Update to 3.4.3

jonataslaw · Aug 7, 2020 · 214268a · djade007 · Aug 8, 2020 · 214268a
1 parent ed6904a
commit 214268a
Show file tree

Hide file tree

Showing 14 changed files with 300 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [3.4.3]
+- Fix onInit fired only first time 
+- Fix language callback(@lundin)
+- Fix docs (@nipodemos)
+
+## [3.4.2]
+- Fix individual imports
+
 ## [3.4.1]
 - Structure organization, and improvements.
 

diff --git a/lib/get.dart b/lib/get.dart
@@ -1,6 +1,6 @@
 library get;
 
-export 'src/instance/instance_manager.dart';
-export 'src/navigation/route_manager.dart';
-export 'src/state_manager/state_manager.dart';
-export 'src/utils/utils.dart';
+export 'instance_manager.dart';
+export 'route_manager.dart';
+export 'state_manager.dart';
+export 'utils.dart';
diff --git a/lib/instance_manager.dart b/lib/instance_manager.dart
@@ -0,0 +1,3 @@
+export 'src/instance/get_instance.dart';
+export 'src/instance/extension_instance.dart';
+export 'src/navigation/routes/bindings_interface.dart';
diff --git a/lib/route_manager.dart b/lib/route_manager.dart
@@ -0,0 +1,13 @@
+export 'src/navigation/routes/custom_transition.dart';
+export 'src/navigation/routes/transitions_type.dart';
+export 'src/navigation/routes/get_route.dart';
+export 'src/navigation/routes/default_route.dart';
+export 'src/navigation/routes/observers/route_observer.dart';
+export 'src/navigation/root/root_widget.dart';
+export 'src/navigation/snackbar/snack_route.dart';
+export 'src/navigation/bottomsheet/bottomsheet.dart';
+export 'src/navigation/snackbar/snack.dart';
+export 'src/get_main.dart';
+export 'src/navigation/routes/default_route.dart';
+export 'src/navigation/root/smart_management.dart';
+export 'src/navigation/extension_navigation.dart';
diff --git a/lib/src/get_interface.dart b/lib/src/get_interface.dart
@@ -4,7 +4,7 @@ import 'navigation/root/root_controller.dart';
 import 'navigation/routes/custom_transition.dart';
 import 'navigation/routes/observers/route_observer.dart';
 import 'navigation/routes/transitions_type.dart';
-import 'utils/utils.dart';
+import '../utils.dart';
 
 ///Use Get.to instead of Navigator.push, Get.off instead of Navigator.pushReplacement,
 ///Get.offAll instead of Navigator.pushAndRemoveUntil. For named routes just add "named"
