From 9236ed55f8bcf8a52e42ad8f19b99d20ecb6004e Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 28 Oct 2019 13:01:21 +0100 Subject: [PATCH] Fix username display in menu --- Habitica/res/layout/drawer_main.xml | 1 - .../habitica/ui/fragments/NavigationDrawerFragment.kt | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml index 441353145..60a527613 100644 --- a/Habitica/res/layout/drawer_main.xml +++ b/Habitica/res/layout/drawer_main.xml @@ -53,7 +53,6 @@ android:singleLine="true" tools:text="\@username" android:textSize="12sp" - android:visibility="gone" android:textColor="@color/white_80_alpha"/> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index b06372464..98f94f812 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -187,7 +187,7 @@ class NavigationDrawerFragment : DialogFragment() { setMessagesCount(user.inbox?.newMessages ?: 0) setSettingsCount(if (user.flags?.isVerifiedUsername != true) 1 else 0 ) setDisplayName(user.profile?.name) - setUsername(user.username) + setUsername(user.formattedUsername) avatarView.setAvatar(user) questMenuView.configure(user) @@ -369,12 +369,7 @@ class NavigationDrawerFragment : DialogFragment() { } private fun setUsername(name: String?) { - if (usernameTextView != null) { - usernameTextView.text = name - usernameTextView.visibility = View.VISIBLE - } else { - usernameTextView.visibility = View.GONE - } + usernameTextView.text = name } override fun onSaveInstanceState(outState: Bundle) {