Merge pull request #150 from Piwigo/Dev/v2

Dev/v2

Author: remi-martin

android/app/build.gradle

@@ -82,5 +82,6 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "androidx.window:window:1.0.0"
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }

android/app/src/main/AndroidManifest.xml

@@ -2,10 +2,10 @@
     package="com.remi.piwigo_ng">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" android:minSdkVersion="33"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" android:minSdkVersion="33"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" android:minSdkVersion="33"/>
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />

l10n/app_de.arb

@@ -770,5 +770,5 @@
     "settings_acknowledgements": "Danksagungen",
     "settings_privacy": "Datenschutzerklärung",
     "settings_unknownVersion": "Unbekannte Version",
-    "settings_privacyUrl": "&lang=de_DE"
+    "settings_privacyLocale": "&lang=de_DE"
 }

l10n/app_en.arb

@@ -194,6 +194,12 @@
     "categoryUpload_takePhoto": "Take Photo",
     "categoryUpload_takeVideo": "Take Video",
 
+    "uploadList_title": "Upload Status",
+    "uploadList_uploading": "Uploading",
+    "uploadList_history": "History",
+
+    "uploadList_empty": "Empty",
+
 
     "setDefaultCategory_select": "Please select an album or sub-album which will become the new root album.",
     "setDefaultCategory_title": "Default Album",
@@ -363,8 +369,8 @@
     "imageOptions_edit": "Edit",
     "imageOptions_download": "Download",
     "imageOptions_share": "Share",
-    "imageOptions_addFavorites": "Add favorites",
-    "imageOptions_removeFavorites": "Remove favorites",
+    "imageOptions_addFavorites": "Add to favorites",
+    "imageOptions_removeFavorites": "Remove from favorites",
     "imageOptions_setAlbumImage": "Set Album Thumbnail",
 
 
@@ -691,6 +697,7 @@
     "imageUploadCompleted_title": "Upload Completed",
     "imageUploadCompleted_message": "photo uploaded to your Piwigo server.",
     "imageUploadCompleted_message1": "photos uploaded to your Piwigo server.",
+    "imageUploadCompleted_warning": "some of your photos could not be uploaded.",
 
 
     "uploadError_title": "Upload Error",
@@ -867,6 +874,26 @@
     "settings_autoUploadDestination": "Destination",
     "settings_autoUploadDestinationInvalid": "Invalid destination album",
     "settings_autoUploadDestinationInfo": "Please select the album or sub-album into which photos and videos will be auto-uploaded.",
+    "settings_autoUploadDuplicateInfo": "Photos that are already in this Piwigo won't be uploaded.",
+    "settings_autoUploadFrequency": "Every",
+    "settings_autoUploadFrequencyMinutes": "{count, plural, =1{1 minute} other{{count} minutes}}",
+    "@settings_autoUploadFrequencyMinutes" : {
+        "placeholders": {
+            "count": {}
+        }
+    },
+    "settings_autoUploadFrequencyHours": "{count, plural, =1{1 hour} other{{count} hours}}",
+    "@settings_autoUploadFrequencyHours" : {
+        "placeholders": {
+            "count": {}
+        }
+    },
+    "settings_autoUploadFrequencyDays": "{count, plural, =1{1 day} other{{count} days}}",
+    "@settings_autoUploadFrequencyDays" : {
+        "placeholders": {
+            "count": {}
+        }
+    },
     "autoUploadError_Disabled": "The Auto-Upload option is disabled in the app settings.",
     "autoUploadError_Failed": "Several transfers failed and the upload queue is on hold. Please check in the app.",
 
@@ -891,9 +918,7 @@
 
 
     "settingsHeader_appearance": "Appearance",
-    "settingsHeader_colorPalette": "Color Palette",
-    "settings_lightColor": "Light",
-    "settings_darkColor": "Dark",
+    "settingsHeader_theme": "Dark Theme",
     "settings_switchPalette": "Automatic",
     "settings_brightness": "Brightness",
     "settings_brightnessHelp": "In low ambient brightness, the Automatic option uses a darker color palette to make photos stand out against darker backgrounds.",
@@ -932,5 +957,8 @@
     "settings_acknowledgements": "Acknowledgements",
     "settings_privacy": "Privacy Policy",
     "settings_unknownVersion": "Unknown version",
