Fix reaction display issues.

res/layout/conversation_reaction_scrubber.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.conversation.ConversationReactionOverlay
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<org.thoughtcrime.securesms.conversation.ConversationReactionOverlay xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_reaction_scrubber"
@@ -23,17 +22,18 @@
 
     <View
         android:id="@+id/conversation_reaction_scrubber_background"
-        android:layout_width="320dp"
+        android:layout_width="@dimen/reaction_scrubber_width"
         android:layout_height="?attr/actionBarSize"
         android:layout_marginTop="40dp"
         android:layout_marginBottom="40dp"
         android:alpha="0"
+        tools:alpha="1"
         android:background="?reactions_overlay_scrubber_background"
         android:elevation="4dp" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/conversation_reaction_scrubber_foreground"
-        android:layout_width="320dp"
+        android:layout_width="@dimen/reaction_scrubber_width"
         android:layout_height="@dimen/conversation_reaction_scrubber_height"
         android:clipToPadding="false"
         android:elevation="4dp">
@@ -49,103 +49,103 @@
             app:layout_constraintRight_toRightOf="@id/reaction_3"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        <ImageView
             android:id="@+id/reaction_1"
             android:layout_width="32dp"
             android:layout_height="48dp"
             android:alpha="0"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textSize="@dimen/conversation_reaction_picker_emoji_text_size"
+            android:src="@drawable/reaction_scrubber_love_48"
             android:translationY="@dimen/reaction_scrubber_anim_start_translation_y"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/reaction_2"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:translationY="0dp" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        <ImageView
             android:id="@+id/reaction_2"
             android:layout_width="32dp"
             android:layout_height="48dp"
             android:alpha="0"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textSize="@dimen/conversation_reaction_picker_emoji_text_size"
+            android:src="@drawable/reaction_scrubber_like_48"
             android:translationY="@dimen/reaction_scrubber_anim_start_translation_y"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/reaction_3"
             app:layout_constraintStart_toEndOf="@id/reaction_1"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:translationY="0dp" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        <ImageView
             android:id="@+id/reaction_3"
             android:layout_width="32dp"
             android:layout_height="48dp"
             android:alpha="0"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textSize="@dimen/conversation_reaction_picker_emoji_text_size"
+            android:src="@drawable/reaction_scrubber_dislike_48"
             android:translationY="@dimen/reaction_scrubber_anim_start_translation_y"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/reaction_4"
             app:layout_constraintStart_toEndOf="@id/reaction_2"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:translationY="0dp" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        <ImageView
             android:id="@+id/reaction_4"
             android:layout_width="32dp"
             android:layout_height="48dp"
             android:alpha="0"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textSize="@dimen/conversation_reaction_picker_emoji_text_size"
+            android:src="@drawable/reaction_scrubber_haha_48"
             android:translationY="@dimen/reaction_scrubber_anim_start_translation_y"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/reaction_5"
             app:layout_constraintStart_toEndOf="@id/reaction_3"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:translationY="0dp" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        <ImageView
             android:id="@+id/reaction_5"
             android:layout_width="32dp"
             android:layout_height="48dp"
             android:alpha="0"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textSize="@dimen/conversation_reaction_picker_emoji_text_size"
+            android:src="@drawable/reaction_scrubber_wow_48"
             android:translationY="@dimen/reaction_scrubber_anim_start_translation_y"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/reaction_6"
             app:layout_constraintStart_toEndOf="@id/reaction_4"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:translationY="0dp" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        <ImageView
             android:id="@+id/reaction_6"
             android:layout_width="32dp"
             android:layout_height="48dp"
             android:alpha="0"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textSize="@dimen/conversation_reaction_picker_emoji_text_size"
+            android:src="@drawable/reaction_scrubber_sad_48"
             android:translationY="@dimen/reaction_scrubber_anim_start_translation_y"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/reaction_7"
             app:layout_constraintStart_toEndOf="@id/reaction_5"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:translationY="0dp" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        <ImageView
             android:id="@+id/reaction_7"
             android:layout_width="32dp"
             android:layout_height="48dp"
             android:alpha="0"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textSize="@dimen/conversation_reaction_picker_emoji_text_size"
+            android:src="@drawable/reaction_scrubber_angry_48"
             android:translationY="@dimen/reaction_scrubber_anim_start_translation_y"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/reaction_6"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:translationY="0dp" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </org.thoughtcrime.securesms.conversation.ConversationReactionOverlay>

res/values-v21/themes.xml

@@ -35,4 +35,15 @@
         <item name="android:navigationBarColor">@color/media_preview_bar_background</item>
     </style>
 
+    <style name="Theme.Design.Light.BottomSheetDialog.Fixed">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:statusBarColor">@color/transparent</item>
+    </style>
+
+    <style name="Theme.Design.BottomSheetDialog.Fixed">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/transparent</item>
+    </style>
+
 </resources>

res/values-v23/themes.xml

@@ -33,4 +33,18 @@
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">@color/core_grey_95</item>
     </style>
+
+    <style name="Theme.Design.Light.BottomSheetDialog.Fixed">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:statusBarColor">@color/transparent</item>
+    </style>
+
+    <style name="Theme.Design.BottomSheetDialog.Fixed">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
 </resources>

res/values-v27/themes.xml

@@ -42,4 +42,20 @@
         <item name="android:navigationBarColor">@color/core_grey_95</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
+
+    <style name="Theme.Design.Light.BottomSheetDialog.Fixed">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:statusBarColor">@color/transparent</item>
+        <item name="android:navigationBarColor">@color/white</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="Theme.Design.BottomSheetDialog.Fixed">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:statusBarColor">@color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
 </resources>

res/values/dimens.xml

@@ -70,10 +70,9 @@
     <dimen name="conversation_vertical_message_spacing_default">8dp</dimen>
     <dimen name="conversation_vertical_message_spacing_collapse">1dp</dimen>
 
-    <dimen name="conversation_reaction_picker_emoji_text_size">28dp</dimen>
-
     <dimen name="reaction_scrubber_anim_start_translation_y">25dp</dimen>
     <dimen name="reaction_scrubber_anim_end_translation_y">0dp</dimen>
+    <dimen name="reaction_scrubber_width">320dp</dimen>
 
     <dimen name="conversation_item_reply_size">20dp</dimen>
     <dimen name="conversation_item_avatar_size">28dp</dimen>

res/values/themes.xml

@@ -689,4 +689,12 @@
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
     </style>
 
+    <style name="Theme.Design.Light.BottomSheetDialog.Fixed">
+        <item name="android:windowIsFloating">false</item>
+    </style>
+
+    <style name="Theme.Design.BottomSheetDialog.Fixed">
+        <item name="android:windowIsFloating">false</item>
+    </style>
+
 </resources>