From d232ecf121dc7e7837edfd116c168451788ea1dc Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Wed, 31 Jan 2024 13:26:47 +0800
Subject: [PATCH] Normalize file naming conventions

---
 .../res/drawable/{about_24.xml => ic_about.xml}  |  0
 .../main/res/drawable/{add_24.xml => ic_add.xml} |  0
 .../{arrow_back_24.xml => ic_arrow_back.xml}     |  0
 .../drawable/{backup_24.xml => ic_backup.xml}    |  0
 .../res/drawable/{check_24.xml => ic_check.xml}  |  0
 .../{dark_mode_24.xml => ic_dark_mode.xml}       |  0
 .../drawable/{delete_24.xml => ic_delete.xml}    |  0
 ...lete_forever_24.xml => ic_delete_forever.xml} |  0
 .../drawable/{exit_to_app_24.xml => ic_exit.xml} |  0
 .../drawable/{github_24.xml => ic_github.xml}    |  0
 .../drawable/{person_24.xml => ic_person.xml}    |  0
 .../drawable/{restore_24.xml => ic_restore.xml}  |  0
 .../{screenshot_24.xml => ic_screenshot.xml}     |  0
 .../{settings_24.xml => ic_settings.xml}         |  0
 .../drawable/{update_24.xml => ic_update.xml}    |  0
 app/src/main/res/drawable/line.xml               | 12 ++++++++++++
 app/src/main/res/drawable/line_drawable.xml      |  6 ++++++
 app/src/main/res/drawable/thumb.xml              | 16 ++++++++++++++++
 app/src/main/res/drawable/thumb_drawable.xml     |  6 ++++++
 app/src/main/res/layout/activity_about.xml       |  8 ++++----
 app/src/main/res/layout/activity_crash.xml       |  2 +-
 app/src/main/res/layout/activity_settings.xml    |  2 +-
 app/src/main/res/layout/item_todo.xml            |  4 ++--
 app/src/main/res/menu/main.xml                   |  2 +-
 app/src/main/res/xml/preferences.xml             | 10 +++++-----
 25 files changed, 54 insertions(+), 14 deletions(-)
 rename app/src/main/res/drawable/{about_24.xml => ic_about.xml} (100%)
 rename app/src/main/res/drawable/{add_24.xml => ic_add.xml} (100%)
 rename app/src/main/res/drawable/{arrow_back_24.xml => ic_arrow_back.xml} (100%)
 rename app/src/main/res/drawable/{backup_24.xml => ic_backup.xml} (100%)
 rename app/src/main/res/drawable/{check_24.xml => ic_check.xml} (100%)
 rename app/src/main/res/drawable/{dark_mode_24.xml => ic_dark_mode.xml} (100%)
 rename app/src/main/res/drawable/{delete_24.xml => ic_delete.xml} (100%)
 rename app/src/main/res/drawable/{delete_forever_24.xml => ic_delete_forever.xml} (100%)
 rename app/src/main/res/drawable/{exit_to_app_24.xml => ic_exit.xml} (100%)
 rename app/src/main/res/drawable/{github_24.xml => ic_github.xml} (100%)
 rename app/src/main/res/drawable/{person_24.xml => ic_person.xml} (100%)
 rename app/src/main/res/drawable/{restore_24.xml => ic_restore.xml} (100%)
 rename app/src/main/res/drawable/{screenshot_24.xml => ic_screenshot.xml} (100%)
 rename app/src/main/res/drawable/{settings_24.xml => ic_settings.xml} (100%)
 rename app/src/main/res/drawable/{update_24.xml => ic_update.xml} (100%)
 create mode 100644 app/src/main/res/drawable/line.xml
 create mode 100644 app/src/main/res/drawable/line_drawable.xml
 create mode 100644 app/src/main/res/drawable/thumb.xml
 create mode 100644 app/src/main/res/drawable/thumb_drawable.xml

