From a707b3f7d1105edb7fa0c2a8e786939639efeee2 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 30 Jan 2020 07:01:34 +0100 Subject: [PATCH] Handle FAB differently Signed-off-by: Mario Danic --- .../com/nextcloud/talk/controllers/base/BaseController.kt | 2 +- .../features/conversationsList/ConversationsListView.kt | 5 +++++ app/src/main/res/layout/activity_main.xml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt index 34db2cf55..34cf9a36b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt @@ -129,6 +129,7 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks { if (changeType == ControllerChangeType.POP_EXIT || changeType == ControllerChangeType.PUSH_EXIT) { activity?.inputEditText?.text = null searchLayout?.searchProgressBar?.isVisible = false + floatingActionButton?.isVisible = false } super.onChangeStarted(changeHandler, changeType) } @@ -143,7 +144,6 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks { activity?.let { if (it is MainActivity) { searchLayout?.isVisible = value - floatingActionButton?.isVisible = value floatingActionButton?.setImageResource(getFloatingActionButtonDrawableRes()) it.toolbar.isVisible = !value diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt index 843093976..0abc664d7 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt @@ -142,6 +142,11 @@ class ConversationsListView : BaseView() { return view } + override fun onAttach(view: View) { + super.onAttach(view) + floatingActionButton?.isVisible = true + } + private fun setSearchQuery(query: CharSequence?) { viewModel.filterLiveData.postValue(query) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index eb48468df..c4e6dbf34 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -66,6 +66,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="16dp" + android:visibility="gone" app:backgroundTint="@color/colorPrimary" app:srcCompat="@drawable/ic_add_white_24px" app:tint="@color/white" />