Merge pull request #645 from justkawal/master

Fix of Issue #643

Merge pull request #645 from justkawal/master
Fix of Issue #643
Jonny Borges · GitHub
Commit d1d76cc0dd07ad135acf6fc5ae08f61adc52e5fd d1d76cc0 2 parents 665d25fe 2e6caf74
Showing 3 changed files with 326 additions and 3 deletions
example/pubspec.lock
packages/get_navigation/lib/src/root/root_widget.dart
pubspec.lock
--- a/example/pubspec.lock 0 → 100644
View file @d1d76cc
+++ b/example/pubspec.lock 0 → 100644
View file @d1d76cc
+ # Generated by pub
+ # See https://dart.dev/tools/pub/glossary#lockfile
+ packages:
+   async:
+     dependency: transitive
+     description:
+       name: async
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "2.4.2"
+   boolean_selector:
+     dependency: transitive
+     description:
+       name: boolean_selector
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "2.0.0"
+   characters:
+     dependency: transitive
+     description:
+       name: characters
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.0.0"
+   charcode:
+     dependency: transitive
+     description:
+       name: charcode
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.1.3"
+   clock:
+     dependency: transitive
+     description:
+       name: clock
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.0.1"
+   collection:
+     dependency: transitive
+     description:
+       name: collection
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.14.13"
+   dio:
+     dependency: "direct main"
+     description:
+       name: dio
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "3.0.10"
+   fake_async:
+     dependency: transitive
+     description:
+       name: fake_async
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.1.0"
+   flutter:
+     dependency: "direct main"
+     description: flutter
+     source: sdk
+     version: "0.0.0"
+   flutter_test:
+     dependency: "direct dev"
+     description: flutter
+     source: sdk
+     version: "0.0.0"
+   get:
+     dependency: "direct main"
+     description:
+       path: ".."
+       relative: true
+     source: path
+     version: "3.10.2"
+   http_parser:
+     dependency: transitive
+     description:
+       name: http_parser
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "3.1.4"
+   matcher:
+     dependency: transitive
+     description:
+       name: matcher
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "0.12.8"
+   meta:
+     dependency: transitive
+     description:
+       name: meta
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.1.8"
+   path:
+     dependency: transitive
+     description:
+       name: path
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.7.0"
+   sky_engine:
+     dependency: transitive
+     description: flutter
+     source: sdk
+     version: "0.0.99"
+   source_span:
+     dependency: transitive
+     description:
+       name: source_span
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.7.0"
+   stack_trace:
+     dependency: transitive
+     description:
+       name: stack_trace
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.9.5"
+   stream_channel:
+     dependency: transitive
+     description:
+       name: stream_channel
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "2.0.0"
+   string_scanner:
+     dependency: transitive
+     description:
+       name: string_scanner
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.0.5"
+   term_glyph:
+     dependency: transitive
+     description:
+       name: term_glyph
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.1.0"
+   test_api:
+     dependency: transitive
+     description:
+       name: test_api
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "0.2.17"
+   typed_data:
+     dependency: transitive
+     description:
+       name: typed_data
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.2.0"
+   vector_math:
+     dependency: transitive
+     description:
+       name: vector_math
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "2.0.8"
+ sdks:
+   dart: ">=2.9.0-14.0.dev <3.0.0"
--- a/packages/get_navigation/lib/src/root/root_widget.dart
View file @d1d76cc
+++ b/packages/get_navigation/lib/src/root/root_widget.dart
View file @d1d76cc
@@ -20,6 +20,7 @@ class GetMaterialApp extends StatelessWidget {
     this.builder,
     this.translationsKeys,
     this.translations,
+     this.textDirection,
     this.title = '',
     this.onGenerateTitle,
     this.color,
@@ -84,6 +85,7 @@ class GetMaterialApp extends StatelessWidget {
   final Color color;
   final Map<String, Map<String, String>> translationsKeys;
   final Translations translations;
+   final TextDirection textDirection;
   final Locale locale;
   final Locale fallbackLocale;
   final Iterable<LocalizationsDelegate<dynamic>> localizationsDelegates;
@@ -231,9 +233,10 @@ class GetMaterialApp extends StatelessWidget {
               ..addAll(navigatorObservers)),
             builder: (context, child) {
               return Directionality(
-                 textDirection: rtlLanguages.contains(Get.locale?.languageCode)
-                     ? TextDirection.rtl
-                     : TextDirection.ltr,
+                 textDirection: textDirection ??
+                     (rtlLanguages.contains(Get.locale?.languageCode)
+                         ? TextDirection.rtl
+                         : TextDirection.ltr),
                 child: builder == null ? child : builder(context, child),
               );
             },
--- a/pubspec.lock 0 → 100644
View file @d1d76cc
+++ b/pubspec.lock 0 → 100644
View file @d1d76cc
+ # Generated by pub
+ # See https://dart.dev/tools/pub/glossary#lockfile
+ packages:
+   async:
+     dependency: transitive
+     description:
+       name: async
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "2.4.2"
+   boolean_selector:
+     dependency: transitive
+     description:
+       name: boolean_selector
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "2.0.0"
+   characters:
+     dependency: transitive
+     description:
+       name: characters
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.0.0"
+   charcode:
+     dependency: transitive
+     description:
+       name: charcode
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.1.3"
+   clock:
+     dependency: transitive
+     description:
+       name: clock
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.0.1"
+   collection:
+     dependency: transitive
+     description:
+       name: collection
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.14.13"
+   effective_dart:
+     dependency: "direct dev"
+     description:
+       name: effective_dart
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.2.4"
+   fake_async:
+     dependency: transitive
+     description:
+       name: fake_async
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.1.0"
+   flutter:
+     dependency: "direct main"
+     description: flutter
+     source: sdk
+     version: "0.0.0"
+   flutter_test:
+     dependency: "direct dev"
+     description: flutter
+     source: sdk
+     version: "0.0.0"
+   matcher:
+     dependency: transitive
+     description:
+       name: matcher
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "0.12.8"
+   meta:
+     dependency: transitive
+     description:
+       name: meta
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.1.8"
+   path:
+     dependency: transitive
+     description:
+       name: path
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.7.0"
+   sky_engine:
+     dependency: transitive
+     description: flutter
+     source: sdk
+     version: "0.0.99"
+   source_span:
+     dependency: transitive
+     description:
+       name: source_span
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.7.0"
+   stack_trace:
+     dependency: transitive
+     description:
+       name: stack_trace
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.9.5"
+   stream_channel:
+     dependency: transitive
+     description:
+       name: stream_channel
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "2.0.0"
+   string_scanner:
+     dependency: transitive
+     description:
+       name: string_scanner
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.0.5"
+   term_glyph:
+     dependency: transitive
+     description:
+       name: term_glyph
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.1.0"
+   test_api:
+     dependency: transitive
+     description:
+       name: test_api
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "0.2.17"
+   typed_data:
+     dependency: transitive
+     description:
+       name: typed_data
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "1.2.0"
+   vector_math:
+     dependency: transitive
+     description:
+       name: vector_math
+       url: "https://pub.dartlang.org"
+     source: hosted
+     version: "2.0.8"
+ sdks:
+   dart: ">=2.9.0-14.0.dev <3.0.0"