Fixes to groups and tags selected

ReightI · ReightI · commit d92cb83c7673 · 2023-08-01T15:02:26.000+02:00
diff --git a/lib/components/cards/album_card.dart b/lib/components/cards/album_card.dart
@@ -222,11 +222,13 @@ class AlbumCardContent extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
-                Text(
+                AutoSizeText(
                   album.name,
+                  maxLines: 1,
                   textAlign: TextAlign.center,
-                  softWrap: true,
-                  maxLines: 2,
+                  maxFontSize:
+                      Theme.of(context).textTheme.titleLarge!.fontSize!,
+                  minFontSize: 10.0,
                   overflow: TextOverflow.ellipsis,
                   style: Theme.of(context).textTheme.titleLarge,
                 ),
@@ -236,26 +238,27 @@ class AlbumCardContent extends StatelessWidget {
                     child: Align(
                       alignment: Alignment.bottomCenter,
                       child: Builder(builder: (context) {
-                        if (isCommentValid(album.comment)) {
-                          return const SizedBox();
-                        }
                         return AutoSizeText(
                           album.comment ?? '',
-                          softWrap: true,
-                          maxLines: 10,
-                          overflow: TextOverflow.ellipsis,
+                          maxFontSize:
+                              Theme.of(context).textTheme.bodySmall!.fontSize!,
+                          minFontSize: 10.0,
+                          overflow: TextOverflow.fade,
                           style: Theme.of(context).textTheme.bodySmall,
                         );
                       }),
                     ),
                   ),
                 ),
-                FittedBox(
-                  fit: BoxFit.fitWidth,
-                  child: Text(
-                    appStrings.imageCount(album.nbTotalImages),
-                    style: Theme.of(context).textTheme.labelSmall,
-                  ),
+                AutoSizeText(
+                  appStrings.imageCount(album.nbTotalImages),
+                  maxLines: 1,
+                  textAlign: TextAlign.center,
+                  maxFontSize:
+                      Theme.of(context).textTheme.labelSmall!.fontSize!,
+                  minFontSize: 8.0,
+                  overflow: TextOverflow.ellipsis,
+                  style: Theme.of(context).textTheme.labelSmall,
                 ),
               ],
             ),
