SES-4388 : Auto scrolling issues (#1547)

Author: jbsession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -627,11 +627,10 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
 
     private fun setupWindowInsets() {
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
-            val systemBarsInsets =
-                windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.ime())
+            val navInsets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val imeInsets = windowInsets.getInsets(WindowInsetsCompat.Type.ime())
 
-            val imeHeight = windowInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom
-            val keyboardVisible = imeHeight > 0
+            val keyboardVisible = imeInsets.bottom > 0
 
             if (keyboardVisible != isKeyboardVisible) {
                 isKeyboardVisible = keyboardVisible
@@ -645,10 +644,10 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             }
 
             binding.bottomSpacer.updateLayoutParams<LayoutParams> {
-                height = systemBarsInsets.bottom
+                height = if (keyboardVisible) imeInsets.bottom else navInsets.bottom
             }
 
-            windowInsets.inset(systemBarsInsets)
+            windowInsets
         }
     }
 
@@ -795,7 +794,8 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                 } else {
                     // If there are new data updated, we'll try to stay scrolled at the bottom (if we were at the bottom).
                     // scrolled to bottom has a leniency of 50dp, so if we are within the 50dp but not fully at the bottom, scroll down
-                    if (binding.conversationRecyclerView.isNearBottom && !binding.conversationRecyclerView.isFullyScrolled) {
+                    if (binding.conversationRecyclerView.isNearBottom &&
+                        !binding.conversationRecyclerView.isFullyScrolled) {
                         binding.conversationRecyclerView.handleScrollToBottom()
                     }
                 }
@@ -817,7 +817,6 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
 
     // called from onCreate
     private fun setUpRecyclerView() {
-        binding.conversationRecyclerView.applyImeBottomPadding()
         binding.conversationRecyclerView.adapter = adapter
         val layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         binding.conversationRecyclerView.layoutManager = layoutManager
@@ -1998,6 +1997,9 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         if (sentMessageInfo != null) {
             messageToScrollAuthor.set(sentMessageInfo.first)
             messageToScrollTimestamp.set(sentMessageInfo.second)
+            binding.conversationRecyclerView.postDelayed({
+                binding.conversationRecyclerView.handleScrollToBottom()
+            }, 500L)
         }
     }
 
@@ -2115,7 +2117,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         if (isShowingAttachmentOptions) { toggleAttachmentOptions() }
 
         // Keep it fixed on the bottom right away
-        binding.conversationRecyclerView.handleScrollToBottom()
+        binding.conversationRecyclerView.handleScrollToBottom(true)
 
         // do the heavy work in the bg
         lifecycleScope.launch(Dispatchers.Default) {
@@ -2680,7 +2682,6 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         searchViewModel.onSearchOpened()
         binding.searchBottomBar.visibility = View.VISIBLE
         binding.searchBottomBar.setData(0, 0, searchViewModel.searchQuery.value)
-        binding.inputBar.visibility = View.GONE
         binding.root.requestApplyInsets()
 
     }
@@ -2689,7 +2690,6 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         viewModel.onSearchClosed()
         searchViewModel.onSearchClosed()
         binding.searchBottomBar.visibility = View.GONE
-        binding.inputBar.visibility = View.VISIBLE
         binding.root.requestApplyInsets()
         adapter.onSearchQueryUpdated(null)
         invalidateOptionsMenu()
@@ -2720,9 +2720,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             binding.conversationRecyclerView.scrollToPosition(position)
 
             if (highlight) {
-                runOnUiThread {
-                    highlightViewAtPosition(position)
-                }
+                runOnUiThread { highlightViewAtPosition(position) }
             }
         } else {
             onMessageNotFound?.run()

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

@@ -334,11 +334,11 @@ class ConversationViewModel @AssistedInject constructor(
 
     init {
         viewModelScope.launch {
-            combine(
-                recipientFlow,
+            combine(recipientFlow,
                 legacyGroupDeprecationManager.deprecationState,
-                ::getInputBarState
-            ).collectLatest {
+                _searchOpened) { r, dep, searchOpen ->
+                getInputBarState(r, dep, searchOpen)
+            }.collectLatest {
                 _inputBarState.value = it
             }
         }
@@ -430,12 +430,13 @@ class ConversationViewModel @AssistedInject constructor(
 
     private fun getInputBarState(
         recipient: Recipient,
-        deprecationState: LegacyGroupDeprecationManager.DeprecationState
+        deprecationState: LegacyGroupDeprecationManager.DeprecationState,
+        searchOpen: Boolean
     ): InputBarState {
         val currentCharLimitState = _inputBarState.value.charLimitState
         return when {
             // prioritise cases that demand the input to be hidden
-            !shouldShowInput(recipient, deprecationState) -> InputBarState(
+            searchOpen || !shouldShowInput(recipient, deprecationState) -> InputBarState(
                 contentState = InputBarContentState.Hidden,
                 enableAttachMediaControls = false,
                 charLimitState = currentCharLimitState

app/src/main/java/org/thoughtcrime/securesms/ui/components/ConversationAppBar.kt

@@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.windowInsetsTopHeight
@@ -163,7 +164,7 @@ fun ConversationAppBar(
                 true -> {
                     Row(
                         modifier = Modifier
-                            .windowInsetsTopHeight(WindowInsets.systemBars)
+                            .statusBarsPadding()
                             .padding(horizontal = LocalDimensions.current.smallSpacing)
                             .heightIn(min = LocalDimensions.current.appBarHeight),
                         verticalAlignment = Alignment.CenterVertically,

app/src/main/java/org/thoughtcrime/securesms/util/adapter/RecyclerViewUtils.kt

@@ -20,13 +20,15 @@ fun RecyclerView.applyImeBottomPadding() {
 }
 
 // Handle scroll logic
-fun RecyclerView.handleScrollToBottom() {
+fun RecyclerView.handleScrollToBottom(fastScroll: Boolean = false) {
     val layoutManager = this.layoutManager as LinearLayoutManager
     val last = this.adapter?.itemCount?.minus(1)?.coerceAtLeast(0) ?: return
 
+    if (last < 0) return
+
     val bottomOffset = this.paddingBottom
 
-    if (layoutManager.isSmoothScrolling) {
+    if (layoutManager.isSmoothScrolling || fastScroll) {
         // second tap = instant align
         layoutManager.scrollToPositionWithOffset(last, bottomOffset)
         return
@@ -41,6 +43,7 @@ fun RecyclerView.handleScrollToBottom() {
             return (boxEnd - viewEnd) - bottomOffset
         }
     }
+
     scroller.targetPosition = last
     layoutManager.startSmoothScroll(scroller)
 }