settings: merged collection quick action editors

lib/l10n/app_en.arb

@@ -758,17 +758,16 @@
   "settingsThumbnailShowVideoDuration": "Show video duration",
   "@settingsThumbnailShowVideoDuration": {},
 
-  "settingsCollectionBrowsingQuickActionsTile": "Quick actions for item browsing",
+  "settingsCollectionQuickActionsTile": "Quick actions",
-  "@settingsCollectionBrowsingQuickActionsTile": {},
+  "@settingsCollectionQuickActionsTile": {},
-  "settingsCollectionBrowsingQuickActionEditorTitle": "Quick Actions",
+  "settingsCollectionQuickActionEditorTitle": "Quick Actions",
-  "@settingsCollectionBrowsingQuickActionEditorTitle": {},
+  "@settingsCollectionQuickActionEditorTitle": {},
+  "settingsCollectionQuickActionTabBrowsing": "Browsing",
+  "@settingsCollectionQuickActionTabBrowsing": {},
+  "settingsCollectionQuickActionTabSelecting": "Selecting",
+  "@settingsCollectionQuickActionTabSelecting": {},
   "settingsCollectionBrowsingQuickActionEditorBanner": "Touch and hold to move buttons and select which actions are displayed when browsing items.",
   "@settingsCollectionBrowsingQuickActionEditorBanner": {},
-
-  "settingsCollectionSelectionQuickActionsTile": "Quick actions for item selection",
-  "@settingsCollectionSelectionQuickActionsTile": {},
-  "settingsCollectionSelectionQuickActionEditorTitle": "Quick Actions",
-  "@settingsCollectionSelectionQuickActionEditorTitle": {},
   "settingsCollectionSelectionQuickActionEditorBanner": "Touch and hold to move buttons and select which actions are displayed when selecting items.",
   "@settingsCollectionSelectionQuickActionEditorBanner": {},
 

lib/l10n/app_ko.arb

@@ -243,6 +243,7 @@
   "collectionActionCopy": "앨범으로 복사",
   "collectionActionMove": "앨범으로 이동",
   "collectionActionRescan": "새로 분석",
+  "collectionActionEdit": "편집",
 
   "collectionSortTitle": "정렬",
   "collectionSortDate": "날짜",
@@ -262,9 +263,11 @@
   "collectionDeleteFailureFeedback": "{count, plural, other{항목 {count}개를 삭제하지 못했습니다}}",
   "collectionCopyFailureFeedback": "{count, plural, other{항목 {count}개를 복사하지 못했습니다}}",
   "collectionMoveFailureFeedback": "{count, plural, other{항목 {count}개를 이동하지 못했습니다}}",
+  "collectionEditFailureFeedback": "{count, plural, other{항목 {count}개를 편집하지 못했습니다}}",
   "collectionExportFailureFeedback": "{count, plural, other{항목 {count}개를 내보내지 못했습니다}}",
   "collectionCopySuccessFeedback": "{count, plural, other{항목 {count}개를 복사했습니다}}",
   "collectionMoveSuccessFeedback": "{count, plural, other{항목 {count}개를 이동했습니다}}",
+  "collectionEditSuccessFeedback": "{count, plural, other{항목 {count}개를 편집했습니다}}",
 
   "collectionEmptyFavourites": "즐겨찾기가 없습니다",
   "collectionEmptyVideos": "동영상이 없습니다",
@@ -349,8 +352,8 @@
   "settingsThumbnailShowRawIcon": "Raw 아이콘 표시",
   "settingsThumbnailShowVideoDuration": "동영상 길이 표시",
 
-  "settingsCollectionSelectionQuickActionsTile": "항목 선택의 빠른 작업",
+  "settingsCollectionQuickActionsTile": "빠른 작업",
-  "settingsCollectionSelectionQuickActionEditorTitle": "빠른 작업",
+  "settingsCollectionQuickActionEditorTitle": "빠른 작업",
   "settingsCollectionSelectionQuickActionEditorBanner": "버튼을 길게 누른 후 이동하여 항목 선택할 때 표시될 버튼을 선택하세요.",
 
   "settingsSectionViewer": "뷰어",

lib/l10n/app_ru.arb

@@ -345,8 +345,8 @@
   "settingsThumbnailShowRawIcon": "Показать значок RAW-файла",
   "settingsThumbnailShowVideoDuration": "Показывать продолжительность видео",
 
