From 0b978dd9d7e48b658b9ce0c95fa4c86211625c54 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 6 Oct 2022 11:06:13 -0300
Subject: [PATCH] Update private story creation screens to match material3
 spec.

---
 .../select/BaseStoryRecipientSelectionFragment.kt      |  2 +-
 .../main/res/drawable/rounded_rectangle_variant_22.xml |  5 +++++
 .../stories_base_recipient_selection_fragment.xml      |  9 +++++----
 .../res/layout/stories_edit_story_name_fragment.xml    | 10 ++++++----
 4 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/rounded_rectangle_variant_22.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt
index af56b1d688..eb121c8944 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt
@@ -147,7 +147,7 @@ abstract class BaseStoryRecipientSelectionFragment : Fragment(R.layout.stories_b
       canSelectSelf = false,
       currentSelection = emptyList(),
       displaySelectionCount = false,
-      displayChips = false,
+      displayChips = true,
       checkboxResource = checkboxResource
     )
 
diff --git a/app/src/main/res/drawable/rounded_rectangle_variant_22.xml b/app/src/main/res/drawable/rounded_rectangle_variant_22.xml
new file mode 100644
index 0000000000..bfb8b1f886
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_rectangle_variant_22.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/signal_colorSurfaceVariant"/>
+    <corners android:radius="22dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml b/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
index bad2a17c19..be1b262828 100644
--- a/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <org.thoughtcrime.securesms.util.views.DarkOverflowToolbar
         android:id="@+id/toolbar"
@@ -12,7 +12,8 @@
         android:layout_height="64dp"
         android:minHeight="64dp"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24" />
+        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiEditText
         android:id="@+id/search_field"
@@ -22,7 +23,7 @@
         android:layout_marginTop="10dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="10dp"
-        android:background="@drawable/rounded_rectangle_secondary_18"
+        android:background="@drawable/rounded_rectangle_variant_22"
         android:hint="@string/TextStoryPostSendFragment__search"
         android:minHeight="44dp"
         android:paddingHorizontal="16dp"
diff --git a/app/src/main/res/layout/stories_edit_story_name_fragment.xml b/app/src/main/res/layout/stories_edit_story_name_fragment.xml
index 5de14c4c43..677d2182eb 100644
--- a/app/src/main/res/layout/stories_edit_story_name_fragment.xml
+++ b/app/src/main/res/layout/stories_edit_story_name_fragment.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <org.thoughtcrime.securesms.util.views.DarkOverflowToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="64dp"
+        android:minHeight="64dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_x_24"
-        app:title="@string/EditPrivateStoryNameFragment__edit_story_name" />
+        app:title="@string/EditPrivateStoryNameFragment__edit_story_name"
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/story_name_wrapper"