Funkwhale
/
funkwhale-app-android
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale-android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'renovate/io.insert-koin-koin-core-3.x' into 'develop' 

Update dependency io.insert-koin:koin-core to v3.2.2

See merge request funkwhale/funkwhale-android!255
This commit is contained in:
Ryan Harg 2022-12-07 11:00:50 +00:00
parent 10e67f1e80 159c7d8d47
commit 82d0dd544d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle.kts
View File

@ -173,9 +173,9 @@ dependencies {
implementation("com.google.android.exoplayer:exoplayer-ui:2.18.1")
implementation("com.google.android.exoplayer:extension-mediasession:2.18.1")
implementation("io.insert-koin:koin-core:3.1.2")
implementation("io.insert-koin:koin-android:3.1.2")
testImplementation("io.insert-koin:koin-test:3.1.2")
implementation("io.insert-koin:koin-core:3.2.2")
implementation("io.insert-koin:koin-android:3.2.2")
testImplementation("io.insert-koin:koin-test:3.2.2")
implementation("com.github.PaulWoitaschek.ExoPlayer-Extensions:extension-opus:789a4f83169cff5c7a91655bb828fde2cfde671a") {
isTransitive = false

8
app/src/main/java/audio/funkwhale/ffa/activities/MainActivity.kt
View File

@ -194,16 +194,16 @@ class MainActivity : AppCompatActivity() {
return super.onPrepareOptionsMenu(menu)
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.toolbar, menu)
menu?.findItem(R.id.nav_all_music)?.let {
menu.findItem(R.id.nav_all_music)?.let {
it.isChecked = Settings.getScopes().contains("all")
it.isEnabled = !it.isChecked
}
menu?.findItem(R.id.nav_my_music)?.isChecked = Settings.getScopes().contains("me")
menu?.findItem(R.id.nav_followed)?.isChecked = Settings.getScopes().contains("subscribed")
menu.findItem(R.id.nav_my_music)?.isChecked = Settings.getScopes().contains("me")
menu.findItem(R.id.nav_followed)?.isChecked = Settings.getScopes().contains("subscribed")
return true
}