Merge remote-tracking branch 'upstream/ui' into ui

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

@@ -25,17 +25,15 @@ class ConversationRecyclerView : RecyclerView {
     private fun initialize() {
         disableClipping()
         addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            private var maxScrollOffset = 0
+            private var bottomOffset = 0
 
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                 // Do nothing
             }
 
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                val scrollOffset = recyclerView.computeVerticalScrollOffset()
-                maxScrollOffset = max(maxScrollOffset, scrollOffset)
-                val bottomOffset = (maxScrollOffset - scrollOffset)
-                delegate?.handleConversationRecyclerViewBottomOffsetChanged(bottomOffset)
+                bottomOffset += dy // FIXME: Not sure this is fully accurate, but it seems close enough
+                delegate?.handleConversationRecyclerViewBottomOffsetChanged(abs(bottomOffset))
             }
         })
     }

app/src/main/res/layout/view_input_bar_recording.xml

@@ -156,7 +156,7 @@
         android:gravity="center"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="14dp"
         android:layout_marginBottom="72dp"
         android:paddingVertical="8dp"
         android:background="@drawable/view_lock_background">