Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386551 )
Change subject: Added MediaWiki flavour
......................................................................
Added MediaWiki flavour
Since, we are not using any suffix here, we had to modify the appId
function in build.gradle in order to avoid a conflict with the
provider authority.
Modified some drawables and strings to use the MediaWiki ones. This
is still work in progress for other subtask.
Refactored the activity_about layout in order to avoid code duplication.
Corrected strings for the MediaWiki specific flavour.
Replaced Wikipedia in strings.
Bug: T165783
Change-Id: Ie1df1f17668a40ad1c1101fce9f21beae213575c
---
M app/build.gradle
A app/src/main/res/layout/about_logo_image.xml
M app/src/main/res/layout/activity_about.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
A app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png
A app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png
A app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png
A app/src/mediawiki/res/drawable-xxxhdpi/w_nav_mark.png
A app/src/mediawiki/res/drawable/wp_wordmark.png
A app/src/mediawiki/res/layout/about_logo_image.xml
A app/src/mediawiki/res/mipmap-hdpi/launcher.png
A app/src/mediawiki/res/mipmap-mdpi/launcher.png
A app/src/mediawiki/res/mipmap-xhdpi/launcher.png
A app/src/mediawiki/res/mipmap-xxhdpi/launcher.png
A app/src/mediawiki/res/mipmap-xxxhdpi/launcher.png
A app/src/mediawiki/res/values/strings.xml
A app/src/mediawiki/res/values/strings_no_translate.xml
18 files changed, 61 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/51/386551/1
diff --git a/app/build.gradle b/app/build.gradle
index c797876..a2f3913 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -134,6 +134,12 @@
manifestPlaceholders =
[customChannel:getProperty('customChannel').toString()]
signingConfig signingConfigs.prod
}
+ mediawiki {
+ applicationId 'org.mediawiki'
+ versionName computeVersionName('mediawiki')
+ signingConfig signingConfigs.prod
+ testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
+ }
}
packagingOptions {
@@ -261,6 +267,6 @@
private String appId(ProductFlavor flavor) {
String suffix = flavor.applicationIdSuffix
- String id = android.defaultConfig.applicationId + (suffix ? ".$suffix" :
'')
+ String id = flavor.applicationId + (suffix ? ".$suffix" : '')
return id
}
diff --git a/app/src/main/res/layout/about_logo_image.xml
b/app/src/main/res/layout/about_logo_image.xml
new file mode 100644
index 0000000..fa61352
--- /dev/null
+++ b/app/src/main/res/layout/about_logo_image.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:tools="http://schemas.android.com/tools";
+ android:id="@+id/about_logo_image"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:src="@drawable/w_nav_mark"
+ android:tint="?attr/secondary_text_color"
+ android:contentDescription="@null"
+ tools:showIn="@layout/activity_about" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml
b/app/src/main/res/layout/activity_about.xml
index 0b1532e..36b2f8f 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -15,15 +15,9 @@
android:padding="24dp"
android:gravity="center"
>
- <ImageView
- android:id="@+id/about_logo_image"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:src="@drawable/w_nav_mark"
- android:tint="?attr/primary_text_color"
- android:contentDescription="@null"
- />
+ <include layout="@layout/about_logo_image" />
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index 86ac3dc..8b9fd94 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -3,6 +3,7 @@
<string name="app_name_prod">Name of the
application.\n{{Identical|Wikipedia}}</string>
<string name="app_name_beta">Name of the beta version of the
application.\n{{Identical|Wikipedia Beta}}</string>
<string name="app_name_alpha">Name of the alpha version of the
application.</string>
+ <string name="app_name_mediawiki">Name of the generic MediaWiki version of
the application.</string>
<string name="wikimedia">Wikimedia\'s name.\n{{Identical|Wikimedia}}</string>
<string name="search_hint">Hint text for the search box</string>
<string name="search_hint_search_history">Hint text for the search box when
searching browsing history</string>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index abfe5e2..d85eb42 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
<string name="app_name_prod">Wikipedia</string>
<string name="app_name_beta" tools:ignore="UnusedResources">Wikipedia
Beta</string>
<string name="app_name_alpha" tools:ignore="UnusedResources">Wikipedia
Alpha</string>
+ <string name="app_name_mediawiki"
tools:ignore="UnusedResources">MediaWiki</string>
<string name="wikimedia">Wikimedia</string>
diff --git a/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png
b/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png
new file mode 100644
index 0000000..283a8f8
--- /dev/null
+++ b/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png
b/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png
new file mode 100644
index 0000000..af89eb0
--- /dev/null
+++ b/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png
b/app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png
new file mode 100644
index 0000000..2119207
--- /dev/null
+++ b/app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/mediawiki/res/drawable-xxxhdpi/w_nav_mark.png
b/app/src/mediawiki/res/drawable-xxxhdpi/w_nav_mark.png
new file mode 100644
index 0000000..e7088c5
--- /dev/null
+++ b/app/src/mediawiki/res/drawable-xxxhdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/mediawiki/res/drawable/wp_wordmark.png
b/app/src/mediawiki/res/drawable/wp_wordmark.png
new file mode 100644
index 0000000..713a7f5
--- /dev/null
+++ b/app/src/mediawiki/res/drawable/wp_wordmark.png
Binary files differ
diff --git a/app/src/mediawiki/res/layout/about_logo_image.xml
b/app/src/mediawiki/res/layout/about_logo_image.xml
new file mode 100644
index 0000000..6a4a278
--- /dev/null
+++ b/app/src/mediawiki/res/layout/about_logo_image.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:tools="http://schemas.android.com/tools";
+ android:id="@+id/about_logo_image"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:src="@drawable/w_nav_mark"
+ android:contentDescription="@null"
+ tools:showIn="@layout/activity_about" />
\ No newline at end of file
diff --git a/app/src/mediawiki/res/mipmap-hdpi/launcher.png
b/app/src/mediawiki/res/mipmap-hdpi/launcher.png
new file mode 100755
index 0000000..b5e2bf0
--- /dev/null
+++ b/app/src/mediawiki/res/mipmap-hdpi/launcher.png
Binary files differ
diff --git a/app/src/mediawiki/res/mipmap-mdpi/launcher.png
b/app/src/mediawiki/res/mipmap-mdpi/launcher.png
new file mode 100755
index 0000000..7ae9dfa
--- /dev/null
+++ b/app/src/mediawiki/res/mipmap-mdpi/launcher.png
Binary files differ
diff --git a/app/src/mediawiki/res/mipmap-xhdpi/launcher.png
b/app/src/mediawiki/res/mipmap-xhdpi/launcher.png
new file mode 100755
index 0000000..cfb1b46
--- /dev/null
+++ b/app/src/mediawiki/res/mipmap-xhdpi/launcher.png
Binary files differ
diff --git a/app/src/mediawiki/res/mipmap-xxhdpi/launcher.png
b/app/src/mediawiki/res/mipmap-xxhdpi/launcher.png
new file mode 100755
index 0000000..8c4bfcf
--- /dev/null
+++ b/app/src/mediawiki/res/mipmap-xxhdpi/launcher.png
Binary files differ
diff --git a/app/src/mediawiki/res/mipmap-xxxhdpi/launcher.png
b/app/src/mediawiki/res/mipmap-xxxhdpi/launcher.png
new file mode 100755
index 0000000..52b69e6
--- /dev/null
+++ b/app/src/mediawiki/res/mipmap-xxxhdpi/launcher.png
Binary files differ
diff --git a/app/src/mediawiki/res/values/strings.xml
b/app/src/mediawiki/res/values/strings.xml
new file mode 100644
index 0000000..01009ba
--- /dev/null
+++ b/app/src/mediawiki/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="wikimedia">MediaWiki</string>
+ <string name="search_hint">Search MediaWiki</string>
+ <string name="preference_title_language">MediaWiki language</string>
+ <string name="nav_item_login">Log in to MediaWiki</string>
+ <string
name="wp_stylized"><![CDATA[<big>M</big>EDIA<big>W</big>IKI]]></string>
+
+ <string name="login_create_account_link">Don\'t have an account? Join this
wiki</string>
+ <string name="about_description">About the MediaWiki app</string>
+ <string name="widget_name_search">MediaWiki search</string>
+ <string name="snippet_share_intro">\"%1$s\" on @MediaWiki: %2$s</string>
+ <string name="crash_report_relaunch_or_quit">We\'re sorry, the MediaWiki
app has experienced an error and was terminated.\n\nWould you like to start
over or quit?</string>
+ <string name="notification_talk_title">New message on MediaWiki</string>
+ <string name="view_random_card_subtitle">Read a random article from
MediaWiki</string>
+ <string name="view_main_page_card_title">Today on MediaWiki</string>
+ <string name="description_edit_success_encouragement">You just made this
wiki better for everyone</string>
+ <string name="description_edit_revert_subtitle">Thanks for editing this
wiki!</string>
+</resources>
diff --git a/app/src/mediawiki/res/values/strings_no_translate.xml
b/app/src/mediawiki/res/values/strings_no_translate.xml
new file mode 100644
index 0000000..c342365
--- /dev/null
+++ b/app/src/mediawiki/res/values/strings_no_translate.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">@string/app_name_mediawiki</string>
+ <string name="channel">MediaWiki Channel</string>
+ <string name="hockeyapp_app_id">10bb726927f04092b3e6ba19a1cc044c</string>
+
+ <!-- The alpha build uses a different signature than beta and prod. -->
+ <string name="account_name">MediaWiki</string>
+ <string name="account_type">org.mediawiki</string>
+
+ <string name="user_option_sync_label">Preferences</string>
+</resources>
--
To view, visit https://gerrit.wikimedia.org/r/386551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1df1f17668a40ad1c1101fce9f21beae213575c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: generic_mediawiki
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Nark0 <6020pe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
