From 675ad1e9a69278ca43046e2cb2c15811766c8fde Mon Sep 17 00:00:00 2001
From: antonio <antoniocappiello.play@gmail.com>
Date: Sun, 4 Jun 2023 18:55:46 +0200
Subject: [PATCH] fix: modified the behavior of long clicks on folders,
 directories and files

---
 .../play/interfaces/ClickCallback.java              |  6 ------
 .../play/ui/adapter/MusicDirectoryAdapter.java      | 13 +------------
 .../play/ui/adapter/MusicFolderAdapter.java         | 12 +-----------
 .../play/ui/adapter/MusicIndexAdapter.java          | 13 +------------
 .../play/ui/fragment/DirectoryFragment.java         |  5 -----
 .../play/ui/fragment/IndexFragment.java             |  5 -----
 .../play/ui/fragment/LibraryFragment.java           |  5 -----
 app/src/main/res/drawable/ic_navigate_next.xml      | 10 ++++++++++
 .../res/layout/item_library_music_directory.xml     |  6 +++---
 .../main/res/layout/item_library_music_folder.xml   |  7 +++----
 .../main/res/layout/item_library_music_index.xml    |  6 +++---
 11 files changed, 22 insertions(+), 66 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_navigate_next.xml

diff --git a/app/src/main/java/com/cappielloantonio/play/interfaces/ClickCallback.java b/app/src/main/java/com/cappielloantonio/play/interfaces/ClickCallback.java
index 99c8abf0..664d43d6 100644
--- a/app/src/main/java/com/cappielloantonio/play/interfaces/ClickCallback.java
+++ b/app/src/main/java/com/cappielloantonio/play/interfaces/ClickCallback.java
@@ -42,13 +42,7 @@ public interface ClickCallback {
 
     default void onMusicFolderClick(Bundle bundle) {}
 
-    default void onMusicFolderLongClick(Bundle bundle) {}
-
     default void onMusicDirectoryClick(Bundle bundle) {}
 
-    default void onMusicDirectoryLongClick(Bundle bundle) {}
-
     default void onMusicIndexClick(Bundle bundle) {}
-
-    default void onMusicIndexLongClick(Bundle bundle) {}
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicDirectoryAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicDirectoryAdapter.java
index 614da24c..d9778721 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicDirectoryAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicDirectoryAdapter.java
@@ -69,9 +69,7 @@ public class MusicDirectoryAdapter extends RecyclerView.Adapter<MusicDirectoryAd
             item.musicDirectoryTitleTextView.setSelected(true);
 
             itemView.setOnClickListener(v -> onClick());
-            itemView.setOnLongClickListener(v -> onLongClick());
-
-            item.musicDirectoryMoreButton.setOnClickListener(v -> onLongClick());
+            item.musicDirectoryMoreButton.setOnClickListener(v -> onClick());
         }
 
         public void onClick() {
@@ -86,14 +84,5 @@ public class MusicDirectoryAdapter extends RecyclerView.Adapter<MusicDirectoryAd
                 click.onMediaClick(bundle);
             }
         }
-
-        private boolean onLongClick() {
-            Bundle bundle = new Bundle();
-            bundle.putParcelable(Constants.MUSIC_DIRECTORY_OBJECT, children.get(getBindingAdapterPosition()));
-
-            click.onMusicDirectoryLongClick(bundle);
-
-            return true;
-        }
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicFolderAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicFolderAdapter.java
index 523c246f..cddbdaa4 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicFolderAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicFolderAdapter.java
@@ -72,9 +72,8 @@ public class MusicFolderAdapter extends RecyclerView.Adapter<MusicFolderAdapter.
             item.musicFolderTitleTextView.setSelected(true);
 
             itemView.setOnClickListener(v -> onClick());
-            itemView.setOnLongClickListener(v -> onLongClick());
 
-            item.musicFolderMoreButton.setOnClickListener(v -> onLongClick());
+            item.musicFolderMoreButton.setOnClickListener(v -> onClick());
         }
 
         public void onClick() {
@@ -82,14 +81,5 @@ public class MusicFolderAdapter extends RecyclerView.Adapter<MusicFolderAdapter.
             bundle.putParcelable(Constants.MUSIC_FOLDER_OBJECT, musicFolders.get(getBindingAdapterPosition()));
             click.onMusicFolderClick(bundle);
         }
-
-        private boolean onLongClick() {
-            Bundle bundle = new Bundle();
-            bundle.putParcelable(Constants.MUSIC_FOLDER_OBJECT, musicFolders.get(getBindingAdapterPosition()));
-
-            click.onMusicFolderLongClick(bundle);
-
-            return true;
-        }
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicIndexAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicIndexAdapter.java
index 4555bda7..509a46d1 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicIndexAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/MusicIndexAdapter.java
@@ -68,9 +68,7 @@ public class MusicIndexAdapter extends RecyclerView.Adapter<MusicIndexAdapter.Vi
             item.musicIndexTitleTextView.setSelected(true);
 
             itemView.setOnClickListener(v -> onClick());
