feat: update templates

Gorniv · Nov 27, 2019 · 76601aa · 76601aa
1 parent e92e913
commit 76601aa
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/templates/bloc.tmpl b/templates/bloc.tmpl
@@ -1,7 +1,8 @@
 import 'dart:async';
+import 'dart:developer' as developer;
+
 import 'package:bloc/bloc.dart';
 import 'package:${appName}${relative}/index.dart';
-import 'dart:developer' as developer;
 
 class ${upperName}Bloc extends Bloc<${upperName}Event, ${upperName}State> {
   // todo: check singleton for logic in project

diff --git a/templates/event.tmpl b/templates/event.tmpl
@@ -1,7 +1,8 @@
 import 'dart:async';
+import 'dart:developer' as developer;
+
 import 'package:${appName}${relative}/index.dart';
 import 'package:meta/meta.dart';
-import 'dart:developer' as developer;
 
 @immutable
 abstract class ${upperName}Event {

diff --git a/templates/model.tmpl b/templates/model.tmpl
@@ -11,14 +11,14 @@ class Autogenerated${upperName} {
     if (json['results'] != null) {
       temp = List<${upperName}Model>();
       json['results'].forEach((v) {
-        temp.add(${upperName}Model.fromJson(v));
+        temp.add(${upperName}Model.fromJson(v as Map<String, dynamic>));
       });
     }
     return Autogenerated${upperName}(results: temp);
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = Map<String, dynamic>();
+    final data = <String, dynamic>{};
     if (this.results != null) {
       data['results'] = this.results.map((v) => v.toJson()).toList();
     }
@@ -36,11 +36,11 @@ class ${upperName}Model extends Equatable {
   List<Object> get props => [id, name];
 
   factory ${upperName}Model.fromJson(Map<String, dynamic> json) {
-    return ${upperName}Model(json['id'], json['name']);
+    return ${upperName}Model(json['id'] as int, json['name'] as String);
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = Map<String, dynamic>();
+    final data = <String, dynamic>{};
     data['id'] = this.id;
     data['name'] = this.name;
     return data;

diff --git a/templates/page.tmpl b/templates/page.tmpl
@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:${appName}${relative}/index.dart';
 
 class ${upperName}Page extends StatelessWidget {
-  static const String routeName = "/${privateName}";
+  static const String routeName = '/${privateName}';
 
   @override
   Widget build(BuildContext context) {
     var _${privateName}Bloc = ${upperName}Bloc();
     return Scaffold(
       appBar: AppBar(
-        title: Text("${upperName}"),
+        title: Text('${upperName}'),
       ),
       body: ${upperName}Screen(${privateName}Bloc: _${privateName}Bloc),
     );

diff --git a/templates/provider.tmpl b/templates/provider.tmpl
@@ -13,7 +13,7 @@ class ${upperName}Provider {
 
   void test(bool isError) {
     if (isError == true){
-      throw Exception("manual error");
+      throw Exception('manual error');
     }
   }
 }

diff --git a/templates/screen.tmpl b/templates/screen.tmpl
@@ -55,7 +55,7 @@ class ${upperName}ScreenState extends State<${upperName}Screen> {
                   padding: const EdgeInsets.only(top: 32.0),
                   child: RaisedButton(
                     color: Colors.blue,
-                    child: Text("reload"),
+                    child: Text('reload'),
                     onPressed: () => this._load(),
                   ),
                 ),
@@ -66,12 +66,12 @@ class ${upperName}ScreenState extends State<${upperName}Screen> {
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
-                Text("Flutter files: done"),
+                Text('Flutter files: done'),
                 Padding(
                   padding: const EdgeInsets.only(top: 32.0),
                   child: RaisedButton(
                     color: Colors.red,
-                    child: Text("throw error"),
+                    child: Text('throw error'),
                     onPressed: () => this._load(true),
                   ),
                 ),

diff --git a/templates/state.tmpl b/templates/state.tmpl
@@ -1,11 +1,10 @@
 import 'package:equatable/equatable.dart';
-import 'package:meta/meta.dart';
 
 abstract class ${upperName}State extends Equatable {
   /// notify change state without deep clone state
   final int version;
 
-  final Iterable propss;
+  final List propss;
   ${upperName}State(this.version,[this.propss]);
 
   /// Copy object for use in action
@@ -21,7 +20,7 @@ abstract class ${upperName}State extends Equatable {
 /// UnInitialized
 class Un${upperName}State extends ${upperName}State {
 
-  Un${upperName}State(version) : super(version);
+  Un${upperName}State(int version) : super(version);
 
   @override
   String toString() => 'Un${upperName}State';
@@ -41,7 +40,7 @@ class Un${upperName}State extends ${upperName}State {
 class In${upperName}State extends ${upperName}State {
   final String hello;
 
-  In${upperName}State(version, this.hello) : super(version, [hello]);
+  In${upperName}State(int version, this.hello) : super(version, [hello]);
 
   @override
   String toString() => 'In${upperName}State $hello';
@@ -60,7 +59,7 @@ class In${upperName}State extends ${upperName}State {
 class Error${upperName}State extends ${upperName}State {
   final String errorMessage;
 
-  Error${upperName}State(version, this.errorMessage): super(version, [errorMessage]);
+  Error${upperName}State(int version, this.errorMessage): super(version, [errorMessage]);
 
   @override
   String toString() => 'Error${upperName}State';