feat: fixed select tag dialog

remi-martin · remi-martin · commit 3c0c14617d81 · 2024-03-30T11:21:41.000+01:00
diff --git a/lib/components/appbars/root_search_app_bar.dart b/lib/components/appbars/root_search_app_bar.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:piwigo_ng/components/dialogs/tags_dialogs.dart';
+import 'package:piwigo_ng/components/modals/open_tag_modal.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';
@@ -41,9 +41,7 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
       if (widget.scrollController.offset > _expandedHeight * _opacityScale) {
         return 0.0;
       }
-      return (_expandedHeight * _opacityScale -
-              widget.scrollController.offset) /
-          (_expandedHeight * _opacityScale);
+      return (_expandedHeight * _opacityScale - widget.scrollController.offset) / (_expandedHeight * _opacityScale);
     }
     return 1.0;
   }
@@ -59,8 +57,7 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
       }
 
       // 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;
     }
@@ -72,8 +69,7 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
   Widget build(BuildContext context) {
     return SliverAppBar(
       leading: IconButton(
-        onPressed: () =>
-            Navigator.of(context).pushNamed(SettingsPage.routeName),
+        onPressed: () => Navigator.of(context).pushNamed(SettingsPage.routeName),
         icon: const Icon(Icons.settings),
       ),
       pinned: true,
@@ -91,7 +87,6 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
                 child: AppField(
                   padding: const EdgeInsets.symmetric(vertical: 8.0),
                   prefix: Icon(Icons.search),
-                  hint: "Search...",
                 ),
               ),
             ),