-            itemView.setOnLongClickListener(v -> onLongClick());
-
-            item.musicIndexMoreButton.setOnClickListener(v -> onLongClick());
+            item.musicIndexMoreButton.setOnClickListener(v -> onClick());
         }
 
         public void onClick() {
@@ -78,14 +76,5 @@ public class MusicIndexAdapter extends RecyclerView.Adapter<MusicIndexAdapter.Vi
             bundle.putParcelable(Constants.MUSIC_INDEX_OBJECT, artists.get(getBindingAdapterPosition()));
             click.onMusicIndexClick(bundle);
         }
-
-        private boolean onLongClick() {
-            Bundle bundle = new Bundle();
-            bundle.putParcelable(Constants.MUSIC_INDEX_OBJECT, artists.get(getBindingAdapterPosition()));
-
-            click.onMusicIndexLongClick(bundle);
-
-            return true;
-        }
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DirectoryFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DirectoryFragment.java
index 7453fc44..1a31c5df 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DirectoryFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DirectoryFragment.java
@@ -170,9 +170,4 @@ public class DirectoryFragment extends Fragment implements ClickCallback {
             directoryViewModel.setMusicDirectoryName(child.getTitle());
         }
     }
-
-    @Override
-    public void onMusicDirectoryLongClick(Bundle bundle) {
-        Toast.makeText(requireContext(), "Long click!", Toast.LENGTH_SHORT).show();
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/IndexFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/IndexFragment.java
index eb6699ac..f83237b7 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/IndexFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/IndexFragment.java
@@ -103,9 +103,4 @@ public class IndexFragment extends Fragment implements ClickCallback {
     public void onMusicIndexClick(Bundle bundle) {
         Navigation.findNavController(requireView()).navigate(R.id.directoryFragment, bundle);
     }
-
-    @Override
-    public void onMusicIndexLongClick(Bundle bundle) {
-        Toast.makeText(requireContext(), "Long click!", Toast.LENGTH_SHORT).show();
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
index fb582bf4..23e78511 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
@@ -307,9 +307,4 @@ public class LibraryFragment extends Fragment implements ClickCallback {
     public void onMusicFolderClick(Bundle bundle) {
         Navigation.findNavController(requireView()).navigate(R.id.indexFragment, bundle);
     }
-
-    @Override
-    public void onMusicFolderLongClick(Bundle bundle) {
-        Toast.makeText(requireContext(), "Long click!", Toast.LENGTH_SHORT).show();
-    }
 }
diff --git a/app/src/main/res/drawable/ic_navigate_next.xml b/app/src/main/res/drawable/ic_navigate_next.xml
new file mode 100644
index 00000000..56c0ca8d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate_next.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:autoMirrored="true">
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M376,720L320,664L504,480L320,296L376,240L616,480L376,720Z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_library_music_directory.xml b/app/src/main/res/layout/item_library_music_directory.xml
index 27245359..e35b8e82 100644
--- a/app/src/main/res/layout/item_library_music_directory.xml
+++ b/app/src/main/res/layout/item_library_music_directory.xml
@@ -44,11 +44,11 @@
 
     <ImageView
         android:id="@+id/music_directory_more_button"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
-        android:background="@drawable/ic_more_vert"
+        android:background="@drawable/ic_navigate_next"
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
         app:layout_constraintBottom_toBottomOf="@id/music_directory_title_text_view"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_library_music_folder.xml b/app/src/main/res/layout/item_library_music_folder.xml
index bf79d584..7af395c1 100644
--- a/app/src/main/res/layout/item_library_music_folder.xml
+++ b/app/src/main/res/layout/item_library_music_folder.xml
@@ -2,7 +2,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
     android:clipChildren="false"
     android:orientation="horizontal">
 
@@ -40,11 +39,11 @@
 
     <ImageView
         android:id="@+id/music_folder_more_button"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
-        android:background="@drawable/ic_more_vert"
+        android:background="@drawable/ic_navigate_next"
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
         app:layout_constraintBottom_toBottomOf="@id/music_folder_title_text_view"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_library_music_index.xml b/app/src/main/res/layout/item_library_music_index.xml
index 01c9c38a..cb1a0e42 100644
--- a/app/src/main/res/layout/item_library_music_index.xml
+++ b/app/src/main/res/layout/item_library_music_index.xml
@@ -44,11 +44,11 @@
 
     <ImageView
         android:id="@+id/music_index_more_button"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
-        android:background="@drawable/ic_more_vert"
+        android:background="@drawable/ic_navigate_next"
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
         app:layout_constraintBottom_toBottomOf="@id/music_index_title_text_view"
         app:layout_constraintEnd_toEndOf="parent"