updated to latest version of example in rx_widgets

escamoteur · Apr 23, 2018 · ec0cc96 · ec0cc96
1 parent 30606cf
commit ec0cc96
Show file tree

Hide file tree

Showing 19 changed files with 886 additions and 169 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,3 @@ build/
 ios/.generated/
 packages
 .flutter-plugins
-pubspec.lock
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -0,0 +1,77 @@
+analyzer:
+  strong-mode:
+    implicit-casts: false
+  errors:
+    unused_import: error
+    unused_local_variable: error
+    dead_code: error
+    override_on_non_overriding_method: error
+  exclude:
+    - example/lib/json/weather_in_cities.g.dart
+
+linter:
+  rules:
+    - annotate_overrides
+    - avoid_empty_else
+    - avoid_function_literals_in_foreach_calls
+    - avoid_init_to_null
+    - avoid_null_checks_in_equality_operators
+    - avoid_renaming_method_parameters
+    - avoid_return_types_on_setters
+    - avoid_returning_null
+    - avoid_types_as_parameter_names
+    - avoid_unused_constructor_parameters
+    - await_only_futures
+    - camel_case_types
+    #- cancel_subscriptions
+    #- cascade_invocations
+    - comment_references
+    #- constant_identifier_names
+    - control_flow_in_finally
+    - directives_ordering
+    - empty_catches
+    - empty_constructor_bodies
+    - empty_statements
+    - hash_and_equals
+    #- implementation_imports
+    - invariant_booleans
+    - iterable_contains_unrelated_type
+    - library_names
+    - library_prefixes
+    - list_remove_unrelated_type
+    - no_adjacent_strings_in_list
+    - no_duplicate_case_values
+    - non_constant_identifier_names
+    - omit_local_variable_types
+    #- only_throw_errors
+    - overridden_fields
+    #- package_api_docs
+    - package_names
+    - package_prefixed_library_names
+    - prefer_adjacent_string_concatenation
+    - prefer_collection_literals
+    - prefer_conditional_assignment
+    #- prefer_const_constructors
+    - prefer_contains
+    - prefer_final_fields
+    - prefer_initializing_formals
+    #- prefer_interpolation_to_compose_strings
+    - prefer_is_empty
+    - prefer_is_not_empty
+#    - prefer_single_quotes
+    - prefer_typing_uninitialized_variables
+    - recursive_getters
+    - slash_for_doc_comments
+    - super_goes_last
+    - test_types_in_equals
+    - throw_in_finally
+    - type_init_formals
+    - unawaited_futures
+    - unnecessary_brace_in_string_interps
+    - unnecessary_getters_setters
+#    - unnecessary_lambdas
+    - unnecessary_null_aware_assignments
+    - unnecessary_statements
+#    - unnecessary_this
+    - unrelated_type_equality_checks
+    - valid_regexps
diff --git a/android.iml b/android.iml
diff --git a/flutter_weather_demo.iml b/flutter_weather_demo.iml
diff --git a/flutter_weather_demo_android.iml b/flutter_weather_demo_android.iml
diff --git a/lib/homepage/homepage.dart b/lib/homepage/homepage.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_weather_demo/homepage/weather_list_view.dart';
-import 'package:flutter_weather_demo/keys.dart';
-import 'package:flutter_weather_demo/model_provider.dart';
-import 'package:flutter_weather_demo/service/weather_entry.dart';
+import 'package:making_flutter_more_reactive/homepage/weather_list_view.dart';
+import 'package:making_flutter_more_reactive/keys.dart';
+import 'package:making_flutter_more_reactive/model_provider.dart';
 import 'package:rx_widgets/rx_widgets.dart';
 
