moved view to beta

Author: Vito0912

.github/workflows/build.yml

@@ -113,7 +113,6 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: 3.27.1
 
       - name: Install Flutter dependencies
         run: flutter pub get
@@ -180,7 +179,6 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: 3.27.1
 
       - name: Extract version from pubspec.yaml
         id: extract_version
@@ -252,7 +250,6 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: 3.27.1
 
       - name: Install Flutter dependencies
         run: flutter pub get

.gitignore

@@ -45,3 +45,6 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+md/build/.last_build_id
+/android/app/.cxx/

lib/features/home/home.dart

@@ -111,6 +111,12 @@ class Home extends HookConsumerWidget {
                     context.push('/offlineProgress');
                   },
                 ),
+                PopupMenuOption(
+                  label: S.of(context).playlists,
+                  onTap: (PopupMenuOption option) {
+                    context.push('/list-view');
+                  },
+                ),
                 PopupMenuOption(
                     label: S.of(context).addUser,
                     onTap: (PopupMenuOption option) {
@@ -143,7 +149,10 @@ class Home extends HookConsumerWidget {
                     search: previousSort?.search ?? '',
                     filter: previousSort?.filter,
                     filterKey: previousSort?.filterKey,
-                    sort: previousSort?.sort ?? (index == 2 ? 'name' : null),
+                    sort: previousSort?.sort ??
+                        ((index == 2 && currentLibrary?.mediaType == 'book')
+                            ? 'name'
+                            : null),
                     desc: previousSort?.desc ?? 0,
                     previous: [
                       ...?sortList.state.previous?.where((LibrarySort sort) {
@@ -194,13 +203,6 @@ class Home extends HookConsumerWidget {
               ),
               label: S.of(context).series,
             ),
-          BottomNavigationBarItem(
-            icon: Icon(
-              Icons.list_alt,
-              color: Theme.of(context).colorScheme.onSurface,
-            ),
-            label: 'Lists',
-          ),
         ],
         tabsBackgroundColor: Theme.of(context).colorScheme.surface,
       ),

lib/features/library/list/collection_view.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:abs_flutter/api/list/response/collection_response.dart';
 import 'package:abs_flutter/features/library/item_components/item_series.dart';
 import 'package:abs_flutter/models/library_preview_item.dart';
@@ -75,7 +77,9 @@ class _CollectionViewState extends ConsumerState<CollectionView> {
               name: currentSeries.name,
             );
 
-            return MultiItem('/collection-view/${currentSeries.id}',
+            String base64Id = Uri.encodeComponent(base64.encode(utf8.encode(currentSeries.id)));
+
+            return MultiItem('/collection-view/$base64Id',
                 series: seriesItem);
           },
         );

lib/features/library/list/list_view.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:abs_flutter/api/library_items/library_item.dart';
 import 'package:abs_flutter/api/list/collection.dart';
 import 'package:abs_flutter/api/list/playlist.dart';
@@ -26,14 +28,16 @@ class ListsItemView extends ConsumerWidget {
       return Center(child: Text('Error: ${items.error}'));
     }
 
+    final String decodedId = utf8.decode(base64.decode(id));
+
     final List<LibraryItem> libraryItems = [];
     String title = '';
     if (type == ListViewType.collection) {
-      final Collection? collection = items.getCollectionById(id);
+      final Collection? collection = items.getCollectionById(decodedId);
       libraryItems.addAll(collection?.items ?? []);
       title = collection?.name ?? '';
     } else {
-      final Playlist? playlist = items.getPlaylistById(id);
+      final Playlist? playlist = items.getPlaylistById(decodedId);
       libraryItems.addAll(playlist?.items
               ?.map((e) => e.libraryItem)
               .where((element) => element != null)

lib/features/library/list/playlist_view.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:abs_flutter/api/list/response/playlist_response.dart';
 import 'package:abs_flutter/features/library/item_components/item_series.dart';
 import 'package:abs_flutter/models/library_preview_item.dart';
@@ -84,7 +86,9 @@ class _PlaylistViewState extends ConsumerState<PlaylistView> {
               name: currentSeries.name,
             );
 
-            return MultiItem('/playlist-view/${currentSeries.id}',
+            String base64Id = Uri.encodeComponent(base64.encode(utf8.encode(currentSeries.id)));
+
+            return MultiItem('/playlist-view/$base64Id',
                 series: seriesItem);
           },
         );

lib/features/library/list_items.dart

@@ -17,6 +17,12 @@ class TabBarWidget extends ConsumerWidget {
           title: TabBar(
             indicatorSize: TabBarIndicatorSize.tab,
             padding: EdgeInsets.zero,
+            indicator: BoxDecoration(
+                borderRadius: BorderRadius.only(
+                    topLeft: Radius.circular(10),
+                    topRight: Radius.circular(10)),
+            color: Theme.of(context).colorScheme.surfaceContainer,
+            ),
             tabs: [
               Tab(text: S.of(context).collections),
               Tab(text: S.of(context).playlists),

lib/features/library/series/series_view.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:abs_flutter/features/library/item_components/item_series.dart';
 import 'package:abs_flutter/models/library_preview_item.dart';
 import 'package:abs_flutter/models/library_series_preview.dart';
@@ -158,8 +160,11 @@ class _SeriesViewState extends ConsumerState<SeriesView> {
                     name: currentSeries.name,
                   );
 
+                  String base64Id = Uri.encodeComponent(base64.encode(utf8.encode(currentSeries.id)));
+                  String base64Name = Uri.encodeComponent(base64.encode(utf8.encode(currentSeries.name)));
+
                   return MultiItem(
-                      '/series-view/${seriesItem.name}/${seriesItem.id}',
+                      '/series-view/$base64Name/$base64Id',
                       series: seriesItem);
                 },
               );

lib/features/library/series/single_series_view.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:abs_flutter/features/library/item_components/item_series.dart';
 import 'package:abs_flutter/features/library/item_components/library_item_widget.dart';
 import 'package:abs_flutter/features/library/notch/notch_content.dart';
@@ -32,9 +34,12 @@ class _SingleSeriesViewState extends ConsumerState<SingleSeriesView> {
 
   @override
   void initState() {
+    String? decodedSeriesId = widget.seriesId != null
+        ? utf8.decode(base64.decode(widget.seriesId!))
+        : null;
     _sort = LibrarySort(
       index: 3,
-      filter: widget.seriesId,
+      filter: decodedSeriesId,
       filterKey: 'series',
       sort: 'sequence',
       desc: (ref.read(settingsProvider)[Constants.SORT_SERIES_ASC]) ? 1 : 0,
@@ -86,14 +91,22 @@ class _SingleSeriesViewState extends ConsumerState<SingleSeriesView> {
   Widget build(BuildContext context) {
     final series = ref.watch(libraryItemsWithSortProvider(_sort));
 
+    // Convert base64 encoded series name to a readable format
+    String? decodedSeriesName = widget.seriesName != null
+        ? utf8.decode(base64.decode(widget.seriesName!))
+        : null;
+    String? decodedSeriesId = widget.seriesId != null
+        ? utf8.decode(base64.decode(widget.seriesId!))
+        : null;
+
     if (series == null) return const Center(child: CircularProgressIndicator());
     if (series.filterBy == null ||
         series.filterBy!.isEmpty ||
         !series.filterBy!.contains('series.')) {
       return PlatformScaffold(
           appBar: PlatformAppBar(
             title: PlatformText(
-                widget.seriesName ?? series.items.first.seriesName ?? ''),
+                decodedSeriesName ?? series.items.first.seriesName ?? ''),
           ),
           body: Center(child: PlatformText(S.of(context).noSeriesSelected)));
     }
@@ -102,9 +115,9 @@ class _SingleSeriesViewState extends ConsumerState<SingleSeriesView> {
         books: series.items,
         total: series.total,
         page: series.page,
-        id: widget.seriesId ?? '',
+        id: decodedSeriesId ?? '',
         libraryId: '',
-        name: widget.seriesName ?? series.items.first.seriesName ?? '');
+        name: decodedSeriesName ?? series.items.first.seriesName ?? '');
 
     const double screenWidth = 800;