From b9cd32c0fee8222511ce0188dab0727308a1c8e0 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Mon, 10 Jun 2024 10:26:42 +0800
Subject: [PATCH] Refine code

---
 .../kotlin/cn/super12138/todo/views/BaseActivity.kt  |  6 ------
 .../cn/super12138/todo/views/todo/ToDoAdapter.kt     |  2 --
 .../cn/super12138/todo/views/todo/ToDoFragment.kt    |  2 --
 app/src/main/res/drawable/ic_delete.xml              | 12 ------------
 app/src/main/res/layout/bottom_sheet_todo.xml        |  2 +-
 app/src/main/res/layout/fragment_progress.xml        |  4 ++--
 app/src/main/res/values-zh-rCN/strings.xml           |  1 -
 app/src/main/res/values/strings.xml                  |  1 -
 app/src/main/res/xml/preferences.xml                 |  2 +-
 9 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_delete.xml

diff --git a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
index e81727d..08efcb9 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
@@ -1,19 +1,13 @@
 package cn.super12138.todo.views
 
-import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.view.View
 import android.view.WindowManager
-import androidx.activity.SystemBarStyle
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.viewbinding.ViewBinding
 import cn.super12138.todo.constant.GlobalValues
-import com.google.android.material.internal.EdgeToEdgeUtils
 
 abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
     lateinit var binding: T
diff --git a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt
index d481acc..deca559 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt
@@ -1,6 +1,5 @@
 package cn.super12138.todo.views.todo
 
-import android.view.HapticFeedbackConstants
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -29,7 +28,6 @@ class ToDoAdapter(
         val todoContext: TextView = view.findViewById(R.id.todo_content)
         val todoSubject: TextView = view.findViewById(R.id.todo_subject)
         val checkToDoBtn: Button = view.findViewById(R.id.check_item_btn)
-        // val delToDoBtn: Button = view.findViewById(R.id.delete_item_btn)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
diff --git a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt
index 17b857f..1b4795e 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt
@@ -1,6 +1,5 @@
 package cn.super12138.todo.views.todo
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -20,7 +19,6 @@ import cn.super12138.todo.databinding.FragmentTodoBinding
 import cn.super12138.todo.logic.Repository
 import cn.super12138.todo.utils.VibrationUtils
 import cn.super12138.todo.views.bottomsheet.ToDoBottomSheet
-import cn.super12138.todo.views.crash.CrashActivity
 import cn.super12138.todo.views.progress.ProgressFragmentViewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.launch
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
deleted file mode 100644
index 416aad7..0000000
--- a/app/src/main/res/drawable/ic_delete.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
-
-</vector>
diff --git a/app/src/main/res/layout/bottom_sheet_todo.xml b/app/src/main/res/layout/bottom_sheet_todo.xml
index ff6f72d..80c6a32 100644
--- a/app/src/main/res/layout/bottom_sheet_todo.xml
+++ b/app/src/main/res/layout/bottom_sheet_todo.xml
@@ -20,9 +20,9 @@
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/todo_sheet_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/todo_sheet_title"
                 android:text="@string/add_task"
                 android:textAlignment="center"
                 android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/fragment_progress.xml b/app/src/main/res/layout/fragment_progress.xml
index f4fa4e7..5b8d51f 100644
--- a/app/src/main/res/layout/fragment_progress.xml
+++ b/app/src/main/res/layout/fragment_progress.xml
@@ -72,8 +72,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAlignment="center"
-            android:visibility="gone"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            android:visibility="gone" />
     </LinearLayout>
 
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ec6e726..4692ce3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -29,7 +29,6 @@
     <string name="delete_confirm">即将删除全部待办，是否继续？</string>
     <string name="tasks_textfield_hint">待办内容</string>
     <string name="delete_one">删除</string>
-    <string name="delete_all">删除全部代办</string>
     <string name="check_one">标记为已完成</string>
     <string name="no_tasks">无待办事项</string>
     <!--<string name="delete_undo">撤销</string>-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fb796e..739b2ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,7 +29,6 @@
     <string name="delete_confirm">Are you sure you want to delete all tasks?</string>
     <string name="tasks_textfield_hint">Tasks</string>
     <string name="delete_one">Delete</string>
-    <string name="delete_all">Delete all tasks</string>
     <string name="check_one">Checked this task</string>
     <string name="no_tasks">No tasks</string>
     <!--<string name="delete_undo">Undo</string>-->
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4d16991..84314e4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -51,8 +51,8 @@
             app:summary="@string/view_all_tasks_summary"
             app:title="@string/view_all_tasks_label" />
         <Preference
-            app:key="about"
             app:icon="@drawable/ic_about"
+            app:key="about"
             app:title="@string/about_label" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file