Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/365021 )
Change subject: Update color of main toolbar and page bottom actions bar.
......................................................................
Update color of main toolbar and page bottom actions bar.
This lightens the color that is used for the main toolbar (in the page
activity), the bottom actions bar (also in page activity), and the search
bar (used in Main and Page activity).
Change-Id: I3b5b7ae03588593ade65fffc0d100a795481ef90
---
M app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
M app/src/main/res/layout/fragment_page.xml
M app/src/main/res/values/colors.xml
M app/src/main/res/values/styles.xml
M app/src/main/res/values/styles_dark.xml
5 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/21/365021/1
diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
index 36ef274..4b4e6ca 100644
--- a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
@@ -86,7 +86,7 @@
Uri imageUri = item.featureImage();
int height = imageUri == null ?
DimenUtil.getContentTopOffsetPx(getContext()) :
newsFeatureImageHeightForDevice();
if (imageUri == null) {
- toolbar.setBackgroundColor(ContextCompat.getColor(getContext(),
R.color.actionbar_background));
+ toolbar.setBackgroundColor(ContextCompat.getColor(getContext(),
R.color.main_toolbar_background));
}
DimenUtil.setViewHeight(image, height);
image.loadImage(imageUri);
diff --git a/app/src/main/res/layout/fragment_page.xml
b/app/src/main/res/layout/fragment_page.xml
index 0700073..40139d4 100644
--- a/app/src/main/res/layout/fragment_page.xml
+++ b/app/src/main/res/layout/fragment_page.xml
@@ -65,9 +65,9 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:tabGravity="fill"
- android:background="@color/darkest_gray"
- app:tabSelectedTextColor="@color/darkest_gray"
- app:tabIndicatorColor="@color/darkest_gray" />
+ android:background="@color/base18"
+ app:tabSelectedTextColor="@color/base18"
+ app:tabIndicatorColor="@color/base18" />
</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/colors.xml
b/app/src/main/res/values/colors.xml
index c2a67cc..057e467 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,12 +9,15 @@
<color name="base50">#a2a9b1</color> <!-- B AAA: Highlighted border -->
<color name="base30">#72777d</color> <!-- B&W AA: Disabled elements text,
Placeholder text, Active border -->
<color name="base20">#54595d</color> <!-- W AAA: Emphasized secondary text
at level AAA need -->
- <color name="base15">#2e3136</color>
+ <color name="base18">#43464a</color> <!-- AAA: "Mesosphere gray" -->
+ <color name="base14">#2e3136</color> <!-- AAA: "Thermosphere gray" -->
+ <color name="base12">#27292d</color> <!-- AAA: "Exosphere gray" -->
<color name="base10">#222</color> <!-- W AAA: Copy color, Buttons /
widgets text -->
<color name="base0">#000</color> <!-- W AAA: Emphasized copy color, Active
button widgets text -->
<!-- Accent -->
<color name="accent90">#eaf3ff</color> <!-- B AAA: Hovered buttons, Active
menu, Items background -->
+ <color name="accent75">#69f</color> <!-- AAA "Stratosphere blue" -->
<color name="accent50">#36c</color> <!-- W AA Progressive: Primary
buttons, Links, Page accents, Focus outlines -->
<color name="accent30">#2a4b8d</color> <!-- W AAA: Active buttons, Active
links -->
<color name="red90">#fee7e6</color> <!-- B AAA -->
@@ -60,12 +63,11 @@
<color name="gray_disabled">#80606060</color>
<color name="gray_highlight">#808080</color>
<color name="page_info_heading">#555</color>
- <color name="actionbar_background">@color/darkest_gray</color>
<color name="actionbar_highlight">#808080</color>
<color name="search_text_hint">#32ffffff</color>
<color name="lead_gradient_start">#b8000000</color>
<color name="new_lead_gradient_start">#50000000</color>
- <color name="main_toolbar_background">@color/actionbar_background</color>
+ <color name="main_toolbar_background">@color/base18</color>
<color name="window_background_light">#fff</color>
<color name="page_background_light">#fff</color>
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index 7887859..4eb5ee6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -26,7 +26,7 @@
</style>
<style name="AppTheme.ToolbarStyle"
parent="@style/Widget.AppCompat.ActionBar">
- <item name="background">@color/actionbar_background</item>
+ <item name="background">@color/main_toolbar_background</item>
<item name="navigationIcon">?attr/homeAsUpIndicator</item>
<item name="elevation">4dp</item>
<item name="titleTextStyle">@style/AppTheme.ToolBarTitleText</item>
diff --git a/app/src/main/res/values/styles_dark.xml
b/app/src/main/res/values/styles_dark.xml
index 8723237..1def75e 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -49,7 +49,7 @@
<item name="tab_shadow_color">@color/tab_shadow_dark</item>
<item name="tool_tip_default_color">@color/tool_tip_default_dark</item>
<item
name="link_preview_toolbar_color">@color/link_preview_toolbar_dark</item>
- <item name="bottom_sheet_background_color">@color/base15</item>
+ <item name="bottom_sheet_background_color">@color/base14</item>
<item
name="link_preview_text_color">@color/link_preview_text_dark</item>
<item
name="link_preview_offline_text_color">@color/link_preview_offline_text_dark</item>
<item name="nav_background_color">@android:color/black</item>
--
To view, visit https://gerrit.wikimedia.org/r/365021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b5b7ae03588593ade65fffc0d100a795481ef90
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
