From f22247dc70121162d13675b2af4e0ee1798f0920 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Thu, 28 Mar 2019 01:40:17 +0100
Subject: [PATCH] tweak profile dialog

---
 res/layout/profile_create_activity.xml        | 86 ++++++-------------
 res/values/styles.xml                         | 14 +--
 .../securesms/CreateProfileActivity.java      |  8 --
 3 files changed, 29 insertions(+), 79 deletions(-)

diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index 19237a799..5375ad55b 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -51,72 +51,42 @@
             android:id="@+id/status_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="top|left"
+            android:gravity="top|start"
             android:hint="@string/pref_default_status_label"
             android:inputType="textMultiLine"
             android:maxLines="3" />
     </android.support.design.widget.TextInputLayout>
 
-        <LinearLayout
-            android:clickable="true"
-                      android:orientation="horizontal"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_marginLeft="16dp"
-                      android:layout_marginRight="16dp"
-                      android:layout_marginTop="16dip"
-                      android:gravity="center_horizontal|center_vertical">
-
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="match_parent"
-                       android:clickable="false"
-                       android:layout_gravity="center_vertical"
-                       android:gravity="center_vertical"
-                       android:src="@drawable/ic_info_white_18dp"
-                       android:tint="@color/blue_400"/>
-
-            <TextView
-                android:id="@+id/information_label"
-                style="@style/Registration.Description"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="3dp"
-                android:clickable="true"
-                android:gravity="center_vertical"
-                android:text="@string/pref_who_can_see_this_information"
-                android:textColor="@color/blue_400" />
-        </LinearLayout>
+    <TextView
+        android:id="@+id/information_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="16dp"
+        android:gravity="start"
+        android:text="@string/pref_who_can_see_profile_explain"
+        android:textColor="@color/gray50" />
 
 
-        <LinearLayout android:orientation="vertical"
-                      android:layout_width="match_parent"
-                      android:layout_height="match_parent"
-                      android:gravity="bottom"
-                      android:clipChildren="false"
-                      android:clipToPadding="false">
+    <TextView
+        android:id="@+id/password_account_settings_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/pref_password_and_account_settings"
+        android:textColor="@color/blue_400"
+        android:textSize="16sp"/>
 
-            <TextView
-                android:id="@+id/password_account_settings_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="20dp"
-                android:layout_marginTop="0dp"
-                android:text="@string/pref_password_and_account_settings"
-                android:textColor="@color/blue_400"
-                android:textSize="16sp"
-                android:textStyle="normal"
-                android:typeface="sans" />
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
-                    xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/emoji_drawer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone" />
-
-        </LinearLayout>
+    <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/emoji_drawer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
 
 </org.thoughtcrime.securesms.components.InputAwareLayout>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d7d52f0d5..3e8120a2e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -65,19 +65,7 @@
         <item name="android:textColor">#BFffffff</item>
     </style>
 
-    <style name="Registration.Description" parent="@android:style/TextAppearance">
-        <item name="android:textSize">16.0sp</item>
-        <item name="android:typeface">sans</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:gravity">left</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:shadowColor">#ffffff</item>
-        <item name="android:shadowDx">1.0</item>
-        <item name="android:shadowDy">1.0</item>
-        <item name="android:shadowRadius">0.0</item>
-        <item name="android:lineSpacingMultiplier">1.25</item>
-    </style>
-    
+
     <!-- For Holo Light Dialog Activity Styling Emulation -->
 
     <style name="ComposeEditText" parent="@style/Signal.Text.Body">
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index 33b5c0be5..fceb39117 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -218,7 +218,6 @@ public class CreateProfileActivity extends BaseActionBarActivity {
 
   private void initializeResources() {
     TextView passwordAccountSettings       = ViewUtil.findById(this, R.id.password_account_settings_button);
-    TextView informationLabel = ViewUtil.findById(this, R.id.information_label);
 
     this.avatar       = ViewUtil.findById(this, R.id.avatar);
     this.name         = ViewUtil.findById(this, R.id.name_text);
@@ -255,13 +254,6 @@ public class CreateProfileActivity extends BaseActionBarActivity {
       Intent intent = new Intent(this, RegistrationActivity.class);
       startActivity(intent);
     });
-
-    informationLabel.setOnClickListener(view -> {
-      new AlertDialog.Builder(this)
-          .setMessage(R.string.pref_who_can_see_profile_explain)
-          .setPositiveButton(R.string.ok, null)
-          .show();
-    });
   }
 
   private void initializeProfileName(boolean excludeSystem) {