From 44562f7d4bb9b2a9647be71491521dcfde1672ea Mon Sep 17 00:00:00 2001 From: SemvdH Date: Wed, 26 Mar 2025 22:35:53 +0100 Subject: [PATCH 1/4] Display toast message after adding a song to a playlist --- .../tempo/repository/PlaylistRepository.java | 7 +++++-- app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-ko/strings.xml | 2 ++ app/src/main/res/values-pt/strings.xml | 2 ++ app/src/main/res/values-ru/strings.xml | 2 ++ app/src/main/res/values-zh/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 9 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java index bcf0c732..091e846d 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java +++ b/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java @@ -1,10 +1,13 @@ package com.cappielloantonio.tempo.repository; +import android.widget.Toast; + import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.tempo.App; +import com.cappielloantonio.tempo.R; import com.cappielloantonio.tempo.database.AppDatabase; import com.cappielloantonio.tempo.database.dao.PlaylistDao; import com.cappielloantonio.tempo.subsonic.base.ApiResponse; @@ -80,12 +83,12 @@ public class PlaylistRepository { .enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { - + Toast.makeText(App.getContext(), getString(R.string.playlist_chooser_dialog_toast_add_success), Toast.LENGTH_SHORT).show(); } @Override public void onFailure(@NonNull Call call, @NonNull Throwable t) { - + Toast.makeText(App.getContext(), getString(R.string.playlist_chooser_dialog_toast_add_failure), Toast.LENGTH_SHORT).show(); } }); } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5c627b9a..a2b89f17 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -186,6 +186,8 @@ Abbrechen Erstellen Zu einer Playliste hinzufügen + Lied zu Playlist hinzugefügt + Titel kann nicht zur Playlist hinzugefügt werden %1$d Tracks • %2$s Länge • %1$s Zum Löschen lange drücken diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 03a2f0db..715f8d45 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -159,6 +159,8 @@ Annuler Créer Ajouter à une playlist + Ajout d'une chanson à la playlist + Échec de l'ajout d'une chanson à la playlist %1$d titres • %2$s Durée • %1$s Nom de la playlist diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2cc5bcb6..493161b7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -188,6 +188,8 @@ Annulla Crea Aggiungi a una playlist + Aggiunta di un brano alla playlist + Impossibile aggiungere un brano alla playlist %1$d brani • %2$s Durata • %1$s Premi a lungo per eliminare diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 679f333a..59e5e39a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -161,6 +161,8 @@ 취소 생성 플레이리스트 추가 + 재생 목록에 노래 추가 + 재생 목록에 노래를 추가하지 못했습니다. %1$d 트랙 • %2$s 재생시간 • %1$s 플레이리스트 이름 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 12f04a31..223093d8 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -160,6 +160,8 @@ Cancelar Criar Adicionar a uma playlist + Adicionada playlist de reprodução + Falha ao adicionar uma playlist de reprodução %1$d faixas • %2$s Duração • %1$s Nome da playlist diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0f893b90..259036f4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -186,6 +186,8 @@ Отмена Создать Добавить в плейлист + Добавьте песню в плейлист + Не удалось добавить песню в список воспроизведения %1$d треков • %2$s Продолжительность • %1$s Долгое нажатие для удаления diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 915b33d1..4564147b 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -165,6 +165,8 @@ 取消 新建 添加到播放列表 + 将歌曲添加到播放列表 + 未能将歌曲添加到播放列表 %1$d 首曲目 • %2$s 持续时间 • %1$s 播放列表名称 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5fd1ac33..3db80974 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,6 +194,8 @@ Cancel Create Add to a playlist + Added song to playlist + Failed to add song to playlist %1$d tracks • %2$s Duration • %1$s Long press to delete From c7164770519610a9661f80c9ab8d668e84584a22 Mon Sep 17 00:00:00 2001 From: eddyizm Date: Fri, 1 Aug 2025 16:09:22 -0700 Subject: [PATCH 2/4] chore: adding env for local dev --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b1123a00..74483036 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ .externalNativeBuild .cxx /.idea/ +.env From 6703704f2259e4bed34ad1df98d32452298940d4 Mon Sep 17 00:00:00 2001 From: eddyizm Date: Sat, 2 Aug 2025 18:21:24 -0700 Subject: [PATCH 3/4] fix: corrected the and updated the string message for the toast. got the build working. It was not pretty. --- .gitignore | 1 + .idea/misc.xml | 1 + app/build.gradle | 7 ++++++- app/src/main/AndroidManifest.xml | 1 - .../tempo/repository/PlaylistRepository.java | 12 +++++++++--- app/src/main/res/values-fr/strings.xml | 2 -- gradlew | 0 settings.gradle | 3 +++ 8 files changed, 20 insertions(+), 7 deletions(-) mode change 100644 => 100755 gradlew diff --git a/.gitignore b/.gitignore index 74483036..6e9024d7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ .cxx /.idea/ .env +.vscode/settings.json diff --git a/.idea/misc.xml b/.idea/misc.xml index 1d411cd3..d5950937 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -192,6 +192,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index b6ee7b49..d26c39ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { targetSdk 35 versionCode 26 - versionName '3.9.0' + versionName '3.9.3' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -107,4 +107,9 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.11.0' implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.14' implementation 'com.squareup.retrofit2:converter-gson:2.11.0' +} +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 986481bd..cc9990e7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,6 @@ - diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java index 091e846d..7884159f 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java +++ b/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java @@ -1,5 +1,8 @@ package com.cappielloantonio.tempo.repository; +import static android.provider.Settings.System.getString; + +import android.provider.Settings; import android.widget.Toast; import androidx.annotation.NonNull; @@ -23,6 +26,7 @@ import retrofit2.Callback; import retrofit2.Response; public class PlaylistRepository { + @androidx.media3.common.util.UnstableApi private final PlaylistDao playlistDao = AppDatabase.getInstance().playlistDao(); public MutableLiveData> getPlaylists(boolean random, int size) { MutableLiveData> listLivePlaylists = new MutableLiveData<>(new ArrayList<>()); @@ -83,12 +87,12 @@ public class PlaylistRepository { .enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { - Toast.makeText(App.getContext(), getString(R.string.playlist_chooser_dialog_toast_add_success), Toast.LENGTH_SHORT).show(); + Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_add_success), Toast.LENGTH_SHORT).show(); } @Override public void onFailure(@NonNull Call call, @NonNull Throwable t) { - Toast.makeText(App.getContext(), getString(R.string.playlist_chooser_dialog_toast_add_failure), Toast.LENGTH_SHORT).show(); + Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_add_failure), Toast.LENGTH_SHORT).show(); } }); } @@ -160,17 +164,19 @@ public class PlaylistRepository { } }); } - + @androidx.media3.common.util.UnstableApi public LiveData> getPinnedPlaylists() { return playlistDao.getAll(); } + @androidx.media3.common.util.UnstableApi public void insert(Playlist playlist) { InsertThreadSafe insert = new InsertThreadSafe(playlistDao, playlist); Thread thread = new Thread(insert); thread.start(); } + @androidx.media3.common.util.UnstableApi public void delete(Playlist playlist) { DeleteThreadSafe delete = new DeleteThreadSafe(playlistDao, playlist); Thread thread = new Thread(delete); diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 715f8d45..03a2f0db 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -159,8 +159,6 @@ Annuler Créer Ajouter à une playlist - Ajout d'une chanson à la playlist - Échec de l'ajout d'une chanson à la playlist %1$d titres • %2$s Durée • %1$s Nom de la playlist diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle index a7c6dd41..1cd079ae 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,5 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} include ':app' rootProject.name = "Tempo" \ No newline at end of file From 31ee749161c85e28e343b0fbd03573dfc5478197 Mon Sep 17 00:00:00 2001 From: eddyizm Date: Sat, 2 Aug 2025 19:07:44 -0700 Subject: [PATCH 4/4] merged and tested, bumping version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d26c39ed..ab1539d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { targetSdk 35 versionCode 26 - versionName '3.9.3' + versionName '3.9.4' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'