From d1b579efb34c9ad1bdae7ccdf20674c9942f71b8 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 10 Aug 2018 11:15:54 +0200 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20show=20points=20to=20allocate?= =?UTF-8?q?=20below=20level=2010.=20Fixes=20#1025?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Habitica/res/layout/fragment_stats.xml | 8 ++++++++ Habitica/res/values/strings.xml | 1 + .../android/habitica/data/implementation/ApiClientImpl.kt | 1 + .../android/habitica/ui/activities/MainActivity.kt | 2 +- .../android/habitica/ui/fragments/StatsFragment.kt | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Habitica/res/layout/fragment_stats.xml b/Habitica/res/layout/fragment_stats.xml index b04ec5b6c..3bcda1026 100644 --- a/Habitica/res/layout/fragment_stats.xml +++ b/Habitica/res/layout/fragment_stats.xml @@ -40,6 +40,14 @@ android:layout_height="24dp" android:scaleType="fitCenter"/> + Joined Public Challenge Short Name + Attribute point allocation unlocks at level 10 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt index 049607225..818766e6e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt @@ -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) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index 440b530b7..0d1cad100 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt index 972975494..e9dafb404 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt @@ -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()))