gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 13:09:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle FAB differently

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

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

@ -129,6 +129,7 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
if (changeType == ControllerChangeType.POP_EXIT || changeType == ControllerChangeType.PUSH_EXIT) { if (changeType == ControllerChangeType.POP_EXIT || changeType == ControllerChangeType.PUSH_EXIT) {
activity?.inputEditText?.text = null activity?.inputEditText?.text = null
searchLayout?.searchProgressBar?.isVisible = false searchLayout?.searchProgressBar?.isVisible = false
floatingActionButton?.isVisible = false
} }
super.onChangeStarted(changeHandler, changeType) super.onChangeStarted(changeHandler, changeType)
} }
@ -143,7 +144,6 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
activity?.let { activity?.let {
if (it is MainActivity) { if (it is MainActivity) {
searchLayout?.isVisible = value searchLayout?.isVisible = value
floatingActionButton?.isVisible = value
floatingActionButton?.setImageResource(getFloatingActionButtonDrawableRes()) floatingActionButton?.setImageResource(getFloatingActionButtonDrawableRes())
it.toolbar.isVisible = !value it.toolbar.isVisible = !value

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

@ -142,6 +142,11 @@ class ConversationsListView : BaseView() {
return view return view
} }
override fun onAttach(view: View) {
super.onAttach(view)
floatingActionButton?.isVisible = true
}
private fun setSearchQuery(query: CharSequence?) { private fun setSearchQuery(query: CharSequence?) {
viewModel.filterLiveData.postValue(query) viewModel.filterLiveData.postValue(query)
} }

1
app/src/main/res/layout/activity_main.xml
View File

@ -66,6 +66,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="16dp" android:layout_margin="16dp"
android:visibility="gone"
app:backgroundTint="@color/colorPrimary" app:backgroundTint="@color/colorPrimary"
app:srcCompat="@drawable/ic_add_white_24px" app:srcCompat="@drawable/ic_add_white_24px"
app:tint="@color/white" /> app:tint="@color/white" />