[app] adjust text size and nav colors

Tornaco · Sep 26, 2022 · 1239d4d · 1239d4d
1 parent c06c67b
commit 1239d4d
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 27 deletions.
diff --git a/android/app/src/main/java/github/tornaco/android/thanos/dashboard/HeaderContent.kt b/android/app/src/main/java/github/tornaco/android/thanos/dashboard/HeaderContent.kt
@@ -80,7 +80,7 @@ fun HeaderContent(state: HeaderState, onHeaderClick: () -> Unit) {
                     }
                     Text(
                         text = stringResource(id = R.string.boost_status_running_apps),
-                        style = MaterialTheme.typography.titleMedium,
+                        style = MaterialTheme.typography.titleMedium.copy(fontSize = 18.sp),
                         color = Color(onSurfaceColor)
                     )
                 }
@@ -131,7 +131,7 @@ fun HeaderContent(state: HeaderState, onHeaderClick: () -> Unit) {
 
 @Composable
 private fun MemStats(
-    memUsage: MemUsage
+    memUsage: MemUsage,
 ) {
     val onSurfaceColor = getColorAttribute(R.attr.colorOnSurface)
 
@@ -174,7 +174,7 @@ private fun MemStats(
 private fun AnimatedLinearProgressIndicator(
     memUsage: MemUsage,
     progressColor: Int,
-    progressTrackColor: Int
+    progressTrackColor: Int,
 ) {
     var startAnim by remember {
         mutableStateOf(false)

diff --git a/android/app/src/main/res/drawable/ic_nav_activity_replacement.xml b/android/app/src/main/res/drawable/ic_nav_activity_replacement.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6effccbc" />
+            <solid android:color="#4dffccbc" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_app_clone.xml b/android/app/src/main/res/drawable/ic_nav_app_clone.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6eb2dfdb" />
+            <solid android:color="#4db2dfdb" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_app_lock.xml b/android/app/src/main/res/drawable/ic_nav_app_lock.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ec8e6c9" />
+            <solid android:color="#4dc8e6c9" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_app_manager.xml b/android/app/src/main/res/drawable/ic_nav_app_manager.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6effe0b2" />
+            <solid android:color="#4dffe0b2" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_bg_restrict.xml b/android/app/src/main/res/drawable/ic_nav_bg_restrict.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6eb2dfdb" />
+            <solid android:color="#4db2dfdb" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_bg_start.xml b/android/app/src/main/res/drawable/ic_nav_bg_start.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6effcdd2" />
+            <solid android:color="#4dffcdd2" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_boost.xml b/android/app/src/main/res/drawable/ic_nav_boost.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ec8e6c9" />
+            <solid android:color="#4dc8e6c9" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_feedback.xml b/android/app/src/main/res/drawable/ic_nav_feedback.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ed1c4e9" />
+            <solid android:color="#4dd1c4e9" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_guide.xml b/android/app/src/main/res/drawable/ic_nav_guide.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6effe0b2" />
+            <solid android:color="#4dffe0b2" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_nr.xml b/android/app/src/main/res/drawable/ic_nav_nr.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ee1bee7" />
+            <solid android:color="#4de1bee7" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_op_remind.xml b/android/app/src/main/res/drawable/ic_nav_op_remind.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ed7ccc8" />
+            <solid android:color="#4dd7ccc8" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_ops.xml b/android/app/src/main/res/drawable/ic_nav_ops.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ecfd8dc" />
+            <solid android:color="#4dcfd8dc" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_plugins.xml b/android/app/src/main/res/drawable/ic_nav_plugins.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ebbdefb" />
+            <solid android:color="#4dbbdefb" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_priv_cheat.xml b/android/app/src/main/res/drawable/ic_nav_priv_cheat.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ed1c4e9" />
+            <solid android:color="#4dd1c4e9" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_profile.xml b/android/app/src/main/res/drawable/ic_nav_profile.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ec5cae9" />
+            <solid android:color="#4dc5cae9" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_screen_on_notification.xml b/android/app/src/main/res/drawable/ic_nav_screen_on_notification.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6eb2ebf2" />
+            <solid android:color="#4db2ebf2" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_smart_freeze.xml b/android/app/src/main/res/drawable/ic_nav_smart_freeze.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ebbdefb" />
+            <solid android:color="#4dbbdefb" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_smart_standby.xml b/android/app/src/main/res/drawable/ic_nav_smart_standby.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ecfd8dc" />
+            <solid android:color="#4dcfd8dc" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_task_blur.xml b/android/app/src/main/res/drawable/ic_nav_task_blur.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ef8bbd0" />
+            <solid android:color="#4df8bbd0" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_task_removal.xml b/android/app/src/main/res/drawable/ic_nav_task_removal.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ee1bee7" />
+            <solid android:color="#4de1bee7" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_wakelock_remover.xml b/android/app/src/main/res/drawable/ic_nav_wakelock_remover.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ef8bbd0" />
+            <solid android:color="#4df8bbd0" />
         </shape>
     </item>
     <item

diff --git a/android/app/src/main/res/drawable/ic_nav_wechat_push.xml b/android/app/src/main/res/drawable/ic_nav_wechat_push.xml
@@ -5,7 +5,7 @@
             <size
                 android:width="52dp"
                 android:height="52dp" />
-            <solid android:color="#6ec8e6c9" />
+            <solid android:color="#4dc8e6c9" />
         </shape>
     </item>
     <item

diff --git a/android/modules/module_common/src/main/res/values/dashboard.xml b/android/modules/module_common/src/main/res/values/dashboard.xml
@@ -66,7 +66,9 @@
     </style>
 
     <style name="TextAppearance.TileSubTitle" parent="TextAppearance.Small">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">13sp</item>
+        <!--        Medium-->
+        <item name="android:fontWeight">500</item>
     </style>
 </resources>