flutter_package / fluttertpc_get

Go to a project
Toggle navigation Toggle navigation pinning
Renat Fakhrutdinov
Committed by GitHub
c3ce4240 2 parents 497fb74c 4eaf7b10

Merge pull request #9 from jonataslaw/master 

update
Inline Side-by-side
Showing 20 changed files with 116 additions and 237 deletions
1 -# Generated by pub  
2 -# See https://dart.dev/tools/pub/glossary#lockfile  
3 -packages:  
4 - async:  
5 - dependency: transitive  
6 - description:  
7 - name: async  
8 - url: "https://pub.dartlang.org"  
9 - source: hosted  
10 - version: "2.4.2"  
11 - boolean_selector:  
12 - dependency: transitive  
13 - description:  
14 - name: boolean_selector  
15 - url: "https://pub.dartlang.org"  
16 - source: hosted  
17 - version: "2.0.0"  
18 - characters:  
19 - dependency: transitive  
20 - description:  
21 - name: characters  
22 - url: "https://pub.dartlang.org"  
23 - source: hosted  
24 - version: "1.0.0"  
25 - charcode:  
26 - dependency: transitive  
27 - description:  
28 - name: charcode  
29 - url: "https://pub.dartlang.org"  
30 - source: hosted  
31 - version: "1.1.3"  
32 - clock:  
33 - dependency: transitive  
34 - description:  
35 - name: clock  
36 - url: "https://pub.dartlang.org"  
37 - source: hosted  
38 - version: "1.0.1"  
39 - collection:  
40 - dependency: transitive  
41 - description:  
42 - name: collection  
43 - url: "https://pub.dartlang.org"  
44 - source: hosted  
45 - version: "1.14.13"  
46 - dio:  
47 - dependency: "direct main"  
48 - description:  
49 - name: dio  
50 - url: "https://pub.dartlang.org"  
51 - source: hosted  
52 - version: "3.0.10"  
53 - fake_async:  
54 - dependency: transitive  
55 - description:  
56 - name: fake_async  
57 - url: "https://pub.dartlang.org"  
58 - source: hosted  
59 - version: "1.1.0"  
60 - flutter:  
61 - dependency: "direct main"  
62 - description: flutter  
63 - source: sdk  
64 - version: "0.0.0"  
65 - flutter_test:  
66 - dependency: "direct dev"  
67 - description: flutter  
68 - source: sdk  
69 - version: "0.0.0"  
70 - get:  
71 - dependency: "direct main"  
72 - description:  
73 - path: ".."  
74 - relative: true  
75 - source: path  
76 - version: "3.10.2"  
77 - http_parser:  
78 - dependency: transitive  
79 - description:  
80 - name: http_parser  
81 - url: "https://pub.dartlang.org"  
82 - source: hosted  
83 - version: "3.1.4"  
84 - matcher:  
85 - dependency: transitive  
86 - description:  
87 - name: matcher  
88 - url: "https://pub.dartlang.org"  
89 - source: hosted  
90 - version: "0.12.8"  
91 - meta:  
92 - dependency: transitive  
93 - description:  
94 - name: meta  
95 - url: "https://pub.dartlang.org"  
96 - source: hosted  
97 - version: "1.1.8"  
98 - path:  
99 - dependency: transitive  
100 - description:  
101 - name: path  
102 - url: "https://pub.dartlang.org"  
103 - source: hosted  
104 - version: "1.7.0"  
105 - sky_engine:  
106 - dependency: transitive  
107 - description: flutter  
108 - source: sdk  
109 - version: "0.0.99"  
110 - source_span:  
111 - dependency: transitive  
112 - description:  
113 - name: source_span  
114 - url: "https://pub.dartlang.org"  
115 - source: hosted  
116 - version: "1.7.0"  
117 - stack_trace:  
118 - dependency: transitive  
119 - description:  
120 - name: stack_trace  
121 - url: "https://pub.dartlang.org"  
122 - source: hosted  
123 - version: "1.9.5"  
124 - stream_channel:  
125 - dependency: transitive  
126 - description:  
127 - name: stream_channel  
128 - url: "https://pub.dartlang.org"  
129 - source: hosted  
130 - version: "2.0.0"  
131 - string_scanner:  
132 - dependency: transitive  
133 - description:  
134 - name: string_scanner  
135 - url: "https://pub.dartlang.org"  
136 - source: hosted  
137 - version: "1.0.5"  
138 - term_glyph:  
139 - dependency: transitive  
140 - description:  
141 - name: term_glyph  
142 - url: "https://pub.dartlang.org"  
143 - source: hosted  
144 - version: "1.1.0"  
145 - test_api:  
146 - dependency: transitive  
147 - description:  
148 - name: test_api  
149 - url: "https://pub.dartlang.org"  
150 - source: hosted  
151 - version: "0.2.17"  
152 - typed_data:  
153 - dependency: transitive  
154 - description:  
155 - name: typed_data  
156 - url: "https://pub.dartlang.org"  
157 - source: hosted  
158 - version: "1.2.0"  
159 - vector_math:  
160 - dependency: transitive  
161 - description:  
162 - name: vector_math  
163 - url: "https://pub.dartlang.org"  
164 - source: hosted  
165 - version: "2.0.8"  
166 -sdks:  
167 - dart: ">=2.9.0-14.0.dev <3.0.0"  
@@ -27,9 +27,16 @@ dependencies: @@ -27,9 +27,16 @@ dependencies:
27 # The following adds the Cupertino Icons font to your application. 27 # The following adds the Cupertino Icons font to your application.
28 # Use with the CupertinoIcons class for iOS style icons. 28 # Use with the CupertinoIcons class for iOS style icons.
29 get: 29 get:
30 - path: ../ 30 + git:
  31 + url: git://github.com/jonataslaw/getx.git
  32 + path: getx
  33 + ref: master
