diff --git a/app/build.gradle b/app/build.gradle index 142447021..ac26f5996 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,7 +65,7 @@ dependencies { // General implementation "androidx.core:core-ktx:1.3.2" - implementation "androidx.activity:activity-ktx:1.2.2" + implementation "androidx.activity:activity-ktx:1.2.3" implementation 'androidx.fragment:fragment-ktx:1.3.3' // UI @@ -86,7 +86,7 @@ dependencies { // Media // TODO: Migrate to media2 when I can figure out how to use it - implementation "androidx.media:media:1.3.0" + implementation "androidx.media:media:1.3.1" // Preferences implementation "androidx.preference:preference-ktx:1.1.1" diff --git a/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt b/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt index 796803174..06ad68c64 100644 --- a/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt @@ -81,13 +81,13 @@ class SongsFragment : Fragment() { // If the name actually starts with "The" or "A", get the character *after* that word. // Yes, this is stupidly english centric but it wont run with other languages. if (length > 5 && startsWith("the ", true)) { - return get(4).toUpperCase() + return get(4).uppercaseChar() } if (length > 3 && startsWith("a ", true)) { - return get(2).toUpperCase() + return get(2).uppercaseChar() } - return get(0).toUpperCase() + return get(0).uppercaseChar() } } diff --git a/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt b/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt index b8800c1f5..0c5564e5c 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt @@ -9,7 +9,6 @@ import androidx.annotation.StringRes import androidx.annotation.StyleRes import androidx.core.text.HtmlCompat import org.oxycblt.auxio.R -import java.util.Locale /** * A list of all possible accents. @@ -55,7 +54,7 @@ data class Accent(@ColorRes val color: Int, @StyleRes val theme: Int, @StringRes @SuppressLint("ResourceType") fun getDetailedSummary(context: Context): Spanned { val name = context.getString(name) - val hex = context.getString(color).toUpperCase(Locale.getDefault()) + val hex = context.getString(color).uppercase() return HtmlCompat.fromHtml( context.getString(R.string.format_accent_summary, name, hex), diff --git a/build.gradle b/build.gradle index 287035c01..c952c1b34 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.4.32" + ext.kotlin_version = "1.5.0" ext.navigation_version = "2.3.5" repositories { @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:4.1.3" + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"