change icons color

shubhsherl · shubhsherl · commit 8015de31ede7 · 2019-03-19T10:05:53.000+05:30
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/ViewHolder.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/ViewHolder.kt
@@ -42,7 +42,7 @@ abstract class ViewHolder<T : ItemHolder<*>>(
                 val menuItems = view.context.inflate(R.menu.chatrooms_action).toList()
                 menuItems.find { it.itemId == R.id.action_favorite_room }?.apply {
                   setTitle(if ((it as RoomUiModel).favorite == true) R.string.action_unfavorite else R.string.action_favorite)
-                  setIcon(if (it.favorite == true) R.drawable.ic_star_black_24dp else R.drawable.ic_star_border_black_24dp)
+                  setIcon(if (it.favorite == true) R.drawable.ic_star_24dp else R.drawable.ic_star_border_24dp)
                   isChecked = (it.favorite==true)
                 }
                 menuItems.find { it.itemId == R.id.action_read }?.apply {
diff --git a/app/src/main/res/drawable/ic_flag_24dp.xml b/app/src/main/res/drawable/ic_flag_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/actionMenuColor"
         android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_leave_room_24dp.xml b/app/src/main/res/drawable/ic_leave_room_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/actionMenuColor"
         android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_24dp.xml b/app/src/main/res/drawable/ic_star_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/actionMenuColor"
         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/drawable/ic_star_border_24dp.xml b/app/src/main/res/drawable/ic_star_border_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/actionMenuColor"
         android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_visibility_off_24dp.xml b/app/src/main/res/drawable/ic_visibility_off_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/actionMenuColor"
         android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
 </vector>
diff --git a/app/src/main/res/menu/chatrooms_action.xml b/app/src/main/res/menu/chatrooms_action.xml
@@ -4,22 +4,22 @@
 
   <item
     android:id="@+id/action_hide_room"
-    android:icon="@drawable/ic_visibility_off_black_24dp"
+    android:icon="@drawable/ic_visibility_off_24dp"
     android:title="@string/action_hide_room" />
 
   <item
     android:id="@+id/action_read"
-    android:icon="@drawable/ic_flag_black_24dp"
+    android:icon="@drawable/ic_flag_24dp"
     android:title="@string/action_mark_read" />
 
   <item
     android:id="@+id/action_favorite_room"
-    android:icon="@drawable/ic_star_border_black_24dp"
+    android:icon="@drawable/ic_star_border_24dp"
     android:title="@string/action_favorite" />
 
   <item
     android:id="@+id/action_leave_room"
-    android:icon="@drawable/ic_leave_room_black_24dp"
+    android:icon="@drawable/ic_leave_room_24dp"
     android:title="@string/action_leave_room" />
 
 </menu>

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ abstract class ViewHolder<T : ItemHolder<*>>(`
`42`	`42`	`val menuItems = view.context.inflate(R.menu.chatrooms_action).toList()`
`43`	`43`	`menuItems.find { it.itemId == R.id.action_favorite_room }?.apply {`
`44`	`44`	`setTitle(if ((it as RoomUiModel).favorite == true) R.string.action_unfavorite else R.string.action_favorite)`
`45`		`- setIcon(if (it.favorite == true) R.drawable.ic_star_black_24dp else R.drawable.ic_star_border_black_24dp)`
	`45`	`+ setIcon(if (it.favorite == true) R.drawable.ic_star_24dp else R.drawable.ic_star_border_24dp)`
`46`	`46`	`isChecked = (it.favorite==true)`
`47`	`47`	`}`
`48`	`48`	`menuItems.find { it.itemId == R.id.action_read }?.apply {`