Rebase PR #206 from kaysavps

Renarde-dev · Renarde-dev · commit 569c752d1e48 · 2025-07-08T13:09:57.000+02:00
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -37,6 +37,16 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
 
         <!-- Don't delete the meta-data below.
diff --git a/l10n/app_en.arb b/l10n/app_en.arb
@@ -313,6 +313,16 @@
     "moveCategoryError_title": "Move Fail",
     "moveCategoryError_message": "Failed to move your album",
 
+    "selectCategory": "Select Album",
+    "selectCategory_select": "Please select an album or sub-album.",
+    "selectCategory_message": "{count, plural, =1{Are you sure you want to upload the image into the album {parent} ?} other{Are you sure you want to upload the images into the album {parent} ?}}",
+    "@selectCategory_message" : {
+        "placeholders": {
+            "count": {},
+            "parent": {}
+        }
+    },
+
 
     "categoryPrivacy": "Manage Permissions",
     "categoryPrivacy_subtitle": "Manage access permissions of \"{album_name}\".",
diff --git a/lib/app.dart b/lib/app.dart
@@ -4,6 +4,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:piwigo_ng/services/app_providers.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
+import 'package:piwigo_ng/services/receive_sharing.dart';
 import 'package:piwigo_ng/utils/overscroll_behavior.dart';
 import 'package:piwigo_ng/utils/themes.dart';
 import 'package:piwigo_ng/views/album/album_page.dart';
@@ -92,10 +93,9 @@ class App extends StatelessWidget {
 }
 
 Route<dynamic> generateRoute(RouteSettings settings) {
+  String? routeName;
   Map<String, dynamic> arguments = {};
-  if (settings.arguments != null) {
-    arguments = settings.arguments as Map<String, dynamic>;
-  }
+  bool externalAppSharedFiles = SharedIntent.sharedFiles != null && SharedIntent.sharedFiles!.isNotEmpty;
 
   bool isAdmin = appPreferences.getBool(Preferences.isAdminKey) ?? false;
 
@@ -107,7 +107,14 @@ Route<dynamic> generateRoute(RouteSettings settings) {
     );
   }
 
