gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-14 23:45:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2514 from nextcloud/dependabot/gradle/com.google.android.material-material-1.7.0

Browse Source 
Bump material from 1.6.1 to 1.7.0
This commit is contained in:
Tim Krüger 2022-11-19 18:21:20 +01:00 committed by GitHub
commit 76c7e34102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -36,7 +36,7 @@ apply plugin: "org.jlleitschuh.gradle.ktlint"
apply plugin: 'kotlinx-serialization' apply plugin: 'kotlinx-serialization'
android { android {
compileSdkVersion 31 compileSdkVersion 32
buildToolsVersion '33.0.0' buildToolsVersion '33.0.0'
namespace 'com.nextcloud.talk' namespace 'com.nextcloud.talk'
@ -175,7 +175,7 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "com.vanniktech:emoji-google:0.15.0" implementation "com.vanniktech:emoji-google:0.15.0"
implementation group: 'androidx.emoji', name: 'emoji-bundled', version: '1.1.0' implementation group: 'androidx.emoji', name: 'emoji-bundled', version: '1.1.0'

2
app/src/main/java/com/nextcloud/talk/activities/FullScreenImageActivity.kt
View File

@ -46,7 +46,7 @@ class FullScreenImageActivity : AppCompatActivity() {
private lateinit var path: String private lateinit var path: String
private var showFullscreen = false private var showFullscreen = false
override fun onCreateOptionsMenu(menu: Menu?): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_preview, menu) menuInflater.inflate(R.menu.menu_preview, menu)
return true return true
} }

2
app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt
View File

@ -49,7 +49,7 @@ class FullScreenMediaActivity : AppCompatActivity(), Player.Listener {
private lateinit var path: String private lateinit var path: String
private lateinit var player: SimpleExoPlayer private lateinit var player: SimpleExoPlayer
override fun onCreateOptionsMenu(menu: Menu?): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_preview, menu) menuInflater.inflate(R.menu.menu_preview, menu)
return true return true
} }

2
app/src/main/java/com/nextcloud/talk/activities/FullScreenTextViewerActivity.kt
View File

@ -50,7 +50,7 @@ class FullScreenTextViewerActivity : AppCompatActivity() {
private lateinit var path: String private lateinit var path: String
override fun onCreateOptionsMenu(menu: Menu?): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_preview, menu) menuInflater.inflate(R.menu.menu_preview, menu)
return true return true
} }

6
app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt
View File

@ -210,13 +210,13 @@ class MessageSearchActivity : BaseActivity() {
binding.emptyContainer.emptyListView.visibility = View.VISIBLE binding.emptyContainer.emptyListView.visibility = View.VISIBLE
} }
override fun onCreateOptionsMenu(menu: Menu?): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_search, menu) menuInflater.inflate(R.menu.menu_search, menu)
return true return true
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
val menuItem = menu!!.findItem(R.id.action_search) val menuItem = menu.findItem(R.id.action_search)
searchView = menuItem.actionView as SearchView searchView = menuItem.actionView as SearchView
setupSearchView() setupSearchView()
menuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { menuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {

2
app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt
View File

@ -180,7 +180,7 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe
showList() showList()
} }
override fun onCreateOptionsMenu(menu: Menu?): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
super.onCreateOptionsMenu(menu) super.onCreateOptionsMenu(menu)
menuInflater.inflate(R.menu.menu_share_files, menu) menuInflater.inflate(R.menu.menu_share_files, menu)
filesSelectionDoneMenuItem = menu?.findItem(R.id.files_selection_done) filesSelectionDoneMenuItem = menu?.findItem(R.id.files_selection_done)