Merge pull request #1 from Piwigo/master

updating

Author: abrenoch

.gitignore

@@ -7,3 +7,4 @@
 /.flutter-plugins-dependencies
 /.packages
 
+*.env

README.md

@@ -10,15 +10,26 @@ If you face trouble please [create tickets](https://github.com/Piwigo/piwigo-flu
 
 # Installation
 
-For now, this application is in Beta. In order to try it, you will need to install the APK:
+For now, this application is in Beta. You can download the latest version either from Github or from Google Play Store:
 
-## Download the APK
+## Download from Play Store
+
+On your Android phone:
+ 1. Go to **Play Store**.
+ 2. Search for **Piwigo NG** on search-bar.
+ 3. Find the listing with the name **Piwigo NG (Early Access)** and click **Install**.
+
+Alternatively, you can directly go to the [Play Store page of Piwigo NG app](https://play.google.com/store/apps/details?id=com.piwigo.piwigo_ng).
+
+## Download from Github
+
+### Download the APK
 
 In Github, Go to [piwigo-flutter-app releases](https://github.com/Piwigo/piwigo-flutter-app/releases), choose the version (latest is recommanded) and download the .apk file.
 
-## Install the APK
+### Install the APK
 
-In your Android phone:
+On your Android phone:
  1. Go to **Settings** > **security** > **install unknown apps**.
  2. Go to **files** and enable **Allow from this source**.
  *Don't forget to disable it when you have finished*

android/app/src/main/AndroidManifest.xml

@@ -46,4 +46,17 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+
+    <queries>
+        <!-- If your app opens https URLs -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+        <!-- If your app makes calls -->
+        <intent>
+            <action android:name="android.intent.action.DIAL" />
+            <data android:scheme="tel" />
+        </intent>
+    </queries>
 </manifest>

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /lib/l10n/app_en.arb
+    translation: /lib/l10n/app_%two_letters_code%.arb

l10n.yaml

@@ -0,0 +1,3 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart

lib/api/API.dart

@@ -1,8 +1,9 @@
 import 'package:cookie_jar/cookie_jar.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:piwigo_ng/views/UploadGalleryViewPage.dart';
+import 'package:piwigo_ng/services/upload/Uploader.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class API {
   static final API _singleton = API._internal();
@@ -17,5 +18,9 @@ class API {
     return _singleton;
   }
 
+  AppLocalizations strings(context) {
+    return AppLocalizations.of(context);
+  }
+
   API._internal();
 }

lib/api/CategoryAPI.dart

@@ -8,7 +8,8 @@ Future<Map<String,dynamic>> fetchAlbums(String albumID) async {
   Map<String, String> queries = {
     "format": "json",
     "method": "pwg.categories.getList",
-    "cat_id": albumID
+    "cat_id": albumID,
+    "thumbnail_size": API.prefs.getString('thumbnail_size'),
   };
 
   try {
@@ -23,10 +24,10 @@ Future<Map<String,dynamic>> fetchAlbums(String albumID) async {
       };
     }
   } catch(e) {
-    var error = e as DioError;
+    //var error = e as DioError;
     return {
       'stat': 'fail',
-      'result': error.message
+      'result': e.toString(),
     };
   }
 }
@@ -83,14 +84,15 @@ Future<dynamic> addCategory(String catName, String catDesc, String parent) async
     };
   }
 }
