Fix more lint issues

analysis_options.yaml

@@ -41,6 +41,9 @@ analyzer:
     unused_import: error
     prefer_is_empty: warning
     use_rethrow_when_possible: info
+    unused_field: warning
+    use_key_in_widget_constructors: warning
+
 
     prefer_const_constructors: ignore # too many warnings
     prefer_const_declarations: ignore # too many warnings

lib/events/sync_status_update_event.dart

@@ -27,12 +27,12 @@ class SyncStatusUpdate extends Event {
 }
 
 enum SyncStatus {
-  started_first_gallery_import,
-  completed_first_gallery_import,
-  applying_remote_diff,
-  preparing_for_upload,
-  in_progress,
+  startedFirstGalleryImport,
+  completedFirstGalleryImport,
+  applyingRemoteDiff,
+  preparingForUpload,
+  inProgress,
   paused,
-  completed_backup,
+  completedBackup,
   error,
 }

lib/events/tab_changed_event.dart

@@ -16,8 +16,8 @@ class TabChangedEvent extends Event {
 }
 
 enum TabChangedEventSource {
-  tab_bar,
-  page_view,
-  collections_page,
-  back_button,
+  tabBar,
+  pageView,
+  collectionsPage,
+  backButton,
 }

lib/models/galleryType.dart

@@ -2,9 +2,9 @@ enum GalleryType {
   homepage,
   archive,
   trash,
-  local_folder,
+  localFolder,
   // indicator for gallery view of collections shared with the user
-  shared_collection,
-  owned_collection,
-  search_results
+  sharedCollection,
+  ownedCollection,
+  searchResults
 }

lib/services/favorites_service.dart

