narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

show edit display name in all flavors

Browse source
This commit is contained in:
Daniel Gultsch 2020-01-05 15:59:54 +01:00
parent 31ba7fab25
commit 9ccb5fdb46
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -604,7 +604,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
if (Config.DISALLOW_REGISTRATION_IN_UI) { if (Config.DISALLOW_REGISTRATION_IN_UI) {
this.binding.accountRegisterNew.setVisibility(View.GONE); this.binding.accountRegisterNew.setVisibility(View.GONE);
} }
this.binding.yourNameBox.setVisibility(QuickConversationsService.isQuicksy() ? View.VISIBLE : View.GONE);
this.binding.actionEditYourName.setOnClickListener(this::onEditYourNameClicked); this.binding.actionEditYourName.setOnClickListener(this::onEditYourNameClicked);
} }

11
src/main/res/layout/activity_edit_account.xml
View file

@ -471,16 +471,11 @@
</TableRow> </TableRow>
</TableLayout> </TableLayout>
<View
android:layout_width="match_parent"
android:layout_height="8dp"/>
<RelativeLayout <RelativeLayout
android:id="@+id/your_name_box" android:id="@+id/your_name_box"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" android:layout_marginTop="12dp">
android:layout_marginTop="24dp">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -522,7 +517,7 @@
android:id="@+id/pgp_fingerprint_box" android:id="@+id/pgp_fingerprint_box"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="16dp"> android:layout_marginTop="12dp">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -563,7 +558,7 @@
android:id="@+id/axolotl_fingerprint_box" android:id="@+id/axolotl_fingerprint_box"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="16dp"> android:layout_marginTop="12dp">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"