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

Don’t show points to allocate below level 10. Fixes #1025

Browse source
This commit is contained in:
Phillip Thelen 2018-08-10 11:15:54 +02:00
parent e6876acea0
commit d1b579efb3
5 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Habitica/res/layout/fragment_stats.xml
View file

@ -40,6 +40,14 @@
android:layout_height="24dp"
android:scaleType="fitCenter"/>
</LinearLayout>
<TextView
android:id="@+id/unlock_at_level"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/unlock_attribute_points"
android:gravity="center"
android:padding="@dimen/spacing_large"
style="@style/Caption4"/>
<com.habitrpg.android.habitica.ui.views.stats.StatsView
android:id="@+id/strengthStatsView"
android:layout_width="match_parent"

1
Habitica/res/values/strings.xml
View file

@ -788,4 +788,5 @@
<string name="joined">Joined</string>
<string name="public_challenge">Public Challenge</string>
<string name="short_name">Short Name</string>
<string name="unlock_attribute_points">Attribute point allocation unlocks at level 10</string>
</resources>

1
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
View file

@ -118,6 +118,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
val request = builder.method(original.method(), original.body())
.build()
lastAPICallURL = original.url().toString()
Log.d("NETWORK", lastAPICallURL)
chain.proceed(request)
}
.readTimeout(120, TimeUnit.SECONDS)

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
View file

@ -451,7 +451,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
}
val statsItem = drawerFragment?.getItemWithIdentifier(NavigationDrawerFragment.SIDEBAR_STATS)
if (statsItem != null) {
if (user?.stats?.lvl ?: 0 >= 0 && user?.stats?.points ?: 0 > 0) {
if (user?.stats?.lvl ?: 0 >= 10 && user?.stats?.points ?: 0 > 0) {
statsItem.additionalInfo = user?.stats?.points.toString()
} else {
statsItem.additionalInfo = null

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
View file

@ -91,6 +91,7 @@ class StatsFragment: BaseMainFragment() {
compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer {
user = it
unlock_at_level.visibility = if (user?.stats?.lvl ?: 0 < 10) View.VISIBLE else View.GONE
updateStats()
updateAttributePoints()
}, RxErrorHandler.handleEmptyError()))