[MediaWiki-commits] [Gerrit] apps...wikipedia[generic_mediawiki]: Added MediaWiki flavour

2017-10-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
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(-)

Approvals:
  jenkins-bot: Verified
  Cooltey: Looks good to me, approved



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 000..fa61352
--- /dev/null
+++ b/app/src/main/res/layout/about_logo_image.xml
@@ -0,0 +1,10 @@
+
+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"
 >
-
+
+
 Name of the 
application.\n{{Identical|Wikipedia}}
   Name of the beta version of the 
application.\n{{Identical|Wikipedia Beta}}
   Name of the alpha version of the 
application.
+  Name of the generic MediaWiki version of 
the application.
   Wikimedia\'s name.\n{{Identical|Wikimedia}}
   Hint text for the search box
   Hint text for the search box when 
searching browsing history
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 @@
 Wikipedia
 Wikipedia 
Beta
 Wikipedia 
Alpha
+MediaWiki
 
 Wikimedia
 
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 000..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 000..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 000..2119207
--- /dev/null
+++

[MediaWiki-commits] [Gerrit] apps...wikipedia[generic_mediawiki]: Added MediaWiki flavour

2017-10-25 Thread Dbrant (Code Review) 
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 000..fa61352
--- /dev/null
+++ b/app/src/main/res/layout/about_logo_image.xml
@@ -0,0 +1,10 @@
+
+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"
 >
-
+
+
 Name of the 
application.\n{{Identical|Wikipedia}}
   Name of the beta version of the 
application.\n{{Identical|Wikipedia Beta}}
   Name of the alpha version of the 
application.
+  Name of the generic MediaWiki version of 
the application.
   Wikimedia\'s name.\n{{Identical|Wikimedia}}
   Hint text for the search box
   Hint text for the search box when 
searching browsing history
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 @@
 Wikipedia
 Wikipedia 
Beta
 Wikipedia 
Alpha
+MediaWiki
 
 Wikimedia
 
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 000..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 000..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 000..2119207
--- /dev/null
+++