Merge branch 'Dev/v2' into Translation/Crowdin

ReightI · ReightI · commit 2a65774e481c · 2023-02-07T12:32:35.000+01:00
# Conflicts:
#	l10n/app_es.arb
#	l10n/app_lt.arb
#	l10n/app_sk.arb
diff --git a/l10n/app_de.arb b/l10n/app_de.arb
@@ -751,15 +751,12 @@
     "settings_appName": "Piwigo NG",
     "settingsHeader_about": "Hinweis",
     "settings_twitter": "@piwigo",
-    "settings_twitterURL": "https://twitter.com/piwigo",
     "settings_contactUs": "Kontakt",
     "settings_feedback": "Feedback",
     "settings_supportForum": "Support-Forum",
     "settings_releaseNotes": "Versionshinweise",
     "settings_rateInAppStore": "Piwigo NG bewerten",
     "settings_translateWithCrowdin": "Piwigo NG übersetzen",
-    "settings_crowdinURL": "https://crowdin.com/project/piwigo-ng",
-    "settings_pwgForumURL": "http://piwigo.org/forum",
     "settings_acknowledgements": "Danksagungen",
     "settings_privacy": "Datenschutzerklärung",
     "settings_privacyUrl": "&lang=de_DE"
diff --git a/l10n/app_en.arb b/l10n/app_en.arb
@@ -931,5 +931,6 @@
     "settings_translateWithCrowdin": "Translate Piwigo NG",
     "settings_acknowledgements": "Acknowledgements",
     "settings_privacy": "Privacy Policy",
+    "settings_unknownVersion": "Unknown version",
     "settings_privacyUrl": "&lang=en_EN"
 }
diff --git a/l10n/app_es.arb b/l10n/app_es.arb
diff --git a/l10n/app_fr.arb b/l10n/app_fr.arb
@@ -751,15 +751,12 @@
     "settings_language": "Choisir la langue",
     "settingsHeader_about": "Informations",
     "settings_twitter": "@piwigo",
-    "settings_twitterURL": "https://twitter.com/piwigo",
     "settings_contactUs": "Contactez-nous",
     "settings_feedback": "Retour d'information",
     "settings_supportForum": "Forum d'Aide",
     "settings_releaseNotes": "Notes de Versions",
     "settings_rateInAppStore": "Noter Piwigo NG",
     "settings_translateWithCrowdin": "Traduire Piwigo NG",
-    "settings_crowdinURL": "https://crowdin.com/project/piwigo-ng",
-    "settings_pwgForumURL": "https://fr.piwigo.org/forum",
     "settings_acknowledgements": "Remerciements",
     "settings_privacy": "Politique de Confidentialité",
     "settings_privacyUrl": "&lang=fr_FR"
