jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378129 )
Change subject: Fix header edit button tint (once more, with feeling)
......................................................................
Fix header edit button tint (once more, with feeling)
Confirmed the fix on API levels 16 and 25.
Bug: T172157
Change-Id: I2d8fa75b78a2764e543857e608a6e22734f541f1
---
M app/src/main/res/layout/view_page_header.xml
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
4 files changed, 13 insertions(+), 4 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/res/layout/view_page_header.xml
b/app/src/main/res/layout/view_page_header.xml
index 3f12821..268b45e 100644
--- a/app/src/main/res/layout/view_page_header.xml
+++ b/app/src/main/res/layout/view_page_header.xml
@@ -71,9 +71,8 @@
android:layout_marginRight="@dimen/edit_pencil_horizontal_margin"
android:layout_gravity="bottom|end"
app:srcCompat="@drawable/ic_mode_edit_white_24dp"
+ style="?attr/header_edit_button"
android:scaleType="fitCenter"
- android:tint="?android:attr/textColorSecondary"
- android:alpha="?attr/page_header_edit_pencil_alpha"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/article_header_edit_hint" />
diff --git a/app/src/main/res/values/attrs.xml
b/app/src/main/res/values/attrs.xml
index f3c7e86..1cf27c9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -47,6 +47,7 @@
<attr name="edit_preview_color" format="reference" />
<attr name="blue_switch" format="reference" />
+ <attr name="header_edit_button" format="reference" />
<declare-styleable name="CabSearchView">
<attr name="cabEnabled" format="boolean" />
diff --git a/app/src/main/res/values/styles_dark.xml
b/app/src/main/res/values/styles_dark.xml
index b867993..bafbab0 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -64,6 +64,7 @@
<item
name="feed_text_tertiary_color">@color/feed_text_tertiary_dark</item>
<item name="searchItemBackground">@color/base12</item>
<item name="cardBackgroundColor">@color/base14</item>
+ <item name="header_edit_button">@style/HeaderEditButtonDark</item>
<item name="edit_preview_color">@color/accent75</item>
<item name="horizontal_divider">@style/HorizontalDividerDark</item>
</style>
@@ -93,4 +94,9 @@
<item name="android:alpha">0.20</item>
</style>
+ <style name="HeaderEditButtonDark">
+ <item name="android:tint">@color/base100</item>
+ <item name="android:alpha">0.7</item>
+ </style>
+
</resources>
diff --git a/app/src/main/res/values/styles_light.xml
b/app/src/main/res/values/styles_light.xml
index 285fb13..9779d3b 100644
--- a/app/src/main/res/values/styles_light.xml
+++ b/app/src/main/res/values/styles_light.xml
@@ -52,8 +52,6 @@
<item
name="link_preview_offline_text_color">@color/link_preview_offline_text_light</item>
<item
name="list_item_text_primary_color">@color/list_item_text_primary_light</item>
<item
name="list_item_text_secondary_color">@color/list_item_text_secondary_light</item>
- <item name="page_header_edit_pencil_alpha">0.55</item>
-
<item name="offline_library_background_color">@color/base80</item>
<item name="nav_tab_background_color">@android:color/white</item>
<item
name="nav_tab_item_color_state">@color/color_state_nav_tab_light</item>
@@ -65,6 +63,7 @@
<item
name="feed_text_tertiary_color">@color/feed_text_tertiary_light</item>
<item name="searchItemBackground">@color/base100</item>
<item name="cardBackgroundColor">@color/base100</item>
+ <item name="header_edit_button">@style/HeaderEditButtonLight</item>
<item name="edit_preview_color">@color/accent50</item>
<item name="horizontal_divider">@style/HorizontalDividerLight</item>
</style>
@@ -96,4 +95,8 @@
<item name="android:alpha">0.12</item>
</style>
+ <style name="HeaderEditButtonLight">
+ <item name="android:alpha">0.55</item>
+ </style>
+
</resources>
--
To view, visit https://gerrit.wikimedia.org/r/378129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d8fa75b78a2764e543857e608a6e22734f541f1
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
