From d5c0d09035d5fef9467e6e9be7615c7ad63b2f3f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 6 Jul 2022 09:17:51 +0200
Subject: [PATCH] Minor UI tweaks

---
 .../habitica/helpers/RxErrorHandler.kt        |  1 +
 common/src/main/res/values/strings.xml        | 21 ++++++++++++++-----
 wearos/build.gradle                           |  1 -
 .../ui/activities/TaskDetailActivity.kt       | 12 ++++++-----
 .../ui/activities/TaskFormActivity.kt         |  2 +-
 .../ui/activities/TaskListActivity.kt         |  8 +++----
 .../ui/activities/TaskResultActivity.kt       |  2 +-
 7 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
index 5d36223ab..dce9aebb5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
@@ -37,6 +37,7 @@ class RxErrorHandler {
                     !HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     !retrofit2.HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     !EOFException::class.java.isAssignableFrom(throwable.javaClass) &&
+                    !retrofit2.adapter.rxjava3.HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     throwable !is ConnectionShutdownException
                 ) {
                     instance?.analyticsManager?.logException(throwable)
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 0619d050a..327b79e24 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -48,11 +48,22 @@
 
     <string name="login_validation_error_title">Validation Error</string>
     <string name="login_validation_error_fieldsmissing">You have to fill out all fields.</string>
-    <string name="x_habits">%d Habits</string>
-    <string name="x_dailies">%d Dailies</string>
-    <string name="x_todos">%d To do\'s</string>
-    <string name="x_rewards">%d Rewards</string>
-
+    <plurals name="x_habits">
+        <item quantity="one">%d Habit</item>
+        <item quantity="other">%d Habits</item>
+    </plurals>
+    <plurals name="x_dailies">
+        <item quantity="one">%d Daily</item>
+        <item quantity="other">%d Dailies</item>
+    </plurals>
+    <plurals name="x_todos">
+        <item quantity="one">%d To Do</item>
+        <item quantity="other">%d To Do\'s</item>
+    </plurals>
+    <plurals name="x_rewards">
+        <item quantity="one">%d Reward</item>
+        <item quantity="other">%d Rewards</item>
+    </plurals>
     <string name="create_task_title">Create a Task</string>
     <string name="complete_task_title">Complete a Task</string>
     <string name="create_task">Create %s</string>
diff --git a/wearos/build.gradle b/wearos/build.gradle
index 61a77bec1..b6bf694f6 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -129,7 +129,6 @@ dependencies {
     kapt "com.google.dagger:hilt-compiler:$daggerhilt_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-
 }
 repositories {
     mavenCentral()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
index 419db4aa2..983a7e867 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
@@ -6,10 +6,10 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityTaskDetailBinding
+import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.common.habitica.models.tasks.streakString
 import com.habitrpg.wearos.habitica.ui.viewmodels.TaskDetailViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import java.util.Locale
 
 @AndroidEntryPoint
 class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailViewModel>() {
@@ -33,10 +33,12 @@ class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailVie
 
     private fun subscribeUI() {
         viewModel.task.observe(this) { task ->
-            binding.taskTypeView.text = task?.type?.value?.replaceFirstChar {
-                if (it.isLowerCase()) it.titlecase(
-                    Locale.getDefault()
-                ) else it.toString()
+            binding.taskTypeView.text = when (task?.type) {
+                TaskType.HABIT -> getString(R.string.habit)
+                TaskType.DAILY -> getString(R.string.daily)
+                TaskType.TODO -> getString(R.string.todo)
+                TaskType.REWARD -> getString(R.string.reward)
+                null -> ""
             }
             binding.taskTypeView.setTextColor(
                 ContextCompat.getColor(
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
index 30ee04e7a..6dfcd5ffe 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
@@ -94,7 +94,7 @@ class TaskFormActivity : BaseActivity<ActivityTaskFormBinding, TaskFormViewModel
             binding.editText.requestFocus()
         } else {
             taskType = TaskType.TODO
-            binding.header.textView.text = getString(R.string.create_task_title)
+            binding.header.textView.text = getString(R.string.new_task)
         }
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
index 210aadf95..62ce9de45 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
@@ -163,10 +163,10 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
         val taskType = viewModel.taskType ?: return ""
         return if (count != null) {
             when (taskType) {
-                TaskType.HABIT -> getString(R.string.x_habits, count)
-                TaskType.DAILY -> getString(R.string.x_dailies, count)
-                TaskType.TODO -> getString(R.string.x_todos, count)
-                TaskType.REWARD -> getString(R.string.x_rewards, count)
+                TaskType.HABIT -> resources.getQuantityString(R.plurals.x_habits, count, count)
+                TaskType.DAILY -> resources.getQuantityString(R.plurals.x_dailies, count, count)
+                TaskType.TODO -> resources.getQuantityString(R.plurals.x_todos, count, count)
+                TaskType.REWARD -> resources.getQuantityString(R.plurals.x_rewards, count, count)
             }
         } else {
             when (taskType) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
index 09cb8d823..b17c9969b 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
@@ -51,7 +51,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
 
     override fun finish() {
         if (viewModel.result?.hasLeveledUp == true) {
-            startActivity(Intent(parent, LevelupActivity::class.java))
+            startActivity(Intent(this, LevelupActivity::class.java))
         }
         super.finish()
     }