From 9d03274e2f76e9a3d72378f02ca70d0aa244e4aa Mon Sep 17 00:00:00 2001
From: Silky Priya <silkypriya64@gmail.com>
Date: Tue, 12 Mar 2019 00:34:09 +0530
Subject: [PATCH] Change place bookmarks buttons color (#2570)

* change bookmarks row button color

* different button color for dark and light mode

* Resolve Merge Conflict
---
 app/src/main/res/layout/nearby_row_button.xml | 8 +++++---
 app/src/main/res/values/attrs.xml             | 1 +
 app/src/main/res/values/styles.xml            | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/nearby_row_button.xml b/app/src/main/res/layout/nearby_row_button.xml
index 96f659148..508d33470 100644
--- a/app/src/main/res/layout/nearby_row_button.xml
+++ b/app/src/main/res/layout/nearby_row_button.xml
@@ -26,7 +26,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             app:srcCompat="@drawable/ic_round_star_border_24px"
-            android:tint="@color/button_blue"/>
+            android:tint="?attr/bookmarkButtonColor"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             app:srcCompat="@drawable/ic_photo_camera_white_24dp"
-            android:tint="@color/button_blue"/>
+            android:tint="?attr/bookmarkButtonColor"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             app:srcCompat="@drawable/ic_photo_white_24dp"
-            android:tint="@color/button_blue"
+            android:tint="?attr/bookmarkButtonColor"
             android:duplicateParentState="true"/>
         <TextView
             android:layout_width="wrap_content"
@@ -108,6 +108,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             app:srcCompat="@drawable/ic_directions_black_24dp"
+            android:tint="?attr/bookmarkButtonColor"
             android:duplicateParentState="true"/>
         <TextView
             android:layout_width="wrap_content"
@@ -135,6 +136,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             app:srcCompat="@drawable/ic_overflow"
+            android:tint="?attr/bookmarkButtonColor"
             android:duplicateParentState="true"/>
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 57e0fcd41..e0f488cba 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -15,6 +15,7 @@
     <attr name="buttonPressed" format="reference"/>
     <attr name="textDisabled" format="reference"/>
     <attr name="textEnabled" format="reference"/>
+    <attr name="bookmarkButtonColor" format="reference"/>
     <attr name="rowButtonColor" format="reference"/>
 
     <attr name="contributionsListBackground" format="reference"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 722b1243e..f3f38aab3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,6 +12,7 @@
         <item name="colorPrimaryDark">@color/primaryDarkColor</item>
         <item name="colorAccent">@color/white</item>
         <item name="colorButtonNormal">@color/primaryColor</item>
+        <item name="bookmarkButtonColor">@color/button_blue_dark</item>
         <item name="rowButtonColor">@color/button_blue_dark</item>
 
         <item name="semitransparentText">@color/commons_app_blue_dark</item>
@@ -41,6 +42,7 @@
         <item name="colorPrimaryDark">@color/primaryDarkColor</item>
         <item name="colorAccent">@color/primaryColor</item>
         <item name="colorButtonNormal">@color/primaryColor</item>
+        <item name="bookmarkButtonColor">@color/button_blue</item>
         <item name="rowButtonColor">@color/button_blue</item>
 
         <item name="semitransparentText">@color/commons_app_blue_light</item>