From c3b275aba30e9a4365c1de4c5c4efde344ef3770 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 28 Mar 2018 02:56:02 -0400 Subject: [PATCH] Add compose layout for qk reply --- .../java/feature/qkreply/QkReplyActivity.kt | 48 +++++++++++- .../drawable/rounded_rectangle_bottom_4dp.xml | 29 ++++++++ .../src/main/res/layout/qkreply_activity.xml | 73 ++++++++++++++++++- 3 files changed, 146 insertions(+), 4 deletions(-) create mode 100755 presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt index 3e87aef6..843c4227 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt @@ -18,8 +18,10 @@ */ package feature.qkreply +import android.content.res.ColorStateList import android.os.Bundle import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView import android.view.ViewGroup import android.view.Window import android.view.WindowManager @@ -30,6 +32,7 @@ import common.base.QkThemedActivity import common.util.extensions.setBackgroundTint import feature.compose.MessagesAdapter import injection.appComponent +import io.reactivex.rxkotlin.Observables import kotlinx.android.synthetic.main.qkreply_activity.* import javax.inject.Inject @@ -53,20 +56,61 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) viewModel.bindView(this) - colors.composeBackground + colors.background + .doOnNext { color -> background.setBackgroundTint(color) } + .doOnNext { color -> composeGradient.setBackgroundTint(color) } + .doOnNext { color -> composeBackground.setBackgroundTint(color) } .autoDisposable(scope()) - .subscribe { color -> background.setBackgroundTint(color) } + .subscribe() + + theme + .autoDisposable(scope()) + .subscribe { color -> send.setBackgroundTint(color) } + + val states = arrayOf( + intArrayOf(android.R.attr.state_enabled), + intArrayOf(-android.R.attr.state_enabled)) + + val iconEnabled = threadId + .distinctUntilChanged() + .switchMap { threadId -> colors.textPrimaryOnThemeForConversation(threadId) } + + val iconDisabled = threadId + .distinctUntilChanged() + .switchMap { threadId -> colors.textTertiaryOnThemeForConversation(threadId) } + + Observables + .combineLatest(iconEnabled, iconDisabled, { primary, tertiary -> + ColorStateList(states, intArrayOf(primary, tertiary)) + }) + .autoDisposable(scope()) + .subscribe { tintList -> send.imageTintList = tintList } toolbar.clipToOutline = true val layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } + adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() { + override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { + if (positionStart > 0) { + adapter.notifyItemChanged(positionStart - 1) + } + + // If we're at the bottom, scroll down to show new messages + val lastVisiblePosition = layoutManager.findLastCompletelyVisibleItemPosition() + if (positionStart >= adapter.itemCount - 1 && lastVisiblePosition == positionStart - 1) { + messages.scrollToPosition(positionStart) + } + } + }) + messages.layoutManager = layoutManager messages.adapter = adapter } override fun render(state: QkReplyState) { title = state.title + threadId.onNext(state.data?.first?.id ?: 0) adapter.data = state.data } diff --git a/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml new file mode 100755 index 00000000..4c52f25e --- /dev/null +++ b/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml @@ -0,0 +1,29 @@ + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/qkreply_activity.xml b/presentation/src/main/res/layout/qkreply_activity.xml index 27f56237..aade3dd7 100644 --- a/presentation/src/main/res/layout/qkreply_activity.xml +++ b/presentation/src/main/res/layout/qkreply_activity.xml @@ -41,10 +41,79 @@ android:paddingBottom="8dp" android:paddingTop="8dp" app:layout_constrainedHeight="true" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@id/message" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/toolbar" /> + app:layout_constraintTop_toBottomOf="@id/toolbar" + tools:listitem="@layout/message_list_item_in" /> + + + + + + + + + +