From 9ccb5fdb463b0f5b4e22c698fec46fcb4ab7654b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 5 Jan 2020 15:59:54 +0100
Subject: [PATCH] show edit display name in all flavors

---
 .../siacs/conversations/ui/EditAccountActivity.java   |  1 -
 src/main/res/layout/activity_edit_account.xml         | 11 +++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 1a24077ad..640ed2412 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -604,7 +604,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
         if (Config.DISALLOW_REGISTRATION_IN_UI) {
             this.binding.accountRegisterNew.setVisibility(View.GONE);
         }
-        this.binding.yourNameBox.setVisibility(QuickConversationsService.isQuicksy() ? View.VISIBLE : View.GONE);
         this.binding.actionEditYourName.setOnClickListener(this::onEditYourNameClicked);
     }
 
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 1f8a8870e..4b7a03e8a 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -471,16 +471,11 @@
                             </TableRow>
                         </TableLayout>
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="8dp"/>
-
                         <RelativeLayout
                             android:id="@+id/your_name_box"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:visibility="gone"
-                            android:layout_marginTop="24dp">
+                            android:layout_marginTop="12dp">
 
                             <LinearLayout
                                 android:layout_width="wrap_content"
@@ -522,7 +517,7 @@
                             android:id="@+id/pgp_fingerprint_box"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:layout_marginTop="16dp">
+                            android:layout_marginTop="12dp">
 
                             <LinearLayout
                                 android:layout_width="wrap_content"
@@ -563,7 +558,7 @@
                             android:id="@+id/axolotl_fingerprint_box"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:layout_marginTop="16dp">
+                            android:layout_marginTop="12dp">
 
                             <LinearLayout
                                 android:layout_width="wrap_content"