From be98ff35089fb58d3f9d0c88b8b393210c741eb3 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 7 Oct 2022 11:51:05 -0400
Subject: [PATCH] Fix bottom bar color in group story selector.

---
 .../v2/stories/ChooseGroupStoryBottomSheet.kt | 16 ++--
 .../stories_choose_group_bottom_bar.xml       | 79 ++++++++++---------
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
index f8cbb1cc0..e2e7c72ea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
@@ -32,10 +32,9 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
     const val RESULT_SET = "groups"
   }
 
-  private lateinit var confirmButton: View
-  private lateinit var selectedList: RecyclerView
   private lateinit var divider: View
   private lateinit var mediator: ContactSearchMediator
+  private lateinit var innerContainer: View
 
   private var animatorSet: AnimatorSet? = null
 
@@ -49,13 +48,14 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
     val container = view.parent.parent.parent as FrameLayout
     val bottomBar = LayoutInflater.from(requireContext()).inflate(R.layout.stories_choose_group_bottom_bar, container, true)
 
-    confirmButton = bottomBar.findViewById(R.id.share_confirm)
-    selectedList = bottomBar.findViewById(R.id.selected_list)
+    innerContainer = bottomBar.findViewById(R.id.inner_container)
     divider = bottomBar.findViewById(R.id.divider)
 
     val adapter = ShareSelectionAdapter()
+    val selectedList: RecyclerView = bottomBar.findViewById(R.id.selected_list)
     selectedList.adapter = adapter
 
+    val confirmButton: View = bottomBar.findViewById(R.id.share_confirm)
     confirmButton.setOnClickListener {
       onDone()
     }
@@ -116,8 +116,7 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
     animatorSet?.cancel()
     animatorSet = AnimatorSet().apply {
       playTogether(
-        ObjectAnimator.ofFloat(confirmButton, View.TRANSLATION_Y, 0f),
-        ObjectAnimator.ofFloat(selectedList, View.TRANSLATION_Y, 0f),
+        ObjectAnimator.ofFloat(innerContainer, View.TRANSLATION_Y, 0f),
         ObjectAnimator.ofFloat(divider, View.TRANSLATION_Y, 0f)
       )
       start()
@@ -125,13 +124,12 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
   }
 
   private fun animateOutBottomBar() {
-    val translationY = DimensionUnit.SP.toPixels(64f)
+    val translationY = DimensionUnit.SP.toPixels(68f)
 
     animatorSet?.cancel()
     animatorSet = AnimatorSet().apply {
       playTogether(
-        ObjectAnimator.ofFloat(confirmButton, View.TRANSLATION_Y, translationY),
-        ObjectAnimator.ofFloat(selectedList, View.TRANSLATION_Y, translationY),
+        ObjectAnimator.ofFloat(innerContainer, View.TRANSLATION_Y, translationY),
         ObjectAnimator.ofFloat(divider, View.TRANSLATION_Y, translationY)
       )
       start()
diff --git a/app/src/main/res/layout/stories_choose_group_bottom_bar.xml b/app/src/main/res/layout/stories_choose_group_bottom_bar.xml
index 9c1e40e3d..d0fb6cf77 100644
--- a/app/src/main/res/layout/stories_choose_group_bottom_bar.xml
+++ b/app/src/main/res/layout/stories_choose_group_bottom_bar.xml
@@ -1,53 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="bottom">
+    android:layout_gravity="bottom"
+    android:orientation="vertical">
 
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="4dp"
         android:background="@drawable/bottom_toolbar_shadow"
-        android:translationY="64sp"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/inner_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:translationY="68sp"
+        android:background="@color/signal_colorSurface1">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/selected_list"
-        android:layout_width="0dp"
-        android:layout_height="44dp"
-        android:layout_marginEnd="@dimen/dsl_settings_gutter"
-        android:clipToPadding="false"
-        android:orientation="horizontal"
-        android:paddingStart="@dimen/dsl_settings_gutter"
-        android:paddingEnd="78dp"
-        android:translationY="64sp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/divider"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:listitem="@layout/share_contact_selection_item" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/selected_list"
+            android:layout_width="0dp"
+            android:layout_height="44dp"
+            android:layout_marginEnd="@dimen/dsl_settings_gutter"
+            android:clipToPadding="false"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/dsl_settings_gutter"
+            android:paddingEnd="78dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:listitem="@layout/share_contact_selection_item" />
 
-    <ImageView
-        android:id="@+id/share_confirm"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/ShareActivity__share"
-        android:background="@drawable/circle_tintable"
-        android:padding="6dp"
-        android:translationY="64sp"
-        app:backgroundTint="@color/signal_colorPrimary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:srcCompat="@drawable/ic_check_24"
-        app:tint="@color/signal_colorOnPrimary"
-        tools:alpha="1" />
+        <ImageView
+            android:id="@+id/share_confirm"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_margin="16dp"
+            android:contentDescription="@string/ShareActivity__share"
+            android:background="@drawable/circle_tintable"
+            android:padding="6dp"
+            app:backgroundTint="@color/signal_colorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:srcCompat="@drawable/ic_check_24"
+            app:tint="@color/signal_colorOnPrimary"
+            tools:alpha="1" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>