chore: consolidate primary_light color

ViscousPot · Oct 22, 2024 · dbd5a75 · dbd5a75
1 parent 6dc137e
commit dbd5a75
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 15 deletions.
diff --git a/app/src/main/java/com/viscouspot/gitsync/MainActivity.kt b/app/src/main/java/com/viscouspot/gitsync/MainActivity.kt
@@ -949,7 +949,7 @@ class MainActivity : AppCompatActivity() {
             } else {
                 selectApplication.text = getString(R.string.application_not_set)
                 selectApplication.setIconResource(R.drawable.circle_plus)
-                selectApplication.setIconTintResource(R.color.textPrimary)
+                selectApplication.setIconTintResource(R.color.primary_light)
                 selectApplication.iconTintMode = PorterDuff.Mode.SRC_IN
 
                 applicationRecycler.visibility = View.GONE

diff --git a/app/src/main/res/color/application_select_icon_tint.xml b/app/src/main/res/color/application_select_icon_tint.xml
diff --git a/app/src/main/res/color/application_select_text_color.xml b/app/src/main/res/color/application_select_text_color.xml
diff --git a/.../res/color/material_button_icon_color.xml → app/src/main/res/color/primary_light.xml b/.../res/color/material_button_icon_color.xml → app/src/main/res/color/primary_light.xml
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
@@ -211,7 +211,7 @@
                 android:insetTop="0dp"
                 android:insetBottom="0dp"
                 android:text="@string/auth"
-                android:textColor="@color/textPrimary"
+                android:textColor="@color/primary_light"
                 android:textSize="@dimen/text_size_md"
                 app:backgroundTint="@null"
                 app:icon="@drawable/circle_xmark"

diff --git a/app/src/main/res/layout/merge_conflict_dialog.xml b/app/src/main/res/layout/merge_conflict_dialog.xml
@@ -164,7 +164,7 @@
         android:paddingHorizontal="@dimen/space_sm"
         android:paddingVertical="@dimen/space_sm"
         android:text="abort merge"
-        android:textColor="@color/textPrimary"
+        android:textColor="@color/primary_light"
         android:textSize="@dimen/text_size_sm"
         app:backgroundTint="@null"
         app:layout_constraintBottom_toBottomOf="@id/merge"

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -64,7 +64,7 @@
     </style>
 
     <style name="ApplicationSelectButton" parent="ThemeOverlay.Material3.Button">
-        <item name="android:textColor">@color/application_select_text_color</item>
-        <item name="iconTint">@color/application_select_icon_tint</item>
+        <item name="android:textColor">@color/primary_light</item>
+        <item name="iconTint">@color/primary_light</item>
     </style>
 </resources>