@@ -10,19 +10,16 @@ import 'package:photos/models/file.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/utils/crypto_util.dart';
-import 'package:photos/utils/file_uploader.dart';
 
 class FavoritesService {
   Configuration _config;
   CollectionsService _collectionsService;
-  FileUploader _fileUploader;
   FilesDB _filesDB;
   int _cachedFavoritesCollectionID;
 
   FavoritesService._privateConstructor() {
     _config = Configuration.instance;
     _collectionsService = CollectionsService.instance;
-    _fileUploader = FileUploader.instance;
     _filesDB = FilesDB.instance;
   }
   static FavoritesService instance = FavoritesService._privateConstructor();

lib/services/local_sync_service.dart

@@ -33,8 +33,7 @@ class LocalSyncService {
 
   LocalSyncService._privateConstructor();
 
-  static final LocalSyncService instance =
-      LocalSyncService._privateConstructor();
+  static final LocalSyncService instance = LocalSyncService._privateConstructor();
 
   Future<void> init() async {
     _prefs = await SharedPreferences.getInstance();
@@ -86,8 +85,7 @@ class LocalSyncService {
       );
     } else {
       // Load from 0 - 01.01.2010
-      Bus.instance
-          .fire(SyncStatusUpdate(SyncStatus.started_first_gallery_import));
+      Bus.instance.fire(SyncStatusUpdate(SyncStatus.startedFirstGalleryImport));
       var startTime = 0;
       var toYear = 2010;
       var toTime = DateTime(toYear).microsecondsSinceEpoch;
@@ -115,8 +113,7 @@ class LocalSyncService {
         !_prefs.getBool(kHasCompletedFirstImportKey)) {
       await _prefs.setBool(kHasCompletedFirstImportKey, true);
       _logger.fine("first gallery import finished");
-      Bus.instance
-          .fire(SyncStatusUpdate(SyncStatus.completed_first_gallery_import));
+      Bus.instance.fire(SyncStatusUpdate(SyncStatus.completedFirstGalleryImport));
     }
     final endTime = DateTime.now().microsecondsSinceEpoch;
     final duration = Duration(microseconds: endTime - startTime);
@@ -139,8 +136,7 @@ class LocalSyncService {
     );
     final existingIDs = await _db.getExistingLocalFileIDs();
     final invalidIDs = getInvalidFileIDs().toSet();
-    final unsyncedFiles =
-        await getUnsyncedFiles(localAssets, existingIDs, invalidIDs, _computer);
+    final unsyncedFiles = await getUnsyncedFiles(localAssets, existingIDs, invalidIDs, _computer);
     if (unsyncedFiles.isNotEmpty) {
       await _db.insertMultiple(unsyncedFiles);
       _logger.info(
@@ -203,8 +199,7 @@ class LocalSyncService {
   }
 
   bool hasGrantedLimitedPermissions() {
-    return _prefs.getString(kPermissionStateKey) ==
-        PermissionState.limited.toString();
+    return _prefs.getString(kPermissionStateKey) == PermissionState.limited.toString();
   }
 
   Future<void> onPermissionGranted(PermissionState state) async {
@@ -233,12 +228,10 @@ class LocalSyncService {
     final files = await getDeviceFiles(fromTime, toTime, _computer);
     if (files.isNotEmpty) {
       _logger.info("Fetched " + files.length.toString() + " files.");
-      final updatedFiles = files
-          .where((file) => existingLocalFileIDs.contains(file.localID))
-          .toList();
+      final updatedFiles =
+          files.where((file) => existingLocalFileIDs.contains(file.localID)).toList();
       updatedFiles.removeWhere((file) => editedFileIDs.contains(file.localID));
-      updatedFiles
-          .removeWhere((file) => downloadedFileIDs.contains(file.localID));
+      updatedFiles.removeWhere((file) => downloadedFileIDs.contains(file.localID));
       if (updatedFiles.isNotEmpty) {
         _logger.info(
           updatedFiles.length.toString() + " local files were updated.",
@@ -276,15 +269,13 @@ class LocalSyncService {
       if (Platform.isIOS) {
         var assetEntity = await AssetEntity.fromId(file.localID);
         if (assetEntity != null) {
-          var isLocallyAvailable =
-              await assetEntity.isLocallyAvailable(isOrigin: true);
+          var isLocallyAvailable = await assetEntity.isLocallyAvailable(isOrigin: true);
           _logger.info(
             're-upload asset ${file.toString()} with localAvailableFlag '
             '$isLocallyAvailable and fav ${assetEntity.isFavorite}',
           );
         } else {
-          _logger
-              .info('re-upload failed to fetch assetInfo ${file.toString()}');
+          _logger.info('re-upload failed to fetch assetInfo ${file.toString()}');
         }
       }
     } catch (ignore) {

lib/services/remote_sync_service.dart

@@ -32,8 +32,7 @@ class RemoteSyncService {
   final _uploader = FileUploader.instance;
   final _collectionsService = CollectionsService.instance;
   final _diffFetcher = DiffFetcher();
-  final FileMigrationService _fileMigrationService =
-      FileMigrationService.instance;
+  final FileMigrationService _fileMigrationService = FileMigrationService.instance;
   int _completedUploads = 0;
   SharedPreferences _prefs;
   Completer<void> _existingSync;
@@ -49,8 +48,7 @@ class RemoteSyncService {
 
   static const kMaximumPermissibleUploadsInThrottledMode = 4;
 
-  static final RemoteSyncService instance =
-      RemoteSyncService._privateConstructor();
+  static final RemoteSyncService instance = RemoteSyncService._privateConstructor();
 
   RemoteSyncService._privateConstructor();
 
@@ -98,7 +96,7 @@ class RemoteSyncService {
           // session are not processed now
           sync();
         } else {
-          Bus.instance.fire(SyncStatusUpdate(SyncStatus.completed_backup));
+          Bus.instance.fire(SyncStatusUpdate(SyncStatus.completedBackup));
         }
       } else {
         _existingSync.complete();
@@ -141,11 +139,10 @@ class RemoteSyncService {
   }
 
   Future<void> _syncUpdatedCollections(bool silently) async {
-    final updatedCollections =
-        await _collectionsService.getCollectionsToBeSynced();
+    final updatedCollections = await _collectionsService.getCollectionsToBeSynced();
 
     if (updatedCollections.isNotEmpty && !silently) {
-      Bus.instance.fire(SyncStatusUpdate(SyncStatus.applying_remote_diff));
+      Bus.instance.fire(SyncStatusUpdate(SyncStatus.applyingRemoteDiff));
     }
     for (final c in updatedCollections) {
       await _syncCollectionDiff(
@@ -169,12 +166,10 @@ class RemoteSyncService {
   }
 
   Future<void> _syncCollectionDiff(int collectionID, int sinceTime) async {
-    final diff =
-        await _diffFetcher.getEncryptedFilesDiff(collectionID, sinceTime);
+    final diff = await _diffFetcher.getEncryptedFilesDiff(collectionID, sinceTime);
     if (diff.deletedFiles.isNotEmpty) {
       final fileIDs = diff.deletedFiles.map((f) => f.uploadedFileID).toList();
-      final deletedFiles =
-          (await FilesDB.instance.getFilesFromIDs(fileIDs)).values.toList();
+      final deletedFiles = (await FilesDB.instance.getFilesFromIDs(fileIDs)).values.toList();
       await FilesDB.instance.deleteFilesFromCollection(collectionID, fileIDs);
       Bus.instance.fire(
         CollectionUpdatedEvent(
@@ -199,8 +194,7 @@ class RemoteSyncService {
             collectionID.toString(),
       );
       Bus.instance.fire(LocalPhotosUpdatedEvent(diff.updatedFiles));
-      Bus.instance
-          .fire(CollectionUpdatedEvent(collectionID, diff.updatedFiles));
+      Bus.instance.fire(CollectionUpdatedEvent(collectionID, diff.updatedFiles));
     }
 
     if (diff.latestUpdatedAtTime > 0) {
@@ -220,28 +214,23 @@ class RemoteSyncService {
   Future<List<File>> _getFilesToBeUploaded() async {
     final foldersToBackUp = Configuration.instance.getPathsToBackUp();
     List<File> filesToBeUploaded;
-    if (LocalSyncService.instance.hasGrantedLimitedPermissions() &&
-        foldersToBackUp.isEmpty) {
+    if (LocalSyncService.instance.hasGrantedLimitedPermissions() && foldersToBackUp.isEmpty) {
       filesToBeUploaded = await _db.getAllLocalFiles();
     } else {
-      filesToBeUploaded =
-          await _db.getFilesToBeUploadedWithinFolders(foldersToBackUp);
+      filesToBeUploaded = await _db.getFilesToBeUploadedWithinFolders(foldersToBackUp);
     }
     if (!Configuration.instance.shouldBackupVideos() || _shouldThrottleSync()) {
-      filesToBeUploaded
-          .removeWhere((element) => element.fileType == FileType.video);
+      filesToBeUploaded.removeWhere((element) => element.fileType == FileType.video);
     }
     if (filesToBeUploaded.isNotEmpty) {
       final int prevCount = filesToBeUploaded.length;
       final ignoredIDs = await IgnoredFilesService.instance.ignoredIDs;
       filesToBeUploaded.removeWhere(
-        (file) =>
-            IgnoredFilesService.instance.shouldSkipUpload(ignoredIDs, file),
+        (file) => IgnoredFilesService.instance.shouldSkipUpload(ignoredIDs, file),
       );
       if (prevCount != filesToBeUploaded.length) {
         _logger.info(
-          (prevCount - filesToBeUploaded.length).toString() +
-              " files were ignored for upload",
+          (prevCount - filesToBeUploaded.length).toString() + " files were ignored for upload",
         );
       }
     }
@@ -265,11 +254,10 @@ class RemoteSyncService {
     _logger.info(editedFiles.length.toString() + " files edited.");
 
     _completedUploads = 0;
-    int toBeUploaded =
-        filesToBeUploaded.length + updatedFileIDs.length + editedFiles.length;
+    int toBeUploaded = filesToBeUploaded.length + updatedFileIDs.length + editedFiles.length;
 
     if (toBeUploaded > 0) {
-      Bus.instance.fire(SyncStatusUpdate(SyncStatus.preparing_for_upload));
+      Bus.instance.fire(SyncStatusUpdate(SyncStatus.preparingForUpload));
       // verify if files upload is allowed based on their subscription plan and
       // storage limit. To avoid creating new endpoint, we are using
       // fetchUploadUrls as alternative method.
@@ -277,10 +265,8 @@ class RemoteSyncService {
     }
     final List<Future> futures = [];
     for (final uploadedFileID in updatedFileIDs) {
-      if (_shouldThrottleSync() &&
-          futures.length >= kMaximumPermissibleUploadsInThrottledMode) {
-        _logger
-            .info("Skipping some updated files as we are throttling uploads");
+      if (_shouldThrottleSync() && futures.length >= kMaximumPermissibleUploadsInThrottledMode) {
+        _logger.info("Skipping some updated files as we are throttling uploads");
         break;
       }
       final file = await _db.getUploadedFileInAnyCollection(uploadedFileID);
@@ -288,23 +274,19 @@ class RemoteSyncService {
     }
 
     for (final file in filesToBeUploaded) {
-      if (_shouldThrottleSync() &&
-          futures.length >= kMaximumPermissibleUploadsInThrottledMode) {
+      if (_shouldThrottleSync() && futures.length >= kMaximumPermissibleUploadsInThrottledMode) {
         _logger.info("Skipping some new files as we are throttling uploads");
         break;
       }
       // prefer existing collection ID for manually uploaded files.
       // See https://github.com/ente-io/frame/pull/187
       final collectionID = file.collectionID ??
-          (await CollectionsService.instance
-                  .getOrCreateForPath(file.deviceFolder))
-              .id;
+          (await CollectionsService.instance.getOrCreateForPath(file.deviceFolder)).id;
       _uploadFile(file, collectionID, futures);
     }
 
     for (final file in editedFiles) {
-      if (_shouldThrottleSync() &&
-          futures.length >= kMaximumPermissibleUploadsInThrottledMode) {
+      if (_shouldThrottleSync() && futures.length >= kMaximumPermissibleUploadsInThrottledMode) {
         _logger.info("Skipping some edited files as we are throttling uploads");
         break;
       }
@@ -332,17 +314,15 @@ class RemoteSyncService {
   }
 
   void _uploadFile(File file, int collectionID, List<Future> futures) {
-    final future = _uploader
-        .upload(file, collectionID)
-        .then((uploadedFile) => _onFileUploaded(uploadedFile));
+    final future =
+        _uploader.upload(file, collectionID).then((uploadedFile) => _onFileUploaded(uploadedFile));
     futures.add(future);
   }
 
   Future<void> _onFileUploaded(File file) async {
     Bus.instance.fire(CollectionUpdatedEvent(file.collectionID, [file]));
     _completedUploads++;
-    final toBeUploadedInThisSession =
-        FileUploader.instance.getCurrentSessionUploadCount();
+    final toBeUploadedInThisSession = FileUploader.instance.getCurrentSessionUploadCount();
     if (toBeUploadedInThisSession == 0) {
       return;
     }
@@ -360,7 +340,7 @@ class RemoteSyncService {
     }
     Bus.instance.fire(
       SyncStatusUpdate(
-        SyncStatus.in_progress,
+        SyncStatus.inProgress,
         completed: _completedUploads,
         total: toBeUploadedInThisSession,
       ),
@@ -380,9 +360,7 @@ class RemoteSyncService {
       final existingFiles = file.deviceFolder == null
           ? null
           : await _db.getMatchingFiles(file.title, file.deviceFolder);
-      if (existingFiles == null ||
-          existingFiles.isEmpty ||
-          userID != file.ownerID) {
+      if (existingFiles == null || existingFiles.isEmpty || userID != file.ownerID) {
         // File uploaded from a different device or uploaded by different user
         // Other rare possibilities : The local file is present on
         // device but it's not imported in local db due to missing permission
@@ -400,10 +378,7 @@ class RemoteSyncService {
         // case when localID for a file changes and the file is uploaded again in
         // the same collection
         final fileWithLocalID = existingFiles.firstWhere(
-          (e) =>
-              file.localID != null &&
-              e.localID != null &&
-              e.localID == file.localID,
+          (e) => file.localID != null && e.localID != null && e.localID == file.localID,
           orElse: () => existingFiles.firstWhere(
             (e) => e.localID != null,
             orElse: () => null,
@@ -487,8 +462,7 @@ class RemoteSyncService {
   // return true if the client needs to re-sync the collections from previous
   // version
   bool _hasReSynced() {
-    return _prefs.containsKey(kHasSyncedEditTime) &&
-        _prefs.containsKey(kHasSyncedArchiveKey);
+    return _prefs.containsKey(kHasSyncedEditTime) && _prefs.containsKey(kHasSyncedArchiveKey);
   }
 
   Future<void> _markReSyncAsDone() async {

lib/services/sync_service.dart

@@ -82,10 +82,9 @@ class SyncService {
     try {
       await _doSync();
       if (_lastSyncStatusEvent != null &&
-          _lastSyncStatusEvent.status !=
-              SyncStatus.completed_first_gallery_import &&
-          _lastSyncStatusEvent.status != SyncStatus.completed_backup) {
-        Bus.instance.fire(SyncStatusUpdate(SyncStatus.completed_backup));
+          _lastSyncStatusEvent.status != SyncStatus.completedFirstGalleryImport &&
+          _lastSyncStatusEvent.status != SyncStatus.completedBackup) {
+        Bus.instance.fire(SyncStatusUpdate(SyncStatus.completedBackup));
       }
       successful = true;
     } on WiFiUnavailableError {
@@ -96,7 +95,7 @@ class SyncService {
     } on SyncStopRequestedError {
       _syncStopRequested = false;
       Bus.instance.fire(
-        SyncStatusUpdate(SyncStatus.completed_backup, wasStopped: true),
+        SyncStatusUpdate(SyncStatus.completedBackup, wasStopped: true),
       );
     } on NoActiveSubscriptionError {
       Bus.instance.fire(

lib/ui/account/login_page.dart

@@ -17,7 +17,7 @@ class _LoginPageState extends State<LoginPage> {
   final _config = Configuration.instance;
   bool _emailIsValid = false;
   String _email;
-  Color _emailInputFieldColor = null;
+  Color _emailInputFieldColor;
 
   @override
   void initState() {
@@ -56,8 +56,7 @@ class _LoginPageState extends State<LoginPage> {
         buttonText: 'Log in',
         onPressedFunction: () {
           UserService.instance.setEmail(_email);
-          UserService.instance
-              .getOtt(context, _email, isCreateAccountScreen: false);
+          UserService.instance.getOtt(context, _email, isCreateAccountScreen: false);
           FocusScope.of(context).unfocus();
         },
       ),
@@ -73,8 +72,7 @@ class _LoginPageState extends State<LoginPage> {
           child: ListView(
             children: [
               Padding(
-                padding:
-                    const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
+                padding: const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
                 child: Text(
                   'Welcome back!',
                   style: Theme.of(context).textTheme.headline4,
@@ -88,8 +86,7 @@ class _LoginPageState extends State<LoginPage> {
                     fillColor: _emailInputFieldColor,
                     filled: true,
                     hintText: 'Email',
-                    contentPadding:
-                        EdgeInsets.symmetric(horizontal: 15, vertical: 15),
+                    contentPadding: EdgeInsets.symmetric(horizontal: 15, vertical: 15),
                     border: UnderlineInputBorder(
                       borderSide: BorderSide.none,
                       borderRadius: BorderRadius.circular(6),
@@ -111,8 +108,7 @@ class _LoginPageState extends State<LoginPage> {
                       _email = value.trim();
                       _emailIsValid = EmailValidator.validate(_email);
                       if (_emailIsValid) {
-                        _emailInputFieldColor =
-                            Color.fromRGBO(45, 194, 98, 0.2);
+                        _emailInputFieldColor = Color.fromRGBO(45, 194, 98, 0.2);
                       } else {
                         _emailInputFieldColor = null;
                       }
@@ -138,10 +134,7 @@ class _LoginPageState extends State<LoginPage> {
                       flex: 5,
                       child: RichText(
                         text: TextSpan(
-                          style: Theme.of(context)
-                              .textTheme
-                              .subtitle1
-                              .copyWith(fontSize: 12),
+                          style: Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 12),
                           children: [
                             TextSpan(
                               text: "By clicking log in, I agree to the ",

lib/ui/account/password_reentry_page.dart

@@ -99,8 +99,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
           child: ListView(
             children: [
               Padding(
-                padding:
-                    const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
+                padding: const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
                 child: Text(
                   'Welcome back!',
                   style: Theme.of(context).textTheme.headline4,
@@ -121,9 +120,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                     suffixIcon: _passwordInFocus
                         ? IconButton(
                             icon: Icon(
-                              _passwordVisible
-                                  ? Icons.visibility
-                                  : Icons.visibility_off,
+                              _passwordVisible ? Icons.visibility : Icons.visibility_off,
                               color: Theme.of(context).iconTheme.color,
                               size: 20,
                             ),
@@ -171,40 +168,32 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                           ),
                         );
                       },
-                      child: Container(
-                        child: Center(
-                          child: Text(
-                            "Forgot password",
-                            style:
-                                Theme.of(context).textTheme.subtitle1.copyWith(
-                                      fontSize: 14,
-                                      decoration: TextDecoration.underline,
-                                    ),
-                          ),
+                      child: Center(
+                        child: Text(
+                          "Forgot password",
+                          style: Theme.of(context).textTheme.subtitle1.copyWith(
+                                fontSize: 14,
+                                decoration: TextDecoration.underline,
+                              ),
                         ),
                       ),
                     ),
                     GestureDetector(
                       behavior: HitTestBehavior.opaque,
                       onTap: () async {
-                        final dialog =
-                            createProgressDialog(context, "Please wait...");
+                        final dialog = createProgressDialog(context, "Please wait...");
                         await dialog.show();
                         await Configuration.instance.logout();
                         await dialog.hide();
-                        Navigator.of(context)
-                            .popUntil((route) => route.isFirst);
+                        Navigator.of(context).popUntil((route) => route.isFirst);
                       },
-                      child: Container(
-                        child: Center(
-                          child: Text(
-                            "Change email",
-                            style:
-                                Theme.of(context).textTheme.subtitle1.copyWith(
-                                      fontSize: 14,
-                                      decoration: TextDecoration.underline,
-                                    ),
-                          ),
+                      child: Center(
+                        child: Text(
+                          "Change email",
+                          style: Theme.of(context).textTheme.subtitle1.copyWith(
+                                fontSize: 14,
+                                decoration: TextDecoration.underline,
+                              ),
                         ),
                       ),
                     ),

lib/ui/account/recovery_page.dart

@@ -82,8 +82,7 @@ class _RecoveryPageState extends State<RecoveryPage> {
             child: ListView(
               children: [
                 Padding(
-                  padding:
-                      const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
+                  padding: const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
                   child: Text(
                     'Forgot password',
                     style: Theme.of(context).textTheme.headline4,
@@ -103,7 +102,7 @@ class _RecoveryPageState extends State<RecoveryPage> {
                     ),
                     style: TextStyle(
                       fontSize: 14,
-                      fontFeatures: [FontFeature.tabularFigures()],
+                      fontFeatures: const [FontFeature.tabularFigures()],
                     ),
                     controller: _recoveryKey,
                     autofocus: false,
@@ -137,11 +136,10 @@ class _RecoveryPageState extends State<RecoveryPage> {
                         child: Center(
                           child: Text(
                             "No recovery key?",
-                            style:
-                                Theme.of(context).textTheme.subtitle1.copyWith(
-                                      fontSize: 14,
-                                      decoration: TextDecoration.underline,
-                                    ),
+                            style: Theme.of(context).textTheme.subtitle1.copyWith(
+                                  fontSize: 14,
+                                  decoration: TextDecoration.underline,
+                                ),
                           ),
                         ),
                       ),

lib/ui/collections_gallery_widget.dart

@@ -304,7 +304,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
                         color: Theme.of(context).iconTheme.color.withOpacity(0.24),
                       ),
                     ),
-                    child: Container(
+                    child: SizedBox(
                       height: 48,
                       width: double.infinity,
                       child: Padding(
@@ -488,7 +488,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
             "long press to select photos and click + to create an album",
             toastLength: Toast.LENGTH_LONG,
           );
-          Bus.instance.fire(TabChangedEvent(0, TabChangedEventSource.collections_page));
+          Bus.instance.fire(TabChangedEvent(0, TabChangedEventSource.collectionsPage));
         },
       );
     }

lib/ui/common/bottomShadow.dart

@@ -3,8 +3,7 @@ import 'package:flutter/material.dart';
 class BottomShadowWidget extends StatelessWidget {
   final double offsetDy;
   final Color shadowColor;
-  const BottomShadowWidget({this.offsetDy = 28, this.shadowColor, Key key})
-      : super(key: key);
+  const BottomShadowWidget({this.offsetDy = 28, this.shadowColor, Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -14,9 +13,7 @@ class BottomShadowWidget extends StatelessWidget {
         color: Colors.transparent,
         boxShadow: [
           BoxShadow(
-            color: shadowColor == null
-                ? Theme.of(context).backgroundColor
-                : shadowColor,
+            color: shadowColor ?? Theme.of(context).backgroundColor,
             spreadRadius: 42,
             blurRadius: 42,
             offset: Offset(0, offsetDy), // changes position of shadow

lib/ui/home_widget.dart

@@ -101,9 +101,8 @@ class _HomeWidgetState extends State<HomeWidget> {
         ],
       ),
     );
-    _tabChangedEventSubscription =
-        Bus.instance.on<TabChangedEvent>().listen((event) {
-      if (event.source != TabChangedEventSource.page_view) {
+    _tabChangedEventSubscription = Bus.instance.on<TabChangedEvent>().listen((event) {
+      if (event.source != TabChangedEventSource.pageView) {
         _selectedTabIndex = event.selectedIndex;
         _pageController.animateToPage(
           event.selectedIndex,
@@ -112,16 +111,13 @@ class _HomeWidgetState extends State<HomeWidget> {
         );
       }
     });
-    _subscriptionPurchaseEvent =
-        Bus.instance.on<SubscriptionPurchasedEvent>().listen((event) {
+    _subscriptionPurchaseEvent = Bus.instance.on<SubscriptionPurchasedEvent>().listen((event) {
       setState(() {});
     });
-    _accountConfiguredEvent =
-        Bus.instance.on<AccountConfiguredEvent>().listen((event) {
+    _accountConfiguredEvent = Bus.instance.on<AccountConfiguredEvent>().listen((event) {
       setState(() {});
     });
-    _triggerLogoutEvent =
-        Bus.instance.on<TriggerLogoutEvent>().listen((event) async {
+    _triggerLogoutEvent = Bus.instance.on<TriggerLogoutEvent>().listen((event) async {
       AlertDialog alert = AlertDialog(
         title: Text("Session expired"),
         content: Text("Please login again"),
@@ -158,16 +154,13 @@ class _HomeWidgetState extends State<HomeWidget> {
         setState(() {});
       }
     });
-    _permissionGrantedEvent =
-        Bus.instance.on<PermissionGrantedEvent>().listen((event) async {
+    _permissionGrantedEvent = Bus.instance.on<PermissionGrantedEvent>().listen((event) async {
       if (mounted) {
         setState(() {});
       }
     });
-    _firstImportEvent =
-        Bus.instance.on<SyncStatusUpdate>().listen((event) async {
-      if (mounted &&
-          event.status == SyncStatus.completed_first_gallery_import) {
+    _firstImportEvent = Bus.instance.on<SyncStatusUpdate>().listen((event) async {
+      if (mounted && event.status == SyncStatus.completedFirstGalleryImport) {
         Duration delayInRefresh = Duration(milliseconds: 0);
         // Loading page will redirect to BackupFolderSelectionPage.
         // To avoid showing folder hook in middle during routing,
@@ -188,8 +181,7 @@ class _HomeWidgetState extends State<HomeWidget> {
         );
       }
     });
-    _backupFoldersUpdatedEvent =
-        Bus.instance.on<BackupFoldersUpdatedEvent>().listen((event) async {
+    _backupFoldersUpdatedEvent = Bus.instance.on<BackupFoldersUpdatedEvent>().listen((event) async {
       if (mounted) {
         setState(() {});
       }
@@ -229,8 +221,7 @@ class _HomeWidgetState extends State<HomeWidget> {
   }
 
   void _initMediaShareSubscription() {
-    _intentDataStreamSubscription =
-        ReceiveSharingIntent.getMediaStream().listen(
+    _intentDataStreamSubscription = ReceiveSharingIntent.getMediaStream().listen(
       (List<SharedMediaFile> value) {
         setState(() {
           _sharedFiles = value;
@@ -269,8 +260,7 @@ class _HomeWidgetState extends State<HomeWidget> {
             return true;
           }
         } else {
-          Bus.instance
-              .fire(TabChangedEvent(0, TabChangedEventSource.back_button));
+          Bus.instance.fire(TabChangedEvent(0, TabChangedEventSource.backButton));
           return false;
         }
       },
@@ -292,17 +282,14 @@ class _HomeWidgetState extends State<HomeWidget> {
       return CreateCollectionPage(null, _sharedFiles);
     }
 
-    final bool showBackupFolderHook =
-        Configuration.instance.getPathsToBackUp().isEmpty &&
-            !LocalSyncService.instance.hasGrantedLimitedPermissions() &&
-            CollectionsService.instance.getActiveCollections().isEmpty;
+    final bool showBackupFolderHook = Configuration.instance.getPathsToBackUp().isEmpty &&
+        !LocalSyncService.instance.hasGrantedLimitedPermissions() &&
+        CollectionsService.instance.getActiveCollections().isEmpty;
     return Stack(
       children: [
         ExtentsPageView(
           children: [
-            showBackupFolderHook
-                ? _getBackupFolderSelectionHook()
-                : _getMainGalleryWidget(),
+            showBackupFolderHook ? _getBackupFolderSelectionHook() : _getMainGalleryWidget(),
             _deviceFolderGalleryWidget,
             _sharedCollectionGallery,
             _settingsPage,
@@ -311,7 +298,7 @@ class _HomeWidgetState extends State<HomeWidget> {
             Bus.instance.fire(
               TabChangedEvent(
                 page,
-                TabChangedEventSource.page_view,
+                TabChangedEventSource.pageView,
               ),
             );
           },
@@ -387,8 +374,7 @@ class _HomeWidgetState extends State<HomeWidget> {
       asyncLoader: (creationStartTime, creationEndTime, {limit, asc}) async {
         final importantPaths = Configuration.instance.getPathsToBackUp();
         final ownerID = Configuration.instance.getUserID();
-        final archivedCollectionIds =
-            CollectionsService.instance.getArchivedCollections();
+        final archivedCollectionIds = CollectionsService.instance.getArchivedCollections();
         FileLoadResult result;
         if (importantPaths.isNotEmpty) {
           result = await FilesDB.instance.getImportantFiles(
@@ -493,8 +479,7 @@ class _HomeWidgetState extends State<HomeWidget> {
                     Color(0xFF1DB954),
                   ],
                   onTap: () async {
-                    if (LocalSyncService.instance
-                        .hasGrantedLimitedPermissions()) {
+                    if (LocalSyncService.instance.hasGrantedLimitedPermissions()) {
                       PhotoManager.presentLimited();
                     } else {
                       routeToPage(
@@ -566,13 +551,11 @@ class HomeBottomNavigationBar extends StatefulWidget {
   final int selectedTabIndex;
 
   @override
-  _HomeBottomNavigationBarState createState() =>
-      _HomeBottomNavigationBarState();
+  _HomeBottomNavigationBarState createState() => _HomeBottomNavigationBarState();
 }
 
 class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
   StreamSubscription<TabChangedEvent> _tabChangedEventSubscription;
-  final _logger = Logger((_HomeBottomNavigationBarState).toString());
   int currentTabIndex = 0;
 
   @override
@@ -582,9 +565,8 @@ class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
     widget.selectedFiles.addListener(() {
       setState(() {});
     });
-    _tabChangedEventSubscription =
-        Bus.instance.on<TabChangedEvent>().listen((event) {
-      if (event.source != TabChangedEventSource.tab_bar) {
+    _tabChangedEventSubscription = Bus.instance.on<TabChangedEvent>().listen((event) {
+      if (event.source != TabChangedEventSource.tabBar) {
         debugPrint('index changed to ${event.selectedIndex}');
         if (mounted) {
           setState(() {
@@ -605,7 +587,7 @@ class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
     Bus.instance.fire(
       TabChangedEvent(
         index,
-        TabChangedEventSource.tab_bar,
+        TabChangedEventSource.tabBar,
       ),
     );
   }
@@ -640,32 +622,23 @@ class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
                           filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
                           child: GNav(
                             curve: Curves.easeOutExpo,
-                            backgroundColor: Theme.of(context)
-                                .colorScheme
-                                .gNavBackgroundColor,
+                            backgroundColor: Theme.of(context).colorScheme.gNavBackgroundColor,
                             mainAxisAlignment: MainAxisAlignment.center,
                             rippleColor: Colors.white.withOpacity(0.1),
-                            activeColor: Theme.of(context)
-                                .colorScheme
-                                .gNavBarActiveColor,
+                            activeColor: Theme.of(context).colorScheme.gNavBarActiveColor,
                             iconSize: 24,
                             padding: EdgeInsets.fromLTRB(16, 8, 16, 8),
                             duration: Duration(milliseconds: 200),
                             gap: 0,
                             tabBorderRadius: 24,
-                            tabBackgroundColor: Theme.of(context)
-                                .colorScheme
-                                .gNavBarActiveColor,
+                            tabBackgroundColor: Theme.of(context).colorScheme.gNavBarActiveColor,
                             haptic: false,
                             tabs: [
                               GButton(
                                 margin: EdgeInsets.fromLTRB(6, 6, 0, 6),
                                 icon: Icons.home,
-                                iconColor:
-                                    Theme.of(context).colorScheme.gNavIconColor,
-                                iconActiveColor: Theme.of(context)
-                                    .colorScheme
-                                    .gNavActiveIconColor,
+                                iconColor: Theme.of(context).colorScheme.gNavIconColor,
+                                iconActiveColor: Theme.of(context).colorScheme.gNavActiveIconColor,
                                 text: '',
                                 onPressed: () {
                                   _onTabChange(
@@ -676,11 +649,8 @@ class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
                               GButton(
                                 margin: EdgeInsets.fromLTRB(0, 6, 0, 6),
                                 icon: Icons.photo_library,
-                                iconColor:
-                                    Theme.of(context).colorScheme.gNavIconColor,
-                                iconActiveColor: Theme.of(context)
-                                    .colorScheme
-                                    .gNavActiveIconColor,
+                                iconColor: Theme.of(context).colorScheme.gNavIconColor,
+                                iconActiveColor: Theme.of(context).colorScheme.gNavActiveIconColor,
                                 text: '',
                                 onPressed: () {
                                   _onTabChange(
@@ -691,11 +661,8 @@ class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
                               GButton(
                                 margin: EdgeInsets.fromLTRB(0, 6, 0, 6),
                                 icon: Icons.folder_shared,
-                                iconColor:
-                                    Theme.of(context).colorScheme.gNavIconColor,
-                                iconActiveColor: Theme.of(context)
-                                    .colorScheme
-                                    .gNavActiveIconColor,
+                                iconColor: Theme.of(context).colorScheme.gNavIconColor,
+                                iconActiveColor: Theme.of(context).colorScheme.gNavActiveIconColor,
                                 text: '',
                                 onPressed: () {
                                   _onTabChange(
@@ -706,11 +673,8 @@ class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
                               GButton(
                                 margin: EdgeInsets.fromLTRB(0, 6, 6, 6),
                                 icon: Icons.person,
-                                iconColor:
-                                    Theme.of(context).colorScheme.gNavIconColor,
-                                iconActiveColor: Theme.of(context)
-                                    .colorScheme
-                                    .gNavActiveIconColor,
+                                iconColor: Theme.of(context).colorScheme.gNavIconColor,
+                                iconActiveColor: Theme.of(context).colorScheme.gNavActiveIconColor,
                                 text: '',
                                 onPressed: () {
                                   _onTabChange(

lib/ui/loading_photos_widget.dart

@@ -37,10 +37,8 @@ class _LoadingPhotosWidgetState extends State<LoadingPhotosWidget> {
   @override
   void initState() {
     super.initState();
-    _firstImportEvent =
-        Bus.instance.on<SyncStatusUpdate>().listen((event) async {
-      if (mounted &&
-          event.status == SyncStatus.completed_first_gallery_import) {
+    _firstImportEvent = Bus.instance.on<SyncStatusUpdate>().listen((event) async {
+      if (mounted && event.status == SyncStatus.completedFirstGalleryImport) {
         if (LocalSyncService.instance.hasGrantedLimitedPermissions()) {
           // Do nothing, let HomeWidget refresh
         } else {
@@ -80,8 +78,7 @@ class _LoadingPhotosWidgetState extends State<LoadingPhotosWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final isLightMode =
-        MediaQuery.of(context).platformBrightness == Brightness.light;
+    final isLightMode = MediaQuery.of(context).platformBrightness == Brightness.light;
     return Scaffold(
       body: SingleChildScrollView(
         child: Center(

lib/ui/nav_bar.dart

@@ -101,20 +101,16 @@ class _GNavState extends State<GNav> {
                 iconColor: t.iconColor ?? widget.color,
                 iconSize: t.iconSize ?? widget.iconSize,
                 textColor: t.textColor ?? widget.activeColor,
-                rippleColor:
-                    t.rippleColor ?? widget.rippleColor ?? Colors.transparent,
-                hoverColor:
-                    t.hoverColor ?? widget.hoverColor ?? Colors.transparent,
+                rippleColor: t.rippleColor ?? widget.rippleColor ?? Colors.transparent,
+                hoverColor: t.hoverColor ?? widget.hoverColor ?? Colors.transparent,
                 padding: t.padding ?? widget.padding,
                 icon: t.icon,
                 haptic: widget.haptic ?? true,
                 leading: t.leading,
                 curve: widget.curve ?? Curves.easeInCubic,
-                backgroundGradient:
-                    t.backgroundGradient ?? widget.tabBackgroundGradient,
-                backgroundColor: t.backgroundColor ??
-                    widget.tabBackgroundColor ??
-                    Colors.transparent,
+                backgroundGradient: t.backgroundGradient ?? widget.tabBackgroundGradient,
+                backgroundColor:
+                    t.backgroundColor ?? widget.tabBackgroundColor ?? Colors.transparent,
                 duration: widget.duration ?? const Duration(milliseconds: 500),
                 onPressed: () {
                   if (!clickable) return;
@@ -124,8 +120,7 @@ class _GNavState extends State<GNav> {
                   });
                   widget.onTabChange(selectedIndex);
 
-                  Future.delayed(
-                      widget.duration ?? const Duration(milliseconds: 500), () {
+                  Future.delayed(widget.duration ?? const Duration(milliseconds: 500), () {
                     setState(() {
                       clickable = true;
                     });
@@ -301,9 +296,8 @@ class _ButtonState extends State<Button> with TickerProviderStateMixin {
     super.initState();
     _expanded = widget.active;
 
-    expandController =
-        AnimationController(vsync: this, duration: widget.duration)
-          ..addListener(() => setState(() {}));
+    expandController = AnimationController(vsync: this, duration: widget.duration)
+      ..addListener(() => setState(() {}));
   }
 
   @override
@@ -315,12 +309,6 @@ class _ButtonState extends State<Button> with TickerProviderStateMixin {
 
   @override
   Widget build(BuildContext context) {
-    var curveValue = expandController
-        .drive(
-          CurveTween(curve: _expanded ? widget.curve : widget.curve.flipped),
-        )
-        .value;
-
     _expanded = !widget.active;
     if (_expanded) {
       expandController.reverse();
@@ -356,9 +344,7 @@ class _ButtonState extends State<Button> with TickerProviderStateMixin {
             // curve: !_expanded ? widget.curve : widget.curve.flipped,
             decoration: BoxDecoration(
               boxShadow: widget.shadow,
-              border: widget.active
-                  ? (widget.activeBorder ?? widget.border)
-                  : widget.border,
+              border: widget.active ? (widget.activeBorder ?? widget.border) : widget.border,
               gradient: widget.gradient,
               color: _expanded
                   ? widget.color.withOpacity(0)

lib/ui/shared_collections_gallery.dart

@@ -28,8 +28,7 @@ class SharedCollectionGallery extends StatefulWidget {
   const SharedCollectionGallery({Key key}) : super(key: key);
 
   @override
-  _SharedCollectionGalleryState createState() =>
-      _SharedCollectionGalleryState();
+  _SharedCollectionGalleryState createState() => _SharedCollectionGalleryState();
 }
 
 class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
@@ -41,13 +40,11 @@ class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
 
   @override
   void initState() {
-    _localFilesSubscription =
-        Bus.instance.on<LocalPhotosUpdatedEvent>().listen((event) {
+    _localFilesSubscription = Bus.instance.on<LocalPhotosUpdatedEvent>().listen((event) {
       _logger.info("Files updated");
       setState(() {});
     });
-    _collectionUpdatesSubscription =
-        Bus.instance.on<CollectionUpdatedEvent>().listen((event) {
+    _collectionUpdatesSubscription = Bus.instance.on<CollectionUpdatedEvent>().listen((event) {
       setState(() {});
     });
     _loggedOutEvent = Bus.instance.on<UserLoggedOutEvent>().listen((event) {
@@ -61,13 +58,11 @@ class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
     super.build(context);
     return FutureBuilder<SharedCollections>(
       future:
-          Future.value(CollectionsService.instance.getLatestCollectionFiles())
-              .then((files) async {
+          Future.value(CollectionsService.instance.getLatestCollectionFiles()).then((files) async {
         final List<CollectionWithThumbnail> outgoing = [];
         final List<CollectionWithThumbnail> incoming = [];
         for (final file in files) {
-          final c =
-              CollectionsService.instance.getCollectionByID(file.collectionID);
+          final c = CollectionsService.instance.getCollectionByID(file.collectionID);
           if (c.owner.id == Configuration.instance.getUserID()) {
             if (c.sharees.isNotEmpty || c.publicURLs.isNotEmpty) {
               outgoing.add(
@@ -87,12 +82,10 @@ class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
           }
         }
         outgoing.sort((first, second) {
-          return second.collection.updationTime
-              .compareTo(first.collection.updationTime);
+          return second.collection.updationTime.compareTo(first.collection.updationTime);
         });
         incoming.sort((first, second) {
-          return second.collection.updationTime
-              .compareTo(first.collection.updationTime);
+          return second.collection.updationTime.compareTo(first.collection.updationTime);
         });
         return SharedCollections(outgoing, incoming);
       }),
@@ -114,10 +107,10 @@ class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
     const double crossAxisSpacingOfGrid = 9;
     Size size = MediaQuery.of(context).size;
     int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
-    double totalWhiteSpaceOfRow = (horizontalPaddingOfGridRow * 2) +
-        (albumsCountInOneRow - 1) * crossAxisSpacingOfGrid;
-    final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
-        (totalWhiteSpaceOfRow / albumsCountInOneRow);
+    double totalWhiteSpaceOfRow =
+        (horizontalPaddingOfGridRow * 2) + (albumsCountInOneRow - 1) * crossAxisSpacingOfGrid;
+    final double sideOfThumbnail =
+        (size.width / albumsCountInOneRow) - (totalWhiteSpaceOfRow / albumsCountInOneRow);
     return SingleChildScrollView(
       child: Container(
         margin: const EdgeInsets.only(bottom: 50),
@@ -142,8 +135,7 @@ class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
                         crossAxisCount: albumsCountInOneRow,
                         mainAxisSpacing: 12,
                         crossAxisSpacing: crossAxisSpacingOfGrid,
-                        childAspectRatio:
-                            sideOfThumbnail / (sideOfThumbnail + 24),
+                        childAspectRatio: sideOfThumbnail / (sideOfThumbnail + 24),
                       ), //24 is height of album title
                     ),
                   )
@@ -257,7 +249,7 @@ class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
                   toastLength: Toast.LENGTH_LONG,
                 );
                 Bus.instance.fire(
-                  TabChangedEvent(1, TabChangedEventSource.collections_page),
+                  TabChangedEvent(1, TabChangedEventSource.collectionsPage),
                 );
               },
             ),
@@ -293,8 +285,7 @@ class OutgoingCollectionItem extends StatelessWidget {
     final sharees = <String>[];
     for (int index = 0; index < c.collection.sharees.length; index++) {
       final sharee = c.collection.sharees[index];
-      final name =
-          (sharee.name?.isNotEmpty ?? false) ? sharee.name : sharee.email;
+      final name = (sharee.name?.isNotEmpty ?? false) ? sharee.name : sharee.email;
       if (index < 2) {
         sharees.add(name);
       } else {
@@ -304,10 +295,7 @@ class OutgoingCollectionItem extends StatelessWidget {
           sharees.add(name);
         } else {
           sharees.add(
-            "and " +
-                remaining.toString() +
-                " other" +
-                (remaining > 1 ? "s" : ""),
+            "and " + remaining.toString() + " other" + (remaining > 1 ? "s" : ""),
           );
         }
         break;
@@ -347,9 +335,7 @@ class OutgoingCollectionItem extends StatelessWidget {
                         ),
                       ),
                       Padding(padding: EdgeInsets.all(2)),
-                      c.collection.publicURLs.isEmpty
-                          ? Container()
-                          : Icon(Icons.link),
+                      c.collection.publicURLs.isEmpty ? Container() : Icon(Icons.link),
                     ],
                   ),
                   sharees.isEmpty
@@ -375,7 +361,7 @@ class OutgoingCollectionItem extends StatelessWidget {
       onTap: () {
         final page = CollectionPage(
           c,
-          appBarType: GalleryType.owned_collection,
+          appBarType: GalleryType.ownedCollection,
           tagPrefix: "outgoing_collection",
         );
         routeToPage(context, page);
@@ -396,14 +382,13 @@ class IncomingCollectionItem extends StatelessWidget {
   Widget build(BuildContext context) {
     const double horizontalPaddingOfGridRow = 16;
     const double crossAxisSpacingOfGrid = 9;
-    TextStyle albumTitleTextStyle =
-        Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 14);
+    TextStyle albumTitleTextStyle = Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 14);
     Size size = MediaQuery.of(context).size;
     int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
-    double totalWhiteSpaceOfRow = (horizontalPaddingOfGridRow * 2) +
-        (albumsCountInOneRow - 1) * crossAxisSpacingOfGrid;
-    final double sideOfThumbnail = (size.width / albumsCountInOneRow) -
-        (totalWhiteSpaceOfRow / albumsCountInOneRow);
+    double totalWhiteSpaceOfRow =
+        (horizontalPaddingOfGridRow * 2) + (albumsCountInOneRow - 1) * crossAxisSpacingOfGrid;
+    final double sideOfThumbnail =
+        (size.width / albumsCountInOneRow) - (totalWhiteSpaceOfRow / albumsCountInOneRow);
     return GestureDetector(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -424,8 +409,7 @@ class IncomingCollectionItem extends StatelessWidget {
                     alignment: Alignment.bottomRight,
                     child: Container(
                       child: Text(
-                        c.collection.owner.name == null ||
-                                c.collection.owner.name.isEmpty
+                        c.collection.owner.name == null || c.collection.owner.name.isEmpty
                             ? c.collection.owner.email.substring(0, 1)
                             : c.collection.owner.name.substring(0, 1),
                         textAlign: TextAlign.center,
@@ -434,9 +418,7 @@ class IncomingCollectionItem extends StatelessWidget {
                       margin: EdgeInsets.fromLTRB(0, 0, 4, 0),
                       decoration: BoxDecoration(
                         shape: BoxShape.circle,
-                        color: Theme.of(context)
-                            .colorScheme
-                            .defaultBackgroundColor,
+                        color: Theme.of(context).colorScheme.defaultBackgroundColor,
                       ),
                     ),
                   ),
@@ -486,7 +468,7 @@ class IncomingCollectionItem extends StatelessWidget {
           context,
           CollectionPage(
             c,
-            appBarType: GalleryType.shared_collection,
+            appBarType: GalleryType.sharedCollection,
             tagPrefix: "shared_collection",
           ),
         );

lib/ui/status_bar_widget.dart

@@ -22,8 +22,8 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
   @override
   void initState() {
     _subscription = Bus.instance.on<SyncStatusUpdate>().listen((event) {
-      if (event.status == SyncStatus.completed_first_gallery_import ||
-          event.status == SyncStatus.completed_backup) {
+      if (event.status == SyncStatus.completedFirstGalleryImport ||
+          event.status == SyncStatus.completedBackup) {
         Future.delayed(Duration(milliseconds: 2000), () {
           if (mounted) {
             setState(() {
@@ -110,17 +110,16 @@ class _SyncStatusWidgetState extends State<SyncStatusWidget> {
   @override
   Widget build(BuildContext context) {
     bool isNotOutdatedEvent = _event != null &&
-        (_event.status == SyncStatus.completed_backup ||
-            _event.status == SyncStatus.completed_first_gallery_import) &&
-        (DateTime.now().microsecondsSinceEpoch - _event.timestamp >
-            kSleepDuration.inMicroseconds);
+        (_event.status == SyncStatus.completedBackup ||
+            _event.status == SyncStatus.completedFirstGalleryImport) &&
+        (DateTime.now().microsecondsSinceEpoch - _event.timestamp > kSleepDuration.inMicroseconds);
     if (_event == null || isNotOutdatedEvent) {
       return Container();
     }
     if (_event.status == SyncStatus.error) {
       return HeaderErrorWidget(error: _event.error);
     }
-    if (_event.status == SyncStatus.completed_backup) {
+    if (_event.status == SyncStatus.completedBackup) {
       return SyncStatusCompletedWidget();
     }
     return RefreshIndicatorWidget(_event);
@@ -172,21 +171,18 @@ class RefreshIndicatorWidget extends StatelessWidget {
   }
 
   String _getRefreshingText() {
-    if (event.status == SyncStatus.started_first_gallery_import ||
-        event.status == SyncStatus.completed_first_gallery_import) {
+    if (event.status == SyncStatus.startedFirstGalleryImport ||
+        event.status == SyncStatus.completedFirstGalleryImport) {
       return "Loading gallery...";
     }
-    if (event.status == SyncStatus.applying_remote_diff) {
+    if (event.status == SyncStatus.applyingRemoteDiff) {
       return "Syncing...";
     }
-    if (event.status == SyncStatus.preparing_for_upload) {
+    if (event.status == SyncStatus.preparingForUpload) {
       return "Encrypting backup...";
     }
-    if (event.status == SyncStatus.in_progress) {
-      return event.completed.toString() +
-          "/" +
-          event.total.toString() +
-          " memories preserved";
+    if (event.status == SyncStatus.inProgress) {
+      return event.completed.toString() + "/" + event.total.toString() + " memories preserved";
     }
     if (event.status == SyncStatus.paused) {
       return event.reason;
@@ -194,7 +190,7 @@ class RefreshIndicatorWidget extends StatelessWidget {
     if (event.status == SyncStatus.error) {
       return event.reason ?? "Upload failed";
     }
-    if (event.status == SyncStatus.completed_backup) {
+    if (event.status == SyncStatus.completedBackup) {
       if (event.wasStopped) {
         return "Sync stopped";
       }

lib/ui/tools/free_space_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/ente_theme_data.dart';
@@ -33,8 +32,7 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
     Logger("FreeSpacePage").info(
       "Number of uploaded files: " + widget.status.localIDs.length.toString(),
     );
-    Logger("FreeSpacePage")
-        .info("Space consumed: " + widget.status.size.toString());
+    Logger("FreeSpacePage").info("Space consumed: " + widget.status.size.toString());
     return SingleChildScrollView(
       child: _getWidget(widget.status),
     );
@@ -49,8 +47,7 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
       color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
       fontWeight: FontWeight.w500,
     );
-    final isLightMode =
-        MediaQuery.of(context).platformBrightness == Brightness.light;
+    final isLightMode = MediaQuery.of(context).platformBrightness == Brightness.light;
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.center,
@@ -83,8 +80,7 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
               Expanded(
                 child: Text(
                   count == 1
-                      ? formattedCount.toString() +
-                          " file on this device has been backed up safely"
+                      ? formattedCount.toString() + " file on this device has been backed up safely"
                       : formattedCount.toString() +
                           " files on this device have been backed up safely",
                   style: informationTextStyle,

lib/ui/tools/set_wallpaper_dialog.dart

@@ -22,42 +22,40 @@ class _SetWallpaperDialogState extends State<SetWallpaperDialog> {
   Widget build(BuildContext context) {
     final alert = AlertDialog(
       title: Text("Set wallpaper"),
-      content: Container(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            RadioListTile(
-              title: const Text("Homescreen"),
-              value: WallpaperManagerFlutter.HOME_SCREEN,
-              groupValue: _lockscreenValue,
-              onChanged: (v) {
-                setState(() {
-                  _lockscreenValue = v;
-                });
-              },
-            ),
-            RadioListTile(
-              title: const Text("Lockscreen"),
-              value: WallpaperManagerFlutter.LOCK_SCREEN,
-              groupValue: _lockscreenValue,
-              onChanged: (v) {
-                setState(() {
-                  _lockscreenValue = v;
-                });
-              },
-            ),
-            RadioListTile(
-              title: const Text("Both"),
-              value: WallpaperManagerFlutter.BOTH_SCREENS,
-              groupValue: _lockscreenValue,
-              onChanged: (v) {
-                setState(() {
-                  _lockscreenValue = v;
-                });
-              },
-            ),
-          ],
-        ),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          RadioListTile(
+            title: const Text("Homescreen"),
+            value: WallpaperManagerFlutter.HOME_SCREEN,
+            groupValue: _lockscreenValue,
+            onChanged: (v) {
+              setState(() {
+                _lockscreenValue = v;
+              });
+            },
+          ),
+          RadioListTile(
+            title: const Text("Lockscreen"),
+            value: WallpaperManagerFlutter.LOCK_SCREEN,
+            groupValue: _lockscreenValue,
+            onChanged: (v) {
+              setState(() {
+                _lockscreenValue = v;
+              });
+            },
+          ),
+          RadioListTile(
+            title: const Text("Both"),
+            value: WallpaperManagerFlutter.BOTH_SCREENS,
+            groupValue: _lockscreenValue,
+            onChanged: (v) {
+              setState(() {
+                _lockscreenValue = v;
+              });
+            },
+          ),
+        ],
       ),
       actions: [
         TextButton(

lib/ui/viewer/file/custom_app_bar.dart

@@ -4,7 +4,7 @@ class CustomAppBar extends PreferredSize {
   final Widget child;
   final double height;
 
-  CustomAppBar(this.child, {this.height = kToolbarHeight});
+  const CustomAppBar(this.child, {Key key, this.height = kToolbarHeight}) : super(key: key);
 
   @override
   Size get preferredSize => Size.fromHeight(height);

lib/ui/viewer/file/exif_info_dialog.dart

@@ -24,7 +24,7 @@ class _ExifInfoDialogState extends State<ExifInfoDialog> {
       ),
       content: Scrollbar(
         controller: scrollController,
-        isAlwaysShown: true,
+        thumbVisibility: true,
         child: SingleChildScrollView(
           controller: scrollController,
           child: _getInfo(),
@@ -71,10 +71,7 @@ class _ExifInfoDialogState extends State<ExifInfoDialog> {
                       FontFeature.tabularFigures(),
                     ],
                     height: 1.4,
-                    color: Theme.of(context)
-                        .colorScheme
-                        .onSurface
-                        .withOpacity(0.7),
+                    color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
                   ),
                 ),
               ),

lib/ui/viewer/file/video_controls.dart

@@ -156,8 +156,7 @@ class _VideoControlsState extends State<VideoControls> {
           color: Colors.transparent,
           child: Center(
             child: AnimatedOpacity(
-              opacity:
-                  _latestValue != null && !_hideStuff && !_dragging ? 1.0 : 0.0,
+              opacity: _latestValue != null && !_hideStuff && !_dragging ? 1.0 : 0.0,
               duration: Duration(milliseconds: 300),
               child: GestureDetector(
                 onTap: _playPause,
@@ -226,8 +225,7 @@ class _VideoControlsState extends State<VideoControls> {
 
     _updateState();
 
-    if ((controller.value != null && controller.value.isPlaying) ||
-        chewieController.autoPlay) {
+    if ((controller.value != null && controller.value.isPlaying) || chewieController.autoPlay) {
       _startHideTimer();
     }
 

lib/ui/viewer/gallery/collection_page.dart

@@ -20,8 +20,8 @@ class CollectionPage extends StatelessWidget {
   CollectionPage(
     this.c, {
     this.tagPrefix = "collection",
-    this.appBarType = GalleryType.owned_collection,
-    this.overlayType = GalleryType.owned_collection,
+    this.appBarType = GalleryType.ownedCollection,
+    this.overlayType = GalleryType.ownedCollection,
     Key key,
   }) : super(key: key);
 

lib/ui/viewer/gallery/device_folder_page.dart

@@ -38,9 +38,7 @@ class DeviceFolderPage extends StatelessWidget {
       },
       tagPrefix: "device_folder:" + folder.path,
       selectedFiles: _selectedFiles,
-      header: Configuration.instance.hasConfiguredAccount()
-          ? _getHeaderWidget()
-          : Container(),
+      header: Configuration.instance.hasConfiguredAccount() ? _getHeaderWidget() : Container(),
       initialFiles: [folder.thumbnail],
       footer: SizedBox(height: 32),
     );
@@ -48,7 +46,7 @@ class DeviceFolderPage extends StatelessWidget {
       appBar: PreferredSize(
         preferredSize: Size.fromHeight(50.0),
         child: GalleryAppBarWidget(
-          GalleryType.local_folder,
+          GalleryType.localFolder,
           folder.name,
           _selectedFiles,
           path: folder.thumbnail.deviceFolder,
@@ -59,7 +57,7 @@ class DeviceFolderPage extends StatelessWidget {
         children: [
           gallery,
           GalleryOverlayWidget(
-            GalleryType.local_folder,
+            GalleryType.localFolder,
             _selectedFiles,
           )
         ],
@@ -78,16 +76,13 @@ class BackupConfigurationHeaderWidget extends StatefulWidget {
   BackupConfigurationHeaderWidget(this.path, {Key key}) : super(key: key);
 
   @override
-  _BackupConfigurationHeaderWidgetState createState() =>
-      _BackupConfigurationHeaderWidgetState();
+  _BackupConfigurationHeaderWidgetState createState() => _BackupConfigurationHeaderWidgetState();
 }
 
-class _BackupConfigurationHeaderWidgetState
-    extends State<BackupConfigurationHeaderWidget> {
+class _BackupConfigurationHeaderWidgetState extends State<BackupConfigurationHeaderWidget> {
   @override
   Widget build(BuildContext context) {
-    final isBackedUp =
-        Configuration.instance.getPathsToBackUp().contains(widget.path);
+    final isBackedUp = Configuration.instance.getPathsToBackUp().contains(widget.path);
     return Container(
       padding: EdgeInsets.only(left: 20, right: 12, top: 4, bottom: 4),
       margin: EdgeInsets.only(bottom: 12),
@@ -100,10 +95,7 @@ class _BackupConfigurationHeaderWidgetState
               : Text(
                   "Backup disabled",
                   style: TextStyle(
-                    color: Theme.of(context)
-                        .colorScheme
-                        .defaultTextColor
-                        .withOpacity(0.7),
+                    color: Theme.of(context).colorScheme.defaultTextColor.withOpacity(0.7),
                   ),
                 ),
           Switch(

lib/ui/viewer/gallery/gallery_app_bar_widget.dart

@@ -26,9 +26,10 @@ class GalleryAppBarWidget extends StatefulWidget {
     this.type,
     this.title,
     this.selectedFiles, {
+    Key key,
     this.path,
     this.collection,
-  });
+  }) : super(key: key);
 
   @override
   _GalleryAppBarWidgetState createState() => _GalleryAppBarWidgetState();
@@ -46,8 +47,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
       setState(() {});
     };
     widget.selectedFiles.addListener(_selectedFilesListener);
-    _userAuthEventSubscription =
-        Bus.instance.on<SubscriptionPurchasedEvent>().listen((event) {
+    _userAuthEventSubscription = Bus.instance.on<SubscriptionPurchasedEvent>().listen((event) {
       setState(() {});
     });
     _appBarTitle = widget.title;
@@ -65,8 +65,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
   Widget build(BuildContext context) {
     // if (widget.selectedFiles.files.isEmpty) {
     return AppBar(
-      backgroundColor:
-          widget.type == GalleryType.homepage ? Color(0x00000000) : null,
+      backgroundColor: widget.type == GalleryType.homepage ? Color(0x00000000) : null,
       elevation: 0,
       centerTitle: false,
       title: widget.type == GalleryType.homepage
@@ -74,10 +73,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
           : TextButton(
               child: Text(
                 _appBarTitle,
-                style: Theme.of(context)
-                    .textTheme
-                    .headline5
-                    .copyWith(fontSize: 16),
+                style: Theme.of(context).textTheme.headline5.copyWith(fontSize: 16),
               ),
               onPressed: () => _renameAlbum(context),
             ),
@@ -86,7 +82,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
   }
 
   Future<dynamic> _renameAlbum(BuildContext context) async {
-    if (widget.type != GalleryType.owned_collection) {
+    if (widget.type != GalleryType.ownedCollection) {
       return;
     }
     final result = await showDialog<String>(
@@ -120,8 +116,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
     List<Widget> actions = <Widget>[];
     if (Configuration.instance.hasConfiguredAccount() &&
         widget.selectedFiles.files.isEmpty &&
-        (widget.type == GalleryType.local_folder ||
-            widget.type == GalleryType.owned_collection)) {
+        (widget.type == GalleryType.localFolder || widget.type == GalleryType.ownedCollection)) {
       actions.add(
         Tooltip(
           message: "Share",
@@ -134,7 +129,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
         ),
       );
     }
-    if (widget.type == GalleryType.owned_collection) {
+    if (widget.type == GalleryType.ownedCollection) {
       actions.add(
         PopupMenuButton(
           itemBuilder: (context) {
@@ -180,9 +175,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
               await changeCollectionVisibility(
                 context,
                 widget.collection,
-                widget.collection.isArchived()
-                    ? kVisibilityVisible
-                    : kVisibilityArchive,
+                widget.collection.isArchived() ? kVisibilityVisible : kVisibilityArchive,
               );
             }
           },
@@ -198,17 +191,15 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
     await dialog.show();
     try {
       if (collection == null) {
-        if (widget.type == GalleryType.local_folder) {
-          collection =
-              await CollectionsService.instance.getOrCreateForPath(widget.path);
+        if (widget.type == GalleryType.localFolder) {
+          collection = await CollectionsService.instance.getOrCreateForPath(widget.path);
         } else {
           throw Exception(
             "Cannot create a collection of type" + widget.type.toString(),
           );
         }
       } else {
-        final sharees =
-            await CollectionsService.instance.getSharees(collection.id);
+        final sharees = await CollectionsService.instance.getSharees(collection.id);
         collection = collection.copyWith(sharees: sharees);
       }
       await dialog.hide();

lib/ui/viewer/gallery/gallery_overlay_widget.dart

@@ -50,8 +50,7 @@ class _GalleryOverlayWidgetState extends State<GalleryOverlayWidget> {
       setState(() {});
     };
     widget.selectedFiles.addListener(_selectedFilesListener);
-    _userAuthEventSubscription =
-        Bus.instance.on<SubscriptionPurchasedEvent>().listen((event) {
+    _userAuthEventSubscription = Bus.instance.on<SubscriptionPurchasedEvent>().listen((event) {
       setState(() {});
     });
     super.initState();
@@ -121,8 +120,7 @@ class _OverlayWidgetState extends State<OverlayWidget> {
       setState(() {});
     };
     widget.selectedFiles.addListener(_selectedFilesListener);
-    _userAuthEventSubscription =
-        Bus.instance.on<SubscriptionPurchasedEvent>().listen((event) {
+    _userAuthEventSubscription = Bus.instance.on<SubscriptionPurchasedEvent>().listen((event) {
       setState(() {});
     });
     super.initState();
@@ -152,9 +150,7 @@ class _OverlayWidgetState extends State<OverlayWidget> {
                 child: BackdropFilter(
                   filter: ImageFilter.blur(sigmaX: 50, sigmaY: 50),
                   child: Container(
-                    color: Theme.of(context)
-                        .colorScheme
-                        .frostyBlurBackdropFilterColor,
+                    color: Theme.of(context).colorScheme.frostyBlurBackdropFilterColor,
                     width: double.infinity,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -162,15 +158,10 @@ class _OverlayWidgetState extends State<OverlayWidget> {
                         Padding(
                           padding: const EdgeInsets.fromLTRB(13, 13, 0, 13),
                           child: Text(
-                            widget.selectedFiles.files.length.toString() +
-                                ' selected',
-                            style: Theme.of(context)
-                                .textTheme
-                                .subtitle2
-                                .copyWith(
+                            widget.selectedFiles.files.length.toString() + ' selected',
+                            style: Theme.of(context).textTheme.subtitle2.copyWith(
                                   fontWeight: FontWeight.w600,
-                                  color:
-                                      Theme.of(context).colorScheme.iconColor,
+                                  color: Theme.of(context).colorScheme.iconColor,
                                 ),
                           ),
                         ),
@@ -197,9 +188,7 @@ class _OverlayWidgetState extends State<OverlayWidget> {
                       padding: EdgeInsets.symmetric(vertical: 8),
                       //height: 32,
                       width: 86,
-                      color: Theme.of(context)
-                          .colorScheme
-                          .frostyBlurBackdropFilterColor,
+                      color: Theme.of(context).colorScheme.frostyBlurBackdropFilterColor,
                       child: Center(
                         child: Text(
                           'Cancel',
@@ -260,15 +249,13 @@ class _OverlayWidgetState extends State<OverlayWidget> {
     }
     // skip add button for incoming collection till this feature is implemented
     if (Configuration.instance.hasConfiguredAccount() &&
-        widget.type != GalleryType.shared_collection) {
+        widget.type != GalleryType.sharedCollection) {
       String msg = "Add";
       IconData iconData = Platform.isAndroid ? Icons.add : CupertinoIcons.add;
       // show upload icon instead of add for files selected in local gallery
-      if (widget.type == GalleryType.local_folder) {
+      if (widget.type == GalleryType.localFolder) {
         msg = "Upload";
-        iconData = Platform.isAndroid
-            ? Icons.cloud_upload
-            : CupertinoIcons.cloud_upload;
+        iconData = Platform.isAndroid ? Icons.cloud_upload : CupertinoIcons.cloud_upload;
       }
       actions.add(
         Tooltip(
@@ -284,7 +271,7 @@ class _OverlayWidgetState extends State<OverlayWidget> {
       );
     }
     if (Configuration.instance.hasConfiguredAccount() &&
-        widget.type == GalleryType.owned_collection &&
+        widget.type == GalleryType.ownedCollection &&
         widget.collection.type != CollectionType.favorites) {
       actions.add(
         Tooltip(
@@ -292,9 +279,7 @@ class _OverlayWidgetState extends State<OverlayWidget> {
           child: IconButton(
             color: Theme.of(context).colorScheme.iconColor,
             icon: Icon(
-              Platform.isAndroid
-                  ? Icons.arrow_forward
-                  : CupertinoIcons.arrow_right,
+              Platform.isAndroid ? Icons.arrow_forward : CupertinoIcons.arrow_right,
             ),
             onPressed: () {
               _moveFiles();
@@ -318,21 +303,20 @@ class _OverlayWidgetState extends State<OverlayWidget> {
     );
     if (widget.type == GalleryType.homepage ||
         widget.type == GalleryType.archive ||
-        widget.type == GalleryType.local_folder) {
+        widget.type == GalleryType.localFolder) {
       actions.add(
         Tooltip(
           message: "Delete",
           child: IconButton(
             color: Theme.of(context).colorScheme.iconColor,
-            icon:
-                Icon(Platform.isAndroid ? Icons.delete : CupertinoIcons.delete),
+            icon: Icon(Platform.isAndroid ? Icons.delete : CupertinoIcons.delete),
             onPressed: () {
               _showDeleteSheet(context);
             },
           ),
         ),
       );
-    } else if (widget.type == GalleryType.owned_collection) {
+    } else if (widget.type == GalleryType.ownedCollection) {
       if (widget.collection.type == CollectionType.folder) {
         actions.add(
           Tooltip(
@@ -366,8 +350,7 @@ class _OverlayWidgetState extends State<OverlayWidget> {
       }
     }
 
-    if (widget.type == GalleryType.homepage ||
-        widget.type == GalleryType.archive) {
+    if (widget.type == GalleryType.homepage || widget.type == GalleryType.archive) {
       bool showArchive = widget.type == GalleryType.homepage;
       actions.add(
         Tooltip(

lib/ui/viewer/search/location_search_results_page.dart

@@ -18,12 +18,10 @@ class LocationSearchResultsPage extends StatefulWidget {
   final ViewPort viewPort;
   final String name;
 
-  LocationSearchResultsPage(this.viewPort, this.name, {Key key})
-      : super(key: key);
+  LocationSearchResultsPage(this.viewPort, this.name, {Key key}) : super(key: key);
 
   @override
-  _LocationSearchResultsPageState createState() =>
-      _LocationSearchResultsPageState();
+  _LocationSearchResultsPageState createState() => _LocationSearchResultsPageState();
 }
 
 class _LocationSearchResultsPageState extends State<LocationSearchResultsPage> {
@@ -35,12 +33,10 @@ class _LocationSearchResultsPageState extends State<LocationSearchResultsPage> {
       appBar: AppBar(
         title: Text(widget.name),
       ),
-      body: Container(
-        child: Gallery(
-          tagPrefix: "location_search",
-          selectedFiles: _selectedFiles,
-          footer: SizedBox(height: 32),
-        ),
+      body: Gallery(
+        tagPrefix: "location_search",
+        selectedFiles: _selectedFiles,
+        footer: SizedBox(height: 32),
       ),
     );
   }

lib/ui/viewer/search/location_search_widget.dart

@@ -95,7 +95,7 @@ class LocationSearchResultWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: new EdgeInsets.symmetric(vertical: 6.0, horizontal: 6.0),
+      padding: EdgeInsets.symmetric(vertical: 6.0, horizontal: 6.0),
       margin: EdgeInsets.symmetric(vertical: 6.0),
       child: Column(
         children: <Widget>[

lib/ui/viewer/search/search_page.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:photos/ui/viewer/search/location_search_widget.dart';
 
 class SearchPage extends StatefulWidget {
+  const SearchPage({Key key}) : super(key: key);
+
   @override
   _SearchPageState createState() => _SearchPageState();
 }

lib/utils/file_sync_util.dart

@@ -63,12 +63,11 @@ Future<List<File>> getUnsyncedFiles(
   Set<String> invalidIDs,
   Computer computer,
 ) async {
-  final args = Map<String, dynamic>();
+  final Map<String, dynamic> args = <String, dynamic>{};
   args['assets'] = assets;
   args['existingIDs'] = existingIDs;
   args['invalidIDs'] = invalidIDs;
-  final unsyncedAssets =
-      await computer.compute(_getUnsyncedAssets, param: args);
+  final unsyncedAssets = await computer.compute(_getUnsyncedAssets, param: args);
   if (unsyncedAssets.isEmpty) {
     return [];
   }
@@ -158,7 +157,7 @@ Future<List<File>> _computeFiles(
   List<File> files,
   Computer computer,
 ) async {
-  final args = Map<String, dynamic>();
+  final Map<String, dynamic> args = <String, dynamic>{};
   args["pathEntity"] = pathEntity;
   args["assetList"] = await _getAllAssetLists(pathEntity);
   args["fromTime"] = fromTime;

lib/utils/file_uploader.dart

@@ -42,7 +42,7 @@ class FileUploader {
 
   final _logger = Logger("FileUploader");
   final _dio = Network.instance.getDio();
-  final _queue = LinkedHashMap<String, FileUploadItem>();
+  final LinkedHashMap _queue = LinkedHashMap<String, FileUploadItem>();
   final _uploadLocks = UploadLocksDB.instance;
   final kSafeBufferForLockExpiry = Duration(days: 1).inMicroseconds;
   final kBGTaskDeathTimeout = Duration(seconds: 5).inMicroseconds;
@@ -68,19 +68,17 @@ class FileUploader {
   Future<void> init(bool isBackground) async {
     _prefs = await SharedPreferences.getInstance();
     _isBackground = isBackground;
-    _processType =
-        isBackground ? ProcessType.background : ProcessType.foreground;
+    _processType = isBackground ? ProcessType.background : ProcessType.foreground;
     final currentTime = DateTime.now().microsecondsSinceEpoch;
     await _uploadLocks.releaseLocksAcquiredByOwnerBefore(
       _processType.toString(),
       currentTime,
     );
-    await _uploadLocks
-        .releaseAllLocksAcquiredBefore(currentTime - kSafeBufferForLockExpiry);
+    await _uploadLocks.releaseAllLocksAcquiredBefore(currentTime - kSafeBufferForLockExpiry);
     if (!isBackground) {
       await _prefs.reload();
-      final isBGTaskDead = (_prefs.getInt(kLastBGTaskHeartBeatTime) ?? 0) <
-          (currentTime - kBGTaskDeathTimeout);
+      final isBGTaskDead =
+          (_prefs.getInt(kLastBGTaskHeartBeatTime) ?? 0) < (currentTime - kBGTaskDeathTimeout);
       if (isBGTaskDead) {
         await _uploadLocks.releaseLocksAcquiredByOwnerBefore(
           ProcessType.background.toString(),
@@ -138,10 +136,7 @@ class FileUploader {
 
   Future<File> forceUpload(File file, int collectionID) async {
     _logger.info(
-      "Force uploading " +
-          file.toString() +
-          " into collection " +
-          collectionID.toString(),
+      "Force uploading " + file.toString() + " into collection " + collectionID.toString(),
     );
     _totalCountInUploadSession++;
     // If the file hasn't been queued yet, ez.
@@ -151,22 +146,20 @@ class FileUploader {
         file,
         collectionID,
         completer,
-        status: UploadStatus.in_progress,
+        status: UploadStatus.inProgress,
       );
       _encryptAndUploadFileToCollection(file, collectionID, forcedUpload: true);
       return completer.future;
     }
     var item = _queue[file.localID];
     // If the file is being uploaded right now, wait and proceed
-    if (item.status == UploadStatus.in_progress ||
-        item.status == UploadStatus.in_background) {
+    if (item.status == UploadStatus.inProgress || item.status == UploadStatus.inBackground) {
       _totalCountInUploadSession--;
       final uploadedFile = await item.completer.future;
       if (uploadedFile.collectionID == collectionID) {
         // Do nothing
       } else {
-        await CollectionsService.instance
-            .addToCollection(collectionID, [uploadedFile]);
+        await CollectionsService.instance.addToCollection(collectionID, [uploadedFile]);
       }
       return uploadedFile;
     } else {
@@ -175,7 +168,7 @@ class FileUploader {
       // 2. Force upload the file
       // 3. Add to the relevant collection
       item = _queue[file.localID];
-      item.status = UploadStatus.in_progress;
+      item.status = UploadStatus.inProgress;
       final uploadedFile = await _encryptAndUploadFileToCollection(
         file,
         collectionID,
@@ -184,8 +177,7 @@ class FileUploader {
       if (item.collectionID == collectionID) {
         return uploadedFile;
       } else {
-        await CollectionsService.instance
-            .addToCollection(item.collectionID, [uploadedFile]);
+        await CollectionsService.instance.addToCollection(item.collectionID, [uploadedFile]);
         return uploadedFile;
       }
     }
@@ -198,7 +190,7 @@ class FileUploader {
   void clearQueue(final Error reason) {
     final List<String> uploadsToBeRemoved = [];
     _queue.entries
-        .where((entry) => entry.value.status == UploadStatus.not_started)
+        .where((entry) => entry.value.status == UploadStatus.notStarted)
         .forEach((pendingUpload) {
       uploadsToBeRemoved.add(pendingUpload.key);
     });
@@ -211,7 +203,7 @@ class FileUploader {
   void removeFromQueueWhere(final bool Function(File) fn, final Error reason) {
     List<String> uploadsToBeRemoved = [];
     _queue.entries
-        .where((entry) => entry.value.status == UploadStatus.not_started)
+        .where((entry) => entry.value.status == UploadStatus.notStarted)
         .forEach((pendingUpload) {
       if (fn(pendingUpload.value.file)) {
         uploadsToBeRemoved.add(pendingUpload.key);
@@ -235,7 +227,7 @@ class FileUploader {
     if (_uploadCounter < kMaximumConcurrentUploads) {
       var pendingEntry = _queue.entries
           .firstWhere(
-            (entry) => entry.value.status == UploadStatus.not_started,
+            (entry) => entry.value.status == UploadStatus.notStarted,
             orElse: () => null,
           )
           ?.value;
@@ -247,14 +239,14 @@ class FileUploader {
         pendingEntry = _queue.entries
             .firstWhere(
               (entry) =>
-                  entry.value.status == UploadStatus.not_started &&
+                  entry.value.status == UploadStatus.notStarted &&
                   entry.value.file.fileType != FileType.video,
               orElse: () => null,
             )
             ?.value;
       }
       if (pendingEntry != null) {
-        pendingEntry.status = UploadStatus.in_progress;
+        pendingEntry.status = UploadStatus.inProgress;
         _encryptAndUploadFileToCollection(
           pendingEntry.file,
           pendingEntry.collectionID,
@@ -274,8 +266,7 @@ class FileUploader {
     }
     final localID = file.localID;
     try {
-      final uploadedFile =
-          await _tryToUpload(file, collectionID, forcedUpload).timeout(
+      final uploadedFile = await _tryToUpload(file, collectionID, forcedUpload).timeout(
         kFileUploadTimeout,
         onTimeout: () {
           final message = "Upload timed out for file " + file.toString();
@@ -287,7 +278,7 @@ class FileUploader {
       return uploadedFile;
     } catch (e) {
       if (e is LockAlreadyAcquiredError) {
-        _queue[localID].status = UploadStatus.in_background;
+        _queue[localID].status = UploadStatus.inBackground;
         return _queue[localID].completer.future;
       } else {
         _queue.remove(localID).completer.completeError(e);
@@ -308,9 +299,8 @@ class FileUploader {
     bool forcedUpload,
   ) async {
     final connectivityResult = await (Connectivity().checkConnectivity());
-    var canUploadUnderCurrentNetworkConditions =
-        (connectivityResult == ConnectivityResult.wifi ||
-            Configuration.instance.shouldBackupOverMobileData());
+    var canUploadUnderCurrentNetworkConditions = (connectivityResult == ConnectivityResult.wifi ||
+        Configuration.instance.shouldBackupOverMobileData());
     if (!canUploadUnderCurrentNetworkConditions && !forcedUpload) {
       throw WiFiUnavailableError();
     }
@@ -334,10 +324,8 @@ class FileUploader {
     }
 
     final tempDirectory = Configuration.instance.getTempDirectory();
-    final encryptedFilePath = tempDirectory +
-        file.generatedID.toString() +
-        (_isBackground ? "_bg" : "") +
-        ".encrypted";
+    final encryptedFilePath =
+        tempDirectory + file.generatedID.toString() + (_isBackground ? "_bg" : "") + ".encrypted";
     final encryptedThumbnailPath = tempDirectory +
         file.generatedID.toString() +
         "_thumbnail" +
@@ -347,10 +335,7 @@ class FileUploader {
 
     try {
       _logger.info(
-        "Trying to upload " +
-            file.toString() +
-            ", isForced: " +
-            forcedUpload.toString(),
+        "Trying to upload " + file.toString() + ", isForced: " + forcedUpload.toString(),
       );
       try {
         mediaUploadData = await getUploadDataFromEnteFile(file);
@@ -362,8 +347,7 @@ class FileUploader {
         }
       }
       Uint8List key;
-      bool isUpdatedFile =
-          file.uploadedFileID != null && file.updationTime == -1;
+      bool isUpdatedFile = file.uploadedFileID != null && file.updationTime == -1;
       if (isUpdatedFile) {
         _logger.info("File was updated " + file.toString());
         key = decryptFileKey(file);
@@ -388,29 +372,23 @@ class FileUploader {
         await io.File(encryptedThumbnailPath).delete();
       }
       final encryptedThumbnailFile = io.File(encryptedThumbnailPath);
-      await encryptedThumbnailFile
-          .writeAsBytes(encryptedThumbnailData.encryptedData);
+      await encryptedThumbnailFile.writeAsBytes(encryptedThumbnailData.encryptedData);
 
       final thumbnailUploadURL = await _getUploadURL();
-      String thumbnailObjectKey =
-          await _putFile(thumbnailUploadURL, encryptedThumbnailFile);
+      String thumbnailObjectKey = await _putFile(thumbnailUploadURL, encryptedThumbnailFile);
 
       final fileUploadURL = await _getUploadURL();
       String fileObjectKey = await _putFile(fileUploadURL, encryptedFile);
 
-      final metadata =
-          await file.getMetadataForUpload(mediaUploadData.sourceFile);
+      final metadata = await file.getMetadataForUpload(mediaUploadData.sourceFile);
       final encryptedMetadataData = await CryptoUtil.encryptChaCha(
         utf8.encode(jsonEncode(metadata)),
         fileAttributes.key,
       );
       final fileDecryptionHeader = Sodium.bin2base64(fileAttributes.header);
-      final thumbnailDecryptionHeader =
-          Sodium.bin2base64(encryptedThumbnailData.header);
-      final encryptedMetadata =
-          Sodium.bin2base64(encryptedMetadataData.encryptedData);
-      final metadataDecryptionHeader =
-          Sodium.bin2base64(encryptedMetadataData.header);
+      final thumbnailDecryptionHeader = Sodium.bin2base64(encryptedThumbnailData.header);
+      final encryptedMetadata = Sodium.bin2base64(encryptedMetadataData.encryptedData);
+      final metadataDecryptionHeader = Sodium.bin2base64(encryptedMetadataData.header);
       if (SyncService.instance.shouldStopSync()) {
         throw SyncStopRequestedError();
       }
@@ -434,10 +412,8 @@ class FileUploader {
           fileAttributes.key,
           CollectionsService.instance.getCollectionKey(collectionID),
         );
-        final encryptedKey =
-            Sodium.bin2base64(encryptedFileKeyData.encryptedData);
-        final keyDecryptionNonce =
-            Sodium.bin2base64(encryptedFileKeyData.nonce);
+        final encryptedKey = Sodium.bin2base64(encryptedFileKeyData.encryptedData);
+        final keyDecryptionNonce = Sodium.bin2base64(encryptedFileKeyData.nonce);
         remoteFile = await _uploadFile(
           file,
           collectionID,
@@ -474,9 +450,7 @@ class FileUploader {
       }
       rethrow;
     } finally {
-      if (io.Platform.isIOS &&
-          mediaUploadData != null &&
-          mediaUploadData.sourceFile != null) {
+      if (io.Platform.isIOS && mediaUploadData != null && mediaUploadData.sourceFile != null) {
         await mediaUploadData.sourceFile.delete();
       }
       if (io.File(encryptedFilePath).existsSync()) {
@@ -680,9 +654,7 @@ class FileUploader {
             headers: {"X-Auth-Token": Configuration.instance.getToken()},
           ),
         );
-        final urls = (response.data["urls"] as List)
-            .map((e) => UploadURL.fromMap(e))
-            .toList();
+        final urls = (response.data["urls"] as List).map((e) => UploadURL.fromMap(e)).toList();
         _uploadURLs.addAll(urls);
       } on DioError catch (e, s) {
         if (e.response != null) {
@@ -719,10 +691,7 @@ class FileUploader {
   }) async {
     final fileSize = contentLength ?? await file.length();
     _logger.info(
-      "Putting object for " +
-          file.toString() +
-          " of size: " +
-          fileSize.toString(),
+      "Putting object for " + file.toString() + " of size: " + fileSize.toString(),
     );
     final startTime = DateTime.now().millisecondsSinceEpoch;
     try {
@@ -737,8 +706,7 @@ class FileUploader {
       );
       _logger.info(
         "Upload speed : " +
-            (fileSize / (DateTime.now().millisecondsSinceEpoch - startTime))
-                .toString() +
+            (fileSize / (DateTime.now().millisecondsSinceEpoch - startTime)).toString() +
             " kilo bytes per second",
       );
 
@@ -773,9 +741,8 @@ class FileUploader {
   }
 
   Future<void> _pollBackgroundUploadStatus() async {
-    final blockedUploads = _queue.entries
-        .where((e) => e.value.status == UploadStatus.in_background)
-        .toList();
+    final blockedUploads =
+        _queue.entries.where((e) => e.value.status == UploadStatus.inBackground).toList();
     for (final upload in blockedUploads) {
       final file = upload.value.file;
       final isStillLocked = await _uploadLocks.isLocked(
@@ -784,8 +751,7 @@ class FileUploader {
       );
       if (!isStillLocked) {
         final completer = _queue.remove(upload.key).completer;
-        final dbFile =
-            await FilesDB.instance.getFile(upload.value.file.generatedID);
+        final dbFile = await FilesDB.instance.getFile(upload.value.file.generatedID);
         if (dbFile.uploadedFileID != null) {
           _logger.info("Background upload success detected");
           completer.complete(dbFile);
@@ -811,14 +777,14 @@ class FileUploadItem {
     this.file,
     this.collectionID,
     this.completer, {
-    this.status = UploadStatus.not_started,
+    this.status = UploadStatus.notStarted,
   });
 }
 
 enum UploadStatus {
-  not_started,
-  in_progress,
-  in_background,
+  notStarted,
+  inProgress,
+  inBackground,
   completed,
 }
 

lib/utils/hex.dart

@@ -27,7 +27,7 @@ class HexEncoder extends Converter<List<int>, String> {
 
   @override
   String convert(List<int> bytes) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuffer buffer = StringBuffer();
     for (int part in bytes) {
       if (part & 0xff != part) {
         throw FormatException("Non-byte integer detected");