fix(nord): use nord colors for like (heart) and favorite (star)

LucasGGamerM · Oct 13, 2023 · 045668d · 045668d
1 parent 8f80668
commit 045668d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/mastodon/src/main/res/color/like_icon.xml b/mastodon/src/main/res/color/like_icon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/like_selected" android:state_selected="true"/>
+	<item android:color="?colorLike" android:state_selected="true"/>
 	<item android:color="?android:textColorSecondary"/>
 </selector>
diff --git a/mastodon/src/main/res/values/colors.xml b/mastodon/src/main/res/values/colors.xml
@@ -435,6 +435,7 @@
 
 	<color name="nord_favorite">#ebcb8b</color>
 	<color name="nord_bookmark_selected">#a3be8c</color>
+	<color name="nord_like">#BF616A</color>
 
 <!--	<color name="nord_gray_400t">#4d8C96B4</color>-->
 	<color name="nord_gray_400">#8C96B4</color>

diff --git a/mastodon/src/main/res/values/palettes.xml b/mastodon/src/main/res/values/palettes.xml
@@ -14,6 +14,7 @@
 		<item name="colorPrimary900">@color/primary_900</item>
 		<item name="colorFavorite">@color/warning_500</item>
 		<item name="colorBookmark">@color/bookmark_selected</item>
+		<item name="colorLike">@color/like_selected</item>
 
 		<item name="colorGray900">@color/gray_900</item>
 		<item name="colorGray800">@color/gray_800</item>
@@ -68,8 +69,10 @@
 		<item name="colorM3DarkOnSurface">?colorGray100</item>
 		<item name="colorM3PrimaryInverse">?colorPrimary200</item>
 
-		<item name="colorFavorite">@color/warning_500</item>
-		<item name="colorLike">@color/like_selected</item>
+<!--		We comment these lines out to allow custom themes, like nord, to get control over them-->
+<!--		<item name="colorFavorite">@color/warning_500</item>-->
+<!--		<item name="colorLike">@color/like_selected</item>-->
+
 		<item name="colorBoost">?colorM3Primary</item>
 		<item name="colorPoll">@color/bookmark_selected</item>
 		<item name="colorTabBarAlpha">#14000000</item>
@@ -538,6 +541,7 @@
 
 		<item name="colorBookmark">@color/nord_bookmark_selected</item>
 		<item name="colorFavorite">@color/nord_favorite</item>
+		<item name="colorLike">@color/nord_like</item>
 
 		<item name="colorGray900">@color/nord_gray_900</item>
 <!--		<item name="colorGray800t">@color/nord_gray_800t</item>-->