diff --git a/app/src/main/res/drawable/about_24.xml b/app/src/main/res/drawable/ic_about.xml
similarity index 100%
rename from app/src/main/res/drawable/about_24.xml
rename to app/src/main/res/drawable/ic_about.xml
diff --git a/app/src/main/res/drawable/add_24.xml b/app/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/add_24.xml
rename to app/src/main/res/drawable/ic_add.xml
diff --git a/app/src/main/res/drawable/arrow_back_24.xml b/app/src/main/res/drawable/ic_arrow_back.xml
similarity index 100%
rename from app/src/main/res/drawable/arrow_back_24.xml
rename to app/src/main/res/drawable/ic_arrow_back.xml
diff --git a/app/src/main/res/drawable/backup_24.xml b/app/src/main/res/drawable/ic_backup.xml
similarity index 100%
rename from app/src/main/res/drawable/backup_24.xml
rename to app/src/main/res/drawable/ic_backup.xml
diff --git a/app/src/main/res/drawable/check_24.xml b/app/src/main/res/drawable/ic_check.xml
similarity index 100%
rename from app/src/main/res/drawable/check_24.xml
rename to app/src/main/res/drawable/ic_check.xml
diff --git a/app/src/main/res/drawable/dark_mode_24.xml b/app/src/main/res/drawable/ic_dark_mode.xml
similarity index 100%
rename from app/src/main/res/drawable/dark_mode_24.xml
rename to app/src/main/res/drawable/ic_dark_mode.xml
diff --git a/app/src/main/res/drawable/delete_24.xml b/app/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/delete_24.xml
rename to app/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/drawable/delete_forever_24.xml b/app/src/main/res/drawable/ic_delete_forever.xml
similarity index 100%
rename from app/src/main/res/drawable/delete_forever_24.xml
rename to app/src/main/res/drawable/ic_delete_forever.xml
diff --git a/app/src/main/res/drawable/exit_to_app_24.xml b/app/src/main/res/drawable/ic_exit.xml
similarity index 100%
rename from app/src/main/res/drawable/exit_to_app_24.xml
rename to app/src/main/res/drawable/ic_exit.xml
diff --git a/app/src/main/res/drawable/github_24.xml b/app/src/main/res/drawable/ic_github.xml
similarity index 100%
rename from app/src/main/res/drawable/github_24.xml
rename to app/src/main/res/drawable/ic_github.xml
diff --git a/app/src/main/res/drawable/person_24.xml b/app/src/main/res/drawable/ic_person.xml
similarity index 100%
rename from app/src/main/res/drawable/person_24.xml
rename to app/src/main/res/drawable/ic_person.xml
diff --git a/app/src/main/res/drawable/restore_24.xml b/app/src/main/res/drawable/ic_restore.xml
similarity index 100%
rename from app/src/main/res/drawable/restore_24.xml
rename to app/src/main/res/drawable/ic_restore.xml
diff --git a/app/src/main/res/drawable/screenshot_24.xml b/app/src/main/res/drawable/ic_screenshot.xml
similarity index 100%
rename from app/src/main/res/drawable/screenshot_24.xml
rename to app/src/main/res/drawable/ic_screenshot.xml
diff --git a/app/src/main/res/drawable/settings_24.xml b/app/src/main/res/drawable/ic_settings.xml
similarity index 100%
rename from app/src/main/res/drawable/settings_24.xml
rename to app/src/main/res/drawable/ic_settings.xml
diff --git a/app/src/main/res/drawable/update_24.xml b/app/src/main/res/drawable/ic_update.xml
similarity index 100%
rename from app/src/main/res/drawable/update_24.xml
rename to app/src/main/res/drawable/ic_update.xml
diff --git a/app/src/main/res/drawable/line.xml b/app/src/main/res/drawable/line.xml
new file mode 100644
index 0000000..863cb4b
--- /dev/null
+++ b/app/src/main/res/drawable/line.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="?attr/colorSurfaceContainerHighest" />
+
+    <padding
+        android:bottom="10dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/line_drawable.xml b/app/src/main/res/drawable/line_drawable.xml
new file mode 100644
index 0000000..5bda4d4
--- /dev/null
+++ b/app/src/main/res/drawable/line_drawable.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/line" android:state_pressed="true" />
+
+    <item android:drawable="@drawable/line" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml
new file mode 100644
index 0000000..c8542a2
--- /dev/null
+++ b/app/src/main/res/drawable/thumb.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="44dp"
+        android:bottomRightRadius="44dp"
+        android:topLeftRadius="44dp"
+        android:topRightRadius="44dp" />
+
+    <padding
+        android:paddingLeft="22dp"
+        android:paddingRight="22dp" />
+
+    <solid android:color="?attr/colorSecondary" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thumb_drawable.xml b/app/src/main/res/drawable/thumb_drawable.xml
new file mode 100644
index 0000000..ef2d0e4
--- /dev/null
+++ b/app/src/main/res/drawable/thumb_drawable.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/thumb" android:state_pressed="true" />
+
+    <item android:drawable="@drawable/thumb" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index e5168c7..f4a0367 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -16,7 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:navigationIcon="@drawable/arrow_back_24"
+            app:navigationIcon="@drawable/ic_arrow_back"
             app:title="@string/about_label" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -94,7 +94,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="15dp"