+import 'package:making_flutter_more_reactive/service/weather_entry.dart';
 
 class HomePage extends StatefulWidget {
   @override
@@ -39,10 +39,12 @@ class HomePageState extends State<HomePage> {
           Expanded(
                 child: 
                 RxLoader<List<WeatherEntry>>(
-                        key: AppKeys.loadingSpinner,
+                        spinnerKey: AppKeys.loadingSpinner,
                         radius: 25.0,
                         commandResults: ModelProvider.of(context).updateWeatherCommand,
                         dataBuilder: (context, data) => WeatherListView(data ,key: AppKeys.weatherList),
+                        placeHolderBuilder: (context) => Center(key: AppKeys.loaderPlaceHolder, child: Text("No Data")),
+                        errorBuilder: (context, ex) => Center(key: AppKeys.loaderError, child: Text("Error: ${ex.toString()}")),
                         ),
           ),
           Padding(
@@ -58,8 +60,12 @@ class HomePageState extends State<HomePage> {
                             onTrue:  RaisedButton(    
                                             key: AppKeys.updateButtonEnabled,                           
                                             child: Text("Update"), 
-                                            onPressed: ModelProvider.of(context).updateWeatherCommand,
-                                            ),
+                                            onPressed: ()  
+                                                {
+                                                  _controller.clear();
+                                                  ModelProvider.of(context).updateWeatherCommand();
+                                                }
+                                        ),
                             onFalse:  RaisedButton(                               
                                             key: AppKeys.updateButtonDisabled,                           
                                             child: Text("Please Wait"), 

diff --git a/lib/homepage/homepage_model.dart b/lib/homepage/homepage_model.dart
@@ -1,6 +1,7 @@
-import 'package:flutter_weather_demo/service/weather_entry.dart';
-import 'package:flutter_weather_demo/service/weather_service.dart';
+
 import 'package:rx_command/rx_command.dart';
+import 'package:making_flutter_more_reactive/service/weather_service.dart';
+import 'package:making_flutter_more_reactive/service/weather_entry.dart';
 
 class HomePageModel {
   final WeatherService service;
@@ -15,7 +16,7 @@ class HomePageModel {
     this.service,
   );
 
-  factory HomePageModel(WeatherService service) {
+  factory HomePageModel(WeatherService service ) {
     // Command expects a bool value when executed and issues the value on it's
     // result Observable (stream)
     final _switchChangedCommand = RxCommand.createSync3<bool, bool>((b) => b);

diff --git a/lib/homepage/weather_list_view.dart b/lib/homepage/weather_list_view.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_weather_demo/keys.dart';
-import 'package:flutter_weather_demo/service/weather_entry.dart';
-import 'package:flutter_weather_demo/weather_icons.dart';
+import 'package:making_flutter_more_reactive/keys.dart';
+import 'package:making_flutter_more_reactive/service/weather_entry.dart';
+import 'package:making_flutter_more_reactive/weather_icons.dart';
 
 
 class WeatherListView extends StatelessWidget {

diff --git a/lib/keys.dart b/lib/keys.dart
@@ -4,11 +4,12 @@ class AppKeys {
   static final Key textField = new Key('filter text field');
   static final Key empty = new Key('empty container');
   static final Key noItems = new Key('noItems');
-  static final Key loadingError = new Key('loadingError');
   static final Key weatherList = new Key('weatherList');
   static final Key cityList = new Key('cityList');
   static final Key loadingSpinner = new Key('loadingSpinner');
   static final Key updateButtonEnabled = new Key('updateButtonEnabled');
   static final Key updateButtonDisabled = new Key('updateButtonDisabled');
+  static final Key loaderPlaceHolder = new Key('loaderPlaceHolder');
+  static final Key loaderError = new Key('loaderError');
   static final Key updateSwitch = new Key('updateSwitch');
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_weather_demo/homepage/homepage.dart';
-import 'package:flutter_weather_demo/homepage/homepage_model.dart';
-import 'package:flutter_weather_demo/model_provider.dart';
-import 'package:flutter_weather_demo/service/weather_service.dart';
+import 'package:making_flutter_more_reactive/homepage/homepage.dart';
+import 'package:making_flutter_more_reactive/homepage/homepage_model.dart';
+import 'package:making_flutter_more_reactive/model_provider.dart';
+import 'package:making_flutter_more_reactive/service/weather_service.dart';
 import 'package:http/http.dart' as http;
 
 void main() {

diff --git a/lib/model_provider.dart b/lib/model_provider.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_weather_demo/homepage/homepage_model.dart';
+import 'package:making_flutter_more_reactive/homepage/homepage_model.dart';
+
 
 // InheritedWidgets allow you to propagate values down the Widget Tree.
 // it can then be accessed by just writing  TheViewModel.of(context)

diff --git a/lib/service/json/weather_in_cities.dart b/lib/service/json/weather_in_cities.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: annotate_overrides
+
 import "package:json_annotation/json_annotation.dart";
 
 part "weather_in_cities.g.dart";

diff --git a/lib/service/weather_entry.dart b/lib/service/weather_entry.dart
@@ -21,4 +21,12 @@ class WeatherEntry {
         temperature = city.main.temp,
         description = city.weather[0]?.description,
         weatherId = city.weather[0].id;
+
+   @override
+   bool operator == (other) {
+     return cityName == other.cityName;
+   } 
+
+   @override
+   int get hashCode => cityName.hashCode;
 }
diff --git a/lib/service/weather_service.dart b/lib/service/weather_service.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:flutter_weather_demo/service/json/weather_in_cities.dart';
-import 'package:flutter_weather_demo/service/weather_entry.dart';
+import 'package:making_flutter_more_reactive/service/json/weather_in_cities.dart';
+import 'package:making_flutter_more_reactive/service/weather_entry.dart';
 import 'package:http/http.dart' as http;
 
 class WeatherService {
@@ -17,7 +17,7 @@ class WeatherService {
     final response = await client.get(url);
 
     if (response.statusCode == 200) {
-      return new WeatherInCities.fromJson(json.decode(response.body))
+      return new WeatherInCities.fromJson(json.decode(response.body) as Map<String,dynamic>)
           .cities
           .where((weatherInCity) =>
               filter == null ||