Merge pull request #227 from Piwigo/Redisgn-select-copy-move-modal

Renarde-dev · web-flow · commit 47bb238e7152 · 2025-10-10T11:37:14.000+02:00
Redesign select copy move modal

Add decorated box and move chevron to the start of the list
diff --git a/.fvmrc b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.8"
+  "flutter": "3.35.5"
 }
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.Properties
 import java.io.FileInputStream
 
@@ -25,14 +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
+    }
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = kotlinJvmTarget
+        }
     }
 
     defaultConfig {
@@ -65,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")
 }
diff --git a/android/build.gradle.kts b/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 {
diff --git a/android/gradle.properties b/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
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
@@ -19,8 +19,8 @@ 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.12.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.0" 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")
diff --git a/docs/CONTRIBUTING.md b/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)
diff --git a/l10n.yaml b/l10n.yaml
@@ -1,4 +1,3 @@
-synthetic-package: false
 arb-dir: l10n
 template-arb-file: app_en.arb
 untranslated-messages-file: l10n/untranslated.json
diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
@@ -4,6 +4,7 @@ import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/network/albums.dart';
 import 'package:piwigo_ng/network/api_error.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
+import 'package:piwigo_ng/utils/resources.dart';
 
 class SelectMoveOrCopyModal extends StatefulWidget {
   const SelectMoveOrCopyModal({
@@ -38,7 +39,8 @@ class _SelectMoveOrCopyModalState extends State<SelectMoveOrCopyModal> {
     _disabledAlbums = [
       if (widget.album != null) widget.album!.id,
       if (parentAlbums.length == 1 || widget.isImage) 0,
-      if (!widget.isImage && parentAlbums.length > 1) int.parse(parentAlbums[parentAlbums.length - 2]),
+      if (!widget.isImage && parentAlbums.length > 1)
+        int.parse(parentAlbums[parentAlbums.length - 2]),
     ];
 
     super.initState();
@@ -199,55 +201,64 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
           widget.onTap?.call(widget.album);
         },
         child: SizedBox(
-          height: 48.0,
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              Expanded(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: Align(
-                    alignment: Alignment.centerLeft,
+            height: 48.0,
+            child: Row(
+              spacing: 2,
+              children: [
+                Padding(padding: EdgeInsetsGeometry.only(left: 10.0)),
+                if (widget.index > 1) ...[
+                  Padding(
+                      padding: EdgeInsetsGeometry.only(
+                          left: 30.0 * (widget.index - 1)))
+                ],
+                if (widget.album.children.isNotEmpty && !widget.isParent) ...[
+                  GestureDetector(
+                      behavior: HitTestBehavior.opaque,
+                      onTap: () => setState(() {
+                            _expanded = !_expanded;
+                          }),
+                      child: AnimatedRotation(
+                        turns: _expanded ? 0.25 : 0, //Rotate by 90°,
+                        duration: const Duration(milliseconds: 200),
+                        child: Icon(Icons.chevron_right),
+                      )),
+                ],
+                Expanded(
                     child: Text(
-                      "${List.generate(widget.index, (index) => '   ').join()} > ${widget.index > 0 ? ' ' : ''}${widget.album.name}",
-                      overflow: TextOverflow.ellipsis,
-                      style: _disabled ? Theme.of(context).textTheme.bodySmall : Theme.of(context).textTheme.bodyMedium,
-                    ),
-                  ),
-                ),
-              ),
-              if (widget.album.children.isNotEmpty && !widget.isParent)
-                GestureDetector(
-                  behavior: HitTestBehavior.opaque,
-                  onTap: () => setState(() {
-                    _expanded = !_expanded;
-                  }),
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                    child: Row(
-                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                      children: [
-                        Center(
-                          child: Text(
-                            appStrings.albumCount(widget.album.nbCategories),
+                  "${widget.album.name}",
+                  overflow: TextOverflow.ellipsis,
+                  style: _disabled
+                      ? Theme.of(context).textTheme.bodySmall
+                      : Theme.of(context).textTheme.bodyMedium,
+                )),
+                if (widget.album.children.isNotEmpty && !widget.isParent) ...[
+                  DecoratedBox(
+                      decoration: BoxDecoration(
+                          color: Theme.of(context).colorScheme.surface,
+                          borderRadius: BorderRadius.circular(5)),
+                      child: Padding(
+                        padding: EdgeInsetsGeometry.symmetric(
+                          horizontal: 8,
+                        ),
+                        child: Row(spacing: 4, children: [
+                          Text(
+                            '${widget.album.nbCategories}',
                             style: TextStyle(
-                              color: Theme.of(context).primaryColor.withValues(alpha: 0.7),
+                              color: Theme.of(context).colorScheme.inverseSurface,
                               fontSize: 14,
                             ),
                           ),
-                        ),
-                        AnimatedRotation(
-                          duration: const Duration(milliseconds: 200),
-                          turns: _expanded ? -0.25 : 0.25,
-                          child: Icon(Icons.chevron_right),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-            ],
-          ),
-        ),
+                          Icon(
+                            Icons.folder,
+                            size: 15,
+                            color: Theme.of(context).colorScheme.inverseSurface,
+                          ),
+                        ]),
+                      )),
+                  Padding(padding: EdgeInsetsGeometry.only(right: 8))
+                ],
+              ],
+            )),
       );
 
   Widget get _divider => Divider(
diff --git a/lib/services/auto_upload_manager.dart b/lib/services/auto_upload_manager.dart
@@ -7,7 +7,6 @@ import 'package:dio/dio.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:heif_converter/heif_converter.dart';
 import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/models/status_model.dart';
 import 'package:piwigo_ng/network/api_client.dart';
@@ -91,17 +90,6 @@ class AutoUploadManager {
     // Remove folders and links
     List<File> files = dirFiles.where((file) => file is File).map<File>((e) => e as File).toList();
 
-    // Convert heic/heif files to .jpg
-    for (File file in files) {
-      if (file.path.endsWith('.heic') || file.path.endsWith('.heif')) {
-        debugPrint("${file.path} is Heic/Heif ! Converting to jpg... ");
-        String? jpgPath = await HeifConverter.convert(file.path, format: 'jpg');
-        if (jpgPath != null) {
-          files.remove(file);
-          files.add(File(jpgPath));
-        }
-      }
-    }
     debugPrint("List files: ${files.toString()}");
     await autoUploadPhotos(files);
     return true;
@@ -462,8 +450,5 @@ void callbackDispatcher() {
 }
 
 void initializeWorkManager() {
-  Workmanager().initialize(
-    callbackDispatcher, // The top level function, aka callbackDispatcher
-    isInDebugMode: kDebugMode,
-  );
+  Workmanager().initialize(callbackDispatcher); // The top level function, aka callbackDispatcher
 }
diff --git a/lib/utils/image_actions.dart b/lib/utils/image_actions.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_image_compress/flutter_image_compress.dart';
-import 'package:heif_converter/heif_converter.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
@@ -71,11 +70,6 @@ Future<List<XFile>?> onPickImages() async {
       if (Preferences.getAvailableFileTypes
           .contains(file.name.split('.').last)) {
         files.add(file);
-      } else if (file.name.endsWith('.heic') || file.name.endsWith('.heif')) {
-        String? jpgPath = await HeifConverter.convert(file.path, format: 'jpg');
-        if (jpgPath != null) {
-          files.add(XFile(jpgPath));
-        }
       }
     }
     return files;
@@ -100,12 +94,6 @@ Future<XFile?> onTakePhoto(BuildContext context) async {
           imageQuality: (Preferences.getUploadQuality * 100).round(),
           requestFullMetadata: !Preferences.getRemoveMetadata,
         );
-        if (image != null) {
-          String? jpgPath = await HeifConverter.convert(image.path, format: 'jpg');
-          if (jpgPath != null) {
-            image = XFile(jpgPath);
-          }
-        }
         break;
       case 1:
         image = await _picker.pickVideo(source: ImageSource.camera);
diff --git a/lib/views/album/album_privacy_page.dart b/lib/views/album/album_privacy_page.dart
@@ -144,26 +144,26 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,
                   ),
-                  child: Column(
-                    children: [
-                      RadioListTile<AlbumStatus>(
-                        value: AlbumStatus.public,
-                        groupValue: _selectedMode,
-                        activeColor: Theme.of(context).colorScheme.secondary,
-                        title: Text(appStrings.categoryPrivacyMode_public),
-                        subtitle: Text(appStrings.categoryPrivacyMode_publicMessage),
-                        onChanged: _onChangeMode,
-                      ),
-                      RadioListTile(
-                        value: AlbumStatus.private,
-                        groupValue: _selectedMode,
-                        activeColor: Theme.of(context).colorScheme.secondary,
-                        title: Text(appStrings.categoryPrivacyMode_private),
-                        subtitle: Text(appStrings.categoryPrivacyMode_privateMessage),
-                        onChanged: _onChangeMode,
-                      ),
-                    ],
-                  ),
+                  child: RadioGroup<AlbumStatus>(
+                      onChanged: _onChangeMode,
+                      groupValue: _selectedMode,
+                      child: Column(
+                        children: [
+                          RadioListTile<AlbumStatus>(
+                            value: AlbumStatus.public,
+                            activeColor: Theme.of(context).colorScheme.secondary,
+                            title: Text(appStrings.categoryPrivacyMode_public),
+                            subtitle: Text(appStrings.categoryPrivacyMode_publicMessage),
+                          ),
+                          RadioListTile(
+                            value: AlbumStatus.private,
+                            activeColor: Theme.of(context).colorScheme.secondary,
+                            title: Text(appStrings.categoryPrivacyMode_private),
+                            subtitle: Text(appStrings.categoryPrivacyMode_privateMessage),
+                          ),
+                        ],
+                      )
+                  )
                 ),
                 AnimatedSize(
                   duration: const Duration(milliseconds: 300),
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "flutter": "3.32.8"`
	`2`	`+ "flutter": "3.35.5"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@ allprojects {`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`
`8`		`-val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()`
	`8`	`+val newBuildDir: Directory = rootProject.layout.buildDirectory`
	`9`	`+ .dir("../../build")`
	`10`	`+ .get()`
`9`	`11`	`rootProject.layout.buildDirectory.value(newBuildDir)`
`10`	`12`
`11`	`13`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-synthetic-package: false`
`2`	`1`	`arb-dir: l10n`
`3`	`2`	`template-arb-file: app_en.arb`
`4`	`3`	`untranslated-messages-file: l10n/untranslated.json`