added reload dependency, reloadAll, InstanceInfo and fix ui fail when navigate to same route

Jonatas
Commit 1fe08f45b34e817ddc55374d5ef102d187e1917c 1fe08f45 1 parent 835d637f
Showing 4 changed files with 111 additions and 15 deletions
lib/get_instance/src/get_instance.dart
lib/get_navigation/src/routes/default_route.dart
lib/get_state_manager/src/simple/get_view.dart
test/instance/get_instance_test.dart
--- a/lib/get_instance/src/get_instance.dart
View file @1fe08f4
+++ b/lib/get_instance/src/get_instance.dart
View file @1fe08f4
 import 'dart:async';
 import 'dart:collection';
+import 'package:flutter/foundation.dart';
+
 import '../../get_core/get_core.dart';
 import 'lifecycle.dart';
+class InstanceInfo {
+  final bool isPermanent;
+  final bool isSingleton;
+  bool get isCreate => !isSingleton;
+  final bool isRegistered;
+  final bool isPrepared;
+  final bool isInit;
+  const InstanceInfo({
+    @required this.isPermanent,
+    @required this.isSingleton,
+    @required this.isRegistered,
+    @required this.isPrepared,
+    @required this.isInit,
+  });
+}
+
 class GetInstance {
   factory GetInstance() => _getInstance ??= GetInstance._();
@@ -156,8 +174,13 @@ class GetInstance {
     final key = _getKey(S, name);
     _singl.putIfAbsent(
       key,
-        () =>
-            _InstanceBuilderFactory<S>(isSingleton, builder, permanent, false));
+      () => _InstanceBuilderFactory<S>(
+        isSingleton,
+        builder,
+        permanent,
+        false,
+      ),
+    );
   }
   /// Clears from memory registered Instances associated with [routeName] when
@@ -226,6 +249,29 @@ class GetInstance {
     _routesKey.putIfAbsent(_getKey(S, tag), () => Get.reference);
   }
