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/com.google.android.material-material-1.x' into 'develop' 

Update dependency com.google.android.material:material to v1.7.0

See merge request funkwhale/funkwhale-android!253
This commit is contained in:
Ryan Harg 2022-12-08 09:23:58 +00:00
parent 6c652f2735 9f7f0294f6
commit 8c0f96ad42
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -171,7 +171,7 @@ dependencies {
implementation("androidx.preference:preference-ktx:1.2.0")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.google.android.material:material:1.6.1")
implementation("com.google.android.material:material:1.7.0")
implementation("com.android.support.constraint:constraint-layout:2.0.4")
implementation("com.google.android.exoplayer:exoplayer-core:2.18.1")

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

@ -188,7 +188,7 @@ class MainActivity : AppCompatActivity() {
super.onBackPressed()
}
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
override fun onPrepareOptionsMenu(menu: Menu): Boolean {
this.menu = menu
return super.onPrepareOptionsMenu(menu)