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:
commit
82d0dd544d
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue