sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-18 19:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into develop

Browse source
This commit is contained in:
Phillip Thelen 2019-01-07 15:57:27 +01:00
commit a6569e0961
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Habitica/res/navigation/navigation.xml
View file

@ -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" />

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
View file

@ -23,6 +23,7 @@ class UsernameLabel(context: Context?, attrs: AttributeSet?) : LinearLayout(cont
var username: String? = ""
set(value) {
field = value
textView.text = value
}