Skip to content

Commit 4f34145

Browse files
joaopmarquesinijoaopmarquesini
authored
Merge pull request #343 from LittleLightForDestiny/flutter_downgrade
Downgrades flutter to 3.19.6
2 parents 4ab0856 + 752b108 commit 4f34145

File tree

8 files changed

+74
-82
lines changed

8 files changed

+74
-82
lines changed

‎.github/workflows/publish-google-play.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: Setup Flutter
7575
uses: subosito/flutter-action@v2
7676
with:
77-
flutter-version: "3.22.1"
77+
flutter-version: "3.19.6"
7878

7979
- name: Create assets/_env
8080
run: |

‎.github/workflows/publish-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
- name: Setup Flutter
115115
uses: subosito/flutter-action@v2
116116
with:
117-
flutter-version: "3.22.1"
117+
flutter-version: "3.19.6"
118118

119119
- name: Create assets/_env
120120
run: |

‎.github/workflows/publish-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
- name: Setup Flutter
115115
uses: subosito/flutter-action@v2
116116
with:
117-
flutter-version: "3.22.1"
117+
flutter-version: "3.19.6"
118118

119119
- name: Create assets/_env
120120
run: |

‎.github/workflows/publish-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Setup Flutter
6666
uses: subosito/flutter-action@v2
6767
with:
68-
flutter-version: "3.22.1"
68+
flutter-version: "3.19.6"
6969

7070
- name: Create assets/_env
7171
shell: bash

‎lib/core/theme/littlelight.theme.dart

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -310,23 +310,25 @@ class LittleLightThemeData {
310310
surface: _surface,
311311
primary: _primary,
312312
primaryContainer: _primaryContainer,
313+
background: _surface,
313314
secondary: _secondary,
314315
secondaryContainer: _secondaryContainer,
315316
onPrimary: onSurfaceLayers.layer0,
316317
onSecondary: onSurfaceLayers.layer0,
318+
onBackground: onSurfaceLayers.layer0,
317319
onSurface: onSurfaceLayers.layer0,
318320
onError: onSurfaceLayers.layer0,
319321
error: errorLayers.layer0);
320322

321-
Color _getSwitchTrackColor(Set<WidgetState> states) {
322-
if (states.contains(WidgetState.selected)) {
323+
Color _getSwitchTrackColor(Set<MaterialState> states) {
324+
if (states.contains(MaterialState.selected)) {
323325
return primaryLayers.layer0;
324326
}
325327
return onSurfaceLayers.layer0.withOpacity(.2);
326328
}
327329

328-
Color _getSwitchThumbColor(Set<WidgetState> states) {
329-
if (states.contains(WidgetState.selected)) {
330+
Color _getSwitchThumbColor(Set<MaterialState> states) {
331+
if (states.contains(MaterialState.selected)) {
330332
return primaryLayers.layer1;
331333
}
332334
return onSurfaceLayers.layer0.withOpacity(.4);
@@ -338,9 +340,9 @@ class LittleLightThemeData {
338340

339341
SwitchThemeData get _switchTheme => SwitchThemeData(
340342
splashRadius: 14,
341-
overlayColor: WidgetStateColor.resolveWith((states) => onSurfaceLayers.layer0.withOpacity(.1)),
342-
trackColor: WidgetStateColor.resolveWith((states) => _getSwitchTrackColor(states)),
343-
thumbColor: WidgetStateColor.resolveWith((states) => _getSwitchThumbColor(states)),
343+
overlayColor: MaterialStateColor.resolveWith((states) => onSurfaceLayers.layer0.withOpacity(.1)),
344+
trackColor: MaterialStateColor.resolveWith((states) => _getSwitchTrackColor(states)),
345+
thumbColor: MaterialStateColor.resolveWith((states) => _getSwitchThumbColor(states)),
344346
);
345347

346348
TextTheme get _textTheme => TextTheme(
@@ -351,8 +353,8 @@ class LittleLightThemeData {
351353

352354
CardTheme get _cardTheme => CardTheme(color: colorScheme.surface);
353355

354-
WidgetStateTextStyle get labelStyle => WidgetStateTextStyle.resolveWith((states) {
355-
final focus = states.contains(WidgetState.focused) || states.contains(WidgetState.selected);
356+
MaterialStateTextStyle get labelStyle => MaterialStateTextStyle.resolveWith((states) {
357+
final focus = states.contains(MaterialState.focused) || states.contains(MaterialState.selected);
356358
if (focus) {
357359
return textTheme.caption.copyWith(color: primaryLayers.layer3, fontSize: 18);
358360
}
@@ -366,7 +368,7 @@ class LittleLightThemeData {
366368
cardTheme: _cardTheme,
367369
textButtonTheme: TextButtonThemeData(
368370
style: ButtonStyle(
369-
foregroundColor: WidgetStateColor.resolveWith((states) => primaryLayers.layer3),
371+
foregroundColor: MaterialStateColor.resolveWith((states) => primaryLayers.layer3),
370372
)),
371373
elevatedButtonTheme: ElevatedButtonThemeData(
372374
style: ElevatedButton.styleFrom(
@@ -396,8 +398,8 @@ class LittleLightThemeData {
396398
focusedBorder: UnderlineInputBorder(borderSide: BorderSide(color: primaryLayers.layer3, width: 2)),
397399
),
398400
radioTheme: RadioThemeData(
399-
fillColor: WidgetStateColor.resolveWith((states) {
400-
if (states.contains(WidgetState.selected)) {
401+
fillColor: MaterialStateColor.resolveWith((states) {
402+
if (states.contains(MaterialState.selected)) {
401403
return primaryLayers.layer2;
402404
}
403405
return onSurfaceLayers.layer0;

‎lib/modules/settings/widgets/wishlist_file_item.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class WishlistFileItem extends SettingsOptionWidget {
3636
child: Text("Remove".translate(context)),
3737
style: ButtonStyle(
3838
visualDensity: VisualDensity.compact,
39-
backgroundColor: WidgetStatePropertyAll<Color>(context.theme.errorLayers),
39+
backgroundColor: MaterialStatePropertyAll<Color>(context.theme.errorLayers),
4040
),
4141
);
4242
}

‎pubspec.lock

Lines changed: 36 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ packages:
9393
dependency: transitive
9494
description:
9595
name: build_daemon
96-
sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
96+
sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
9797
url: "https://pub.dev"
9898
source: hosted
99-
version: "4.0.2"
99+
version: "4.0.1"
100100
build_resolvers:
101101
dependency: transitive
102102
description:
@@ -109,18 +109,18 @@ packages:
109109
dependency: "direct dev"
110110
description:
111111
name: build_runner
112-
sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
112+
sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
113113
url: "https://pub.dev"
114114
source: hosted
115-
version: "2.4.11"
115+
version: "2.4.9"
116116
build_runner_core:
117117
dependency: transitive
118118
description:
119119
name: build_runner_core
120-
sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
120+
sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
121121
url: "https://pub.dev"
122122
source: hosted
123-
version: "7.3.1"
123+
version: "7.3.0"
124124
built_collection:
125125
dependency: transitive
126126
description:
@@ -210,7 +210,7 @@ packages:
210210
source: hosted
211211
version: "4.10.0"
212212
collection:
213-
dependency: "direct main"
213+
dependency: transitive
214214
description:
215215
name: collection
216216
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
@@ -486,7 +486,7 @@ packages:
486486
source: hosted
487487
version: "2.1.0"
488488
http:
489-
dependency: "direct main"
489+
dependency: transitive
490490
description:
491491
name: http
492492
sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
@@ -537,10 +537,10 @@ packages:
537537
dependency: transitive
538538
description:
539539
name: intl
540-
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
540+
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
541541
url: "https://pub.dev"
542542
source: hosted
543-
version: "0.19.0"
543+
version: "0.18.1"
544544
io:
545545
dependency: transitive
546546
description:
@@ -577,26 +577,26 @@ packages:
577577
dependency: transitive
578578
description:
579579
name: leak_tracker
580-
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
580+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
581581
url: "https://pub.dev"
582582
source: hosted
583-
version: "10.0.4"
583+
version: "10.0.0"
584584
leak_tracker_flutter_testing:
585585
dependency: transitive
586586
description:
587587
name: leak_tracker_flutter_testing
588-
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
588+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
589589
url: "https://pub.dev"
590590
source: hosted
591-
version: "3.0.3"
591+
version: "2.0.1"
592592
leak_tracker_testing:
593593
dependency: transitive
594594
description:
595595
name: leak_tracker_testing
596-
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
596+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
597597
url: "https://pub.dev"
598598
source: hosted
599-
version: "3.0.1"
599+
version: "2.0.1"
600600
linkify:
601601
dependency: transitive
602602
description:
@@ -641,10 +641,10 @@ packages:
641641
dependency: transitive
642642
description:
643643
name: meta
644-
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
644+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
645645
url: "https://pub.dev"
646646
source: hosted
647-
version: "1.12.0"
647+
version: "1.11.0"
648648
mime:
649649
dependency: transitive
650650
description:
@@ -721,10 +721,10 @@ packages:
721721
dependency: transitive
722722
description:
723723
name: path_provider_android
724-
sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
724+
sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
725725
url: "https://pub.dev"
726726
source: hosted
727-
version: "2.2.5"
727+
version: "2.2.4"
728728
path_provider_foundation:
729729
dependency: transitive
730730
description:
@@ -849,10 +849,10 @@ packages:
849849
dependency: transitive
850850
description:
851851
name: shared_preferences_android
852-
sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
852+
sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
853853
url: "https://pub.dev"
854854
source: hosted
855-
version: "2.2.3"
855+
version: "2.2.2"
856856
shared_preferences_foundation:
857857
dependency: transitive
858858
description:
@@ -905,10 +905,10 @@ packages:
905905
dependency: transitive
906906
description:
907907
name: shelf_web_socket
908-
sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
908+
sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
909909
url: "https://pub.dev"
910910
source: hosted
911-
version: "2.0.0"
911+
version: "1.0.4"
912912
shimmer:
913913
dependency: "direct main"
914914
description:
@@ -1038,10 +1038,10 @@ packages:
10381038
dependency: transitive
10391039
description:
10401040
name: test_api
1041-
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
1041+
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
10421042
url: "https://pub.dev"
10431043
source: hosted
1044-
version: "0.7.0"
1044+
version: "0.6.1"
10451045
timeago:
10461046
dependency: "direct main"
10471047
description:
@@ -1086,10 +1086,10 @@ packages:
10861086
dependency: transitive
10871087
description:
10881088
name: url_launcher_android
1089-
sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
1089+
sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
10901090
url: "https://pub.dev"
10911091
source: hosted
1092-
version: "6.3.3"
1092+
version: "6.3.2"
10931093
url_launcher_ios:
10941094
dependency: transitive
10951095
description:
@@ -1158,10 +1158,10 @@ packages:
11581158
dependency: transitive
11591159
description:
11601160
name: vm_service
1161-
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
1161+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
11621162
url: "https://pub.dev"
11631163
source: hosted
1164-
version: "14.2.1"
1164+
version: "13.0.0"
11651165
wakelock_plus:
11661166
dependency: "direct main"
11671167
description:
@@ -1194,30 +1194,22 @@ packages:
11941194
url: "https://pub.dev"
11951195
source: hosted
11961196
version: "0.5.1"
1197-
web_socket:
1198-
dependency: transitive
1199-
description:
1200-
name: web_socket
1201-
sha256: "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078"
1202-
url: "https://pub.dev"
1203-
source: hosted
1204-
version: "0.1.5"
12051197
web_socket_channel:
12061198
dependency: transitive
12071199
description:
12081200
name: web_socket_channel
1209-
sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276
1201+
sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
12101202
url: "https://pub.dev"
12111203
source: hosted
1212-
version: "3.0.0"
1204+
version: "2.4.5"
12131205
win32:
12141206
dependency: transitive
12151207
description:
12161208
name: win32
1217-
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
1209+
sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
12181210
url: "https://pub.dev"
12191211
source: hosted
1220-
version: "5.5.1"
1212+
version: "5.5.0"
12211213
win32_registry:
12221214
dependency: transitive
12231215
description:
@@ -1251,5 +1243,5 @@ packages:
12511243
source: hosted
12521244
version: "3.1.2"
12531245
sdks:
1254-
dart: ">=3.4.0 <4.0.0"
1255-
flutter: ">=3.22.0"
1246+
dart: ">=3.3.0 <4.0.0"
1247+
flutter: ">=3.19.0"

0 commit comments

Comments
 (0)