Merge pull request #96 from Vito0912/feat/seriesSorting

Vito0912 · web-flow · commit c85e7147ca60 · 2024-11-22T21:32:03.000+01:00
Series sorting and fixed caching
diff --git a/lib/features/home/home.dart b/lib/features/home/home.dart
@@ -62,13 +62,18 @@ class Home extends HookConsumerWidget {
             ],
             if (MediaQuery.of(context).size.width >= 900 &&
                 (currentIndex.value == 0 || currentIndex.value == 2)) ...[
-              const Expanded(
+              Expanded(
                   flex: 3,
                   child: Padding(
-                    padding: EdgeInsets.only(left: 16),
+                    padding: const EdgeInsets.only(left: 16),
                     child: Padding(
-                        padding: EdgeInsets.symmetric(horizontal: 32),
-                        child: Center(child: NotchContent())),
+                        padding: const EdgeInsets.symmetric(horizontal: 32),
+                        child: Center(
+                            child: NotchContent(
+                          disableFilter: currentIndex.value == 2,
+                          sortKeys:
+                              currentIndex.value == 2 ? seriesSortKeys : null,
+                        ))),
                   ))
             ]
           ],
@@ -142,6 +147,7 @@ class Home extends HookConsumerWidget {
                     search: previousSort?.search ?? '',
                     filter: previousSort?.filter,
                     filterKey: previousSort?.filterKey,
+                    sort: previousSort?.sort ?? (index == 2 ? 'name' : null),
                     previous: [
                   ...?sortList.previous?.where((LibrarySort sort) {
                     return sort.index != index;
diff --git a/lib/features/library/item_components/item_series.dart b/lib/features/library/item_components/item_series.dart
@@ -5,7 +5,6 @@ import 'package:abs_api/abs_api.dart';
 import 'package:abs_flutter/features/library/item_components/top_label.dart';
 import 'package:abs_flutter/generated/l10n.dart';
 import 'package:abs_flutter/models/library_series_preview.dart';
-import 'package:abs_flutter/provider/library_items_provider.dart';
 import 'package:abs_flutter/provider/progress_provider.dart';
 import 'package:abs_flutter/provider/settings_provider.dart';
 import 'package:abs_flutter/util/constants.dart';
@@ -29,17 +28,7 @@ class ItemSeries extends ConsumerWidget {
       return InkWell(
         onTap: clickable
             ? () {
-                ref.read(libraryItemSearchProvider.notifier).state = ref
-                    .read(libraryItemSearchProvider.notifier)
-                    .state
-                    .copyWith(
-                        filterKey: 'series',
-                        filter: series.id,
-                        sort: 'sequence',
-                        desc:
-                            settings[Constants.SORT_SERIES_ASC] == true ? 1 : 0,
-                        search: '');
-                context.push('/series-view/${series.name}');
+                context.push('/series-view/${series.name}/${series.id}');
               }
             : null,
         child: Padding(
diff --git a/lib/features/library/library_items_wrapper.dart b/lib/features/library/library_items_wrapper.dart
@@ -11,7 +11,7 @@ class LibraryItemsWrapper extends StatelessWidget {
     return Stack(
       children: [
         const LibraryItems(),
-        if(MediaQuery.of(context).size.width < 900) const LibraryNotch(),
+        if (MediaQuery.of(context).size.width < 900) const LibraryNotch(),
       ],
     );
   }
diff --git a/lib/features/library/notch.dart b/lib/features/library/notch.dart
@@ -1,11 +1,15 @@
-
 import 'package:abs_flutter/features/library/notch/notch_content.dart';
 import 'package:flutter/material.dart';
 
-
-
 class LibraryNotch extends StatelessWidget {
-  const LibraryNotch({super.key});
+  final bool disableFilter;
+  final bool disableSearch;
+  final Map<String, String>? sortKeys;
+  const LibraryNotch(
+      {super.key,
+      this.disableFilter = false,
+      this.disableSearch = false,
+      this.sortKeys});
 
   @override
   Widget build(BuildContext context) {
@@ -24,10 +28,13 @@ class LibraryNotch extends StatelessWidget {
           bottomRight: Radius.circular(32.0),
         ),
       ),
-      child: const Padding(
-        padding: EdgeInsets.only(left: 8, right: 8, top: 8, bottom: 8),
-        child: NotchContent()
-      ),
+      child: Padding(
+          padding: const EdgeInsets.only(left: 8, right: 8, top: 8, bottom: 8),
+          child: NotchContent(
+            disableFilter: disableFilter,
+            disableSearch: disableSearch,
+            sortKeys: sortKeys,
+          )),
     );
   }
 }
diff --git a/lib/features/library/notch/notch_content.dart b/lib/features/library/notch/notch_content.dart
@@ -11,8 +11,12 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 class NotchContent extends ConsumerStatefulWidget {
   final bool disableFilter;
   final bool disableSearch;
+  final Map<String, String>? sortKeys;
   const NotchContent(
-      {super.key, this.disableFilter = false, this.disableSearch = false});
+      {super.key,
+      this.disableFilter = false,
+      this.disableSearch = false,
+      this.sortKeys});
 
   @override
   _NotchContentState createState() => _NotchContentState();
@@ -93,7 +97,9 @@ class _NotchContentState extends ConsumerState<NotchContent> {
                             },
                     ),
                   ),
-                  SortButton(),
+                  SortButton(
+                    overwriteSortOptions: widget.sortKeys,
+                  ),
                   if (!widget.disableFilter) const FilterButton(),
                   if (librarySort.search == null ||
                       librarySort.search!.isNotEmpty)
diff --git a/lib/features/library/notch/sort_button.dart b/lib/features/library/notch/sort_button.dart
@@ -7,17 +7,20 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 class SortButton extends ConsumerWidget {
-  SortButton({super.key});
-
-  final Map<String, String> sortOptions = {
-    "media.metadata.title": S.current.title,
-    "media.metadata.seriesName": S.current.series,
-    "media.metadata.authorName": S.current.author,
-    "media.metadata.publisher": S.current.publisher,
-    "media.metadata.language": S.current.language,
-    "media.duration": S.current.duration,
-    "sequence": S.current.sequence,
-  };
+  final Map<String, String>? overwriteSortOptions;
+  late final Map<String, String> sortOptions;
+  SortButton({super.key, this.overwriteSortOptions}) {
+    sortOptions = overwriteSortOptions ??
+        {
+          "media.metadata.title": S.current.title,
+          "media.metadata.seriesName": S.current.series,
+          "media.metadata.authorName": S.current.author,
+          "media.metadata.publisher": S.current.publisher,
+          "media.metadata.language": S.current.language,
+          "media.duration": S.current.duration,
+          "sequence": S.current.sequence,
+        };
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -57,11 +60,19 @@ class SortButton extends ConsumerWidget {
               Navigator.of(context).pop();
             }
 
+            void onItemLongPress() {
+              sort.state = sort.state.copyWith(
+                sort: sortKey,
+                desc: isSelected ? (isDescending ? 1 : 0) : 1,
+              );
+              Navigator.of(context).pop();
+            }
+
             return PlatformWidget(
-              material: (_, __) => _buildMaterialListTile(
-                  sortValue, isSelected, isDescending, onItemTap),
-              cupertino: (_, __) => _buildCupertinoListTile(
-                  sortValue, isSelected, isDescending, onItemTap),
+              material: (_, __) => _buildMaterialListTile(sortValue, isSelected,
+                  isDescending, onItemTap, onItemLongPress),
+              cupertino: (_, __) => _buildCupertinoListTile(sortValue,
+                  isSelected, isDescending, onItemTap, onItemLongPress),
             );
           },
         );
@@ -70,55 +81,62 @@ class SortButton extends ConsumerWidget {
   }
 
   Widget _buildMaterialListTile(String sortValue, bool isSelected,
-      bool isDescending, VoidCallback onTap) {
-    return ListTile(
-      title: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(sortValue),
-          if (isSelected)
-            Row(
-              children: [
-                Tooltip(
-                    message: isDescending
-                        ? S.current.ascending
-                        : S.current.descending,
-                    child: Icon(isDescending
-                        ? Icons.arrow_upward
-                        : Icons.arrow_downward)),
-                const SizedBox(width: 8),
-                const Icon(Icons.check),
-              ],
-            ),
-        ],
+      bool isDescending, VoidCallback onTap, VoidCallback onLongPress) {
+    return GestureDetector(
+      onLongPress: onLongPress,
+      child: ListTile(
+        title: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(sortValue),
+            if (isSelected)
+              Row(
+                children: [
+                  Tooltip(
+                      message: isDescending
+                          ? S.current.ascending
+                          : S.current.descending,
+                      child: Icon(isDescending
+                          ? Icons.arrow_upward
+                          : Icons.arrow_downward)),
+                  const SizedBox(width: 8),
+                  const Icon(Icons.check),
+                ],
+              ),
+          ],
+        ),
+        onTap: onTap,
       ),
-      onTap: onTap,
     );
   }
 
   Widget _buildCupertinoListTile(String sortValue, bool isSelected,
-      bool isDescending, VoidCallback onTap) {
-    return CupertinoListTile(
-      title: Text(sortValue),
-      trailing: isSelected
-          ? Row(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Tooltip(
-                  message:
-                      isDescending ? S.current.ascending : S.current.descending,
-                  child: Icon(
-                      isDescending
-                          ? CupertinoIcons.arrow_up
-                          : CupertinoIcons.arrow_down,
-                      size: 16),
-                ),
-                const SizedBox(width: 8),
-                const Icon(CupertinoIcons.check_mark),
-              ],
-            )
-          : null,
-      onTap: onTap,
+      bool isDescending, VoidCallback onTap, VoidCallback onLongPress) {
+    return GestureDetector(
+      onLongPress: onLongPress,
+      child: CupertinoListTile(
+        title: Text(sortValue),
+        trailing: isSelected
+            ? Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Tooltip(
+                    message: isDescending
+                        ? S.current.ascending
+                        : S.current.descending,
+                    child: Icon(
+                        isDescending
+                            ? CupertinoIcons.arrow_up
+                            : CupertinoIcons.arrow_down,
+                        size: 16),
+                  ),
+                  const SizedBox(width: 8),
+                  const Icon(CupertinoIcons.check_mark),
+                ],
+              )
+            : null,
+        onTap: onTap,
+      ),
     );
   }
 }
