Upgrade Flutter dependencies and dart fix (thunder-app#1568)

* chore: upgrade flutter dependencies, performed dart fix for some issues * chore: additional dart fix * lint: fix line formatting
micahmo · Sep 30, 2024 · d53b57d · d53b57d
1 parent 0e50fd5
commit d53b57d
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 95 deletions.
diff --git a/lib/comment/cubit/create_comment_cubit.dart b/lib/comment/cubit/create_comment_cubit.dart
@@ -21,15 +21,15 @@ class CreateCommentCubit extends Cubit<CreateCommentState> {
     Account? account = await fetchActiveProfileAccount();
     if (account == null) return;
 
-    PictrsApi pictrs = PictrsApi(account.instance!);
+    PictrsApi pictrs = PictrsApi(account.instance);
     List<String> urls = [];
 
     emit(state.copyWith(status: CreateCommentStatus.imageUploadInProgress));
 
     try {
       for (String imageFile in imageFiles) {
         PictrsUpload result = await pictrs.upload(filePath: imageFile, auth: account.jwt);
-        String url = "https://${account.instance!}/pictrs/image/${result.files[0].file}";
+        String url = "https://${account.instance}/pictrs/image/${result.files[0].file}";
 
         urls.add(url);
 

diff --git a/lib/community/widgets/post_card_view_comfortable.dart b/lib/community/widgets/post_card_view_comfortable.dart
@@ -16,9 +16,7 @@ import 'package:thunder/core/enums/media_type.dart';
 import 'package:thunder/core/enums/view_mode.dart';
 import 'package:thunder/core/models/post_view_media.dart';
 import 'package:thunder/core/theme/bloc/theme_bloc.dart';
-import 'package:thunder/feed/bloc/feed_bloc.dart';
 import 'package:thunder/feed/feed.dart';
-import 'package:thunder/feed/view/feed_page.dart';
 import 'package:thunder/shared/media_view.dart';
 import 'package:thunder/shared/text/scalable_text.dart';
 import 'package:thunder/thunder/bloc/thunder_bloc.dart';

diff --git a/lib/core/auth/bloc/auth_bloc.dart b/lib/core/auth/bloc/auth_bloc.dart
@@ -48,7 +48,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       prefs.setString('active_profile_id', event.accountId);
 
       // Check to see the instance settings (for checking if downvotes are enabled)
-      LemmyClient.instance.changeBaseUrl(account.instance!.replaceAll('https://', ''));
+      LemmyClient.instance.changeBaseUrl(account.instance.replaceAll('https://', ''));
       LemmyApiV3 lemmy = LemmyClient.instance.lemmyApiV3;
 
       GetSiteResponse getSiteResponse = await lemmy.run(GetSite(auth: account.jwt));
@@ -97,9 +97,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         return emit(state.copyWith(status: AuthStatus.success, account: null, isLoggedIn: false));
       }
 
-      if (activeAccount.username != null && activeAccount.jwt != null && activeAccount.instance != null) {
+      if (activeAccount.username != null && activeAccount.jwt != null) {
         // Set lemmy client to use the instance
-        LemmyClient.instance.changeBaseUrl(activeAccount.instance!.replaceAll('https://', ''));
+        LemmyClient.instance.changeBaseUrl(activeAccount.instance.replaceAll('https://', ''));
 
         // Check to see the instance settings (for checking if downvotes are enabled)
         LemmyApiV3 lemmy = LemmyClient.instance.lemmyApiV3;

diff --git a/lib/core/auth/helpers/fetch_account.dart b/lib/core/auth/helpers/fetch_account.dart
@@ -11,7 +11,7 @@ Future<Account?> fetchActiveProfileAccount() async {
 
   // Update the baseUrl if account was found
   if (account?.instance != null && account!.instance != LemmyClient.instance.lemmyApiV3.host) {
-    LemmyClient.instance.changeBaseUrl(account.instance!.replaceAll('https://', ''));
+    LemmyClient.instance.changeBaseUrl(account.instance.replaceAll('https://', ''));
   }
 
   return account;

diff --git a/lib/feed/utils/community.dart b/lib/feed/utils/community.dart
@@ -6,7 +6,6 @@ import 'package:thunder/account/models/account.dart';
 import 'package:thunder/account/models/favourite.dart';
 import 'package:thunder/core/auth/helpers/fetch_account.dart';
 import 'package:thunder/core/singletons/lemmy_client.dart';
-import 'package:uuid/uuid.dart';
 
 /// Logic to block a community
 Future<BlockCommunityResponse> blockCommunity(int communityId, bool block) async {

diff --git a/lib/notification/utils/apns.dart b/lib/notification/utils/apns.dart
@@ -34,7 +34,7 @@ void initAPNs({required StreamController<NotificationResponse> controller}) asyn
 
   // TODO: Select accounts to enable push notifications
   for (Account account in accounts) {
-    bool success = await sendAuthTokenToNotificationServer(type: NotificationType.apn, token: token, jwt: account.jwt!, instance: account.instance!);
+    bool success = await sendAuthTokenToNotificationServer(type: NotificationType.apn, token: token, jwt: account.jwt!, instance: account.instance);
     if (!success) debugPrint("Failed to send device token to server for account ${account.id}. Skipping.");
   }
 
@@ -48,7 +48,7 @@ void initAPNs({required StreamController<NotificationResponse> controller}) asyn
 
     // TODO: Select accounts to enable push notifications
     for (Account account in accounts) {
-      bool success = await sendAuthTokenToNotificationServer(type: NotificationType.apn, token: token, jwt: account.jwt!, instance: account.instance!);
+      bool success = await sendAuthTokenToNotificationServer(type: NotificationType.apn, token: token, jwt: account.jwt!, instance: account.instance);
       if (!success) debugPrint("Failed to send device token to server for account ${account.id}. Skipping.");
     }
   });

diff --git a/lib/notification/utils/navigate_notification.dart b/lib/notification/utils/navigate_notification.dart
@@ -54,7 +54,7 @@ void navigateToNotificationReplyPage(BuildContext context, {required int? replyI
 
   // Load the notifications
   while (!doneFetching) {
-    final GetRepliesResponse getRepliesResponse = await (LemmyClient()..changeBaseUrl(account.instance!)).lemmyApiV3.run(GetReplies(
+    final GetRepliesResponse getRepliesResponse = await (LemmyClient()..changeBaseUrl(account.instance)).lemmyApiV3.run(GetReplies(
           sort: CommentSortType.new_,
           page: currentPage,
           limit: 50,

diff --git a/lib/notification/utils/unified_push.dart b/lib/notification/utils/unified_push.dart
@@ -50,7 +50,7 @@ void initUnifiedPushNotifications({required StreamController<NotificationRespons
 
       // TODO: Select accounts to enable push notifications
       for (Account account in accounts) {
-        bool success = await sendAuthTokenToNotificationServer(type: NotificationType.unifiedPush, token: endpoint, jwt: account.jwt!, instance: account.instance!);
+        bool success = await sendAuthTokenToNotificationServer(type: NotificationType.unifiedPush, token: endpoint, jwt: account.jwt!, instance: account.instance);
         if (!success) debugPrint("Failed to send device token to server for account ${account.id}. Skipping.");
       }
     },

diff --git a/lib/post/cubit/create_post_cubit.dart b/lib/post/cubit/create_post_cubit.dart
@@ -23,15 +23,15 @@ class CreatePostCubit extends Cubit<CreatePostState> {
     Account? account = await fetchActiveProfileAccount();
     if (account == null) return;
 
-    PictrsApi pictrs = PictrsApi(account.instance!);
+    PictrsApi pictrs = PictrsApi(account.instance);
     List<String> urls = [];
 
     isPostImage ? emit(state.copyWith(status: CreatePostStatus.postImageUploadInProgress)) : emit(state.copyWith(status: CreatePostStatus.imageUploadInProgress));
 
     try {
       for (String imageFile in imageFiles) {
         PictrsUpload result = await pictrs.upload(filePath: imageFile, auth: account.jwt);
-        String url = "https://${account.instance!}/pictrs/image/${result.files[0].file}";
+        String url = "https://${account.instance}/pictrs/image/${result.files[0].file}";
 
         urls.add(url);
 

diff --git a/lib/post/utils/post.dart b/lib/post/utils/post.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 
 import 'package:lemmy_api_client/v3.dart';

diff --git a/lib/settings/pages/accessibility_settings_page.dart b/lib/settings/pages/accessibility_settings_page.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:smooth_highlight/smooth_highlight.dart';
 import 'package:thunder/community/utils/post_card_action_helpers.dart';
 
 import 'package:thunder/core/enums/local_settings.dart';

diff --git a/lib/settings/pages/fab_settings_page.dart b/lib/settings/pages/fab_settings_page.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:expandable/expandable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:smooth_highlight/smooth_highlight.dart';
 
 import 'package:thunder/core/enums/fab_action.dart';
 import 'package:thunder/core/enums/local_settings.dart';

diff --git a/lib/settings/pages/settings_page.dart b/lib/settings/pages/settings_page.dart
@@ -90,7 +90,7 @@ class _SettingsPageState extends State<SettingsPage> {
                         localSettings.length,
                         (index) => ListTile(
                               subtitle: Text(
-                                  "${l10n.getLocalSettingLocalization(localSettings[index].category!.toString())}${localSettings[index].subCategory == null ? '' : ' > ${l10n.getLocalSettingLocalization(localSettings[index].subCategory.toString())}'}"),
+                                  "${l10n.getLocalSettingLocalization(localSettings[index].category.toString())}${localSettings[index].subCategory == null ? '' : ' > ${l10n.getLocalSettingLocalization(localSettings[index].subCategory.toString())}'}"),
                               onTap: () {
                                 navigateToSetting(context, localSettings[index]);
                                 controller.closeView(null);

diff --git a/lib/shared/comment_content.dart b/lib/shared/comment_content.dart
@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:lemmy_api_client/v3.dart';
 import 'package:thunder/comment/utils/comment.dart';
 import 'package:thunder/shared/common_markdown_body.dart';

diff --git a/lib/shared/cross_posts.dart b/lib/shared/cross_posts.dart
@@ -1,9 +1,5 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/painting.dart';
-import 'package:flutter/rendering.dart';
 import 'package:lemmy_api_client/v3.dart';
-import 'package:thunder/core/enums/full_name.dart';
 import 'package:thunder/core/models/post_view_media.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 

diff --git a/lib/shared/gesture_fab.dart b/lib/shared/gesture_fab.dart
@@ -149,9 +149,9 @@ class _GestureFabState extends State<GestureFab> with SingleTickerProviderStateM
           progress: _expandAnimation,
           focus: isFabOpen && i == count - 1,
           centered: widget.centered,
-          child: widget.children[i],
           first: i == count - 1,
           last: i == 0,
+          child: widget.children[i],
         ),
       );
     }

diff --git a/lib/shared/multi_picker_item.dart b/lib/shared/multi_picker_item.dart
@@ -28,28 +28,26 @@ class MultiPickerItem extends StatelessWidget {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
       children: [
-        ...pickerItems
-            .map(
-              (p) => Expanded(
-                flex: 1,
-                child: Padding(
-                  padding: const EdgeInsets.only(left: 10, right: 10),
-                  child: Tooltip(
-                    message: p.label,
-                    child: TextButton(
-                      onPressed: p.onSelected,
-                      style: TextButton.styleFrom(foregroundColor: p.backgroundColor),
-                      child: Icon(
-                        p.icon,
-                        semanticLabel: p.label,
-                        color: p.onSelected == null ? null : p.foregroundColor ?? theme.textTheme.bodyMedium?.color,
-                      ),
-                    ),
+        ...pickerItems.map(
+          (p) => Expanded(
+            flex: 1,
+            child: Padding(
+              padding: const EdgeInsets.only(left: 10, right: 10),
+              child: Tooltip(
+                message: p.label,
+                child: TextButton(
+                  onPressed: p.onSelected,
+                  style: TextButton.styleFrom(foregroundColor: p.backgroundColor),
+                  child: Icon(
+                    p.icon,
+                    semanticLabel: p.label,
+                    color: p.onSelected == null ? null : p.foregroundColor ?? theme.textTheme.bodyMedium?.color,
                   ),
                 ),
               ),
-            )
-            .toList(),
+            ),
+          ),
+        ),
       ],
     );
   }

diff --git a/lib/thunder/bloc/thunder_bloc.dart b/lib/thunder/bloc/thunder_bloc.dart
@@ -7,7 +7,6 @@ import 'package:lemmy_api_client/v3.dart';
 
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:stream_transform/stream_transform.dart';
-import 'package:thunder/account/models/account.dart';
 import 'package:thunder/core/enums/action_color.dart';
 import 'package:thunder/core/enums/browser_mode.dart';
 

diff --git a/lib/thunder/pages/thunder_page.dart b/lib/thunder/pages/thunder_page.dart
@@ -31,7 +31,6 @@ import 'package:thunder/core/singletons/lemmy_client.dart';
 import 'package:thunder/core/singletons/preferences.dart';
 import 'package:thunder/core/update/check_github_update.dart';
 import 'package:thunder/feed/feed.dart';
-import 'package:thunder/feed/widgets/feed_fab.dart';
 import 'package:thunder/modlog/utils/navigate_modlog.dart';
 import 'package:thunder/post/utils/post.dart';
 import 'package:thunder/shared/common_markdown_body.dart';
@@ -219,7 +218,7 @@ class _ThunderState extends State<Thunder> {
 
     if (activeAccount?.username != null && activeAccount?.jwt != null && activeAccount?.instance != null) {
       // Set lemmy client to use the instance
-      LemmyClient.instance.changeBaseUrl(activeAccount!.instance!.replaceAll('https://', ''));
+      LemmyClient.instance.changeBaseUrl(activeAccount!.instance.replaceAll('https://', ''));
     }
 
     // If the incoming link is a custom URL, replace it back with https://

diff --git a/lib/user/widgets/user_selector.dart b/lib/user/widgets/user_selector.dart
@@ -127,7 +127,7 @@ Future<void> temporarilySwitchAccount(
       if (communityActorId?.isNotEmpty == true && onCommunityChanged != null) {
         CommunityView? resolvedCommunity;
         try {
-          final ResolveObjectResponse resolveObjectResponse = await LemmyApiV3(newUser.instance!).run(ResolveObject(q: communityActorId!));
+          final ResolveObjectResponse resolveObjectResponse = await LemmyApiV3(newUser.instance).run(ResolveObject(q: communityActorId!));
           resolvedCommunity = resolveObjectResponse.community;
         } catch (e) {
           // We'll just return null if we can't find it.
@@ -139,7 +139,7 @@ Future<void> temporarilySwitchAccount(
       if (postActorId?.isNotEmpty == true && onPostChanged != null) {
         PostView? resolvedPost;
         try {
-          final ResolveObjectResponse resolveObjectResponse = await LemmyApiV3(newUser.instance!).run(ResolveObject(q: postActorId!));
+          final ResolveObjectResponse resolveObjectResponse = await LemmyApiV3(newUser.instance).run(ResolveObject(q: postActorId!));
           resolvedPost = resolveObjectResponse.post;
           if (resolvedPost != null) {
             onPostChanged((await parsePostViews([resolvedPost])).first);
@@ -149,7 +149,7 @@ Future<void> temporarilySwitchAccount(
         }
         if (resolvedPost == null) {
           // This is not allowed, so we must block the account switch.
-          showSnackbar(l10n.accountSwitchPostNotFound(newUser.instance!));
+          showSnackbar(l10n.accountSwitchPostNotFound(newUser.instance));
           if (context.mounted) context.read<AuthBloc>().add(SwitchAccount(accountId: originalUser.id, reload: false));
         }
       }
@@ -158,7 +158,7 @@ Future<void> temporarilySwitchAccount(
       if (parentCommentActorId?.isNotEmpty == true && onParentCommentChanged != null) {
         CommentView? resolvedComment;
         try {
-          final ResolveObjectResponse resolveObjectResponse = await LemmyApiV3(newUser.instance!).run(ResolveObject(q: parentCommentActorId!));
+          final ResolveObjectResponse resolveObjectResponse = await LemmyApiV3(newUser.instance).run(ResolveObject(q: parentCommentActorId!));
           resolvedComment = resolveObjectResponse.comment;
           if (resolvedComment != null) {
             onParentCommentChanged(resolvedComment);
@@ -168,7 +168,7 @@ Future<void> temporarilySwitchAccount(
         }
         if (resolvedComment == null) {
           // This is not allowed, so we must block the accout switch.
-          showSnackbar(l10n.accountSwitchParentCommentNotFound(newUser.instance!));
+          showSnackbar(l10n.accountSwitchParentCommentNotFound(newUser.instance));
           if (context.mounted) context.read<AuthBloc>().add(SwitchAccount(accountId: originalUser.id, reload: false));
         }
       }

diff --git a/lib/utils/settings_utils.dart b/lib/utils/settings_utils.dart
@@ -48,7 +48,7 @@ void shareSetting(BuildContext context, LocalSettings? setting, String descripti
   if (setting == null) return;
 
   final AppLocalizations l10n = AppLocalizations.of(context)!;
-  final String settingPath = '${l10n.getLocalSettingLocalization(setting.category!.toString())} > ${l10n.getLocalSettingLocalization(setting.subCategory.toString())} > $description';
+  final String settingPath = '${l10n.getLocalSettingLocalization(setting.category.toString())} > ${l10n.getLocalSettingLocalization(setting.subCategory.toString())} > $description';
 
   Clipboard.setData(ClipboardData(text: '[Thunder Setting: $settingPath](thunder://setting-${setting.name})'));
   showSnackbar('Setting link copied to clipboard!');