run dart fix --apply

lib/app.dart

@@ -92,7 +92,7 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
           localeListResolutionCallback: localResolutionCallBack,
           localizationsDelegates: const [
             ...AppLocalizations.localizationsDelegates,
-            S.delegate
+            S.delegate,
           ],
         ),
       );
@@ -110,7 +110,7 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
         localeListResolutionCallback: localResolutionCallBack,
         localizationsDelegates: const [
           ...AppLocalizations.localizationsDelegates,
-          S.delegate
+          S.delegate,
         ],
       );
     }

lib/core/error-reporting/tunneled_transport.dart

@@ -122,7 +122,7 @@ class _CredentialBuilder {
     return headers
       ..addAll(
         <String, String>{
-          'X-Sentry-Auth': '$_authHeader, sentry_timestamp=$timestamp'
+          'X-Sentry-Auth': '$_authHeader, sentry_timestamp=$timestamp',
         },
       );
   }

lib/db/device_files_db.dart

@@ -154,7 +154,7 @@ extension DeviceFiles on FilesDB {
             {
               "id": localPathAsset.pathID,
               "name": localPathAsset.pathName,
-              "should_backup": shouldAutoBackup ? _sqlBoolTrue : _sqlBoolFalse
+              "should_backup": shouldAutoBackup ? _sqlBoolTrue : _sqlBoolFalse,
             },
             conflictAlgorithm: ConflictAlgorithm.ignore,
           );
@@ -210,7 +210,7 @@ extension DeviceFiles on FilesDB {
               "name": pathEntity.name,
               "count": pathEntity.assetCount,
               "cover_id": localID,
-              "should_backup": shouldBackup ? _sqlBoolTrue : _sqlBoolFalse
+              "should_backup": shouldBackup ? _sqlBoolTrue : _sqlBoolFalse,
             },
             conflictAlgorithm: ConflictAlgorithm.ignore,
           );

lib/ente_theme_data.dart

@@ -392,9 +392,7 @@ ElevatedButtonThemeData buildElevatedButtonThemeData({
 }) {
   return ElevatedButtonThemeData(
     style: ElevatedButton.styleFrom(
-      elevation: elevation,
-      onPrimary: onPrimary,
-      primary: primary,
+      foregroundColor: onPrimary, backgroundColor: primary, elevation: elevation,
       alignment: Alignment.center,
       textStyle: const TextStyle(
         fontWeight: FontWeight.w600,

lib/l10n/intl_nl.arb

@@ -419,7 +419,7 @@
   "skip": "Overslaan",
   "updatingFolderSelection": "Map selectie bijwerken...",
   "itemCount": "{count, plural, one{{count} item} other{{count} items}}",
-  "deleteItemCount": "{count, plural, one {}=1 {Verwijder {count} bestand} other {Verwijder {count} bestanden}}",
+  "deleteItemCount": "{count, plural, one {Verwijder {count} bestand} other {Verwijder {count} bestanden}}",
   "duplicateItemsGroup": "{count} bestanden, elk {formattedSize}",
   "@duplicateItemsGroup": {
     "description": "Display the number of duplicate files and their size",

lib/services/collections_service.dart

@@ -453,7 +453,7 @@ class CollectionsService {
           "collectionID": collectionID,
           "email": email,
           "encryptedKey": CryptoUtil.bin2base64(encryptedKey),
-          "role": role.toStringVal()
+          "role": role.toStringVal(),
         },
       );
       final sharees = <User>[];
@@ -650,7 +650,7 @@ class CollectionsService {
         data: {
           "collectionID": collection.id,
           "encryptedName": CryptoUtil.bin2base64(encryptedName.encryptedData!),
-          "nameDecryptionNonce": CryptoUtil.bin2base64(encryptedName.nonce!)
+          "nameDecryptionNonce": CryptoUtil.bin2base64(encryptedName.nonce!),
         },
       );
       collection.setName(newName);

lib/services/files_service.dart

@@ -32,7 +32,7 @@ class FilesService {
       final response = await _enteDio.post(
         "/files/size",
         data: {
-          "fileIDs": [uploadedFileID]
+          "fileIDs": [uploadedFileID],
         },
       );
       return response.data["size"];

lib/services/location_service.dart

@@ -170,7 +170,7 @@ class LocationService {
         LocationTagUpdatedEvent(
           LocTagEventType.update,
           updatedLocTagEntities: [
-            LocalEntity(updatedLoationTag, locationTagEntity.id)
+            LocalEntity(updatedLoationTag, locationTagEntity.id),
           ],
         ),
       );

lib/services/object_detection/tflite/classifier.dart

@@ -56,10 +56,10 @@ abstract class Classifier {
       final outputTensors = _interpreter.getOutputTensors();
       _outputShapes = [];
       _outputTypes = [];
-      outputTensors.forEach((tensor) {
+      for (var tensor in outputTensors) {
         _outputShapes.add(tensor.shape);
         _outputTypes.add(tensor.type);
-      });
+      }
       logger.info("Interpreter initialized");
     } catch (e, s) {
       logger.severe("Error while creating interpreter", e, s);

lib/theme/colors.dart

@@ -264,7 +264,7 @@ const List<Color> avatarLight = [
   Color.fromRGBO(176, 198, 149, 1),
   Color.fromRGBO(233, 154, 173, 1),
   Color.fromRGBO(209, 132, 132, 1),
-  Color.fromRGBO(120, 181, 167, 1)
+  Color.fromRGBO(120, 181, 167, 1),
 ];
 
 const List<Color> avatarDark = [
@@ -290,5 +290,5 @@ const List<Color> avatarDark = [
   Color.fromRGBO(176, 198, 149, 1),
   Color.fromRGBO(233, 154, 173, 1),
   Color.fromRGBO(209, 132, 132, 1),
-  Color.fromRGBO(120, 181, 167, 1)
+  Color.fromRGBO(120, 181, 167, 1),
 ];

lib/ui/account/delete_account_page.dart

@@ -175,7 +175,7 @@ class _DeleteAccountPageState extends State<DeleteAccountPage> {
                         style: getEnteTextTheme(context).bodyMuted,
                         textAlign: TextAlign.left,
                       ),
-                    )
+                    ),
                   ],
                 ),
               ),

lib/ui/account/email_entry_page.dart

@@ -377,8 +377,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                   .copyWith(fontSize: 12),
               tags: {
                 'u-terms': StyledTextActionTag(
-                  (String? text, Map<String?, String?> attrs) => {
-                    Navigator.of(context).push(
+                  (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
                       MaterialPageRoute(
                         builder: (BuildContext context) {
                           return WebPage(
@@ -387,15 +386,13 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                           );
                         },
                       ),
-                    )
-                  },
+                    ),
                   style: const TextStyle(
                     decoration: TextDecoration.underline,
                   ),
                 ),
                 'u-policy': StyledTextActionTag(
-                  (String? text, Map<String?, String?> attrs) => {
-                    Navigator.of(context).push(
+                  (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
                       MaterialPageRoute(
                         builder: (BuildContext context) {
                           return WebPage(
@@ -404,12 +401,11 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                           );
                         },
                       ),
-                    )
-                  },
+                    ),
                   style: const TextStyle(
                     decoration: TextDecoration.underline,
                   ),
-                )
+                ),
               },
             ),
           ),
