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