From e87342496e532331697a05b8c237c74f2697d37d Mon Sep 17 00:00:00 2001
From: kouki4416 <pank4416@gmail.com>
Date: Sat, 17 Sep 2022 08:55:17 +0900
Subject: [PATCH 1/3] Fix deselecting daily item does not decrement count

---
 .../android/habitica/data/implementation/TaskRepositoryImpl.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index b01a08b23..ac562212d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -146,6 +146,8 @@ class TaskRepositoryImpl(
                     bgTask.completed = up
                     if (TaskType.DAILY == bgTask.type && up) {
                         bgTask.streak = (bgTask.streak ?: 0) + 1
+                    } else if(TaskType.DAILY == bgTask.type && !up && (bgTask.streak != null && bgTask.streak!! >= 1)){
+                        bgTask.streak = bgTask.streak!! - 1
                     }
                 } else if (TaskType.HABIT == bgTask.type) {
                     if (up) {

From fbceaec49913da2317528dd33c758228f081ca6b Mon Sep 17 00:00:00 2001
From: kouki4416 <pank4416@gmail.com>
Date: Sat, 15 Oct 2022 18:35:00 +0900
Subject: [PATCH 2/3] Changed if statement logic

---
 .../habitica/data/implementation/TaskRepositoryImpl.kt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index ac562212d..57ff01629 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -144,10 +144,12 @@ class TaskRepositoryImpl(
                 bgTask.value = (bgTask.value - localDelta) + res.delta
                 if (TaskType.DAILY == bgTask.type || TaskType.TODO == bgTask.type) {
                     bgTask.completed = up
-                    if (TaskType.DAILY == bgTask.type && up) {
-                        bgTask.streak = (bgTask.streak ?: 0) + 1
-                    } else if(TaskType.DAILY == bgTask.type && !up && (bgTask.streak != null && bgTask.streak!! >= 1)){
-                        bgTask.streak = bgTask.streak!! - 1
+                    if(TaskType.DAILY == bgTask.type){
+                        if(up){
+                            bgTask.streak = (bgTask.streak ?: 0) + 1
+                        } else {
+                            bgTask.streak = (bgTask.streak ?: 0) - 1
+                        }
                     }
                 } else if (TaskType.HABIT == bgTask.type) {
                     if (up) {

From 3ef4ea283e1996c8b406fec323b4bcbcb2032dbc Mon Sep 17 00:00:00 2001
From: kouki4416 <pank4416@gmail.com>
Date: Sat, 15 Oct 2022 18:37:07 +0900
Subject: [PATCH 3/3] Code format

---
 .../habitica/data/implementation/TaskRepositoryImpl.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index 57ff01629..ea832952e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -144,8 +144,8 @@ class TaskRepositoryImpl(
                 bgTask.value = (bgTask.value - localDelta) + res.delta
                 if (TaskType.DAILY == bgTask.type || TaskType.TODO == bgTask.type) {
                     bgTask.completed = up
-                    if(TaskType.DAILY == bgTask.type){
-                        if(up){
+                    if (TaskType.DAILY == bgTask.type) {
+                        if (up) {
                             bgTask.streak = (bgTask.streak ?: 0) + 1
                         } else {
                             bgTask.streak = (bgTask.streak ?: 0) - 1