diff --git a/.github/workflows/publish-google-play.yml b/.github/workflows/publish-google-play.yml index ab0433c8..ec15c829 100644 --- a/.github/workflows/publish-google-play.yml +++ b/.github/workflows/publish-google-play.yml @@ -74,7 +74,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.22.1" + flutter-version: "3.19.6" - name: Create assets/_env run: | diff --git a/.github/workflows/publish-ios.yml b/.github/workflows/publish-ios.yml index ae15e805..19c255ff 100644 --- a/.github/workflows/publish-ios.yml +++ b/.github/workflows/publish-ios.yml @@ -114,7 +114,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.22.1" + flutter-version: "3.19.6" - name: Create assets/_env run: | diff --git a/.github/workflows/publish-macos.yml b/.github/workflows/publish-macos.yml index c7d0b3a8..fb59f609 100644 --- a/.github/workflows/publish-macos.yml +++ b/.github/workflows/publish-macos.yml @@ -114,7 +114,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.22.1" + flutter-version: "3.19.6" - name: Create assets/_env run: | diff --git a/.github/workflows/publish-windows.yml b/.github/workflows/publish-windows.yml index d5747e47..0a0d241f 100644 --- a/.github/workflows/publish-windows.yml +++ b/.github/workflows/publish-windows.yml @@ -65,7 +65,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.22.1" + flutter-version: "3.19.6" - name: Create assets/_env shell: bash diff --git a/lib/core/theme/littlelight.theme.dart b/lib/core/theme/littlelight.theme.dart index 16a4eb9f..1daf7a8a 100644 --- a/lib/core/theme/littlelight.theme.dart +++ b/lib/core/theme/littlelight.theme.dart @@ -310,23 +310,25 @@ class LittleLightThemeData { surface: _surface, primary: _primary, primaryContainer: _primaryContainer, + background: _surface, secondary: _secondary, secondaryContainer: _secondaryContainer, onPrimary: onSurfaceLayers.layer0, onSecondary: onSurfaceLayers.layer0, + onBackground: onSurfaceLayers.layer0, onSurface: onSurfaceLayers.layer0, onError: onSurfaceLayers.layer0, error: errorLayers.layer0); - Color _getSwitchTrackColor(Set states) { - if (states.contains(WidgetState.selected)) { + Color _getSwitchTrackColor(Set states) { + if (states.contains(MaterialState.selected)) { return primaryLayers.layer0; } return onSurfaceLayers.layer0.withOpacity(.2); } - Color _getSwitchThumbColor(Set states) { - if (states.contains(WidgetState.selected)) { + Color _getSwitchThumbColor(Set states) { + if (states.contains(MaterialState.selected)) { return primaryLayers.layer1; } return onSurfaceLayers.layer0.withOpacity(.4); @@ -338,9 +340,9 @@ class LittleLightThemeData { SwitchThemeData get _switchTheme => SwitchThemeData( splashRadius: 14, - overlayColor: WidgetStateColor.resolveWith((states) => onSurfaceLayers.layer0.withOpacity(.1)), - trackColor: WidgetStateColor.resolveWith((states) => _getSwitchTrackColor(states)), - thumbColor: WidgetStateColor.resolveWith((states) => _getSwitchThumbColor(states)), + overlayColor: MaterialStateColor.resolveWith((states) => onSurfaceLayers.layer0.withOpacity(.1)), + trackColor: MaterialStateColor.resolveWith((states) => _getSwitchTrackColor(states)), + thumbColor: MaterialStateColor.resolveWith((states) => _getSwitchThumbColor(states)), ); TextTheme get _textTheme => TextTheme( @@ -351,8 +353,8 @@ class LittleLightThemeData { CardTheme get _cardTheme => CardTheme(color: colorScheme.surface); - WidgetStateTextStyle get labelStyle => WidgetStateTextStyle.resolveWith((states) { - final focus = states.contains(WidgetState.focused) || states.contains(WidgetState.selected); + MaterialStateTextStyle get labelStyle => MaterialStateTextStyle.resolveWith((states) { + final focus = states.contains(MaterialState.focused) || states.contains(MaterialState.selected); if (focus) { return textTheme.caption.copyWith(color: primaryLayers.layer3, fontSize: 18); } @@ -366,7 +368,7 @@ class LittleLightThemeData { cardTheme: _cardTheme, textButtonTheme: TextButtonThemeData( style: ButtonStyle( - foregroundColor: WidgetStateColor.resolveWith((states) => primaryLayers.layer3), + foregroundColor: MaterialStateColor.resolveWith((states) => primaryLayers.layer3), )), elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( @@ -396,8 +398,8 @@ class LittleLightThemeData { focusedBorder: UnderlineInputBorder(borderSide: BorderSide(color: primaryLayers.layer3, width: 2)), ), radioTheme: RadioThemeData( - fillColor: WidgetStateColor.resolveWith((states) { - if (states.contains(WidgetState.selected)) { + fillColor: MaterialStateColor.resolveWith((states) { + if (states.contains(MaterialState.selected)) { return primaryLayers.layer2; } return onSurfaceLayers.layer0; diff --git a/lib/modules/settings/widgets/wishlist_file_item.dart b/lib/modules/settings/widgets/wishlist_file_item.dart index d1880832..8b47994a 100644 --- a/lib/modules/settings/widgets/wishlist_file_item.dart +++ b/lib/modules/settings/widgets/wishlist_file_item.dart @@ -36,7 +36,7 @@ class WishlistFileItem extends SettingsOptionWidget { child: Text("Remove".translate(context)), style: ButtonStyle( visualDensity: VisualDensity.compact, - backgroundColor: WidgetStatePropertyAll(context.theme.errorLayers), + backgroundColor: MaterialStatePropertyAll(context.theme.errorLayers), ), ); } diff --git a/pubspec.lock b/pubspec.lock index e56a1f60..cfb2c787 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.0.1" build_resolvers: dependency: transitive description: @@ -109,18 +109,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.9" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.0" built_collection: dependency: transitive description: @@ -210,7 +210,7 @@ packages: source: hosted version: "4.10.0" collection: - dependency: "direct main" + dependency: transitive description: name: collection sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a @@ -486,7 +486,7 @@ packages: source: hosted version: "2.1.0" http: - dependency: "direct main" + dependency: transitive description: name: http sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" @@ -537,10 +537,10 @@ packages: dependency: transitive description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.18.1" io: dependency: transitive description: @@ -577,26 +577,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.0" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "2.0.1" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "2.0.1" linkify: dependency: transitive description: @@ -641,10 +641,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.11.0" mime: dependency: transitive description: @@ -721,10 +721,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514" + sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d url: "https://pub.dev" source: hosted - version: "2.2.5" + version: "2.2.4" path_provider_foundation: dependency: transitive description: @@ -849,10 +849,10 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577" + sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.2" shared_preferences_foundation: dependency: transitive description: @@ -905,10 +905,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.4" shimmer: dependency: "direct main" description: @@ -1038,10 +1038,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.6.1" timeago: dependency: "direct main" description: @@ -1086,10 +1086,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf + sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9" url: "https://pub.dev" source: hosted - version: "6.3.3" + version: "6.3.2" url_launcher_ios: dependency: transitive description: @@ -1158,10 +1158,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "13.0.0" wakelock_plus: dependency: "direct main" description: @@ -1194,30 +1194,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.5.1" - web_socket: - dependency: transitive - description: - name: web_socket - sha256: "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078" - url: "https://pub.dev" - source: hosted - version: "0.1.5" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276 + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "2.4.5" win32: dependency: transitive description: name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 + sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.5.0" win32_registry: dependency: transitive description: @@ -1251,5 +1243,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.19.0" diff --git a/pubspec.yaml b/pubspec.yaml index f9090469..514fe6ae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,49 +15,47 @@ dependencies: flutter_localizations: sdk: flutter tinycolor2: ^3.0.1 - shared_preferences: ^2.2.2 - archive: ^3.6.0 - sqflite: ^2.2.6 - http: ^1.1.2 - path_provider: ^2.0.2 - font_awesome_flutter: ^10.4.0 + shared_preferences: ^2.2.3 + archive: ^3.6.1 + sqflite: ^2.3.3+1 + path_provider: ^2.1.3 + font_awesome_flutter: ^10.7.0 bungie_api: 13.18.0 shimmer: ^3.0.0 - timeago: ^3.0.1 + timeago: ^3.6.1 firebase_analytics: ^11.0.1 - flutter_dotenv: ^5.0.2 - url_launcher: ^6.0.2 - wakelock_plus: ^1.0.0+3 - flutter_advanced_switch: ^3.0.1 - logger: ^2.0.2+1 + flutter_dotenv: ^5.1.0 + url_launcher: ^6.3.0 + wakelock_plus: ^1.2.5 + flutter_advanced_switch: ^3.1.0 + logger: ^2.3.0 package_info_plus: ^8.0.0 device_info_plus: ^10.1.0 - cached_network_image: ^3.3.0 + cached_network_image: ^3.3.1 in_app_review: ^2.0.9 flutter_linkify: ^6.0.0 - bubble: 1.2.1 + bubble: ^1.2.1 - get_it: ^7.6.4 - provider: ^6.0.1 + get_it: ^7.7.0 + provider: ^6.1.2 flutter_phoenix: ^1.1.1 - collection: ^1.15.0-nullsafety.4 - json_annotation: ^4.8.1 + json_annotation: ^4.9.0 app_links: ^6.1.1 protocol_registry: ^0.0.5 firebase_crashlytics: ^4.0.1 dev_dependencies: - build_runner: ^2.1.7 - json_serializable: ^6.7.1 + build_runner: ^2.4.9 + json_serializable: ^6.8.0 analyzer: ^6.4.1 - sqflite_common_ffi: ^2.3.2 + sqflite_common_ffi: ^2.3.3 flutter_test: sdk: flutter msix: ^3.16.7