refactor

2023-06-06 15:27:17 +05:30 · 2023-06-06 15:27:17 +05:30 · d43a4a78dd
commit d43a4a78dd
parent 126fe3ea02
27 changed files with 92 additions and 94 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -1,5 +1,5 @@
 PODS:
-  - background_fetch (1.1.4):
+  - background_fetch (1.1.6):
    - Flutter
  - camera_avfoundation (0.0.1):
    - Flutter
@ -8,30 +8,30 @@ PODS:
    - ReachabilitySwift
  - device_info (0.0.1):
    - Flutter
-  - Firebase/CoreOnly (10.3.0):
-    - FirebaseCore (= 10.3.0)
-  - Firebase/Messaging (10.3.0):
+  - Firebase/CoreOnly (10.9.0):
+    - FirebaseCore (= 10.9.0)
+  - Firebase/Messaging (10.9.0):
    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 10.3.0)
-  - firebase_core (2.5.0):
-    - Firebase/CoreOnly (= 10.3.0)
+    - FirebaseMessaging (~> 10.9.0)
+  - firebase_core (2.13.1):
+    - Firebase/CoreOnly (= 10.9.0)
    - Flutter
-  - firebase_messaging (14.2.2):
-    - Firebase/Messaging (= 10.3.0)
+  - firebase_messaging (14.6.2):
+    - Firebase/Messaging (= 10.9.0)
    - firebase_core
    - Flutter
-  - FirebaseCore (10.3.0):
+  - FirebaseCore (10.9.0):
    - FirebaseCoreInternal (~> 10.0)
    - GoogleUtilities/Environment (~> 7.8)
    - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.5.0):
+  - FirebaseCoreInternal (10.10.0):
    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.5.0):
+  - FirebaseInstallations (10.10.0):
    - FirebaseCore (~> 10.0)
    - GoogleUtilities/Environment (~> 7.8)
    - GoogleUtilities/UserDefaults (~> 7.8)
    - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (10.3.0):
+  - FirebaseMessaging (10.9.0):
    - FirebaseCore (~> 10.0)
    - FirebaseInstallations (~> 10.0)
    - GoogleDataTransport (~> 9.2)
@ -71,26 +71,26 @@ PODS:
  - FMDB (2.7.5):
    - FMDB/standard (= 2.7.5)
  - FMDB/standard (2.7.5)
-  - GoogleDataTransport (9.2.1):
+  - GoogleDataTransport (9.2.3):
    - GoogleUtilities/Environment (~> 7.7)
    - nanopb (< 2.30910.0, >= 2.30908.0)
    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.11.0):
+  - GoogleUtilities/AppDelegateSwizzler (7.11.1):
    - GoogleUtilities/Environment
    - GoogleUtilities/Logger
    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.0):
+  - GoogleUtilities/Environment (7.11.1):
    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.0):
+  - GoogleUtilities/Logger (7.11.1):
    - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.11.0):
+  - GoogleUtilities/Network (7.11.1):
    - GoogleUtilities/Logger
    - "GoogleUtilities/NSData+zlib"
    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.11.0)"
-  - GoogleUtilities/Reachability (7.11.0):
+  - "GoogleUtilities/NSData+zlib (7.11.1)"
+  - GoogleUtilities/Reachability (7.11.1):
    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.11.0):
+  - GoogleUtilities/UserDefaults (7.11.1):
    - GoogleUtilities/Logger
  - image_editor_common (1.0.0):
    - Flutter
@ -135,14 +135,14 @@ PODS:
  - photo_manager (2.0.0):
    - Flutter
    - FlutterMacOS
-  - PromisesObjC (2.1.1)
+  - PromisesObjC (2.2.0)
  - ReachabilitySwift (5.0.0)
  - receive_sharing_intent (0.0.1):
    - Flutter
-  - SDWebImage (5.15.2):
-    - SDWebImage/Core (= 5.15.2)
-  - SDWebImage/Core (5.15.2)
-  - SDWebImageWebPCoder (0.10.1):
+  - SDWebImage (5.16.0):
+    - SDWebImage/Core (= 5.16.0)
+  - SDWebImage/Core (5.16.0)
+  - SDWebImageWebPCoder (0.11.0):
    - libwebp (~> 1.0)
    - SDWebImage/Core (~> 5.15)
  - Sentry/HybridSDK (7.31.5)
