From 019e673ce78f241717a1da97482ff1ec142b2487 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 6 Nov 2019 19:08:51 +0100 Subject: remove schulchat from main project --- build.gradle | 23 +----- src/schulchat/AndroidManifest.xml | 10 --- src/schulchat/res/drawable-hdpi/logo.png | Bin 7947 -> 0 bytes src/schulchat/res/drawable-mdpi/logo.png | Bin 6362 -> 0 bytes src/schulchat/res/drawable-xhdpi/logo.png | Bin 13083 -> 0 bytes src/schulchat/res/drawable-xxhdpi/logo.png | Bin 14888 -> 0 bytes src/schulchat/res/drawable-xxxhdpi/logo.png | Bin 46825 -> 0 bytes src/schulchat/res/drawable/background.xml | 11 --- src/schulchat/res/layout/welcome.xml | 109 ---------------------------- src/schulchat/res/values/about.xml | 51 ------------- src/schulchat/res/values/colors.xml | 13 ---- src/schulchat/res/values/defaults.xml | 81 --------------------- src/schulchat/res/values/strings.xml | 37 ---------- 13 files changed, 3 insertions(+), 332 deletions(-) delete mode 100644 src/schulchat/AndroidManifest.xml delete mode 100644 src/schulchat/res/drawable-hdpi/logo.png delete mode 100644 src/schulchat/res/drawable-mdpi/logo.png delete mode 100644 src/schulchat/res/drawable-xhdpi/logo.png delete mode 100644 src/schulchat/res/drawable-xxhdpi/logo.png delete mode 100644 src/schulchat/res/drawable-xxxhdpi/logo.png delete mode 100644 src/schulchat/res/drawable/background.xml delete mode 100644 src/schulchat/res/layout/welcome.xml delete mode 100644 src/schulchat/res/values/about.xml delete mode 100644 src/schulchat/res/values/colors.xml delete mode 100644 src/schulchat/res/values/defaults.xml delete mode 100644 src/schulchat/res/values/strings.xml diff --git a/build.gradle b/build.gradle index 506daa3c8..628cdfe4c 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,6 @@ repositories { configurations { playstoreImplementation gitImplementation - playstoreschulchatImplementation } dependencies { @@ -106,8 +105,8 @@ android { minSdkVersion 16 targetSdkVersion 29 - versionCode 273 - versionName "2.2.10 beta (2019-10-26)" + versionCode 274 + versionName "2.2.10 beta (2019-11-02)" //resConfigs "en" archivesBaseName += "-$versionName" @@ -139,25 +138,9 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - flavorDimensions("mode", "distribution") + flavorDimensions("distribution") productFlavors { - pixart { - dimension "mode" - } - schulchat { - dimension "mode" - applicationId = 'de.schulchat.messenger' - resConfigs "en" - - resValue "string", "applicationId", applicationId - resValue "string", "app_name", "Schulchat Messenger" - - buildConfigField("String", "DOMAIN_LOCK", '"kurswahl-online.de"') - buildConfigField("String", "MAGIC_CREATE_DOMAIN", '"kurswahl-online.de"') - buildConfigField("String", "LOGTAG", '"Schulchat_Messenger"') - buildConfigField("boolean", "SHOW_INTRO", "false") - } playstore { dimension "distribution" versionNameSuffix "-playstore" diff --git a/src/schulchat/AndroidManifest.xml b/src/schulchat/AndroidManifest.xml deleted file mode 100644 index 08a2c1288..000000000 --- a/src/schulchat/AndroidManifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/src/schulchat/res/drawable-hdpi/logo.png b/src/schulchat/res/drawable-hdpi/logo.png deleted file mode 100644 index 25be49a6b..000000000 Binary files a/src/schulchat/res/drawable-hdpi/logo.png and /dev/null differ diff --git a/src/schulchat/res/drawable-mdpi/logo.png b/src/schulchat/res/drawable-mdpi/logo.png deleted file mode 100644 index e11f58198..000000000 Binary files a/src/schulchat/res/drawable-mdpi/logo.png and /dev/null differ diff --git a/src/schulchat/res/drawable-xhdpi/logo.png b/src/schulchat/res/drawable-xhdpi/logo.png deleted file mode 100644 index dcb4c2b0f..000000000 Binary files a/src/schulchat/res/drawable-xhdpi/logo.png and /dev/null differ diff --git a/src/schulchat/res/drawable-xxhdpi/logo.png b/src/schulchat/res/drawable-xxhdpi/logo.png deleted file mode 100644 index 0ca0f03f8..000000000 Binary files a/src/schulchat/res/drawable-xxhdpi/logo.png and /dev/null differ diff --git a/src/schulchat/res/drawable-xxxhdpi/logo.png b/src/schulchat/res/drawable-xxxhdpi/logo.png deleted file mode 100644 index bc41ef463..000000000 Binary files a/src/schulchat/res/drawable-xxxhdpi/logo.png and /dev/null differ diff --git a/src/schulchat/res/drawable/background.xml b/src/schulchat/res/drawable/background.xml deleted file mode 100644 index cc4f16b21..000000000 --- a/src/schulchat/res/drawable/background.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/schulchat/res/layout/welcome.xml b/src/schulchat/res/layout/welcome.xml deleted file mode 100644 index f697ca443..000000000 --- a/src/schulchat/res/layout/welcome.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - -