Skip to content

armgit / ente

Public Imported from GitHub
0

💚 End-to-end encrypted cloud for everything.

[mobile][photos] Simplify skipped files screen

ashilkn7f1114244a91
diff --git a/mobile/apps/photos/changes/remove-skipped-files-subtitle.md b/mobile/apps/photos/changes/remove-skipped-files-subtitle.md
new file mode 100644
index 0000000000..669bea75f5
--- /dev/null
+++ b/mobile/apps/photos/changes/remove-skipped-files-subtitle.md
@@ -0,0 +1 @@
+- Simplified the skipped files experience in device folders.
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/device/backup_header_widget.dart b/mobile/apps/photos/lib/ui/viewer/gallery/device/backup_header_widget.dart
index 2dcdb4019f..4e77cb6a10 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/device/backup_header_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/device/backup_header_widget.dart
@@ -105,8 +105,6 @@ class _BackupHeaderWidgetState extends State<BackupHeaderWidget> {
return _paddedHeader(
MenuItemWidgetNew(
title: l10n.skippedFiles,
- subText: l10n.chooseReasonToViewFiles,
- titleToSubTextSpacing: 2,
leadingIconWidget: _menuIcon(
context,
HugeIcons.strokeRoundedReload,
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/device/device_folder_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/device/device_folder_page.dart
index 09af4303fa..f1bde04c53 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/device/device_folder_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/device/device_folder_page.dart
@@ -150,11 +150,7 @@ class _DeviceFolderPageState extends State<DeviceFolderPage> {
Future<void> _openSkippedFiles() async {
await routeToPage(
context,
- SkippedDeviceFolderPage(
- widget.deviceCollection,
- shouldBackup: _shouldBackup,
- onBackupChanged: _updateBackupStatus,
- ),
+ SkippedDeviceFolderPage(widget.deviceCollection),
);
}
}
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/device/skipped_device_folder_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/device/skipped_device_folder_page.dart
index 452143c819..84c73e1e21 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/device/skipped_device_folder_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/device/skipped_device_folder_page.dart
@@ -26,15 +26,8 @@ import "package:photos/ui/viewer/gallery/state/selection_state.dart";
class SkippedDeviceFolderPage extends StatefulWidget {
final DeviceCollection deviceCollection;
- final bool shouldBackup;
- final Future<bool> Function(bool shouldBackup) onBackupChanged;
- const SkippedDeviceFolderPage(
- this.deviceCollection, {
- required this.shouldBackup,
- required this.onBackupChanged,
- super.key,
- });
+ const SkippedDeviceFolderPage(this.deviceCollection, {super.key});
@override
State<SkippedDeviceFolderPage> createState() =>
@@ -48,13 +41,11 @@ class _SkippedDeviceFolderPageState extends State<SkippedDeviceFolderPage> {
late final StreamSubscription<LocalPhotosUpdatedEvent> _localPhotosSub;
late Future<List<EnteFile>> _filesInDeviceCollection;
late Future<Set<IgnoredUploadReasonBucket>> _ignoredUploadBuckets;
- late bool _shouldBackup;
IgnoredUploadReasonBucket? _selectedBucket;
@override
void initState() {
super.initState();
- _shouldBackup = widget.shouldBackup;
_refreshIgnoredState();
_localPhotosSub = Bus.instance.on<LocalPhotosUpdatedEvent>().listen((_) {
if (!mounted) {
@@ -98,11 +89,7 @@ class _SkippedDeviceFolderPageState extends State<SkippedDeviceFolderPage> {
GalleryType.localFolder,
l10n.skippedFiles,
_selectedFiles,
- deviceCollection: widget.deviceCollection,
- isDeviceFolderBackedUp: _shouldBackup,
- onDisableDeviceFolderBackup: () async {
- await _updateBackupStatus(false);
- },
+ showOverflowMenu: false,
);
final gallery = Gallery(
key: ValueKey("skipped_device_folder:${widget.deviceCollection.id}"),
@@ -172,19 +159,6 @@ class _SkippedDeviceFolderPageState extends State<SkippedDeviceFolderPage> {
unawaited(RemoteSyncService.instance.sync(silently: true));
}
- Future<void> _updateBackupStatus(bool shouldBackup) async {
- final updated = await widget.onBackupChanged(shouldBackup);
- if (!mounted || !updated) {
- return;
- }
- setState(() {
- _shouldBackup = shouldBackup;
- });
- if (!shouldBackup) {
- await Navigator.of(context).maybePop();
- }
- }
-
Future<void> _syncSelectedBucket({required bool popIfEmpty}) async {
try {
final buckets = await _ignoredUploadBuckets;
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
index 675f4f7035..15e301e2a7 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
@@ -77,6 +77,7 @@ class GalleryAppBarWidget extends StatefulWidget {
Collection? collection,
List<EnteFile>? files,
PreferredSizeWidget? bottom,
+ bool showOverflowMenu = true,
}) {
return GalleryAppBarConfig(
sliverBuilder: (_) => GalleryAppBarWidget._(
@@ -90,6 +91,7 @@ class GalleryAppBarWidget extends StatefulWidget {
collection: collection,
files: files,
bottom: bottom,
+ showOverflowMenu: showOverflowMenu,
),
geometryBuilder: (context) => _resolveSliverGeometry(
context,
@@ -139,6 +141,7 @@ class GalleryAppBarWidget extends StatefulWidget {
final Collection? collection;
final List<EnteFile>? files;
final PreferredSizeWidget? bottom;
+ final bool showOverflowMenu;
const GalleryAppBarWidget._(
this.type,
@@ -151,6 +154,7 @@ class GalleryAppBarWidget extends StatefulWidget {
this.collection,
this.files,
this.bottom,
+ required this.showOverflowMenu,
});
@override
@@ -570,7 +574,8 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
final bool isArchived = widget.collection?.isArchived() ?? false;
final bool isHidden = widget.collection?.isHidden() ?? false;
- if (!_hasOverflowMenuActions(userId, isArchived, isHidden)) {
+ if (!widget.showOverflowMenu ||
+ !_hasOverflowMenuActions(userId, isArchived, isHidden)) {
return actions;
}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_bg.arb b/mobile/packages/strings/lib/l10n/arb/strings_bg.arb
index 6742988d90..037713f5c2 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_bg.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_bg.arb
@@ -597,7 +597,6 @@
"chooseBackupLocation": "Choose a backup location",
"chooseFromAnExistingContact": "Choose from an existing contact",
"chooseIcon": "Изберете икона",
- "chooseReasonToViewFiles": "Choose a reason to view these files",
"chooseYourPlan": "Choose your plan",
"city": "In the city",
"citySunsets": "City sunset glow",
@@ -4648,4 +4647,4 @@
}
},
"grantAccess": "Grant access"
-}
\ No newline at end of file
+}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_de.arb b/mobile/packages/strings/lib/l10n/arb/strings_de.arb
index 3dcba8415c..b48320d8e9 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_de.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_de.arb
@@ -594,7 +594,6 @@
"chooseBackupLocation": "Sicherungsort festlegen",
"chooseFromAnExistingContact": "Aus einem vorhandenen Kontakt auswählen",
"chooseIcon": "Symbol wählen",
- "chooseReasonToViewFiles": "Wähle einen Grund für die Anzeige dieser Dateien",
"chooseYourPlan": "Wähle dein Abonnement",
"city": "In der Stadt",
"citySunsets": "Leuchtender Sonnenuntergang in der Stadt",
@@ -4307,4 +4306,4 @@
"cameraPermissionSettings": "Kamerazugriff ist deaktiviert. Aktiviere ihn in den Einstellungen, um fortzufahren.",
"cameraPermissionRestricted": "Kamerazugriff ist auf diesem Gerät eingeschränkt.",
"grantAccess": "Zugriff erlauben"
-}
\ No newline at end of file
+}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_en.arb b/mobile/packages/strings/lib/l10n/arb/strings_en.arb
index b5971414f0..1166d9dd9a 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_en.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_en.arb
@@ -602,7 +602,6 @@
"chooseBackupLocation": "Choose a backup location",
"chooseFromAnExistingContact": "Choose from an existing contact",
"chooseIcon": "Choose icon",
- "chooseReasonToViewFiles": "Choose a reason to view these files",
"chooseYourPlan": "Choose your plan",
"city": "In the city",
"citySunsets": "City sunset glow",
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_fr.arb b/mobile/packages/strings/lib/l10n/arb/strings_fr.arb
index d56287806d..e865052684 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_fr.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_fr.arb
@@ -518,7 +518,6 @@
"chooseBackupLocation": "Choisir l'emplacement de la sauvegarde",
"chooseFromAnExistingContact": "Choisir parmi un contact existant",
"chooseIcon": "Choisir un icône",
- "chooseReasonToViewFiles": "Choisissez une raison pour voir ces fichiers",
"chooseYourPlan": "Choisissez votre abonnement",
"city": "Dans la ville",
"citySunsets": "Coucher du soleil en ville",
@@ -3742,4 +3741,4 @@
"youveNoFilesInThisAlbumThatCanBeDeleted": "Vous n'avez pas de fichiers dans cet album qui peuvent être supprimés",
"zoomOutToSeePhotos": "Zoom en arrière pour voir les photos",
"grantAccess": "Autoriser l'accès"
-}
\ No newline at end of file
+}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_it.arb b/mobile/packages/strings/lib/l10n/arb/strings_it.arb
index 276147936d..9911524e03 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_it.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_it.arb
@@ -579,7 +579,6 @@
"chooseBackupLocation": "Scegli una posizione di backup",
"chooseFromAnExistingContact": "Scegli da un contatto esistente",
"chooseIcon": "Scegli icona",
- "chooseReasonToViewFiles": "Scegliere un motivo per visualizzare questi file",
"chooseYourPlan": "Scegli il tuo piano",
"city": "In città",
"citySunsets": "Tramonti in città",
@@ -4127,4 +4126,4 @@
"youveNoFilesInThisAlbumThatCanBeDeleted": "Non hai file in questo album che possono essere eliminati",
"zoomOutToSeePhotos": "Zoom indietro per visualizzare le foto",
"grantAccess": "Concedi accesso"
-}
\ No newline at end of file
+}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_pt_BR.arb b/mobile/packages/strings/lib/l10n/arb/strings_pt_BR.arb
index 505cebf88b..b1948e3baa 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_pt_BR.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_pt_BR.arb
@@ -597,7 +597,6 @@
"chooseBackupLocation": "Selecione o local do backup",
"chooseFromAnExistingContact": "Escolher de um contato existente",
"chooseIcon": "Escolher ícone",
- "chooseReasonToViewFiles": "Escolha um motivo para ver estes arquivos",
"chooseYourPlan": "Escolha seu plano",
"city": "Na cidade",
"citySunsets": "Brilho do pôr do sol na cidade",
@@ -4009,4 +4008,4 @@
"cameraPermissionSettings": "O acesso à câmera está desativado. Ative-o nas Configurações para continuar.",
"cameraPermissionRestricted": "O acesso à câmera está restrito neste dispositivo.",
"grantAccess": "Permitir"
-}
\ No newline at end of file
+}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_ru.arb b/mobile/packages/strings/lib/l10n/arb/strings_ru.arb
index 190a053964..65c0fbb2ee 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_ru.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_ru.arb
@@ -585,7 +585,6 @@
"chooseBackupLocation": "Выберите место для резервной копии",
"chooseFromAnExistingContact": "Выбрать из существующих контактов",
"chooseIcon": "Выберите значок",
- "chooseReasonToViewFiles": "Выберите причину для просмотра этих файлов",
"chooseYourPlan": "Выбери свой тариф",
"city": "В городе",
"citySunsets": "Городской закат",
@@ -3826,4 +3825,4 @@
"youveNoFilesInThisAlbumThatCanBeDeleted": "В этом альбоме нет файлов, которые можно удалить",
"zoomOutToSeePhotos": "Уменьшите масштаб, чтобы увидеть фото",
"grantAccess": "Предоставить доступ"
-}
\ No newline at end of file
+}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_vi.arb b/mobile/packages/strings/lib/l10n/arb/strings_vi.arb
index b9d2454912..2f837418d1 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_vi.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_vi.arb
@@ -597,7 +597,6 @@
"chooseBackupLocation": "Chọn nơi sao lưu",
"chooseFromAnExistingContact": "Chọn từ danh bạ hiện có",
"chooseIcon": "Chọn biểu tượng",
- "chooseReasonToViewFiles": "Hãy chọn một lý do để xem các tệp này",
"chooseYourPlan": "Chọn gói của bạn",
"city": "Trong thành phố",
"citySunsets": "Hoàng hôn thành phố",
@@ -4154,4 +4153,4 @@
}
},
"grantAccess": "Cấp quyền truy cập"
-}
\ No newline at end of file
+}
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_zh_TW.arb b/mobile/packages/strings/lib/l10n/arb/strings_zh_TW.arb
index ef2d1e912a..e349ba2dec 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_zh_TW.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_zh_TW.arb
@@ -484,7 +484,6 @@
"chooseBackupLocation": "選擇備份存放位置",
"chooseFromAnExistingContact": "從現有聯絡人中選擇",
"chooseIcon": "選擇圖示",
- "chooseReasonToViewFiles": "選擇原因以查看這些檔案",
"chooseYourPlan": "選擇您的方案",
"city": "在此城市",
"citySunsets": "城市日落餘暉",
@@ -3483,4 +3482,4 @@
"youveNoFilesInThisAlbumThatCanBeDeleted": "此相簿中沒有您可以刪除的檔案",
"zoomOutToSeePhotos": "縮小以查看照片",
"grantAccess": "授予存取權限"
-}
\ No newline at end of file
+}