π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[locker] Hide scanner sheet entry only behind the add FAB
laurenspriemec2e03489012
diff --git a/mobile/apps/locker/lib/ui/pages/home_page.dart b/mobile/apps/locker/lib/ui/pages/home_page.dartindex f5959ea817..1f04402e95 100644--- a/mobile/apps/locker/lib/ui/pages/home_page.dart+++ b/mobile/apps/locker/lib/ui/pages/home_page.dart@@ -667,7 +667,8 @@ class _HomePageState extends UploaderPageState<HomePage>],FloatingActionButton(tooltip: 'Add item',- onPressed: _openSavePage,+ onPressed: () =>+ _openSavePage(includeScanner: false),shape: const CircleBorder(),backgroundColor: colors.primary,elevation: 0,@@ -779,7 +780,7 @@ class _HomePageState extends UploaderPageState<HomePage>child: HomeEmptyStateWidget(isLoading: _isSyncing,onSetupLegacy: () => openLegacyFromHome(context),- onSaveToLocker: _openSavePage,+ onSaveToLocker: () => _openSavePage(includeScanner: true),),),),@@ -846,11 +847,12 @@ class _HomePageState extends UploaderPageState<HomePage>);}- void _openSavePage() {+ void _openSavePage({required bool includeScanner}) {showSaveBottomSheet(context,onUploadDocument: addFile,onUploadFiles: uploadFiles,+ includeScanner: includeScanner,);}diff --git a/mobile/apps/locker/lib/ui/pages/save_page.dart b/mobile/apps/locker/lib/ui/pages/save_page.dartindex afab61de5c..9cba0ad46b 100644--- a/mobile/apps/locker/lib/ui/pages/save_page.dart+++ b/mobile/apps/locker/lib/ui/pages/save_page.dart@@ -28,10 +28,13 @@ class SaveOption {final String description;}-List<SaveOption> saveOptions(BuildContext context) {+List<SaveOption> saveOptions(+ BuildContext context, {+ bool includeScanner = true,+}) {final l10n = context.strings;return [- if (FeatureFlagService.instance.documentScanner)+ if (includeScanner && FeatureFlagService.instance.documentScanner)SaveOption(type: SaveOptionType.scanDocument,icon: HugeIcons.strokeRoundedFileScan,@@ -135,6 +138,7 @@ Future<void> showSaveBottomSheet(BuildContext context, {required Future<bool> Function() onUploadDocument,required Future<bool> Function(List<File> files) onUploadFiles,+ bool includeScanner = true,}) {return showBottomSheetComponent<void>(context: context,@@ -142,6 +146,7 @@ Future<void> showSaveBottomSheet(rootContext: context,onUploadDocument: onUploadDocument,onUploadFiles: onUploadFiles,+ includeScanner: includeScanner,),);}@@ -152,17 +157,19 @@ class SaveBottomSheet extends StatelessWidget {required this.rootContext,required this.onUploadDocument,required this.onUploadFiles,+ this.includeScanner = true,});final BuildContext rootContext;final Future<bool> Function() onUploadDocument;final Future<bool> Function(List<File> files) onUploadFiles;+ final bool includeScanner;@overrideWidget build(BuildContext context) {final colors = context.componentColors;final maxHeight = MediaQuery.of(context).size.height * 0.75;- final options = saveOptions(context);+ final options = saveOptions(context, includeScanner: includeScanner);return BottomSheetComponent(title: context.strings.saveToLocker,@@ -230,6 +237,7 @@ class SaveBottomSheet extends StatelessWidget {navigator.context,onUploadDocument: onUploadDocument,onUploadFiles: onUploadFiles,+ includeScanner: includeScanner,);});}