gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 18:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-28 11:36:54 +01:00
parent 0857938d94
commit 818d15dbec
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
View File

@ -110,7 +110,6 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
if (it is MainActivity) { if (it is MainActivity) {
it.searchCardView?.isVisible = value it.searchCardView?.isVisible = value
it.floatingActionButton?.isVisible = value it.floatingActionButton?.isVisible = value
it.inputEditText?.hint = getSearchHint()
val layoutParams = it.toolbar.layoutParams as AppBarLayout.LayoutParams val layoutParams = it.toolbar.layoutParams as AppBarLayout.LayoutParams
@ -178,8 +177,10 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
val title = getTitle() val title = getTitle()
val actionBar = actionBar val actionBar = actionBar
if (title != null && actionBar != null) { if (title != null && actionBar != null && !getIsUsingSearchLayout()) {
actionBar.title = title actionBar.title = title
} else if (title != null && activity is MainActivity) {
activity?.inputEditText?.hint = title
} }
} }
@ -215,5 +216,4 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
} }
open fun getIsUsingSearchLayout(): Boolean = false open fun getIsUsingSearchLayout(): Boolean = false
open fun getSearchHint(): String? = null
} }

6
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
View File

@ -291,12 +291,8 @@ class ConversationsListView : BaseView() {
return true return true
} }
override fun getSearchHint(): String? {
return resources?.getString(R.string.nc_search_conversations)
}
override fun getTitle(): String? { override fun getTitle(): String? {
return resources?.getString(R.string.nc_app_name) return resources?.getString(R.string.nc_search_conversations)
} }
override fun onRestoreViewState(view: View, savedViewState: Bundle) { override fun onRestoreViewState(view: View, savedViewState: Bundle) {