mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Change place bookmarks buttons color (#2570)

Browse source 
* change bookmarks row button color

* different button color for dark and light mode

* Resolve Merge Conflict
This commit is contained in:
Silky Priya 2019-03-12 00:34:09 +05:30 • committed by Vivek Maskara
parent 6389b35b49
commit 9d03274e2f
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/res/layout/nearby_row_button.xml
View file

@ -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"

1
app/src/main/res/values/attrs.xml
View file

@ -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"/>

2
app/src/main/res/values/styles.xml
View file

@ -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>