diff --git a/l10n/app_lt.arb b/l10n/app_lt.arb
diff --git a/l10n/app_sk.arb b/l10n/app_sk.arb
diff --git a/lib/api/images.dart b/lib/api/images.dart
@@ -212,19 +212,23 @@ Future<XFile?> downloadImage(String dirPath, ImageModel image) async {
 
 Future<int> deleteImages(
   List<ImageModel> imageList,
-  AlbumModel album,
+  AlbumModel? album,
   DeleteAlbumModes mode,
 ) async {
   int nbSuccess = 0;
   for (ImageModel image in imageList) {
     bool response = false;
-    switch (mode) {
-      case DeleteAlbumModes.noDelete:
-        response = await removeImage(image, album.id);
-        break;
-      default:
-        response = await deleteImage(image);
-        break;
+    if (album == null) {
+      response = await deleteImage(image);
+    } else {
+      switch (mode) {
+        case DeleteAlbumModes.noDelete:
+          response = await removeImage(image, album.id);
+          break;
+        default:
+          response = await deleteImage(image);
+          break;
+      }
     }
     if (response == true) {
       nbSuccess++;
diff --git a/lib/api/upload.dart b/lib/api/upload.dart
@@ -23,6 +23,7 @@ import '../services/chunked_uploader.dart';
 import '../services/notification_service.dart';
 
 Future<void> _showUploadNotification({bool success = true}) async {
+  if (!Preferences.getUploadNotification) return;
   final android = AndroidNotificationDetails(
     'piwigo-ng-upload',
     'Piwigo NG Upload',
@@ -124,12 +125,7 @@ Future<List<Map<String, dynamic>>> uploadPhotos(
       debugPrint("$e");
     }
   }
-  if (Preferences.getUploadNotification) {
-    if (result.isEmpty) {
-      _showUploadNotification(success: false);
-    }
-    _showUploadNotification(success: true);
-  }
+  _showUploadNotification(success: result.isNotEmpty);
   if (result.isEmpty) return [];
   uploadCompletedList = result.map<int>((e) => e['id']).toList();
   try {
diff --git a/lib/app.dart b/lib/app.dart
@@ -45,6 +45,9 @@ class App extends StatelessWidget {
             Locale('en'),
             Locale('de'),
             Locale('fr'),
+            Locale('es'),
+            Locale('lt'),
+            Locale('sk'),
             Locale('zh'),
           ],
           locale: localNotifier.locale,
diff --git a/lib/components/appbars/root_search_app_bar.dart b/lib/components/appbars/root_search_app_bar.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:piwigo_ng/utils/localizations.dart';
 
 import '../../views/settings/settings_view_page.dart';
 import '../fields/app_field.dart';
@@ -99,7 +100,7 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
           vertical: 16,
         ),
         title: Text(
-          'Albums', // Todo: Use translations
+          appStrings.tabBar_albums,
           textScaleFactor: 1,
           style: Theme.of(context).appBarTheme.titleTextStyle,
         ),
diff --git a/lib/components/appbars/settings_app_bar.dart b/lib/components/appbars/settings_app_bar.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:piwigo_ng/utils/localizations.dart';
 
 class SettingsAppBar extends StatefulWidget {
   const SettingsAppBar({
@@ -32,8 +33,7 @@ class _SettingsAppBarState extends State<SettingsAppBar> {
       }
 
       // In case 0%-100% of the expanded height is viewed
-      double scrollDelta =
-          (_expandedHeight - widget.scrollController.offset) / _expandedHeight;
+      double scrollDelta = (_expandedHeight - widget.scrollController.offset) / _expandedHeight;
       double scrollPercent = (scrollDelta * 2 - 1);
       return (1 - scrollPercent) * delta * basePadding + basePadding;
     }
@@ -44,9 +44,8 @@ class _SettingsAppBarState extends State<SettingsAppBar> {
   @override
   Widget build(BuildContext context) {
     return SliverAppBar(
-      leading: IconButton(
+      leading: BackButton(
         onPressed: () => Navigator.of(context).pop(),
-        icon: const Icon(Icons.arrow_back),
       ),
       pinned: true,
       expandedHeight: _expandedHeight,
@@ -56,7 +55,7 @@ class _SettingsAppBarState extends State<SettingsAppBar> {
           vertical: 16,
         ),
         title: Text(
-          'Settings', // Todo: Use translations
+          appStrings.tabBar_preferences,
           textScaleFactor: 1,
           style: Theme.of(context).appBarTheme.titleTextStyle,
         ),
diff --git a/lib/components/buttons/app_text_button.dart b/lib/components/buttons/app_text_button.dart
@@ -30,7 +30,7 @@ class AppTextButton extends StatelessWidget {
               TextStyle(
                 color: Theme.of(context).primaryColor,
                 fontWeight: FontWeight.w500,
-              ), // Todo: Text button text style
+              ),
         ),
       ),
     );
diff --git a/lib/components/cards/album_card.dart b/lib/components/cards/album_card.dart
@@ -4,6 +4,7 @@ import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:piwigo_ng/components/clippers/album_card_clipper.dart';
 import 'package:piwigo_ng/components/clippers/clip_shadow_path.dart';
 import 'package:piwigo_ng/models/album_model.dart';
+import 'package:piwigo_ng/utils/localizations.dart';
 
 import 'album_card_action.dart';
 
@@ -267,7 +268,7 @@ class AlbumCardContent extends StatelessWidget {
                 FittedBox(
                   fit: BoxFit.fitWidth,
                   child: Text(
-                    "${album.nbTotalImages} photos", // Todo: use variable
+                    appStrings.imageCount(album.nbTotalImages),
                     style: Theme.of(context).textTheme.labelSmall,
                   ),
                 ),
diff --git a/lib/components/cards/image_details_card.dart b/lib/components/cards/image_details_card.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:piwigo_ng/models/image_model.dart';
+import 'package:piwigo_ng/services/locale_provider.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
+import 'package:provider/provider.dart';
 
 class ImageDetailsCard extends StatelessWidget {
   const ImageDetailsCard({Key? key, required this.image, this.onRemove}) : super(key: key);
@@ -39,11 +41,15 @@ class ImageDetailsCard extends StatelessWidget {
                         Flexible(
                           child: Padding(
                             padding: const EdgeInsets.only(top: 4.0),
-                            child: Text(
-                              DateFormat.yMMMMd().format(DateTime.parse(image.dateAvailable!)), // todo locale
-                              maxLines: 2,
-                              style: Theme.of(context).textTheme.bodyMedium,
-                            ),
+                            child: Builder(builder: (context) {
+                              LocaleNotifier localeNotifier = Provider.of<LocaleNotifier>(context, listen: false);
+                              return Text(
+                                DateFormat.yMMMMd(localeNotifier.locale.languageCode)
+                                    .format(DateTime.parse(image.dateAvailable!)),
+                                maxLines: 2,
+                                style: Theme.of(context).textTheme.bodyMedium,
+                              );
+                            }),
                           ),
                         ),
                     ],
diff --git a/lib/services/preferences_service.dart b/lib/services/preferences_service.dart
@@ -19,6 +19,11 @@ class Preferences {
 
   static const String accountUsernameKey = 'ACCOUNT_USERNAME';
   static const String userStatusKey = 'USER_STATUS';
+  static String get getUserStatus {
+    print(appPreferences.getString(userStatusKey));
+    return appPreferences.getString(userStatusKey) ?? 'guest';
+  }
+
   static const String communityStatusKey = 'COMMUNITY_STATUS';
   static const String tokenKey = 'PWG_TOKEN';
   static const String versionKey = 'VERSION';
@@ -131,7 +136,6 @@ class Preferences {
   /// Saves server info retrieved from pwg.session.getStatus API call
   static void saveStatus(StatusModel status) async {
     appPreferences.setString(accountUsernameKey, status.username);
-    appPreferences.setString(userStatusKey, status.status);
     appPreferences.setString(tokenKey, status.pwgToken);
     appPreferences.setString(versionKey, status.version);
     appPreferences.setStringList(availableSizesKey, status.availableSizes);
@@ -146,5 +150,7 @@ class Preferences {
     } else {
       appPreferences.setBool(isAdminKey, false);
     }
+    print(status.status);
+    appPreferences.setString(userStatusKey, status.status);
   }
 }
diff --git a/lib/utils/image_actions.dart b/lib/utils/image_actions.dart
@@ -70,13 +70,15 @@ Future<bool?> onEditPhotos(BuildContext context, List<ImageModel> images) async
   });
 }
 
-Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images, AlbumModel album) async {
-  AlbumModel origin = album;
-  if (images.length == 1) {
+Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images, [AlbumModel? album]) async {
+  late AlbumModel origin;
+  if (album == null || images.length == 1) {
     origin = AlbumModel(
       id: images.first.categories.first['id'],
       name: '',
     );
+  } else {
+    origin = album;
   }
   return showModalBottomSheet<dynamic>(
     context: context,
@@ -85,7 +87,7 @@ Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images, Albu
       padding: MediaQuery.of(context).padding,
       child: MoveOrCopyModal(
         title: appStrings.moveImage_title,
-        subtitle: appStrings.moveImage_selectAlbum(images.length, images.first),
+        subtitle: appStrings.moveImage_selectAlbum(images.length, images.first.name),
         isImage: true,
         album: origin,
         onSelected: (selectedAlbum) async {
@@ -102,7 +104,7 @@ Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images, Albu
           int results = 0;
           switch (choice) {
             case 0:
-              results = await moveImages(images, album.id, selectedAlbum.id);
+              results = await moveImages(images, origin.id, selectedAlbum.id);
               break;
             case 1:
               results = await assignImages(images, selectedAlbum.id);
@@ -118,7 +120,7 @@ Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images, Albu
   );
 }
 
-Future<bool> onDeletePhotos(BuildContext context, List<ImageModel> images, AlbumModel album) async {
+Future<bool> onDeletePhotos(BuildContext context, List<ImageModel> images, [AlbumModel? album]) async {
   final DeleteAlbumModes? mode = await showModalBottomSheet<DeleteAlbumModes>(
     context: context,
     isScrollControlled: true,
diff --git a/lib/utils/localizations.dart b/lib/utils/localizations.dart
@@ -58,8 +58,12 @@ String getLanguageFromCode(String code) {
       return 'Español';
     case 'fr':
       return 'Français';
+    case 'lt':
+      return 'Lietuvių kalba';
+    case 'sk':
+      return 'Slovenčina';
     case 'zh':
-      return '中国人';
+      return '中文';
     default:
       return code;
   }
diff --git a/lib/views/album/album_view_page.dart b/lib/views/album/album_view_page.dart
@@ -10,6 +10,7 @@ import 'package:piwigo_ng/components/scroll_widgets/album_grid_view.dart';
 import 'package:piwigo_ng/components/scroll_widgets/image_grid_view.dart';
 import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/models/image_model.dart';
+import 'package:piwigo_ng/services/preferences_service.dart';
 import 'package:piwigo_ng/services/upload_notifier.dart';
 import 'package:piwigo_ng/utils/album_actions.dart';
 import 'package:piwigo_ng/utils/image_actions.dart';
@@ -257,11 +258,11 @@ class _AlbumViewPageState extends State<AlbumViewPage> {
                     text: appStrings.imageOptions_share,
                   ),
                 ),
-              if (_selectedList.isNotEmpty)
+              if (_selectedList.isNotEmpty && Preferences.getUserStatus != 'guest')
                 PopupMenuItem(
                   onTap: () => Future.delayed(
                     const Duration(seconds: 0),
-                    () => _onLikePhotos(),
+                    _onLikePhotos,
                   ),
                   child: PopupListItem(
                     icon: _hasNonFavorites ? Icons.favorite_border : Icons.favorite,
@@ -417,12 +418,6 @@ class _AlbumViewPageState extends State<AlbumViewPage> {
       _imageList = result.data!;
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) => setState(() {}));
     }
-    // todo: useless display
-    // if (_imageList.isEmpty) {
-    //   return Center(
-    //     child: Text(appStrings.noImages),
-    //   );
-    // }
     _selectedList = _imageList.where((image) => _selectedList.contains(image)).toList();
     return ImageGridView(
       imageList: _imageList,
@@ -472,19 +467,20 @@ class _AlbumViewPageState extends State<AlbumViewPage> {
                       icon: Icon(Icons.share),
                     ),
                   ),
-                  Expanded(
-                    child: IconButton(
-                      onPressed: _onLikePhotos,
-                      icon: Builder(
-                        builder: (context) {
-                          if (_hasNonFavorites) {
-                            return Icon(Icons.favorite_border);
-                          }
-                          return Icon(Icons.favorite);
-                        },
+                  if (Preferences.getUserStatus != 'guest') // Todo: enum roles
+                    Expanded(
+                      child: IconButton(
+                        onPressed: _onLikePhotos,
+                        icon: Builder(
+                          builder: (context) {
+                            if (_hasNonFavorites) {
+                              return Icon(Icons.favorite_border);
+                            }
+                            return Icon(Icons.favorite);
+                          },
+                        ),
                       ),
                     ),
-                  ),
                   Expanded(
                     child: IconButton(
                       onPressed: () => downloadImages(_selectedList),
diff --git a/lib/views/authentication/login_view_page.dart b/lib/views/authentication/login_view_page.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:piwigo_ng/app.dart';
+import 'package:piwigo_ng/utils/localizations.dart';
 import 'package:piwigo_ng/views/settings/privacy_policy_view_page.dart';
 
 import '../../components/buttons/app_text_button.dart';
@@ -61,7 +62,7 @@ class _LoginViewPageState extends State<LoginViewPage> {
                         ),
                       ),
                       AppTextButton(
-                        text: "Privacy Policy", // Todo: Use translations
+                        text: appStrings.settings_privacy,
                         onPressed: () {
                           App.navigatorKey.currentState?.pushNamed(
                             PrivacyPolicyViewPage.routeName,
@@ -73,13 +74,9 @@ class _LoginViewPageState extends State<LoginViewPage> {
                         builder: (context, snapshot) {
                           if (snapshot.hasData) {
                             PackageInfo packageInfo = snapshot.data!;
-                            return Text(
-                              packageInfo.version,
-                            );
+                            return Text(packageInfo.version);
                           }
-                          return const Text(
-                            "Unknown version",
-                          ); // Todo: Add to translations
+                          return Text(appStrings.settings_unknownVersion);
                         },
                       ),
                     ],
diff --git a/lib/views/image/edit_image_page.dart b/lib/views/image/edit_image_page.dart
diff --git a/lib/views/image/image_search_view_page.dart b/lib/views/image/image_search_view_page.dart
diff --git a/lib/views/image/image_view_page.dart b/lib/views/image/image_view_page.dart
diff --git a/lib/views/settings/privacy_policy_view_page.dart b/lib/views/settings/privacy_policy_view_page.dart

Original file line number	Diff line number	Diff line change
`@@ -931,5 +931,6 @@`
`931`	`931`	`"settings_translateWithCrowdin": "Translate Piwigo NG",`
`932`	`932`	`"settings_acknowledgements": "Acknowledgements",`
`933`	`933`	`"settings_privacy": "Privacy Policy",`
	`934`	`+ "settings_unknownVersion": "Unknown version",`
`934`	`935`	`"settings_privacyUrl": "&lang=en_EN"`
`935`	`936`	`}`