@ -155,7 +155,7 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - sqflite (0.0.2):
+  - sqflite (0.0.3):
    - Flutter
    - FMDB (>= 2.7.5)
  - tflite_flutter (0.1.0):
@ -318,17 +318,17 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/wakelock/ios"

 SPEC CHECKSUMS:
-  background_fetch: bd64e544b303ee4cd4cf2fe8cb2187b72aecf9ca
-  camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9
+  background_fetch: bc9b44b0bf8b434e282a2ac9be8662800a0296ed
+  camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
  device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
-  Firebase: f92fc551ead69c94168d36c2b26188263860acd9
-  firebase_core: f95c8bbe65213d406d592573ad42a12d64849cb8
-  firebase_messaging: 3daef9f9ee5b91de2f282895ec91cc5e5ca78556
-  FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a
-  FirebaseCoreInternal: e463f41bb935cd049505bf7e9a5bdd7dcea90df6
-  FirebaseInstallations: 935bc4abb6f7a035cab7a0c31cb777b2be3dd254
-  FirebaseMessaging: e345b219fd15d325f0cf2fef28cb8ce00d851b3f
+  Firebase: bd152f0f3d278c4060c5c71359db08ebcfd5a3e2
+  firebase_core: ce64b0941c6d87c6ef5022ae9116a158236c8c94
+  firebase_messaging: 42912365e62efc1ea3e00724e5eecba6068ddb88
+  FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557
+  FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893
+  FirebaseInstallations: 52153982b057d3afcb4e1fbb3eb0b6d00611e681
+  FirebaseMessaging: 6b7052cc3da7bc8e5f72bef871243e8f04a14eed
  fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
@ -338,12 +338,12 @@ SPEC CHECKSUMS:
  flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
  flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
-  fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
+  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4
-  GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f
+  GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd
+  GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
-  in_app_purchase_storekit: 6b297e2b5eab9fa3251a492d57301722e4132a71
+  in_app_purchase_storekit: 4fb7ee9e824b1f09107fbfbbce8c4b276366dc43
  integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
  local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
@ -355,23 +355,23 @@ SPEC CHECKSUMS:
  open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
+  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
  photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
-  PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
+  PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
  receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
-  SDWebImage: 8ab87d4b3e5cc4927bd47f78db6ceb0b94442577
-  SDWebImageWebPCoder: 4851414d9f8894e328e8b97c93ea4f4f4e4418ae
+  SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
+  SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499
  Sentry: 4c9babff9034785067c896fd580b1f7de44da020
-  sentry_flutter: b10ae7a5ddcbc7f04648eeb2672b5747230172f1
+  sentry_flutter: 1346a880b24c0240807b53b10cf50ddad40f504e
  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
+  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
  tflite_flutter: 9157a660578930a99728974f247369af1c3595d5
  tflite_flutter_helper: 543b46b6bd064b21c92ea6e54bc0b29f1ce74cb5
  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: fb12c43172927bb5cf75aeebd073f883801f1993
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
  video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
  wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
--- a/lib/app.dart
+++ b/lib/app.dart
@ -13,7 +13,7 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
 import 'package:photos/services/sync_service.dart';
-import 'package:photos/ui/home_widget.dart';
+import 'package:photos/ui/tabs/home_widget.dart';
 import "package:photos/ui/viewer/actions/file_viewer.dart";
 import "package:photos/utils/intent_util.dart";

--- a/lib/ui/account/password_reentry_page.dart
+++ b/lib/ui/account/password_reentry_page.dart
@ -10,7 +10,7 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/ui/account/recovery_page.dart';
 import 'package:photos/ui/common/dynamic_fab.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
-import 'package:photos/ui/home_widget.dart';
+import 'package:photos/ui/tabs/home_widget.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/email_util.dart';

