gradle: bump up code version

app/build.gradle

@@ -28,8 +28,8 @@ android {
         tempo {
             dimension "default"
             applicationId 'com.cappielloantonio.tempo'
-            versionCode 17
+            versionCode 18
-            versionName '3.5.2'
+            versionName '3.5.3'
         }
 
         notquitemy {

app/proguard-rules.pro

@@ -21,4 +21,5 @@
 #-renamesourcefileattribute SourceFile
 
 -keepattributes SourceFile, LineNumberTable
--keep public class * extends java.lang.Exception
+-keep public class * extends java.lang.Exception
+-keep class retrofit2.** { *; }

app/src/main/java/com/cappielloantonio/tempo/interfaces/PlaylistCallback.java

@@ -0,0 +1,8 @@
+package com.cappielloantonio.tempo.interfaces;
+
+import androidx.annotation.Keep;
+
+@Keep
+public interface PlaylistCallback {
+    default void onDismiss() {}
+}

app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java

@@ -95,12 +95,29 @@ public class PlaylistRepository {
                 .enqueue(new Callback<ApiResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        Log.d("PLAYLIST", response.toString());
+                        Log.d("createPlaylist", "onResponse: ");
                     }
 
                     @Override
                     public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-                        Log.d("PLAYLIST", t.toString());
+
+                    }
+                });
+    }
+
+    public void updatePlaylist(String playlistId, String name, ArrayList<String> songsId) {
+        App.getSubsonicClientInstance(false)
+                .getPlaylistClient()
+                .deletePlaylist(playlistId)
+                .enqueue(new Callback<ApiResponse>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                        createPlaylist(null, name, songsId);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+
                     }
                 });
     }

app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistChooserDialog.java

@@ -67,7 +67,7 @@ public class PlaylistChooserDialog extends DialogFragment implements ClickCallba
             Bundle bundle = new Bundle();
             bundle.putParcelable(Constants.TRACK_OBJECT, playlistChooserViewModel.getSongToAdd());
 
-            PlaylistEditorDialog dialog = new PlaylistEditorDialog();
+            PlaylistEditorDialog dialog = new PlaylistEditorDialog(null);
             dialog.setArguments(bundle);
             dialog.show(requireActivity().getSupportFragmentManager(), null);
 

app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java

@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.databinding.DialogPlaylistEditorBinding;
+import com.cappielloantonio.tempo.interfaces.PlaylistCallback;
 import com.cappielloantonio.tempo.ui.adapter.PlaylistDialogSongHorizontalAdapter;
 import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.util.MusicUtil;
@@ -25,10 +26,15 @@ import java.util.Objects;
 public class PlaylistEditorDialog extends DialogFragment {
     private DialogPlaylistEditorBinding bind;
     private PlaylistEditorViewModel playlistEditorViewModel;
+    private PlaylistCallback playlistCallback;
 
     private String playlistName;
     private PlaylistDialogSongHorizontalAdapter playlistDialogSongHorizontalAdapter;
 
+    public PlaylistEditorDialog(PlaylistCallback playlistCallback) {
+        this.playlistCallback = playlistCallback;
+    }
+
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -85,13 +91,13 @@ public class PlaylistEditorDialog extends DialogFragment {
                     playlistEditorViewModel.updatePlaylist(playlistName);
                 }
 
-                Objects.requireNonNull(getDialog()).dismiss();
+                dialogDismiss();
             }
         });
 
         ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
             playlistEditorViewModel.deletePlaylist();
-            Objects.requireNonNull(getDialog()).dismiss();
+            dialogDismiss();
         });
     }
 
@@ -102,7 +108,9 @@ public class PlaylistEditorDialog extends DialogFragment {
         playlistDialogSongHorizontalAdapter = new PlaylistDialogSongHorizontalAdapter();
         bind.playlistSongRecyclerView.setAdapter(playlistDialogSongHorizontalAdapter);
 
-        playlistEditorViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> playlistDialogSongHorizontalAdapter.setItems(songs));
+        playlistEditorViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> {
+            if (songs != null) playlistDialogSongHorizontalAdapter.setItems(songs);
+        });
 
         new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT) {
             int originalPosition = -1;
@@ -157,4 +165,9 @@ public class PlaylistEditorDialog extends DialogFragment {
 
         return true;
     }
+
+    private void dialogDismiss() {
+        Objects.requireNonNull(getDialog()).dismiss();
+        playlistCallback.onDismiss();
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -619,25 +618,6 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
         });
     }
 