@@ -33,7 +33,7 @@ abstract class GetInterface {
   GetMaterialController getxController = GetMaterialController();
 
   Locale locale;
-  
+
   Locale fallbackLocale;
 
   GlobalKey<NavigatorState> key = GlobalKey<NavigatorState>();

diff --git a/lib/src/instance/get_instance.dart b/lib/src/instance/get_instance.dart
@@ -75,8 +75,8 @@ class GetInstance {
     assert(builder != null);
     String key = _getKey(S, name);
 
-    GetConfig._singl
-        .putIfAbsent(key, () => FcBuilder<S>(isSingleton, builder, permanent));
+    GetConfig._singl.putIfAbsent(
+        key, () => FcBuilder<S>(isSingleton, builder, permanent, false));
   }
 
   Future<void> removeDependencyByRoute(String routeName) async {
@@ -97,9 +97,17 @@ class GetInstance {
     keysToRemove.clear();
   }
 
-  bool isDependencyInit<S>({String name}) {
+  bool initDependencies<S>({String name}) {
     String key = _getKey(S, name);
-    return GetConfig.routesKey.containsKey(key);
+    bool isInit = GetConfig._singl[key].isInit;
+    if (!isInit) {
+      startController<S>(tag: name);
+      GetConfig._singl[key].isInit = true;
+      if (GetConfig.smartManagement != SmartManagement.onlyBuilder) {
+        registerRouteInstance<S>(tag: name);
+      }
+    }
+    return true;
   }
 
   void registerRouteInstance<S>({String tag}) {
@@ -112,7 +120,7 @@ class GetInstance {
     return GetConfig._singl[key].getSependency() as S;
   }
 
-  void initController<S>({String tag}) {
+  void startController<S>({String tag}) {
     String key = _getKey(S, tag);
     final i = GetConfig._singl[key].getSependency();
 
@@ -146,14 +154,8 @@ class GetInstance {
   /// Find a instance from required class
   S find<S>({String tag, FcBuilderFunc<S> instance}) {
     String key = _getKey(S, tag);
-    bool callInit = false;
-    if (isRegistred<S>(tag: tag)) {
-      if (!isDependencyInit<S>() &&
-          GetConfig.smartManagement != SmartManagement.onlyBuilder) {
-        registerRouteInstance<S>(tag: tag);
-        callInit = true;
-      }
 
+    if (isRegistred<S>(tag: tag)) {
       FcBuilder builder = GetConfig._singl[key] as FcBuilder;
       if (builder == null) {
         if (tag == null) {
@@ -162,9 +164,7 @@ class GetInstance {
           throw "class ${S.toString()} with tag '$tag' is not register";
         }
       }
-      if (callInit) {
-        initController<S>(tag: tag);
-      }
+      initDependencies<S>();
 
       return GetConfig._singl[key].getSependency() as S;
     } else {
@@ -175,21 +175,13 @@ class GetInstance {
         print('[GETX] $S instance was created at that time');
       S _value = put<S>(GetConfig._factory[key].builder() as S);
 
-      if (!isDependencyInit<S>() &&
-          GetConfig.smartManagement != SmartManagement.onlyBuilder) {
-        registerRouteInstance<S>(tag: tag);
-        callInit = true;
-      }
+      initDependencies<S>();
 
-      if (GetConfig.smartManagement != SmartManagement.keepFactory) {
-        if (!GetConfig._factory[key].fenix) {
-          GetConfig._factory.remove(key);
-        }
+      if (GetConfig.smartManagement != SmartManagement.keepFactory &&
+          !GetConfig._factory[key].fenix) {
+        GetConfig._factory.remove(key);
       }
 
-      if (callInit) {
-        initController<S>(tag: tag);
-      }
       return _value;
     }
   }
@@ -263,8 +255,9 @@ class FcBuilder<S> {
   FcBuilderFunc builderFunc;
   S dependency;
   bool permanent = false;
+  bool isInit = false;
 
-  FcBuilder(this.isSingleton, this.builderFunc, this.permanent);
+  FcBuilder(this.isSingleton, this.builderFunc, this.permanent, this.isInit);
 
   S getSependency() {
     if (isSingleton) {

diff --git a/lib/src/navigation/extension_navigation.dart b/lib/src/navigation/extension_navigation.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:get/src/get_interface.dart';
-import 'package:get/src/instance/instance_manager.dart';
-import 'package:get/src/navigation/route_manager.dart';
-
+import 'package:get/instance_manager.dart';
+import 'package:get/route_manager.dart';
 import 'root/parse_route.dart';
 import 'routes/bindings_interface.dart';
 

diff --git a/lib/src/navigation/root/root_widget.dart b/lib/src/navigation/root/root_widget.dart
@@ -281,7 +281,8 @@ extension Trans on String {
         Get.translations[Get.locale.languageCode].containsKey(this)) {
       return Get.translations[Get.locale.languageCode][this];
       // If there is no corresponding language or corresponding key, return the key.
-    } else if (Get.fallbackLocale != null && Get.translations.containsKey(
+    } else if (Get.fallbackLocale != null &&
+        Get.translations.containsKey(
             "${Get.fallbackLocale.languageCode}_${Get.fallbackLocale.countryCode}") &&
         Get.translations[
                 "${Get.fallbackLocale.languageCode}_${Get.fallbackLocale.countryCode}"]

diff --git a/lib/src/navigation/routes/default_route.dart b/lib/src/navigation/routes/default_route.dart
@@ -3,10 +3,10 @@ import 'dart:ui' show lerpDouble;
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:get/src/navigation/route_manager.dart';
+import 'package:get/route_manager.dart';
 import 'package:get/src/get_main.dart';
 import 'package:get/src/instance/get_instance.dart';
-import 'package:get/src/utils/utils.dart';
+import 'package:get/utils.dart';
 import 'bindings_interface.dart';
 import 'custom_transition.dart';
 import 'default_transitions.dart';