diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt index b5e4540b..50a808db 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt @@ -23,14 +23,6 @@ import androidx.recyclerview.widget.RecyclerView fun RecyclerView.Adapter<*>.autoScrollToStart(recyclerView: RecyclerView) { registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() { - override fun onChanged() { - val layoutManager = recyclerView.layoutManager as? LinearLayoutManager ?: return - - if (layoutManager.stackFromEnd) { - recyclerView.scrollToPosition(itemCount - 1) - } - } - override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { val layoutManager = recyclerView.layoutManager as? LinearLayoutManager ?: return diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 23bfdfd1..56acded0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -36,7 +36,6 @@ import androidx.core.app.ActivityCompat import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders -import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks @@ -124,13 +123,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView { chips.itemAnimator = null chips.layoutManager = FlexboxLayoutManager(this) - val layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } - messageAdapter.autoScrollToStart(messageList) messageAdapter.emptyView = messagesEmpty messageList.setHasFixedSize(true) - messageList.layoutManager = layoutManager messageList.adapter = messageAdapter attachments.adapter = attachmentAdapter diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt index c273e87a..ae0d98bb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt @@ -27,6 +27,7 @@ import android.view.Window import android.view.WindowManager import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.RecyclerView import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R @@ -69,6 +70,9 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { messages.adapter = adapter messages.adapter?.autoScrollToStart(messages) + messages.adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() { + override fun onChanged() = messages.scrollToPosition(adapter.itemCount - 1) + }) // These theme attributes don't apply themselves on API 21 if (Build.VERSION.SDK_INT <= 22) { diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 1d159d4c..86ea1246 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -36,10 +36,12 @@ android:clipToPadding="false" android:paddingBottom="16dp" android:paddingTop="8dp" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintBottom_toBottomOf="@id/composeBackground" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar" + app:stackFromEnd="true" tools:listitem="@layout/message_list_item_in" />