-  switch (settings.name) {
+  if (externalAppSharedFiles) {
+    routeName = UploadPage.routeName;
+  } else {
+    routeName = settings.name;
+    arguments = _extractArguments(settings);
+  }
+
+  switch (routeName) {
     case LoginPage.routeName:
       return MaterialPageRoute(
         builder: (_) => const LoginPage(),
@@ -164,13 +171,7 @@ Route<dynamic> generateRoute(RouteSettings settings) {
         settings: settings,
       );
     case UploadPage.routeName:
-      return MaterialPageRoute(
-        builder: (_) => UploadPage(
-          imageList: arguments["images"] ?? <XFile>[],
-          albumId: arguments["category"],
-        ),
-        settings: settings,
-      );
+      return _createUploadPageRoute(settings, externalAppSharedFiles);
     case UploadStatusPage.routeName:
       return MaterialPageRoute(
         builder: (_) => UploadStatusPage(),
@@ -228,3 +229,41 @@ Route<dynamic> generateRoute(RouteSettings settings) {
       );
   }
 }
+
+Map<String, dynamic> _extractArguments(RouteSettings settings) {
+  if (settings.arguments != null) {
+    return settings.arguments as Map<String, dynamic>;
+  }
+  return {};
+}
+
+MaterialPageRoute<dynamic> _createUploadPageRoute(RouteSettings settings, bool externalAppSharedFiles) {
+  Map<String, dynamic> arguments = {};
+
+  if (externalAppSharedFiles) {
+    arguments['images'] = SharedIntent.sharedFiles;
+    SharedIntent.cleanupSharedFiles();
+
+    // Create new RouteSettings with updated arguments
+    return MaterialPageRoute(
+      builder: (_) => UploadPage(
+        imageList: arguments["images"] ?? <XFile>[],
+        albumId: arguments["category"],
+      ),
+      settings: RouteSettings( // Create new RouteSettings here
+        name: UploadPage.routeName,
+        arguments: arguments,
+      ),
+    );
+  } else {
+    // For other cases, use original settings
+    arguments = _extractArguments(settings);
+    return MaterialPageRoute(
+      builder: (_) => UploadPage(
+        imageList: arguments["images"] ?? <XFile>[],
+        albumId: arguments["category"],
+      ),
+      settings: settings,
+    );
+  }
+}
diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
@@ -5,8 +5,8 @@ import 'package:piwigo_ng/network/albums.dart';
 import 'package:piwigo_ng/network/api_error.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
 
-class MoveOrCopyModal extends StatefulWidget {
-  const MoveOrCopyModal({
+class SelectMoveOrCopyModal extends StatefulWidget {
+  const SelectMoveOrCopyModal({
     Key? key,
     this.album,
     this.isImage = false,
@@ -22,10 +22,10 @@ class MoveOrCopyModal extends StatefulWidget {
   final Future<dynamic> Function(AlbumModel)? onSelected;
 
   @override
-  _MoveOrCopyModalState createState() => _MoveOrCopyModalState();
+  _SelectMoveOrCopyModalState createState() => _SelectMoveOrCopyModalState();
 }
 
-class _MoveOrCopyModalState extends State<MoveOrCopyModal> {
+class _SelectMoveOrCopyModalState extends State<SelectMoveOrCopyModal> {
   late final Future<ApiResponse<List<AlbumModel>>> _albumFuture;
   late final List<int> _disabledAlbums;
 
diff --git a/lib/main.dart b/lib/main.dart
@@ -8,12 +8,14 @@ import 'package:piwigo_ng/network/api_client.dart';
 import 'package:piwigo_ng/services/auto_upload_manager.dart';
 import 'package:piwigo_ng/services/notification_service.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
+import 'package:piwigo_ng/services/receive_sharing.dart';
 import 'package:piwigo_ng/services/theme_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   _setUITheme();
+  await SharedIntent.receiveSharedData();
   HttpOverrides.global = SSLHttpOverrides();
   appPreferences = await SharedPreferences.getInstance();
   runApp(const App());
diff --git a/lib/services/receive_sharing.dart b/lib/services/receive_sharing.dart
@@ -0,0 +1,30 @@
+import 'package:image_picker/image_picker.dart';
+import 'package:receive_sharing_intent/receive_sharing_intent.dart';
+
+
+class SharedIntent {
+  static List<XFile>? sharedFiles;
+  static Future<List<XFile>?> receiveSharedData() async {
+    try {
+      // Get the instance of ReceiveSharingIntent
+      ReceiveSharingIntent receiveSharingIntent = await ReceiveSharingIntent.instance;
+
+      // Get the initial shared data
+      List<SharedMediaFile> receivedFiles = await receiveSharingIntent.getInitialMedia();
+
+      if (receivedFiles.isNotEmpty) {
+        // Transform SharedMediaFile to XFile
+        sharedFiles = receivedFiles.map((sharedFile) => XFile(sharedFile.path)).toList();
+        return sharedFiles;
+      } else {
+        return null;
+      }
+    } catch (e) {
+      print('Error receiving shared data: $e');
+      return null;
+    }
+  }
+  static void cleanupSharedFiles() {
+    sharedFiles = null;
+  }
+}
diff --git a/lib/utils/album_actions.dart b/lib/utils/album_actions.dart
@@ -3,7 +3,7 @@ import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
 import 'package:piwigo_ng/components/modals/create_album_modal.dart';
 import 'package:piwigo_ng/components/modals/delete_album_mode_modal.dart';
 import 'package:piwigo_ng/components/modals/edit_album_modal.dart';
-import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart';
 import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/snackbars.dart';
 import 'package:piwigo_ng/models/album_model.dart';
@@ -43,7 +43,7 @@ Future<void> onEditAlbum(BuildContext context, AlbumModel album) async {
 Future<void> onMoveAlbum(BuildContext context, AlbumModel album) async {
   await showPiwigoModal(
     context: context,
-    builder: (_) => MoveOrCopyModal(
+    builder: (_) => SelectMoveOrCopyModal(
       title: appStrings.moveCategory,
       subtitle: appStrings.moveCategory_select(album.name),
       album: album,
diff --git a/lib/utils/image_actions.dart b/lib/utils/image_actions.dart
@@ -9,7 +9,7 @@ import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
 import 'package:piwigo_ng/components/modals/choose_camera_picker_modal.dart';
 import 'package:piwigo_ng/components/modals/choose_move_option_modal.dart';
 import 'package:piwigo_ng/components/modals/delete_images_modal.dart';
-import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart';
 import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/snackbars.dart';
 import 'package:piwigo_ng/models/album_model.dart';
@@ -139,7 +139,7 @@ Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images,
   }
   return showPiwigoModal(
     context: context,
-    builder: (_) => MoveOrCopyModal(
+    builder: (_) => SelectMoveOrCopyModal(
       title: appStrings.moveImage_title,
       subtitle: appStrings.moveImage_selectAlbum(
         images.length,
diff --git a/lib/views/settings/auto_upload_page.dart b/lib/views/settings/auto_upload_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart';
 import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/sections/settings_section.dart';
 import 'package:piwigo_ng/models/album_model.dart';
@@ -96,7 +96,7 @@ class _AutoUploadPageState extends State<AutoUploadPage> {
                 onPressed: () async {
                   await showPiwigoModal(
                     context: context,
-                    builder: (_) => MoveOrCopyModal(
+                    builder: (_) => SelectMoveOrCopyModal(
                       title: appStrings.settings_autoUploadDestination,
                       subtitle: appStrings.settings_autoUploadDestinationInfo,
                       isImage: true,
diff --git a/lib/views/upload/upload_page.dart b/lib/views/upload/upload_page.dart
@@ -8,7 +8,10 @@ import 'package:mime_type/mime_type.dart';
 import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart';
 import 'package:piwigo_ng/components/cards/image_details_card.dart';
 import 'package:piwigo_ng/components/cards/piwigo_chip.dart';
+import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
 import 'package:piwigo_ng/components/fields/app_field.dart';
+import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/modals/select_tags_modal.dart';
 import 'package:piwigo_ng/components/sections/form_section.dart';
 import 'package:piwigo_ng/models/tag_model.dart';
@@ -22,11 +25,11 @@ import 'package:rounded_loading_button/rounded_loading_button.dart';
 import 'package:video_player/video_player.dart';
 
 class UploadPage extends StatefulWidget {
-  const UploadPage({Key? key, required this.imageList, required this.albumId}) : super(key: key);
+  const UploadPage({Key? key, required this.imageList, this.albumId}) : super(key: key);
 
   static const String routeName = '/upload';
   final List<XFile> imageList;
-  final int albumId;
+  final int? albumId;
 
   @override
   State<UploadPage> createState() => _UploadGalleryViewPage();
@@ -45,12 +48,38 @@ class _UploadGalleryViewPage extends State<UploadPage> with SingleTickerProvider
   List<XFile> _imageList = [];
   List<String> _imageExistList = [];
   int? _privacyLevel;
+  late int _albumDestination;
+
+  Future<void> _selectAlbum() async {
+    await showPiwigoModal(
+      context: context,
+      builder: (_) => SelectMoveOrCopyModal(
+        title: appStrings.selectCategory,
+        subtitle: appStrings.selectCategory_select,
+        isImage: true,
+        onSelected: (album) async {
+          if (!await showConfirmDialog(context,
+          title: appStrings.selectCategory,
+          message: appStrings.selectCategory_message(
+            widget.imageList.length,
+            album.name,
+          ),
+          )) return false;
+          setState(() {
+            _albumDestination = album.id;
+          });
+          return true;
+        },
+      ),
+    );
+  }
 
   @override
   void initState() {
     _imageList = List.from(widget.imageList);
     _authorController = TextEditingController(text: Preferences.getUploadAuthor);
     super.initState();
+
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       setState(() {
         PrivacyLevel.values.forEach((privacy) {
@@ -63,6 +92,11 @@ class _UploadGalleryViewPage extends State<UploadPage> with SingleTickerProvider
           ));
         });
       });
+      if (widget.albumId != null) {
+        _albumDestination = widget.albumId!;
+      } else {
+        _selectAlbum();
+      }
       checkImageExist();
     });
   }
@@ -126,7 +160,7 @@ class _UploadGalleryViewPage extends State<UploadPage> with SingleTickerProvider
     _btnController.start();
     List<int> tagIds = _tags.map<int>((tag) => tag.id).toList();
     List<XFile> filesToUpload = _imageList.where((e) => !_imageExistList.contains(e.path)).toList();
-    var result = await uploadPhotos(filesToUpload, widget.albumId, info: {
+    var result = await uploadPhotos(filesToUpload, _albumDestination, info: {
       'name': _titleController.text,
       'comment': _descriptionController.text,
       'author': _authorController.text,
diff --git a/pubspec.lock b/pubspec.lock
@@ -1013,6 +1013,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  receive_sharing_intent:
+    dependency: "direct main"
+    description:
+      name: receive_sharing_intent
+      sha256: f127989f8662ea15e193bd1e10605e5a0ab6bb92dffd51f3ce002feb0ce24c93
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.0"
   rounded_loading_button:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -64,6 +64,7 @@ dependencies:
   flutter_cache_manager: ^3.3.0 # Handles network image cache
   heif_converter: ^1.0.1 # Convert heic files to jpg
   provider: ^6.0.3 # Notifiers for theme and language changes
+  receive_sharing_intent: ^1.4.0 # Receive sharing from other apps
 
   # Translations
   flutter_localizations:
