diff --git a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
index ea4f5035d..05fc72c90 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
@@ -38,7 +38,7 @@ class MusicLoader(private val app: Application) {
return Response.FAILED
}
- if (songs.size == 0) {
+ if (songs.isEmpty()) {
return Response.NO_MUSIC
}
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt
index 1c564ba21..bb3658a15 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt
@@ -502,7 +502,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
/**
* A [BroadcastReceiver] for receiving system events from the media notification or the headset.
*/
- inner class SystemEventReceiver : BroadcastReceiver() {
+ private inner class SystemEventReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val action = intent.action
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
index f48c3cc9b..220b39ac0 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.Transformations
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.launch
+import org.oxycblt.auxio.R
import org.oxycblt.auxio.logD
import org.oxycblt.auxio.logE
import org.oxycblt.auxio.music.Album
@@ -21,6 +22,7 @@ import org.oxycblt.auxio.playback.state.PlaybackMode
import org.oxycblt.auxio.playback.state.PlaybackStateManager
import org.oxycblt.auxio.recycler.SortMode
import org.oxycblt.auxio.settings.SettingsManager
+import org.oxycblt.auxio.ui.createToast
/**
* The ViewModel that provides a UI frontend for [PlaybackStateManager].
@@ -315,6 +317,8 @@ class PlaybackViewModel : ViewModel(), PlaybackStateManager.Callback {
fun save(context: Context) {
viewModelScope.launch {
playbackManager.saveStateToDatabase(context)
+
+ context.getString(R.string.debug_state_saved).createToast(context)
}
}
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
index c844c78f0..55d0b4ca1 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
@@ -21,7 +21,6 @@ import org.oxycblt.auxio.recycler.DisplayMode
import org.oxycblt.auxio.settings.ui.AccentAdapter
import org.oxycblt.auxio.ui.ACCENTS
import org.oxycblt.auxio.ui.Accent
-import org.oxycblt.auxio.ui.createToast
/**
* The actual fragment containing the settings menu. Inherits [PreferenceFragmentCompat].
@@ -134,7 +133,6 @@ class SettingsListFragment : PreferenceFragmentCompat() {
SettingsManager.Keys.KEY_DEBUG_SAVE -> {
onPreferenceClickListener = Preference.OnPreferenceClickListener {
playbackModel.save(requireContext())
- getString(R.string.debug_state_saved).createToast(requireContext())
true
}
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt b/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
index 98167bd98..f199e52db 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
@@ -25,6 +25,8 @@ import com.google.android.material.button.MaterialButton
import org.oxycblt.auxio.R
import org.oxycblt.auxio.logE
+// A Variety of shortcut, convenience, hacks, and extension functions used across Auxio.
+
// --- VIEW CONFIGURATION ---
/**
@@ -48,17 +50,17 @@ fun TextView.setTextColorResource(@ColorRes color: Int) {
}
/**
- * Apply accents to a [MaterialButton]
+ * Apply accents to a [MaterialButton] manually.
+ * Yes, I could change my theming to Material but that would have so many second-and-third order
+ * effects that I *really* dont want to deal with it. This hack works.
* @param highlighted Whether the MaterialButton has an "Unimportant" style or not.
* Required because you cant determine a style of a view before API 29
*/
fun MaterialButton.applyAccents(highlighted: Boolean) {
- val accent = Accent.get().color.toColor(context)
-
if (highlighted) {
- backgroundTintList = ColorStateList.valueOf(accent)
+ backgroundTintList = Accent.get().color.toStateList(context)
} else {
- setTextColor(accent)
+ setTextColor(Accent.get().color.toColor(context))
}
}
@@ -84,7 +86,7 @@ fun String.createToast(context: Context) {
/**
* Ensure that a not-null [AppCompatActivity] will be returned.
- * @throws IllegalStateException When there is no activity or if the activity is null
+ * @throws IllegalStateException When there is no [AppCompatActivity] or if the activity is null
*/
fun Fragment.requireCompatActivity(): AppCompatActivity {
val activity = requireActivity()
@@ -127,6 +129,7 @@ fun Int.toColor(context: Context): Int {
* Resolve a color and turn it into a [ColorStateList]
* @param context [Context] required
* @return The resolved color as a [ColorStateList]
+ * @see toColor
*/
fun Int.toStateList(context: Context): ColorStateList = ColorStateList.valueOf(toColor(context))
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b5c3d981e..99b28a019 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -23,7 +23,7 @@
Zum Album gehen
Warteschlange
Zur Warteschlange hinzufügen
- der Warteschlange hinzugefügt
+ Der Warteschlange hinzugefügt
Nächsten im Warteschlange
Über
Version
@@ -55,7 +55,7 @@
Shuffle-Einstellung merken
Laden die Musik fehlgeschlagen
Link könnte nicht geöffnet werden
- Suchen deine Musikbibliothek…
+ Durchsuche deine Musikbibliothek…
Albumcover für %s
Künstlerbild für %s
Genrebild für %s
@@ -88,18 +88,18 @@
Unbekanntes Genre
Unbekannter Künstler
Unbekanntes Album
- Lieden geladen: %d
+ Lieder geladen: %d
Entwickelt von OxygenCobalt
Abspielen
Pausieren
Auxio-Icon
- Löschen Suchanfrage
+ "Suchanfrage Löschen "
Art die Wiederholung ändern
Zufällig ausschalten
Zufällig anschalten
- zu letzter Lied springen
- Springt zu nächster springen
- Warteschlange Entleeren
+ Zu letzter Lied springen
+ Zu nächster Lied springen
+ Warteschlange entleeren
Pausieren wenn anderes Audio abspielt [Bsp. Alarme]
Abspielen/Pausieren wenn der Kopfhöreranschluss ändern
Zufällig-Aktionstaste Vorziehen
@@ -117,7 +117,7 @@
Ändere Aktionstaste verwenden
Lassen Zufällig an, wenn ein neues Lied anspielen
Ausschalten zu Speicherverbrauch sparen
- Zeigen Albumcover an der Benachrichtigung
+ Albumcover am Benachrichtigung zeigen
Verbesst die Albumcover Qualität, jedoch die Ladezeit und höher Speicherverbrauch beeinträchtigt
Zurückspulen, bevor zurück springen
Ein einfacher und flexibeler Musik-Player für Android
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 983672cd9..71ba37be9 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -56,4 +56,18 @@
Γκρί
Γαλάζιος Γκρί
Τραγούδια φορτώθηκε: %d
+
+ - %d Τραγούδι
+ - %d Τραγούδια
+
+
+
+ - %d Άλμπουμ
+ - %d Άλμπουμ
+
+ Διακοπή
+ Α-Ω
+ Ω-Α
+ Προεπιλεγμένη
+ Παράληψη των Media Store εξωφύλλων
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c0cb9c146..0fa9ff8e8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -81,4 +81,5 @@
Busca en tu biblioteca…
Conexión de auriculares
+ Ignorar imágenes de la librería del sistema
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e9e704ab3..ddda52300 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -63,7 +63,7 @@
Titres chargés: %d
Titres
Ajouter à la file d\'attente
- Bibliothèque Objets
+ Objets Bibliothèque
Rouge
Morceau %d
@@ -80,4 +80,5 @@
Développé par OxygenCobalt
Branchement du casque
Recherche dans votre bibliothèque…
+ Ignorer le stockage des pochettes
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 79639dc0c..0ef12c2e2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -80,4 +80,5 @@
Cerca nella tua libreria…
Inserimento cuffie
+ Ignora le copertine del Media Store
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6f16ad4f6..a6a81cc62 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -75,4 +75,5 @@
- %d Álbum
- %d Álbuns
+ Ignorar capas Media Store
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 0bb315c5f..e1797633e 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -61,6 +61,11 @@
Moreno
Grisalho
Azul-grisalho
+ Músicas carregado: %d
+ Sobre
+ Versão
+ Ver no GitHub
+ Licenças
- %d Música
- %d Músicas
@@ -70,5 +75,5 @@
- %d Álbum
- %d Álbuns
- Músicas carregado: %d
+ Ignorar capas Media Store
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 000000000..5dddcc7d4
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,79 @@
+
+
+ Повторить попытку
+ Разрешить
+ Библиотека
+ Жанры
+ Исполнители
+ Альбомы
+ Треки
+ Треки
+ Поиск в библиотеке…
+ Поиск
+ Фильтр
+ Всё
+ Сортировка
+ По умолчанию
+ А-Я
+ Я-А
+ Сейчас воспроизводится
+ Воспроизвести
+ Перемешать
+ Перейти к исполнителю
+ Перейти к альбому
+ Очередь
+ Добавить в очередь
+ Добавлена в очередь
+ Далее
+ О программе
+ Версия
+ Открыть на GitHub
+ Лицензии
+ Настройки
+ Вид экрана воспроизведения
+ Тема
+ Темная
+ Светлая
+ Цвет акцента
+ Автоматически
+ Цветное уведомление
+ Аудио
+ Фокусировка аудио
+ Гарнитура
+ Поведение
+ Продолжить
+ Стоп
+ Запомнить перемешивание
+ Музыка не найдена
+ Трек %d
+ Ошибка
+ Очистить очередь
+ Воспроизвести
+ Пауза
+ Расный
+ Розовый
+ Пурпурный
+ Голубой
+ Зелёный
+ Светло-Зелёный
+ Оранжевый
+ Жёлтый
+ Коричневый
+ Седой
+ Нейтральный
+ Треки загружено: %d
+
+ - %d Песня
+ - %d Песни
+ - %d Песен
+ - %d Треки
+
+
+
+ - %d Альбом
+ - %d Альбома
+ - %d Альбомов
+ - %d Альбомы
+
+ Игнорировать хранилище обложек альбомов
+
\ No newline at end of file