bug fix, cleanup

nuclearfog · Aug 11, 2024 · 0cf80df · 0cf80df
1 parent 7e7a198
commit 0cf80df
Show file tree

Hide file tree

Showing 55 changed files with 9 additions and 209 deletions.
diff --git a/app/src/main/assets/licenses.html b/app/src/main/assets/licenses.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html>
-
+<html lang="en">
 <head>
+	<title>Licenses</title>
 	<style>
 		body { font-size: x-small; font-family: sans-serif; } pre { background-color: #eeeeee; padding: 1em; white-space: normal; }
 	</style>

diff --git a/app/src/main/java/org/nuclearfog/apollo/player/MultiPlayer.java b/app/src/main/java/org/nuclearfog/apollo/player/MultiPlayer.java
@@ -423,7 +423,7 @@ private void setCrossfadeTask(boolean enable) {
 		// set new cross fade task
 		if (enable) {
 			if (xfadeTask == null) {
-				xfadeTask = threadPool.scheduleAtFixedRate(new Runnable() {
+				xfadeTask = threadPool.scheduleWithFixedDelay(new Runnable() {
 					@Override
 					public void run() {
 						xfadeHandler.post(new Runnable() {

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/dialogs/LicenseDialog.java b/app/src/main/java/org/nuclearfog/apollo/ui/dialogs/LicenseDialog.java
@@ -4,6 +4,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
 import android.webkit.WebView;
 
 import androidx.annotation.NonNull;
@@ -21,10 +22,12 @@ public class LicenseDialog extends DialogFragment {
 
 	private static final String TAG = "LicenseDialog";
 
+
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-		WebView webView = new WebView(inflater.getContext());
+		WebView webView = new WebView(requireContext());
+		webView.setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
 		webView.loadUrl("file:///android_asset/licenses.html");
 		return webView;
 	}

diff --git a/app/src/main/java/org/nuclearfog/apollo/utils/StringUtils.java b/app/src/main/java/org/nuclearfog/apollo/utils/StringUtils.java
@@ -69,7 +69,7 @@ public static String makeTimeString(Context context, long duration) {
 		long hour = min / 60;
 		if (hour > 0)
 			return String.format(context.getString(R.string.durationformatlong), hour, min % 60, sec % 60);
-		return String.format(context.getString(R.string.durationformatshort), hour, min % 60, sec % 60);
+		return String.format(context.getString(R.string.durationformatshort), min % 60, sec % 60);
 	}
 
 	/**

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Koppelvlak</string>
 	<string name="settings_storage_category">Berging</string>
 	<string name="settings_data_category">Data</string>
-	<string name="settings_author_title">Skrywer</string>
 	<string name="settings_about_apollo">Oor Apollo</string>
-	<string name="settings_special_thanks">Spesiale woord van dank</string>
-	<string name="settings_lopez_summary">Ikoon en Play-winkel ontwerp</string>
 	<string name="settings_color_scheme_title">Kies Apollo\'s verstekkleur skema</string>
 	<string name="settings_color_scheme_summary">Verander die aksentkleur in Apollo</string>
 	<string name="settings_theme_chooser_title">Kies tema</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Oopbronlisensies</string>
 	<string name="settings_version_title">Bouweergawe</string>
 	<string name="share_track_using">Deel liedtjie d.m.v.:</string>
-	<string name="color_picker_title">Kleur skema</string>
 	<string name="current_color">Huidig</string>
 	<string name="new_color">Nuut</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (Alternatiewe)</string>

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">واجهة المستخدم</string>
 	<string name="settings_storage_category">التخزين</string>
 	<string name="settings_data_category">البيانات</string>
-	<string name="settings_author_title">الناشر</string>
 	<string name="settings_about_apollo">حول Apollo</string>
-	<string name="settings_special_thanks">شكر خاص</string>
-	<string name="settings_lopez_summary">تصميم شعار الرمز و تصميم Play Store</string>
 	<string name="settings_color_scheme_title">اختر نظام الألوان الإفتىاضي Apollo</string>
 	<string name="settings_color_scheme_summary">يتغير لون علامة في Apollo</string>
 	<string name="settings_theme_chooser_title">اختيار الموضوع</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">تراخيص مفتوحة المصدر</string>
 	<string name="settings_version_title">رقم الإصدار</string>
 	<string name="share_track_using">مشاركة المسار ااستخدام:</string>
-	<string name="color_picker_title">نظام الألوان</string>
 	<string name="current_color">الحالي</string>
 	<string name="new_color">جديد</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (مناوب)</string>

diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
@@ -65,9 +65,7 @@
 	<string name="theme_set"><xliff:g id="name">%s</xliff:g> tema olaraq tənzimləndi</string>
 	<string name="settings_storage_category">Yaddaş</string>
 	<string name="settings_data_category">Verilənlər</string>
-	<string name="settings_author_title">Müəllif</string>
 	<string name="settings_about_apollo">Apollo Haqqında</string>
-	<string name="settings_special_thanks">Xüsusi təşəkkürlər</string>
 	<string name="settings_theme_chooser_title">Tema seçici</string>
 	<string name="settings_delete_cache_title">Önyaddaşı sil</string>
 	<string name="settings_delete_cache_summary">Önyaddaşdakı bütün şəkilləri sil</string>
@@ -77,7 +75,6 @@
 	<string name="settings_open_source_licenses">Açıq mənbə lisenziyaları</string>
 	<string name="settings_version_title">Versiya nömrəsi</string>
 	<string name="share_track_using">Mahnını paylaş:</string>
-	<string name="color_picker_title">Rəng sxemi</string>
 	<string name="current_color">Hazırki</string>
 	<string name="new_color">Yeni</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (alternativ)</string>

diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">ইন্টারফেস</string>
 	<string name="settings_storage_category">সংগ্রহস্থল</string>
 	<string name="settings_data_category">ডাটা</string>
-	<string name="settings_author_title">লেখক</string>
 	<string name="settings_about_apollo">অ্যাপোলো সম্পর্কে</string>
-	<string name="settings_special_thanks">বিশেষ ধন্যবাদ</string>
-	<string name="settings_lopez_summary">আইকন ও প্লে-স্টোর ব্যানার ডিজাইন</string>
 	<string name="settings_color_scheme_title">অ্যাপোলোর পূর্ব-নির্ধারিত রঙ-পরিকল্পনা পছন্দ করুন</string>
 	<string name="settings_color_scheme_summary">অ্যাপোলোর রঙের ধরন পরিবর্তন করুন</string>
 	<string name="settings_theme_chooser_title">থিম চয়নকারী</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">উন্মুক্ত লাইসেন্স</string>
 	<string name="settings_version_title">সংস্করণ নাম্বর</string>
 	<string name="share_track_using">ট্র্যাক শেয়ার করুন ব্যবহার করেঃ</string>
-	<string name="color_picker_title">রঙ-পরিকল্পনা</string>
 	<string name="current_color">বর্তমান</string>
 	<string name="new_color">নতুন</string>
 	<string name="app_widget_large_alt">অ্যাপোলোঃ ৪×২ (বিকল্প)</string>

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Interfície</string>
 	<string name="settings_storage_category">Emmagatzematge</string>
 	<string name="settings_data_category">Dades</string>
-	<string name="settings_author_title">Autor</string>
 	<string name="settings_about_apollo">Quant a Apollo</string>
-	<string name="settings_special_thanks">Agraïments especials</string>
-	<string name="settings_lopez_summary">Disseny de l\'icona i el banner de la Play Store</string>
 	<string name="settings_color_scheme_title">Escull l\'esquema de color predefinit de l\'Apollo</string>
 	<string name="settings_color_scheme_summary">Canvia el color de l\'accent a l\'Apollo</string>
 	<string name="settings_theme_chooser_title">Selector de tema</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Llicencies de codi obert</string>
 	<string name="settings_version_title">Número de versió</string>
 	<string name="share_track_using">Comparteix la pista utilitzant:</string>
-	<string name="color_picker_title">Esquema de color</string>
 	<string name="current_color">Actual</string>
 	<string name="new_color">Nou</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (alternatiu)</string>

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Rozhraní</string>
 	<string name="settings_storage_category">Úložiště</string>
 	<string name="settings_data_category">Data</string>
-	<string name="settings_author_title">Autor</string>
 	<string name="settings_about_apollo">O aplikaci Apollo</string>
-	<string name="settings_special_thanks">Zvláštní poděkování</string>
-	<string name="settings_lopez_summary">Vzhled ikony a upoutávky v Google Play</string>
 	<string name="settings_color_scheme_title">Zvolte výchozí barevné schéma</string>
 	<string name="settings_color_scheme_summary">Změní barevný vzhled aplikace Apollo</string>
 	<string name="settings_theme_chooser_title">Výběr motivu</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Licence otevřeného software</string>
 	<string name="settings_version_title">Číslo verze</string>
 	<string name="share_track_using">Sdílet skladbu pomocí:</string>
-	<string name="color_picker_title">Barevné shéma</string>
 	<string name="current_color">Aktuální</string>
 	<string name="new_color">Nová</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (varianta)</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Brugerflade</string>
 	<string name="settings_storage_category">Lagring</string>
 	<string name="settings_data_category">Data</string>
-	<string name="settings_author_title">Forfatter</string>
 	<string name="settings_about_apollo">Om Apollo</string>
-	<string name="settings_special_thanks">Især tak til</string>
-	<string name="settings_lopez_summary">Bannerdesign for ikoner og Play Butik</string>
 	<string name="settings_color_scheme_title">Vælg Apollos standard-farveskema</string>
 	<string name="settings_color_scheme_summary">Ændrer accentfarven i Apollo</string>
 	<string name="settings_theme_chooser_title">Temavælger</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Open source-licenser</string>
 	<string name="settings_version_title">Versionsnummer</string>
 	<string name="share_track_using">Del sang vha.:</string>
-	<string name="color_picker_title">Farveskema</string>
 	<string name="current_color">Aktuel</string>
 	<string name="new_color">Ny</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (alternativ)</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Oberfläche</string>
 	<string name="settings_storage_category">Speicher</string>
 	<string name="settings_data_category">Daten</string>
-	<string name="settings_author_title">Autor</string>
 	<string name="settings_about_apollo">Über Apollo</string>
-	<string name="settings_special_thanks">Danksagungen</string>
-	<string name="settings_lopez_summary">Design des Symbols und Play Store-Banners</string>
 	<string name="settings_color_scheme_title">Farbschema</string>
 	<string name="settings_color_scheme_summary">Farbakzent auswählen</string>
 	<string name="settings_theme_chooser_title">Designs</string>
@@ -111,7 +108,6 @@
 	<string name="settings_version_title">Version</string>
 	<string name="share_track_using">Titel teilen</string>
 	<string name="menu_clear_popular">Liste leeren</string>
-	<string name="color_picker_title">Farbschema</string>
 	<string name="current_color">Momentan</string>
 	<string name="new_color">Neu</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (Alternativ)</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Διεπαφή</string>
 	<string name="settings_storage_category">Αποθηκευτικός χώρος</string>
 	<string name="settings_data_category">Δεδομένα</string>
-	<string name="settings_author_title">Δημιουργός</string>
 	<string name="settings_about_apollo">Περί Apollo</string>
-	<string name="settings_special_thanks">Θερμές ευχαριστίες</string>
-	<string name="settings_lopez_summary">Εικονίδια και σχεδιασμός Play Store banner</string>
 	<string name="settings_color_scheme_title">Επιλογή προεπιλεγμένου συνδυασμού χρωμάτων</string>
 	<string name="settings_color_scheme_summary">Αλλαγή τόνου χρώματος του Apollo</string>
 	<string name="settings_theme_chooser_title">Θέματα</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Άδειες χρήσης ανοιχτού κώδικα</string>
 	<string name="settings_version_title">Αρıθμός έκδοσης</string>
 	<string name="share_track_using">Κοινή χρήση κομματιού με τη χρήση:</string>
-	<string name="color_picker_title">Τόνος χρώματος</string>
 	<string name="current_color">Τρέχον</string>
 	<string name="new_color">Νέο</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (εναλλακτικό)</string>

diff --git a/app/src/main/res/values-en-rAU/strings.xml b/app/src/main/res/values-en-rAU/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Interface</string>
 	<string name="settings_storage_category">Storage</string>
 	<string name="settings_data_category">Data</string>
-	<string name="settings_author_title">Author</string>
 	<string name="settings_about_apollo">About Apollo</string>
-	<string name="settings_special_thanks">Special thanks</string>
-	<string name="settings_lopez_summary">Icon and Play Store banner design</string>
 	<string name="settings_color_scheme_title">Choose Apollo\'s default colour scheme</string>
 	<string name="settings_color_scheme_summary">Changes the accent colour in Apollo</string>
 	<string name="settings_theme_chooser_title">Theme chooser</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Open source licenses</string>
 	<string name="settings_version_title">Version number</string>
 	<string name="share_track_using">Share track using:</string>
-	<string name="color_picker_title">Colour scheme</string>
 	<string name="current_color">Current</string>
 	<string name="new_color">New</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (Alternate)</string>

diff --git a/app/src/main/res/values-en-rIN/strings.xml b/app/src/main/res/values-en-rIN/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Interface</string>
 	<string name="settings_storage_category">Storage</string>
 	<string name="settings_data_category">Data</string>
-	<string name="settings_author_title">Author</string>
 	<string name="settings_about_apollo">About Apollo</string>
-	<string name="settings_special_thanks">Special thanks</string>
-	<string name="settings_lopez_summary">Icon and Play Store banner design</string>
 	<string name="settings_color_scheme_title">Choose Apollo\'s default colour scheme</string>
 	<string name="settings_color_scheme_summary">Changes the accent colour in Apollo</string>
 	<string name="settings_theme_chooser_title">Theme chooser</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Open source licenses</string>
 	<string name="settings_version_title">Version number</string>
 	<string name="share_track_using">Share track using:</string>
-	<string name="color_picker_title">Colour scheme</string>
 	<string name="current_color">Current</string>
 	<string name="new_color">New</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (alternate)</string>

diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Interfaz</string>
 	<string name="settings_storage_category">Almacenamiento</string>
 	<string name="settings_data_category">Datos</string>
-	<string name="settings_author_title">Autor</string>
 	<string name="settings_about_apollo">Acerca de Apollo</string>
-	<string name="settings_special_thanks">Agradecimientos</string>
-	<string name="settings_lopez_summary">Iconos y diseño en Play Store</string>
 	<string name="settings_color_scheme_title">Elegir el esquema de color por defecto de Apolo</string>
 	<string name="settings_color_scheme_summary">Escoger un color para el diseño de Apollo</string>
 	<string name="settings_theme_chooser_title">Selector de Temas</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Licencias de software libre</string>
 	<string name="settings_version_title">Número de Versión</string>
 	<string name="share_track_using">Compartir canción usando:</string>
-	<string name="color_picker_title">Esquema de color</string>
 	<string name="current_color">Actual</string>
 	<string name="new_color">Nuevo</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (alt.)</string>

diff --git a/app/src/main/res/values-es-rXA/strings.xml b/app/src/main/res/values-es-rXA/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Aspeutu</string>
 	<string name="settings_storage_category">Almacenamientu</string>
 	<string name="settings_data_category">Datos</string>
-	<string name="settings_author_title">Autor</string>
 	<string name="settings_about_apollo">Tocante a Apollo</string>
-	<string name="settings_special_thanks">Gracies a</string>
-	<string name="settings_lopez_summary">Iconos y diseñu en Play Store</string>
 	<string name="settings_color_scheme_title">Esquema de color</string>
 	<string name="settings_color_scheme_summary">Esbillar un color pal diseñu d\'Apollo</string>
 	<string name="settings_theme_chooser_title">Temes</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Llicencies de software llibre</string>
 	<string name="settings_version_title">Versión</string>
 	<string name="share_track_using">Compartir canción usando:</string>
-	<string name="color_picker_title">Esquema de color</string>
 	<string name="current_color">Actual</string>
 	<string name="new_color">Nuevu</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (alt.)</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Apariencia</string>
 	<string name="settings_storage_category">Almacenamiento</string>
 	<string name="settings_data_category">Datos</string>
-	<string name="settings_author_title">Autor</string>
 	<string name="settings_about_apollo">Acerca de Apollo</string>
-	<string name="settings_special_thanks">Agradecimientos</string>
-	<string name="settings_lopez_summary">Iconos y diseño en Play Store</string>
 	<string name="settings_color_scheme_title">Esquema de color</string>
 	<string name="settings_color_scheme_summary">Escoger un color para el diseño de Apollo</string>
 	<string name="settings_theme_chooser_title">Temas</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Licencias de software libre</string>
 	<string name="settings_version_title">Versión</string>
 	<string name="share_track_using">Compartir canción usando:</string>
-	<string name="color_picker_title">Esquema de color</string>
 	<string name="current_color">Actual</string>
 	<string name="new_color">Nuevo</string>
 	<string name="app_widget_large_alt">Apollo: 4×2 (alt.)</string>

diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
@@ -90,10 +90,7 @@
 	<string name="settings_ui_category">Liides</string>
 	<string name="settings_storage_category">Salvestuskoht</string>
 	<string name="settings_data_category">Andmed</string>
-	<string name="settings_author_title">Autor</string>
 	<string name="settings_about_apollo">Teave Apollost</string>
-	<string name="settings_special_thanks">Erilised tänud</string>
-	<string name="settings_lopez_summary">Ikooni ja Play poe bänneri disain</string>
 	<string name="settings_color_scheme_title">Vali Apollo vaikimisi värviskeem</string>
 	<string name="settings_color_scheme_summary">Muudab Apollo põhivärvi</string>
 	<string name="settings_theme_chooser_title">Teema valik</string>
@@ -106,7 +103,6 @@
 	<string name="settings_open_source_licenses">Avatud lähtekoodiga litsentsid</string>
 	<string name="settings_version_title">Versiooni number</string>
 	<string name="share_track_using">Jaga lugu, kasutades:</string>
-	<string name="color_picker_title">Värvilahendus</string>
 	<string name="current_color">Praegune</string>
 	<string name="new_color">Uus</string>
 	<string name="app_widget_large_alt">Apollo: 4 × 2 (alternatiivne)</string>