From 513c1baa2acfa9298acbc91d3f7f9d23565c72af Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 17 Aug 2022 11:19:32 +0200
Subject: [PATCH] challenge form fixes

---
 Habitica/res/layout/activity_create_challenge.xml   |  1 +
 Habitica/res/values/strings.xml                     |  4 ++--
 Habitica/res/values/styles.xml                      |  4 ++--
 .../habitica/data/implementation/ApiClientImpl.kt   |  2 +-
 .../habitica/ui/activities/ChallengeFormActivity.kt | 13 +++++++++----
 version.properties                                  |  2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml
index 3a248ab28..a899c876c 100644
--- a/Habitica/res/layout/activity_create_challenge.xml
+++ b/Habitica/res/layout/activity_create_challenge.xml
@@ -17,6 +17,7 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
+            android:background="?attr/headerBackgroundColor"
             app:layout_scrollFlags="scroll|enterAlways"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 5621d5174..ddae3fca9 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -265,8 +265,8 @@
     <string name="notification_purchase_reward" >You purchased a reward</string>
     <string name="world_quest">World Quest</string>
     <string name="inn_description">Need a break? Check into Daniel’s Inn to pause some of Habitica’s more difficult game mechanics:\n\n
-&#8226; Your missed Dailies won\'t damage you (bosses will still do damage caused by other Party member\'s missed Dailies)
-&#8226; Your Task streaks and Habit counters will not reset
+&#8226; Your missed Dailies won\'t damage you (bosses will still do damage caused by other Party member\'s missed Dailies)\n
+&#8226; Your Task streaks and Habit counters will not reset\n
 &#8226; Your damage to the Quest boss or found collection items will remain pending until you check out of the Inn</string>
     <string name="empty_items">You don\'t have any %s</string>
     <string name="user_level_with_class">Lvl %1$d %2$s</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 6032ace73..78d8f584e 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -354,7 +354,7 @@
     <style name="Toolbar.Modern" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
         <item name="android:textColorPrimary">?attr/headerTextColor</item>
         <item name="textColorSecondary">?attr/headerTextColor</item>
-        <item name="background">?attr/headerBackgroundColor</item>
+        <item name="android:background">?attr/headerBackgroundColor</item>
         <item name="actionMenuTextColor">?attr/toolbarContentColor</item>
         <item name="android:actionMenuTextColor">?attr/toolbarContentColor</item>
         <item name="android:itemTextAppearance">@style/menu_item_color</item>
@@ -720,7 +720,7 @@
     </style>
 
     <style name="HabiticaButton.Yellow" parent="HabiticaButton">
-        <item name="android:backgroundTint">@color/yellow_100</item>
+        <item name="android:backgroundTint">@color/yellow_5</item>
     </style>
 
     <style name="HabiticaButton.White" parent="HabiticaButton">
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 a827dddf6..b71208310 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
@@ -225,7 +225,7 @@ class ApiClientImpl(
             this.showConnectionProblemDialog(R.string.internal_error_api)
         } else if (throwableClass == SocketTimeoutException::class.java || UnknownHostException::class.java == throwableClass || IOException::class.java == throwableClass) {
             this.showConnectionProblemDialog(R.string.network_error_no_network_body)
-        } else if (throwableClass == retrofit2.adapter.rxjava3.HttpException::class.java) {
+        } else if (retrofit2.adapter.rxjava3.HttpException::class.java.isAssignableFrom(throwable.javaClass) || HttpException::class.java.isAssignableFrom(throwable.javaClass)) {
             val error = throwable as HttpException
             val res = getErrorResponse(error)
             val status = error.code()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index b9a38af57..a075717f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -70,10 +70,10 @@ class ChallengeFormActivity : BaseActivity() {
 
     override var overrideModernHeader: Boolean? = true
     // Add {*} Items
-    private var addHabit = createTask(resources.getString(R.string.add_habit))
-    private var addDaily = createTask(resources.getString(R.string.add_daily))
-    private var addTodo = createTask(resources.getString(R.string.add_todo))
-    private var addReward = createTask(resources.getString(R.string.add_reward))
+    private lateinit var addHabit: Task
+    private lateinit var addDaily: Task
+    private lateinit var addTodo: Task
+    private lateinit var addReward: Task
     private var user: User? = null
 
     private var savingInProgress = false
@@ -212,6 +212,11 @@ class ChallengeFormActivity : BaseActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        addHabit = createTask(resources.getString(R.string.add_habit))
+        addDaily = createTask(resources.getString(R.string.add_daily))
+        addTodo = createTask(resources.getString(R.string.add_todo))
+        addReward = createTask(resources.getString(R.string.add_reward))
+
         super.onCreate(savedInstanceState)
 
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
diff --git a/version.properties b/version.properties
index 2bdfb8477..2b17cce57 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.0.1
-CODE=4370
\ No newline at end of file
+CODE=4380
\ No newline at end of file