Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366742 )
Change subject: Fix: remove color attributes from Drawables
......................................................................
Fix: remove color attributes from Drawables
Color attributes in Drawables are not supported on API 19 and lower and
crash the app when referenced with a valid attribute name (color as
opposed to drawable). Make theme dependent Drawables instead.
Change-Id: I490d3a6dacb31ee783bf12da6ab57f2666a7be30
---
M app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java
A app/src/main/res/drawable/edit_improve_tag_selected_dark.xml
A app/src/main/res/drawable/edit_improve_tag_selected_light.xml
A app/src/main/res/drawable/edit_improve_tag_unselected_dark.xml
A app/src/main/res/drawable/edit_improve_tag_unselected_light.xml
D app/src/main/res/drawable/editpage_improve_tag_selected.xml
D app/src/main/res/drawable/editpage_improve_tag_unselected.xml
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/colors.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
11 files changed, 40 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/42/366742/1
diff --git a/app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java
b/app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java
index 328ad21..619917a 100644
--- a/app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java
+++ b/app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.res.Resources;
+import android.support.annotation.AttrRes;
import android.support.annotation.ColorInt;
import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.widget.AppCompatTextView;
@@ -77,7 +78,10 @@
}
private void updateState() {
- setBackgroundResource(selected ?
R.drawable.editpage_improve_tag_selected :
R.drawable.editpage_improve_tag_unselected);
+ @AttrRes int backgroundAttributeResource = selected
+ ? R.attr.edit_improve_tag_selected_drawable :
R.attr.edit_improve_tag_unselected_drawable;
+ setBackgroundResource(ResourceUtil.getThemedAttributeId(getContext(),
backgroundAttributeResource));
+
@ColorInt int textColor = ResourcesCompat.getColor(resources, selected
? android.R.color.white :
ResourceUtil.getThemedAttributeId(getContext(), R.attr.colorAccent), null);
setTextColor(textColor);
diff --git a/app/src/main/res/drawable/edit_improve_tag_selected_dark.xml
b/app/src/main/res/drawable/edit_improve_tag_selected_dark.xml
new file mode 100644
index 0000000..02e765b
--- /dev/null
+++ b/app/src/main/res/drawable/edit_improve_tag_selected_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android";>
+ <stroke android:width="1dp" android:color="@color/accent_dark" />
+ <solid android:color="@color/accent_dark" />
+ <corners android:radius="@dimen/corner_radius" />
+</shape>
diff --git a/app/src/main/res/drawable/edit_improve_tag_selected_light.xml
b/app/src/main/res/drawable/edit_improve_tag_selected_light.xml
new file mode 100644
index 0000000..5041e00
--- /dev/null
+++ b/app/src/main/res/drawable/edit_improve_tag_selected_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android";>
+ <stroke android:width="1dp" android:color="@color/accent_light" />
+ <solid android:color="@color/accent_light" />
+ <corners android:radius="@dimen/corner_radius" />
+</shape>
diff --git a/app/src/main/res/drawable/edit_improve_tag_unselected_dark.xml
b/app/src/main/res/drawable/edit_improve_tag_unselected_dark.xml
new file mode 100644
index 0000000..b05dfef
--- /dev/null
+++ b/app/src/main/res/drawable/edit_improve_tag_unselected_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android";>
+ <stroke android:width="1dp" android:color="@color/accent_dark" />
+ <solid android:color="@color/window_background_dark" />
+ <corners android:radius="@dimen/corner_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/edit_improve_tag_unselected_light.xml
b/app/src/main/res/drawable/edit_improve_tag_unselected_light.xml
new file mode 100644
index 0000000..f290ce6
--- /dev/null
+++ b/app/src/main/res/drawable/edit_improve_tag_unselected_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android";>
+ <stroke android:width="1dp" android:color="@color/accent_light" />
+ <solid android:color="@color/window_background_light" />
+ <corners android:radius="@dimen/corner_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/editpage_improve_tag_selected.xml
b/app/src/main/res/drawable/editpage_improve_tag_selected.xml
deleted file mode 100644
index e1f9909..0000000
--- a/app/src/main/res/drawable/editpage_improve_tag_selected.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android";>
- <stroke android:width="1dp" android:color="?attr/colorAccent" />
- <solid android:color="?attr/colorAccent" />
- <corners android:radius="@dimen/corner_radius" />
-</shape>
diff --git a/app/src/main/res/drawable/editpage_improve_tag_unselected.xml
b/app/src/main/res/drawable/editpage_improve_tag_unselected.xml
deleted file mode 100644
index df32e10..0000000
--- a/app/src/main/res/drawable/editpage_improve_tag_unselected.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android";>
- <stroke android:width="1dp" android:color="?attr/colorAccent" />
- <solid android:drawable="?attr/window_background_color" />
- <corners android:radius="@dimen/corner_radius" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml
b/app/src/main/res/values/attrs.xml
index 65c6780..8ebd7f5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -10,6 +10,8 @@
<attr name="toc_section_text_color" format="reference"/>
<attr name="toc_subsection_text_color" format="reference"/>
<attr name="edit_text_color" format="reference"/>
+ <attr name="edit_improve_tag_selected_drawable" format="reference" />
+ <attr name="edit_improve_tag_unselected_drawable" format="reference" />
<attr name="abusefilter_background_color" format="reference"/>
<attr name="lead_image_drawable" format="reference"/>
<!-- TODO: rename? -->
diff --git a/app/src/main/res/values/colors.xml
b/app/src/main/res/values/colors.xml
index 0453fbd..10a16b1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,6 +34,9 @@
<color name="yellow30">#ac6600</color> <!-- B AAA: -->
<color name="material_icon_default_gray">#9e9e9e</color>
+ <color name="accent_light">@color/accent50</color>
+ <color name="accent_dark">@color/accent75</color>
+
<!-- Legacy -->
<color name="darkest_gray">@color/base10</color>
<color name="dark_gray">@color/base30</color>
diff --git a/app/src/main/res/values/styles_dark.xml
b/app/src/main/res/values/styles_dark.xml
index 5b0135e..fe88552 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -26,7 +26,7 @@
<item
name="autoCompleteTextViewStyle">@style/AppTheme.SearchViewEditTextStyle</item>
<item name="popupMenuStyle">@style/Theme.Dark.PopupMenuStyle</item>
<item name="alertDialogTheme">@style/Theme.Dark.Dialog.Alert</item>
- <item name="colorAccent">@color/accent75</item>
+ <item name="colorAccent">@color/accent_dark</item>
<item name="android:windowBackground">@color/base10</item>
<item name="window_background_color">@color/base10</item>
<item name="window_inverse_color">@color/base90</item>
@@ -38,6 +38,8 @@
<item name="toc_section_text_color">@color/toc_section_text_dark</item>
<item
name="toc_subsection_text_color">@color/toc_subsection_text_dark</item>
<item name="edit_text_color">@color/edit_text_dark</item>
+ <item
name="edit_improve_tag_selected_drawable">@drawable/edit_improve_tag_selected_dark</item>
+ <item
name="edit_improve_tag_unselected_drawable">@drawable/edit_improve_tag_unselected_dark</item>
<item
name="abusefilter_background_color">@color/abusefilter_background_dark</item>
<item name="lead_image_drawable">@drawable/lead_default_dark</item>
<item name="lead_text_color">@color/lead_text_dark</item>
diff --git a/app/src/main/res/values/styles_light.xml
b/app/src/main/res/values/styles_light.xml
index 4ee2f5e..f3b54ac 100644
--- a/app/src/main/res/values/styles_light.xml
+++ b/app/src/main/res/values/styles_light.xml
@@ -26,7 +26,7 @@
<item
name="autoCompleteTextViewStyle">@style/AppTheme.SearchViewEditTextStyle</item>
<item name="popupMenuStyle">@style/Theme.Light.PopupMenuStyle</item>
<item name="alertDialogTheme">@style/Theme.Light.Dialog.Alert</item>
- <item name="colorAccent">@color/accent50</item>
+ <item name="colorAccent">@color/accent_light</item>
<item name="android:windowBackground">@color/base90</item>
<item name="window_background_color">@color/base90</item>
<item name="window_inverse_color">@color/base10</item>
@@ -38,6 +38,8 @@
<item
name="toc_section_text_color">@color/toc_section_text_light</item>
<item
name="toc_subsection_text_color">@color/toc_subsection_text_light</item>
<item name="edit_text_color">@color/edit_text_light</item>
+ <item
name="edit_improve_tag_selected_drawable">@drawable/edit_improve_tag_selected_light</item>
+ <item
name="edit_improve_tag_unselected_drawable">@drawable/edit_improve_tag_unselected_light</item>
<item
name="abusefilter_background_color">@color/abusefilter_background_light</item>
<!-- TODO: rename? -->
<item name="lead_image_drawable">@drawable/lead_default</item>
--
To view, visit https://gerrit.wikimedia.org/r/366742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I490d3a6dacb31ee783bf12da6ab57f2666a7be30
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
