Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Use the Ente picker for adding device photos

r4khulb71746beaf69
diff --git a/mobile/apps/photos/changes/device-media-picker.md b/mobile/apps/photos/changes/device-media-picker.md
new file mode 100644
index 0000000000..1938eb0fe9
--- /dev/null
+++ b/mobile/apps/photos/changes/device-media-picker.md
@@ -0,0 +1 @@
+- Improved adding photos from your device with gallery selection controls and a preview of selected items.
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/hooks/add_photos_sheet.dart b/mobile/apps/photos/lib/ui/viewer/gallery/hooks/add_photos_sheet.dart
index 533db35f48..cf84d87c63 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/hooks/add_photos_sheet.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/hooks/add_photos_sheet.dart
@@ -1,27 +1,22 @@
import "package:ente_components/ente_components.dart";
import "package:ente_strings/ente_strings.dart";
import "package:ente_ui/components/loading_widget.dart";
-import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
import "package:flutter_animate/flutter_animate.dart";
import "package:hugeicons/hugeicons.dart";
import "package:photos/core/configuration.dart";
-import "package:photos/core/constants.dart";
import "package:photos/db/files_db.dart";
-import "package:photos/locale.dart";
import 'package:photos/models/collection/collection.dart';
import "package:photos/models/selected_files.dart";
-import "package:photos/service_locator.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/services/filter/db_filters.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/device_picker/device_picker_page.dart";
import "package:photos/ui/viewer/gallery/gallery.dart";
import "package:photos/ui/viewer/gallery/state/boundary_reporter_mixin.dart";
import "package:photos/ui/viewer/gallery/state/gallery_boundaries_provider.dart";
import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
-import "package:photos/utils/dialog_util.dart";
-import 'package:wechat_assets_picker/wechat_assets_picker.dart';
Future<dynamic> showAddPhotosSheet(
BuildContext context,
@@ -179,89 +174,12 @@ class AddPhotosPhotoWidget extends StatelessWidget {
}
Future<void> _onPickFromDeviceClicked(BuildContext context) async {
- try {
- final assetPickerTextDelegate = await _getAssetPickerTextDelegate();
- if (!context.mounted) return;
- final List<AssetEntity>? result = await AssetPicker.pickAssets(
- context,
- pickerConfig: AssetPickerConfig(
- keepScrollOffset: true,
- maxAssets: maxPickAssetLimit,
- textDelegate: assetPickerTextDelegate,
- gridCount: 6,
- pageSize: 120,
- ),
- );
- if (result != null && result.isNotEmpty) {
- final ca = CollectionActions(CollectionsService.instance);
- if (!context.mounted) return;
- await ca.addToCollection(
- context,
- collection.id,
- false,
- picketAssets: result,
- );
- if (!context.mounted) return;
- Navigator.of(context).pop();
- }
- } catch (e) {
- if (e is StateError) {
- final PermissionState ps = await permissionService
- .requestPhotoMangerPermissions();
- if (ps != PermissionState.authorized && ps != PermissionState.limited) {
- if (!context.mounted) return;
- await showChoiceDialog(
- context,
- title: context.strings.grantPermission,
- body: context.strings.pleaseGrantPermissions,
- firstButtonLabel: context.strings.ok,
- secondButtonLabel: context.strings.cancel,
- firstButtonOnTap: () async {
- await PhotoManager.openSetting();
- },
- );
- } else {
- if (!context.mounted) return;
- await showErrorDialog(
- context,
- context.strings.oops,
- context.strings.somethingWentWrong + (kDebugMode ? "\n$e" : ""),
- );
- }
- }
- }
- }
-
- // AssetPicker's fallback is Chinese. Unsupported locales use its English
- // delegate.
- Future<AssetPickerTextDelegate> _getAssetPickerTextDelegate() async {
- final Locale locale = (await getLocale())!;
- switch (locale.languageCode.toLowerCase()) {
- case "en":
- return const EnglishAssetPickerTextDelegate();
- case "he":
- return const HebrewAssetPickerTextDelegate();
- case "de":
- return const GermanAssetPickerTextDelegate();
- case "ru":
- return const RussianAssetPickerTextDelegate();
- case "ja":
- return const JapaneseAssetPickerTextDelegate();
- case "ar":
- return const ArabicAssetPickerTextDelegate();
- case "fr":
- return const FrenchAssetPickerTextDelegate();
- case "vi":
- return const VietnameseAssetPickerTextDelegate();
- case "tr":
- return const TurkishAssetPickerTextDelegate();
- case "ko":
- return const KoreanAssetPickerTextDelegate();
- case "zh":
- return const AssetPickerTextDelegate();
- default:
- return const EnglishAssetPickerTextDelegate();
- }
+ final result = await showDevicePicker(context);
+ if (!context.mounted || result == null || result.isEmpty) return;
+ final added = await CollectionActions(
+ CollectionsService.instance,
+ ).addToCollection(context, collection.id, false, picketAssets: result);
+ if (context.mounted && added) Navigator.of(context).pop();
}
}
diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yaml
index 54ce364009..6fcbc7a2ca 100644
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -194,7 +194,6 @@ dependencies:
video_player: 2.10.0
visibility_detector: 0.4.0+2
wakelock_plus: 1.3.2
- wechat_assets_picker: 9.8.0
widgets_to_image: 1.0.0
workmanager: 0.9.0+3
xml: 6.6.1
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index fb13f92bbf..235db84dcf 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1768,14 +1768,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.1"
- nested:
- dependency: transitive
- description:
- name: nested
- sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.0"
nm:
dependency: transitive
description:
@@ -2137,14 +2129,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.2.0"
- provider:
- dependency: transitive
- description:
- name: provider
- sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
- url: "https://pub.dev"
- source: hosted
- version: "6.1.5+1"
pub_semver:
dependency: transitive
description:
@@ -2984,22 +2968,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.2.1"
- wechat_assets_picker:
- dependency: transitive
- description:
- name: wechat_assets_picker
- sha256: c307e50394c1e6dfcd5c4701e84efb549fce71444fedcf2e671c50d809b3e2a1
- url: "https://pub.dev"
- source: hosted
- version: "9.8.0"
- wechat_picker_library:
- dependency: transitive
- description:
- name: wechat_picker_library
- sha256: "5cb61b9aa935b60da5b043f8446fbb9c5077419f20ccc4856bf444aec4f44bc1"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.7"
widgets_to_image:
dependency: transitive
description: