Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327850 )
Change subject: Vectorize still more drawables.
......................................................................
Vectorize still more drawables.
- Abuse filter icons.
- Map marker icon.
- Error icon used in Crash dialog and WikiErrorView (no longer using a
compound drawable in TextView, for compatibility).
Change-Id: Ia07ab53e7aa99c62b2a5e241e0a142ad89861aac
---
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
D app/src/main/res/drawable-hdpi/abusefilter_disallow.png
D app/src/main/res/drawable-hdpi/abusefilter_warn.png
D app/src/main/res/drawable-hdpi/ic_error_black.png
D app/src/main/res/drawable-hdpi/ic_error_gray.png
D app/src/main/res/drawable-hdpi/ic_map_marker.png
D app/src/main/res/drawable-mdpi/abusefilter_disallow.png
D app/src/main/res/drawable-mdpi/abusefilter_warn.png
D app/src/main/res/drawable-mdpi/ic_error_black.png
D app/src/main/res/drawable-mdpi/ic_error_gray.png
D app/src/main/res/drawable-mdpi/ic_map_marker.png
D app/src/main/res/drawable-xhdpi/abusefilter_disallow.png
D app/src/main/res/drawable-xhdpi/abusefilter_warn.png
D app/src/main/res/drawable-xhdpi/ic_error_black.png
D app/src/main/res/drawable-xhdpi/ic_error_gray.png
D app/src/main/res/drawable-xhdpi/ic_map_marker.png
D app/src/main/res/drawable-xxhdpi/abusefilter_disallow.png
D app/src/main/res/drawable-xxhdpi/abusefilter_warn.png
D app/src/main/res/drawable-xxhdpi/ic_error_black.png
D app/src/main/res/drawable-xxhdpi/ic_error_gray.png
D app/src/main/res/drawable-xxhdpi/ic_map_marker.png
D app/src/main/res/drawable-xxxhdpi/abusefilter_disallow.png
D app/src/main/res/drawable-xxxhdpi/abusefilter_warn.png
D app/src/main/res/drawable-xxxhdpi/ic_error_black.png
D app/src/main/res/drawable-xxxhdpi/ic_error_gray.png
D app/src/main/res/drawable-xxxhdpi/ic_map_marker.png
A app/src/main/res/drawable/ic_abusefilter_disallow.xml
A app/src/main/res/drawable/ic_abusefilter_warn.xml
A app/src/main/res/drawable/ic_error_black_24dp.xml
A app/src/main/res/drawable/ic_map_marker.xml
M app/src/main/res/layout-land/fragment_crash_report.xml
M app/src/main/res/layout/activity_edit_section.xml
M app/src/main/res/layout/custom_error_view.xml
M app/src/main/res/layout/fragment_crash_report.xml
D icon-svgs/24/ic_error_gray.noflip.svg
D icon-svgs/24/ic_map_marker.noflip.svg
D icon-svgs/48/abusefilter_disallow.noflip.svg
D icon-svgs/48/abusefilter_warn.noflip.svg
D icon-svgs/72/ic_pageimage_placeholder.noflip.svg
39 files changed, 72 insertions(+), 301 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/50/327850/1
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index 8829e9c..f962cf3 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -9,6 +9,7 @@
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
@@ -483,12 +484,12 @@
}
if (abusefilterEditResult.getType() ==
EditAbuseFilterResult.TYPE_ERROR) {
funnel.logAbuseFilterError(abusefilterEditResult.getCode());
- abuseFilterImage.setImageResource(R.drawable.abusefilter_disallow);
+ abuseFilterImage.setImageDrawable(ContextCompat.getDrawable(this,
R.drawable.ic_abusefilter_disallow));
abusefilterTitle.setText(getString(R.string.abusefilter_title_disallow));
abusefilterText.setText(StringUtil.fromHtml(getString(R.string.abusefilter_text_disallow)));
} else {
funnel.logAbuseFilterWarning(abusefilterEditResult.getCode());
- abuseFilterImage.setImageResource(R.drawable.abusefilter_warn);
+ abuseFilterImage.setImageDrawable(ContextCompat.getDrawable(this,
R.drawable.ic_abusefilter_warn));
abusefilterTitle.setText(getString(R.string.abusefilter_title_warn));
abusefilterText.setText(StringUtil.fromHtml(getString(R.string.abusefilter_text_warn)));
}
diff --git a/app/src/main/res/drawable-hdpi/abusefilter_disallow.png
b/app/src/main/res/drawable-hdpi/abusefilter_disallow.png
deleted file mode 100644
index 383bbf9..0000000
--- a/app/src/main/res/drawable-hdpi/abusefilter_disallow.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/abusefilter_warn.png
b/app/src/main/res/drawable-hdpi/abusefilter_warn.png
deleted file mode 100644
index f2efc3e..0000000
--- a/app/src/main/res/drawable-hdpi/abusefilter_warn.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_error_black.png
b/app/src/main/res/drawable-hdpi/ic_error_black.png
deleted file mode 100644
index a026a8c..0000000
--- a/app/src/main/res/drawable-hdpi/ic_error_black.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_error_gray.png
b/app/src/main/res/drawable-hdpi/ic_error_gray.png
deleted file mode 100644
index 789f2a4..0000000
--- a/app/src/main/res/drawable-hdpi/ic_error_gray.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_map_marker.png
b/app/src/main/res/drawable-hdpi/ic_map_marker.png
deleted file mode 100644
index 7ba5f5e..0000000
--- a/app/src/main/res/drawable-hdpi/ic_map_marker.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/abusefilter_disallow.png
b/app/src/main/res/drawable-mdpi/abusefilter_disallow.png
deleted file mode 100644
index 5c105a4..0000000
--- a/app/src/main/res/drawable-mdpi/abusefilter_disallow.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/abusefilter_warn.png
b/app/src/main/res/drawable-mdpi/abusefilter_warn.png
deleted file mode 100644
index 773b742..0000000
--- a/app/src/main/res/drawable-mdpi/abusefilter_warn.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_error_black.png
b/app/src/main/res/drawable-mdpi/ic_error_black.png
deleted file mode 100644
index 39dc272..0000000
--- a/app/src/main/res/drawable-mdpi/ic_error_black.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_error_gray.png
b/app/src/main/res/drawable-mdpi/ic_error_gray.png
deleted file mode 100644
index 3953f2b..0000000
--- a/app/src/main/res/drawable-mdpi/ic_error_gray.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_map_marker.png
b/app/src/main/res/drawable-mdpi/ic_map_marker.png
deleted file mode 100644
index 896c2fb..0000000
--- a/app/src/main/res/drawable-mdpi/ic_map_marker.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/abusefilter_disallow.png
b/app/src/main/res/drawable-xhdpi/abusefilter_disallow.png
deleted file mode 100644
index 573e468..0000000
--- a/app/src/main/res/drawable-xhdpi/abusefilter_disallow.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/abusefilter_warn.png
b/app/src/main/res/drawable-xhdpi/abusefilter_warn.png
deleted file mode 100644
index 5bf91be..0000000
--- a/app/src/main/res/drawable-xhdpi/abusefilter_warn.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_error_black.png
b/app/src/main/res/drawable-xhdpi/ic_error_black.png
deleted file mode 100644
index 63b9aa8..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_error_black.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_error_gray.png
b/app/src/main/res/drawable-xhdpi/ic_error_gray.png
deleted file mode 100644
index 3c587a3..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_error_gray.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_map_marker.png
b/app/src/main/res/drawable-xhdpi/ic_map_marker.png
deleted file mode 100644
index 8dd8b99..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_map_marker.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/abusefilter_disallow.png
b/app/src/main/res/drawable-xxhdpi/abusefilter_disallow.png
deleted file mode 100644
index a2575f2..0000000
--- a/app/src/main/res/drawable-xxhdpi/abusefilter_disallow.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/abusefilter_warn.png
b/app/src/main/res/drawable-xxhdpi/abusefilter_warn.png
deleted file mode 100644
index 0125ba5..0000000
--- a/app/src/main/res/drawable-xxhdpi/abusefilter_warn.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_error_black.png
b/app/src/main/res/drawable-xxhdpi/ic_error_black.png
deleted file mode 100644
index 6f8f1ba..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_error_black.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_error_gray.png
b/app/src/main/res/drawable-xxhdpi/ic_error_gray.png
deleted file mode 100644
index ae5e3b0..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_error_gray.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_map_marker.png
b/app/src/main/res/drawable-xxhdpi/ic_map_marker.png
deleted file mode 100644
index 3d61513..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_map_marker.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/abusefilter_disallow.png
b/app/src/main/res/drawable-xxxhdpi/abusefilter_disallow.png
deleted file mode 100644
index 412ebce..0000000
--- a/app/src/main/res/drawable-xxxhdpi/abusefilter_disallow.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/abusefilter_warn.png
b/app/src/main/res/drawable-xxxhdpi/abusefilter_warn.png
deleted file mode 100644
index ed49029..0000000
--- a/app/src/main/res/drawable-xxxhdpi/abusefilter_warn.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_error_black.png
b/app/src/main/res/drawable-xxxhdpi/ic_error_black.png
deleted file mode 100644
index 9affa2e..0000000
--- a/app/src/main/res/drawable-xxxhdpi/ic_error_black.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_error_gray.png
b/app/src/main/res/drawable-xxxhdpi/ic_error_gray.png
deleted file mode 100644
index ceb5ddc..0000000
--- a/app/src/main/res/drawable-xxxhdpi/ic_error_gray.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_map_marker.png
b/app/src/main/res/drawable-xxxhdpi/ic_map_marker.png
deleted file mode 100644
index 18ffcaf..0000000
--- a/app/src/main/res/drawable-xxxhdpi/ic_map_marker.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/ic_abusefilter_disallow.xml
b/app/src/main/res/drawable/ic_abusefilter_disallow.xml
new file mode 100644
index 0000000..8878f46
--- /dev/null
+++ b/app/src/main/res/drawable/ic_abusefilter_disallow.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="48.0"
+ android:viewportWidth="48.0" android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android";>
+ <path android:fillColor="@color/foundation_red"
android:pathData="M24,0C10.74,0 0,10.74 0,24c0,13.26 10.74,24 24,24c13.26,0
24,-10.74 24,-24C48,10.74 37.26,0
24,0zM32.57,36.32l-8.73,-8.73l-8.73,8.73l-1.32,-1.32c-1.25,-1.25 -1.25,-3.28
0,-4.54L20.25,24l-8.41,-8.41l3.59,-3.59l8.41,8.41l8.73,-8.73l1.32,1.32c1.25,1.25
1.25,3.28 0,4.54L27.43,24l8.73,8.73L32.57,36.32z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_abusefilter_warn.xml
b/app/src/main/res/drawable/ic_abusefilter_warn.xml
new file mode 100644
index 0000000..58cd2df
--- /dev/null
+++ b/app/src/main/res/drawable/ic_abusefilter_warn.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="48.0"
+ android:viewportWidth="48.0" android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android";>
+ <path android:fillColor="@color/foundation_yellow"
android:pathData="M24,0C10.74,0 0,10.74 0,24c0,13.26 10.74,24 24,24c13.26,0
24,-10.74 24,-24C48,10.74 37.26,0 24,0zM35.73,28.24c0,0 -6.49,-1.08
-10.81,-1.08c-4.32,0 -6.49,-2.16 -6.49,-2.16v12.97h-2.16V12.03h2.16v2.16c0,0
2.16,2.16 6.49,2.16c4.33,0 10.81,1.08 10.81,1.08l-3.24,5.41L35.73,28.24z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_error_black_24dp.xml
b/app/src/main/res/drawable/ic_error_black_24dp.xml
new file mode 100644
index 0000000..3d98979
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android";
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48
10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_map_marker.xml
b/app/src/main/res/drawable/ic_map_marker.xml
new file mode 100644
index 0000000..17d826c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map_marker.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android";
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M5.181,22.051a6.879,1.887 0,1 0,13.757 0a6.879,1.887
0,1 0,-13.757 0z"
+ android:fillAlpha="0.18823529"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M12.06,0.094C7.811,0.094 4.375,3.135
4.375,7.779c0,5.764 7.685,14.272 7.685,14.272 0,0 7.685,-8.508 7.685,-14.272
0,-4.733 -3.436,-7.685 -7.685,-7.685z"
+ android:fillAlpha="1"
+ android:fillColor="#42a078"/>
+ <path
+ android:pathData="m18.162,5.345c-0.027,0.035 -0.057,0.054 -0.092,0.054
-0.27,0.027 -0.494,0.113 -0.664,0.262 -0.173,0.148 -0.351,0.431
-0.534,0.847L14.068,12.816c-0.019,0.059 -0.07,0.089 -0.154,0.089 -0.067,0
-0.116,-0.03 -0.154,-0.089l-1.571,-3.281 -1.808,3.284c-0.038,0.059 -0.089,0.089
-0.154,0.089 -0.081,0 -0.135,-0.03 -0.159,-0.089L7.315,6.51c-0.173,-0.391
-0.354,-0.666 -0.545,-0.82 -0.189,-0.156 -0.456,-0.251 -0.796,-0.288 -0.03,0
-0.057,-0.016 -0.084,-0.046C5.863,5.326 5.852,5.289 5.852,5.251c0,-0.102
0.03,-0.154 0.089,-0.154 0.246,0 0.502,0.011 0.769,0.032 0.248,0.022
0.483,0.032 0.702,0.032 0.224,0 0.488,-0.011 0.791,-0.032 0.318,-0.022
0.602,-0.032 0.847,-0.032 0.059,0 0.089,0.051 0.089,0.154 0,0.102 -0.019,0.154
-0.054,0.154 -0.246,0.019 -0.44,0.081 -0.58,0.186 -0.14,0.105 -0.211,0.245
-0.211,0.418 0,0.089 0.03,0.197 0.089,0.329l2.275,5.134 1.293,-2.437
-1.204,-2.521c-0.216,-0.45 -0.394,-0.741 -0.534,-0.871 -0.14,-0.129
-0.351,-0.21 -0.632,-0.24 -0.027,0 -0.051,-0.016 -0.073,-0.046 -0.024,-0.03
-0.035,-0.067 -0.035,-0.105 0,-0.102 0.024,-0.154 0.078,-0.154 0.246,0
0.47,0.011 0.675,0.032 0.197,0.022 0.408,0.032 0.632,0.032 0.219,0 0.451,-0.011
0.696,-0.032 0.254,-0.022 0.502,-0.032 0.748,-0.032 0.059,0 0.089,0.051
0.089,0.154 0,0.102 -0.016,0.154 -0.054,0.154 -0.491,0.032 -0.737,0.173
-0.737,0.418 0,0.111 0.057,0.28 0.17,0.51l0.796,1.615 0.791,-1.477c0.111,-0.208
0.165,-0.386 0.165,-0.528 0,-0.337 -0.246,-0.515 -0.737,-0.539 -0.046,0
-0.067,-0.051 -0.067,-0.154 0,-0.038 0.011,-0.073 0.032,-0.105C12.772,5.111
12.797,5.092 12.818,5.092c0.175,0 0.391,0.011 0.648,0.032 0.246,0.022
0.448,0.032 0.605,0.032 0.113,0 0.281,-0.011 0.499,-0.027 0.278,-0.024
0.513,-0.038 0.699,-0.038 0.043,0 0.065,0.043 0.065,0.132 0,0.116 -0.04,0.175
-0.121,0.175 -0.286,0.03 -0.515,0.108 -0.691,0.237 -0.175,0.129 -0.391,0.418
-0.65,0.874l-1.055,1.949 1.43,2.909 2.111,-4.904c0.073,-0.178 0.111,-0.345
0.111,-0.493 0,-0.359 -0.246,-0.55 -0.737,-0.572 -0.046,0 -0.067,-0.051
-0.067,-0.154 0,-0.102 0.032,-0.154 0.1,-0.154 0.178,0 0.391,0.011 0.637,0.032
0.227,0.022 0.418,0.032 0.572,0.032 0.162,0 0.348,-0.011
0.561,-0.032C17.755,5.103 17.952,5.092 18.127,5.092c0.051,-0 0.075,0.043
0.075,0.132"
+ android:strokeColor="#00000000"
+ android:fillColor="#f2f2f2"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/layout-land/fragment_crash_report.xml
b/app/src/main/res/layout-land/fragment_crash_report.xml
index 4b98be6..408c196 100644
--- a/app/src/main/res/layout-land/fragment_crash_report.xml
+++ b/app/src/main/res/layout-land/fragment_crash_report.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
@@ -15,9 +16,9 @@
<ImageView
android:id="@+id/crash_report_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_error_black"
+ android:layout_width="128dp"
+ android:layout_height="128dp"
+ app:srcCompat="@drawable/ic_error_black_24dp"
android:tint="?attr/window_inverse_color"
android:contentDescription="@null"
android:alpha="@dimen/crash_report_icon_alpha" />
diff --git a/app/src/main/res/layout/activity_edit_section.xml
b/app/src/main/res/layout/activity_edit_section.xml
index 8828071..af7130c 100644
--- a/app/src/main/res/layout/activity_edit_section.xml
+++ b/app/src/main/res/layout/activity_edit_section.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android";
- xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto";
+ xmlns:tools="http://schemas.android.com/tools";
+ android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/window_background_color">
<ProgressBar
@@ -102,7 +104,7 @@
android:id="@+id/edit_section_abusefilter_image"
android:layout_width="48dp"
android:layout_height="48dp"
- android:src="@drawable/abusefilter_warn"
+ app:srcCompat="@drawable/ic_abusefilter_warn"
android:layout_margin="24dp"
android:layout_gravity="center_horizontal"
android:contentDescription="@null"/>
diff --git a/app/src/main/res/layout/custom_error_view.xml
b/app/src/main/res/layout/custom_error_view.xml
index 43d0f77..6fae493 100644
--- a/app/src/main/res/layout/custom_error_view.xml
+++ b/app/src/main/res/layout/custom_error_view.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -10,19 +11,27 @@
android:paddingRight="24dp"
android:paddingTop="16dp">
- <TextView
- android:id="@+id/error_text"
+ <LinearLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="@style/RtlAwareTextView"
- android:layout_gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textIsSelectable="true"
- tools:text="Sample error description"
- android:drawableStart="@drawable/ic_error_gray"
- tools:ignore="RtlCompat"
- android:drawablePadding="8dp"
- />
+ android:layout_height="wrap_content">
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ app:srcCompat="@drawable/ic_error_black_24dp"
+ android:tint="@color/dark_gray"
+ android:contentDescription="@null"/>
+ <TextView
+ android:id="@+id/error_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/RtlAwareTextView"
+ android:layout_gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textIsSelectable="true"
+ tools:text="Sample error description"
+ />
+ </LinearLayout>
<TextView
style="@style/Widget.AppCompat.Button"
diff --git a/app/src/main/res/layout/fragment_crash_report.xml
b/app/src/main/res/layout/fragment_crash_report.xml
index 4d89d75..bf5da1a 100644
--- a/app/src/main/res/layout/fragment_crash_report.xml
+++ b/app/src/main/res/layout/fragment_crash_report.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -16,9 +17,9 @@
<ImageView
android:id="@+id/crash_report_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_error_black"
+ android:layout_width="128dp"
+ android:layout_height="128dp"
+ app:srcCompat="@drawable/ic_error_black_24dp"
android:tint="?attr/window_inverse_color"
android:contentDescription="@null"
android:alpha="@dimen/crash_report_icon_alpha" />
diff --git a/icon-svgs/24/ic_error_gray.noflip.svg
b/icon-svgs/24/ic_error_gray.noflip.svg
deleted file mode 100644
index df005ec..0000000
--- a/icon-svgs/24/ic_error_gray.noflip.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- fill="#000000"
- height="24"
- viewBox="0 0 24 24"
- width="24"
- id="svg2"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="ic_error_gray.svg">
- <metadata
- id="metadata12">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs10" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1328"
- inkscape:window-height="822"
- id="namedview8"
- showgrid="false"
- inkscape:zoom="9.8333333"
- inkscape:cx="12"
- inkscape:cy="12"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <path
- d="M0 0h24v24H0z"
- fill="none"
- id="path4" />
- <path
- d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1
15h-2v-2h2v2zm0-4h-2V7h2v6z"
- id="path6"
- style="fill:#808080" />
-</svg>
diff --git a/icon-svgs/24/ic_map_marker.noflip.svg
b/icon-svgs/24/ic_map_marker.noflip.svg
deleted file mode 100644
index 75df914..0000000
--- a/icon-svgs/24/ic_map_marker.noflip.svg
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:sketch="http://www.bohemiancoding.com/sketch/ns";
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="24"
- height="24"
- viewBox="0 0 24 24"
- id="svg2"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="ic_map_marker.svg"
- inkscape:export-filename="E:\Desktop\ic_marker2.png"
- inkscape:export-xdpi="270"
- inkscape:export-ydpi="270">
- <metadata
- id="metadata12">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs10" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="926"
- inkscape:window-height="602"
- id="namedview8"
- showgrid="false"
- inkscape:zoom="22.627417"
- inkscape:cx="12.591837"
- inkscape:cy="15.777341"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <ellipse
- style="fill:#000000;fill-opacity:0.18823529"
- id="path4173"
- cx="12.059893"
- cy="22.050585"
- rx="6.878665"
- ry="1.8869154" />
- <path
- d="M 12.059892,0.09375 C 7.8112446,0.09375 4.375,3.1352702
4.375,7.7786421 c 0,5.7636689 7.684892,14.2719429 7.684892,14.2719429 0,0
7.684893,-8.508274 7.684893,-14.2719429 0,-4.7332129 -3.436245,-7.6848921
-7.684893,-7.6848921 z"
- id="path4"
- style="fill:#42a078;fill-opacity:1"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="sscss" />
- <path
- d="M0 0h24v24h-24z"
- fill="none"
- id="path6" />
- <g
- id="Page-1"
- sketch:type="MSPage"
- style="fill:#e6e6e6;fill-rule:evenodd;stroke:none;stroke-width:1"
- transform="matrix(0.38196458,0,0,0.38196458,5.0346715,5.1805554)">
- <g
- id="Logged-in"
- sketch:type="MSArtboardGroup"
- transform="translate(-31,-65)"
- style="fill:#e6e6e6">
- <g
- id="drawer-bg-+-account-switcher"
- sketch:type="MSLayerGroup"
- transform="translate(1,0)"
- style="fill:#e6e6e6">
- <g
- id="account-switcher"
- sketch:type="MSShapeGroup"
- style="fill:#e6e6e6" />
- </g>
- </g>
- </g>
- <g
- id="Page-1-0"
- sketch:type="MSPage"
- style="fill:#f2f2f2;fill-rule:evenodd;stroke:none;stroke-width:1"
- transform="matrix(0.34350928,0,0,0.34350928,5.852455,5.0919478)">
- <g
- id="Logged-in-9"
- sketch:type="MSArtboardGroup"
- transform="translate(-31,-65)"
- style="fill:#f2f2f2">
- <g
- id="drawer-bg-+-account-switcher-4"
- sketch:type="MSLayerGroup"
- transform="translate(1,0)"
- style="fill:#f2f2f2">
- <g
- id="account-switcher-3"
- sketch:type="MSShapeGroup"
- style="fill:#f2f2f2">
- <path
- inkscape:connector-curvature="0"
- d="m 65.834713,65.737521 c -0.07857,0.102054 -0.164974,0.15699
-0.26713,0.15699 -0.785635,0.0785 -1.437809,0.329618 -1.932731,0.761393
-0.502852,0.431671 -1.021356,1.255818 -1.555617,2.464519 L 53.916,87.486829 c
-0.05499,0.172627 -0.204313,0.259045 -0.447861,0.259045 -0.196382,0
-0.337878,-0.08631 -0.447861,-0.259045 l -4.572626,-9.55212 -5.264035,9.559939
c -0.109982,0.172627 -0.259304,0.259044 -0.447861,0.259044 -0.235721,0
-0.392869,-0.08631 -0.463512,-0.259044 L 34.25833,69.128241 c
-0.502852,-1.138128 -1.029286,-1.938716 -1.587026,-2.386024 -0.550017,-0.45523
-1.327826,-0.729911 -2.317774,-0.839783 -0.0864,0 -0.164974,-0.04712
-0.243547,-0.133431 C 30.031409,65.682689 30,65.572817 30,65.462945 c
0,-0.29824 0.0864,-0.447412 0.259304,-0.447412 0.714992,0 1.461392,0.03138
2.2392,0.09423 0.722818,0.06275 1.4064,0.09424 2.042713,0.09424 0.65207,0
1.422053,-0.03138 2.302018,-0.09424 0.92713,-0.06275 1.752104,-0.09423
2.466991,-0.09423 0.1728,0 0.259304,0.149172 0.259304,0.447412 0,0.298239
-0.05499,0.447411 -0.157147,0.447411 -0.714992,0.05494 -1.280661,0.235486
-1.689183,0.541544 -0.408522,0.306058 -0.612835,0.714275 -0.612835,1.216623
0,0.259044 0.0864,0.572921 0.259305,0.957578 l 6.623269,14.94431
3.763409,-7.09542 -3.504105,-7.338723 c -0.628591,-1.310755 -1.147095,-2.158461
-1.555617,-2.535196 -0.408522,-0.376735 -1.021356,-0.61222 -1.838504,-0.698534
-0.07857,0 -0.149322,-0.04712 -0.212139,-0.133431 -0.07075,-0.08631
-0.102157,-0.196186 -0.102157,-0.306058 0,-0.29824 0.07075,-0.447412
0.227896,-0.447412 0.714991,0 1.367061,0.03138 1.964243,0.09424
0.573496,0.06275 1.186331,0.09424 1.838505,0.09424 0.636417,0 1.312069,-0.03138
2.02706,-0.09424 0.738574,-0.06275 1.461392,-0.09424 2.176279,-0.09424 0.1728,0
0.259304,0.149172 0.259304,0.447412 0,0.29824 -0.04716,0.447412
-0.157148,0.447412 -1.429982,0.09424 -2.144869,0.502348 -2.144869,1.216622
0,0.321799 0.164974,0.816329 0.495026,1.483486 l 2.317774,4.701474
2.302017,-4.30118 c 0.322122,-0.604402 0.47927,-1.122387 0.47927,-1.538422
0,-0.981137 -0.714992,-1.499122 -2.14487,-1.569799 -0.133565,0
-0.196383,-0.149172 -0.196383,-0.447412 0,-0.109872 0.03141,-0.211926
0.09433,-0.306058 C 50.145078,65.054936 50.215826,65 50.278643,65 c 0.510679,0
1.13927,0.03138 1.88567,0.09424 0.714991,0.06276 1.304243,0.09424
1.759931,0.09424 0.329947,0 0.817147,-0.03138 1.45346,-0.0785 0.809218,-0.07068
1.4928,-0.109872 2.034887,-0.109872 0.125739,0 0.188557,0.125613
0.188557,0.384553 0,0.337539 -0.117809,0.510166 -0.353531,0.510166
-0.8328,0.08631 -1.500626,0.313981 -2.011304,0.690716 -0.510678,0.376735
-1.13927,1.216623 -1.893496,2.543014 l -3.072,5.674793 4.164105,8.468929
6.144,-14.277154 c 0.212139,-0.517984 0.322121,-1.004696 0.322121,-1.436367
0,-1.043892 -0.714991,-1.601176 -2.144869,-1.663931 -0.133565,0
-0.196383,-0.149172 -0.196383,-0.447412 0,-0.29824 0.09433,-0.447412
0.290713,-0.447412 0.518505,0 1.13927,0.03138 1.854157,0.09424 0.66,0.06276
1.217843,0.09424 1.6656,0.09424 0.471443,0 1.01353,-0.03138 1.634191,-0.09424 C
64.648696,65.031482 65.222296,65 65.732974,65 c 0.148904,-2.08e-4
0.219548,0.125405 0.219548,0.384345"
- id="Imported-Layers"
- style="fill:#f2f2f2"
-
sodipodi:nodetypes="cccccscccsccccssscscsscssccccsccsscscsscscccscscscscsscsccccscsscsccc"
/>
- </g>
- </g>
- </g>
- </g>
-</svg>
diff --git a/icon-svgs/48/abusefilter_disallow.noflip.svg
b/icon-svgs/48/abusefilter_disallow.noflip.svg
deleted file mode 100644
index f53631c..0000000
--- a/icon-svgs/48/abusefilter_disallow.noflip.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- width="48px" height="48px" viewBox="0 0 48 48" enable-background="new
0 0 48 48" xml:space="preserve">
-<path fill="#D02227"
d="M24,0C10.745,0,0,10.745,0,24c0,13.255,10.745,24,24,24c13.255,0,24-10.745,24-24C48,10.745,37.255,0,24,0z
-
M32.57,36.323l-8.731-8.731l-8.731,8.731l-1.324-1.324c-1.253-1.253-1.253-3.284,0-4.537L20.247,24l-8.408-8.408l3.592-3.592
-
l8.409,8.408l8.731-8.731l1.324,1.324c1.253,1.253,1.253,3.284,0,4.537L27.431,24l8.731,8.731L32.57,36.323z"/>
-</svg>
diff --git a/icon-svgs/48/abusefilter_warn.noflip.svg
b/icon-svgs/48/abusefilter_warn.noflip.svg
deleted file mode 100644
index e6c4596..0000000
--- a/icon-svgs/48/abusefilter_warn.noflip.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- width="48px" height="48px" viewBox="0 0 48 48" enable-background="new
0 0 48 48" xml:space="preserve">
-<path fill="#FCB315"
d="M24,0C10.745,0,0,10.745,0,24c0,13.255,10.745,24,24,24c13.255,0,24-10.745,24-24C48,10.745,37.255,0,24,0z
-
M35.729,28.243c0,0-6.486-1.081-10.81-1.081c-4.324,0-6.486-2.162-6.486-2.162v12.972h-2.162V12.028h2.162v2.162
-
c0,0,2.162,2.162,6.486,2.162c4.328,0,10.81,1.081,10.81,1.081l-3.243,5.405L35.729,28.243z"/>
-</svg>
diff --git a/icon-svgs/72/ic_pageimage_placeholder.noflip.svg
b/icon-svgs/72/ic_pageimage_placeholder.noflip.svg
deleted file mode 100644
index e23040a..0000000
--- a/icon-svgs/72/ic_pageimage_placeholder.noflip.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- viewBox="0 0 56 56"
- enable-background="new 0 0 56 56"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- width="100%"
- height="100%"
- sodipodi:docname="ic_pageimage_placeholder.noflip.svg"
- inkscape:export-filename="E:\Desktop\noimage.png"
- inkscape:export-xdpi="205.65242"
- inkscape:export-ydpi="205.65242">
- <metadata
- id="metadata12">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs10" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1327"
- inkscape:window-height="951"
- id="namedview8"
- showgrid="false"
- inkscape:zoom="11.9198"
- inkscape:cx="23.063455"
- inkscape:cy="25.845996"
- inkscape:window-x="636"
- inkscape:window-y="33"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <path
- d="M0 0h56v56h-56z"
- id="path4"
- fill="#eee"
- style="fill:#808080;fill-opacity:0.1254902"
- inkscape:export-filename="E:\Desktop\path6.png"
- inkscape:export-xdpi="205.14706"
- inkscape:export-ydpi="205.14706" />
- <path
- style="fill:#eeeeee"
- inkscape:connector-curvature="0"
- d="M 20.994111,16.422624 H 35.677324 V 37.522711 H 20.994111 z"
- id="path4-7"
- inkscape:export-filename="E:\Desktop\path6.png"
- inkscape:export-xdpi="205.14706"
- inkscape:export-ydpi="205.14706" />
- <path
- d="m 36.4,13.5 -18.6,0 0,25.018644 c 0,1.4 0.796186,2.181356
2.196186,2.181356 l 18.803814,0 0,-25 c 0.1,-1.4 -1,-2.2 -2.4,-2.2 z m -6.2,3.5
5.1,0 0,6.4 -5.1,0 z m -8.8,0 6,0 0,1.8 -6,0 z m 0,4.6 6,0 0,1.8 -6,0 z m
0,15.5 0,-1.8 13.8,0 0,1.8 z m 13.8,-4.5 -13.8,0 0,-1.8 13.8,0 z m 0,-4.7
-13.8,0 0,-1.8 13.8,0 z"
- id="path6"
- inkscape:export-xdpi="205.14706"
- inkscape:export-ydpi="205.14706"
- inkscape:connector-curvature="0"
- style="fill:#999999"
- sodipodi:nodetypes="scssccscccccccccccccccccccccccccccccc" />
-</svg>
--
To view, visit https://gerrit.wikimedia.org/r/327850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia07ab53e7aa99c62b2a5e241e0a142ad89861aac
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