+  InstanceInfo getInstanceInfo<S>({String tag}) {
+    final build = _getDependency<S>(tag: tag);
+
+    return InstanceInfo(
+      isPermanent: build?.permanent,
+      isSingleton: build?.isSingleton,
+      isRegistered: isRegistered<S>(tag: tag),
+      isPrepared: !(build?.isInit ?? true),
+      isInit: build?.isInit,
+    );
+  }
+
+  _InstanceBuilderFactory _getDependency<S>({String tag, String key}) {
+    final newKey = key ?? _getKey(S, tag);
+
+    if (!_singl.containsKey(newKey)) {
+      Get.log('Instance "$newKey" is not registered.', isError: true);
+      return null;
+    } else {
+      return _singl[newKey];
+    }
+  }
+
   /// Initializes the controller
   S _startController<S>({String tag}) {
     final key = _getKey(S, tag);
@@ -316,12 +362,6 @@ class GetInstance {
   ///   the Instance. **don't use** it unless you know what you are doing.
   /// - [force] Will delete an Instance even if marked as [permanent].
   bool delete<S>({String tag, String key, bool force = false}) {
-    // return _queue.secure<bool>(() {
-    return _delete<S>(tag: tag, key: key, force: force);
-    // });
-  }
-
-  bool _delete<S>({String tag, String key, bool force = false}) {
     final newKey = key ?? _getKey(S, tag);
     if (!_singl.containsKey(newKey)) {
@@ -360,6 +400,37 @@ class GetInstance {
     return true;
   }
+  void reloadAll({bool force = false}) {
+    _singl.forEach((key, value) {
+      if (value.permanent && !force) {
+        Get.log('Instance "$key" is permanent. Skipping reload');
+      } else {
+        value.dependency = null;
+        value.isInit = false;
+        Get.log('Instance "$key" was reloaded.');
+      }
+    });
+  }
+
+  void reload<S>({String tag, String key, bool force = false}) {
+    final newKey = key ?? _getKey(S, tag);
+
+    final builder = _getDependency<S>(tag: tag, key: newKey);
+    if (builder == null) return;
+
+    if (builder.permanent && !force) {
+      Get.log(
+        '''Instance "$newKey" is permanent. Use [force = true] to force the restart.''',
+        isError: true,
+      );
+      return;
+    }
+
+    builder.dependency = null;
+    builder.isInit = false;
+    Get.log('Instance "$newKey" was restarted.');
+  }
+
   /// Check if a Class Instance<[S]> (or [tag]) is registered in memory.
   /// - [tag] is optional, if you used a [tag] to register the Instance.
   bool isRegistered<S>({String tag}) => _singl.containsKey(_getKey(S, tag));
@@ -370,12 +441,11 @@ class GetInstance {
   bool isPrepared<S>({String tag}) {
     final newKey = _getKey(S, tag);
-    if (!_singl.containsKey(newKey)) {
-      Get.log('Instance "$newKey" not found.', isError: true);
+    final builder = _getDependency<S>(tag: tag, key: newKey);
+    if (builder == null) {
       return false;
     }
-    final builder = _singl[newKey];
     if (!builder.isInit) {
       return true;
     }
--- a/lib/get_navigation/src/routes/default_route.dart
View file @1fe08f4
+++ b/lib/get_navigation/src/routes/default_route.dart
View file @1fe08f4
@@ -386,8 +386,11 @@ class GetPageRoute<T> extends PageRoute<T> {
   void dispose() {
     super.dispose();
     if (Get.smartManagement != SmartManagement.onlyBuilder) {
-      WidgetsBinding.instance.addPostFrameCallback(
-          (_) => GetInstance().removeDependencyByRoute("$reference"));
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (Get.reference != reference) {
+          GetInstance().removeDependencyByRoute("$reference");
+        }
+      });
     }
     // if (Get.smartManagement != SmartManagement.onlyBuilder) {
--- a/lib/get_state_manager/src/simple/get_view.dart
View file @1fe08f4
+++ b/lib/get_state_manager/src/simple/get_view.dart
View file @1fe08f4
@@ -69,10 +69,14 @@ abstract class GetWidget<S extends GetLifeCycleBase> extends GetWidgetCache {
 class _GetCache<S extends GetLifeCycleBase> extends WidgetCache<GetWidget<S>> {
   S _controller;
   bool _isCreator = false;
+  InstanceInfo info;
   @override
   void onInit() {
-    _isCreator = Get.isPrepared<S>(tag: widget.tag);
-    if (Get.isPrepared<S>()) {
+    info = GetInstance().getInstanceInfo<S>(tag: widget.tag);
+
+    _isCreator = info.isPrepared && info.isCreate;
+
+    if (info.isRegistered) {
       _controller = Get.find<S>(tag: widget.tag);
     }
@@ -90,6 +94,7 @@ class _GetCache<S extends GetLifeCycleBase> extends WidgetCache<GetWidget<S>> {
         GetWidget._cache[widget] = null;
       });
     }
+    info = null;
     super.onClose();
   }
--- a/test/instance/get_instance_test.dart
View file @1fe08f4
+++ b/test/instance/get_instance_test.dart
View file @1fe08f4
@@ -81,6 +81,19 @@ void main() {
     Get.reset();
   });
+  test('Get.reloadInstance test', () async {
+    Get.lazyPut<Controller>(() => Controller());
+    var ct1 = Get.find<Controller>();
+    ct1.increment();
+    expect(ct1.count, 1);
+    ct1 = Get.find<Controller>();
+    expect(ct1.count, 1);
+    GetInstance().reload<Controller>();
+    ct1 = Get.find<Controller>();
+    expect(ct1.count, 0);
+    Get.reset();
+  });
+
   test('Get.lazyPut with abstract class test', () async {
     final api = Api();
     Get.lazyPut<Service>(() => api);
@@ -127,6 +140,7 @@ void main() {
 class Controller extends DisposableController {
   int init = 0;
   int close = 0;
+  int count = 0;
   @override
   void onInit() {
     init++;
@@ -138,4 +152,8 @@ class Controller extends DisposableController {
     close++;
     super.onClose();
   }
+
+  void increment() {
+    count++;
+  }
 }