From 3c15fbcd49eac625000f39ed90d3cd4efd647a2c Mon Sep 17 00:00:00 2001 From: steckbrief Date: Mon, 1 Jul 2019 22:36:28 +0200 Subject: introduces new distribution and stage flavors as first steps for rebranding --- build.gradle | 23 ++++++++++++++------ settings.gradle | 2 +- src/beta/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 5133 bytes src/beta/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 3096 bytes src/beta/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 7317 bytes src/beta/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 11957 bytes src/beta/res/drawable-xxxhdpi/ic_launcher.png | Bin 0 -> 16932 bytes src/beta/res/values/strings.xml | 4 ++++ src/main/res/values/defaults.xml | 2 +- .../messenger/services/PushManagementService.java | 24 +++++++++++++++++++++ 10 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 src/beta/res/drawable-hdpi/ic_launcher.png create mode 100644 src/beta/res/drawable-mdpi/ic_launcher.png create mode 100644 src/beta/res/drawable-xhdpi/ic_launcher.png create mode 100644 src/beta/res/drawable-xxhdpi/ic_launcher.png create mode 100644 src/beta/res/drawable-xxxhdpi/ic_launcher.png create mode 100644 src/beta/res/values/strings.xml create mode 100644 src/piratx/java/de/pixart/messenger/services/PushManagementService.java diff --git a/build.gradle b/build.gradle index c343ae1b5..4c8ce0816 100644 --- a/build.gradle +++ b/build.gradle @@ -101,15 +101,14 @@ android { minSdkVersion 16 targetSdkVersion 28 - versionCode 266 - versionName "2.2.7" + versionCode 1 + versionName "0.0.1" archivesBaseName += "-$versionName" - applicationId "de.pixart.messenger" + applicationId "de.thedevstack.piratx" multiDexEnabled true - buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/"') + buildConfigField("String", "UPDATE_URL", '"NULL"') resValue "string", "applicationId", applicationId - resValue "string", "app_name", "Pix-Art Messenger" dimension "distribution" } @@ -129,13 +128,23 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - flavorDimensions("distribution") + flavorDimensions("distribution", "stage") productFlavors { + beta { + dimension "stage" + applicationIdSuffix ".beta" + versionNameSuffix "-beta" + } + piratx { + dimension "distribution" + } standardPush { dimension "distribution" } - standard + standard { + dimension "distribution" + } } if (project.hasProperty('mStoreFile') && project.hasProperty('mStorePassword') && diff --git a/settings.gradle b/settings.gradle index 591d3e182..13cce3507 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ include ':libs:android-transcoder' include ':libs:xmpp-addr' include ':libs:fullscreenvideoview' -rootProject.name = 'PixArtMessenger' +rootProject.name = 'PiratX' diff --git a/src/beta/res/drawable-hdpi/ic_launcher.png b/src/beta/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 000000000..16c7a7ce4 Binary files /dev/null and b/src/beta/res/drawable-hdpi/ic_launcher.png differ diff --git a/src/beta/res/drawable-mdpi/ic_launcher.png b/src/beta/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 000000000..3a59b17ef Binary files /dev/null and b/src/beta/res/drawable-mdpi/ic_launcher.png differ diff --git a/src/beta/res/drawable-xhdpi/ic_launcher.png b/src/beta/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 000000000..9afafb852 Binary files /dev/null and b/src/beta/res/drawable-xhdpi/ic_launcher.png differ diff --git a/src/beta/res/drawable-xxhdpi/ic_launcher.png b/src/beta/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..b12d83bb3 Binary files /dev/null and b/src/beta/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/src/beta/res/drawable-xxxhdpi/ic_launcher.png b/src/beta/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..d0654a90b Binary files /dev/null and b/src/beta/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/src/beta/res/values/strings.xml b/src/beta/res/values/strings.xml new file mode 100644 index 000000000..d5a708280 --- /dev/null +++ b/src/beta/res/values/strings.xml @@ -0,0 +1,4 @@ + + + PiratX BETA + \ No newline at end of file diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 59b759636..040f0185e 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -1,6 +1,6 @@ - Pix-Art Messenger + PiratX Computer Mobile phone Tablet diff --git a/src/piratx/java/de/pixart/messenger/services/PushManagementService.java b/src/piratx/java/de/pixart/messenger/services/PushManagementService.java new file mode 100644 index 000000000..b76f5b4de --- /dev/null +++ b/src/piratx/java/de/pixart/messenger/services/PushManagementService.java @@ -0,0 +1,24 @@ +package de.pixart.messenger.services; + +import de.pixart.messenger.entities.Account; + +public class PushManagementService { + + protected final XmppConnectionService mXmppConnectionService; + + public PushManagementService(XmppConnectionService service) { + this.mXmppConnectionService = service; + } + + public void registerPushTokenOnServer(Account account) { + //stub implementation. only affects playstore flavor + } + + public boolean available(Account account) { + return false; + } + + public boolean isStub() { + return true; + } +} -- cgit v1.2.3