Merge pull request #49 from AP-Atul/feat/auto-play-configure

Add option to configure auto-play
ap-atul · Aug 28, 2023 · 9a6eb6f · 9a6eb6f
2 parents a3b0069 + 1d187d9
commit 9a6eb6f
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -11,10 +11,10 @@
 ### Download
 
 | Lite                                                                                                                                                                                               | Online                                                                                                                                                                                   |
-| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Github release v0.15](https://github.com/AP-Atul/music_player_lite/releases/download/v0.15/mplite.apk)                                                                                              | [Github release v0.3](https://github.com/AP-Atul/music_player_lite/releases/download/v0.3/mplite_online.apk)                                                                             |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [Github release](https://github.com/AP-Atul/music_player_lite/releases/latest)                                                                                                                     | [Github release v0.3](https://github.com/AP-Atul/music_player_lite/releases/download/v0.3/mplite_online.apk)                                                                             |
 | <a href="https://apt.izzysoft.de/fdroid/index/apk/com.atul.musicplayer"><img src="https://github.com/AP-Atul/music_player_lite/raw/main/assets/IzzyOnDroid.png" width="200px"></a>                 | <a href="https://apt.izzysoft.de/fdroid/index/apk/com.atul.musicplayeronline"><img src="https://github.com/AP-Atul/music_player_lite/raw/main/assets/IzzyOnDroid.png" width="200px"></a> |
-<a href="https://f-droid.org/packages/com.atul.musicplayer/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" width="200px"></a> |
+ <a href="https://f-droid.org/packages/com.atul.musicplayer/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" width="200px"></a>                                                    |
 | <a href="https://play.google.com/store/apps/details?id=com.atul.musicplayer"><img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" width="200px"></a> |                                                                                                                                                                                          |
 
 ### Community

diff --git a/src/app/build.gradle b/src/app/build.gradle
@@ -11,17 +11,15 @@ android {
             keyPassword 'musicplayerlite'
         }
     }