--- a/lib/ui/collections/collection_action_sheet.dart
+++ b/lib/ui/collections/collection_action_sheet.dart
@ -12,7 +12,7 @@ import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/ente_theme.dart';
-import "package:photos/ui/collections_list_widget.dart";
+import 'package:photos/ui/collections/collections_list_widget.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/components/bottom_of_title_bar_widget.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
--- a/lib/ui/collections/collections_list_widget.dart
+++ b/lib/ui/collections/collections_list_widget.dart
@ -16,7 +16,7 @@ import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/ignored_files_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import "package:photos/ui/actions/collection/collection_sharing_actions.dart";
-import "package:photos/ui/collection_action_sheet.dart";
+import 'package:photos/ui/collections/collection_action_sheet.dart';
 import 'package:photos/ui/components/album_list_item_widget.dart';
 import 'package:photos/ui/components/new_album_list_widget.dart';
 import "package:photos/ui/sharing/share_collection_page.dart";
--- a/lib/ui/home/home_bottom_nav_bar.dart
+++ b/lib/ui/home/home_bottom_nav_bar.dart
@ -6,7 +6,7 @@ import 'package:photos/events/tab_changed_event.dart';
 import 'package:photos/models/selected_files.dart';
 import "package:photos/theme/colors.dart";
 import 'package:photos/theme/ente_theme.dart';
