mirror of
https://github.com/antebudimir/tempus.git
synced 2026-04-15 16:27:26 +00:00
feat: Add selector for playlist visibility (#394)
* feat: add selector for playlist visiblity when adding a song * fix: wrong number of arguments * feat: make dialog text localized * chore: add es, fr, it, pt localization for playlist visibility dialog --------- Co-authored-by: eddyizm <eddyizm@gmail.com>
This commit is contained in:
Tom
GitHub
parent
6e51611867
commit
26c7bee106
7 changed files with 36 additions and 9 deletions
|
|
@ -1,8 +1,5 @@
|
|||
package com.cappielloantonio.tempo.repository;
|
||||
|
||||
import static android.provider.Settings.System.getString;
|
||||
|
||||
import android.provider.Settings;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
|
@ -107,13 +104,13 @@ public class PlaylistRepository {
|
|||
return playlistLiveData;
|
||||
}
|
||||
|
||||
public void addSongToPlaylist(String playlistId, ArrayList<String> songsId) {
|
||||
public void addSongToPlaylist(String playlistId, ArrayList<String> songsId, Boolean playlistVisibilityIsPublic) {
|
||||
if (songsId.isEmpty()) {
|
||||
Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_all_skipped), Toast.LENGTH_SHORT).show();
|
||||
} else{
|
||||
App.getSubsonicClientInstance(false)
|
||||
.getPlaylistClient()
|
||||
.updatePlaylist(playlistId, null, true, songsId, null)
|
||||
.updatePlaylist(playlistId, null, playlistVisibilityIsPublic, songsId, null)
|
||||
.enqueue(new Callback<ApiResponse>() {
|
||||
@Override
|
||||
public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import android.view.View;
|
|||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.StringRes;
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
|
@ -20,6 +21,7 @@ import com.cappielloantonio.tempo.viewmodel.PlaylistChooserViewModel;
|
|||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
public class PlaylistChooserDialog extends DialogFragment implements ClickCallback {
|
||||
private DialogPlaylistChooserBinding bind;
|
||||
|
|
@ -35,9 +37,21 @@ public class PlaylistChooserDialog extends DialogFragment implements ClickCallba
|
|||
|
||||
playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class);
|
||||
|
||||
String[] playlistVisibilityChoice = {
|
||||
getString(R.string.playlist_chooser_dialog_visibility_public),
|
||||
getString(R.string.playlist_chooser_dialog_visibility_private)
|
||||
};
|
||||
|
||||
return new MaterialAlertDialogBuilder(getActivity())
|
||||
.setView(bind.getRoot())
|
||||
.setTitle(R.string.playlist_chooser_dialog_title)
|
||||
.setSingleChoiceItems(
|
||||
playlistVisibilityChoice,
|
||||
0,
|
||||
(dialog, which) -> {
|
||||
boolean isPublic = (which == 0);
|
||||
playlistChooserViewModel.setIsPlaylistPublic(isPublic);
|
||||
})
|
||||
.setNeutralButton(R.string.playlist_chooser_dialog_neutral_button, (dialog, id) -> { })
|
||||
.setNegativeButton(R.string.playlist_chooser_dialog_negative_button, (dialog, id) -> dialog.cancel())
|
||||
.create();
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package com.cappielloantonio.tempo.viewmodel;
|
|||
|
||||
import android.app.Application;
|
||||
import android.app.Dialog;
|
||||
import android.content.SharedPreferences;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.lifecycle.AndroidViewModel;
|
||||
|
|
@ -21,8 +20,17 @@ import java.util.List;
|
|||
|
||||
public class PlaylistChooserViewModel extends AndroidViewModel {
|
||||
private final PlaylistRepository playlistRepository;
|
||||
|
||||
private final MutableLiveData<List<Playlist>> playlists = new MutableLiveData<>(null);
|
||||
private final MutableLiveData<Boolean> playlistIsPublic = new MutableLiveData<>(false);
|
||||
|
||||
public Boolean getIsPlaylistPublic() {
|
||||
return playlistIsPublic.getValue();
|
||||
}
|
||||
|
||||
public void setIsPlaylistPublic(boolean isPublic) {
|
||||
playlistIsPublic.setValue(isPublic);
|
||||
}
|
||||
|
||||
private ArrayList<Child> toAdd = new ArrayList<>();
|
||||
|
||||
public PlaylistChooserViewModel(@NonNull Application application) {
|
||||
|
|
@ -39,7 +47,7 @@ public class PlaylistChooserViewModel extends AndroidViewModel {
|
|||
public void addSongsToPlaylist(LifecycleOwner owner, Dialog dialog, String playlistId) {
|
||||
List<String> songIds = Lists.transform(toAdd, Child::getId);
|
||||
if (Preferences.allowPlaylistDuplicates()) {
|
||||
playlistRepository.addSongToPlaylist(playlistId, new ArrayList<>(songIds));
|
||||
playlistRepository.addSongToPlaylist(playlistId, new ArrayList<>(songIds), getIsPlaylistPublic());
|
||||
dialog.dismiss();
|
||||
} else {
|
||||
playlistRepository.getPlaylistSongs(playlistId).observe(owner, playlistSongs -> {
|
||||
|
|
@ -47,7 +55,7 @@ public class PlaylistChooserViewModel extends AndroidViewModel {
|
|||
List<String> playlistSongIds = Lists.transform(playlistSongs, Child::getId);
|
||||
songIds.removeAll(playlistSongIds);
|
||||
}
|
||||
playlistRepository.addSongToPlaylist(playlistId, new ArrayList<>(songIds));
|
||||
playlistRepository.addSongToPlaylist(playlistId, new ArrayList<>(songIds), getIsPlaylistPublic());
|
||||
dialog.dismiss();
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -227,6 +227,8 @@
|
|||
<string name="playlist_chooser_dialog_title">Añadir a una lista de reproducción</string>
|
||||
<string name="playlist_chooser_dialog_toast_add_failure">Error al añadir a la lista</string>
|
||||
<string name="playlist_chooser_dialog_toast_all_skipped">Todas las pistas se han descartado porque están repetidas</string>
|
||||
<string name="playlist_chooser_dialog_visibility_public">Público</string>
|
||||
<string name="playlist_chooser_dialog_visibility_private">Privado</string>
|
||||
<string name="playlist_counted_tracks">%1$d pistas • %2$s</string>
|
||||
<string name="playlist_duration">Duración • %1$s</string>
|
||||
<string name="playlist_editor_dialog_action_delete_toast">Pulsación larga para eliminar</string>
|
||||
|
|
|
|||
|
|
@ -236,6 +236,8 @@
|
|||
<string name="playlist_chooser_dialog_toast_add_success">Titre ajouté à la playlist</string>
|
||||
<string name="playlist_chooser_dialog_toast_add_failure">Échec d\'ajout du titre à la playlist</string>
|
||||
<string name="playlist_chooser_dialog_toast_all_skipped">Tous les titres ont été traités comme des doublons et ignorés</string>
|
||||
<string name="playlist_chooser_dialog_visibility_public">Publique</string>
|
||||
<string name="playlist_chooser_dialog_visibility_private">Privé</string>
|
||||
<string name="playlist_counted_tracks">%1$d titres • %2$s</string>
|
||||
<string name="playlist_duration">Durée • %1$s</string>
|
||||
<string name="playlist_editor_dialog_action_delete_toast">Appui long pour supprimer</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,8 @@
|
|||
<string name="playlist_chooser_dialog_toast_add_success">Aggiunta di un brano alla playlist</string>
|
||||
<string name="playlist_chooser_dialog_toast_add_failure">Impossibile aggiungere un brano alla playlist</string>
|
||||
<string name="playlist_chooser_dialog_toast_all_skipped">Tutte le canzoni sono state saltate perché duplicate</string>
|
||||
<string name="playlist_chooser_dialog_visibility_public">Pubblico</string>
|
||||
<string name="playlist_chooser_dialog_visibility_private">Privato</string>
|
||||
<string name="playlist_counted_tracks">%1$d brani • %2$s</string>
|
||||
<string name="playlist_duration">Durata • %1$s</string>
|
||||
<string name="playlist_editor_dialog_action_delete_toast">Premi a lungo per eliminare</string>
|
||||
|
|
|
|||
|
|
@ -164,6 +164,8 @@
|
|||
<string name="playlist_chooser_dialog_title">Adicionar a uma playlist</string>
|
||||
<string name="playlist_chooser_dialog_toast_add_success">Adicionada playlist de reprodução</string>
|
||||
<string name="playlist_chooser_dialog_toast_add_failure">Falha ao adicionar uma playlist de reprodução</string>
|
||||
<string name="playlist_chooser_dialog_visibility_public">Pública</string>
|
||||
<string name="playlist_chooser_dialog_visibility_private">Privada</string>
|
||||
<string name="playlist_counted_tracks">%1$d faixas • %2$s</string>
|
||||
<string name="playlist_duration">Duração • %1$s</string>
|
||||
<string name="playlist_editor_dialog_hint_name">Nome da playlist</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue