Redesign select copy move modal

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.5"
+  "flutter": "3.35.5"
 }

android/app/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.Properties
 import java.io.FileInputStream
 
@@ -8,6 +9,11 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 // https://docs.flutter.dev/deployment/android#configure-signing-in-gradle
 val keystoreProperties = Properties()
 val keystorePropertiesFile = rootProject.file("key.properties")
@@ -20,18 +26,23 @@ android {
     //compileSdkVersion flutter.compileSdkVersion
     //ndkVersion = flutter.ndkVersion
     compileSdk = 36
-    ndkVersion = "29.0.13599879"
+    ndkVersion = "29.0.14206865 "
+
+    val compileJavaVersion = JavaVersion.VERSION_17
+    val kotlinJvmTarget = JvmTarget.JVM_17
 
     compileOptions {
         // Flag to enable support for the new language APIs
         isCoreLibraryDesugaringEnabled = true
         // Sets Java compatibility to Java 17
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = compileJavaVersion
+        targetCompatibility = compileJavaVersion
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        compilerOptions {
+            jvmTarget = kotlinJvmTarget
+        }
     }
 
     defaultConfig {
@@ -45,10 +56,10 @@ android {
 
     signingConfigs {
         create("release") {
-            keyAlias = keystoreProperties["keyAlias"] as String
-            keyPassword = keystoreProperties["keyPassword"] as String
+            keyAlias = keystoreProperties["keyAlias"] as? String
+            keyPassword = keystoreProperties["keyPassword"] as? String
             storeFile = keystoreProperties["storeFile"]?.let { file(it) }
-            storePassword = keystoreProperties["storePassword"] as String
+            storePassword = keystoreProperties["storePassword"] as? String
         }
     }
 
@@ -64,6 +75,6 @@ flutter {
 }
 
 dependencies {
-    implementation("androidx.window:window:1.4.0")
+    implementation("androidx.window:window:1.5.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 }

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.

android/build.gradle.kts

@@ -5,7 +5,9 @@ allprojects {
     }
 }
 
-val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+val newBuildDir: Directory = rootProject.layout.buildDirectory
+    .dir("../../build")
+    .get()
 rootProject.layout.buildDirectory.value(newBuildDir)
 
 subprojects {

android/gradle.properties

@@ -11,9 +11,7 @@
 # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 #Tue Apr 22 14:46:56 CEST 2025
-android.enableJetifier=true
-android.jetifier.ignorelist=bcprov-jdk15on
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

android/settings.gradle.kts

@@ -17,9 +17,10 @@ pluginManagement {
 }
 
 plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.10.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.21" apply false
+    id("com.android.application") version "8.13.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")

docs/CONTRIBUTING.md

@@ -18,15 +18,13 @@ flutter config --no-analytics
 
 Using [fvm](https://fvm.app/) :
 ```sh
-fvm install 2.27.4
+fvm install 3.27.4
 cd <Project-dir>
-fvm use 2.27.4
+fvm use 3.27.4
 ```
 
 ### Android Studio
 
-*(Optional - enable wayland support)* : Add `-Dawt.toolkit.name=WLToolkit` to the Custom VM Options.
-
 Install the flutter plugin and restart, then go to **Settings > Languages & Framework > Android SDK > SDK Tools** and install the following :
 
 - Android SDK Build-Tools
@@ -48,6 +46,13 @@ If Android studio doesn't pickup the path of the flutter toolchain or dart :
 In **Settings > Languages & Framework > Flutter** set the flutter SDK path using the absolute path of your install.  
 And in **Settings > Languages & Framework > Dart** specify the Dark SDK path `<Absolute-Flutter-Path>/bin/cache/dart-sdk`
 
+## Debugging
+
+By default running the app via Android Studio or `flutter run` will use the debug APK (located in `build/app/outputs/flutter-apk/app-debug.apk`).
+Background tasks are done with [workmanager](https://docs.page/fluttercommunity/flutter_workmanager) debugging must be enabled via the kotlin flag `WorkmanagerDebug.setCurrent(LoggingDebugHandler())`
+
+See more info in https://docs.page/fluttercommunity/flutter_workmanager/debugging
+
 ## Contributing guidelines
 
 Contribution must target the `develop` branch and must have documented changes.
@@ -56,6 +61,4 @@ if you are fixing an existing issue or bug, tag it in your merge request (exampl
 
 if you are doing maintenance work, be sure to add the changelog of the libraries you are updating.
 
-Translation are done via [crowdin](https://crowdin.com/project/piwigo-ng)
-
-
+Translation are done via [crowdin](https://crowdin.com/project/piwigo-ng)

l10n.yaml

@@ -1,4 +1,3 @@
-synthetic-package: false
 arb-dir: l10n
 template-arb-file: app_en.arb
 untranslated-messages-file: l10n/untranslated.json

l10n/app_de.arb

@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Album verschoben",
     "moveCategoryError_title": "Verschieben fehlgeschlagen",
     "moveCategoryError_message": "Fehler beim Verschieben Ihres Albums",
+    "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}\".",
     "@categoryPrivacy_subtitle": {

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}\".",

l10n/app_es.arb

@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Album Moved",
     "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}\".",
     "@categoryPrivacy_subtitle": {

l10n/app_fr.arb

@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Album déplacé",
     "moveCategoryError_title": "Echec",
     "moveCategoryError_message": "Impossible de déplacer votre 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": "Gérer les permissions",
     "categoryPrivacy_subtitle": "Gérer les permissions d'accès à \"{album_name}\".",
     "@categoryPrivacy_subtitle": {

l10n/app_lt.arb

@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Albumas perkeltas",
     "moveCategoryError_title": "Perkelti nepavyko",
     "moveCategoryError_message": "Nepavyko perkelti albumo",
+    "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}\".",
     "@categoryPrivacy_subtitle": {

l10n/app_sk.arb

@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Album presunutý",
     "moveCategoryError_title": "Presunutie zlyhalo",
     "moveCategoryError_message": "Nepodarilo sa presunúť tvoj 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}\".",
     "@categoryPrivacy_subtitle": {

l10n/app_zh.arb

@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "相册已移动",
     "moveCategoryError_title": "移动失败",
     "moveCategoryError_message": "移动相册失败",
+    "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": "管理权限",
     "categoryPrivacy_subtitle": "管理 \"{album_name}\" 的访问权限",
     "@categoryPrivacy_subtitle": {

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,
+    );
+  }
+}