@@ -446,8 +442,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                   .copyWith(fontSize: 12),
               tags: {
                 'underline': StyledTextActionTag(
-                  (String? text, Map<String?, String?> attrs) => {
-                    Navigator.of(context).push(
+                  (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
                       MaterialPageRoute(
                         builder: (BuildContext context) {
                           return WebPage(
@@ -456,8 +451,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                           );
                         },
                       ),
-                    )
-                  },
+                    ),
                   style: const TextStyle(
                     decoration: TextDecoration.underline,
                   ),

lib/ui/account/login_page.dart

@@ -179,8 +179,7 @@ class _LoginPageState extends State<LoginPage> {
                               .copyWith(fontSize: 12),
                           tags: {
                             'u-terms': StyledTextActionTag(
-                              (String? text, Map<String?, String?> attrs) => {
-                                Navigator.of(context).push(
+                              (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
                                   MaterialPageRoute(
                                     builder: (BuildContext context) {
                                       return WebPage(
@@ -189,15 +188,13 @@ class _LoginPageState extends State<LoginPage> {
                                       );
                                     },
                                   ),
-                                )
-                              },
+                                ),
                               style: const TextStyle(
                                 decoration: TextDecoration.underline,
                               ),
                             ),
                             'u-policy': StyledTextActionTag(
-                              (String? text, Map<String?, String?> attrs) => {
-                                Navigator.of(context).push(
+                              (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
                                   MaterialPageRoute(
                                     builder: (BuildContext context) {
                                       return WebPage(
@@ -206,19 +203,18 @@ class _LoginPageState extends State<LoginPage> {
                                       );
                                     },
                                   ),
-                                )
-                              },
+                                ),
                               style: const TextStyle(
                                 decoration: TextDecoration.underline,
                               ),
-                            )
+                            ),
                           },
                         ),
                       ),
                       const Expanded(
                         flex: 1,
                         child: SizedBox.shrink(),
-                      )
+                      ),
                     ],
                   ),
                 ),

lib/ui/account/login_pwd_verification_page.dart

@@ -228,7 +228,7 @@ State<LoginPasswordVerificationPage> {
                       ),
                     ],
                   ),
-                )
+                ),
               ],
             ),
           ),

lib/ui/account/ott_verification_page.dart

@@ -151,7 +151,7 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
                   SizedBox(
                     width: MediaQuery.of(context).size.width * 0.2,
                     height: 1,
-                  )
+                  ),
                 ],
               ),
             ),
@@ -203,7 +203,7 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
                             decoration: TextDecoration.underline,
                           ),
                     ),
-                  )
+                  ),
                 ],
               ),
             ),

lib/ui/account/password_reentry_page.dart

@@ -320,7 +320,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                       ),
                     ],
                   ),
-                )
+                ),
               ],
             ),
           ),

lib/ui/account/recovery_key_page.dart

@@ -192,7 +192,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
                             children: _saveOptions(context, recoveryKey),
                           ),
                         ),
-                      )
+                      ),
                     ],
                   ), // columnEnds
                 ),

lib/ui/account/two_factor_setup_page.dart

@@ -104,7 +104,7 @@ class _TwoFactorSetupPageState extends State<TwoFactorSetupPage>
                       ),
                       Tab(
                         text: S.of(context).scanCode,
-                      )
+                      ),
                     ],
                     controller: _tabController,
                     indicatorSize: TabBarIndicatorSize.tab,
@@ -174,7 +174,7 @@ class _TwoFactorSetupPageState extends State<TwoFactorSetupPage>
           Text(
             S.of(context).tapToCopy,
             style: TextStyle(color: textColor.withOpacity(0.5)),
-          )
+          ),
         ],
       ),
     );

lib/ui/account/verify_recovery_page.dart

@@ -201,7 +201,7 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
                           ),
                         ),
                       ),
-                      const SizedBox(height: 20)
+                      const SizedBox(height: 20),
                     ],
                   ),
                 ),

lib/ui/actions/collection/collection_sharing_actions.dart

@@ -84,7 +84,7 @@ class CollectionActions {
           isInAlert: true,
           shouldStickToDarkTheme: true,
           labelText: S.of(context).cancel,
-        )
+        ),
       ],
       title: S.of(context).removePublicLink,
       body:
@@ -176,7 +176,7 @@ class CollectionActions {
           isInAlert: true,
           shouldStickToDarkTheme: true,
           labelText: S.of(context).cancel,
-        )
+        ),
       ],
       title: S.of(context).removeWithQuestionMark,
       body: S.of(context).removeParticipantBody(user.email),

lib/ui/collections/album/column_item.dart

@@ -92,7 +92,7 @@ class AlbumColumnItemWidget extends StatelessWidget {
                             );
                           }
                         },
-                      )
+                      ),
                     ],
                   ),
                 ),

lib/ui/collections/album/row_item.dart

@@ -170,7 +170,7 @@ class AlbumRowItemWidget extends StatelessWidget {
                               TextSpan(text: '  \u2022  $textCount'),
                             ],
                           ),
-                        )
+                        ),
                       ],
                     );
                   } else {

lib/ui/collections/collection_action_sheet.dart

@@ -188,7 +188,7 @@ class _CollectionActionSheetState extends State<CollectionActionSheet> {
                         labelText: S.of(context).cancel,
                       ),
                     ),
-                  )
+                  ),
                 ],
               ),
             ),

lib/ui/common/dynamic_fab.dart

@@ -28,7 +28,7 @@ class DynamicFAB extends StatelessWidget {
               spreadRadius: 200,
               blurRadius: 100,
               offset: const Offset(0, 230),
-            )
+            ),
           ],
         ),
         width: double.infinity,

lib/ui/common/gradient_button.dart

@@ -74,7 +74,7 @@ class GradientButton extends StatelessWidget {
                 ? linearGradientColors
                 : [
                     getEnteColorScheme(context).fillMuted,
-                    getEnteColorScheme(context).fillMuted
+                    getEnteColorScheme(context).fillMuted,
                   ],
           ),
           borderRadius: BorderRadius.circular(8),

lib/ui/common/progress_dialog.dart

@@ -277,7 +277,7 @@ class _BodyState extends State<_Body> {
                   _direction == TextDirection.ltr ? loader : text,
                   const SizedBox(width: 8.0),
                   _direction == TextDirection.rtl ? loader : text,
-                  const SizedBox(width: 8.0)
+                  const SizedBox(width: 8.0),
                 ],
               ),
             ],

lib/ui/common/web_page.dart

@@ -56,7 +56,7 @@ class _WebPageState extends State<WebPage> {
               : const EnteLoadingWidget(
                   color: Colors.white,
                   padding: 12,
-                )
+                ),
         ],
       ),
       backgroundColor: Colors.black,

lib/ui/components/buttons/button_widget.dart

@@ -320,7 +320,7 @@ class _ButtonChildWidgetState extends State<ButtonChildWidget> {
                                             overflow: TextOverflow.ellipsis,
                                           ),
                                         ),
-                                      )
+                                      ),
                               ],
                             );
                           },

lib/ui/components/buttons/chip_button_widget.dart

@@ -46,7 +46,7 @@ class ChipButtonWidget extends StatelessWidget {
                     label!,
                     style: getEnteTextTheme(context).miniBold,
                   ),
-                )
+                ),
             ],
           ),
         ),

lib/ui/components/dialog_widget.dart

@@ -311,7 +311,7 @@ class _TextInputDialogState extends State<TextInputDialog> {
                   ),
                 ),
               ],
-            )
+            ),
           ],
         ),
       ),

lib/ui/components/keyboard/keybiard_oveylay.dart

@@ -8,7 +8,7 @@ class KeyboardOverlay {
       return;
     }
 
-    final OverlayState? overlayState = Overlay.of(context);
+    final OverlayState overlayState = Overlay.of(context);
     _overlayEntry = OverlayEntry(
       builder: (context) {
         return Positioned(
@@ -20,7 +20,7 @@ class KeyboardOverlay {
       },
     );
 
-    overlayState!.insert(_overlayEntry!);
+    overlayState.insert(_overlayEntry!);
   }
 
   static removeOverlay() {

lib/ui/components/menu_section_title.dart

@@ -27,7 +27,7 @@ class MenuSectionTitle extends StatelessWidget {
             style: getEnteTextTheme(context).small.copyWith(
                   color: colorScheme.textMuted,
                 ),
-          )
+          ),
         ],
       ),
     );

lib/ui/components/notification_widget.dart

@@ -53,7 +53,7 @@ class NotificationWidget extends StatelessWidget {
         subTextStyle = textTheme.miniMuted;
         strokeColorScheme = colorScheme;
         boxShadow = [
-          BoxShadow(color: Colors.black.withOpacity(0.25), blurRadius: 1)
+          BoxShadow(color: Colors.black.withOpacity(0.25), blurRadius: 1),
         ];
         break;
       case NotificationType.goldenBanner:
@@ -122,7 +122,7 @@ class NotificationWidget extends StatelessWidget {
                   defaultColor: strokeColorScheme.fillFaint,
                   pressedColor: strokeColorScheme.fillMuted,
                   onTap: onTap,
-                )
+                ),
               ],
             ),
           ),

lib/ui/components/title_bar_widget.dart

