Merge pull request #184 from SputNikPlop/flutter_322

fix: flutter deprecations for 3.22
LezdCS · May 24, 2024 · 51ba074 · 51ba074
2 parents 4dfc0a5 + d8b3523
commit 51ba074
Show file tree

Hide file tree

Showing 47 changed files with 324 additions and 235 deletions.
diff --git a/README.md b/README.md
@@ -8,12 +8,11 @@ IRL Link is a mobile application to monitor your IRL Stream.
 [![GitHub](https://img.shields.io/github/license/lezdcs/irl_link?color=%238442f5)](https://choosealicense.com/licenses/gpl-3.0/)
 
 ## Download
-<a href='https://play.google.com/store/apps/details?id=dev.lezd.www.irllink&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1' target="_blank"><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' height="85"/></a>
-<a href='https://apps.apple.com/us/app/irl-link/id6447156883' target="_blank"><img alt='Get it on the App Store' src='https://www.irllink.com/_next/static/media/app-store-badge.a2e763b8.svg' height="74px"/></a>
+<a href='https://play.google.com/store/apps/details?id=dev.lezd.www.irllink&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="85" src='./assets/google-play-badge.png'/></a>
+<a href="https://apps.apple.com/app/id6447156883"><img alt='Download on the App Store' height="85" src="./assets/apple-download.svg"></a>
 
 Also available in the [Releases](https://github.com/LezdCS/irl_link/releases).
 <br />
-Soon to be released on the iOS App Store!
 
 ## Features
 

diff --git a/lib/assets/apple-download.svg b/lib/assets/apple-download.svg
diff --git a/lib/assets/google-play-badge.png b/lib/assets/google-play-badge.png
diff --git a/lib/main.dart b/lib/main.dart
@@ -26,8 +26,8 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   final crashlyticsTalkerObserver = CrashlyticsTalkerObserver();
   final talker = TalkerFlutter.init(
-     settings:  TalkerSettings(),
-     observer: crashlyticsTalkerObserver,
+    settings: TalkerSettings(),
+    observer: crashlyticsTalkerObserver,
   );
   await initializeService();
   await GetStorage.init();
@@ -43,7 +43,9 @@ void main() async {
   globals.packageName = packageInfo.packageName;
   globals.talker = talker;
   AppTranslations.initLanguages();
-  runApp(Main(talker: talker,));
+  runApp(Main(
+    talker: talker,
+  ));
 }
 
 const notificationChannelId = 'irllink_foreground';

diff --git a/lib/src/core/resources/data_state.dart b/lib/src/core/resources/data_state.dart
@@ -8,7 +8,7 @@ abstract class DataState<T> {
     this.data,
     this.error,
   }) {
-    if(error != null) {
+    if (error != null) {
       globals.talker?.error(error);
     }
   }

diff --git a/lib/src/core/resources/themes.dart b/lib/src/core/resources/themes.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 class Themes {
   final ThemeData darkTheme = ThemeData.dark().copyWith(
     colorScheme: ColorScheme.fromSwatch().copyWith(
-      background: const Color(0xFF0e0e10),
+      surface: const Color(0xFF0e0e10),
       secondary: const Color(0xFF18181b),
       error: const Color(0xFFEC0808),
 
@@ -25,23 +25,23 @@ class Themes {
       ),
     ),
     switchTheme: SwitchThemeData(
-      thumbColor: MaterialStateProperty.resolveWith(
-        (Set<MaterialState> states) {
-          if (states.contains(MaterialState.selected)) {
+      thumbColor: WidgetStateProperty.resolveWith(
+        (Set<WidgetState> states) {
+          if (states.contains(WidgetState.selected)) {
             return Colors.white;
           }
-          if (states.contains(MaterialState.disabled)) {
+          if (states.contains(WidgetState.disabled)) {
             return null;
           }
           return Colors.white;
         },
       ),
-      trackColor: MaterialStateProperty.resolveWith(
-        (Set<MaterialState> states) {
-          if (states.contains(MaterialState.selected)) {
+      trackColor: WidgetStateProperty.resolveWith(
+        (Set<WidgetState> states) {
+          if (states.contains(WidgetState.selected)) {
             return Colors.deepPurpleAccent[200];
           }
-          if (states.contains(MaterialState.disabled)) {
+          if (states.contains(WidgetState.disabled)) {
             return Colors.grey[850];
           }
           return Colors.grey[850];
@@ -61,7 +61,7 @@ class Themes {
 
   final ThemeData lightTheme = ThemeData.light().copyWith(
     colorScheme: ColorScheme.fromSwatch().copyWith(
-      background: const Color(0xFFffffff),
+      surface: const Color(0xFFffffff),
       secondary: const Color(0xFFefeff1),
       error: const Color(0xFFEC0808),
 
@@ -77,23 +77,23 @@ class Themes {
       ),
     ),
     switchTheme: SwitchThemeData(
-      thumbColor: MaterialStateProperty.resolveWith(
-        (Set<MaterialState> states) {
-          if (states.contains(MaterialState.selected)) {
+      thumbColor: WidgetStateProperty.resolveWith(
+        (Set<WidgetState> states) {
+          if (states.contains(WidgetState.selected)) {
             return Colors.white;
           }
-          if (states.contains(MaterialState.disabled)) {
+          if (states.contains(WidgetState.disabled)) {
             return null;
           }
           return Colors.white;
         },
       ),
-      trackColor: MaterialStateProperty.resolveWith(
-        (Set<MaterialState> states) {
-          if (states.contains(MaterialState.selected)) {
+      trackColor: WidgetStateProperty.resolveWith(
+        (Set<WidgetState> states) {
+          if (states.contains(WidgetState.selected)) {
             return Colors.deepPurpleAccent[200];
           }
-          if (states.contains(MaterialState.disabled)) {
+          if (states.contains(WidgetState.disabled)) {
             return Colors.grey[850];
           }
           return Colors.grey[850];

diff --git a/lib/src/core/utils/crashlytics_talker_observer.dart b/lib/src/core/utils/crashlytics_talker_observer.dart
@@ -6,19 +6,19 @@ class CrashlyticsTalkerObserver extends TalkerObserver {
 
   @override
   void onError(err) {
-      FirebaseCrashlytics.instance.recordError(
-        err.error,
-        err.stackTrace,
-        reason: err.message,
-      );
+    FirebaseCrashlytics.instance.recordError(
+      err.error,
+      err.stackTrace,
+      reason: err.message,
+    );
   }
 
   @override
   void onException(err) {
-      FirebaseCrashlytics.instance.recordError(
-        err.exception,
-        err.stackTrace,
-        reason: err.message,
-      );
+    FirebaseCrashlytics.instance.recordError(
+      err.exception,
+      err.stackTrace,
+      reason: err.message,
+    );
   }
-}
+}
diff --git a/lib/src/core/utils/dashboard_events.dart b/lib/src/core/utils/dashboard_events.dart
@@ -132,7 +132,8 @@ Map<SupportedEvents, ExistingDashboardEvent> dashboardEvents = {
     provider: DashboardActionsProvider.twitch,
     actionsAllowed: [DashboardActionsTypes.button],
     action: (String v) {
-      String channel = Get.find<HomeViewController>().twitchData!.twitchUser.login;
+      String channel =
+          Get.find<HomeViewController>().twitchData!.twitchUser.login;
       Get.find<HomeViewController>()
           .sendChatMessage(v.substring(1, v.length - 1), channel);
     },

diff --git a/lib/src/core/utils/init_dio.dart b/lib/src/core/utils/init_dio.dart
@@ -10,7 +10,8 @@ Dio initDio() {
     TalkerDioLogger(
       talker: talker,
       settings: TalkerDioLoggerSettings(
-        requestFilter: (RequestOptions options) => !options.path.contains('api.twitch.tv'),
+        requestFilter: (RequestOptions options) =>
+            !options.path.contains('api.twitch.tv'),
         printRequestHeaders: true,
         // responseFilter: (response) => ![200, 202].contains(response.statusCode),
       ),

diff --git a/lib/src/data/entities/stream_elements/se_activity_dto.dart b/lib/src/data/entities/stream_elements/se_activity_dto.dart
@@ -18,7 +18,7 @@ class SeActivityDTO extends SeActivity {
   factory SeActivityDTO.fromJson(Map<String, dynamic> map) {
     switch (map['type']) {
       case 'follow':
-        return SeActivityDTO (
+        return SeActivityDTO(
           id: map["_id"],
           channel: map["channel"],
           username: map["data"]["displayName"],
@@ -37,7 +37,7 @@ class SeActivityDTO extends SeActivity {
           activityType: ActivityType.subscription,
         );
       case "tip":
-       return SeActivityDTO(
+        return SeActivityDTO(
           id: map["_id"],
           channel: map["channel"],
           username: map["data"]["displayName"],

diff --git a/lib/src/data/entities/twitch/twitch_decoded_idtoken_dto.dart b/lib/src/data/entities/twitch/twitch_decoded_idtoken_dto.dart
@@ -1,4 +1,3 @@
-
 import 'package:irllink/src/domain/entities/twitch/twitch_decoded_idtoken.dart';
 
 class TwitchDecodedIdTokenDTO extends TwitchDecodedIdToken {

diff --git a/lib/src/data/entities/twitch/twitch_poll_dto.dart b/lib/src/data/entities/twitch/twitch_poll_dto.dart
@@ -43,7 +43,7 @@ class TwitchPollDTO extends TwitchPoll {
 
     DateFormat df = DateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
     DateTime endsAt = df.parse(map['ends_at'] ?? map['ended_at']);
-    
+
     return TwitchPollDTO(
       id: map['id'],
       title: map['title'],

diff --git a/lib/src/data/entities/twitch/twitch_user_dto.dart b/lib/src/data/entities/twitch/twitch_user_dto.dart
@@ -1,4 +1,3 @@
-
 import 'package:irllink/src/domain/entities/twitch/twitch_user.dart';
 
 class TwitchUserDTO extends TwitchUser {