* New : Minor changes

app/src/main/java/com/sahdeepsingh/Bop/Activities/PlayingNowList.java

@@ -28,7 +28,7 @@
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.sahdeepsingh.Bop.Adapters.AdapterSong;
+import com.sahdeepsingh.Bop.Adapters.CurrentPlayListSongsAdapter;
 import com.sahdeepsingh.Bop.R;
 import com.sahdeepsingh.Bop.playerMain.Main;
 
@@ -108,7 +108,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mPlaylistName = findViewById(R.id.name);
 
         songListView.setLayoutManager(new LinearLayoutManager(this));
-        songListView.setAdapter(new AdapterSong(Main.nowPlayingList));
+        songListView.setAdapter(new CurrentPlayListSongsAdapter(Main.nowPlayingList));
 
 
         if ((getIntent().getExtras() != null && getIntent().getExtras().containsKey("playlistname")) || !Main.mainMenuHasNowPlayingItem) {
@@ -208,7 +208,7 @@ private void updateMediaDescription(MediaDescriptionCompat description) {
             return;
         }
         //mLine1.setText(description.getTitle());
-        songListView.setAdapter(new AdapterSong(Main.nowPlayingList));
+        songListView.setAdapter(new CurrentPlayListSongsAdapter(Main.nowPlayingList));
         songListView.scrollToPosition(Main.musicService.currentSongPosition);
         mTitleView.setText(description.getTitle());
         mTitleView.setSelected(true);

app/src/main/java/com/sahdeepsingh/Bop/Adapters/AlbumRecyclerViewAdapter.java

@@ -1,9 +1,7 @@
 package com.sahdeepsingh.Bop.Adapters;
 
-import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,7 +15,6 @@
 import com.sahdeepsingh.Bop.utils.utils;
 import com.squareup.picasso.Picasso;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,7 +23,7 @@
 
 public class AlbumRecyclerViewAdapter extends RecyclerView.Adapter<AlbumRecyclerViewAdapter.ViewHolder> {
 
-    private final List<String> mValues;
+    private List<String> mValues;
 
     public AlbumRecyclerViewAdapter(List<String> items) {
         mValues = items;
@@ -62,6 +59,9 @@ public void onClick(View v) {
         });
     }
 
+    public void updateData(List<String> items) {
+        this.mValues = items;
+    }
     @Override
     public int getItemCount() {
         return mValues.size();

app/src/main/java/com/sahdeepsingh/Bop/Adapters/ArtistRecyclerViewAdapter.java

@@ -1,9 +1,7 @@
 package com.sahdeepsingh.Bop.Adapters;
 
-import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,7 +15,6 @@
 import com.sahdeepsingh.Bop.utils.utils;
 import com.squareup.picasso.Picasso;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,6 +58,9 @@ public void onClick(View v) {
         });
     }
 