-import 'package:photos/ui/nav_bar.dart';
+import 'package:photos/ui/tabs/nav_bar.dart';

 class HomeBottomNavigationBar extends StatefulWidget {
  const HomeBottomNavigationBar(
--- a/lib/ui/home/loading_photos_widget.dart
+++ b/lib/ui/home/loading_photos_widget.dart
@ -9,8 +9,8 @@ import 'package:photos/events/local_import_progress.dart';
 import 'package:photos/events/sync_status_update_event.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/services/local_sync_service.dart';
-import 'package:photos/ui/backup_folder_selection_page.dart';
 import 'package:photos/ui/common/bottom_shadow.dart';
+import 'package:photos/ui/settings/backup/backup_folder_selection_page.dart';
 import 'package:photos/utils/navigation_util.dart';

 class LoadingPhotosWidget extends StatefulWidget {
--- a/lib/ui/home/preserve_footer_widget.dart
+++ b/lib/ui/home/preserve_footer_widget.dart
@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:photo_manager/photo_manager.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/services/local_sync_service.dart';
-import 'package:photos/ui/backup_folder_selection_page.dart';
 import 'package:photos/ui/common/gradient_button.dart';
+import 'package:photos/ui/settings/backup/backup_folder_selection_page.dart';
 import 'package:photos/utils/navigation_util.dart';

 class PreserveFooterWidget extends StatelessWidget {
--- a/lib/ui/home/start_backup_hook_widget.dart
+++ b/lib/ui/home/start_backup_hook_widget.dart
@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:photos/generated/l10n.dart';
 import 'package:photos/services/local_sync_service.dart';
-import 'package:photos/ui/backup_folder_selection_page.dart';
 import 'package:photos/ui/common/gradient_button.dart';
+import 'package:photos/ui/settings/backup/backup_folder_selection_page.dart';
 import 'package:photos/utils/navigation_util.dart';

 class StartBackupHookWidget extends StatelessWidget {
--- a/lib/ui/payment/skip_subscription_widget.dart
+++ b/lib/ui/payment/skip_subscription_widget.dart
@ -5,7 +5,7 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/models/billing_plan.dart';
 import 'package:photos/models/subscription.dart';
 import 'package:photos/services/billing_service.dart';
-import 'package:photos/ui/home_widget.dart';
+import "package:photos/ui/tabs/home_widget.dart";

 class SkipSubscriptionWidget extends StatelessWidget {
  const SkipSubscriptionWidget({
--- a/lib/ui/settings/advanced_settings_screen.dart
+++ b/lib/ui/settings/advanced_settings_screen.dart
--- a/lib/ui/settings/backup/backup_folder_selection_page.dart
+++ b/lib/ui/settings/backup/backup_folder_selection_page.dart
--- a/lib/ui/settings/backup/backup_section_widget.dart
+++ b/lib/ui/settings/backup/backup_section_widget.dart
@ -8,13 +8,13 @@ import 'package:photos/services/deduplication_service.dart';
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/services/update_service.dart';
 import 'package:photos/theme/ente_theme.dart';
-import 'package:photos/ui/backup_folder_selection_page.dart';
-import 'package:photos/ui/backup_settings_screen.dart';
-import 'package:photos/ui/components/captioned_text_widget.dart';
+import "package:photos/ui/components/captioned_text_widget.dart";
 import 'package:photos/ui/components/dialog_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import 'package:photos/ui/settings/backup/backup_folder_selection_page.dart';
+import 'package:photos/ui/settings/backup/backup_settings_screen.dart';
 import 'package:photos/ui/settings/common_settings.dart';
 import 'package:photos/ui/tools/deduplicate_page.dart';
 import 'package:photos/ui/tools/free_space_page.dart';
--- a/lib/ui/settings/backup/backup_settings_screen.dart
+++ b/lib/ui/settings/backup/backup_settings_screen.dart
--- a/lib/ui/settings/general_section_widget.dart
+++ b/lib/ui/settings/general_section_widget.dart
@ -6,11 +6,11 @@ import 'package:photos/services/billing_service.dart';
 import "package:photos/services/feature_flag_service.dart";
 import 'package:photos/services/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
-import 'package:photos/ui/advanced_settings_screen.dart';
-import 'package:photos/ui/components/captioned_text_widget.dart';
-import 'package:photos/ui/components/expandable_menu_item_widget.dart';
+import "package:photos/ui/components/captioned_text_widget.dart";
+import "package:photos/ui/components/expandable_menu_item_widget.dart";
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import "package:photos/ui/growth/referral_screen.dart";
+import 'package:photos/ui/settings/advanced_settings_screen.dart';
 import 'package:photos/ui/settings/common_settings.dart';
 import "package:photos/ui/settings/language_picker.dart";
 import 'package:photos/utils/navigation_util.dart';
--- a/lib/ui/settings_page.dart
+++ b/lib/ui/settings_page.dart
@ -16,7 +16,7 @@ import "package:photos/ui/growth/referral_screen.dart";
 import 'package:photos/ui/settings/about_section_widget.dart';
 import 'package:photos/ui/settings/account_section_widget.dart';
 import 'package:photos/ui/settings/app_version_widget.dart';
-import 'package:photos/ui/settings/backup_section_widget.dart';
+import 'package:photos/ui/settings/backup/backup_section_widget.dart';
 import 'package:photos/ui/settings/debug_section_widget.dart';
 import 'package:photos/ui/settings/general_section_widget.dart';
 import 'package:photos/ui/settings/inherited_settings_state.dart';
--- a/lib/ui/tabs/home_widget.dart
+++ b/lib/ui/tabs/home_widget.dart
@ -30,22 +30,22 @@ import 'package:photos/services/user_service.dart';
 import 'package:photos/states/user_details_state.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/ente_theme.dart';
-import 'package:photos/ui/collection_action_sheet.dart';
-import 'package:photos/ui/collections_gallery_widget.dart';
-import 'package:photos/ui/common/bottom_shadow.dart';
+import 'package:photos/ui/collections/collection_action_sheet.dart';
+import "package:photos/ui/common/bottom_shadow.dart";
 import 'package:photos/ui/extents_page_view.dart';
 import 'package:photos/ui/home/grant_permissions_widget.dart';
 import 'package:photos/ui/home/header_widget.dart';
 import 'package:photos/ui/home/home_bottom_nav_bar.dart';
 import 'package:photos/ui/home/home_gallery_widget.dart';
 import 'package:photos/ui/home/landing_page_widget.dart';
+import "package:photos/ui/home/loading_photos_widget.dart";
 import 'package:photos/ui/home/preserve_footer_widget.dart';
 import 'package:photos/ui/home/start_backup_hook_widget.dart';
-import 'package:photos/ui/loading_photos_widget.dart';
 import 'package:photos/ui/notification/update/change_log_page.dart';
 import 'package:photos/ui/settings/app_update_dialog.dart';
 import 'package:photos/ui/settings_page.dart';
-import "package:photos/ui/shared_collections_gallery.dart";
+import "package:photos/ui/tabs/shared_collections_tab.dart";
+import "package:photos/ui/tabs/user_collections_tab.dart";
 import 'package:photos/utils/dialog_util.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:uni_links/uni_links.dart';
@ -60,8 +60,8 @@ class HomeWidget extends StatefulWidget {
 }

 class _HomeWidgetState extends State<HomeWidget> {
-  static const _deviceFolderGalleryWidget = CollectionsGalleryWidget();
-  static const _sharedCollectionGallery = SharedCollectionGallery();
+  static const _userCollectionsTab = UserCollectionsTab();
+  static const _sharedCollectionTab = SharedCollectionsTab();
  static final _settingsPage = SettingsPage(
    emailNotifier: UserService.instance.emailValueNotifier,
  );
@ -375,8 +375,8 @@ class _HomeWidgetState extends State<HomeWidget> {
                        footer: const PreserveFooterWidget(),
                        selectedFiles: _selectedFiles,
                      ),
-                _deviceFolderGalleryWidget,
-                _sharedCollectionGallery,
+                _userCollectionsTab,
+                _sharedCollectionTab,
              ],
            );
          },
--- a/lib/ui/tabs/nav_bar.dart
+++ b/lib/ui/tabs/nav_bar.dart
--- a/lib/ui/tabs/shared/new_shared_collections_gallery.dart
+++ b/lib/ui/tabs/shared/new_shared_collections_gallery.dart
@ -2,7 +2,7 @@ import "package:flutter/material.dart";
 import "package:photos/core/constants.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/theme/ente_theme.dart";
-import "package:photos/ui/collection_action_sheet.dart";
+import 'package:photos/ui/collections/collection_action_sheet.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import "package:photos/ui/components/empty_state_item_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
--- a/lib/ui/tabs/shared_collections_tab.dart
+++ b/lib/ui/tabs/shared_collections_tab.dart
@ -20,23 +20,22 @@ import 'package:photos/theme/colors.dart';
 import 'package:photos/ui/collections/section_title.dart';
 import 'package:photos/ui/common/gradient_button.dart';
 import 'package:photos/ui/common/loading_widget.dart';
-import "package:photos/ui/new_shared_collections_gallery.dart";
-import 'package:photos/ui/sharing/user_avator_widget.dart';
+import "package:photos/ui/sharing/user_avator_widget.dart";
+import 'package:photos/ui/tabs/shared/new_shared_collections_gallery.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
 import 'package:photos/ui/viewer/gallery/collection_page.dart';
 import 'package:photos/utils/navigation_util.dart';
 import 'package:photos/utils/share_util.dart';
 import 'package:photos/utils/toast_util.dart';

-class SharedCollectionGallery extends StatefulWidget {
-  const SharedCollectionGallery({Key? key}) : super(key: key);
+class SharedCollectionsTab extends StatefulWidget {
+  const SharedCollectionsTab({Key? key}) : super(key: key);

  @override
-  State<SharedCollectionGallery> createState() =>
-      _SharedCollectionGalleryState();
+  State<SharedCollectionsTab> createState() => _SharedCollectionsTabState();
 }

-class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
+class _SharedCollectionsTabState extends State<SharedCollectionsTab>
    with AutomaticKeepAliveClientMixin {
  final Logger _logger = Logger("SharedCollectionGallery");
  late StreamSubscription<LocalPhotosUpdatedEvent> _localFilesSubscription;
--- a/lib/ui/collections_gallery_widget.dart
+++ b/lib/ui/collections_gallery_widget.dart
@ -28,17 +28,16 @@ import 'package:photos/ui/viewer/actions/delete_empty_albums.dart';
 import 'package:photos/ui/viewer/gallery/empty_state.dart';
 import 'package:photos/utils/local_settings.dart';

-class CollectionsGalleryWidget extends StatefulWidget {
-  const CollectionsGalleryWidget({Key? key}) : super(key: key);
+class UserCollectionsTab extends StatefulWidget {
+  const UserCollectionsTab({Key? key}) : super(key: key);

  @override
-  State<CollectionsGalleryWidget> createState() =>
-      _CollectionsGalleryWidgetState();
+  State<UserCollectionsTab> createState() => _UserCollectionsTabState();
 }

-class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
+class _UserCollectionsTabState extends State<UserCollectionsTab>
    with AutomaticKeepAliveClientMixin {
-  final _logger = Logger((_CollectionsGalleryWidgetState).toString());
+  final _logger = Logger((_UserCollectionsTabState).toString());
  late StreamSubscription<LocalPhotosUpdatedEvent> _localFilesSubscription;
  late StreamSubscription<CollectionUpdatedEvent>
      _collectionUpdatesSubscription;
--- a/lib/ui/viewer/actions/file_selection_actions_widget.dart
+++ b/lib/ui/viewer/actions/file_selection_actions_widget.dart
@ -16,7 +16,7 @@ import 'package:photos/services/hidden_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/actions/collection/collection_file_actions.dart';
 import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
-import 'package:photos/ui/collection_action_sheet.dart';
+import 'package:photos/ui/collections/collection_action_sheet.dart';
 import 'package:photos/ui/components/action_sheet_widget.dart';
 import 'package:photos/ui/components/blur_menu_item_widget.dart';
 import 'package:photos/ui/components/bottom_action_bar/expanded_menu_widget.dart';
--- a/lib/ui/viewer/actions/file_selection_overlay_bar.dart
+++ b/lib/ui/viewer/actions/file_selection_overlay_bar.dart
@ -6,7 +6,7 @@ import 'package:photos/models/gallery_type.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/theme/ente_theme.dart';
-import 'package:photos/ui/collection_action_sheet.dart';
+import 'package:photos/ui/collections/collection_action_sheet.dart';
 import 'package:photos/ui/components/bottom_action_bar/bottom_action_bar_widget.dart';
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import 'package:photos/ui/viewer/actions/file_selection_actions_widget.dart';
--- a/lib/ui/viewer/file/fading_app_bar.dart
+++ b/lib/ui/viewer/file/fading_app_bar.dart
@ -21,7 +21,7 @@ import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/hidden_service.dart';
 import 'package:photos/services/ignored_files_service.dart';
 import 'package:photos/services/local_sync_service.dart';
-import 'package:photos/ui/collection_action_sheet.dart';
+import 'package:photos/ui/collections/collection_action_sheet.dart';
 import 'package:photos/ui/viewer/file/custom_app_bar.dart';
 import "package:photos/ui/viewer/file_details/favorite_widget.dart";
 import "package:photos/ui/viewer/file_details/upload_icon_widget.dart";
--- a/lib/ui/viewer/file/fading_bottom_bar.dart
+++ b/lib/ui/viewer/file/fading_bottom_bar.dart
@ -10,7 +10,7 @@ import 'package:photos/models/trash_file.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/ente_theme.dart';
 import "package:photos/ui/actions/file/file_actions.dart";
-import 'package:photos/ui/collection_action_sheet.dart';
+import 'package:photos/ui/collections/collection_action_sheet.dart';
 import 'package:photos/utils/delete_file_util.dart';
 import 'package:photos/utils/share_util.dart';

--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -49,8 +49,8 @@ dependencies:
  expansion_tile_card: ^2.0.0
  extended_image: ^6.2.1
  fast_base58: ^0.2.1
-  firebase_core: ^2.4.1
-  firebase_messaging: ^14.2.1
+  firebase_core: ^2.13.1
+  firebase_messaging: ^14.6.2
  fk_user_agent: ^2.0.1
  flutter:
    sdk: flutter
--- a/setup.sh
+++ b/setup.sh
@ -4,10 +4,10 @@

 cd "$(dirname "$(readlink -f "$0")")"

+
 # Pull from the latest tag where binaries were built
 ANDROID_TAG="tf_2.5"
 IOS_TAG="v0.5.0"
-
 IOS_URL="https://github.com/am15h/tflite_flutter_plugin/releases/download/"
 ANDROID_URL="https://github.com/am15h/tflite_flutter_plugin/releases/download/"