diff --git a/app/build.gradle b/app/build.gradle index a11ef9b9..5630dfff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,6 @@ android { vectorDrawables.useSupportLibrary = true - resValue 'string', 'app_name', "dandelion*" - manifestPlaceholders = [appIcon: "@drawable/ic_launcher"] } compileOptions { @@ -55,10 +53,12 @@ android { buildConfigField "boolean", "IS_GPLAY_BUILD", "true" }*/ + flavorDandelior { + applicationId "net.gsantner.dandelior" + } + flavorTest { - applicationId "com.github.dfa.secondlion" - resValue 'string', 'app_name', "secondlion*" - manifestPlaceholders = [appIcon: "@drawable/ic_launcher_test"] + applicationId "net.gsantner.secondlion" versionCode = Integer.parseInt(new Date().format('yyMMdd')) versionName = new Date().format('yyMMdd') buildConfigField "boolean", "IS_TEST_BUILD", "true" diff --git a/app/src/flavorDandelior/ic_launcher-web.png b/app/src/flavorDandelior/ic_launcher-web.png new file mode 100644 index 00000000..91d4f752 Binary files /dev/null and b/app/src/flavorDandelior/ic_launcher-web.png differ diff --git a/app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher.xml b/app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..d378acd7 --- /dev/null +++ b/app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher_round.xml b/app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..d378acd7 --- /dev/null +++ b/app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000..63a719ac Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..c64eb6a6 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png differ diff --git a/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 00000000..5ccf4981 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png differ diff --git a/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png new file mode 100644 index 00000000..c0ff8a34 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png differ diff --git a/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 00000000..162c8910 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..062b3c81 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png differ diff --git a/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 00000000..776b6491 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..948fdea3 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png differ diff --git a/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..16a0c5e3 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..f0f4e870 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..2e04f097 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..abb14898 Binary files /dev/null and b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/flavorDandelior/res/drawable/ic_launcher_background.xml b/app/src/flavorDandelior/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..f280ce18 --- /dev/null +++ b/app/src/flavorDandelior/res/drawable/ic_launcher_background.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_test_foreground.xml b/app/src/flavorDandelior/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_test_foreground.xml rename to app/src/flavorDandelior/res/drawable/ic_launcher_foreground.xml diff --git a/app/src/flavorDandelior/res/values/strings-flavor.xml b/app/src/flavorDandelior/res/values/strings-flavor.xml new file mode 100644 index 00000000..75d07bd2 --- /dev/null +++ b/app/src/flavorDandelior/res/values/strings-flavor.xml @@ -0,0 +1,4 @@ + + + dandelior* + diff --git a/app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher.xml b/app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..d378acd7 --- /dev/null +++ b/app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher_round.xml b/app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..d378acd7 --- /dev/null +++ b/app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_test.png b/app/src/flavorTest/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_launcher_test.png rename to app/src/flavorTest/res/drawable-hdpi/ic_launcher.png diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_test_round.png b/app/src/flavorTest/res/drawable-hdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_launcher_test_round.png rename to app/src/flavorTest/res/drawable-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/drawable-ldpi/ic_launcher_test.png b/app/src/flavorTest/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from app/src/main/res/drawable-ldpi/ic_launcher_test.png rename to app/src/flavorTest/res/drawable-ldpi/ic_launcher.png diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_test.png b/app/src/flavorTest/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_launcher_test.png rename to app/src/flavorTest/res/drawable-mdpi/ic_launcher.png diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_test_round.png b/app/src/flavorTest/res/drawable-mdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_launcher_test_round.png rename to app/src/flavorTest/res/drawable-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_test.png b/app/src/flavorTest/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_launcher_test.png rename to app/src/flavorTest/res/drawable-xhdpi/ic_launcher.png diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_test_round.png b/app/src/flavorTest/res/drawable-xhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_launcher_test_round.png rename to app/src/flavorTest/res/drawable-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png b/app/src/flavorTest/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_launcher_test.png rename to app/src/flavorTest/res/drawable-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_test_round.png b/app/src/flavorTest/res/drawable-xxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_launcher_test_round.png rename to app/src/flavorTest/res/drawable-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png b/app/src/flavorTest/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png rename to app/src/flavorTest/res/drawable-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_test_round.png b/app/src/flavorTest/res/drawable-xxxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_launcher_test_round.png rename to app/src/flavorTest/res/drawable-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/drawable/ic_launcher_test_background.xml b/app/src/flavorTest/res/drawable/ic_launcher_background.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_test_background.xml rename to app/src/flavorTest/res/drawable/ic_launcher_background.xml diff --git a/app/src/flavorTest/res/drawable/ic_launcher_foreground.xml b/app/src/flavorTest/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..2610c60c --- /dev/null +++ b/app/src/flavorTest/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/ic_launcher_test-web.png b/app/src/flavorTest/res/ic_launcher-web.png similarity index 100% rename from app/src/main/ic_launcher_test-web.png rename to app/src/flavorTest/res/ic_launcher-web.png diff --git a/app/src/flavorTest/res/values/strings-flavor.xml b/app/src/flavorTest/res/values/strings-flavor.xml new file mode 100644 index 00000000..78eb04f7 --- /dev/null +++ b/app/src/flavorTest/res/values/strings-flavor.xml @@ -0,0 +1,4 @@ + + + secondlion* + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 91d95680..dd74c774 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ @@ -53,7 +53,7 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_test_round.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher_test_round.xml deleted file mode 100644 index f1b3aaa2..00000000 --- a/app/src/main/res/drawable-anydpi-v26/ic_launcher_test_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings-flavor.xml b/app/src/main/res/values/strings-flavor.xml new file mode 100644 index 00000000..aa9e1c3e --- /dev/null +++ b/app/src/main/res/values/strings-flavor.xml @@ -0,0 +1,4 @@ + + + @string/dandelion + diff --git a/build.gradle b/build.gradle index 5c5bfd78..4780cbe3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,13 @@ +/*####################################################### +* +* Maintained by Gregor Santner, 2017- +* https://gsantner.net/ +* +* License: Apache 2.0 / Commercial +* https://github.com/gsantner/opoc/#licensing +* https://www.apache.org/licenses/LICENSE-2.0 +* +#########################################################*/ import java.text.SimpleDateFormat // Top-level build file where you can add configuration options common to all sub-projects/modules.