@@ -178,7 +178,7 @@ class TitleWidget extends StatelessWidget {
               : Text(
                   caption!,
                   style: textTheme.miniMuted,
-                )
+                ),
         ],
       ),
     );
@@ -224,7 +224,7 @@ class FlexibleSpaceBarWidget extends StatelessWidget {
                           style: textTheme.smallMuted,
                           overflow: TextOverflow.ellipsis,
                           maxLines: 1,
-                        )
+                        ),
                 ],
               ),
             ),

lib/ui/growth/apply_code_screen.dart

@@ -141,7 +141,7 @@ class _ApplyCodeScreenState extends State<ApplyCodeScreen> {
                           );
                         }
                       },
-                    )
+                    ),
                   ],
                 ),
               ),

lib/ui/growth/code_success_screen.dart

@@ -151,7 +151,7 @@ class CodeSuccessScreen extends StatelessWidget {
                               ),
                             ),
                           ),
-                        )
+                        ),
                       ],
                     ),
                   ),

lib/ui/growth/referral_code_widget.dart

@@ -41,7 +41,7 @@ class ReferralCodeWidget extends StatelessWidget {
                   Icons.adaptive.share,
                   size: 22,
                   color: colorScheme.strokeMuted,
-                )
+                ),
               ],
             ),
           ),

lib/ui/growth/storage_details_screen.dart

@@ -138,7 +138,7 @@ class _StorageDetailsScreenState extends State<StorageDetailsScreen> {
                                   S.of(context).usableReferralStorageInfo,
                                   style: textStyle.small
                                       .copyWith(color: colorScheme.textMuted),
-                                )
+                                ),
                               ],
                             ),
                           );

lib/ui/home/grant_permissions_widget.dart

@@ -78,7 +78,7 @@ class GrantPermissionsWidget extends StatelessWidget {
               spreadRadius: 190,
               blurRadius: 30,
               offset: const Offset(0, 170),
-            )
+            ),
           ],
         ),
         width: double.infinity,

lib/ui/home/header_error_widget.dart

@@ -28,7 +28,7 @@ class HeaderErrorWidget extends StatelessWidget {
               context,
               getSubscriptionPage(),
               forceCustomPageRoute: true,
-            )
+            ),
           },
         ),
       );
@@ -45,7 +45,7 @@ class HeaderErrorWidget extends StatelessWidget {
               context,
               getSubscriptionPage(),
               forceCustomPageRoute: true,
-            )
+            ),
           },
         ),
       );
@@ -63,7 +63,7 @@ class HeaderErrorWidget extends StatelessWidget {
               S.of(context).raiseTicket,
               "support@ente.io",
               subject: S.of(context).backupFailed,
-            )
+            ),
           },
         ),
       );

lib/ui/home/header_widget.dart

@@ -18,7 +18,7 @@ class HeaderWidget extends StatelessWidget {
       _statusBarWidget,
       _memoriesWidget,
     ];
-    return Column(
+    return const Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: list,
     );

lib/ui/home/home_gallery_widget.dart

@@ -86,7 +86,7 @@ class HomeGalleryWidget extends StatelessWidget {
       alignment: Alignment.bottomCenter,
       children: [
         gallery,
-        FileSelectionOverlayBar(GalleryType.homepage, selectedFiles)
+        FileSelectionOverlayBar(GalleryType.homepage, selectedFiles),
       ],
     );
     // return gallery;

lib/ui/home/loading_photos_widget.dart

@@ -117,7 +117,7 @@ class _LoadingPhotosWidgetState extends State<LoadingPhotosWidget> {
                           height: 400,
                         ),
                       ],
-                    )
+                    ),
                   ],
                 ),
                 Text(
@@ -164,7 +164,7 @@ class _LoadingPhotosWidgetState extends State<LoadingPhotosWidget> {
                             left: 0,
                             right: 0,
                             child: BottomShadowWidget(),
-                          )
+                          ),
                         ],
                       ),
                     ),

lib/ui/home/status_bar_widget.dart

@@ -114,11 +114,11 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
                       context,
                       const VerifyRecoveryPage(),
                       forceCustomPageRoute: true,
-                    )
+                    ),
                   },
                 ),
               )
-            : const SizedBox.shrink()
+            : const SizedBox.shrink(),
       ],
     );
   }

lib/ui/huge_listview/draggable_scrollbar.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:photos/ui/huge_listview/scroll_bar_thumb.dart';

lib/ui/map/map_pull_up_gallery.dart

@@ -141,7 +141,7 @@ class _MapPullUpGalleryState extends State<MapPullUpGallery> {
                               Text(
                                 S.of(context).zoomOutToSeePhotos,
                                 style: textTheme.smallFaint,
-                              )
+                              ),
                             ],
                           ),
                         ),
@@ -179,7 +179,7 @@ class _MapPullUpGalleryState extends State<MapPullUpGallery> {
                 },
               ),
             ),
-          )
+          ),
         ],
       ),
     );

lib/ui/map/map_view.dart

@@ -90,7 +90,7 @@ class _MapViewState extends State<MapView> {
                 bottom: widget.bottomSheetDraggableAreaHeight,
               ),
               child: const OSMFranceTileAttributes(),
-            )
+            ),
           ],
           children: [
             const OSMFranceTileLayer(),
@@ -123,12 +123,12 @@ class _MapViewState extends State<MapView> {
                         key: Key(markers.first.key.toString()),
                         imageMarker: widget.imageMarkers[index],
                       ),
-                      MapGalleryTileBadge(size: markers.length)
+                      MapGalleryTileBadge(size: markers.length),
                     ],
                   );
                 },
               ),
-            )
+            ),
           ],
         ),
         Positioned(

lib/ui/map/marker_image.dart

@@ -38,7 +38,7 @@ class MarkerImage extends StatelessWidget {
                 painter: MarkerPointer(bgColor),
               ),
             ),
-          )
+          ),
         ],
       ),
     );

lib/ui/payment/billing_questions_widget.dart

@@ -90,7 +90,7 @@ class FaqWidget extends StatelessWidget {
                 height: 1.5,
               ),
             ),
-          )
+          ),
         ],
       ),
     );

lib/ui/payment/stripe_subscription_page.dart

@@ -131,7 +131,7 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
               color: Theme.of(context).colorScheme.background,
               blurRadius: 16,
               offset: const Offset(0, 8),
-            )
+            ),
           ],
         ),
         child: widget.isOnboarding
@@ -166,7 +166,7 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
           _getBody(),
           const BottomShadowWidget(
             offsetDy: 40,
-          )
+          ),
         ],
       ),
     );

lib/ui/payment/subscription_common_widgets.dart

@@ -75,7 +75,7 @@ class _SubscriptionHeaderWidgetState extends State<SubscriptionHeaderWidget> {
                       .textTheme
                       .titleMedium!
                       .copyWith(fontWeight: FontWeight.bold),
-                )
+                ),
               ],
             ),
           ),

lib/ui/settings/advanced_settings_screen.dart

@@ -157,7 +157,7 @@ class _AdvancedSettingsScreenState extends State<AdvancedSettingsScreen> {
                                   );
                                 },
                               ),
-                            )
+                            ),
                           ],
                         ),
                       ],

lib/ui/settings/app_update_dialog.dart

@@ -43,7 +43,7 @@ class _AppUpdateDialogState extends State<AppUpdateDialog> {
                   style:
                       enteTextTheme.small.copyWith(color: enteColor.textMuted),
                 ),
-              )
+              ),
             ],
           ),
         ),
@@ -104,7 +104,7 @@ class _AppUpdateDialogState extends State<AppUpdateDialog> {
               mode: LaunchMode.externalApplication,
             ),
           ),
-        )
+        ),
       ],
     );
     final shouldForceUpdate =

lib/ui/settings/backup/backup_folder_selection_page.dart

@@ -159,7 +159,7 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
                       blurRadius: 24,
                       offset: const Offset(0, -8),
                       spreadRadius: 4,
-                    )
+                    ),
                   ],
                 ),
                 padding: widget.isOnboarding
@@ -313,7 +313,7 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
               : LinearGradient(
                   colors: [
                     Theme.of(context).colorScheme.boxUnSelectColor,
-                    Theme.of(context).colorScheme.boxUnSelectColor
+                    Theme.of(context).colorScheme.boxUnSelectColor,
                   ],
                 ),
         ),

lib/ui/settings/backup/backup_settings_screen.dart

@@ -122,7 +122,7 @@ class BackupSettingsScreen extends StatelessWidget {
                                   MenuSectionDescriptionWidget(
                                     content:
                                         S.of(context).deviceLockExplanation,
-                                  )
+                                  ),
                                 ],
                               )
                             : const SizedBox.shrink(),

lib/ui/settings/notification_settings_screen.dart

@@ -76,9 +76,9 @@ class NotificationSettingsScreen extends StatelessWidget {
                               content: S
                                   .of(context)
                                   .sharedPhotoNotificationsExplanation,
-                            )
+                            ),
                           ],
-                        )
+                        ),
                       ],
                     ),
                   ),

lib/ui/settings/storage_card_widget.dart

@@ -225,7 +225,7 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
                         : strokeBaseDark,
                     fractionOfStorage:
                         (userDetails.usage / userDetails.getTotalStorage()),
-                  )
+                  ),
                 ],
               ),
               const SizedBox(height: 12),
@@ -279,7 +279,7 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
                 ],
               ),
             ],
-          )
+          ),
         ],
       ),
     );
@@ -354,7 +354,7 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
               totalStorage,
               totalStorageUnit,
             ),
-      )
+      ),
     ];
   }
 }

lib/ui/sharing/manage_album_participant.dart

@@ -174,7 +174,7 @@ class _ManageIndividualParticipantState
                   Navigator.of(context).pop(true);
                 }
               },
-            )
+            ),
           ],
         ),
       ),

lib/ui/sharing/manage_links_widget.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
 import "package:fast_base58/fast_base58.dart";
@@ -256,7 +255,9 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
                       onTap: () async {
                         await Clipboard.setData(ClipboardData(text: urlValue));
                         showShortToast(
-                            context, S.of(context).linkCopiedToClipboard);
+                          context,
+                          S.of(context).linkCopiedToClipboard,
+                        );
                       },
                       isBottomBorderRadiusRemoved: true,
                     ),

lib/ui/sharing/pickers/device_limit_picker_page.dart

@@ -46,7 +46,7 @@ class DeviceLimitPickerPage extends StatelessWidget {
                       ),
                       MenuSectionDescriptionWidget(
                         content: S.of(context).maxDeviceLimitSpikeHandling(50),
-                      )
+                      ),
                     ],
                   ),
                 );

lib/ui/sharing/share_collection_page.dart

@@ -92,7 +92,7 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
             AddParticipantPage(widget.collection, true),
           ).then(
             (value) => {
-              if (mounted) {setState(() => {})}
+              if (mounted) {setState(() => {})},
             },
           );
         },
@@ -117,7 +117,7 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
           routeToPage(context, AddParticipantPage(widget.collection, false))
               .then(
             (value) => {
-              if (mounted) {setState(() => {})}
+              if (mounted) {setState(() => {})},
             },
           );
         },