-  "settingsCollectionSelectionQuickActionsTile": "Быстрые действия с объектами",
+  "settingsCollectionQuickActionsTile": "Быстрые действия",
-  "settingsCollectionSelectionQuickActionEditorTitle": "Быстрые действия",
+  "settingsCollectionQuickActionEditorTitle": "Быстрые действия",
   "settingsCollectionSelectionQuickActionEditorBanner": "Нажмите и удерживайте, чтобы переместить кнопки и выбрать, какие действия будут отображаться при выборе элементов.",
 
   "settingsSectionViewer": "Просмотрщик",

lib/widgets/settings/common/quick_actions/editor_page.dart

@@ -15,7 +15,7 @@ import 'package:aves/widgets/viewer/overlay/common.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-class QuickActionEditorPage<T extends Object> extends StatefulWidget {
+class QuickActionEditorPage<T extends Object> extends StatelessWidget {
   final String title, bannerText;
   final List<T> allAvailableActions;
   final Widget? Function(T action) actionIcon;
@@ -35,10 +35,50 @@ class QuickActionEditorPage<T extends Object> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _QuickActionEditorPageState createState() => _QuickActionEditorPageState<T>();
+  Widget build(BuildContext context) {
+    return MediaQueryDataProvider(
+      child: Scaffold(
+        appBar: AppBar(
+          title: Text(title),
+        ),
+        body: SafeArea(
+          child: QuickActionEditorBody(
+            bannerText: bannerText,
+            allAvailableActions: allAvailableActions,
+            actionIcon: actionIcon,
+            actionText: actionText,
+            load: load,
+            save: save,
+          ),
+        ),
+      ),
+    );
+  }
 }
 
