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:
commit
8c0f96ad42
|
@ -171,7 +171,7 @@ dependencies {
|
||||||
implementation("androidx.preference:preference-ktx:1.2.0")
|
implementation("androidx.preference:preference-ktx:1.2.0")
|
||||||
implementation("androidx.recyclerview:recyclerview:1.2.1")
|
implementation("androidx.recyclerview:recyclerview:1.2.1")
|
||||||
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
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.android.support.constraint:constraint-layout:2.0.4")
|
||||||
|
|
||||||
implementation("com.google.android.exoplayer:exoplayer-core:2.18.1")
|
implementation("com.google.android.exoplayer:exoplayer-core:2.18.1")
|
||||||
|
|
|
@ -188,7 +188,7 @@ class MainActivity : AppCompatActivity() {
|
||||||
super.onBackPressed()
|
super.onBackPressed()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
|
override fun onPrepareOptionsMenu(menu: Menu): Boolean {
|
||||||
this.menu = menu
|
this.menu = menu
|
||||||
|
|
||||||
return super.onPrepareOptionsMenu(menu)
|
return super.onPrepareOptionsMenu(menu)
|
||||||
|
|
Loading…
Reference in New Issue