fix: Dynamically change sorting options for each status, properly handle each option

Author: k12onoss

lib/logic/cubit/books_tab_index_cubit.dart

@@ -0,0 +1,7 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class BooksTabIndexCubit extends Cubit<int> {
+  BooksTabIndexCubit() : super(0);
+
+  void setTabIndex(int index) => emit(index);
+}

lib/main.dart

@@ -24,6 +24,7 @@ import 'package:openreads/logic/bloc/theme_bloc/theme_bloc.dart';
 import 'package:openreads/logic/bloc/welcome_bloc/welcome_bloc.dart';
 import 'package:openreads/logic/cubit/book_cubit.dart';
 import 'package:openreads/logic/cubit/book_lists_order_cubit.dart';
+import 'package:openreads/logic/cubit/books_tab_index_cubit.dart';
 import 'package:openreads/logic/cubit/current_book_cubit.dart';
 import 'package:openreads/logic/cubit/default_book_status_cubit.dart';
 import 'package:openreads/logic/cubit/default_book_tags_cubit.dart';
@@ -91,6 +92,7 @@ class App extends StatelessWidget {
       BlocProvider(create: (_) => ThemeBloc()),
       BlocProvider(create: (_) => DisplayBloc()),
       BlocProvider(create: (_) => SortBloc()),
+      BlocProvider(create: (_) => BooksTabIndexCubit()),
       BlocProvider(create: (_) => WelcomeBloc()),
       BlocProvider(create: (_) => RatingTypeBloc()),
       BlocProvider(create: (_) => MigrationV1ToV2Bloc()),

lib/ui/books_screen/books_screen.dart

@@ -23,8 +23,6 @@ class BooksScreen extends StatefulWidget {
 
 class _BooksScreenState extends State<BooksScreen>
     with AutomaticKeepAliveClientMixin, TickerProviderStateMixin {
-  int _booksTabIndex = 0;
-
   late TabController _tabController;
   late ScrollController _chipScrollController;
 
@@ -114,6 +112,15 @@ class _BooksScreenState extends State<BooksScreen>
       case SortType.byStartDate:
         list = _sortByStartDate(list: list, isAsc: state.isAsc);
         break;
+      case SortType.byPublicationYear:
+        list = _sortByPublicationYear(list: list, isAsc: state.isAsc);
+        break;
+      case SortType.byDateAdded:
+        list = _sortByDateAdded(list: list, isAsc: state.isAsc);
+        break;
+      case SortType.byDateModified:
+        list = _sortByDateModified(list: list, isAsc: state.isAsc);
+        break;
       default:
         list = _sortByTitle(list: list, isAsc: state.isAsc);
     }
@@ -142,10 +149,62 @@ class _BooksScreenState extends State<BooksScreen>
       case SortType.byAuthor:
         list = _sortByAuthor(list: list, isAsc: state.isAsc);
         break;
+      case SortType.byPages:
+        list = _sortByPages(list: list, isAsc: state.isAsc);
+        break;
+      case SortType.byPublicationYear:
+        list = _sortByPublicationYear(list: list, isAsc: state.isAsc);
+        break;
+      case SortType.byDateAdded:
+        list = _sortByDateAdded(list: list, isAsc: state.isAsc);
+        break;
+      case SortType.byDateModified:
+        list = _sortByDateModified(list: list, isAsc: state.isAsc);
+        break;
+
+      default:
+        list = _sortByTitle(list: list, isAsc: state.isAsc);
+    }
+
+    return list;
+  }
 