-Future<dynamic> deleteCategory(String catId) async {
+Future<dynamic> deleteCategory(String catId, {String deletionMode = "delete_orphans"}) async {
   Map<String, String> queries = {
     "format": "json",
     "method": "pwg.categories.delete",
   };
   FormData formData =  FormData.fromMap({
     "category_id": catId,
     "pwg_token": API.prefs.getString("pwg_token"),
+    'photo_deletion_mode': deletionMode,
   });
   try {
     Response response = await API.dio.post('ws.php',

lib/api/ImageAPI.dart

@@ -9,7 +9,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:path/path.dart' as path;
-import 'package:piwigo_ng/views/components/SnackBars.dart';
+import 'package:piwigo_ng/views/components/snackbars.dart';
 
 import 'API.dart';
 
@@ -42,6 +42,38 @@ Future<Map<String,dynamic>> fetchImages(String albumID, int page) async {
   }
 }
 
+Future<dynamic> getImageInfo(int imageId) async {
+  Map<String, String> queries = {
+    "format": "json",
+    "method": "pwg.images.getInfo",
+  };
+  FormData formData =  FormData.fromMap({
+    "image_id": imageId
+  });
+  try {
+    Response response = await API.dio.post('ws.php',
+        data: formData,
+        queryParameters: queries
+    );
+
+    if (response.statusCode == 200) {
+      return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } catch (e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
+  }
+}
+
+
 Future<bool> _requestPermissions() async {
   var permission = await Permission.storage.status;
   print(permission.isGranted);
@@ -145,9 +177,11 @@ Future<int> deleteImages(BuildContext context, List<int> imageIdList) async {
     var response = await deleteImage(id);
     if(response['stat'] == 'fail') {
       print(response);
+      ScaffoldMessenger.of(context).hideCurrentSnackBar();
       ScaffoldMessenger.of(context).showSnackBar(
         errorSnackBar(context, '${response['result']}'),
       );
+      break;
     } else {
       nbSuccess++;
     }
@@ -186,14 +220,81 @@ Future<dynamic> deleteImage(int imageId) async {
   }
 }
 
+Future<int> removeImages(BuildContext context, List<int> imageIdList, String catId) async {
+  int nbSuccess = 0;
+  for(int id in imageIdList) {
+    var response = await removeImage(id, catId);
+    if(response['stat'] == 'fail') {
+      print(response);
+      ScaffoldMessenger.of(context).hideCurrentSnackBar();
+      ScaffoldMessenger.of(context).showSnackBar(
+        errorSnackBar(context, '${response['result']}'),
+      );
+      break;
+    } else {
+      nbSuccess++;
+    }
+  }
+  return nbSuccess;
+}
+Future<dynamic> removeImage(int imageId, String catId) async {
+  var imageInfo = await getImageInfo(imageId);
+  if(imageInfo['stat'] == 'fail') return imageInfo;
+
+  List<String> categories = imageInfo['result']['categories'].map<String>(
+      (cat) => cat['id'].toString()
+  ).toList();
+  categories.removeWhere((cat) => cat == catId);
+
+  if(categories.isEmpty) {
+    return await deleteImage(imageId);
+  }
+
+  Map<String, String> queries = {
+    "format": "json",
+    "method": "pwg.images.setInfo",
+  };
+  FormData formData =  FormData.fromMap({
+    "image_id": imageId,
+    "categories": categories,
+    "multiple_value_mode": "replace"
+  });
+
+  try {
+    Response response = await API.dio.post('ws.php',
+        data: formData,
+        queryParameters: queries
+    );
+
+    print(response.data);
+
+    if (response.statusCode == 200) {
+      return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } catch (e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
+  }
+}
+
 Future<int> moveImages(BuildContext context, List<dynamic> images, int category) async {
   int nbMoved = 0;
   for(var image in images) {
     var response = await moveImage(image['id'], [category]);
     if(response['stat'] == 'fail') {
+      ScaffoldMessenger.of(context).hideCurrentSnackBar();
       ScaffoldMessenger.of(context).showSnackBar(
           errorSnackBar(context, '${response['result']}')
       );
+      break;
     } else {
       nbMoved++;
     }
@@ -245,9 +346,11 @@ Future<int> assignImages(BuildContext context, List<dynamic> images, int categor
     categories.add(category);
     var response = await assignImage(image['id'], categories);
     if(response['stat'] == 'fail') {
+      ScaffoldMessenger.of(context).hideCurrentSnackBar();
       ScaffoldMessenger.of(context).showSnackBar(
           errorSnackBar(context, '${response['result']}')
       );
+      break;
     } else {
       nbAssigned++;
     }
@@ -294,11 +397,7 @@ Future<int> editImages(BuildContext context, List<Map<String, dynamic>> images,
   int nbEdited = 0;
   for(var image in images) {
     var response = await editImage(image['id'], image['name'], image['desc'], tags, level);
-    if(response['stat'] == 'fail') {
-      ScaffoldMessenger.of(context).showSnackBar(
-          errorSnackBar(context, '${response['result']}')
-      );
-    } else {
+    if(response['stat'] != 'fail') {
       nbEdited++;
     }
   }
@@ -309,15 +408,55 @@ Future<dynamic> editImage(int imageId, String name, String desc, List<int> tags,
     "format": "json",
     "method": "pwg.images.setInfo",
   };
-  FormData formData = FormData.fromMap({
+
+  Map<String,dynamic> form = {
     "image_id": imageId,
-    "name": name,
-    "comment": desc,
-    "tag_ids": tags,
-    "level": level,
     "single_value_mode": "replace",
     "multiple_value_mode": "append"
-  });
+  };
+  if(name != "" && name != null) form["name"] = name;
+  if(desc != "" && desc != null) form["comment"] = desc;
+  if(tags.isNotEmpty) form["tag_ids"] = tags;
+  if(level != -1) form["level"] = level;
+
+  FormData formData = FormData.fromMap(form);
+
+  try {
+    Response response = await API.dio.post('ws.php',
+        data: formData,
+        queryParameters: queries
+    );
+
+    if (response.statusCode == 200) {
+      return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } catch (e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
+  }
+}
+
+Future<dynamic> renameImage(int imageId, String name) async {
+  Map<String, String> queries = {
+    "format": "json",
+    "method": "pwg.images.setInfo",
+  };
+
+  Map<String,dynamic> form = {
+    "image_id": imageId,
+    "name": name,
+    "single_value_mode": "replace"
+  };
+
+  FormData formData = FormData.fromMap(form);
 
   try {
     Response response = await API.dio.post('ws.php',

lib/api/SessionAPI.dart

@@ -29,6 +29,7 @@ Future<String> loginUser(String url, String username, String password) async {
         var status = await sessionStatus();
         print(status);
         if(status["stat"] == "ok") {
+          print("$url, $username");
           savePreferences(status["result"], url: url, username: username, password: password, isLogged: true, isGuest: false);
           return null;
         }
@@ -77,13 +78,13 @@ void saveStatus(Map<String, dynamic> status) async {
   API.prefs.setString("status", status["status"]);
   API.prefs.setString("version", status["version"]);
   API.prefs.setStringList("available_sizes", status["available_sizes"].cast<String>());
-  if(API.prefs.getBool("is_logged") && !API.prefs.getBool("is_guest")) {
+  if(API.prefs.getString("user_status") == "admin" || API.prefs.getString("user_status") == "webmaster") {
     API.prefs.setInt('upload_form_chunk_size', status['upload_form_chunk_size']);
     API.prefs.setString("file_types", status["upload_file_types"]);
   }
-  if(API.prefs.getString('miniature_size') == null) {
-    API.prefs.setString('miniature_size', 'medium');
-  }
+  if(API.prefs.getString('thumbnail_size') == null) API.prefs.setString('thumbnail_size', 'medium');
+  if(API.prefs.getString('full_screen_image_size') == null) API.prefs.setString('full_screen_image_size', 'medium');
+  if(API.prefs.getString('album_thumbnail_size') == null) API.prefs.setString('album_thumbnail_size', 'medium');
 }
 
 void savePreferences(Map<String, dynamic> status, {
@@ -98,14 +99,15 @@ void savePreferences(Map<String, dynamic> status, {
   API.prefs.setString('password', password);
   API.prefs.setBool("is_logged", isLogged);
   API.prefs.setBool("is_guest", isGuest);
+  API.prefs.setString("user_status", status["status"]);
   API.prefs.setString("base_url", url);
 
   API.prefs.setString("default_album", "Root Album");
-  if(API.prefs.getInt("default_miniatures_size") == null) API.prefs.setInt("default_miniatures_size", 0);
+  if(API.prefs.getInt("default_thumbnails_size") == null) API.prefs.setInt("default_thumbnails_size", 0);
   if(API.prefs.getInt("sort") == null) API.prefs.setInt("sort", 0);
   if(API.prefs.getInt("recent_albums") == null) API.prefs.setInt("recent_albums", 5);
   if(API.prefs.getDouble("portrait_image_count") == null) API.prefs.setDouble("portrait_image_count", 4);
   if(API.prefs.getDouble("landscape_image_count") == null) API.prefs.setDouble("landscape_image_count", 6);
-  if(API.prefs.getBool("show_miniature_title") == null) API.prefs.setBool("show_miniature_title", false);
+  if(API.prefs.getBool("show_thumbnail_title") == null) API.prefs.setBool("show_thumbnail_title", false);
   saveStatus(status);
 }