From 489e2e4d5cbee761dd6a935e638e7bd9003d0632 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Thu, 15 Aug 2024 18:22:33 +0800
Subject: [PATCH] Add more text colors

---
 app/src/main/res/layout/activity_about.xml    | 8 ++++----
 app/src/main/res/layout/activity_crash.xml    | 4 +++-
 app/src/main/res/layout/bottom_sheet_info.xml | 8 ++++----
 app/src/main/res/layout/bottom_sheet_todo.xml | 6 +++---
 app/src/main/res/layout/dialog_backup.xml     | 5 +++--
 app/src/main/res/layout/dialog_restore.xml    | 3 ++-
 app/src/main/res/layout/fragment_progress.xml | 6 +++---
 app/src/main/res/layout/item_empty.xml        | 1 +
 app/src/main/res/layout/item_todo.xml         | 4 ++--
 9 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index f0e476a..e1c0cf9 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -67,7 +67,7 @@
                             android:layout_marginTop="10dp"
                             android:text="@string/app_name"
                             android:textAlignment="center"
-                            android:textColor="?android:attr/textColorPrimary"
+                            android:textColor="?attr/colorOnSurface"
                             android:textSize="20sp" />
 
                         <TextView
@@ -103,7 +103,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="20dp"
                             android:text="@string/check_update"
-                            android:textColor="?android:attr/textColorPrimary"
+                            android:textColor="?attr/colorOnSurface"
                             android:textSize="15sp" />
                     </LinearLayout>
 
@@ -130,7 +130,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="20dp"
                             android:text="@string/view_source"
-                            android:textColor="?android:attr/textColorPrimary"
+                            android:textColor="?attr/colorOnSurface"
                             android:textSize="15sp" />
                     </LinearLayout>
 
@@ -157,7 +157,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="20dp"
                             android:text="@string/author"
-                            android:textColor="?android:attr/textColorPrimary"
+                            android:textColor="?attr/colorOnSurface"
                             android:textSize="15sp" />
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml
index 953c66c..ad8044f 100644
--- a/app/src/main/res/layout/activity_crash.xml
+++ b/app/src/main/res/layout/activity_crash.xml
@@ -50,7 +50,8 @@
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginEnd="20dp"
-                android:text="@string/error_tips" />
+                android:text="@string/error_tips"
+                android:textColor="?attr/colorOnSurfaceVariant" />
 
             <TextView
                 android:id="@+id/crash_log"
@@ -61,6 +62,7 @@
                 android:layout_marginEnd="20dp"
                 android:fontFamily="monospace"
                 android:text="@string/no_crash_logs"
+                android:textColor="?attr/colorOnSurface"
                 android:textIsSelectable="true"
                 android:textSize="13sp" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_info.xml b/app/src/main/res/layout/bottom_sheet_info.xml
index 7a626b0..044071e 100644
--- a/app/src/main/res/layout/bottom_sheet_info.xml
+++ b/app/src/main/res/layout/bottom_sheet_info.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="25sp" />
 
 
@@ -35,7 +35,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="15sp"
                 android:visibility="gone" />
 
@@ -44,7 +44,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="15sp" />
 
             <TextView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:layout_marginBottom="45dp"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="15sp" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/bottom_sheet_todo.xml b/app/src/main/res/layout/bottom_sheet_todo.xml
index 66a85ef..823f585 100644
--- a/app/src/main/res/layout/bottom_sheet_todo.xml
+++ b/app/src/main/res/layout/bottom_sheet_todo.xml
@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/add_task"
                 android:textAlignment="center"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="25sp" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -137,7 +137,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="15sp"
                 android:visibility="gone" />
 
@@ -162,7 +162,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/delete_one"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:textColor="?attr/colorOnSurface"
                     android:visibility="gone"
                     app:backgroundTint="?attr/colorErrorContainer" />
 
diff --git a/app/src/main/res/layout/dialog_backup.xml b/app/src/main/res/layout/dialog_backup.xml
index 6db1c90..2b577ad 100644
--- a/app/src/main/res/layout/dialog_backup.xml
+++ b/app/src/main/res/layout/dialog_backup.xml
@@ -14,7 +14,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/backup_tips" />
+            android:text="@string/backup_tips"
+            android:textColor="?attr/colorOnSurfaceVariant" />
 
         <TextView
             android:id="@+id/json_output"
@@ -23,7 +24,7 @@
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
             android:fontFamily="monospace"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_restore.xml b/app/src/main/res/layout/dialog_restore.xml
index 0ad3f25..b7463b6 100644
--- a/app/src/main/res/layout/dialog_restore.xml
+++ b/app/src/main/res/layout/dialog_restore.xml
@@ -15,7 +15,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/restore_tips" />
+            android:text="@string/restore_tips"
+            android:textColor="?attr/colorOnSurfaceVariant" />
 
         <CheckBox
             android:id="@+id/overwrite_data"
diff --git a/app/src/main/res/layout/fragment_progress.xml b/app/src/main/res/layout/fragment_progress.xml
index 91b97d4..4e36f06 100644
--- a/app/src/main/res/layout/fragment_progress.xml
+++ b/app/src/main/res/layout/fragment_progress.xml
@@ -45,7 +45,7 @@
                 android:layout_marginStart="10dp"
                 android:text="0"
                 android:textAppearance="?attr/textAppearanceDisplaySmall"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textStyle="bold" />
 
             <TextView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:text="/"
                 android:textAppearance="?attr/textAppearanceDisplayMedium"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textStyle="bold" />
 
             <TextView
@@ -63,7 +63,7 @@
                 android:layout_marginEnd="10dp"
                 android:text="0"
                 android:textAppearance="?attr/textAppearanceDisplayMedium"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textStyle="bold" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_empty.xml b/app/src/main/res/layout/item_empty.xml
index 2b594b5..94f7b6d 100644
--- a/app/src/main/res/layout/item_empty.xml
+++ b/app/src/main/res/layout/item_empty.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:text="@string/no_tasks"
         android:textAlignment="center"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_todo.xml b/app/src/main/res/layout/item_todo.xml
index 573395c..7b82c44 100644
--- a/app/src/main/res/layout/item_todo.xml
+++ b/app/src/main/res/layout/item_todo.xml
@@ -32,7 +32,7 @@
                 android:layout_marginTop="18dp"
                 android:ellipsize="marquee"
                 android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="20sp" />
 
             <TextView
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
                 android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="11sp" />
         </LinearLayout>