Fix bug when value is null for multiple choice

davigmacode · davigmacode · commit 0f37ba41f035 · 2019-12-21T14:52:53.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [2.0.1] - 2019-12-21
+
+* fix bug when value is null for multiple choice
+* update demo and add video preview example
+
 ## [2.0.0] - 2019-12-20
 
 * Use Provider as state management
diff --git a/README.md b/README.md
@@ -4,6 +4,12 @@ Smart select allows you to easily convert your usual form selects into dynamic p
 
 # Demo
 
+## Preview
+
+[![Watch the demo](https://img.youtube.com/vi/bcHELDM8hWg/maxresdefault.jpg)](https://youtu.be/bcHELDM8hWg)
+
+## Download
+
 [![Demo App](https://github.com/davigmacode/flutter_smart_select/raw/master/example/art/qr/apk.png "Demo App")](https://github.com/davigmacode/flutter_smart_select/blob/master/example/art/demo/SmartSelect.apk?raw=true)
 
 # Features
diff --git a/example/README.md b/example/README.md
@@ -1,5 +1,11 @@
 # Demo App
 
+## Preview
+
+[![Watch the demo](https://img.youtube.com/vi/bcHELDM8hWg/maxresdefault.jpg)](https://youtu.be/bcHELDM8hWg)
+
+## Download
+
 [![Demo App](https://github.com/davigmacode/flutter_smart_select/raw/master/example/art/qr/apk.png "Demo App")](https://github.com/davigmacode/flutter_smart_select/blob/master/example/art/demo/SmartSelect.apk?raw=true)
 
 # Source Code
@@ -26,7 +32,7 @@
 * [Leading Widget](https://github.com/davigmacode/flutter_smart_select/blob/master/example/lib/features_tile/tile_leading.dart)
 * [Custom Trailing Widget](https://github.com/davigmacode/flutter_smart_select/blob/master/example/lib/features_tile/tile_trailing.dart)
 * [Loading Stats](https://github.com/davigmacode/flutter_smart_select/blob/master/example/lib/features_tile/tile_loading.dart)
-* [Custom Tile Builder]((https://github.com/davigmacode/flutter_smart_select/blob/master/example/lib/features_tile/tile_builder.dart))
+* [Custom Tile Builder](https://github.com/davigmacode/flutter_smart_select/blob/master/example/lib/features_tile/tile_builder.dart)
 
 
 ## Customize Option
diff --git a/example/art/demo/SmartSelect.apk b/example/art/demo/SmartSelect.apk
diff --git a/example/art/qr/apk.png b/example/art/qr/apk.png
diff --git a/example/lib/features.dart b/example/lib/features.dart
@@ -6,19 +6,9 @@ import './features_option/option_main.dart';
 import './features_modal/modal_main.dart';
 import './features_choices/choices_main.dart';
 
-class Features extends StatefulWidget {
-  @override
-  _FeaturesState createState() => _FeaturesState();
-}
-
-class _FeaturesState extends State<Features> with AutomaticKeepAliveClientMixin<Features> {
-
-  @override
-  bool get wantKeepAlive => true;
-
+class Features extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    super.build(context);
     return DefaultTabController(
       length: 6,
       child: Scaffold(
@@ -39,7 +29,7 @@ class _FeaturesState extends State<Features> with AutomaticKeepAliveClientMixin<
           actions: <Widget>[
             IconButton(
               icon: Icon(Icons.help_outline),
-              onPressed: () => _about(),
+              onPressed: () => _about(context),
             )
           ],
         ),
@@ -57,7 +47,7 @@ class _FeaturesState extends State<Features> with AutomaticKeepAliveClientMixin<
     );
   }
 
-  void _about() {
+  void _about(BuildContext context) {
     showDialog(
       context: context,
       builder: (_) => Dialog(
diff --git a/example/lib/features_choices/choices_main.dart b/example/lib/features_choices/choices_main.dart
@@ -5,9 +5,19 @@ import './choices_divider.dart';
 import './choices_theme.dart';
 import '../features_header.dart';
 
-class FeaturesChoices extends StatelessWidget {
+class FeaturesChoices extends StatefulWidget {
+  @override
+  _FeaturesChoicesState createState() => _FeaturesChoicesState();
+}
+
+class _FeaturesChoicesState extends State<FeaturesChoices> with AutomaticKeepAliveClientMixin<FeaturesChoices> {
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Scrollbar(
       child:ListView(
         children: <Widget>[
diff --git a/example/lib/features_modal/modal_main.dart b/example/lib/features_modal/modal_main.dart
@@ -7,9 +7,19 @@ import './modal_header.dart';
 import './modal_headerless.dart';
 import '../features_header.dart';
 
-class FeaturesModal extends StatelessWidget {
+class FeaturesModal extends StatefulWidget {
+  @override
+  _FeaturesModalState createState() => _FeaturesModalState();
+}
+
+class _FeaturesModalState extends State<FeaturesModal> with AutomaticKeepAliveClientMixin<FeaturesModal> {
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Scrollbar(
       child:ListView(
         children: <Widget>[
diff --git a/example/lib/features_multi/multi_main.dart b/example/lib/features_multi/multi_main.dart
@@ -7,9 +7,19 @@ import './multi_chips.dart';
 import './multi_switches.dart';
 import '../features_header.dart';
 
-class FeaturesMulti extends StatelessWidget {
+class FeaturesMulti extends StatefulWidget {
+  @override
+  _FeaturesMultiState createState() => _FeaturesMultiState();
+}
+
+class _FeaturesMultiState extends State<FeaturesMulti> with AutomaticKeepAliveClientMixin<FeaturesMulti> {
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Scrollbar(
       child:ListView(
         children: <Widget>[
diff --git a/example/lib/features_option/option_async.dart b/example/lib/features_option/option_async.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:smart_select/smart_select.dart';
 import 'package:dio/dio.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 
 class FeaturesOptionAsync extends StatefulWidget {
   @override
@@ -11,7 +12,11 @@ class _FeaturesOptionAsyncState extends State<FeaturesOptionAsync> {
 
   String _user;
   List _users = [];
-  bool _isLoading;
+  bool _usersIsLoading;
+
+  List _country;
+  List _countries = [];
+  bool _countriesIsLoading;
 
   @override
   Widget build(BuildContext context) {
@@ -23,9 +28,9 @@ class _FeaturesOptionAsyncState extends State<FeaturesOptionAsync> {
           value: _user,
           option: SmartSelectOptionConfig(
             _users,
-            value: (_item) => _item['email'],
-            title: (_item) => _item['name']['first'] + ' ' + _item['name']['last'],
-            subtitle: (_item) => _item['email'],
+            value: (data) => data['email'],
+            title: (data) => data['name']['first'] + ' ' + data['name']['last'],
+            subtitle: (data) => data['email'],
             groupBy: 'gender',
           ),
           modal: SmartSelectModalConfig(useFilter: true),
@@ -40,7 +45,7 @@ class _FeaturesOptionAsyncState extends State<FeaturesOptionAsync> {
               title: state.title,
               value: state.valueDisplay,
               isTwoLine: true,
-              isLoading: _isLoading,
+              isLoading: _usersIsLoading,
               leading: Builder(
                 builder: (context) {
                   String avatarUrl = state.valueObject != null
@@ -56,6 +61,30 @@ class _FeaturesOptionAsyncState extends State<FeaturesOptionAsync> {
           },
           onChange: (val) => setState(() => _user = val),
         ),
+        Divider(indent: 20),
+        SmartSelect(
+          title: 'Country',
+          value: _country,
+          isTwoLine: true,
+          isMultiChoice: true,
+          option: SmartSelectOptionConfig(
+            _countries,
+            value: (data) => data['subregion'] + ' - ' + data['name'],
+            title: (data) => data['name'],
+            subtitle: ['capital'],
+            groupBy: 'region',
+          ),
+          modal: SmartSelectModalConfig(useFilter: true),
+          choice: SmartSelectChoiceConfig(
+            type: SmartSelectChoiceType.checkboxes,
+          ),
+          leading: Container(
+            width: 40,
+            height: 40,
+            child: Icon(Icons.flag),
+          ),
+          onChange: (val) => setState(() => _country = val),
+        ),
         Container(height: 7),
       ],
     );
@@ -66,19 +95,32 @@ class _FeaturesOptionAsyncState extends State<FeaturesOptionAsync> {
     super.initState();
 
     _getUsers();
+    _getCountries();
   }
 
   void _getUsers() async {
     try {
-      setState(() => _isLoading = true);
+      setState(() => _usersIsLoading = true);
       String url = "https://randomuser.me/api/?inc=gender,name,nat,picture,email&results=25";
       Response res = await Dio().get(url);
-      setState(() {
-        _users = res.data['results'];
-        _isLoading = false;
-      });
+      setState(() =>_users = res.data['results'].cast<Map>());
+    } catch (e) {
+      print(e);
+    } finally {
+      setState(() => _usersIsLoading = false);
+    }
+  }
+
+  void _getCountries() async {
+    try {
+      setState(() => _countriesIsLoading = true);
+      String url = "http://restcountries.eu/rest/v2/all?fields=name;capital;flag;region;subregion";
+      Response res = await Dio().get(url);
+      setState(() => _countries = res.data.cast<Map>());
     } catch (e) {
       print(e);
+    } finally {
+      setState(() => _countriesIsLoading = false);
     }
   }
 }
diff --git a/example/lib/features_option/option_main.dart b/example/lib/features_option/option_main.dart
@@ -6,9 +6,19 @@ import './option_list_of_list.dart';
 import './option_async.dart';
 import '../features_header.dart';
 
-class FeaturesOption extends StatelessWidget {
+class FeaturesOption extends StatefulWidget {
+  @override
+  _FeaturesOptionState createState() => _FeaturesOptionState();
+}
+
+class _FeaturesOptionState extends State<FeaturesOption> with AutomaticKeepAliveClientMixin<FeaturesOption> {
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Scrollbar(
       child:ListView(
         children: <Widget>[
diff --git a/example/lib/features_single/single_main.dart b/example/lib/features_single/single_main.dart
@@ -6,9 +6,19 @@ import './single_popup.dart';
 import './single_chips.dart';
 import '../features_header.dart';
 
-class FeaturesSingle extends StatelessWidget {
+class FeaturesSingle extends StatefulWidget {
+  @override
+  _FeaturesSingleState createState() => _FeaturesSingleState();
+}
+
+class _FeaturesSingleState extends State<FeaturesSingle> with AutomaticKeepAliveClientMixin<FeaturesSingle> {
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Scrollbar(
       child:ListView(
         children: <Widget>[
diff --git a/example/lib/features_tile/tile_main.dart b/example/lib/features_tile/tile_main.dart
@@ -8,9 +8,19 @@ import './tile_trailing.dart';
 import './tile_builder.dart';
 import '../features_header.dart';
 
-class FeaturesTile extends StatelessWidget {
+class FeaturesTile extends StatefulWidget {
+  @override
+  _FeaturesTileState createState() => _FeaturesTileState();
+}
+
+class _FeaturesTileState extends State<FeaturesTile> with AutomaticKeepAliveClientMixin<FeaturesTile> {
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Scrollbar(
       child:ListView(
         children: <Widget>[
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -69,6 +69,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.15.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -109,6 +116,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.4"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   pedantic:
     dependency: transitive
     description:
@@ -148,7 +169,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.1"
   source_span:
     dependency: transitive
     description:
@@ -221,3 +242,4 @@ packages:
     version: "3.5.0"
 sdks:
   dart: ">2.4.0 <3.0.0"
+  flutter: ">=1.5.9-pre.94 <2.0.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -24,6 +24,7 @@ dependencies:
   dio: ^3.0.7
   provider: ^3.2.0
   sticky_headers: ^0.1.8+1
+  flutter_svg: ^0.15.0
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
diff --git a/lib/src/model/state.dart b/lib/src/model/state.dart
@@ -33,7 +33,7 @@ class SmartSelectState {
   /// that represent the value
   dynamic get valueObject {
     return isMultiChoice == true
-      ? option.where((SmartSelectOptionItem item) => value.contains(item.value))
+      ? option.where((SmartSelectOptionItem item) => value?.contains(item.value) ?? false)
       : option.firstWhere((SmartSelectOptionItem item) => item.value == value, orElse: () => null);
   }
 
diff --git a/lib/src/model/state_selected.dart b/lib/src/model/state_selected.dart
@@ -12,7 +12,7 @@ class SmartSelectStateSelected extends ChangeNotifier {
 
   bool contains(dynamic val, [isMultiChoice = false]) {
     return _isMultiChoice == true
-      ? _value.contains(val)
+      ? _value?.contains(val) ?? false
       : _value == val;
   }
 
diff --git a/lib/src/widget.dart b/lib/src/widget.dart
diff --git a/pubspec.yaml b/pubspec.yaml
