From fd41061f509e2780ee770bd14fc0c91d15dd7067 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 21 Feb 2016 20:14:50 +0100
Subject: [PATCH] Fixed an issue where the format icons were the wrong color
---
app/src/main/res/layout/widget_editor.xml | 4 ++++
app/src/main/res/values/attrs.xml | 1 +
app/src/main/res/values/styles.xml | 28 ++++-------------------
3 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/app/src/main/res/layout/widget_editor.xml b/app/src/main/res/layout/widget_editor.xml
index a302902e5..16d69691f 100644
--- a/app/src/main/res/layout/widget_editor.xml
+++ b/app/src/main/res/layout/widget_editor.xml
@@ -82,10 +82,14 @@
android:id="@+id/formatting_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
+
<android.support.v7.widget.ActionMenuView
android:id="@+id/formatting_menu"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize"/>
+
</android.support.v7.widget.Toolbar>
+
</android.support.design.widget.AppBarLayout>
+
</RelativeLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 2cf6d8c07..f1689d169 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -22,6 +22,7 @@
<resources>
<attr name="colorAccentFocus" format="color" />
+ <attr name="formatBarTheme" format="reference" />
<!-- sender colors -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f8d3cc3d4..5c37a0c00 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,6 +31,7 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="colorAccentFocus">@color/colorAccentFocus</item>
<item name="actionBarTheme">@style/AppTheme.AppBarOverlay</item>
+ <item name="formatBarTheme">@style/AppTheme.AppBarOverlay</item>
<item name="windowActionModeOverlay">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -39,19 +40,14 @@
<item name="material_drawer_primary_text">?attr/colorForeground</item>
<item name="material_drawer_primary_icon">?attr/colorForeground</item>
<item name="material_drawer_secondary_text">?attr/colorForegroundSecondary</item>
- <item name="material_drawer_selected">#26ffffff</item>
-
+
<item name="iconFormatBold">@drawable/ic_format_bold_dark</item>
<item name="iconFormatItalic">@drawable/ic_format_italic_dark</item>
<item name="iconFormatUnderline">@drawable/ic_format_underline_dark</item>
<item name="iconFormatPaint">@drawable/ic_format_paint_dark</item>
<item name="iconFormatFill">@drawable/ic_format_fill_dark</item>
<item name="iconHistory">@drawable/ic_history_dark</item>
- <item name="iconDebug">@drawable/ic_bug_dark</item>
- <item name="iconFilter">@drawable/ic_filter_dark</item>
- <item name="iconModify">@drawable/ic_pencil_dark</item>
- <item name="iconDelete">@drawable/ic_delete_dark</item>
- <item name="iconAdd">@drawable/ic_plus_dark</item>
+ <item name="material_drawer_selected">#26ffffff</item>
<item name="cardStyle">@style/CardView.Dark</item>
</style>
@@ -63,6 +59,7 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="colorAccentFocus">@color/colorAccentFocus</item>
<item name="actionBarTheme">@style/AppTheme.AppBarOverlay</item>
+ <item name="formatBarTheme">@style/AppTheme.AppBarOverlay.Light</item>
<item name="windowActionModeOverlay">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -79,11 +76,6 @@
<item name="iconFormatPaint">@drawable/ic_format_paint_light</item>
<item name="iconFormatFill">@drawable/ic_format_fill_light</item>
<item name="iconHistory">@drawable/ic_history_light</item>
- <item name="iconDebug">@drawable/ic_bug_light</item>
- <item name="iconFilter">@drawable/ic_filter_light</item>
- <item name="iconModify">@drawable/ic_pencil_light</item>
- <item name="iconDelete">@drawable/ic_delete_light</item>
- <item name="iconAdd">@drawable/ic_plus_light</item>
<item name="cardStyle">@style/CardView.Light</item>
</style>
@@ -110,12 +102,6 @@
<item name="android:textColorPrimary">#ffffff</item>
<item name="drawerArrowStyle">@style/DrawerArrowToggle</item>
- <item name="iconFormatBold">@drawable/ic_format_bold_dark</item>
- <item name="iconFormatItalic">@drawable/ic_format_italic_dark</item>
- <item name="iconFormatUnderline">@drawable/ic_format_underline_dark</item>
- <item name="iconFormatPaint">@drawable/ic_format_paint_dark</item>
- <item name="iconFormatFill">@drawable/ic_format_fill_dark</item>
- <item name="iconHistory">@drawable/ic_history_dark</item>
<item name="iconDebug">@drawable/ic_bug_dark</item>
<item name="iconFilter">@drawable/ic_filter_dark</item>
<item name="iconModify">@drawable/ic_pencil_dark</item>
@@ -128,12 +114,6 @@
<item name="android:textColorPrimary">#727272</item>
<item name="drawerArrowStyle">@style/DrawerArrowToggle.Light</item>
- <item name="iconFormatBold">@drawable/ic_format_bold_light</item>
- <item name="iconFormatItalic">@drawable/ic_format_italic_light</item>
- <item name="iconFormatUnderline">@drawable/ic_format_underline_light</item>
- <item name="iconFormatPaint">@drawable/ic_format_paint_light</item>
- <item name="iconFormatFill">@drawable/ic_format_fill_light</item>
- <item name="iconHistory">@drawable/ic_history_light</item>
<item name="iconDebug">@drawable/ic_bug_light</item>
<item name="iconFilter">@drawable/ic_filter_light</item>
<item name="iconModify">@drawable/ic_pencil_light</item>
--
GitLab