From fb7cae6ba4cba326d91b724ad2a6803dba06116d Mon Sep 17 00:00:00 2001
From: Mike-Antonacci <70340774+Mike-Antonacci@users.noreply.github.com>
Date: Fri, 27 Nov 2020 12:27:40 -0700
Subject: [PATCH] Decrease horizontal dpToPx from 80 to 72, and vertical from
 32 to 24

---
 Habitica/build.gradle                                      | 2 +-
 Habitica/res/layout/support_collapsible_section.xml        | 7 ++++---
 .../habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt    | 6 +++---
 build.gradle                                               | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 50b2de8fb..f7c85ced4 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath('com.noveogroup.android:check:1.2.5') {
             exclude module: 'checkstyle'
             exclude module: 'pmd-java'
diff --git a/Habitica/res/layout/support_collapsible_section.xml b/Habitica/res/layout/support_collapsible_section.xml
index 88b8487b9..f6c353652 100644
--- a/Habitica/res/layout/support_collapsible_section.xml
+++ b/Habitica/res/layout/support_collapsible_section.xml
@@ -40,12 +40,13 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content" />
+
         <ImageView
             android:id="@+id/caret_view"
-            android:layout_width="wrap_content"
+            android:layout_width="14dp"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
-            android:layout_marginEnd="@dimen/spacing_large"/>
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:src="@drawable/ic_keyboard_arrow_down_black_24dp" />
     </LinearLayout>
     <TextView android:id="@+id/description_view"
         android:layout_width="match_parent"
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..6955e224b 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,11 +227,11 @@ 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.x <= 60.dpToPx(context)) {
+            if (motionEvent.y <= mainTaskWrapper.height + 24.dpToPx(context)) {
+                if (motionEvent.x <= 72.dpToPx(context)) {
                     onLeftActionTouched()
                     return true
-                } else if ((itemView.width - motionEvent.x <= 60.dpToPx(context))) {
+                } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) {
                     onRightActionTouched()
                     return true
                 }
diff --git a/build.gradle b/build.gradle
index a0784d9bc..01fb8bf24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'