From 36618aaa6ea0f69659b5da50bd5c7d294eb91053 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 21 Feb 2022 10:25:40 +0100 Subject: [PATCH] lets add a new Prepaid build variant with some Google related things hidden --- app/build.gradle | 3 ++- .../draw/pro/activities/MainActivity.kt | 12 +++++++----- app/src/prepaid/res/values/bools.xml | 4 ++++ 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 app/src/prepaid/res/values/bools.xml diff --git a/app/build.gradle b/app/build.gradle index 54801ca..0bf3c23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -49,6 +49,7 @@ android { productFlavors { core {} fdroid {} + prepaid {} } sourceSets { @@ -62,6 +63,6 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:03e4d214b1' + implementation 'com.github.SimpleMobileTools:Simple-Commons:b1ac82c8e1' implementation "androidx.print:print:1.0.0" } diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt index 5a73ef8..78a0279 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt @@ -196,11 +196,13 @@ class MainActivity : SimpleActivity(), CanvasListener { private fun launchAbout() { val licenses = LICENSE_GLIDE - val faqItems = arrayListOf( - FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), - FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons), - FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons) - ) + val faqItems = ArrayList() + + if (!resources.getBoolean(R.bool.hide_google_relations)) { + faqItems.add(FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)) + faqItems.add(FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons)) + faqItems.add(FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons)) + } startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, false) } diff --git a/app/src/prepaid/res/values/bools.xml b/app/src/prepaid/res/values/bools.xml new file mode 100644 index 0000000..9171b0d --- /dev/null +++ b/app/src/prepaid/res/values/bools.xml @@ -0,0 +1,4 @@ + + + true +