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

Fix the icon issues

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-09 15:09:05 +01:00
parent e105eef2a8
commit eca83fef93
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -644,6 +644,7 @@ class ChatController(args: Bundle) : BaseController(), MessagesListAdapter
override fun onAttach(view: View) { override fun onAttach(view: View) {
super.onAttach(view) super.onAttach(view)
setTitle()
eventBus.register(this) eventBus.register(this)
if (conversationUser?.userId != "?" && conversationUser?.hasSpreedFeatureCapability( if (conversationUser?.userId != "?" && conversationUser?.hasSpreedFeatureCapability(

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

@ -99,6 +99,7 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
} }
override fun onChangeStarted(changeHandler: ControllerChangeHandler, changeType: ControllerChangeType) { override fun onChangeStarted(changeHandler: ControllerChangeHandler, changeType: ControllerChangeType) {
actionBar?.setIcon(null)
setOptionsMenuHidden(true) setOptionsMenuHidden(true)
super.onChangeStarted(changeHandler, changeType) super.onChangeStarted(changeHandler, changeType)
} }
@ -129,7 +130,6 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
} }
it.container.layoutParams = layoutParamsForContainer it.container.layoutParams = layoutParamsForContainer
it.toolbar.layoutParams = layoutParams it.toolbar.layoutParams = layoutParams
it.toolbar.forceLayout()
} }
} }