From 14236d3062f001fc8a3a05a19ffeff6f86292255 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 13 May 2021 11:27:13 -0400
Subject: [PATCH] Show About in AppSettings screen.

---
 .../settings/app/AppSettingsFragment.kt       |  8 +++
 .../main/res/layout/bio_preference_item.xml   | 52 +++++++++++--------
 app/src/main/res/values/text_styles.xml       |  4 ++
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
index 9d766e110a..2a60bcd7c5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
@@ -160,6 +160,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
   private class BioPreferenceViewHolder(itemView: View) : PreferenceViewHolder<BioPreference>(itemView) {
 
     private val avatarView: AvatarImageView = itemView.findViewById(R.id.icon)
+    private val aboutView: TextView = itemView.findViewById(R.id.about)
 
     override fun bind(model: BioPreference) {
       super.bind(model)
@@ -173,6 +174,13 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
       titleView.visibility = View.VISIBLE
       summaryView.visibility = View.VISIBLE
       avatarView.visibility = View.VISIBLE
+
+      if (model.recipient.combinedAboutAndEmoji != null) {
+        aboutView.text = model.recipient.combinedAboutAndEmoji
+        aboutView.visibility = View.VISIBLE
+      } else {
+        aboutView.visibility = View.GONE
+      }
     }
   }
 
diff --git a/app/src/main/res/layout/bio_preference_item.xml b/app/src/main/res/layout/bio_preference_item.xml
index 7f3b05f042..a3c6392386 100644
--- a/app/src/main/res/layout/bio_preference_item.xml
+++ b/app/src/main/res/layout/bio_preference_item.xml
@@ -19,33 +19,41 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/title"
+    <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
         android:layout_marginEnd="24dp"
-        android:textAppearance="@style/Signal.Text.Title.SettingsBio"
-        app:layout_constraintBottom_toTopOf="@id/summary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/icon"
+        android:orientation="vertical"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_goneMarginBottom="16dp"
-        tools:text="Person Name" />
-
-    <TextView
-        android:id="@+id/summary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:textAppearance="@style/TextAppearance.Signal.Body2"
-        android:textColor="@color/signal_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/title"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        tools:text="+1 (999) 555-1234" />
+        app:layout_constraintStart_toEndOf="@id/icon"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/Signal.Text.Title.SettingsBio"
+            tools:text="Peter Parker" />
+
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/about"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Signal.Text.Preview.Secondary"
+            android:maxLines="1"
+            android:ellipsize="end"
+            tools:text="Crusin' the web" />
+
+        <TextView
+            android:id="@+id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Signal.Text.Preview.Secondary"
+            tools:text="+1 (999) 555-1234" />
+
+    </LinearLayout>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/text_styles.xml b/app/src/main/res/values/text_styles.xml
index 134e509e25..ad297be533 100644
--- a/app/src/main/res/values/text_styles.xml
+++ b/app/src/main/res/values/text_styles.xml
@@ -22,6 +22,10 @@
         <item name="android:letterSpacing" tools:ignore="NewApi">0.01</item>
     </style>
 
+    <style name="Signal.Text.Preview.Secondary">
+        <item name="android:textColor">@color/signal_text_secondary</item>
+    </style>
+
     <style name="Signal.Text.Preview.Medium">
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>