From 87e52e458b371b534d3ea16f1e01196997982231 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Tue, 25 Jun 2024 12:00:06 +0800
Subject: [PATCH] Add an indicator to show complete tasks
---
.../todo/views/all/AllTasksAdapter.kt | 9 ++
.../todo/views/bottomsheet/ToDoBottomSheet.kt | 4 +
.../main/res/drawable/bg_item_complete.xml | 5 +
app/src/main/res/layout/bottom_sheet_todo.xml | 18 +++-
app/src/main/res/layout/item_all_tasks.xml | 2 +-
app/src/main/res/values-night/colors.xml | 96 +------------------
app/src/main/res/values/colors.xml | 96 +------------------
7 files changed, 36 insertions(+), 194 deletions(-)
create mode 100644 app/src/main/res/drawable/bg_item_complete.xml
diff --git a/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt b/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt
index f56771f..6487518 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt
@@ -3,10 +3,13 @@ package cn.super12138.todo.views.all
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.LinearLayout
import android.widget.TextView
+import androidx.core.content.ContextCompat
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView
import cn.super12138.todo.R
+import cn.super12138.todo.ToDoApp
import cn.super12138.todo.logic.model.ToDo
import cn.super12138.todo.utils.VibrationUtils
@@ -19,6 +22,7 @@ class AllTasksAdapter(
inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
val todoContext: TextView = view.findViewById(R.id.todo_content_all)
val todoSubject: TextView = view.findViewById(R.id.todo_subject_all)
+ val itemBackground: LinearLayout = view.findViewById(R.id.item_background)
}
@@ -33,6 +37,11 @@ class AllTasksAdapter(
holder.todoContext.text = todo.content
holder.todoSubject.text = todo.subject
+ if (todo.state == 1) {
+ holder.itemBackground.background =
+ ContextCompat.getDrawable(ToDoApp.context, R.drawable.bg_item_complete)
+ }
+
holder.itemView.setOnClickListener {
VibrationUtils.performHapticFeedback(it)
diff --git a/app/src/main/kotlin/cn/super12138/todo/views/bottomsheet/ToDoBottomSheet.kt b/app/src/main/kotlin/cn/super12138/todo/views/bottomsheet/ToDoBottomSheet.kt
index c0503f2..05767f7 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/bottomsheet/ToDoBottomSheet.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/bottomsheet/ToDoBottomSheet.kt
@@ -101,6 +101,10 @@ class ToDoBottomSheet : BottomSheetDialogFragment() {
binding.btnSave.text = getString(R.string.update)
TextUtils.getSubjectID(todoOrigSubject)?.let { binding.todoSubject.check(it) }
+
+ if (GlobalValues.devMode) {
+ binding.todoUuid.text = "UUID: $todoUUID"
+ }
}
binding.btnSave.setOnClickListener {
diff --git a/app/src/main/res/drawable/bg_item_complete.xml b/app/src/main/res/drawable/bg_item_complete.xml
new file mode 100644
index 0000000..37a9aeb
--- /dev/null
+++ b/app/src/main/res/drawable/bg_item_complete.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_todo.xml b/app/src/main/res/layout/bottom_sheet_todo.xml
index 80c6a32..f249a23 100644
--- a/app/src/main/res/layout/bottom_sheet_todo.xml
+++ b/app/src/main/res/layout/bottom_sheet_todo.xml
@@ -1,6 +1,7 @@
@@ -17,6 +18,8 @@
@@ -134,10 +133,19 @@
+
+
diff --git a/app/src/main/res/layout/item_all_tasks.xml b/app/src/main/res/layout/item_all_tasks.xml
index 5b43534..9a2d00c 100644
--- a/app/src/main/res/layout/item_all_tasks.xml
+++ b/app/src/main/res/layout/item_all_tasks.xml
@@ -11,9 +11,9 @@
android:focusable="true">
#2C1B19
#372623
#43302D
- #FFBAAF
- #370000
- #FF5540
- #000000
- #FFBAAF
- #370000
- #E26E5D
- #000000
- #F6C273
- #211400
- #B6893F
- #000000
- #FFBAB1
- #370001
- #FF5449
- #000000
- #1E0F0D
- #FADCD7
- #1E0F0D
- #FFF9F8
- #5C403B
- #E9C2BB
- #BF9A95
- #9D7B76
- #000000
- #FADCD7
- #372623
- #950100
- #FFDAD4
- #2D0000
- #FFB4A8
- #740100
- #FFDAD4
- #2D0000
- #FFB4A8
- #6B150D
- #FFDDAF
- #1B0F00
- #F1BE6F
- #4B3100
- #1E0F0D
- #483531
- #190A08
- #281715
- #2C1B19
- #372623
- #43302D
- #FFF9F8
- #000000
- #FFBAAF
- #000000
- #FFF9F8
- #000000
- #FFBAAF
- #000000
- #FFFAF7
- #000000
- #F6C273
- #000000
- #FFF9F9
- #000000
- #FFBAB1
- #000000
- #1E0F0D
- #FADCD7
- #1E0F0D
- #FFFFFF
- #5C403B
- #FFF9F8
- #E9C2BB
- #E9C2BB
- #000000
- #FADCD7
- #000000
- #5C0000
- #FFE0DB
- #000000
- #FFBAAF
- #370000
- #FFE0DB
- #000000
- #FFBAAF
- #370000
- #FFE3BD
- #000000
- #F6C273
- #211400
- #1E0F0D
- #483531
- #190A08
- #281715
- #2C1B19
- #372623
- #43302D
+
+ #282B24
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7f9de8c..bad958a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -192,98 +192,6 @@
#FFE9E6
#FFE2DD
#FADCD7
- #7E0100
- #FFFFFF
- #BB1A0E
- #FFFFFF
- #7D2318
- #FFFFFF
- #BF5344
- #FFFFFF
- #533700
- #FFFFFF
- #7E5811
- #FFFFFF
- #8C0009
- #FFFFFF
- #DA342E
- #FFFFFF
- #FFF8F6
- #281715
- #FFF8F6
- #281715
- #FFDAD4
- #573C38
- #765853
- #94736E
- #000000
- #3E2C29
- #FFEDEA
- #FFB4A8
- #DB3323
- #FFFFFF
- #B7160B
- #FFFFFF
- #BF5344
- #FFFFFF
- #9E3B2E
- #FFFFFF
- #966D26
- #FFFFFF
- #7B550D
- #FFFFFF
- #F1D3CE
- #FFF8F6
- #FFFFFF
- #FFF0EE
- #FFE9E6
- #FFE2DD
- #FADCD7
- #4E0000
- #FFFFFF
- #8C0100
- #FFFFFF
- #4E0000
- #FFFFFF
- #7D2318
- #FFFFFF
- #311F00
- #FFFFFF
- #5C3D00
- #FFFFFF
- #4E0002
- #FFFFFF
- #8C0009
- #FFFFFF
- #FFF8F6
- #281715
- #FFF8F6
- #000000
- #FFDAD4
- #351E1A
- #573C38
- #573C38
- #000000
- #3E2C29
- #FFFFFF
- #FFE7E3
- #8C0100
- #FFFFFF
- #620100
- #FFFFFF
- #7D2318
- #FFFFFF
- #5D0B05
- #FFFFFF
- #5C3D00
- #FFFFFF
- #3F2800
- #FFFFFF
- #F1D3CE
- #FFF8F6
- #FFFFFF
- #FFF0EE
- #FFE9E6
- #FFE2DD
- #FADCD7
+
+ #E8E9DE
\ No newline at end of file