From e663698e512dfc61f74157e1a58a0d41de498cfe Mon Sep 17 00:00:00 2001
From: Debashis Biswas <debashis.biswas@asu.edu>
Date: Wed, 2 Jan 2019 23:12:24 -0700
Subject: [PATCH] updated navigation.xml to use string resources for toolbar
 names updated setter in UsernameLabel class to set its own variable

---
 Habitica/res/navigation/navigation.xml               | 12 ++++++------
 .../habitica/ui/views/social/UsernameLabel.kt        |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 03ec81c7b..38832d79f 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -115,7 +115,7 @@
     <activity
         android:id="@+id/gemPurchaseActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity"
-        android:label="GemPurchaseActivity" />
+        android:label="@string/gem.purchase.toolbartitle" />
     <fragment
         android:id="@+id/newsFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.NewsFragment"
@@ -181,12 +181,12 @@
     <activity
         android:id="@+id/prefsActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.PrefsActivity"
-        android:label="activity_prefs"
+        android:label="@string/app_settings"
         tools:layout="@layout/activity_prefs" />
     <fragment
         android:id="@+id/inboxMessageListFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.InboxMessageListFragment"
-        android:label="InboxMessageListFragment" >
+        android:label="@string/inbox" >
         <argument
             android:name="userID"
             app:argType="string" />
@@ -197,7 +197,7 @@
     <fragment
         android:id="@+id/petDetailRecyclerFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment"
-        android:label="PetDetailRecyclerFragment" >
+        android:label="@string/pets" >
         <argument
             android:name="type"
             app:argType="string" />
@@ -208,7 +208,7 @@
     <fragment
         android:id="@+id/mountDetailRecyclerFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRecyclerFragment"
-        android:label="MountDetailRecyclerFragment" >
+        android:label="@string/mounts" >
         <argument
             android:name="type"
             app:argType="string" />
@@ -219,7 +219,7 @@
     <fragment
         android:id="@+id/challengeDetailFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeDetailFragment"
-        android:label="Challenge" >
+        android:label="@string/challenge" >
         <argument
             android:name="challengeID"
             app:argType="string" />
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
index 799b823a1..19be23d7d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
@@ -23,6 +23,7 @@ class UsernameLabel(context: Context?, attrs: AttributeSet?) : LinearLayout(cont
 
     var username: String? = ""
     set(value) {
+        field = value
         textView.text = value
     }