diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 0bfa58204..6677e3586 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -150,7 +150,7 @@ android { buildConfigField "String", "TESTING_LEVEL", "\"production\"" resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" - versionCode 2632 + versionCode 2635 versionName "3.1" } diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml index 142af01f4..55ae48abf 100644 --- a/Habitica/res/layout/checklist_item_row.xml +++ b/Habitica/res/layout/checklist_item_row.xml @@ -30,7 +30,7 @@ android:scaleType="center" android:src="@drawable/checkmark" /> - - + + - + android:layout_gravity="center"> + - - + android:layout_width="76dp" + android:layout_height="76dp" + android:layout_gravity="start" + app:roundedCornerRadius="6dp" + app:roundingBorderWidth="6dp" + android:scaleType="fitEnd" /> + + + + \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt index ba7fd3d64..db2ee44bb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt @@ -227,7 +227,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc: override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean { if (motionEvent != null) { if (motionEvent.action != MotionEvent.ACTION_UP) return true - if (motionEvent.y <= mainTaskWrapper.height + 20.dpToPx(context)) { + if (motionEvent.y <= mainTaskWrapper.height + 5.dpToPx(context)) { if (motionEvent.x <= 60.dpToPx(context)) { onLeftActionTouched() return true diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt index 4dc27ac58..f2cca07bf 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt @@ -96,6 +96,14 @@ class ContentDeserializer : JsonDeserializer { } result.appearances = context.deserialize(obj.get("appearances"), object : TypeToken>() {}.type) result.backgrounds = context.deserialize(obj.get("backgrounds"), object : TypeToken>() {}.type) + val noBackground = Customization() + noBackground.customizationSet = "incentiveBackgrounds" + noBackground.customizationSetName = "Login Incentive" + noBackground.identifier = "" + noBackground.price = 0 + noBackground.type = "background" + noBackground.category = "" + result.backgrounds.add(noBackground) result.faq = context.deserialize(obj.get("faq"), object : TypeToken>() {}.type) deserializeTrace.stop()