-    "settings_privacyUrl": "&lang=en_EN"
+    "settings_privacyLocale": "&lang=en_EN",
+    "@settings_privacyLocale": {
+        "description": "The language and country code for the url to Piwigo Mobile apps privacy policy: https://piwigo.org/mobile-apps-privacy-policy&webview&lang=en_EN"
+    }
 }

l10n/app_es.arb

@@ -759,5 +759,5 @@
   "settings_translateWithCrowdin": "Translate Piwigo NG",
   "settings_acknowledgements": "Acknowledgements",
   "settings_privacy": "Privacy Policy",
-  "settings_privacyUrl": "&lang=es_ES"
+  "settings_privacyLocale": "&lang=es_ES"
 }

l10n/app_fr.arb

@@ -770,5 +770,5 @@
     "settings_acknowledgements": "Remerciements",
     "settings_privacy": "Politique de Confidentialité",
     "settings_unknownVersion": "Unknown version",
-    "settings_privacyUrl": "&lang=fr_FR"
+    "settings_privacyLocale": "&lang=fr_FR"
 }

l10n/app_lt.arb

@@ -762,5 +762,5 @@
   "settings_pwgForumURL": "https://piwigo.org/forum",
   "settings_acknowledgements": "Padėkos",
   "settings_privacy": "Privatumo politika",
-  "settings_privacyUrl": "&lang=lt_LT"
+  "settings_privacyLocale": "&lang=lt_LT"
 }

l10n/app_sk.arb

@@ -759,5 +759,5 @@
   "settings_translateWithCrowdin": "Translate Piwigo NG",
   "settings_acknowledgements": "Acknowledgements",
   "settings_privacy": "Privacy Policy",
-  "settings_privacyUrl": "&lang=en_EN"
+  "settings_privacyLocale": "&lang=en_EN"
 }

l10n/app_zh.arb

@@ -770,5 +770,5 @@
     "settings_acknowledgements": "鸣谢",
     "settings_privacy": "隐私政策",
     "settings_unknownVersion": "未知版本",
-    "settings_privacyUrl": "&lang=en_EN"
+    "settings_privacyLocale": "&lang=en_EN"
 }

lib/api/albums.dart

@@ -12,8 +12,9 @@ import 'authentication.dart';
 Map<String, dynamic> tryParseJson(String data) {
   try {
     return json.decode(data);
-  } on FormatException catch (e) {
+  } on FormatException catch (_) {
     debugPrint('Invalid json data');
+    debugPrint(data);
     int start = data.indexOf('{');
     int end = data.lastIndexOf('}');
     String parsedData = data.substring(start, end + 1);
@@ -48,7 +49,8 @@ Future<ApiResult<List<AlbumModel>>> fetchAlbums(int albumID) async {
     );
 
     if (response.statusCode == 200) {
-      List<dynamic> jsonAlbums = tryParseJson(response.data)['result']['categories'];
+      List<dynamic> jsonAlbums =
+          tryParseJson(response.data)['result']['categories'];
       List<AlbumModel> albums = List<AlbumModel>.from(jsonAlbums.map(
         (album) {
           bool canUpload = false;
@@ -85,7 +87,8 @@ Future<ApiResult<List<AlbumModel>>> fetchCommunityAlbums(int albumID) async {
     );
 
     if (response.statusCode == 200) {
-      List<dynamic> jsonAlbums = json.decode(response.data)['result']['categories'];
+      List<dynamic> jsonAlbums =
+          json.decode(response.data)['result']['categories'];
       List<AlbumModel> albums = List<AlbumModel>.from(jsonAlbums.map(
         (album) => AlbumModel.fromJson(album),
       ));
@@ -203,7 +206,10 @@ Future<ApiResult<bool>> moveAlbum(int catId, int parentCatId) async {
   return ApiResult(error: ApiErrors.moveAlbumError);
 }
 
-Future<ApiResult<bool>> editAlbum({required String name, required int albumId, String description = ''}) async {
+Future<ApiResult<bool>> editAlbum(
+    {required String name,
+    required int albumId,
+    String description = ''}) async {
   Map<String, String> queries = {
     'format': 'json',
     'method': 'pwg.categories.setInfo',
@@ -213,6 +219,7 @@ Future<ApiResult<bool>> editAlbum({required String name, required int albumId, S
     'name': name,
     'comment': description,
   });
+
   try {
     Response response = await ApiClient.post(
       data: formData,