From 7b5e817d3bf1fcfc77cf2fe116edd4a7142d9fd7 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Sat, 26 Jun 2021 19:53:57 -0600 Subject: [PATCH] all: cleanup code Cleanup the codebase in general: - Remove useless resources - Upgrade kotlin to 1.5.2 - Upgrade coil to 1.2.2 --- app/build.gradle | 2 +- .../org/oxycblt/auxio/music/MusicStore.kt | 1 - .../auxio/playback/PlaybackFragment.kt | 3 - .../system/PlaybackSessionConnector.kt | 2 + .../org/oxycblt/auxio/recycler/SortMode.kt | 1 - .../oxycblt/auxio/settings/AboutFragment.kt | 2 - .../oxycblt/auxio/settings/SettingsCompat.kt | 2 +- .../settings/blacklist/BlacklistViewModel.kt | 2 +- .../layout-land/fragment_compact_playback.xml | 2 +- .../res/layout/fragment_compact_playback.xml | 2 +- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - app/src/main/res/values/styles_android.xml | 1 + app/src/main/res/values/styles_component.xml | 117 ++++++++++-------- app/src/main/res/values/styles_core.xml | 4 +- app/src/main/res/values/themes_black.xml | 4 - build.gradle | 2 +- info/ADDITIONS.md | 2 +- 35 files changed, 78 insertions(+), 90 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 54be9765b..c0f55200a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,7 +94,7 @@ dependencies { implementation "com.google.android.exoplayer:exoplayer-core:2.14.1" // Image loading - implementation "io.coil-kt:coil:1.2.1" + implementation 'io.coil-kt:coil:1.2.2' // Material implementation "com.google.android.material:material:1.3.0" diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt index dda7df0c9..3934d0b37 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt @@ -14,7 +14,6 @@ import java.lang.Exception * The main storage for music items. Use [MusicStore.getInstance] to get the single instance of it. * @author OxygenCobalt * TODO: Modernize the blacklist system to Android 10+ - * TODO: Investigate issue where flac files have no years */ class MusicStore private constructor() { private var mGenres = listOf() diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt index 3313d0cb3..378f59eca 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt @@ -36,9 +36,6 @@ class PlaybackFragment : Fragment(), SeekBar.OnSeekBarChangeListener { container: ViewGroup?, savedInstanceState: Bundle? ): View { - // TODO: Add a swipe-to-next-track function using a ViewPager - // Would require writing my own variant though to avoid index updates - val normalTextColor = binding.playbackDurationCurrent.currentTextColor val accentColor = Accent.get().getStateList(requireContext()) val controlColor = R.color.control_color.toStateList(requireContext()) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackSessionConnector.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackSessionConnector.kt index 91578bc28..3e220b136 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackSessionConnector.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackSessionConnector.kt @@ -160,9 +160,11 @@ class PlaybackSessionConnector( private fun getPlayerState(): Int { if (playbackManager.song == null) { + // No song, player should be stopped return PlaybackStateCompat.STATE_STOPPED } + // Otherwise play/pause return if (playbackManager.isPlaying) { PlaybackStateCompat.STATE_PLAYING } else { diff --git a/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt b/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt index 6c2c6e708..a91ed3cf9 100644 --- a/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt +++ b/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt @@ -15,7 +15,6 @@ import org.oxycblt.auxio.music.Song * off the given sorting mode. * @property iconRes The icon for this [SortMode] * @author OxygenCobalt - * TODO: Make SortMode use title case [skip the/a(n)] */ enum class SortMode(@DrawableRes val iconRes: Int) { // Icons for each mode are assigned to the enums themselves diff --git a/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt index cadcc93e8..2d9edaa5d 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt @@ -92,7 +92,5 @@ class AboutFragment : Fragment() { private const val LINK_CODEBASE = "https://github.com/oxygencobalt/Auxio" private const val LINK_FAQ = "$LINK_CODEBASE/blob/master/info/FAQ.md" private const val LINK_LICENSES = "$LINK_CODEBASE/blob/master/info/LICENSES.md" - - const val TAG = "TAG_ABOUT_DIALOG" } } diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsCompat.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsCompat.kt index 6e7cc0360..9e7510fd8 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsCompat.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsCompat.kt @@ -8,7 +8,7 @@ import org.oxycblt.auxio.recycler.DisplayMode import org.oxycblt.auxio.ui.ACCENTS import org.oxycblt.auxio.ui.Accent -// A couple of utils for migrating from old settings values to the new the new +// A couple of utils for migrating from old settings values to the new // formats used in 1.3.2 & 1.4.0 fun handleThemeCompat(prefs: SharedPreferences): Int { diff --git a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistViewModel.kt b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistViewModel.kt index 7181e0839..b6caf9867 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistViewModel.kt @@ -73,7 +73,7 @@ class BlacklistViewModel(context: Context) : ViewModel() { } /** - * Check if changes have been made to the viewmodel's paths. + * Check if changes have been made to the ViewModel's paths. */ fun isModified() = dbPaths != paths.value diff --git a/app/src/main/res/layout-land/fragment_compact_playback.xml b/app/src/main/res/layout-land/fragment_compact_playback.xml index f993ef49e..1aa1631c7 100644 --- a/app/src/main/res/layout-land/fragment_compact_playback.xml +++ b/app/src/main/res/layout-land/fragment_compact_playback.xml @@ -67,7 +67,7 @@ Alles Sortierung - Standard Aufsteigend Absteigend diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8975cd108..c70a77db5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -16,7 +16,6 @@ Όλα Σειρά Διάταξης - Προεπιλεγμένη Αναπαραγωγή Τυχαία diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4a746c7ee..d50baebfc 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -16,7 +16,6 @@ Todo Ordenamiento - Predefinido Ascendente Descendente diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f7caa555b..b361d5b9e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -16,7 +16,6 @@ Tout Tri - Défaut Ascendant Descendant diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index f12585e14..667eff8aa 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -15,7 +15,6 @@ सारे क्रमबद्ध - डिफ़ॉल्ट चलाएं शफ़ल diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index dd76b9631..d8fdfb60c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -16,7 +16,6 @@ Összes Összes - Alapértelmezett Növekvő Csökkenő diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7a8be9842..8d6573dd1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -16,7 +16,6 @@ Semua Urutan - Bawaan Naik Turun diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ba89fc8ab..0ea3433ee 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -16,7 +16,6 @@ Tutto Ordine - Predefinito Ascendente Discendente diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index fe083662a..e4ad25f72 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -16,7 +16,6 @@ 전부 분류 - 기본 오름차순 내림차순 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 01ecb82b0..ed2a971a2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -20,7 +20,6 @@ Alles Sorteren - Standaard Oplopend Aflopend diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d447d87e2..903cf7a77 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -16,7 +16,6 @@ Wszystkie Sortowanie - Domyślne Rosnąco Malejąco diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 73b1e6c6a..84950caa4 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -16,7 +16,6 @@ Tudo Classificação - Padrão Descendente Reproduzir diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ddfc422c5..aa87d04c1 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -16,7 +16,6 @@ Tudo Classificação - Padrão Ascendente Descendente diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c23ea0f8d..274e5591b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -16,7 +16,6 @@ Tot Sortare - În mod implicit Crescător Descrescător diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ae53f62a7..e3fa6732b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -16,7 +16,6 @@ Всё Сортировка - По умолчанию По возрастанию По убыванию diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 85a94cd88..c9e411601 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -16,7 +16,6 @@ Tümü Sıralama - Varsayılan Artan Azalan diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 95ebc3cd1..91fa4a3cd 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -16,7 +16,6 @@ Усе Сортування - За замовчуванням Відтворити Перемішати diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7ae251653..9df520f95 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -16,7 +16,6 @@ 全部 排序 - 默認 升序排列 降序排列 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 162873eb7..ee705e126 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,7 +21,6 @@ All Sort - Default Ascending Descending diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml index f148817d1..301ab6da6 100644 --- a/app/src/main/res/values/styles_android.xml +++ b/app/src/main/res/values/styles_android.xml @@ -9,6 +9,7 @@ 0dp + diff --git a/app/src/main/res/values/styles_component.xml b/app/src/main/res/values/styles_component.xml index c519d9342..2e840279a 100644 --- a/app/src/main/res/values/styles_component.xml +++ b/app/src/main/res/values/styles_component.xml @@ -30,7 +30,7 @@ @drawable/ui_small_unbounded_ripple - + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + - - + - + + - \ No newline at end of file diff --git a/build.gradle b/build.gradle index c06fd29af..7ff99377b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.5.10" + ext.kotlin_version = "1.5.20" ext.navigation_version = "2.3.5" repositories { diff --git a/info/ADDITIONS.md b/info/ADDITIONS.md index 4d410710f..6659917a5 100644 --- a/info/ADDITIONS.md +++ b/info/ADDITIONS.md @@ -25,4 +25,4 @@ Feel free to fork Auxio to add your own feature set however. - Lyrics [#19] - Recently added list[#18] - Folder View/Grouping [#10] -- Replaygain [#7] +- ReplayGain [#7]