@@ -126,8 +121,7 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
             PopupMenuItem(
               onTap: () => Future.delayed(
                 const Duration(seconds: 0),
-                () =>
-                    Navigator.of(context).pushNamed(UploadStatusPage.routeName),
+                () => Navigator.of(context).pushNamed(UploadStatusPage.routeName),
               ),
               child: Stack(
                 children: [
@@ -138,8 +132,7 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
                   Positioned(
                     top: 14.0,
                     left: 0.0,
-                    child: Consumer<UploadNotifier>(
-                        builder: (context, uploadNotifier, child) {
+                    child: Consumer<UploadNotifier>(builder: (context, uploadNotifier, child) {
                       return NotificationDot(
                         isShown: uploadNotifier.uploadList.isNotEmpty,
                       );
@@ -149,8 +142,9 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
               ),
             ),
             PopupMenuItem(
-              onTap: () => (
-                  showChooseTagSheet(context)
+              onTap: () => Future.delayed(
+                const Duration(seconds: 0),
+                () => showOpenTagModal(context),
               ),
               child: PopupListItem(
                 icon: Icons.local_offer_outlined,
@@ -161,8 +155,7 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
               PopupMenuItem(
                 onTap: () => Future.delayed(
                   const Duration(seconds: 0),
-                  () => Navigator.of(context)
-                      .pushNamed(ImageFavoritesPage.routeName),
+                  () => Navigator.of(context).pushNamed(ImageFavoritesPage.routeName),
                 ),
                 child: PopupListItem(
                   icon: Icons.favorite,
@@ -174,8 +167,7 @@ class _RootSearchAppBarState extends State<RootSearchAppBar> {
         Positioned(
           top: 12.0,
           left: 12.0,
-          child: Consumer<UploadNotifier>(
-              builder: (context, uploadNotifier, child) {
+          child: Consumer<UploadNotifier>(builder: (context, uploadNotifier, child) {
             return NotificationDot(
               isShown: uploadNotifier.uploadList.isNotEmpty,
             );
diff --git a/lib/components/modals/open_tag_modal.dart b/lib/components/modals/open_tag_modal.dart
@@ -0,0 +1,154 @@
+import 'package:flutter/material.dart';
+import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
+import 'package:piwigo_ng/components/fields/app_field.dart';
+import 'package:piwigo_ng/models/tag_model.dart';
+import 'package:piwigo_ng/network/api_error.dart';
+import 'package:piwigo_ng/network/tags.dart';
+import 'package:piwigo_ng/utils/localizations.dart';
+import 'package:piwigo_ng/views/image/image_tags_page.dart';
+
+class OpenTagModal extends StatefulWidget {
+  const OpenTagModal({super.key});
+
+  @override
+  _OpenTagModalState createState() => _OpenTagModalState();
+}
+
+class _OpenTagModalState extends State<OpenTagModal> {
+  final ScrollController _scrollController = ScrollController();
+  late final Future _tagsFuture;
+
+  String _searchQuery = '';
+  List<TagModel>? _tagList;
+
+  @override
+  void initState() {
+    super.initState();
+    _tagsFuture = _onRefresh();
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _onRefresh() async {
+    try {
+      final ApiResponse<List<TagModel>> result = await getTags();
+      if (!result.hasData) return;
+      setState(() {
+        _tagList = result.data!.where((tag) => tag.counter > 0).toList()..sort((a, b) => a.name.compareTo(b.name));
+      });
+    } catch (e) {
+      setState(() {
+        _tagList = null;
+      });
+    }
+  }
+
+  void _onSelectTag(TagModel tag) {
+    Navigator.of(context).pop();
+    Navigator.of(context).pushNamed(
+      ImageTagsPage.routeName,
+      arguments: {
+        'tag': tag,
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.transparent,
+      appBar: AppBar(
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.vertical(
+            top: Radius.circular(15.0),
+          ),
+        ),
+        elevation: 0.0,
+        scrolledUnderElevation: 5.0,
+        leading: IconButton(
+          icon: Icon(Icons.close),
+          onPressed: () => Navigator.of(context).pop(),
+        ),
+        title: Text(appStrings.tags),
+      ),
+      body: ListView(
+        controller: ModalScrollController.of(context),
+        physics: const AlwaysScrollableScrollPhysics(),
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 16.0,
+              vertical: 8.0,
+            ),
+            child: AppField(
+              padding: const EdgeInsets.symmetric(vertical: 8.0),
+              prefix: Icon(Icons.search),
+              onChanged: (query) => setState(() {
+                _searchQuery = query;
+              }),
+            ),
+          ),
+          FutureBuilder(
+            future: _tagsFuture,
+            builder: (context, snapshot) {
+              switch (snapshot.connectionState) {
+                case ConnectionState.done:
+                  return _buildTagList();
+                default:
+                  return Center(
+                    child: CircularProgressIndicator(),
+                  );
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildTagList() {
+    if (_tagList == null) {
+      return Center(
+        child: Text(appStrings.coreDataFetch_TagError),
+      );
+    }
+
+    List<TagModel> tags =
+        _tagList!.where((tag) => tag.name.toLowerCase().contains(_searchQuery.toLowerCase())).toList();
+    if (tags.isEmpty) {
+      return Center(
+        child: Text(appStrings.none),
+      );
+    }
+
+    return Column(
+      children: tags.map((tag) => _buildItem(tag)).toList(),
+    );
+  }
+
+  Widget _buildItem(TagModel tag) => ListTile(
+        visualDensity: VisualDensity.compact,
+        shape: Border(
+          bottom: BorderSide(color: Theme.of(context).scaffoldBackgroundColor),
+        ),
+        title: Text(tag.name),
+        trailing: Text(appStrings.imageCount(tag.counter)),
+        onTap: () => _onSelectTag(tag),
+      );
+}
+
+Future<int?> showOpenTagModal(BuildContext context) async {
+  return showMaterialModalBottomSheet<int>(
+    context: context,
+    enableDrag: false,
+    shape: RoundedRectangleBorder(
+      borderRadius: BorderRadius.vertical(top: Radius.circular(30.0)),
+    ),
+    backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+    builder: (context) => OpenTagModal(),
+  );
+}
diff --git a/lib/components/modals/select_tags_modal.dart b/lib/components/modals/select_tags_modal.dart
@@ -41,11 +41,10 @@ class _SelectTagsModalState extends State<SelectTagsModal> {
     super.dispose();
   }
 
-  List<TagModel> get _unselectedTagList =>
-      _tagList!.where((t) => !_selectedTagList.contains(t)).toList();
+  List<TagModel> get _unselectedTagList => _tagList!.where((t) => !_selectedTagList.contains(t)).toList();
 
   Future<void> _onRefresh() async {
-    final ApiResponse<List<TagModel>> result = await getTags();
+    final ApiResponse<List<TagModel>> result = await getAdminTags();
     if (!result.hasData) return;
     setState(() {
       _tagList = result.data!;
diff --git a/lib/network/tags.dart b/lib/network/tags.dart
@@ -9,6 +9,31 @@ import 'package:piwigo_ng/services/preferences_service.dart';
 import 'api_client.dart';
 
 Future<ApiResponse<List<TagModel>>> getTags() async {
+  Map<String, String> queries = {
+    'format': 'json',
+    'method': 'pwg.tags.getList',
+  };
+
+  Response response = await ApiClient.get(queryParameters: queries);
+
+  try {
+    if (response.statusCode == 200) {
+      var data = json.decode(response.data);
+      if (data['stat'] == 'fail') {
+        return ApiResponse(error: ApiErrors.error);
+      }
+      List<TagModel> tags = data['result']['tags'].map<TagModel>((tag) => TagModel.fromJson(tag)).toList();
+      return ApiResponse(data: tags);
+    }
+  } 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);
+}
+
+Future<ApiResponse<List<TagModel>>> getAdminTags() async {
   Map<String, String> queries = {
     'format': 'json',
     'method': 'pwg.tags.getAdminList',
@@ -22,9 +47,7 @@ Future<ApiResponse<List<TagModel>>> getTags() async {
       if (data['stat'] == 'fail') {
         return ApiResponse(error: ApiErrors.error);
       }
-      List<TagModel> tags = data['result']['tags']
-          .map<TagModel>((tag) => TagModel.fromJson(tag))
-          .toList();
+      List<TagModel> tags = data['result']['tags'].map<TagModel>((tag) => TagModel.fromJson(tag)).toList();
       return ApiResponse(data: tags);
     }
   } on DioError catch (e) {
@@ -72,10 +95,7 @@ Future<dynamic> editTag(int tagId, String tagName) async {
     "new_name": tagName,
     'pwg_token': appPreferences.getString('PWG_TOKEN'),
   });
-  Response response = await ApiClient.post(
-      data: formData,
-      queryParameters: queries
-  );
+  Response response = await ApiClient.post(data: formData, queryParameters: queries);
 
   try {
     if (response.statusCode == 200) {
@@ -91,4 +111,4 @@ Future<dynamic> editTag(int tagId, String tagName) async {
     debugPrint('Get tags: $e\n${e.stackTrace}');
   }
   return ApiResponse(error: ApiErrors.error);
-}
+}
diff --git a/lib/views/components/dialogs/tags_dialogs.dart b/lib/views/components/dialogs/tags_dialogs.dart
diff --git a/lib/views/image/image_search_page.dart b/lib/views/image/image_search_page.dart