31 dio: ^3.0.9 34 dio: ^3.0.9
32 - get_test: ^3.11.0 35 + get_test:
  36 + git:
  37 + url: git://github.com/jonataslaw/getx.git
  38 + path: packages/get_test
  39 + ref: master
33 dev_dependencies: 40 dev_dependencies:
34 flutter_test: 41 flutter_test:
35 sdk: flutter 42 sdk: flutter
@@ -6,3 +6,4 @@ export 'package:get_instance/get_instance.dart'; @@ -6,3 +6,4 @@ export 'package:get_instance/get_instance.dart';
6 export 'package:get_navigation/get_navigation.dart'; 6 export 'package:get_navigation/get_navigation.dart';
7 export 'package:get_utils/get_utils.dart'; 7 export 'package:get_utils/get_utils.dart';
8 export 'package:get_rx/get_rx.dart'; 8 export 'package:get_rx/get_rx.dart';
  9 +export 'package:get_test/get_test.dart';
  1 +library get;
  2 +
1 export 'package:get_instance/get_instance.dart'; 3 export 'package:get_instance/get_instance.dart';
  1 +library get;
  2 +
1 export 'package:get_navigation/get_navigation.dart'; 3 export 'package:get_navigation/get_navigation.dart';
  1 +library get;
  2 +
1 export 'package:get_rx/get_rx.dart'; 3 export 'package:get_rx/get_rx.dart';
2 export 'package:get_state_manager/get_state_manager.dart'; 4 export 'package:get_state_manager/get_state_manager.dart';
  1 +library get;
  2 +
1 export 'package:get_utils/get_utils.dart'; 3 export 'package:get_utils/get_utils.dart';
@@ -9,12 +9,41 @@ environment: @@ -9,12 +9,41 @@ environment:
9 dependencies: 9 dependencies:
10 flutter: 10 flutter:
11 sdk: flutter 11 sdk: flutter
12 - get_core: ">=3.10.2 <4.0.0"  
13 - get_instance: ">=3.10.2 <4.0.0"  
14 - get_rx: ">=3.10.2 <4.0.0"  
15 - get_state_manager: ">=3.10.2 <4.0.0"  
16 - get_navigation: ">=3.10.2 <4.0.0"  
17 - get_utils: ">=3.10.2 <4.0.0" 12 + get_core:
  13 + git:
  14 + url: git://github.com/jonataslaw/getx.git
  15 + path: packages/get_core
  16 + ref: master
  17 + get_instance:
  18 + git:
  19 + url: git://github.com/jonataslaw/getx.git
  20 + path: packages/get_instance
  21 + ref: master
  22 + get_rx:
  23 + git:
  24 + url: git://github.com/jonataslaw/getx.git
  25 + path: packages/get_rx
  26 + ref: master
  27 + get_state_manager:
  28 + git:
  29 + url: git://github.com/jonataslaw/getx.git
  30 + path: packages/get_state_manager
  31 + ref: master
  32 + get_navigation:
  33 + git:
  34 + url: git://github.com/jonataslaw/getx.git
  35 + path: packages/get_navigation
  36 + ref: master
  37 + get_utils:
  38 + git:
  39 + url: git://github.com/jonataslaw/getx.git
  40 + path: packages/get_utils
  41 + ref: master
  42 + get_test:
  43 + git:
  44 + url: git://github.com/jonataslaw/getx.git
  45 + path: packages/get_test
  46 + ref: master
