Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source 
Update kotlin to 1.5.0 and the android gradle plugin to 4.2.0.
This commit is contained in:
OxygenCobalt 2021-05-05 20:11:48 -06:00
parent a849d00248
commit 7c457d5773
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -65,7 +65,7 @@ dependencies {
// General // General
implementation "androidx.core:core-ktx:1.3.2" 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' implementation 'androidx.fragment:fragment-ktx:1.3.3'
// UI // UI
@ -86,7 +86,7 @@ dependencies {
// Media // Media
// TODO: Migrate to media2 when I can figure out how to use it // 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 // Preferences
implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.preference:preference-ktx:1.1.1"

6
app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
View file

@ -81,13 +81,13 @@ class SongsFragment : Fragment() {
// If the name actually starts with "The" or "A", get the character *after* that word. // 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. // Yes, this is stupidly english centric but it wont run with other languages.
if (length > 5 && startsWith("the ", true)) { if (length > 5 && startsWith("the ", true)) {
return get(4).toUpperCase() return get(4).uppercaseChar()
} }
if (length > 3 && startsWith("a ", true)) { if (length > 3 && startsWith("a ", true)) {
return get(2).toUpperCase() return get(2).uppercaseChar()
} }
return get(0).toUpperCase() return get(0).uppercaseChar()
} }
} }

3
app/src/main/java/org/oxycblt/auxio/ui/Accent.kt
View file

@ -9,7 +9,6 @@ import androidx.annotation.StringRes
import androidx.annotation.StyleRes import androidx.annotation.StyleRes
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import java.util.Locale
/** /**
* A list of all possible accents. * A list of all possible accents.
@ -55,7 +54,7 @@ data class Accent(@ColorRes val color: Int, @StyleRes val theme: Int, @StringRes
@SuppressLint("ResourceType") @SuppressLint("ResourceType")
fun getDetailedSummary(context: Context): Spanned { fun getDetailedSummary(context: Context): Spanned {
val name = context.getString(name) val name = context.getString(name)
val hex = context.getString(color).toUpperCase(Locale.getDefault()) val hex = context.getString(color).uppercase()
return HtmlCompat.fromHtml( return HtmlCompat.fromHtml(
context.getString(R.string.format_accent_summary, name, hex), context.getString(R.string.format_accent_summary, name, hex),

4
build.gradle
View file

@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = "1.4.32" ext.kotlin_version = "1.5.0"
ext.navigation_version = "2.3.5" ext.navigation_version = "2.3.5"
repositories { repositories {
@ -9,7 +9,7 @@ buildscript {
} }
dependencies { 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 "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"