From 7eda08d1b68ce3496b7a3e01aa7265d84b58a349 Mon Sep 17 00:00:00 2001 From: Mike-Antonacci <70340774+Mike-Antonacci@users.noreply.github.com> Date: Tue, 10 Nov 2020 21:15:58 -0700 Subject: [PATCH 1/8] Rename habitica.properties.example to habitica.properties --- habitica.properties.example => habitica.properties | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename habitica.properties.example => habitica.properties (100%) diff --git a/habitica.properties.example b/habitica.properties similarity index 100% rename from habitica.properties.example rename to habitica.properties From 18175b51d0aaf39b9e22183e300ccfec4e342828 Mon Sep 17 00:00:00 2001 From: Mike-Antonacci <70340774+Mike-Antonacci@users.noreply.github.com> Date: Tue, 10 Nov 2020 21:16:23 -0700 Subject: [PATCH 2/8] Rename habitica.resources.example to habitica.resources --- habitica.resources.example => habitica.resources | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename habitica.resources.example => habitica.resources (100%) diff --git a/habitica.resources.example b/habitica.resources similarity index 100% rename from habitica.resources.example rename to habitica.resources From 430f89eda78b34c2bdc951f55e38ffaf3593a596 Mon Sep 17 00:00:00 2001 From: Mike-Antonacci <70340774+Mike-Antonacci@users.noreply.github.com> Date: Tue, 10 Nov 2020 21:17:12 -0700 Subject: [PATCH 3/8] Add files via upload --- Habitica/google-services.json | 69 +++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Habitica/google-services.json diff --git a/Habitica/google-services.json b/Habitica/google-services.json new file mode 100644 index 000000000..1613c3bb2 --- /dev/null +++ b/Habitica/google-services.json @@ -0,0 +1,69 @@ +{ + "project_info": { + "project_number": "786261551143", + "firebase_url": "https://habitica-3ad69.firebaseio.com", + "project_id": "habitica-3ad69", + "storage_bucket": "habitica-3ad69.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:786261551143:android:5a836986630180e50a0602", + "android_client_info": { + "package_name": "com.habitrpg.android.habitica" + } + }, + "oauth_client": [ + { + "client_id": "786261551143-i8c0j6s3p3sasfb2ov16sdl4du1anhvp.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCx53gb7IXtpfeD_5NmICGGwPCsAzW9ybM" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "786261551143-i8c0j6s3p3sasfb2ov16sdl4du1anhvp.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:786261551143:android:6b6c6fdc44b197540a0602", + "android_client_info": { + "package_name": "com.habitrpg.android.habitica.debug" + } + }, + "oauth_client": [ + { + "client_id": "786261551143-i8c0j6s3p3sasfb2ov16sdl4du1anhvp.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCx53gb7IXtpfeD_5NmICGGwPCsAzW9ybM" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "786261551143-i8c0j6s3p3sasfb2ov16sdl4du1anhvp.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file 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 4/8] 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" /> + + android:layout_marginEnd="@dimen/spacing_large" + android:src="@drawable/ic_keyboard_arrow_down_black_24dp" /> Date: Fri, 27 Nov 2020 16:20:55 -0700 Subject: [PATCH 5/8] Reset horizontal to 60dp and vertical to 5dp --- .../habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6955e224b..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,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 + 24.dpToPx(context)) { - if (motionEvent.x <= 72.dpToPx(context)) { + if (motionEvent.y <= mainTaskWrapper.height + 5.dpToPx(context)) { + if (motionEvent.x <= 60.dpToPx(context)) { onLeftActionTouched() return true - } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) { + } else if ((itemView.width - motionEvent.x <= 60.dpToPx(context))) { onRightActionTouched() return true } From 668adc313e62e2c5613773f77184a6bbeb8a9cf9 Mon Sep 17 00:00:00 2001 From: Mike-Antonacci <70340774+Mike-Antonacci@users.noreply.github.com> Date: Fri, 27 Nov 2020 17:24:41 -0700 Subject: [PATCH 6/8] Increase horizontal from 60dp to 72dp --- .../habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 db2ee44bb..3e9f8ada7 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 @@ -228,10 +228,10 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc: if (motionEvent != null) { if (motionEvent.action != MotionEvent.ACTION_UP) return true if (motionEvent.y <= mainTaskWrapper.height + 5.dpToPx(context)) { - if (motionEvent.x <= 60.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 } From cc1c7a3324c2c599842a092c5ab6cc48573de410 Mon Sep 17 00:00:00 2001 From: Mike-Antonacci <70340774+Mike-Antonacci@users.noreply.github.com> Date: Wed, 6 Jan 2021 17:26:19 -0700 Subject: [PATCH 7/8] Differentiate between checklist vs not, and expanded vs not --- .../viewHolders/tasks/BaseTaskViewHolder.kt | 42 +++++++++++++++---- .../tasks/ChecklistedViewHolder.kt | 7 ++-- .../ui/viewHolders/tasks/HabitViewHolder.kt | 1 + 3 files changed, 39 insertions(+), 11 deletions(-) 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 3e9f8ada7..12457e7ef 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 @@ -228,12 +228,40 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc: if (motionEvent != null) { if (motionEvent.action != MotionEvent.ACTION_UP) return true if (motionEvent.y <= mainTaskWrapper.height + 5.dpToPx(context)) { - if (motionEvent.x <= 72.dpToPx(context)) { - onLeftActionTouched() - return true - } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) { - onRightActionTouched() - return true + if ((this.task?.checklist?.isNotEmpty() != true)) { + if (motionEvent.x <= 72.dpToPx(context)) { + onLeftActionTouched() + return true + } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) { + onRightActionTouched() + return true + } + } else { + val checkboxHolder: ViewGroup = itemView.findViewById(R.id.checkBoxHolder) + if (mainTaskWrapper.height == checkboxHolder.height) { + if (motionEvent.x <= 72.dpToPx(context)) { + onLeftActionTouched() + return true + } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) { + onRightActionTouched() + return true + } + } else { + if (motionEvent.y <= (checkboxHolder.height + 5.dpToPx(context))) { + if (motionEvent.x <= 72.dpToPx(context)) { + onLeftActionTouched() + return true + } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) { + onRightActionTouched() + return true + } + } else if ((motionEvent.y > (checkboxHolder.height + 5.dpToPx(context)))) { + if (motionEvent.x <= 72.dpToPx(context)) { + onLeftActionTouched() + return true + } + } + } } } } @@ -249,4 +277,4 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc: this.openTaskDisabled = openTaskDisabled this.taskActionsDisabled = taskActionsDisabled } -} +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt index 60b8ec71f..7462f17cd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt @@ -3,15 +3,14 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks import android.content.Context import android.graphics.PorterDuff import android.graphics.Rect -import android.view.LayoutInflater -import android.view.TouchDelegate -import android.view.View -import android.view.ViewGroup +import android.util.Log +import android.view.* import android.widget.* import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R +import com.habitrpg.android.habitica.extensions.dpToPx import com.habitrpg.android.habitica.extensions.getThemeColor import com.habitrpg.android.habitica.extensions.isUsingNightModeResources import com.habitrpg.android.habitica.helpers.RxErrorHandler diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt index d470a436e..5933b6de9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt @@ -1,6 +1,7 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks import android.graphics.PorterDuff +import android.util.Log import android.view.View import android.widget.Button import android.widget.FrameLayout From dba9175697f710e32e5433f58855b7284c136260 Mon Sep 17 00:00:00 2001 From: Mike-Antonacci <70340774+Mike-Antonacci@users.noreply.github.com> Date: Wed, 6 Jan 2021 17:37:01 -0700 Subject: [PATCH 8/8] Clean up imports --- .../habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt | 3 --- .../android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt | 1 - 2 files changed, 4 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt index 7462f17cd..aeb85305a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt @@ -2,15 +2,12 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks import android.content.Context import android.graphics.PorterDuff -import android.graphics.Rect -import android.util.Log import android.view.* import android.widget.* import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.extensions.dpToPx import com.habitrpg.android.habitica.extensions.getThemeColor import com.habitrpg.android.habitica.extensions.isUsingNightModeResources import com.habitrpg.android.habitica.helpers.RxErrorHandler diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt index 5933b6de9..d470a436e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks import android.graphics.PorterDuff -import android.util.Log import android.view.View import android.widget.Button import android.widget.FrameLayout