-class _QuickActionEditorPageState<T extends Object> extends State<QuickActionEditorPage<T>> {
+class QuickActionEditorBody<T extends Object> extends StatefulWidget {
+  final String bannerText;
+  final List<T> allAvailableActions;
+  final Widget? Function(T action) actionIcon;
+  final String Function(BuildContext context, T action) actionText;
+  final List<T> Function() load;
+  final void Function(List<T> actions) save;
+
+  const QuickActionEditorBody({
+    Key? key,
+    required this.bannerText,
+    required this.allAvailableActions,
+    required this.actionIcon,
+    required this.actionText,
+    required this.load,
+    required this.save,
+  }) : super(key: key);
+
+  @override
+  _QuickActionEditorBodyState createState() => _QuickActionEditorBodyState<T>();
+}
+
+class _QuickActionEditorBodyState<T extends Object> extends State<QuickActionEditorBody<T>> with AutomaticKeepAliveClientMixin {
   final GlobalKey<AnimatedListState> _animatedListKey = GlobalKey(debugLabel: 'quick-actions-animated-list');
   Timer? _targetLeavingTimer;
   late List<T> _quickActions;
@@ -77,6 +117,8 @@ class _QuickActionEditorPageState<T extends Object> extends State<QuickActionEdi
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
+
     final header = QuickActionButton<T>(
       placement: QuickActionPlacement.header,
       panelHighlight: _quickActionHighlight,
@@ -95,17 +137,11 @@ class _QuickActionEditorPageState<T extends Object> extends State<QuickActionEdi
       removeAction: _removeQuickAction,
       onTargetLeave: _onQuickActionTargetLeave,
     );
-    return MediaQueryDataProvider(
+    return WillPopScope(
-      child: Scaffold(
-        appBar: AppBar(
-          title: Text(widget.title),
-        ),
-        body: WillPopScope(
       onWillPop: () {
         widget.save(_quickActions);
         return SynchronousFuture(true);
       },
-          child: SafeArea(
       child: ListView(
         children: [
           Padding(
@@ -222,9 +258,6 @@ class _QuickActionEditorPageState<T extends Object> extends State<QuickActionEdi
           ),
         ],
       ),
-          ),
-        ),
-      ),
     );
   }
 
@@ -284,7 +317,7 @@ class _QuickActionEditorPageState<T extends Object> extends State<QuickActionEdi
         axis: Axis.horizontal,
         sizeFactor: animation,
         child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: _QuickActionEditorPageState.quickActionVerticalPadding, horizontal: 4),
+          padding: const EdgeInsets.symmetric(vertical: _QuickActionEditorBodyState.quickActionVerticalPadding, horizontal: 4),
           child: OverlayButton(
             child: IconButton(
               icon: widget.actionIcon(action) ?? const SizedBox(),
@@ -309,4 +342,7 @@ class _QuickActionEditorPageState<T extends Object> extends State<QuickActionEdi
 
     return child;
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }

lib/widgets/settings/thumbnails/browsing_actions_editor.dart

@@ -1,44 +0,0 @@
-import 'package:aves/model/actions/entry_set_actions.dart';
-import 'package:aves/model/settings/settings.dart';
-import 'package:aves/widgets/common/extensions/build_context.dart';
-import 'package:aves/widgets/settings/common/quick_actions/editor_page.dart';
-import 'package:flutter/material.dart';
-
-class BrowsingActionsTile extends StatelessWidget {
-  const BrowsingActionsTile({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      title: Text(context.l10n.settingsCollectionBrowsingQuickActionsTile),
-      onTap: () {
-        Navigator.push(
-          context,
-          MaterialPageRoute(
-            settings: const RouteSettings(name: BrowsingActionEditorPage.routeName),
-            builder: (context) => const BrowsingActionEditorPage(),
-          ),
-        );
-      },
-    );
-  }
-}
-
-class BrowsingActionEditorPage extends StatelessWidget {
-  static const routeName = '/settings/collection_browsing_actions';
-
-  const BrowsingActionEditorPage({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return QuickActionEditorPage<EntrySetAction>(
-      title: context.l10n.settingsCollectionBrowsingQuickActionEditorTitle,
-      bannerText: context.l10n.settingsCollectionBrowsingQuickActionEditorBanner,
-      allAvailableActions: EntrySetActions.browsing,
-      actionIcon: (action) => action.getIcon(),
-      actionText: (context, action) => action.getText(context),
-      load: () => settings.collectionBrowsingQuickActions.toList(),
-      save: (actions) => settings.collectionBrowsingQuickActions = actions,
-    );
-  }
-}

lib/widgets/settings/thumbnails/collection_actions_editor.dart

@@ -0,0 +1,81 @@
+import 'package:aves/model/actions/entry_set_actions.dart';
+import 'package:aves/model/settings/settings.dart';
+import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
+import 'package:aves/widgets/settings/common/quick_actions/editor_page.dart';
+import 'package:flutter/material.dart';
+import 'package:tuple/tuple.dart';
+
+class CollectionActionsTile extends StatelessWidget {
+  const CollectionActionsTile({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      title: Text(context.l10n.settingsCollectionQuickActionsTile),
+      onTap: () {
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            settings: const RouteSettings(name: CollectionActionEditorPage.routeName),
+            builder: (context) => const CollectionActionEditorPage(),
+          ),
+        );
+      },
+    );
+  }
+}
+
+class CollectionActionEditorPage extends StatelessWidget {
+  static const routeName = '/settings/collection_actions';
+
+  const CollectionActionEditorPage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    final tabs = <Tuple2<Tab, Widget>>[
+      Tuple2(
+        Tab(text: l10n.settingsCollectionQuickActionTabBrowsing),
+        QuickActionEditorBody<EntrySetAction>(
+          bannerText: context.l10n.settingsCollectionBrowsingQuickActionEditorBanner,
+          allAvailableActions: EntrySetActions.browsing,
+          actionIcon: (action) => action.getIcon(),
+          actionText: (context, action) => action.getText(context),
+          load: () => settings.collectionBrowsingQuickActions.toList(),
+          save: (actions) => settings.collectionBrowsingQuickActions = actions,
+        ),
+      ),
+      Tuple2(
+        Tab(text: l10n.settingsCollectionQuickActionTabSelecting),
+        QuickActionEditorBody<EntrySetAction>(
+          bannerText: context.l10n.settingsCollectionSelectionQuickActionEditorBanner,
+          allAvailableActions: EntrySetActions.selection,
+          actionIcon: (action) => action.getIcon(),
+          actionText: (context, action) => action.getText(context),
+          load: () => settings.collectionSelectionQuickActions.toList(),
+          save: (actions) => settings.collectionSelectionQuickActions = actions,
+        ),
+      ),
+    ];
+
+    return MediaQueryDataProvider(
+      child: DefaultTabController(
+        length: tabs.length,
+        child: Scaffold(
+          appBar: AppBar(
+            title: Text(context.l10n.settingsCollectionQuickActionEditorTitle),
+            bottom: TabBar(
+              tabs: tabs.map((t) => t.item1).toList(),
+            ),
+          ),
+          body: SafeArea(
+            child: TabBarView(
+              children: tabs.map((t) => t.item2).toList(),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/settings/thumbnails/selection_actions_editor.dart

@@ -1,44 +0,0 @@
-import 'package:aves/model/actions/entry_set_actions.dart';
-import 'package:aves/model/settings/settings.dart';
-import 'package:aves/widgets/common/extensions/build_context.dart';
-import 'package:aves/widgets/settings/common/quick_actions/editor_page.dart';
-import 'package:flutter/material.dart';
-
-class SelectionActionsTile extends StatelessWidget {
-  const SelectionActionsTile({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      title: Text(context.l10n.settingsCollectionSelectionQuickActionsTile),
-      onTap: () {
-        Navigator.push(
-          context,
-          MaterialPageRoute(
-            settings: const RouteSettings(name: SelectionActionEditorPage.routeName),
-            builder: (context) => const SelectionActionEditorPage(),
-          ),
-        );
-      },
-    );
-  }
-}
-
-class SelectionActionEditorPage extends StatelessWidget {
-  static const routeName = '/settings/collection_selection_actions';
-
-  const SelectionActionEditorPage({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return QuickActionEditorPage<EntrySetAction>(
-      title: context.l10n.settingsCollectionSelectionQuickActionEditorTitle,
-      bannerText: context.l10n.settingsCollectionSelectionQuickActionEditorBanner,
-      allAvailableActions: EntrySetActions.selection,
-      actionIcon: (action) => action.getIcon(),
-      actionText: (context, action) => action.getText(context),
-      load: () => settings.collectionSelectionQuickActions.toList(),
-      save: (actions) => settings.collectionSelectionQuickActions = actions,
-    );
-  }
-}

lib/widgets/settings/thumbnails/thumbnails.dart

@@ -6,8 +6,7 @@ import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/common/identity/aves_icons.dart';
 import 'package:aves/widgets/settings/common/tile_leading.dart';
-import 'package:aves/widgets/settings/thumbnails/browsing_actions_editor.dart';
+import 'package:aves/widgets/settings/thumbnails/collection_actions_editor.dart';
-import 'package:aves/widgets/settings/thumbnails/selection_actions_editor.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -38,8 +37,7 @@ class ThumbnailsSection extends StatelessWidget {
       expandedNotifier: expandedNotifier,
       showHighlight: false,
       children: [
-        const BrowsingActionsTile(),
+        const CollectionActionsTile(),
-        const SelectionActionsTile(),
         SwitchListTile(
           value: currentShowThumbnailLocation,
           onChanged: (v) => settings.showThumbnailLocation = v,

untranslated.json

@@ -3,11 +3,8 @@
     "unsupportedTypeDialogTitle",
     "unsupportedTypeDialogMessage",
     "editEntryDateDialogExtractFromTitle",
-    "collectionActionEdit",
+    "settingsCollectionQuickActionTabBrowsing",
-    "collectionEditFailureFeedback",
+    "settingsCollectionQuickActionTabSelecting",
-    "collectionEditSuccessFeedback",
-    "settingsCollectionBrowsingQuickActionsTile",
-    "settingsCollectionBrowsingQuickActionEditorTitle",
     "settingsCollectionBrowsingQuickActionEditorBanner",
     "settingsAllowInstalledAppAccess",
     "settingsAllowInstalledAppAccessSubtitle"
@@ -23,8 +20,8 @@
     "collectionActionEdit",
     "collectionEditFailureFeedback",
     "collectionEditSuccessFeedback",
-    "settingsCollectionBrowsingQuickActionsTile",
+    "settingsCollectionQuickActionTabBrowsing",
-    "settingsCollectionBrowsingQuickActionEditorTitle",
+    "settingsCollectionQuickActionTabSelecting",
     "settingsCollectionBrowsingQuickActionEditorBanner",
     "settingsAllowInstalledAppAccess",
     "settingsAllowInstalledAppAccessSubtitle"