diff --git a/lib/components/lists/select_model_list.dart b/lib/components/lists/select_model_list.dart
@@ -23,44 +23,54 @@ class SelectModelList<T> extends StatefulWidget {
 }
 
 class _SelectModelListState<T> extends State<SelectModelList<T>> {
+  static const Duration kAnimationDuration = Duration(milliseconds: 300);
   final GlobalKey<AnimatedListState> _selectedListKey =
       GlobalKey<AnimatedListState>();
   final GlobalKey<AnimatedListState> _unselectedListKey =
       GlobalKey<AnimatedListState>();
 
-  void _onTapItem(T item) {
-    if (widget.selected.contains(item)) {
+  void _onTapItem(T item, bool selected) {
+    if (selected) {
+      if (widget.unselected.contains(item)) return;
       _onDeselect(item);
     } else {
+      if (widget.selected.contains(item)) return;
       _onSelect(item);
     }
   }
 
   void _onSelect(T item) async {
     int oldIndex = widget.unselected.indexOf(item);
+    int? newIndex = widget.onSelect?.call(item);
+
     _unselectedListKey.currentState?.removeItem(
       oldIndex,
       (_, animation) => _buildItem(item, animation, false),
-      duration: const Duration(milliseconds: 150),
+      duration: kAnimationDuration,
     );
 
-    int? newIndex = widget.onSelect?.call(item);
     newIndex ??= widget.selected.indexOf(item);
-    _selectedListKey.currentState?.insertItem(newIndex);
+    _selectedListKey.currentState?.insertItem(
+      newIndex,
+      duration: kAnimationDuration,
+    );
   }
 
   void _onDeselect(T item) async {
     int oldIndex = widget.selected.indexOf(item);
+    int? newIndex = widget.onDeselect?.call(item);
+
     _selectedListKey.currentState?.removeItem(
       oldIndex,
       (_, animation) => _buildItem(item, animation, true),
-      duration: const Duration(milliseconds: 150),
+      duration: kAnimationDuration,
     );
-
-    int? newIndex = widget.onDeselect?.call(item);
-    await Future.delayed(const Duration(milliseconds: 100));
+    // await Future.delayed(const Duration(milliseconds: 10));
     newIndex ??= widget.unselected.indexOf(item);
-    _unselectedListKey.currentState?.insertItem(newIndex);
+    _unselectedListKey.currentState?.insertItem(
+      newIndex,
+      duration: kAnimationDuration,
+    );
   }
 
   @override
@@ -117,9 +127,14 @@ class _SelectModelListState<T> extends State<SelectModelList<T>> {
     );
   }
 
-  _buildItem(T item, Animation<double> animation, bool selected) {
+  Widget _buildItem(
+    T item,
+    Animation<double> animation,
+    bool selected,
+  ) {
     return SizeTransition(
-      sizeFactor: animation,
+      sizeFactor: animation.drive(
+          Tween(begin: .0, end: 1.0).chain(CurveTween(curve: Curves.ease))),
       child: ListTile(
         key: ObjectKey(item),
         visualDensity: VisualDensity.compact,
@@ -130,7 +145,7 @@ class _SelectModelListState<T> extends State<SelectModelList<T>> {
         trailing: selected
             ? Icon(Icons.remove_circle_outline, color: Colors.red)
             : Icon(Icons.add_circle_outline, color: Colors.green),
-        onTap: () => _onTapItem(item),
+        onTap: () => _onTapItem(item, selected),
       ),
     );
   }
diff --git a/lib/components/modals/select_groups_modal.dart b/lib/components/modals/select_groups_modal.dart
@@ -3,10 +3,8 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:piwigo_ng/components/buttons/piwigo_button.dart';
 import 'package:piwigo_ng/components/lists/select_model_list.dart';
 import 'package:piwigo_ng/models/group_model.dart';
-import 'package:piwigo_ng/network/api_error.dart';
 import 'package:piwigo_ng/network/groups.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
-import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class SelectGroupsModal extends StatefulWidget {
   const SelectGroupsModal({
@@ -22,12 +20,8 @@ class SelectGroupsModal extends StatefulWidget {
 
 class _SelectGroupsModalState extends State<SelectGroupsModal> {
   final ScrollController _scrollController = ScrollController();
-  final RefreshController _refreshController =
-      RefreshController(initialRefresh: false);
   late final Future _groupsFuture;
 
-  PagingModel _paging = PagingModel();
-
   List<GroupModel> _selectedGroupList = [];
   List<GroupModel>? _groupList = [];
 
@@ -151,6 +145,9 @@ Future<List<GroupModel>?> showSelectGroupModal(
 ]) async {
   return showMaterialModalBottomSheet<List<GroupModel>>(
     context: context,
+    shape: RoundedRectangleBorder(
+      borderRadius: BorderRadius.vertical(top: Radius.circular(30.0)),
+    ),
     backgroundColor: Theme.of(context).scaffoldBackgroundColor,
     builder: (context) => SelectGroupsModal(
       selectedGroups: selectedGroups,
diff --git a/lib/components/modals/select_tags_modal.dart b/lib/components/modals/select_tags_modal.dart
@@ -12,10 +12,10 @@ import 'package:piwigo_ng/utils/localizations.dart';
 class SelectTagsModal extends StatefulWidget {
   const SelectTagsModal({
     Key? key,
-    this.selectedTags = const [],
+    this.selectedTags,
   }) : super(key: key);
 
-  final List<TagModel> selectedTags;
+  final List<TagModel>? selectedTags;
 
   @override
   _SelectTagsModalState createState() => _SelectTagsModalState();
@@ -30,7 +30,7 @@ class _SelectTagsModalState extends State<SelectTagsModal> {
 
   @override
   void initState() {
-    _selectedTagList = List.from(widget.selectedTags);
+    _selectedTagList = List.from(widget.selectedTags ?? []);
     super.initState();
     _tagsFuture = _onRefresh();
   }
@@ -174,3 +174,19 @@ class _SelectTagsModalState extends State<SelectTagsModal> {
     );
   }
 }
+
+Future<List<TagModel>?> showSelectTagsModal(
+  BuildContext context, [
+  List<TagModel>? selectedTags,
+]) async {
+  return showMaterialModalBottomSheet<List<TagModel>>(
+    context: context,
+    shape: RoundedRectangleBorder(
+      borderRadius: BorderRadius.vertical(top: Radius.circular(30.0)),
+    ),
+    backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+    builder: (context) => SelectTagsModal(
+      selectedTags: selectedTags,
+    ),
+  );
+}
diff --git a/lib/views/album/album_privacy_page.dart b/lib/views/album/album_privacy_page.dart
@@ -188,10 +188,21 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
               ],
             ),
           ),
+          Divider(
+            color: Theme.of(context).disabledColor,
+          ),
+          SwitchListTile(
+            value: _recursive,
+            onChanged: (value) => setState(() {
+              _recursive = value;
+            }),
+            title: Text(appStrings.categoryPrivacyRecursive),
+            subtitle: Text(appStrings.categoryPrivacyRecursive_message),
+          ),
           Padding(
             padding: const EdgeInsets.symmetric(
-              horizontal: 24.0,
               vertical: 16.0,
+              horizontal: 24.0,
             ),
             child: PiwigoButton(
               onPressed: _onConfirmPermissions,
@@ -218,7 +229,7 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
               IconButton(
                 tooltip: appStrings.categoryPrivacyGroups_add,
                 onPressed: _onSelectGroups,
-                icon: Icon(Icons.add_circle),
+                icon: Icon(Icons.edit),
               ),
             ],
             child: FutureBuilder(
@@ -251,17 +262,6 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
               },
             ),
           ),
-          FormSection(
-            title: appStrings.categoryPrivacyRecursive,
-            child: SwitchListTile(
-              contentPadding: EdgeInsets.zero,
-              value: _recursive,
-              onChanged: (value) => setState(() {
-                _recursive = value;
-              }),
-              subtitle: Text(appStrings.categoryPrivacyRecursive_message),
-            ),
-          ),
         ],
       ),
     );
@@ -274,17 +274,15 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
       children: List.generate(_groups.length, (index) {
         GroupModel group = _groups[index];
         return PiwigoChip(
-          onRemove: () => _onRemoveGroup(index),
           label: group.name,
+          backgroundColor: Theme.of(context).chipTheme.backgroundColor,
+          foregroundColor: Theme.of(context).textTheme.bodyMedium?.color,
         );
       }),
     );
   }
 
   Widget get _buildUserPermissions {
-    if (_allowedUsers.isEmpty) {
-      return Text(appStrings.none);
-    }
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
diff --git a/lib/views/image/edit_image_page.dart b/lib/views/image/edit_image_page.dart
@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart';
 import 'package:piwigo_ng/components/cards/image_details_card.dart';
 import 'package:piwigo_ng/components/cards/piwigo_chip.dart';
@@ -197,21 +196,15 @@ class _EditImagePageState extends State<EditImagePage> {
             margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
             title: appStrings.tagsAdd_title,
             onTapTitle: () {
-              showMaterialModalBottomSheet<List<TagModel>>(
-                context: context,
-                backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-                builder: (context) => SelectTagsModal(
-                  selectedTags: _tags,
-                ),
-              ).then((value) {
+              showSelectTagsModal(context, _tags).then((value) {
                 if (value is! List<TagModel>) return;
                 setState(() {
                   _tags = value;
                 });
               });
             },
             actions: [
-              const Icon(Icons.add_circle),
+              const Icon(Icons.edit),
             ],
             child: ClipRRect(
               borderRadius: BorderRadius.circular(10),
@@ -222,7 +215,10 @@ class _EditImagePageState extends State<EditImagePage> {
                   TagModel tag = _tags[index];
                   return PiwigoChip(
                     label: tag.name,
-                    onRemove: () => _onDeselectTag(tag),
+                    backgroundColor:
+                        Theme.of(context).chipTheme.backgroundColor,
+                    foregroundColor:
+                        Theme.of(context).textTheme.bodyMedium?.color,
                   );
                 }),
               ),
diff --git a/lib/views/upload/upload_page.dart b/lib/views/upload/upload_page.dart
@@ -9,7 +9,6 @@ import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart';
 import 'package:piwigo_ng/components/cards/image_details_card.dart';
 import 'package:piwigo_ng/components/cards/piwigo_chip.dart';
 import 'package:piwigo_ng/components/fields/app_field.dart';
-import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/modals/select_tags_modal.dart';
 import 'package:piwigo_ng/components/sections/form_section.dart';
 import 'package:piwigo_ng/models/tag_model.dart';
@@ -296,20 +295,15 @@ class _UploadGalleryViewPage extends State<UploadPage>
         FormSection(
           title: appStrings.tagsAdd_title,
           onTapTitle: () {
-            showPiwigoModal<List<TagModel>>(
-              context: context,
-              builder: (_) => SelectTagsModal(
-                selectedTags: _tags,
-              ),
-            ).then((value) {
+            showSelectTagsModal(context, _tags).then((value) {
               if (value is! List<TagModel>) return;
               setState(() {
                 _tags = value;
               });
             });
           },
           actions: [
-            const Icon(Icons.add_circle),
+            const Icon(Icons.edit),
           ],
           child: Wrap(
             spacing: 8.0,
@@ -318,7 +312,8 @@ class _UploadGalleryViewPage extends State<UploadPage>
               TagModel tag = _tags[index];
               return PiwigoChip(
                 label: tag.name,
-                onRemove: () => _onDeselectTag(tag),
+                backgroundColor: Theme.of(context).chipTheme.backgroundColor,
+                foregroundColor: Theme.of(context).textTheme.bodyMedium?.color,
               );
             }),
           ),
