Fix settings button visible on insertion settings page (#90)

* Fix playlist settings button not hiding on settings page * Add some tests for playlist add items selection route * Convert 1 based index of insertSongsInPlaylist to 0 base
nt4f04uNd · May 8, 2023 · 5db7929 · 5db7929
1 parent 9f4574b
commit 5db7929
Show file tree

Hide file tree

Showing 8 changed files with 301 additions and 33 deletions.
diff --git a/lib/routes/home_route/persistent_queue_route.dart b/lib/routes/home_route/persistent_queue_route.dart
@@ -242,12 +242,9 @@ class _PersistentQueueRouteState extends State<PersistentQueueRoute> with Select
       onSubmit: (entries) {
         int index;
         if (selectedSong == null) {
-          index = 1;
+          index = 0;
         } else {
-          index = songs.indexOf(selectedSong!) + 2;
-          if (index <= 0) {
-            index = 1;
-          }
+          index = songs.indexOf(selectedSong!) + 1;
         }
         ContentControl.instance.insertSongsInPlaylist(
           index: index,

diff --git a/lib/routes/home_route/player_route.dart b/lib/routes/home_route/player_route.dart
@@ -1102,7 +1102,7 @@ class _SaveQueueAsPlaylistActionState extends State<_SaveQueueAsPlaylistAction>
       bool success = false;
       try {
         await ContentControl.instance.insertSongsInPlaylist(
-          index: 1,
+          index: 0,
           songs: songs,
           playlist: playlist,
         );

diff --git a/lib/routes/selection_route.dart b/lib/routes/selection_route.dart
@@ -17,7 +17,6 @@ class _SelectionRouteState extends State<SelectionRoute> {
   late final HomeRouter nestedHomeRouter = HomeRouter.selection(widget.selectionArguments);
   late final ContentSelectionController controller;
   late ChildBackButtonDispatcher _backButtonDispatcher;
-  bool settingsOpened = false;
 
   @override
   void didChangeDependencies() {
@@ -29,38 +28,41 @@ class _SelectionRouteState extends State<SelectionRoute> {
   @override
   void initState() {
     super.initState();
+    var settingsOpened = false;
     controller = ContentSelectionController.createAlwaysInSelection(
       context: context,
       actionsBuilder: (context) {
         final l10n = getl10n(context);
         final settingsPageBuilder = widget.selectionArguments.settingsPageBuilder;
         return [
           if (settingsPageBuilder != null)
-            AnimatedSwitcher(
-              duration: const Duration(milliseconds: 240),
-              switchInCurve: Curves.easeOutCubic,
-              switchOutCurve: Curves.easeInCubic,
-              child: settingsOpened
-                  ? const SizedBox.shrink()
-                  : NFIconButton(
-                      icon: const Icon(Icons.settings_rounded),
-                      onPressed: () async {
-                        if (!settingsOpened) {
-                          setState(() {
-                            settingsOpened = true;
-                          });
-                          await nestedHomeRouter.navigatorKey.currentState!.push(StackFadeRouteTransition(
-                            child: Builder(builder: (context) => settingsPageBuilder(context)),
-                            transitionSettings: AppRouter.instance.transitionSettings.greyDismissible,
-                          ));
-                          if (mounted) {
+            StatefulBuilder(
+              builder: (context, setState) => AnimatedSwitcher(
+                duration: const Duration(milliseconds: 240),
+                switchInCurve: Curves.easeOutCubic,
+                switchOutCurve: Curves.easeInCubic,
+                child: settingsOpened
+                    ? const SizedBox.shrink()
+                    : NFIconButton(
+                        icon: const Icon(Icons.settings_rounded),
+                        onPressed: () async {
+                          if (!settingsOpened) {
                             setState(() {
-                              settingsOpened = false;
+                              settingsOpened = true;
                             });
+                            await nestedHomeRouter.navigatorKey.currentState!.push(StackFadeRouteTransition(
+                              child: Builder(builder: (context) => settingsPageBuilder(context)),
+                              transitionSettings: AppRouter.instance.transitionSettings.greyDismissible,
+                            ));
+                            if (mounted) {
+                              setState(() {
+                                settingsOpened = false;
+                              });
+                            }
                           }
-                        }
-                      },
-                    ),
+                        },
+                      ),
+              ),
             ),
           const SizedBox(width: 6.0),
           AnimatedBuilder(

diff --git a/lib/widgets/selection.dart b/lib/widgets/selection.dart
@@ -1741,7 +1741,7 @@ class _AddToPlaylistSelectionAction extends StatelessWidget {
                 onItemTap: (index) {
                   final playlist = playlists[index];
                   ContentControl.instance.insertSongsInPlaylist(
-                    index: playlist.length + 1,
+                    index: playlist.length,
                     songs: ContentUtils.flatten(ContentUtils.selectionPackAndSort(controller.data).merged),
                     playlist: playlist,
                   );

diff --git a/sweyer_plugin/android/src/main/java/com/nt4f04und/sweyer/sweyer_plugin/SweyerPlugin.java b/sweyer_plugin/android/src/main/java/com/nt4f04und/sweyer/sweyer_plugin/SweyerPlugin.java
@@ -413,7 +413,8 @@ public void onMethodCall(@NonNull MethodCall call, @NotNull MethodChannel.Result
                                 );
                                 values.put(
                                         MediaStore.Audio.Playlists.Members.PLAY_ORDER,
-                                        i + index
+                                        // Play order is one based, so add 1 to the zero based index.
+                                        i + index + 1
                                 );
                                 valuesList.add(values);
                             }

diff --git a/sweyer_plugin/lib/sweyer_plugin.dart b/sweyer_plugin/lib/sweyer_plugin.dart
@@ -130,7 +130,7 @@ class SweyerPlugin {
     required PlatformPlaylist playlist,
   }) {
     assert(songs.isNotEmpty);
-    assert(index >= 0 && index <= playlist.songIds.length + 1);
+    assert(index >= 0 && index <= playlist.songIds.length);
     return SweyerPluginPlatform.instance.insertSongsInPlaylist(
       index: index,
       songIds: songs.map((song) => song.sourceId).toList(),

diff --git a/test/fakes/fake_sweyer_plugin_platform.dart b/test/fakes/fake_sweyer_plugin_platform.dart
@@ -59,7 +59,10 @@ class FakeSweyerPluginPlatform extends SweyerPluginPlatform {
     required int index,
     required List<int> songIds,
     required int playlistId,
-  }) async {}
+  }) async {
+    final playlist = playlists!.firstWhere((playlist) => playlist.id == playlistId);
+    playlist.songIds.insertAll(index, songIds);
+  }
 
   @override
   Future<bool> isIntentActionView() async {