@@ -221,7 +221,7 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
                 ManageSharedLinkWidget(collection: widget.collection),
               ).then(
                 (value) => {
-                  if (mounted) {setState(() => {})}
+                  if (mounted) {setState(() => {})},
                 },
               );
             },

lib/ui/tabs/home_widget.dart

@@ -158,8 +158,8 @@ class _HomeWidgetState extends State<HomeWidget> {
               {
                 setState(
                   () {},
-                )
-              }
+                ),
+              },
           },
         );
       }
@@ -204,7 +204,7 @@ class _HomeWidgetState extends State<HomeWidget> {
       (_) => Future.delayed(
         const Duration(seconds: 1),
         () => {
-          if (mounted) {showChangeLog(context)}
+          if (mounted) {showChangeLog(context)},
         },
       ),
     );

lib/ui/tabs/shared_collections_tab.dart

@@ -245,7 +245,7 @@ class _SharedCollectionsTabState extends State<SharedCollectionsTab>
                             );
                           },
                         ),
-                      )
+                      ),
                     ],
                   )
                 : const SizedBox.shrink(),

lib/ui/tools/app_lock.dart

@@ -117,7 +117,7 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {
       localeListResolutionCallback: localResolutionCallBack,
       localizationsDelegates: const [
         ...AppLocalizations.localizationsDelegates,
-        S.delegate
+        S.delegate,
       ],
       onGenerateRoute: (settings) {
         switch (settings.name) {

lib/ui/tools/deduplicate_page.dart

@@ -130,9 +130,9 @@ class _DeduplicatePageState extends State<DeduplicatePage> {
                     ),
                   ],
                 ),
-              )
+              ),
             ],
-          )
+          ),
         ],
       ),
       body: _getBody(),

lib/ui/tools/editor/image_editor_page.dart

@@ -87,7 +87,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
                       });
                     },
                     icon: const Icon(Icons.history),
-                  )
+                  ),
                 ]
               : [],
         ),

lib/ui/viewer/actions/delete_empty_albums.dart

@@ -107,7 +107,7 @@ class _DeleteEmptyAlbumsState extends State<DeleteEmptyAlbums> {
                     _isCancelled = true;
                     Navigator.of(context, rootNavigator: true).pop();
                   },
-                )
+                ),
               ],
               title: S.of(context).deleteEmptyAlbumsWithQuestionMark,
               body: S.of(context).deleteAlbumsDialogBody,

lib/ui/viewer/actions/file_selection_actions_widget.dart

@@ -461,7 +461,7 @@ class _FileSelectionActionsWidgetState
           buttonAction: ButtonAction.third,
           shouldStickToDarkTheme: true,
           isInAlert: true,
-        )
+        ),
       ],
       title: S.of(context).publicLinkCreated,
       body: S.of(context).youCanManageYourLinksInTheShareTab,

lib/ui/viewer/file/detail_page.dart

@@ -81,7 +81,7 @@ class _DetailPageState extends State<DetailPage> {
   void initState() {
     super.initState();
     _files = [
-      ...widget.config.files
+      ...widget.config.files,
     ]; // Make a copy since we append preceding and succeeding entries to this
     _selectedIndexNotifier.value = widget.config.selectedIndex;
     _preloadEntries();
@@ -305,7 +305,7 @@ class _DetailPageState extends State<DetailPage> {
     }
     if (_selectedIndexNotifier.value == totalFiles - 1) {
       // Deleted the last file
-      await _pageController!.previousPage(
+      await _pageController.previousPage(
         duration: const Duration(milliseconds: 200),
         curve: Curves.easeInOut,
       );
@@ -313,7 +313,7 @@ class _DetailPageState extends State<DetailPage> {
         _files!.remove(file);
       });
     } else {
-      await _pageController!.nextPage(
+      await _pageController.nextPage(
         duration: const Duration(milliseconds: 200),
         curve: Curves.easeInOut,
       );

lib/ui/viewer/file/file_details_widget.dart

@@ -159,7 +159,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
                 )
               : const SizedBox.shrink();
         },
-      )
+      ),
     ]);
     if (_isImage) {
       fileDetailsTiles.addAll([
@@ -173,7 +173,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
               ],
             );
           },
-        )
+        ),
       ]);
     }
 
@@ -230,7 +230,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
                   },
                   childCount: fileDetailsTiles.length,
                 ),
-              )
+              ),
             ],
           ),
         ),
@@ -253,10 +253,10 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
           locationDataFromExif?.longitude != null) {
         widget.file.location = locationDataFromExif;
         await FileMagicService.instance.updatePublicMagicMetadata([
-          widget.file
+          widget.file,
         ], {
           latKey: locationDataFromExif!.latitude,
-          longKey: locationDataFromExif.longitude
+          longKey: locationDataFromExif.longitude,
         });
         hasLocationData.value = true;
       }

lib/ui/viewer/file/video_controls.dart