18 47
19 48
20 dev_dependencies: 49 dev_dependencies:
@@ -9,7 +9,10 @@ environment: @@ -9,7 +9,10 @@ environment:
9 9
10 dependencies: 10 dependencies:
11 get_core: 11 get_core:
12 - path: ../get_core 12 + git:
  13 + url: git://github.com/jonataslaw/getx.git
  14 + path: packages/get_core
  15 + ref: master
13 16
14 dev_dependencies: 17 dev_dependencies:
15 test: ">=1.0.0 <2.0.0" 18 test: ">=1.0.0 <2.0.0"
@@ -206,40 +206,6 @@ class GetBar<T extends Object> extends StatefulWidget { @@ -206,40 +206,6 @@ class GetBar<T extends Object> extends StatefulWidget {
206 return await Get.key.currentState.push(_snackRoute); 206 return await Get.key.currentState.push(_snackRoute);
207 } 207 }
208 208
209 - /// Dismisses the snack causing is to return a future containing [result].  
210 - /// When this future finishes, it is guaranteed that Snack was dismissed.  
211 - Future<T> dismiss([T result]) async {  
212 - // If route was never initialized, do nothing  
213 - if (_snackRoute == null) {  
214 - return null;  
215 - }  
216 -  
217 - if (_snackRoute.isCurrent) {  
218 - _snackRoute.navigator.pop(result);  
219 - return _snackRoute.completed;  
220 - } else if (_snackRoute.isActive) {  
221 - // removeRoute is called every time you dismiss a Snack that is not  
222 - // the top route.  
223 - // It will not animate back and listeners will not detect  
224 - // SnackbarStatus.CLOSING or SnackbarStatus.CLOSED  
225 - // To avoid this, always make sure that Snack is the top  
226 - // route when it is being dismissed  
227 - _snackRoute.navigator.removeRoute(_snackRoute);  
228 - }  
229 -  
230 - return null;  
231 - }  
232 -  
233 - /// Checks if the snack is visible  
234 - bool isShowing() {  
235 - return _snackRoute?.currentStatus == SnackbarStatus.OPEN;  
236 - }  
237 -  
238 - /// Checks if the snack is dismissed  
239 - bool isDismissed() {  
240 - return _snackRoute?.currentStatus == SnackbarStatus.CLOSED;  
241 - }  
242 -  
243 @override 209 @override
244 State createState() { 210 State createState() {
245 return _GetBarState<T>(); 211 return _GetBarState<T>();
@@ -273,8 +239,9 @@ class _GetBarState<K extends Object> extends State<GetBar> @@ -273,8 +239,9 @@ class _GetBarState<K extends Object> extends State<GetBar>
273 ((widget.userInputForm != null || 239 ((widget.userInputForm != null ||
274 ((widget.message != null && widget.message.isNotEmpty) || 240 ((widget.message != null && widget.message.isNotEmpty) ||
275 widget.messageText != null))), 241 widget.messageText != null))),
276 - // ignore: lines_longer_than_80_chars  
277 - "A message is mandatory if you are not using userInputForm. Set either a message or messageText"); 242 + """
  243 +A message is mandatory if you are not using userInputForm.
  244 +Set either a message or messageText""");