-    public void reorder() {
-        if (bind != null) {
-            // bind.homeLinearLayoutContainer.removeAllViews();
-            // bind.homeLinearLayoutContainer.addView(bind.homeDiscoverSector);
-
-            // bind.homeLinearLayoutContainer.addView(bind.homeSimilarTracksSector);
-            // bind.homeLinearLayoutContainer.addView(bind.homeRadioArtistSector);
-            // bind.homeLinearLayoutContainer.addView(bind.homeGridTracksSector);
-            // bind.homeLinearLayoutContainer.addView(bind.starredTracksSector);
-            // bind.homeLinearLayoutContainer.addView(bind.starredAlbumsSector);
-            // bind.homeLinearLayoutContainer.addView(bind.starredArtistsSector);
-
-            // bind.homeLinearLayoutContainer.addView(bind.homeRecentlyAddedAlbumsSector);
-            // bind.homeLinearLayoutContainer.addView(bind.homeFlashbackSector);
-            // bind.homeLinearLayoutContainer.addView(bind.homeMostPlayedAlbumsSector);
-            // bind.homeLinearLayoutContainer.addView(bind.homeRecentlyPlayedAlbumsSector);
-        }
-    }
-
     private void initializeMediaBrowser() {
         mediaBrowserListenableFuture = new MediaBrowser.Builder(requireContext(), new SessionToken(requireContext(), new ComponentName(requireContext(), MediaService.class))).buildAsync();
     }

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LibraryFragment.java

@@ -1,6 +1,7 @@
 package com.cappielloantonio.tempo.ui.fragment;
 
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,6 +19,7 @@ import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.databinding.FragmentLibraryBinding;
 import com.cappielloantonio.tempo.helper.recyclerview.CustomLinearSnapHelper;
 import com.cappielloantonio.tempo.interfaces.ClickCallback;
+import com.cappielloantonio.tempo.interfaces.PlaylistCallback;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.AlbumAdapter;
 import com.cappielloantonio.tempo.ui.adapter.ArtistAdapter;
@@ -71,7 +73,7 @@ public class LibraryFragment extends Fragment implements ClickCallback {
         initAlbumView();
         initArtistView();
         initGenreView();
-        initPlaylistSlideView();
+        initPlaylistView();
     }
 
     @Override
@@ -80,6 +82,12 @@ public class LibraryFragment extends Fragment implements ClickCallback {
         activity.setBottomNavigationBarVisibility(true);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshPlaylistView();
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -222,7 +230,7 @@ public class LibraryFragment extends Fragment implements ClickCallback {
         genreSnapHelper.attachToRecyclerView(bind.genreRecyclerView);
     }
 
-    private void initPlaylistSlideView() {
+    private void initPlaylistView() {
         bind.playlistRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         bind.playlistRecyclerView.setHasFixedSize(true);
 
@@ -244,6 +252,12 @@ public class LibraryFragment extends Fragment implements ClickCallback {
         });
     }
 
+    private void refreshPlaylistView() {
+        final Handler handler = new Handler();
+        final Runnable runnable = () -> libraryViewModel.refreshPlaylistSample(getViewLifecycleOwner());
+        handler.postDelayed(runnable, 100);
+    }
+
     @Override
     public void onAlbumClick(Bundle bundle) {
         Navigation.findNavController(requireView()).navigate(R.id.albumPageFragment, bundle);
@@ -276,7 +290,13 @@ public class LibraryFragment extends Fragment implements ClickCallback {
 
     @Override
     public void onPlaylistLongClick(Bundle bundle) {
-        PlaylistEditorDialog dialog = new PlaylistEditorDialog();
+        PlaylistEditorDialog dialog = new PlaylistEditorDialog(new PlaylistCallback() {
+            @Override
+            public void onDismiss() {
+                refreshPlaylistView();
+            }
+        });
+
         dialog.setArguments(bundle);
         dialog.show(activity.getSupportFragmentManager(), null);
     }

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistCatalogueFragment.java

@@ -178,7 +178,7 @@ public class PlaylistCatalogueFragment extends Fragment implements ClickCallback
 
     @Override
     public void onPlaylistLongClick(Bundle bundle) {
-        PlaylistEditorDialog dialog = new PlaylistEditorDialog();
+        PlaylistEditorDialog dialog = new PlaylistEditorDialog(null);
         dialog.setArguments(bundle);
         dialog.show(activity.getSupportFragmentManager(), null);
         hideKeyboard(requireView());

app/src/main/java/com/cappielloantonio/tempo/viewmodel/PlaylistEditorViewModel.java

@@ -37,8 +37,7 @@ public class PlaylistEditorViewModel extends AndroidViewModel {
     }
 
     public void updatePlaylist(String name) {
-        playlistRepository.deletePlaylist(toEdit.getId());
+        playlistRepository.updatePlaylist(toEdit.getId(), name, getPlaylistSongIds());
-        playlistRepository.createPlaylist(toEdit.getId(), name, getPlaylistSongIds());
     }
 
     public void deletePlaylist() {

app/src/main/res/layout/fragment_home_tab_music.xml

@@ -296,7 +296,8 @@
             android:id="@+id/home_grid_tracks_sector"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/grid_tracks_pre_text_view"