-    compileSdkVersion 33
+    compileSdk 33
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.atul.musicplayer"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 15
-        versionName "0.15"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        versionCode 16
+        versionName "0.16"
     }
 
     buildTypes {

diff --git a/src/app/src/androidTest/java/com/atul/musicplayer/ExampleInstrumentedTest.java b/src/app/src/androidTest/java/com/atul/musicplayer/ExampleInstrumentedTest.java
diff --git a/src/app/src/main/java/com/atul/musicplayer/MPConstants.java b/src/app/src/main/java/com/atul/musicplayer/MPConstants.java
@@ -36,6 +36,7 @@ public class MPConstants {
     };
     public static final String SETTINGS_THEME = "shared_pref_theme";
     public static final String SETTINGS_ALBUM_REQUEST = "shared_pref_album_request";
+    public static final String SETTINGS_AUTO_PLAY = "shared_pref_auto_play_music";
     public static final String SETTINGS_THEME_MODE = "shared_pref_theme_mode";
     public static final String SETTINGS_EXCLUDED_FOLDER = "shared_pref_excluded_folders";
     public static final String EXCLUDED_FOLDER_SEPARATOR = ":::";

diff --git a/src/app/src/main/java/com/atul/musicplayer/MPPreferences.java b/src/app/src/main/java/com/atul/musicplayer/MPPreferences.java
@@ -35,10 +35,18 @@ public static void storeAlbumRequest(Context context, boolean val) {
         getEditor(context).putBoolean(MPConstants.SETTINGS_ALBUM_REQUEST, val).apply();
     }
 
+    public static void storeAutoPlay(Context context, boolean val) {
+        getEditor(context).putBoolean(MPConstants.SETTINGS_AUTO_PLAY, val).apply();
+    }
+
     public static boolean getAlbumRequest(Context context) {
         return getSharedPref(context).getBoolean(MPConstants.SETTINGS_ALBUM_REQUEST, false);
     }
 
+    public static boolean getAutoPlay(Context context) {
+        return getSharedPref(context).getBoolean(MPConstants.SETTINGS_AUTO_PLAY, true);
+    }
+
     public static void storeThemeMode(Context context, int theme) {
         getEditor(context).putInt(MPConstants.SETTINGS_THEME_MODE, theme).apply();
     }

diff --git a/src/app/src/main/java/com/atul/musicplayer/adapter/SongsAdapter.java b/src/app/src/main/java/com/atul/musicplayer/adapter/SongsAdapter.java
@@ -89,9 +89,15 @@ public MyViewHolder(@NonNull View itemView) {
             songName = itemView.findViewById(R.id.song_name);
             albumName = itemView.findViewById(R.id.song_album);
 
+
             itemView.findViewById(R.id.root_layout).setOnClickListener(v -> {
                     List<Music> toPlay = new ArrayList<>();
-                    toPlay.add(musicList.get(getAdapterPosition()));
+                    boolean autoPlay = MPPreferences.getAutoPlay(itemView.getContext());
+                    if (autoPlay) {
+                        toPlay.addAll(musicList.subList(getAdapterPosition(), musicList.size()));
+                    } else {
+                        toPlay.add(musicList.get(getAdapterPosition()));
+                    }
                     listener.playQueue(toPlay, false);
                 }
             );

diff --git a/src/app/src/main/java/com/atul/musicplayer/fragments/SettingsFragment.java b/src/app/src/main/java/com/atul/musicplayer/fragments/SettingsFragment.java
@@ -35,6 +35,7 @@ public class SettingsFragment extends Fragment implements View.OnClickListener {
     private MainViewModel viewModel;
     private RecyclerView accentView;
     private boolean state;
+    private boolean autoPlayState;
     private LinearLayout chipLayout;
     private ImageView currentThemeMode;
 
@@ -43,6 +44,7 @@ public class SettingsFragment extends Fragment implements View.OnClickListener {
     private FolderDialog folderDialog;
 
     public SettingsFragment() {
+        // Unused
     }
 
     public static SettingsFragment newInstance() {
@@ -69,6 +71,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         });
 
         SwitchMaterial switchMaterial = view.findViewById(R.id.album_switch);
+        SwitchMaterial autoPlaySwitch = view.findViewById(R.id.auto_play_switch);
         accentView = view.findViewById(R.id.accent_view);
         chipLayout = view.findViewById(R.id.chip_layout);
         currentThemeMode = view.findViewById(R.id.current_theme_mode);
@@ -81,7 +84,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         LinearLayout refreshOption = view.findViewById(R.id.refresh_options);
 
         state = MPPreferences.getAlbumRequest(requireActivity().getApplicationContext());
+        autoPlayState = MPPreferences.getAutoPlay(requireActivity().getApplicationContext());
         switchMaterial.setChecked(state);
+        autoPlaySwitch.setChecked(autoPlayState);
         setCurrentThemeMode();
 
         accentView.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.HORIZONTAL, false));
@@ -90,6 +95,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         accentOption.setOnClickListener(this);
         albumOption.setOnClickListener(this);
         switchMaterial.setOnClickListener(this);
+        autoPlaySwitch.setOnClickListener(this);
         themeModeOption.setOnClickListener(this);
         folderOption.setOnClickListener(this);
         refreshOption.setOnClickListener(this);
@@ -149,6 +155,9 @@ public void onClick(View v) {
         else if (id == R.id.album_switch)
             setAlbumRequest();
 
+        else if (id == R.id.auto_play_switch)
+            setAutoPlay();
+
         else if (id == R.id.theme_mode_option) {
             int mode = chipLayout.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE;
             chipLayout.setVisibility(mode);
@@ -204,6 +213,10 @@ private void setAlbumRequest() {
         ThemeHelper.applySettings(getActivity());
     }
 
+    private void setAutoPlay() {
+        MPPreferences.storeAutoPlay(requireActivity().getApplicationContext(), (!autoPlayState));
+    }
+
     private void setUpRateReview() {
         startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(MPConstants.PLAY_STORE_LINK)));
     }

diff --git a/src/app/src/main/java/com/atul/musicplayer/player/PlayerManager.java b/src/app/src/main/java/com/atul/musicplayer/player/PlayerManager.java
@@ -223,7 +223,15 @@ public void onCompletion(MediaPlayer mp) {
     @Override
     public void onPrepared(MediaPlayer mp) {
         mp.start();
-        playerService.startForeground(NOTIFICATION_ID, notificationManager.createNotification());
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                playerService.startForeground(NOTIFICATION_ID, notificationManager.createNotification(), ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
+            } else {
+                playerService.startForeground(NOTIFICATION_ID, notificationManager.createNotification());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
         for (PlayerListener listener : playerListeners)
             listener.onMusicSet(playerQueue.getCurrentMusic());

diff --git a/src/app/src/main/java/com/atul/musicplayer/player/PlayerNotificationManager.java b/src/app/src/main/java/com/atul/musicplayer/player/PlayerNotificationManager.java
@@ -81,7 +81,6 @@ public Notification createNotification() {
         notificationBuilder
                 .setContentTitle(song.title)
                 .setContentText(song.artist)
-                .setProgress(100, playerService.getPlayerManager().getCurrentPosition(), true)
                 .setColor(MusicLibraryHelper.getDominantColorFromThumbnail(albumArt))
                 .setLargeIcon(albumArt)
                 .setStyle(notificationStyle);
@@ -124,21 +123,13 @@ public void updateNotification() {
 
     @NonNull
     private NotificationCompat.Action notificationAction(@NonNull final String action) {
-        int icon = R.drawable.ic_controls_pause;
-
-        switch (action) {
-            case PREV_ACTION:
-                icon = R.drawable.ic_controls_prev;
-                break;
-            case PLAY_PAUSE_ACTION:
-                icon = playerService.getPlayerManager().isPlaying() ? R.drawable.ic_controls_pause : R.drawable.ic_controls_play;
-                break;
-            case NEXT_ACTION:
-                icon = R.drawable.ic_controls_next;
-                break;
-            default:
-                break;
-        }
+        int icon = -1;
+        if (action.equals(PREV_ACTION)) icon = R.drawable.ic_controls_prev;
+        else if (action.equals(NEXT_ACTION)) icon = R.drawable.ic_controls_next;
+        else if (action.equals(PLAY_PAUSE_ACTION)) icon =
+                playerService.getPlayerManager().isPlaying()
+                        ? R.drawable.ic_controls_pause
+                        : R.drawable.ic_controls_play;
         return new NotificationCompat.Action.Builder(icon, action, playerAction(action)).build();
     }
 

diff --git a/src/app/src/main/res/layout/fragment_settings.xml b/src/app/src/main/res/layout/fragment_settings.xml
@@ -43,7 +43,7 @@
                 android:id="@+id/theme_mode_option"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="10dp"
                 android:background="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -129,7 +129,6 @@
                 android:id="@+id/accent_option"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
                 android:background="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -183,7 +182,6 @@
                 android:id="@+id/album_options"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
                 android:background="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -236,7 +234,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
+                android:layout_marginTop="20dp"
                 android:fontFamily="@font/nunito_sans_semibold"
                 android:text="@string/general"
                 android:textColor="?colorPrimary"
@@ -248,7 +246,7 @@
                 android:id="@+id/folder_options"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="10dp"
                 android:background="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -295,7 +293,6 @@
                 android:id="@+id/refresh_options"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
                 android:background="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -338,11 +335,63 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/play_next_song_options"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:contentDescription="@string/image"
+                    android:src="@drawable/ic_music_queue"
+                    app:tint="?colorPrimary" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="10dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:fontFamily="@font/nunito_sans"
+                        android:text="@string/auto_play_next_songs"
+                        android:textColor="@color/colorTextHigh"
+                        android:textSize="@dimen/text_big" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:fontFamily="@font/nunito_sans"
+                        android:text="@string/auto_play_summary"
+                        android:textColor="@color/colorTextMed"
+                        android:textSize="@dimen/text_big_med" />
+
+                </LinearLayout>
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/auto_play_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:checked="false" />
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/review_options"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
                 android:background="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"

diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml
@@ -47,6 +47,8 @@
     <string name="cancel">Cancel</string>
     <string name="view_pager_title">Main page</string>
     <string name="tab_layout_title">Bottom horizontal menu</string>
+    <string name="auto_play_next_songs">Auto play the song list</string>
+    <string name="auto_play_summary">when enabled, will play the song list automatically</string>
 
 
 </resources>
diff --git a/src/app/src/test/java/com/atul/musicplayer/ExampleUnitTest.java b/src/app/src/test/java/com/atul/musicplayer/ExampleUnitTest.java