projects/aports·blob master · refs

362 lines · 12.9 KiB

1diff --git a/lib/src/f_wallet_app.dart b/lib/src/f_wallet_app.dart
2index 4d963aa..abc6159 100644
3--- a/lib/src/f_wallet_app.dart
4+++ b/lib/src/f_wallet_app.dart
5@@ -1,11 +1,11 @@
6 import 'package:flutter/material.dart';
7
8 import 'package:dynamic_color/dynamic_color.dart';
9-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
10 import 'package:flutter_localizations/flutter_localizations.dart';
11 import 'package:hive_flutter/hive_flutter.dart';
12 import 'package:provider/provider.dart';
13
14+import 'package:f_wallet/l10n/app_localizations.dart';
15 import 'package:f_wallet/src/utils/f_wallet_theme.dart';
16 import 'package:f_wallet/src/utils/hive_boxes.dart';
17 import 'package:f_wallet/src/utils/pass_manager.dart';
18diff --git a/lib/src/pages/pass_details/components/transit_type_icon.dart b/lib/src/pages/pass_details/components/transit_type_icon.dart
19index ef08df1..ebcf08f 100644
20--- a/lib/src/pages/pass_details/components/transit_type_icon.dart
21+++ b/lib/src/pages/pass_details/components/transit_type_icon.dart
22@@ -1,8 +1,9 @@
23 import 'package:flutter/material.dart';
24
25-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
26 import 'package:pkpass/pkpass.dart';
27
28+import 'package:f_wallet/l10n/app_localizations.dart';
29+
30 class TransitTypeIcon extends StatelessWidget {
31 final TransitType? transitType;
32 final DateTime? relevantDate;
33diff --git a/lib/src/pages/pass_details/pass_details.dart b/lib/src/pages/pass_details/pass_details.dart
34index 3ddf0e7..c8d8149 100644
35--- a/lib/src/pages/pass_details/pass_details.dart
36+++ b/lib/src/pages/pass_details/pass_details.dart
37@@ -5,12 +5,12 @@ import 'package:flutter/foundation.dart';
38 import 'package:flutter/material.dart';
39
40 import 'package:file_selector/file_selector.dart';
41-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
42 import 'package:path_provider/path_provider.dart';
43 import 'package:pkpass/pkpass.dart';
44 import 'package:share_plus/share_plus.dart';
45 import 'package:url_launcher/url_launcher.dart';
46
47+import 'package:f_wallet/l10n/app_localizations.dart';
48 import 'package:f_wallet/src/pages/pass_details/pass_details_view.dart';
49 import 'package:f_wallet/src/utils/hive_boxes.dart';
50 import 'package:f_wallet/src/utils/locale_locle.dart';
51diff --git a/lib/src/pages/pass_details/pass_details_view.dart b/lib/src/pages/pass_details/pass_details_view.dart
52index f3cef4d..55d8759 100644
53--- a/lib/src/pages/pass_details/pass_details_view.dart
54+++ b/lib/src/pages/pass_details/pass_details_view.dart
55@@ -1,8 +1,8 @@
56 import 'package:flutter/material.dart';
57
58-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
59 import 'package:pkpass/pkpass.dart';
60
61+import 'package:f_wallet/l10n/app_localizations.dart';
62 import 'package:f_wallet/src/pages/pass_details/components/barcode.dart';
63 import 'package:f_wallet/src/pages/pass_details/pass_details.dart';
64 import 'package:f_wallet/src/utils/locale_locle.dart';
65diff --git a/lib/src/pages/pass_list/components/pass_tab_destination.dart b/lib/src/pages/pass_list/components/pass_tab_destination.dart
66index 01cc621..05ca088 100644
67--- a/lib/src/pages/pass_list/components/pass_tab_destination.dart
68+++ b/lib/src/pages/pass_list/components/pass_tab_destination.dart
69@@ -1,7 +1,6 @@
70 import 'package:flutter/material.dart';
71
72-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
73-
74+import 'package:f_wallet/l10n/app_localizations.dart';
75 import 'pass_tabs.dart';
76
77 class PassTabDestination extends StatelessWidget {
78diff --git a/lib/src/pages/pass_list/pass_list.dart b/lib/src/pages/pass_list/pass_list.dart
79index 839a6ab..59e3c9e 100644
80--- a/lib/src/pages/pass_list/pass_list.dart
81+++ b/lib/src/pages/pass_list/pass_list.dart
82@@ -7,13 +7,13 @@ import 'package:flutter/material.dart';
83 import 'package:flutter/services.dart';
84
85 import 'package:file_selector/file_selector.dart';
86-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
87 import 'package:flutter_sharing_intent/flutter_sharing_intent.dart';
88 import 'package:flutter_sharing_intent/model/sharing_file.dart';
89 import 'package:go_router/go_router.dart';
90 import 'package:pkpass/pkpass.dart';
91 import 'package:url_launcher/link.dart';
92
93+import 'package:f_wallet/l10n/app_localizations.dart';
94 import 'package:f_wallet/src/utils/args_parser.dart';
95 import 'package:f_wallet/src/utils/pass_manager.dart';
96 import 'package:f_wallet/src/utils/version.dart';
97diff --git a/lib/src/pages/pass_list/pass_list_view.dart b/lib/src/pages/pass_list/pass_list_view.dart
98index 742cd59..c188799 100644
99--- a/lib/src/pages/pass_list/pass_list_view.dart
100+++ b/lib/src/pages/pass_list/pass_list_view.dart
101@@ -1,9 +1,9 @@
102 import 'package:flutter/material.dart';
103
104 import 'package:animations/animations.dart';
105-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
106 import 'package:provider/provider.dart';
107
108+import 'package:f_wallet/l10n/app_localizations.dart';
109 import 'package:f_wallet/src/pages/pass_list/components/pass_preview.dart';
110 import 'package:f_wallet/src/pages/pass_list/pass_list.dart';
111 import 'package:f_wallet/src/utils/pass_manager.dart';
112diff --git a/lib/src/widgets/language_button.dart b/lib/src/widgets/language_button.dart
113index beb2435..c6a09e6 100644
114--- a/lib/src/widgets/language_button.dart
115+++ b/lib/src/widgets/language_button.dart
116@@ -1,8 +1,8 @@
117 import 'package:flutter/material.dart';
118
119-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
120 import 'package:hive_flutter/hive_flutter.dart';
121
122+import 'package:f_wallet/l10n/app_localizations.dart';
123 import 'package:f_wallet/src/utils/hive_boxes.dart';
124 import 'language_dialog.dart';
125
126diff --git a/lib/src/widgets/language_dialog.dart b/lib/src/widgets/language_dialog.dart
127index b205dac..683c54e 100644
128--- a/lib/src/widgets/language_dialog.dart
129+++ b/lib/src/widgets/language_dialog.dart
130@@ -1,8 +1,9 @@
131 import 'package:flutter/material.dart';
132
133-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
134 import 'package:locale_names/locale_names.dart';
135
136+import 'package:f_wallet/l10n/app_localizations.dart';
137+
138 class LanguageDialog extends StatelessWidget {
139 const LanguageDialog({super.key});
140
141diff --git a/lib/src/widgets/theme_button.dart b/lib/src/widgets/theme_button.dart
142index 379ff27..261283a 100644
143--- a/lib/src/widgets/theme_button.dart
144+++ b/lib/src/widgets/theme_button.dart
145@@ -1,8 +1,8 @@
146 import 'package:flutter/material.dart';
147
148-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
149 import 'package:hive_flutter/hive_flutter.dart';
150
151+import 'package:f_wallet/l10n/app_localizations.dart';
152 import 'package:f_wallet/src/utils/hive_boxes.dart';
153
154 class ThemeButton extends StatelessWidget {
155--- ./pubspec.lock.orig
156+++ ./pubspec.lock
157@@ -61,10 +61,10 @@
158 dependency: transitive
159 description:
160 name: characters
161- sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
162+ sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
163 url: "https://pub.dev"
164 source: hosted
165- version: "1.3.0"
166+ version: "1.4.0"
167 charset:
168 dependency: transitive
169 description:
170@@ -93,18 +93,18 @@
171 dependency: transitive
172 description:
173 name: clock
174- sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
175+ sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
176 url: "https://pub.dev"
177 source: hosted
178- version: "1.1.1"
179+ version: "1.1.2"
180 collection:
181 dependency: transitive
182 description:
183 name: collection
184- sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
185+ sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
186 url: "https://pub.dev"
187 source: hosted
188- version: "1.18.0"
189+ version: "1.19.1"
190 cross_file:
191 dependency: transitive
192 description:
193@@ -149,10 +149,10 @@
194 dependency: transitive
195 description:
196 name: fake_async
197- sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
198+ sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
199 url: "https://pub.dev"
200 source: hosted
201- version: "1.3.1"
202+ version: "1.3.3"
203 ffi:
204 dependency: transitive
205 description:
206@@ -409,10 +409,10 @@
207 dependency: "direct main"
208 description:
209 name: intl
210- sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
211+ sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
212 url: "https://pub.dev"
213 source: hosted
214- version: "0.19.0"
215+ version: "0.20.2"
216 js:
217 dependency: transitive
218 description:
219@@ -433,26 +433,26 @@
220 dependency: transitive
221 description:
222 name: leak_tracker
223- sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
224+ sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
225 url: "https://pub.dev"
226 source: hosted
227- version: "10.0.4"
228+ version: "11.0.2"
229 leak_tracker_flutter_testing:
230 dependency: transitive
231 description:
232 name: leak_tracker_flutter_testing
233- sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
234+ sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
235 url: "https://pub.dev"
236 source: hosted
237- version: "3.0.3"
238+ version: "3.0.10"
239 leak_tracker_testing:
240 dependency: transitive
241 description:
242 name: leak_tracker_testing
243- sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
244+ sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
245 url: "https://pub.dev"
246 source: hosted
247- version: "3.0.1"
248+ version: "3.0.2"
249 linkify:
250 dependency: transitive
251 description:
252@@ -489,26 +489,26 @@
253 dependency: transitive
254 description:
255 name: matcher
256- sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
257+ sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
258 url: "https://pub.dev"
259 source: hosted
260- version: "0.12.16+1"
261+ version: "0.12.17"
262 material_color_utilities:
263 dependency: transitive
264 description:
265 name: material_color_utilities
266- sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
267+ sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
268 url: "https://pub.dev"
269 source: hosted
270- version: "0.8.0"
271+ version: "0.11.1"
272 meta:
273 dependency: transitive
274 description:
275 name: meta
276- sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
277+ sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
278 url: "https://pub.dev"
279 source: hosted
280- version: "1.12.0"
281+ version: "1.17.0"
282 mime:
283 dependency: transitive
284 description:
285@@ -529,10 +529,10 @@
286 dependency: transitive
287 description:
288 name: path
289- sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
290+ sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
291 url: "https://pub.dev"
292 source: hosted
293- version: "1.9.0"
294+ version: "1.9.1"
295 path_provider:
296 dependency: "direct main"
297 description:
298@@ -649,7 +649,7 @@
299 dependency: transitive
300 description: flutter
301 source: sdk
302- version: "0.0.99"
303+ version: "0.0.0"
304 source_span:
305 dependency: transitive
306 description:
307@@ -670,18 +670,18 @@
308 dependency: transitive
309 description:
310 name: stack_trace
311- sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
312+ sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
313 url: "https://pub.dev"
314 source: hosted
315- version: "1.11.1"
316+ version: "1.12.1"
317 stream_channel:
318 dependency: transitive
319 description:
320 name: stream_channel
321- sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
322+ sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
323 url: "https://pub.dev"
324 source: hosted
325- version: "2.1.2"
326+ version: "2.1.4"
327 string_scanner:
328 dependency: transitive
329 description:
330@@ -702,10 +702,10 @@
331 dependency: transitive
332 description:
333 name: test_api
334- sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
335+ sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
336 url: "https://pub.dev"
337 source: hosted
338- version: "0.7.0"
339+ version: "0.7.7"
340 tint:
341 dependency: transitive
342 description:
343@@ -798,10 +798,10 @@
344 dependency: transitive
345 description:
346 name: vector_math
347- sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
348+ sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
349 url: "https://pub.dev"
350 source: hosted
351- version: "2.1.4"
352+ version: "2.2.0"
353 vm_service:
354 dependency: transitive
355 description:
356@@ -851,5 +851,5 @@
357 source: hosted
358 version: "3.1.2"
359 sdks:
360- dart: ">=3.4.0 <4.0.0"
361+ dart: ">=3.8.0-0 <4.0.0"
362 flutter: ">=3.22.0"