-                            app:srcCompat="@drawable/update_24" />
+                            app:srcCompat="@drawable/ic_update" />
 
                         <TextView
                             android:id="@+id/check_update_text"
@@ -121,7 +121,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="15dp"
-                            app:srcCompat="@drawable/github_24" />
+                            app:srcCompat="@drawable/ic_github" />
 
                         <TextView
                             android:id="@+id/open_source_text"
@@ -148,7 +148,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="15dp"
-                            app:srcCompat="@drawable/person_24" />
+                            app:srcCompat="@drawable/ic_person" />
 
                         <TextView
                             android:id="@+id/developer_name"
diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml
index 31edd76..8729cdf 100644
--- a/app/src/main/res/layout/activity_crash.xml
+++ b/app/src/main/res/layout/activity_crash.xml
@@ -55,6 +55,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:text="@string/exit_app"
-        app:icon="@drawable/exit_to_app_24" />
+        app:icon="@drawable/ic_exit" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 0a79d29..aa07eed 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -16,7 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:navigationIcon="@drawable/arrow_back_24"
+            app:navigationIcon="@drawable/ic_arrow_back"
             app:title="@string/settings_label" />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/item_todo.xml b/app/src/main/res/layout/item_todo.xml
index 67273f5..fd3003c 100644
--- a/app/src/main/res/layout/item_todo.xml
+++ b/app/src/main/res/layout/item_todo.xml
@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="15dp"
             android:tooltipText="@string/delete_one"
-            app:icon="@drawable/delete_24" />
+            app:icon="@drawable/ic_delete" />
 
         <Button
             android:id="@+id/check_item_btn"
@@ -58,6 +58,6 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="15dp"
             android:tooltipText="@string/check_one"
-            app:icon="@drawable/check_24" />
+            app:icon="@drawable/ic_check" />
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 9a0f782..07b3f4d 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/item_settings"
-        android:icon="@drawable/settings_24"
+        android:icon="@drawable/ic_settings"
         android:title="@string/settings_label"
         android:tooltipText="@string/settings_label"
         app:showAsAction="always" />
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index aa7ec2d..54e1246 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -5,7 +5,7 @@
             android:defaultValue="0"
             android:entries="@array/appearance"
             android:entryValues="@array/appearance_value"
-            android:icon="@drawable/dark_mode_24"
+            android:icon="@drawable/ic_dark_mode"
             android:key="dark_mode"
             android:title="@string/dark_mode"
             app:summary="@string/dark_mode_summary" />
@@ -21,18 +21,18 @@
             app:dialogMessage="多个项目请使用英文逗号隔开"
             app:summary="自定义创建待办时文本框的预测项" />-->
         <SwitchPreferenceCompat
-            android:icon="@drawable/screenshot_24"
+            android:icon="@drawable/ic_screenshot"
             app:defaultValue="false"
             app:key="secure_mode"
             app:summary="@string/secure_mode_summary"
             app:title="@string/secure_mode" />
         <Preference
-            android:icon="@drawable/backup_24"
+            android:icon="@drawable/ic_backup"
             app:key="backupDB"
             app:summary="@string/backup_summary"
             app:title="@string/backup" />
         <Preference
-            android:icon="@drawable/restore_24"
+            android:icon="@drawable/ic_restore"
             app:key="restoreDB"
             app:summary="@string/restore_summary"
             app:title="@string/restore" />
@@ -40,7 +40,7 @@
 
     <PreferenceCategory android:title="@string/others">
         <Preference
-            android:icon="@drawable/about_24"
+            android:icon="@drawable/ic_about"
             app:title="@string/about_label">
             <intent
                 android:targetClass="cn.super12138.todo.views.about.AboutActivity"