Merge pull request #11 from abrenoch/temp-merge

bringing up to date

Author: abrenoch

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.remi.piwigo_ng">
+
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -32,6 +33,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -43,12 +45,16 @@
         <!-- If your app opens https URLs -->
         <intent>
             <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="https" />
         </intent>
-        <!-- If your app makes calls -->
         <intent>
             <action android:name="android.intent.action.DIAL" />
             <data android:scheme="tel" />
         </intent>
+        <intent>
+            <action android:name="android.intent.action.SEND" />
+            <data android:mimeType="*/*" />
+        </intent>
     </queries>
 </manifest>

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         jcenter()

android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.jetifier.blacklist=bcprov-jdk15on

lib/api/SearchAPI.dart

@@ -0,0 +1,31 @@
+import 'dart:convert';
+
+import 'package:dio/dio.dart';
+import 'API.dart';
+
+Future<Map<String,dynamic>> searchAlbums(String searchQuery) async {
+
+  Map<String, String> query = {
+    "format": "json",
+    "method": "pwg.images.search",
+    "query": searchQuery,
+  };
+
+  try {
+    Response response = await API().dio.get('ws.php', queryParameters: query);
+
+    if (response.statusCode == 200) {
+      return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } catch(e) {
+    return {
+      'stat': 'fail',
+      'result': e.toString(),
+    };
+  }
+}

lib/constants/SettingsConstants.dart

@@ -47,6 +47,23 @@ AppLocalizations appStrings(context) {
   return AppLocalizations.of(context);
 }
 
+String getLanguageFromCode(String code) {
+  switch (code) {
+    case 'de': return 'Deutsch';
+    break;
+    case 'en': return 'English';
+    break;
+    case 'es': return 'Español';
+    break;
+    case 'fr': return 'Français';
+    break;
+    case 'zh': return '中国人';
+    break;
+    default: return code;
+      break;
+  }
+}
+
 Map<int, String> albumSort(context) {
   return {
     0: appStrings(context).categorySort_nameAscending,

lib/l10n/app_en.arb

@@ -906,6 +906,7 @@
 
 
     "settings_appName": "Piwigo NG",
+    "settings_language": "Select language",
     "settingsHeader_about": "Information",
     "settings_twitter": "@piwigo",
     "settings_twitterURL": "https://twitter.com/piwigo",