@@ -110,7 +110,7 @@ class _VideoControlsState extends State<VideoControls> {
   Widget _buildBottomBar(
     BuildContext context,
   ) {
-    final iconColor = Theme.of(context).textTheme.button!.color;
+    final iconColor = Theme.of(context).textTheme.labelLarge!.color;
 
     return Container(
       padding: const EdgeInsets.only(bottom: 60),

lib/ui/viewer/file/video_widget.dart

@@ -168,7 +168,7 @@ class _VideoWidgetState extends State<VideoWidget> {
     final contentWithDetector = GestureDetector(
       child: content,
       onVerticalDragUpdate: (d) => {
-        if (d.delta.dy > dragSensitivity) {Navigator.of(context).pop()}
+        if (d.delta.dy > dragSensitivity) {Navigator.of(context).pop()},
       },
     );
     return VisibilityDetector(

lib/ui/viewer/file/zoomable_image.dart

@@ -113,7 +113,7 @@ class _ZoomableImageState extends State<ZoomableImage>
         ? null
         : (d) => {
               if (!_isZooming && d.delta.dy > dragSensitivity)
-                {Navigator.of(context).pop()}
+                {Navigator.of(context).pop()},
             };
     return GestureDetector(
       onVerticalDragUpdate: verticalDragCallback,
@@ -284,7 +284,7 @@ class _ZoomableImageState extends State<ZoomableImage>
         _logger.info('Updating aspect ratio for ${widget.photo} to $h:$w');
 
         await FileMagicService.instance.updatePublicMagicMetadata([
-          widget.photo
+          widget.photo,
         ], {
           heightKey: h,
           widthKey: w,

lib/ui/viewer/file_details/location_tags_widget.dart

@@ -81,7 +81,7 @@ class _LocationTagsWidgetState extends State<LocationTagsWidget> {
         Text(
           S.of(context).groupNearbyPhotos,
           style: getEnteTextTheme(context).miniBoldMuted,
-        )
+        ),
       ];
     } else {
       if (mounted) {

lib/ui/viewer/file_details/objects_item_widget.dart

@@ -38,7 +38,7 @@ class ObjectsItemWidget extends StatelessWidget {
           ChipButtonWidget(
             S.of(context).noResults,
             noChips: true,
-          )
+          ),
         ];
       }
       // sort by values

lib/ui/viewer/gallery/collection_page.dart

@@ -72,7 +72,7 @@ class CollectionPage extends StatelessWidget {
               (event) =>
                   event.id == c.collection.id &&
                   event.type == CollectionMetaEventType.sortChanged,
-            )
+            ),
       ],
       removalEventTypes: const {
         EventType.deletedFromRemote,
@@ -107,7 +107,7 @@ class CollectionPage extends StatelessWidget {
             galleryType,
             _selectedFiles,
             collection: c.collection,
-          )
+          ),
         ],
       ),
     );

lib/ui/viewer/gallery/component/group/lazy_group_gallery.dart

@@ -215,7 +215,7 @@ class _LazyGroupGalleryState extends State<LazyGroupGallery> {
                               },
                             );
                     },
-                  )
+                  ),
           ],
         ),
         _shouldRender!

lib/ui/viewer/gallery/device_folder_page.dart

@@ -73,7 +73,7 @@ class DeviceFolderPage extends StatelessWidget {
           FileSelectionOverlayBar(
             GalleryType.localFolder,
             _selectedFiles,
-          )
+          ),
         ],
       ),
     );
@@ -183,7 +183,7 @@ class _BackupHeaderWidgetState extends State<BackupHeaderWidget> {
                     duration: const Duration(milliseconds: 1000),
                   );
                 },
-              )
+              ),
             ],
           ),
         ],

lib/ui/viewer/gallery/empty_album_state.dart

@@ -30,7 +30,7 @@ class EmptyAlbumState extends StatelessWidget {
             onTap: () async {
               try {
                 await showAddPhotosSheet(context, c);
-              } catch (e, s) {
+              } catch (e) {
                 showGenericErrorDialog(context: context);
               }
             },

lib/ui/viewer/gallery/gallery_app_bar_widget.dart

@@ -201,7 +201,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
           isInAlert: true,
           shouldStickToDarkTheme: true,
           labelText: S.of(context).cancel,
-        )
+        ),
       ],
       title: S.of(context).leaveSharedAlbum,
       body: S.of(context).photosAddedByYouWillBeRemovedFromTheAlbum,
@@ -699,7 +699,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
         unawaited(
           routeToPage(
             context,
-              (isQuickLink && (collection.hasLink)) ? ManageSharedLinkWidget(collection: collection!) :
+              (isQuickLink && (collection.hasLink)) ? ManageSharedLinkWidget(collection: collection) :
               ShareCollectionPage
               (collection),
           ),

lib/ui/viewer/gallery/hidden_page.dart

@@ -49,7 +49,7 @@ class HiddenPage extends StatelessWidget {
       removalEventTypes: const {
         EventType.unhide,
         EventType.deletedFromEverywhere,
-        EventType.deletedFromRemote
+        EventType.deletedFromRemote,
       },
       forceReloadEvents: [
         Bus.instance.on<FilesUpdatedEvent>().where(

lib/ui/viewer/gallery/hooks/add_photos_sheet.dart

@@ -193,7 +193,7 @@ class AddPhotosPhotoWidget extends StatelessWidget {
                         ],
                       ),
                     ),
-                  )
+                  ),
                 ],
               ),
             ),

lib/ui/viewer/gallery/hooks/pick_cover_photo.dart

@@ -179,7 +179,7 @@ class PickCoverPhotoWidget extends StatelessWidget {
                         ],
                       ),
                     ),
-                  )
+                  ),
                 ],
               ),
             ),

lib/ui/viewer/gallery/photo_grid_size_picker_page.dart

