Match fill colors for hover bar icons and use tints

paroj · Apr 14, 2024 · e28cc7e · e28cc7e
1 parent fb68538
commit e28cc7e
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 48 deletions.
diff --git a/app/src/main/res/drawable/ic_action_rating_bad.xml b/app/src/main/res/drawable/ic_action_rating_bad.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v1.91l0.01,0.01L1,14c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z"/>
+    <path android:fillColor="@color/darkElement" android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v1.91l0.01,0.01L1,14c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_rating_good.xml b/app/src/main/res/drawable/ic_action_rating_good.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
+    <path android:fillColor="@color/darkElement" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_bookmark.xml b/app/src/main/res/drawable/ic_menu_bookmark.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
+    <path android:fillColor="@color/darkElement" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_toggle_star.xml b/app/src/main/res/drawable/ic_toggle_star.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+    <path android:fillColor="@color/darkElement" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>
diff --git a/app/src/main/res/layout-land/download.xml b/app/src/main/res/layout-land/download.xml
@@ -47,32 +47,38 @@
 				<ImageButton
 					android:id="@+id/download_rating_bad"
 					style="@style/DownloadActionImageButton"
-					android:src="?attr/rating_bad"/>
+					android:src="?attr/rating_bad"
+					android:tint="?attr/element_color"/>
 
 				<ImageButton
 					android:id="@+id/download_star"
 					style="@style/DownloadActionImageButton"
-					android:src="@android:drawable/star_big_off"/>
+					android:src="?attr/star"
+					android:tint="?attr/element_color"/>
 
 				<ImageButton
 					android:id="@+id/download_playback_speed"
 					style="@style/DownloadActionImageButton"
-					android:src="?attr/playback_speed"/>
+					android:src="?attr/playback_speed"
+					android:tint="?attr/element_color"/>
 
 				<ImageButton
 					android:id="@+id/download_bookmark"
 					style="@style/DownloadActionImageButton"
-					android:src="?attr/bookmark"/>
+					android:src="?attr/bookmark"
+					android:tint="?attr/element_color"/>
 
 				<ImageButton
 					android:id="@+id/download_rating_good"
 					style="@style/DownloadActionImageButton"
-					android:src="?attr/rating_good"/>
+					android:src="?attr/rating_good"
+					android:tint="?attr/element_color"/>
 
 				<ImageButton
 					android:id="@+id/download_rating_combined"
 					style="@style/DownloadActionImageButton"
-					android:src="?attr/rating_combined"/>
+					android:src="?attr/rating_combined"
+					android:tint="?attr/element_color"/>
 			</LinearLayout>
 		</LinearLayout>
 

diff --git a/app/src/main/res/layout-large-land/download.xml b/app/src/main/res/layout-large-land/download.xml
@@ -44,32 +44,38 @@
 					<ImageButton
 						android:id="@+id/download_rating_bad"
 						style="@style/DownloadActionImageButton"
-						android:src="?attr/rating_bad"/>
+						android:src="?attr/rating_bad"
+						android:tint="?attr/element_color"/>
 
 					<ImageButton
 						android:id="@+id/download_star"
 						style="@style/DownloadActionImageButton"
-						android:src="@android:drawable/star_big_off"/>
+						android:src="?attr/star"
+						android:tint="?attr/element_color"/>
 
 					<ImageButton
 						android:id="@+id/download_playback_speed"
 						style="@style/DownloadActionImageButton"
-						android:src="?attr/playback_speed"/>
+						android:src="?attr/playback_speed"
+						android:tint="?attr/element_color"/>
 
 					<ImageButton
 						android:id="@+id/download_bookmark"
 						style="@style/DownloadActionImageButton"
-						android:src="?attr/bookmark"/>
+						android:src="?attr/bookmark"
+						android:tint="?attr/element_color"/>
 
 					<ImageButton
 						android:id="@+id/download_rating_good"
 						style="@style/DownloadActionImageButton"
-						android:src="?attr/rating_good"/>
+						android:src="?attr/rating_good"
+						android:tint="?attr/element_color"/>
 
 					<ImageButton
 						android:id="@+id/download_rating_combined"
 						style="@style/DownloadActionImageButton"
-						android:src="?attr/rating_combined"/>
+						android:src="?attr/rating_combined"
+						android:tint="?attr/element_color"/>
 				</LinearLayout>
 			</RelativeLayout>
 

diff --git a/app/src/main/res/layout-port/download.xml b/app/src/main/res/layout-port/download.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/download_layout_container"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
@@ -45,39 +46,40 @@
 							android:layout_height="wrap_content"
 							android:layout_gravity="center_horizontal|bottom"
 							android:background="@color/overlayColor"
-							android:visibility="invisible"
 							android:gravity="center"
-							android:orientation="horizontal">
-
-								<ImageButton
-									android:id="@+id/download_rating_bad"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_action_rating_bad"/>
-
-								<ImageButton
-									android:id="@+id/download_star"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_toggle_star_outline_dark"/>
-
-								<ImageButton
-									android:id="@+id/download_playback_speed"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_action_playback_speed"/>
-
-								<ImageButton
-									android:id="@+id/download_bookmark"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_menu_bookmark"/>
-
-								<ImageButton
-									android:id="@+id/download_rating_good"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_action_rating_good"/>
-
-								<ImageButton
-									android:id="@+id/download_rating_combined"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_action_rating_combined"/>
+							android:orientation="horizontal"
+							android:visibility="invisible"
+							tools:visibility="visible">
+
+							<ImageButton
+								android:id="@+id/download_rating_bad"
+								style="@style/DownloadActionImageButton"
+								android:src="@drawable/ic_action_rating_bad" />
+
+							<ImageButton
+								android:id="@+id/download_star"
+								style="@style/DownloadActionImageButton"
+								android:src="@drawable/ic_toggle_star" />
+
+							<ImageButton
+								android:id="@+id/download_playback_speed"
+								style="@style/DownloadActionImageButton"
+								android:src="@drawable/ic_action_playback_speed" />
+
+							<ImageButton
+								android:id="@+id/download_bookmark"
+								style="@style/DownloadActionImageButton"
+								android:src="@drawable/ic_menu_bookmark" />
+
+							<ImageButton
+								android:id="@+id/download_rating_good"
+								style="@style/DownloadActionImageButton"
+								android:src="@drawable/ic_action_rating_good" />
+
+							<ImageButton
+								android:id="@+id/download_rating_combined"
+								style="@style/DownloadActionImageButton"
+								android:src="@drawable/ic_action_rating_combined" />
 						</LinearLayout>
 					</FrameLayout>
 				</FrameLayout>