From 63c6e5e1fd8b35655b83472127cdd23fb7c88cbb Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 21 Jun 2019 09:08:30 +0200
Subject: [PATCH] Fix small crash

---
 Habitica/build.gradle                                    | 4 ++--
 Habitica/res/layout/achievement_list_item.xml            | 9 +++++----
 Habitica/res/layout/shop_header.xml                      | 5 +++--
 Habitica/res/values/styles.habitica.xml                  | 3 ++-
 .../android/habitica/ui/activities/TaskFormActivity.kt   | 9 +++++----
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 7d6d06480..fb4402523 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -150,8 +150,8 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         multiDexEnabled true
 
-        versionCode 2165
-        versionName "1.10"
+        versionCode 2168
+        versionName "2.0"
     }
 
     lintOptions {
diff --git a/Habitica/res/layout/achievement_list_item.xml b/Habitica/res/layout/achievement_list_item.xml
index 4c085896d..def7138ec 100644
--- a/Habitica/res/layout/achievement_list_item.xml
+++ b/Habitica/res/layout/achievement_list_item.xml
@@ -34,18 +34,19 @@
         android:layout_marginTop="0dp"/>
 </RelativeLayout>
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:layout_marginRight="@dimen/spacing_large">
         <TextView
             android:id="@+id/achievement_title"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/Body1"
             android:textColor="@color/gray_100"/>
         <TextView
             android:id="@+id/achievement_description"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/Caption3"
             android:textColor="@color/gray_100"/>
diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml
index 9a005f275..84951777e 100644
--- a/Habitica/res/layout/shop_header.xml
+++ b/Habitica/res/layout/shop_header.xml
@@ -34,7 +34,8 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:layout_marginTop="124dp"
-        style="@style/Caption2"
+        android:layout_marginTop="120dp"
+        android:layout_marginBottom="4dp"
+        style="@style/Body1"
         tools:text="Welcome to the Market! Stock up on new gear or buy rare eggs and potions. Check in periodically for new stock." />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index c9da73191..9db6ed00a 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -67,6 +67,7 @@
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">14sp</item>
         <item name="android:letterSpacing">0.035</item>
+        <item name="android:lineSpacingExtra">6sp</item>
     </style>
 
     <style name="Body1_Button" parent="@style/Widget.AppCompat.Button.Borderless">
@@ -122,7 +123,7 @@
         <item name="android:letterSpacing">0.035</item>
     </style>
     <style name="Overline">
-        <item name="android:fontFamily">@string/font_family_regular</item>
+        <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">10sp</item>
         <item name="android:letterSpacing">0.15</item>
         <item name="android:textAllCaps">true</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index f8ef91ccc..92c6b5d23 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -444,10 +444,11 @@ class TaskFormActivity : BaseActivity() {
         val alert = HabiticaAlertDialog(this)
         alert.setTitle(R.string.are_you_sure)
         alert.addButton(R.string.delete_task, true) { _, _ ->
-                    task?.id?.let { taskRepository.deleteTask(it).subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()) }
-                    dismissKeyboard()
-                    finish()
-                }
+            if (task?.isValid != true) return@addButton
+            task?.id?.let { taskRepository.deleteTask(it).subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()) }
+            dismissKeyboard()
+            finish()
+        }
         alert.addCancelButton()
         alert.show()
     }