diff --git a/lib/features/library/series/series_view_wrapper.dart b/lib/features/library/series/series_view_wrapper.dart
@@ -1,5 +1,6 @@
 import 'package:abs_flutter/features/library/notch.dart';
 import 'package:abs_flutter/features/library/series/series_view.dart';
+import 'package:abs_flutter/globals.dart';
 import 'package:flutter/material.dart';
 
 class SeriesViewWrapper extends StatelessWidget {
@@ -10,7 +11,8 @@ class SeriesViewWrapper extends StatelessWidget {
     return Stack(
       children: [
         const SeriesView(),
-        if (MediaQuery.of(context).size.width < 900) const LibraryNotch(),
+        if (MediaQuery.of(context).size.width < 900)
+          LibraryNotch(disableFilter: true, sortKeys: seriesSortKeys),
       ],
     );
   }
diff --git a/lib/features/library/series/single_series_view.dart b/lib/features/library/series/single_series_view.dart
@@ -41,8 +41,13 @@ class _SingleSeriesViewState extends ConsumerState<SingleSeriesView> {
                   sort: 'sequence',
                   desc: (ref.read(settingsProvider)[Constants.SORT_SERIES_ASC])
                       ? 1
-                      : 0);
+                      : 0,
+                  previous: [
+                ref.read(libraryItemSearchProvider).copyWith(previous: null),
+                ...?ref.read(libraryItemSearchProvider).previous
+              ]);
         }
