diff --git a/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideModule.java b/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideModule.java index 3d169f41..f2c6d363 100644 --- a/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideModule.java +++ b/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideModule.java @@ -23,7 +23,7 @@ public class CustomGlideModule implements GlideModule { @Override public void applyOptions(@NonNull Context context, GlideBuilder builder) { File file = new File(App.getInstance().getApplicationInfo().dataDir + "/glide"); - int size = PreferenceUtil.getInstance(context).getCacheSize(); + int size = PreferenceUtil.getInstance(context).getImageCacheSize(); builder.setDiskCache(new DiskLruCacheFactory(() -> file, size)); builder.setDefaultRequestOptions(new RequestOptions().format(DecodeFormat.PREFER_RGB_565)); diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java index eb4645b3..69fcb054 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java @@ -70,7 +70,7 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen if (v == binding.login) { final Context context = this; if (binding.server.getText().toString().trim().length() == 0) { - Toast.makeText(context, context.getResources().getString(R.string.error_login_empty_addr), Toast.LENGTH_SHORT).show(); + Toast.makeText(context, context.getResources().getString(R.string.error_login_empty_address), Toast.LENGTH_SHORT).show(); return; } diff --git a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java index f4928b1d..e4351558 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java @@ -82,7 +82,7 @@ public final class PreferenceUtil { public static final String REMEMBER_SHUFFLE = "remember_shuffle"; public static final String REMEMBER_QUEUE = "remember_queue"; - public static final String CACHE_SIZE = "cache_size"; + public static final String IMAGE_CACHE_SIZE = "image_cache_size"; private static PreferenceUtil sInstance; @@ -387,8 +387,8 @@ public final class PreferenceUtil { editor.apply(); } - public final int getCacheSize() { - return Integer.parseInt(mPreferences.getString(CACHE_SIZE, "400000000")); + public final int getImageCacheSize() { + return Integer.parseInt(mPreferences.getString(IMAGE_CACHE_SIZE, "400000000")); } public List getCategories() { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 040bf096..683cc7bc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -158,8 +158,6 @@ Warteschlange merken Maximale Listengröße Cache-Größe - Externes Verzeichnis - "Bildcache in externem Verzeichnis speichern, um die Dateien zwischen Installationen aufzubewahren. " Warteschlange beim Schließen der Anwendung speichen, damit sie über Sitzungen hinweg bestehen bleibt. Quellcode Melde Fehler diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0fdf0a02..3067231d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -140,7 +140,7 @@ Année Impossible de contacter le serveur. Identifiants de connexion invalides. - Veuillez saisir l\'adresse du serveur. + Veuillez saisir l\'adresse du serveur. Une erreur inattendue s\'est produite. Ajouter à une playlist Ajouter à la liste de lecture @@ -161,11 +161,9 @@ Déconnexion Nom Images - Stocke le cache d\'images dans un dossier externe pour les conserver entre différentes installations. Enregistrer la liste de lecture à la fermeture de l\'application pour la conserver entre différentes utilisations. Le mode aléatoire sera conservé au choix d\'une nouvelle liste de titres pour la liste de lecture. Taille du cache - Dossier externe Débit maximum Taile de liste maximum Se souvenir de la dernière liste de lecture diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24f9c4f7..e220d290 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -124,9 +124,7 @@ Remember Queue Page Size Cache Size - External Directory - Store the image cache in an external directory to keep the files between installs. The primary theme color for control elements. An alternate color used to accent elements. Uses the current song\'s album cover as the lock screen wallpaper. @@ -200,7 +198,7 @@ Playlist is empty The playing notification provides actions for play/pause etc. - Playing notification + Playing Notification You have to select at least one category. Permissions denied. Permission to access external storage denied. @@ -221,7 +219,7 @@ Sleep timer set for %d minutes from now. Can\'t reach server. Invalid login credentials. - Please fill in the server address. + Please fill in the server address. An unexpected error occurred. Please fill in your username. diff --git a/app/src/main/res/xml/pref_cache.xml b/app/src/main/res/xml/pref_cache.xml index 702abcd1..72b24cf4 100644 --- a/app/src/main/res/xml/pref_cache.xml +++ b/app/src/main/res/xml/pref_cache.xml @@ -9,7 +9,7 @@ android:defaultValue="400000000" android:entries="@array/pref_images_cache_size_titles" android:entryValues="@array/pref_images_cache_size_values" - android:key="cache_size" + android:key="image_cache_size" android:negativeButtonText="@null" android:positiveButtonText="@null" android:title="@string/pref_title_images_cache_size" />