fix : fix major bugs

* fix infinit loading widget when close app with back button and widget is main widget
vmwsree · Jun 6, 2022 · c03978b · c03978b
1 parent 6346bda
commit c03978b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -89,7 +89,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.34.0"
+    version: "0.34.0+1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:

diff --git a/flutter_osm_interface/pubspec.lock b/flutter_osm_interface/pubspec.lock
@@ -42,7 +42,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   dio:
     dependency: "direct main"
     description:
@@ -56,7 +56,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -94,7 +94,7 @@ packages:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
@@ -108,7 +108,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   permission_handler:
     dependency: "direct main"
     description:
@@ -141,7 +141,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -183,7 +183,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.8"
+    version: "0.4.9"
   typed_data:
     dependency: transitive
     description:
@@ -197,7 +197,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
 sdks:
-  dart: ">=2.15.0 <3.0.0"
+  dart: ">=2.17.0-0 <3.0.0"
   flutter: ">=2.5.0"
diff --git a/lib/src/controller/osm/osm_controller.dart b/lib/src/controller/osm/osm_controller.dart
@@ -117,6 +117,9 @@ class MobileOSMController extends IBaseOSMController {
 
     osmPlatform.onMapRestored(_idMap).listen((event) {
       Future.delayed(Duration(milliseconds: 300), () {
+        if(!_osmFlutterState.widget.mapIsReadyListener.value){
+          _osmFlutterState.widget.mapIsReadyListener.value = true;
+        }
         _osmFlutterState.widget.controller.osMMixin?.mapRestored();
       });
     });

diff --git a/lib/src/widgets/mobile_osm_flutter.dart b/lib/src/widgets/mobile_osm_flutter.dart
@@ -91,12 +91,13 @@ class MobileOsmFlutterState extends State<MobileOsmFlutter>
   late ValueNotifier<Orientation> orientation;
   late ValueNotifier<Size> sizeNotifier;
   ValueNotifier<bool> setCache = ValueNotifier(false);
-  ValueNotifier<bool> isFirstLaunched = ValueNotifier(false);
+  late ValueNotifier<bool> isFirstLaunched;
 
   @override
   void initState() {
     super.initState();
     keyUUID = Uuid().v4();
+    isFirstLaunched = ValueNotifier(false);
     WidgetsBinding.instance.addObserver(this);
     Future.delayed(Duration.zero, () async {
       orientation = ValueNotifier(Orientation.values[MediaQuery.of(context).orientation.index]);
@@ -138,6 +139,7 @@ class MobileOsmFlutterState extends State<MobileOsmFlutter>
             orientation.value = Orientation.values[nIndex];
           } else {
             if (sizeNotifier.value != MediaQuery.of(context).size) {
+              setCache.value = true;
               sizeNotifier.value = MediaQuery.of(context).size;
             }
           }
@@ -149,14 +151,21 @@ class MobileOsmFlutterState extends State<MobileOsmFlutter>
   @override
   bool get mounted => super.mounted;
 
-  @override
-  void didUpdateWidget(covariant MobileOsmFlutter oldWidget) {
+  void saveCache() {
     if (Platform.isAndroid && isFirstLaunched.value) {
-      if (!setCache.value) {
+      if (setCache.value == false) {
         setCache.value = true;
         Future.microtask(() async => await _osmController?.saveCacheMap());
       }
     }
+  }
+
+  @override
+  void didUpdateWidget(covariant MobileOsmFlutter oldWidget) {
+    // saveCache();
+    if (widget.mapIsReadyListener.value) {
+      saveCache();
+    }
     super.didUpdateWidget(oldWidget);
     if (this.widget != oldWidget &&
         Platform.isAndroid &&
@@ -243,22 +252,21 @@ class PlatformView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    Widget widgetMap = AndroidView(
-      key: androidKey,
-      viewType: 'plugins.dali.hamza/osmview',
-      onPlatformViewCreated: onPlatformCreatedView,
-      creationParams: uuidMapCache,
-      //creationParamsCodec: null,
-      creationParamsCodec: StandardMethodCodec().messageCodec,
-    );
     if (defaultTargetPlatform == TargetPlatform.iOS) {
-      widgetMap = UiKitView(
+      return UiKitView(
         //  key: mobileKey,
         viewType: 'plugins.dali.hamza/osmview',
         onPlatformViewCreated: onPlatformCreatedView,
         //creationParamsCodec:  StandardMessageCodec(),
       );
     }
-    return widgetMap;
+    return AndroidView(
+      key: androidKey,
+      viewType: 'plugins.dali.hamza/osmview',
+      onPlatformViewCreated: onPlatformCreatedView,
+      creationParams: uuidMapCache,
+      //creationParamsCodec: null,
+      creationParamsCodec: StandardMethodCodec().messageCodec,
+    );
   }
 }