278 245
279 _isTitlePresent = (widget.title != null || widget.titleText != null); 246 _isTitlePresent = (widget.title != null || widget.titleText != null);
280 _messageTopMargin = _isTitlePresent ? 6.0 : widget.padding.top; 247 _messageTopMargin = _isTitlePresent ? 6.0 : widget.padding.top;
1 import 'dart:async'; 1 import 'dart:async';
2 import 'dart:ui'; 2 import 'dart:ui';
3 -  
4 import 'package:flutter/widgets.dart'; 3 import 'package:flutter/widgets.dart';
5 - 4 +import '../../get_navigation.dart';
6 import 'snack.dart'; 5 import 'snack.dart';
7 6
8 class SnackRoute<T> extends OverlayRoute<T> { 7 class SnackRoute<T> extends OverlayRoute<T> {
@@ -65,7 +64,7 @@ class SnackRoute<T> extends OverlayRoute<T> { @@ -65,7 +64,7 @@ class SnackRoute<T> extends OverlayRoute<T> {
65 OverlayEntry( 64 OverlayEntry(
66 builder: (context) { 65 builder: (context) {
67 return GestureDetector( 66 return GestureDetector(
68 - onTap: snack.isDismissible ? () => snack.dismiss() : null, 67 + onTap: snack.isDismissible ? Get.back : null,
69 child: AnimatedBuilder( 68 child: AnimatedBuilder(
70 animation: _filterBlurAnimation, 69 animation: _filterBlurAnimation,
71 builder: (context, child) { 70 builder: (context, child) {
@@ -11,11 +11,20 @@ dependencies: @@ -11,11 +11,20 @@ dependencies:
11 flutter: 11 flutter:
12 sdk: flutter 12 sdk: flutter
13 get_state_manager: 13 get_state_manager:
14 - path: ../get_state_manager 14 + git:
  15 + url: git://github.com/jonataslaw/getx.git
  16 + path: packages/get_state_manager
  17 + ref: master
15 get_core: 18 get_core:
16 - path: ../get_core 19 + git:
  20 + url: git://github.com/jonataslaw/getx.git
  21 + path: packages/get_core
  22 + ref: master
17 get_utils: 23 get_utils:
18 - path: ../get_utils 24 + git:
  25 + url: git://github.com/jonataslaw/getx.git
  26 + path: packages/get_utils
  27 + ref: master
19 28
20 dev_dependencies: 29 dev_dependencies:
21 flutter_test: 30 flutter_test:
@@ -9,9 +9,15 @@ environment: @@ -9,9 +9,15 @@ environment:
9 9
10 dependencies: 10 dependencies:
11 get_core: 11 get_core:
12 - path: ../get_core 12 + git:
  13 + url: git://github.com/jonataslaw/getx.git
  14 + path: packages/get_core
  15 + ref: master
13 get_instance: 16 get_instance:
14 - path: ../get_instance 17 + git:
  18 + url: git://github.com/jonataslaw/getx.git
  19 + path: packages/get_instance
  20 + ref: master
15 meta: ">=1.1.0 <2.0.0" 21 meta: ">=1.1.0 <2.0.0"
16 22
17 23
@@ -11,11 +11,20 @@ dependencies: @@ -11,11 +11,20 @@ dependencies:
11 flutter: 11 flutter:
12 sdk: flutter 12 sdk: flutter
13 get_rx: 13 get_rx:
14 - path: ../get_rx 14 + git:
  15 + url: git://github.com/jonataslaw/getx.git
  16 + path: packages/get_rx
  17 + ref: master
15 get_instance: 18 get_instance:
16 - path: ../get_instance 19 + git:
  20 + url: git://github.com/jonataslaw/getx.git
  21 + path: packages/get_instance
  22 + ref: master
17 get_core: 23 get_core:
18 - path: ../get_core 24 + git:
  25 + url: git://github.com/jonataslaw/getx.git
  26 + path: packages/get_core
  27 + ref: master
19 28
20 dev_dependencies: 29 dev_dependencies:
21 flutter_test: 30 flutter_test:
@@ -26,6 +26,7 @@ dependencies: @@ -26,6 +26,7 @@ dependencies:
26 get_test: 26 get_test:
27 path: ../ 27 path: ../
28 get: 28 get:
  29 + path: ../../../getx
29 30
30 31
31 # The following adds the Cupertino Icons font to your application. 32 # The following adds the Cupertino Icons font to your application.
@@ -11,8 +11,16 @@ dependencies: @@ -11,8 +11,16 @@ dependencies:
11 flutter: 11 flutter:
12 sdk: flutter 12 sdk: flutter
13 mockito: ">=3.0.0 <4.0.0" 13 mockito: ">=3.0.0 <4.0.0"
14 - get_navigation: ">=3.10.2 <4.0.0"  
15 - get_state_manager: ">=3.10.2 <4.0.0" 14 + get_navigation:
  15 + git:
  16 + url: git://github.com/jonataslaw/getx.git
  17 + path: packages/get_navigation
  18 + ref: master
  19 + get_state_manager:
  20 + git:
  21 + url: git://github.com/jonataslaw/getx.git
  22 + path: packages/get_state_manager
  23 + ref: master
16 image_test_utils: ">=1.0.0 <2.0.0" 24 image_test_utils: ">=1.0.0 <2.0.0"
17 flutter_test: 25 flutter_test:
18 sdk: flutter 26 sdk: flutter
1 -import 'dart:ui'; 1 +import 'dart:async';
2 2
3 /// Duration utilities. 3 /// Duration utilities.
4 extension GetDurationUtils on Duration { 4 extension GetDurationUtils on Duration {
@@ -15,5 +15,5 @@ extension GetDurationUtils on Duration { @@ -15,5 +15,5 @@ extension GetDurationUtils on Duration {
15 /// await 0.7.seconds.delay(() { 15 /// await 0.7.seconds.delay(() {
16 /// } 16 /// }
17 ///``` 17 ///```
18 - Future delay([VoidCallback callback]) async => Future.delayed(this, callback); 18 + Future delay([FutureOr callback()]) async => Future.delayed(this, callback);
19 } 19 }
@@ -66,13 +66,9 @@ extension LocalesIntl on GetInterface { @@ -66,13 +66,9 @@ extension LocalesIntl on GetInterface {
66 66
67 Locale get fallbackLocale => _intlHost.fallbackLocale; 67 Locale get fallbackLocale => _intlHost.fallbackLocale;
68 68
69 - set locale(Locale newLocale) {  
70 - _intlHost.locale = newLocale;  
71 - } 69 + set locale(Locale newLocale) => _intlHost.locale = newLocale;
72 70
73 - set fallbackLocale(Locale newLocale) {  
74 - _intlHost.fallbackLocale = newLocale;  
75 - } 71 + set fallbackLocale(Locale newLocale) => _intlHost.fallbackLocale = newLocale;
76 72
77 Map<String, Map<String, String>> get translations => _intlHost.translations; 73 Map<String, Map<String, String>> get translations => _intlHost.translations;
78 74
1 -import 'dart:ui';  
2 - 1 +import 'dart:async';
3 import '../get_utils/get_utils.dart'; 2 import '../get_utils/get_utils.dart';
4 3
5 extension GetNumUtils on num { 4 extension GetNumUtils on num {
@@ -24,7 +23,7 @@ extension GetNumUtils on num { @@ -24,7 +23,7 @@ extension GetNumUtils on num {
24 /// print('currently running callback 1.2sec'); 23 /// print('currently running callback 1.2sec');
25 /// } 24 /// }
26 ///``` 25 ///```
27 - Future delay([VoidCallback callback]) async => Future.delayed( 26 + Future delay([FutureOr callback()]) async => Future.delayed(
28 Duration(milliseconds: (this * 1000).round()), 27 Duration(milliseconds: (this * 1000).round()),
29 callback, 28 callback,
30 ); 29 );
@@ -11,7 +11,11 @@ dependencies: @@ -11,7 +11,11 @@ dependencies:
11 flutter: 11 flutter:
12 sdk: flutter 12 sdk: flutter
13 get_core: 13 get_core:
14 - path: ../get_core 14 + git:
  15 + url: git://github.com/jonataslaw/getx.git
  16 + path: packages/get_core
  17 + ref: master
  18 + meta: ">=1.1.0 <2.0.0"
15 19
16 dev_dependencies: 20 dev_dependencies:
17 flutter_test: 21 flutter_test: