From 93762609ab94937111b6b13711c74cdd8d3661d1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 28 Nov 2017 17:30:41 -0500 Subject: [PATCH] Manage visibility for compose bar --- .../moez/QKSMS/common/util/extensions/ViewExtensions.kt | 4 ++++ .../moez/QKSMS/presentation/compose/ComposeActivity.kt | 9 +++++---- qksms/src/main/res/layout/compose_activity.xml | 8 ++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt index fcbcac2d..7762056e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt @@ -27,4 +27,8 @@ fun View.setMargins(left: Int? = null, top: Int? = null, right: Int? = null, bot fun View.setPadding(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) { setPadding(left ?: paddingLeft, top ?: paddingTop, right ?: paddingRight, bottom ?: paddingBottom) +} + +fun View.setVisible(visible: Boolean, invisible: Int = View.GONE) { + visibility = if (visible) View.VISIBLE else invisible } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index 4e99ed0a..341d20fe 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -4,7 +4,6 @@ import android.app.AlertDialog import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView -import android.view.View import com.google.android.flexbox.FlexboxLayoutManager import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges @@ -12,6 +11,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.util.ThemeManager import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.presentation.base.QkActivity @@ -65,9 +65,10 @@ class ComposeActivity : QkActivity(), ComposeView { } override fun render(state: ComposeState) { - toolbarTitle.visibility = if (state.editingMode) View.GONE else View.VISIBLE - chips.visibility = if (state.editingMode) View.VISIBLE else View.GONE - contacts.visibility = if (state.editingMode) View.VISIBLE else View.GONE + toolbarTitle.setVisible(!state.editingMode) + chips.setVisible(state.editingMode) + contacts.setVisible(state.editingMode) + composeBar.setVisible(!state.editingMode || state.selectedContacts.isNotEmpty()) if (chipsAdapter.data !== state.selectedContacts) { chipsAdapter.data = state.selectedContacts diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml index 2760f0a4..4ff8b5d2 100644 --- a/qksms/src/main/res/layout/compose_activity.xml +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -6,7 +6,9 @@ android:background="@color/backgroundLight" android:orientation="vertical"> - + + android:paddingTop="8dp" + tools:visibility="gone" />