Merge pull request #124 from abrenoch/more_list_types

Add support for viewing images by tags

Author: remi-martin

lib/app.dart

@@ -16,6 +16,7 @@ import 'package:piwigo_ng/views/image/edit_image_page.dart';
 import 'package:piwigo_ng/views/image/image_favorites_page.dart';
 import 'package:piwigo_ng/views/image/image_page.dart';
 import 'package:piwigo_ng/views/image/image_search_page.dart';
+import 'package:piwigo_ng/views/image/image_tags_page.dart';
 import 'package:piwigo_ng/views/image/video_player_page.dart';
 import 'package:piwigo_ng/views/settings/auto_upload_page.dart';
 import 'package:piwigo_ng/views/settings/privacy_policy_page.dart';
@@ -147,6 +148,14 @@ Route<dynamic> generateRoute(RouteSettings settings) {
         ),
         settings: settings,
       );
+    case ImageTagsPage.routeName:
+      return MaterialPageRoute(
+        builder: (_) => ImageTagsPage(
+          isAdmin: arguments['isAdmin'] ?? isAdmin,
+          tag: arguments["tag"],
+        ),
+        settings: settings,
+      );
     case ImageFavoritesPage.routeName:
       return MaterialPageRoute(
         builder: (_) => ImageFavoritesPage(

lib/components/appbars/root_search_app_bar.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:piwigo_ng/components/dialogs/tags_dialogs.dart';
 import 'package:piwigo_ng/components/notification_dot.dart';
 import 'package:piwigo_ng/components/popup_list_item.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
@@ -147,6 +148,15 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
                 ],
               ),
             ),
+            PopupMenuItem(
+              onTap: () => (
+                  showChooseTagSheet(context)
+              ),
+              child: PopupListItem(
+                icon: Icons.local_offer_outlined,
+                text: appStrings.tags,
+              ),
+            ),
             if (Preferences.getUserStatus != 'guest')
               PopupMenuItem(
                 onTap: () => Future.delayed(

lib/network/images.dart

@@ -167,6 +167,49 @@ Future<ApiResponse<Map>> fetchFavorites([
   return ApiResponse(error: ApiErrors.error);
 }
 
+Future<ApiResponse<Map>> fetchTagImages(int tagID, [int page = 0]) async {
+  Map<String, String> query = {
+    "format": "json",
+    "method": "pwg.tags.getImages",
+    "tag_id": tagID.toString(),
+    "per_page": "100",
+    "page": page.toString(),
+  };
+
+  try {
+    Response response = await ApiClient.get(queryParameters: query);
+
+    if (response.statusCode == 200) {
+      final Map<String, dynamic> result = json.decode(response.data);
+      if (result['stat'] == 'fail') {
+        return ApiResponse<Map>(data: {
+          'total_count': 0,
+          'images': [],
+        });
+      }
+      final jsonImages = result['result']['images'];
+      List<ImageModel> images = List<ImageModel>.from(
+        jsonImages.map((image) {
+          image['tags'] = null;
+          return ImageModel.fromJson(image);
+        }),
+      );
+
+      print(result['result']['paging']);
+
+      return ApiResponse<Map>(data: {
+        'total_count': result['result']['paging']['total_count'],
+        'images': images,
+      });
+    }
+  } on DioError catch (e) {
+    debugPrint('Fetch tag images: ${e.message}');
+  } on Error catch (e) {
+    debugPrint('Fetch tag images: ${e.stackTrace}');
+  }
+  return ApiResponse(error: ApiErrors.error);
+}
+
 Future<String?> pickDirectoryPath() async {
   return await FilePicker.platform.getDirectoryPath();
 }

lib/network/tags.dart

@@ -4,6 +4,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:piwigo_ng/models/tag_model.dart';
 import 'package:piwigo_ng/network/api_error.dart';
+import 'package:piwigo_ng/services/preferences_service.dart';
 
 import 'api_client.dart';
 
@@ -60,3 +61,34 @@ Future<ApiResponse<TagModel>> createTag(String name) async {
   }
   return ApiResponse(error: ApiErrors.error);
 }
+
+Future<dynamic> editTag(int tagId, String tagName) async {
+  Map<String, String> queries = {
+    "format": "json",
+    "method": "pwg.tags.rename",
+  };
+  FormData formData = FormData.fromMap({
+    "tag_id": tagId,
+    "new_name": tagName,
+    'pwg_token': appPreferences.getString('PWG_TOKEN'),
+  });
+  Response response = await ApiClient.post(
+      data: formData,
+      queryParameters: queries
+  );
+
+  try {
+    if (response.statusCode == 200) {
+      var data = json.decode(response.data);
+      if (data['stat'] == 'fail') {
+        return ApiResponse(error: ApiErrors.error);
+      }
+      return ApiResponse(data: true);
+    }
+  } on DioError catch (e) {
+    debugPrint('Get tags: ${e.message}');
+  } on Error catch (e) {
+    debugPrint('Get tags: $e\n${e.stackTrace}');
+  }
+  return ApiResponse(error: ApiErrors.error);
+}