Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327853 )
Change subject: Vectorize WMF logo.
......................................................................
Vectorize WMF logo.
- No longer use this drawable for our Authenticator (use launcher icon
instead, for compatibility with API <21)
- Tinting the logo to be monochrome in About activity, to comply with new
design guidelines.
This was the last raster drawable in the "ldrtl" directories!
Change-Id: I7aa753d2dbaae451b720fbc9f92c14a1dd2bc1b4
---
M app/src/androidTest/java/org/wikipedia/test/view/PrimaryTestImg.java
D app/src/main/res/drawable-hdpi/wmf_logo.png
D app/src/main/res/drawable-ldrtl-hdpi/wmf_logo.png
D app/src/main/res/drawable-ldrtl-mdpi/wmf_logo.png
D app/src/main/res/drawable-ldrtl-xhdpi/wmf_logo.png
D app/src/main/res/drawable-ldrtl-xxhdpi/wmf_logo.png
D app/src/main/res/drawable-ldrtl-xxxhdpi/wmf_logo.png
D app/src/main/res/drawable-mdpi/wmf_logo.png
D app/src/main/res/drawable-xhdpi/wmf_logo.png
D app/src/main/res/drawable-xxhdpi/wmf_logo.png
D app/src/main/res/drawable-xxxhdpi/wmf_logo.png
A app/src/main/res/drawable/ic_wmf_logo.xml
M app/src/main/res/layout/activity_about.xml
M app/src/main/res/xml/wikimedia_authenticator.xml
D icon-svgs/48/wmf_logo.svg
15 files changed, 13 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/53/327853/1
diff --git
a/app/src/androidTest/java/org/wikipedia/test/view/PrimaryTestImg.java
b/app/src/androidTest/java/org/wikipedia/test/view/PrimaryTestImg.java
index d74b117..f13d509 100644
--- a/app/src/androidTest/java/org/wikipedia/test/view/PrimaryTestImg.java
+++ b/app/src/androidTest/java/org/wikipedia/test/view/PrimaryTestImg.java
@@ -5,7 +5,7 @@
import org.wikipedia.R;
public enum PrimaryTestImg implements TestImg {
- NULL(0), NONNULL(R.drawable.wmf_logo);
+ NULL(0), NONNULL(R.drawable.ic_wmf_logo);
@Override @DrawableRes public int id() {
return id;
diff --git a/app/src/main/res/drawable-hdpi/wmf_logo.png
b/app/src/main/res/drawable-hdpi/wmf_logo.png
deleted file mode 100644
index 29c7dc4..0000000
--- a/app/src/main/res/drawable-hdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/wmf_logo.png
b/app/src/main/res/drawable-ldrtl-hdpi/wmf_logo.png
deleted file mode 100644
index e65f0a8..0000000
--- a/app/src/main/res/drawable-ldrtl-hdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/wmf_logo.png
b/app/src/main/res/drawable-ldrtl-mdpi/wmf_logo.png
deleted file mode 100644
index c4a33c6..0000000
--- a/app/src/main/res/drawable-ldrtl-mdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/wmf_logo.png
b/app/src/main/res/drawable-ldrtl-xhdpi/wmf_logo.png
deleted file mode 100644
index 998214d..0000000
--- a/app/src/main/res/drawable-ldrtl-xhdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/wmf_logo.png
b/app/src/main/res/drawable-ldrtl-xxhdpi/wmf_logo.png
deleted file mode 100644
index bef4597..0000000
--- a/app/src/main/res/drawable-ldrtl-xxhdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/wmf_logo.png
b/app/src/main/res/drawable-ldrtl-xxxhdpi/wmf_logo.png
deleted file mode 100644
index bed19ab..0000000
--- a/app/src/main/res/drawable-ldrtl-xxxhdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/wmf_logo.png
b/app/src/main/res/drawable-mdpi/wmf_logo.png
deleted file mode 100644
index 4307781..0000000
--- a/app/src/main/res/drawable-mdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/wmf_logo.png
b/app/src/main/res/drawable-xhdpi/wmf_logo.png
deleted file mode 100644
index a34dc97..0000000
--- a/app/src/main/res/drawable-xhdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/wmf_logo.png
b/app/src/main/res/drawable-xxhdpi/wmf_logo.png
deleted file mode 100644
index f469255..0000000
--- a/app/src/main/res/drawable-xxhdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/wmf_logo.png
b/app/src/main/res/drawable-xxxhdpi/wmf_logo.png
deleted file mode 100644
index c98d31e..0000000
--- a/app/src/main/res/drawable-xxxhdpi/wmf_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/ic_wmf_logo.xml
b/app/src/main/res/drawable/ic_wmf_logo.xml
new file mode 100644
index 0000000..5d54fa5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wmf_logo.xml
@@ -0,0 +1,8 @@
+<vector android:height="24dp" android:viewportHeight="1198.0"
+ android:viewportWidth="1198.0" android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android";>
+ <path android:fillAlpha="1" android:fillColor="#339966"
android:pathData="m811.6,338.4 l-165.6,165.6 0,427.8C811.9,908.4 935.3,766.6
935.5,599 935.4,498 889.8,402.3 811.6,338.4ZM550.3,931.5
L550.3,505.5L385.3,339.4C307.7,403.2 262.6,498.5 262.5,599 262.7,765.9
385.2,907.4 550.3,931.5Z"/>
+ <path android:fillColor="#00000000"
+ android:pathData="M918.2,240.2A480.2,480.2 0,0 1,1079.3
599L1079.3,599A480.3,480.3 0,0 1,599 1079.3A480.3,480.2 83.1,0 1,118.8
599A480.2,480.2 0,0 1,280 240"
+ android:strokeAlpha="1" android:strokeColor="#006699"
android:strokeWidth="115.81969452"/>
+ <path android:fillAlpha="1" android:fillColor="#990000"
android:pathData="M599,219.5m-184.5,0a184.5,184.5 0,1 1,369 0a184.5,184.5 0,1
1,-369 0"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_about.xml
b/app/src/main/res/layout/activity_about.xml
index b069ead..0924071 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -2,6 +2,7 @@
<ScrollView
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:id="@+id/about_scrollview"
android:layout_width="match_parent"
@@ -156,7 +157,8 @@
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:padding="4dp"
- android:src="@drawable/wmf_logo"
+ app:srcCompat="@drawable/ic_wmf_logo"
+ android:tint="@color/dark_gray"
android:contentDescription="@null" />
<TextView
diff --git a/app/src/main/res/xml/wikimedia_authenticator.xml
b/app/src/main/res/xml/wikimedia_authenticator.xml
index 3e924d8..b89549d 100644
--- a/app/src/main/res/xml/wikimedia_authenticator.xml
+++ b/app/src/main/res/xml/wikimedia_authenticator.xml
@@ -2,5 +2,5 @@
<account-authenticator
xmlns:android="http://schemas.android.com/apk/res/android";
android:accountType="@string/account_type"
- android:icon="@drawable/wmf_logo"
+ android:icon="@mipmap/launcher"
android:label="@string/account_name" />
\ No newline at end of file
diff --git a/icon-svgs/48/wmf_logo.svg b/icon-svgs/48/wmf_logo.svg
deleted file mode 100644
index e7ef65e..0000000
--- a/icon-svgs/48/wmf_logo.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-
-<svg xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; version="1.1"
- id="Wikimedia logo"
- viewBox="-599 -599 1198 1198" width="1024" height="1024">
-<defs>
- <clipPath id="mask">
- <path d="M 47.5,-87.5 v 425 h -95 v -425 l -552,-552 v 1250 h 1199 v -1250
z" />
- </clipPath>
-</defs>
-<g clip-path="url(#mask)">
- <circle id="green parts" fill="#396" r="336.5"/>
- <circle id="blue arc" fill="none" stroke="#069" r="480.25"
stroke-width="135.5" />
-</g>
-<circle fill="#900" cy="-379.5" r="184.5" id="red circle"/>
-</svg>
--
To view, visit https://gerrit.wikimedia.org/r/327853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aa753d2dbaae451b720fbc9f92c14a1dd2bc1b4
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