@@ -29,14 +29,14 @@ class PhotoGridSizePickerPage extends StatelessWidget {
           SliverList(
             delegate: SliverChildBuilderDelegate(
               (context, index) {
-                return Padding(
-                  padding: const EdgeInsets.symmetric(
+                return const Padding(
+                  padding: EdgeInsets.symmetric(
                     horizontal: 16,
                     vertical: 20,
                   ),
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
-                    children: const [
+                    children: [
                       ClipRRect(
                         borderRadius: BorderRadius.all(Radius.circular(8)),
                         child: ItemsWidget(),

lib/ui/viewer/gallery/trash_page.dart

@@ -89,7 +89,7 @@ class TrashPage extends StatelessWidget {
               ),
             ),
           ),
-          FileSelectionOverlayBar(GalleryType.trash, _selectedFiles)
+          FileSelectionOverlayBar(GalleryType.trash, _selectedFiles),
         ],
       ),
     );

lib/ui/viewer/location/add_location_sheet.dart

@@ -148,7 +148,7 @@ class _AddLocationSheetState extends State<AddLocationSheet> {
                                   ),
                                 );
                               },
-                            )
+                            ),
                           ],
                         ),
                         const SizedBox(height: 24),

lib/ui/viewer/location/location_screen.dart

@@ -234,7 +234,7 @@ class _LocationGalleryWidgetState extends State<LocationGalleryWidget> {
               FileSelectionOverlayBar(
                 GalleryType.locationTag,
                 _selectedFiles,
-              )
+              ),
             ],
           );
         } else {
@@ -307,7 +307,7 @@ class _GalleryHeaderWidgetState extends State<GalleryHeaderWidget> {
                   );
                 }
               },
-            )
+            ),
           ],
         ),
       ),

lib/ui/viewer/location/pick_center_point_widget.dart

@@ -165,7 +165,7 @@ class PickCenterPointWidget extends StatelessWidget {
                         ],
                       ),
                     ),
-                  )
+                  ),
                 ],
               ),
             ),

lib/ui/viewer/search/result/search_result_page.dart

@@ -67,7 +67,7 @@ class SearchResultPage extends StatelessWidget {
           FileSelectionOverlayBar(
             overlayType,
             _selectedFiles,
-          )
+          ),
         ],
       ),
     );

lib/ui/viewer/search/result/search_result_widget.dart

@@ -82,7 +82,7 @@ class SearchResultWidget extends StatelessWidget {
                         return const SizedBox.shrink();
                       }
                     },
-                  )
+                  ),
                 ],
               ),
               const Spacer(),

lib/utils/device_info.dart

@@ -27,7 +27,7 @@ final Set<String> iOSLowEndMachineCodes = <String>{
   "iPhone10,2", // iPhone 8 Plus
   "iPhone10,3", // iPhone X Global
   "iPhone10,4", // iPhone 8
-  "iPhone10,5" //  iPhone 8
+  "iPhone10,5", //  iPhone 8
 };
 
 Future<bool> isLowSpecDevice() async {

lib/utils/file_uploader.dart

@@ -397,7 +397,7 @@ class FileUploader {
       await _checkIfWithinStorageLimit(mediaUploadData!.sourceFile!);
       final encryptedFile = io.File(encryptedFilePath);
       final EncryptionResult fileAttributes = await CryptoUtil.encryptFile(
-        mediaUploadData!.sourceFile!.path,
+        mediaUploadData.sourceFile!.path,
         encryptedFilePath,
         key: key,
       );
@@ -468,7 +468,7 @@ class FileUploader {
             (mediaUploadData.width ?? 0) != 0) {
           final pubMetadata = {
             heightKey: mediaUploadData.height,
-            widthKey: mediaUploadData.width
+            widthKey: mediaUploadData.width,
           };
           if (mediaUploadData.motionPhotoStartIndex != null) {
             pubMetadata[motionVideoIndexKey] =
@@ -780,7 +780,7 @@ class FileUploader {
       "metadata": {
         "encryptedData": encryptedMetadata,
         "decryptionHeader": metadataDecryptionHeader,
-      }
+      },
     };
     if (pubMetadata != null) {
       request["pubMagicMetadata"] = pubMetadata;
@@ -855,7 +855,7 @@ class FileUploader {
       "metadata": {
         "encryptedData": encryptedMetadata,
         "decryptionHeader": metadataDecryptionHeader,
-      }
+      },
     };
     try {
       final response = await _enteDio.put("/files/update", data: request);

lib/utils/share_util.dart

@@ -27,7 +27,7 @@ final _videoExtension = {
   "webm",
   "wmv",
   "flv",
-  "3gp"
+  "3gp",
 };
 // share is used to share media/files from ente to other apps
 Future<void> share(
@@ -172,7 +172,7 @@ Future<List<File>> convertPickedFiles(
         enteTypeType = FileType.video;
       } else {
         _logger.warning(
-          "ignore file type ${media.mimeType}, extn ${extenName} path: ${media.path}",
+          "ignore file type ${media.mimeType}, extn $extenName path: ${media.path}",
         );
         continue;
       }

test/utils/date_time_util_test.dart

@@ -17,7 +17,7 @@ void main() {
       "IMG_20210921_144423_783",
       "Screenshot_2022-06-21-16-51-29-164_newFormat.heic",
       "Screenshot 20221106 211633.com.google.android.apps.nbu.paisa.user.jpg",
-      "signal-2022-12-17-15-16-04-718.jpg"
+      "signal-2022-12-17-15-16-04-718.jpg",
     ];
     for (String val in validParsing) {
       final parsedValue = parseDateTimeFromFileNameV2(val);
@@ -36,7 +36,7 @@ void main() {
     final List<String> badParsing = [
       "Snapchat-431959199.mp4.",
       "Snapchat-400000000.mp4",
-      "Snapchat-900000000.mp4"
+      "Snapchat-900000000.mp4",
     ];
     for (String val in badParsing) {
       final parsedValue = parseDateTimeFromFileNameV2(val);