+        print(ref.read(libraryItemSearchProvider));
       }
     });
 
@@ -122,11 +127,15 @@ class _SingleSeriesViewState extends ConsumerState<SingleSeriesView> {
             icon: const Icon(Icons.arrow_back),
             onPressed: () {
               // Reset filter on back
-              final sortNotifier = ref.read(libraryItemSearchProvider.notifier);
-              sortNotifier.state = sortNotifier.state.copyWith(
-                filter: null,
-                filterKey: null,
-              );
+              ref.read(libraryItemSearchProvider.notifier).state = ref
+                  .read(libraryItemSearchProvider)
+                  .previous!
+                  .first
+                  .copyWith(
+                      previous: ref
+                          .read(libraryItemSearchProvider)
+                          .previous
+                          ?.sublist(1));
               Navigator.pop(context);
             },
           )),
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -107,6 +107,7 @@ class MessageLookup extends MessageLookupByLibrary {
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "addANewUser": MessageLookupByLibrary.simpleMessage("Add a New User"),
         "addUser": MessageLookupByLibrary.simpleMessage("Add User"),
+        "added": MessageLookupByLibrary.simpleMessage("Added"),
         "aggressiveCaching":
             MessageLookupByLibrary.simpleMessage("Aggressive Caching"),
         "aggressiveCachingDescription": MessageLookupByLibrary.simpleMessage(
@@ -284,6 +285,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "If you want to use multiple server addresses, you can add them later"),
         "mustEnterValidAddress": MessageLookupByLibrary.simpleMessage(
             "You must enter a valid server address"),
+        "name": MessageLookupByLibrary.simpleMessage("Name"),
         "narrators": MessageLookupByLibrary.simpleMessage("Narrators"),
         "newestEpisodes":
             MessageLookupByLibrary.simpleMessage("Newest Episodes"),
@@ -305,6 +307,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "notificationHeading": MessageLookupByLibrary.simpleMessage(
             "Notifications should be enabled"),
         "numBooksInSeries": m30,
+        "numberOfBooks":
+            MessageLookupByLibrary.simpleMessage("Number of Books"),
         "offlineProgress":
             MessageLookupByLibrary.simpleMessage("Offline Progress"),
         "offlineSavedProgress":
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/globals.dart b/lib/globals.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
diff --git a/lib/util/interceptor/cache_interceptor.dart b/lib/util/interceptor/cache_interceptor.dart

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class LibraryItemsWrapper extends StatelessWidget {`
`11`	`11`	`return Stack(`
`12`	`12`	`children: [`
`13`	`13`	`const LibraryItems(),`
`14`		`- if(MediaQuery.of(context).size.width < 900) const LibraryNotch(),`
	`14`	`+ if (MediaQuery.of(context).size.width < 900) const LibraryNotch(),`
`15`	`15`	`],`
`16`	`16`	`);`
`17`	`17`	`}`