fix bugs on Flutter 1.17.0

tp7309 · tp7309 · commit c2e95b68ad46 · 2020-05-12T22:00:03.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.2.1
+- fix bugs on Flutter 1.17.0.
+
 ## 0.2.0
 - import widgets.dart instead of material.dart
 - fix some bugs.
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 # sticky_and_expandable_list
-
 Flutter implementation of sticky headers and expandable list.Support use it in a CustomScrollView.
 
 [![Pub](https://img.shields.io/pub/v/sticky_and_expandable_list.svg)](https://pub.dartlang.org/packages/sticky_and_expandable_list)
@@ -9,10 +8,10 @@ README i18n:[中文说明](https://github.com/tp7309/flutter_sticky_and_expandab
 
 ## Features
 
-- Build a grouped list, which can expand/collapse section or sticky section header.
+- Build a grouped list, which support expand/collapse section and sticky header.
 - Use it with CustomScrollView、SliverAppBar.
 - Listen the scroll offset of current sticky header, current sticky header index and switching header index.
-- Only use one list widget, so it supports large data and a small memory usage.
+- Only use one list widget, so it supports large data and a normal memory usage.
 - More section customization support, you can return a new section widget by sectionBuilder, to customize background，expand/collapse animation, section layout, and so on.
 - Support add divider.
 
@@ -22,7 +21,7 @@ In the `pubspec.yaml` of your flutter project, add the following dependency:
 
 ```yaml
 dependencies:
-  sticky_and_expandable_list: ^0.2.0
+  sticky_and_expandable_list: ^0.2.1
 ```
 
 ## Basic Usage
@@ -56,7 +55,7 @@ dependencies:
 
 ```dart
 setState(() {
-  section.setSectionExpanded(true);
+  sectionList[i].setSectionExpanded(true);
 });
 ```
 
diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -1,6 +1,6 @@
 # sticky_and_expandable_list
 
-可拆叠列表的 Flutter 实现，支持固定组标题，可以与 Sliver 家族控件配合使用。
+可拆叠列表的 Flutter 实现，支持粘性头部，可以与 Sliver 家族控件配合使用。
 
 [![Pub](https://img.shields.io/pub/v/sticky_and_expandable_list.svg)](https://pub.dartlang.org/packages/sticky_and_expandable_list)
 
@@ -21,7 +21,7 @@
 
 ```yaml
 dependencies:
-  sticky_and_expandable_list: ^0.2.0
+  sticky_and_expandable_list: ^0.2.1
 ```
 
 ## 基础使用示例
@@ -55,7 +55,7 @@ dependencies:
 
 ```dart
 setState(() {
-  section.setSectionExpanded(true);
+  sectionList[i].setSectionExpanded(true);
 });
 ```
 
diff --git a/doc/images/sliverlist.gif b/doc/images/sliverlist.gif
diff --git a/example/android/app/src/main/kotlin/com/sshine/expandablelist/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/sshine/expandablelist/example/MainActivity.kt
@@ -1,12 +1,11 @@
 package com.sshine.expandablelist.example
 
-import android.support.annotation.NonNull;
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugins.GeneratedPluginRegistrant
 
 class MainActivity: FlutterActivity() {
-    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine);
     }
 }
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -9,11 +9,7 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
-		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
-		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -26,8 +22,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
-				9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -38,13 +32,11 @@
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -57,8 +49,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
-				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -68,9 +58,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
 				9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -201,7 +189,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/lib/src/expandable_section_container.dart b/lib/src/expandable_section_container.dart
@@ -4,7 +4,6 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 import '../sticky_and_expandable_list.dart';
 
-
 ///Section widget information.
 class ExpandableSectionContainerInfo {
   Widget header;
@@ -301,7 +300,7 @@ class RenderExpandableSectionContainer extends RenderBox
     double maxScrollOffset = minScrollOffset + size.height;
 
     //when [ExpandableSectionContainer] size changed, SliverList may give a wrong
-    // layoutOffset at first tim, so check offsets for store right layoutOffset
+    // layoutOffset at first time, so check offsets for store right layoutOffset
     // in [containerOffsets].
     if (_listIndex < _controller.containerOffsets.length) {
       currContainerOffset = _controller.containerOffsets[_listIndex];
@@ -379,8 +378,10 @@ class RenderExpandableSectionContainer extends RenderBox
       while (_controller.containerOffsets.length <= containerParentData.index) {
         _controller.containerOffsets.add(0);
       }
-      _controller.containerOffsets[containerParentData.index] =
-          containerParentData.layoutOffset;
+      if (containerParentData.layoutOffset != null) {
+        _controller.containerOffsets[containerParentData.index] =
+            containerParentData.layoutOffset;
+      }
     });
   }
 
diff --git a/lib/src/sliver_expandable_list.dart b/lib/src/sliver_expandable_list.dart
@@ -59,7 +59,7 @@ class SliverExpandableChildDelegate<T, S extends ExpandableListSection<T>> {
   ///sliver list builder
   SliverChildBuilderDelegate delegate;
 
-  ///when section is collapsed, all child widget in content widget will be removed.
+  ///if value is true, when section is collapsed, all child widget in section widget will be removed.
   bool removeItemsOnCollapsed = true;
 
   SliverExpandableChildDelegate(
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: sticky_and_expandable_list
-description: Build a grouped list, which can expand/collapse section or sticky header, support use it with sliver widget.
-version: 0.2.0
+description: Build a grouped list, which support expand/collapse section and sticky header, support use it with sliver widget.
+version: 0.2.1
 homepage: https://github.com/tp7309/flutter_sticky_and_expandable_list
 issue_tracker: https://github.com/tp7309/flutter_sticky_and_expandable_list/issues
 

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`package com.sshine.expandablelist.example`
`2`	`2`
`3`		`-import android.support.annotation.NonNull;`
`4`	`3`	`import io.flutter.embedding.android.FlutterActivity`
`5`	`4`	`import io.flutter.embedding.engine.FlutterEngine`
`6`	`5`	`import io.flutter.plugins.GeneratedPluginRegistrant`
`7`	`6`
`8`	`7`	`class MainActivity: FlutterActivity() {`
`9`		`- override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {`
	`8`	`+ override fun configureFlutterEngine(flutterEngine: FlutterEngine) {`
`10`	`9`	`GeneratedPluginRegistrant.registerWith(flutterEngine);`
`11`	`10`	`}`
`12`	`11`	`}`