+    public void updateData(List<String> items) {
+        this.mValues = items;
+    }
 
     @Override
     public int getItemCount() {

app/src/main/java/com/sahdeepsingh/Bop/Adapters/AdapterSong.java → app/src/main/java/com/sahdeepsingh/Bop/Adapters/CurrentPlayListSongsAdapter.java

@@ -13,7 +13,6 @@
 import com.sahdeepsingh.Bop.utils.utils;
 import com.squareup.picasso.Picasso;
 
-import java.io.File;
 import java.util.List;
 
 import androidx.annotation.NonNull;
@@ -30,11 +29,11 @@
  * We'll map the ArrayList from our MainActivity into
  * multiple Artist/Title fields inside our activity_main Layout.
  */
-public class AdapterSong extends RecyclerView.Adapter<AdapterSong.ViewHolder> {
+public class CurrentPlayListSongsAdapter extends RecyclerView.Adapter<CurrentPlayListSongsAdapter.ViewHolder> {
 
     private final List<Song> mValues;
 
-    public AdapterSong(List<Song> items) {
+    public CurrentPlayListSongsAdapter(List<Song> items) {
         mValues = items;
     }
 
@@ -112,12 +111,12 @@ public int getItemCount() {
     }
 
     public class ViewHolder extends RecyclerView.ViewHolder {
-        final View mView;
         public final TextView songName;
         public final TextView songBy;
+        final View mView;
+        final CircleImageView circleImageView;
         barVisuals barVisuals;
         ImageView songOptions;
-        final CircleImageView circleImageView;
 
         ViewHolder(View view) {
             super(view);

app/src/main/java/com/sahdeepsingh/Bop/Adapters/GenreRecyclerViewAdapter.java

@@ -1,9 +1,7 @@
 package com.sahdeepsingh.Bop.Adapters;
 
-import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,7 +15,6 @@
 import com.sahdeepsingh.Bop.utils.utils;
 import com.squareup.picasso.Picasso;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,7 +24,7 @@
 
 public class GenreRecyclerViewAdapter extends RecyclerView.Adapter<GenreRecyclerViewAdapter.ViewHolder> {
 
-    private final List<String> mValues;
+    private List<String> mValues;
 
     public GenreRecyclerViewAdapter(List<String> items) {
         mValues = items;
@@ -63,6 +60,10 @@ public void onClick(View v) {
         });
     }
 
+    public void updateData(List<String> items) {
+        this.mValues = items;
+    }
+
     @Override
     public int getItemCount() {
         return mValues.size();

app/src/main/java/com/sahdeepsingh/Bop/Adapters/PlaylistRecyclerViewAdapter.java

@@ -23,7 +23,6 @@
 import com.sahdeepsingh.Bop.utils.utils;
 import com.squareup.picasso.Picasso;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,7 +31,7 @@
 
 public class PlaylistRecyclerViewAdapter extends RecyclerView.Adapter<PlaylistRecyclerViewAdapter.ViewHolder> {
 
-    private final List<String> playlists;
+    private List<String> playlists;
     private RecyclerView mRecyclerView;
     private int anyExpanded = -1;
     private ViewHolder expandedViewholder;
@@ -159,6 +158,10 @@ public void onClick(DialogInterface dialog, int which) {
 
     }
 
+    public void UpdateData(List<String> items) {
+        this.playlists = items;
+    }
+
     @Override
     public int getItemCount() {
         if ((playlists != null) && (!playlists.isEmpty()))

app/src/main/java/com/sahdeepsingh/Bop/Adapters/SongsRecyclerViewAdapter.java

@@ -1,13 +1,9 @@
 package com.sahdeepsingh.Bop.Adapters;
 
-import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.net.Uri;
-import android.provider.MediaStore;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,8 +17,6 @@
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 import com.squareup.picasso.Picasso;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,7 +26,7 @@
 
 public class SongsRecyclerViewAdapter extends RecyclerView.Adapter<SongsRecyclerViewAdapter.ViewHolder> implements FastScrollRecyclerView.SectionedAdapter {
 
-    private final List<Song> songs;
+    private List<Song> songs;
     private List<Song> selected = new ArrayList<>();
     private OnClickAction receiver;
 
@@ -195,6 +189,9 @@ public void setActionModeReceiver(OnClickAction receiver) {
         this.receiver = receiver;
     }
 
+    public void updateData(List<Song> list) {
+        this.songs = list;
+    }
     public List<Song> getSelected() {
         return selected;
     }

app/src/main/java/com/sahdeepsingh/Bop/SongData/Data.java

@@ -284,6 +284,12 @@ public void updatePlaylists(Context context, String fromWhere) {
             cursor2.close();
         }
 
+        Collections.sort(playlists, new Comparator<Playlist>() {
+            public int compare(Playlist a, Playlist b) {
+                return a.getName().compareTo(b.getName());
+            }
+        });
+
     }
 
     public void updateGenres(Context context, String fromWhere) {

app/src/main/java/com/sahdeepsingh/Bop/fragments/FragmentAlbum.java

@@ -26,7 +26,7 @@
 
 public class FragmentAlbum extends Fragment {
 
-    AlbumRecyclerViewAdapter mfilteredAdapter;
+    AlbumRecyclerViewAdapter albumRecyclerViewAdapter;
     EditText search;
     List<String> filtered = new ArrayList<>();
     LinearLayout noData;
@@ -55,16 +55,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         Context context = view.getContext();
         RecyclerView recyclerView = view.findViewById(R.id.list);
-            recyclerView.setLayoutManager(new GridLayoutManager(context, 2)); //can change to create grid layout
-            ArrayList<String> albums = Main.songs.getAlbums();
-            AlbumRecyclerViewAdapter albumRecyclerViewAdapter = new AlbumRecyclerViewAdapter(albums);
-            recyclerView.setAdapter(albumRecyclerViewAdapter);
+        recyclerView.setLayoutManager(new GridLayoutManager(context, 2)); //can change to create grid layout
+        ArrayList<String> albums = Main.songs.getAlbums();
+        albumRecyclerViewAdapter = new AlbumRecyclerViewAdapter(albums);
+        recyclerView.setAdapter(albumRecyclerViewAdapter);
         RVUtils.makenoDataVisible(recyclerView, noData);
 
         swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                recyclerView.setAdapter(new AlbumRecyclerViewAdapter(albums));
+                albumRecyclerViewAdapter.updateData(albums);
+                albumRecyclerViewAdapter.notifyDataSetChanged();
                 RVUtils.makenoDataVisible(recyclerView, noData);
                 swipeRefreshLayout.setRefreshing(false);
             }
@@ -93,9 +94,8 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                     }
                 recyclerView.setLayoutManager(new GridLayoutManager(context, 2));
                 Collections.sort(filtered, String::compareToIgnoreCase);
-                mfilteredAdapter = new AlbumRecyclerViewAdapter(filtered);
-                recyclerView.setAdapter(mfilteredAdapter);
-                mfilteredAdapter.notifyDataSetChanged();
+                albumRecyclerViewAdapter.updateData(filtered);
+                albumRecyclerViewAdapter.notifyDataSetChanged();
                 RVUtils.makenoDataVisible(recyclerView, noData);
 
             }

app/src/main/java/com/sahdeepsingh/Bop/fragments/FragmentArtist.java

@@ -30,8 +30,9 @@
  */
 public class FragmentArtist extends Fragment {
 
-    ArtistRecyclerViewAdapter mfilteredAdapter;
+    ArtistRecyclerViewAdapter artistRecyclerViewAdapter;
     EditText search;
+    ArrayList<String> artists = Main.songs.getArtists();
     List<String> filtered = new ArrayList<>();
     LinearLayout noData;
     SwipeRefreshLayout swipeRefreshLayout;
@@ -53,16 +54,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         Context context = view.getContext();
         RecyclerView recyclerView = view.findViewById(R.id.list);
         recyclerView.setLayoutManager(new GridLayoutManager(context, 2)); //can change to create grid layout
-        ArrayList<String> artists = Main.songs.getArtists();
         Collections.sort(artists);
-        ArtistRecyclerViewAdapter artistRecyclerViewAdapter = new ArtistRecyclerViewAdapter(artists);
+        artistRecyclerViewAdapter = new ArtistRecyclerViewAdapter(artists);
         recyclerView.setAdapter(artistRecyclerViewAdapter);
         RVUtils.makenoDataVisible(recyclerView, noData);
 
         swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                recyclerView.setAdapter(new ArtistRecyclerViewAdapter(artists));
+                artistRecyclerViewAdapter.updateData(artists);
+                artistRecyclerViewAdapter.notifyDataSetChanged();
                 RVUtils.makenoDataVisible(recyclerView, noData);
                 swipeRefreshLayout.setRefreshing(false);
             }
@@ -90,11 +91,9 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                     }
                 recyclerView.setLayoutManager(new GridLayoutManager(context, 2));
                 Collections.sort(filtered, String::compareToIgnoreCase);
-                mfilteredAdapter = new ArtistRecyclerViewAdapter(filtered);
-                recyclerView.setAdapter(mfilteredAdapter);
-                mfilteredAdapter.notifyDataSetChanged();
+                artistRecyclerViewAdapter.updateData(filtered);
+                artistRecyclerViewAdapter.notifyDataSetChanged();
                 RVUtils.makenoDataVisible(recyclerView, noData);
-
             }
 
             @Override

app/src/main/java/com/sahdeepsingh/Bop/fragments/FragmentGenre.java

@@ -26,7 +26,7 @@
 
 public class FragmentGenre extends Fragment {
 
-    GenreRecyclerViewAdapter mfilteredAdapter;
+    GenreRecyclerViewAdapter genreRecyclerViewAdapter;
     EditText search;
     List<String> filtered = new ArrayList<>();
     LinearLayout noData;
@@ -59,17 +59,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         recyclerView = view.findViewById(R.id.list);
         recyclerView.setLayoutManager(new GridLayoutManager(context, 2));
         Collections.sort(genres);
-        GenreRecyclerViewAdapter myGenreRecyclerViewAdapter = new GenreRecyclerViewAdapter(genres);
-        recyclerView.setAdapter(myGenreRecyclerViewAdapter);
+        genreRecyclerViewAdapter = new GenreRecyclerViewAdapter(genres);
+        recyclerView.setAdapter(genreRecyclerViewAdapter);
         RVUtils.makenoDataVisible(recyclerView, noData);
 
         swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                recyclerView.setAdapter(new GenreRecyclerViewAdapter(genres));
+                genreRecyclerViewAdapter.updateData(genres);
+                genreRecyclerViewAdapter.notifyDataSetChanged();
                 RVUtils.makenoDataVisible(recyclerView, noData);
                 swipeRefreshLayout.setRefreshing(false);
-
             }
         });
         search = view.findViewById(R.id.searchGenre);
@@ -95,12 +95,9 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                     }
                 recyclerView.setLayoutManager(new GridLayoutManager(context, 2));
                 Collections.sort(filtered, String::compareToIgnoreCase);
-                mfilteredAdapter = new GenreRecyclerViewAdapter(filtered);
-                recyclerView.setAdapter(mfilteredAdapter);
-                mfilteredAdapter.notifyDataSetChanged();
+                genreRecyclerViewAdapter.updateData(filtered);
+                genreRecyclerViewAdapter.notifyDataSetChanged();
                 RVUtils.makenoDataVisible(recyclerView, noData);
-
-
             }
 
             @Override

app/src/main/java/com/sahdeepsingh/Bop/fragments/FragmentPlaylist.java

@@ -26,7 +26,7 @@
 
 public class FragmentPlaylist extends Fragment {
 
-    PlaylistRecyclerViewAdapter mfilteredAdapter;
+    PlaylistRecyclerViewAdapter playlistRecyclerViewAdapter;
     LinearLayout noData;
     SwipeRefreshLayout refreshLayout;
     RecyclerView recyclerView;
@@ -52,7 +52,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         Context context = view.getContext();
         recyclerView = view.findViewById(R.id.list);
         recyclerView.setLayoutManager(new GridLayoutManager(context, 1));
-        recyclerView.setAdapter(new PlaylistRecyclerViewAdapter(getPlaylists()));
+        playlistRecyclerViewAdapter = new PlaylistRecyclerViewAdapter(getPlaylists());
+        recyclerView.setAdapter(playlistRecyclerViewAdapter);
         RVUtils.makenoDataVisible(recyclerView, noData);
         ArrayList<String> filtered = new ArrayList<>(getPlaylists());
         EditText search = view.findViewById(R.id.searchPlaylist);
@@ -78,9 +79,11 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                     }
                 recyclerView.setLayoutManager(new LinearLayoutManager(context));
                 Collections.sort(filtered, String::compareToIgnoreCase);
-                mfilteredAdapter = new PlaylistRecyclerViewAdapter(filtered);
+                playlistRecyclerViewAdapter.UpdateData(filtered);
+                playlistRecyclerViewAdapter.notifyDataSetChanged();
+                /*mfilteredAdapter = new PlaylistRecyclerViewAdapter(filtered);
                 recyclerView.setAdapter(mfilteredAdapter);
-                mfilteredAdapter.notifyDataSetChanged();
+                mfilteredAdapter.notifyDataSetChanged();*/
                 RVUtils.makenoDataVisible(recyclerView, noData);
 
             }
@@ -103,7 +106,8 @@ public void onRefresh() {
 
     private void refreshPlaylists() {
         Main.songs.updatePlaylists(getActivity(), "external");
-        recyclerView.setAdapter(new PlaylistRecyclerViewAdapter(getPlaylists()));
+        playlistRecyclerViewAdapter.UpdateData(getPlaylists());
+        playlistRecyclerViewAdapter.notifyDataSetChanged();
         RVUtils.makenoDataVisible(recyclerView, noData);
         refreshLayout.setRefreshing(false);
     }

app/src/main/java/com/sahdeepsingh/Bop/fragments/FragmentSongs.java

@@ -126,16 +126,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         noData = view.findViewById(R.id.noData);
         floatingActionButton = view.findViewById(R.id.fabplayAll);
         swipeRefreshLayout = view.findViewById(R.id.refreshSongs);
-
-
-        // Set the adapter
-            Context context = view.getContext();
+        Context context = view.getContext();
         recyclerView = view.findViewById(R.id.list);
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
         songsRecyclerViewAdapter = new SongsRecyclerViewAdapter(Main.songs.songs);
         songsRecyclerViewAdapter.setActionModeReceiver(this);
         songsRecyclerViewAdapter.setHasStableIds(true);
-        //recyclerView properties for fast scrolling but doesn't work much
         recyclerView.setHasFixedSize(true);
         recyclerView.setItemViewCacheSize(20);
         recyclerView.setDrawingCacheEnabled(true);
@@ -150,10 +146,9 @@ public void onRefresh() {
                     actionMode.finish();
 
                 Main.songs.songs.clear();
-                songsRecyclerViewAdapter = new SongsRecyclerViewAdapter(Main.songs.songs);
                 Main.songs.updateSongs(getActivity(), "external");
-                songsRecyclerViewAdapter.setActionModeReceiver(FragmentSongs.this);
-                recyclerView.setAdapter(songsRecyclerViewAdapter);
+                songsRecyclerViewAdapter.updateData(Main.songs.songs);
+                songsRecyclerViewAdapter.notifyDataSetChanged();
                 RVUtils.makenoDataVisible(recyclerView, noData);
                 swipeRefreshLayout.setRefreshing(false);
 
@@ -181,11 +176,9 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                     }
                 recyclerView.setLayoutManager(new LinearLayoutManager(context));
                 Collections.sort(filtered, (u1, t1) -> u1.getTitle().compareToIgnoreCase(t1.getTitle()));
-                songsRecyclerViewAdapter = new SongsRecyclerViewAdapter(filtered);
-                recyclerView.setAdapter(songsRecyclerViewAdapter);
+                songsRecyclerViewAdapter.updateData(filtered);
                 songsRecyclerViewAdapter.notifyDataSetChanged();
                 RVUtils.makenoDataVisible(recyclerView, noData);
-
             }
 
             @Override