+  List<Book> _sortUnfinishedList({
+    required SetSortState state,
+    required List<Book> list,
+  }) {
+    if (state.tags != null) {
+      list = _filterTags(
+        list: list,
+        tags: state.tags!,
+        filterTagsAsAnd: state.filterTagsAsAnd,
+        filterOutSelectedTags: state.filterOutTags,
+      );
+    }
+
+    if (state.bookType != null) {
+      list = _filterOutBookTypes(list, state.bookType!);
+    }
+
+    switch (state.sortType) {
+      case SortType.byAuthor:
+        list = _sortByAuthor(list: list, isAsc: state.isAsc);
+        break;
       case SortType.byPages:
         list = _sortByPages(list: list, isAsc: state.isAsc);
         break;
+      case SortType.byStartDate:
+        list = _sortByStartDate(list: list, isAsc: state.isAsc);
+        break;
+      case SortType.byPublicationYear:
+        list = _sortByPublicationYear(list: list, isAsc: state.isAsc);
+        break;
+      case SortType.byDateAdded:
+        list = _sortByDateAdded(list: list, isAsc: state.isAsc);
+        break;
+      case SortType.byDateModified:
+        list = _sortByDateModified(list: list, isAsc: state.isAsc);
+        break;
       default:
         list = _sortByTitle(list: list, isAsc: state.isAsc);
     }
@@ -669,14 +728,6 @@ class _BooksScreenState extends State<BooksScreen>
     return booksWithPublicationDate + booksWithoutPublicationDate;
   }
 
-  _changeTab(int index) {
-    setState(() {
-      _booksTabIndex = index;
-    });
-
-    _tabController.index = index;
-  }
-
   @override
   bool get wantKeepAlive => true;
 
@@ -747,11 +798,10 @@ class _BooksScreenState extends State<BooksScreen>
   StreamBuilder<List<Book>> _buildUnfinishedBooksTabView() {
     bookCubit.getUnfinishedBooks();
 
-    //TODO: sort unfinished book by date of modification
     return _buildBooksTabView(
       listNumber: 3,
       stream: bookCubit.unfinishedBooks,
-      sorting: null,
+      sorting: _sortUnfinishedList,
     );
   }
 
@@ -830,36 +880,28 @@ class _BooksScreenState extends State<BooksScreen>
       switch (status) {
         case BookStatus.read:
           tabChips.add(BooksTabChip(
-            selected: _booksTabIndex == index,
             index: index,
-            changeTab: _changeTab,
             tabController: _tabController,
             title: LocaleKeys.books_finished.tr(),
           ));
           break;
         case BookStatus.inProgress:
           tabChips.add(BooksTabChip(
-            selected: _booksTabIndex == index,
             index: index,
-            changeTab: _changeTab,
             tabController: _tabController,
             title: LocaleKeys.books_in_progress.tr(),
           ));
           break;
         case BookStatus.forLater:
           tabChips.add(BooksTabChip(
-            selected: _booksTabIndex == index,
             index: index,
-            changeTab: _changeTab,
             tabController: _tabController,
             title: LocaleKeys.books_for_later.tr(),
           ));
           break;
         case BookStatus.unfinished:
           tabChips.add(BooksTabChip(
-            selected: _booksTabIndex == index,
             index: index,
-            changeTab: _changeTab,
             tabController: _tabController,
             title: LocaleKeys.books_unfinished.tr(),
           ));

lib/ui/books_screen/widgets/book_tag_chip.dart

@@ -1,18 +1,16 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:openreads/logic/cubit/books_tab_index_cubit.dart';
 
 class BooksTabChip extends StatefulWidget {
   const BooksTabChip({
     super.key,
-    required this.selected,
     required this.index,
-    required this.changeTab,
     required this.tabController,
     required this.title,
   });
 
-  final bool selected;
   final int index;
-  final Function(int) changeTab;
   final TabController tabController;
   final String title;
 
@@ -44,14 +42,20 @@ class _BookTabChipState extends State<BooksTabChip> {
   Widget build(BuildContext context) {
     return Padding(
       padding: const EdgeInsets.fromLTRB(8, 0, 0, 0),
-      child: FilterChip(
-        selected: widget.selected,
-        label: Text(widget.title),
-        visualDensity: VisualDensity.compact,
-        showCheckmark: false,
-        onSelected: (bool _) {
-          _scrollToChip(widget.index, context);
-          widget.changeTab(widget.index);
+      child: BlocBuilder<BooksTabIndexCubit, int>(
+        builder: (context, tabIndex) {
+          return FilterChip(
+            selected: tabIndex == widget.index,
+            label: Text(widget.title),
+            visualDensity: VisualDensity.compact,
+            showCheckmark: false,
+            onSelected: (bool _) {
+              _scrollToChip(widget.index, context);
+              BlocProvider.of<BooksTabIndexCubit>(context)
+                  .setTabIndex(widget.index);
+              widget.tabController.index = widget.index;
+            },
+          );
         },
       ),
     );