Skip to content

Commit 9d03274

Browse files
silkypriyamaskaravivek
authored andcommitted
Change place bookmarks buttons color (commons-app#2570)
* change bookmarks row button color * different button color for dark and light mode * Resolve Merge Conflict
1 parent 6389b35 commit 9d03274

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

app/src/main/res/layout/nearby_row_button.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
android:layout_height="wrap_content"
2727
android:layout_gravity="center_horizontal"
2828
app:srcCompat="@drawable/ic_round_star_border_24px"
29-
android:tint="@color/button_blue"/>
29+
android:tint="?attr/bookmarkButtonColor"/>
3030
<TextView
3131
android:layout_width="wrap_content"
3232
android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
5353
android:layout_height="wrap_content"
5454
android:layout_gravity="center_horizontal"
5555
app:srcCompat="@drawable/ic_photo_camera_white_24dp"
56-
android:tint="@color/button_blue"/>
56+
android:tint="?attr/bookmarkButtonColor"/>
5757
<TextView
5858
android:layout_width="wrap_content"
5959
android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
7979
android:layout_height="wrap_content"
8080
android:layout_gravity="center_horizontal"
8181
app:srcCompat="@drawable/ic_photo_white_24dp"
82-
android:tint="@color/button_blue"
82+
android:tint="?attr/bookmarkButtonColor"
8383
android:duplicateParentState="true"/>
8484
<TextView
8585
android:layout_width="wrap_content"
@@ -108,6 +108,7 @@
108108
android:layout_height="wrap_content"
109109
android:layout_gravity="center_horizontal"
110110
app:srcCompat="@drawable/ic_directions_black_24dp"
111+
android:tint="?attr/bookmarkButtonColor"
111112
android:duplicateParentState="true"/>
112113
<TextView
113114
android:layout_width="wrap_content"
@@ -135,6 +136,7 @@
135136
android:layout_height="wrap_content"
136137
android:layout_gravity="center_horizontal"
137138
app:srcCompat="@drawable/ic_overflow"
139+
android:tint="?attr/bookmarkButtonColor"
138140
android:duplicateParentState="true"/>
139141
<TextView
140142
android:layout_width="wrap_content"

app/src/main/res/values/attrs.xml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<attr name="buttonPressed" format="reference"/>
1616
<attr name="textDisabled" format="reference"/>
1717
<attr name="textEnabled" format="reference"/>
18+
<attr name="bookmarkButtonColor" format="reference"/>
1819
<attr name="rowButtonColor" format="reference"/>
1920

2021
<attr name="contributionsListBackground" format="reference"/>

app/src/main/res/values/styles.xml

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<item name="colorPrimaryDark">@color/primaryDarkColor</item>
1313
<item name="colorAccent">@color/white</item>
1414
<item name="colorButtonNormal">@color/primaryColor</item>
15+
<item name="bookmarkButtonColor">@color/button_blue_dark</item>
1516
<item name="rowButtonColor">@color/button_blue_dark</item>
1617

1718
<item name="semitransparentText">@color/commons_app_blue_dark</item>
@@ -41,6 +42,7 @@
4142
<item name="colorPrimaryDark">@color/primaryDarkColor</item>
4243
<item name="colorAccent">@color/primaryColor</item>
4344
<item name="colorButtonNormal">@color/primaryColor</item>
45+
<item name="bookmarkButtonColor">@color/button_blue</item>
4446
<item name="rowButtonColor">@color/button_blue</item>
4547

4648
<item name="semitransparentText">@color/commons_app_blue_light</item>

0 commit comments

Comments
 (0)