From 78b818795630750fb8869a6e63eaeefa56486e2d Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 24 Jun 2022 20:17:23 +0200 Subject: [PATCH] do not show some FAQ items at the fdroid app variant --- app/build.gradle | 6 +++--- .../com/simplemobiletools/clock/activities/MainActivity.kt | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 18a9555b..b3a0956b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,9 +63,9 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:e5a4973e6a' - implementation 'com.facebook.stetho:stetho:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'com.github.SimpleMobileTools:Simple-Commons:b45fde5669' + implementation 'com.facebook.stetho:stetho:1.5.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.shawnlin:number-picker:2.4.6' implementation "androidx.preference:preference-ktx:1.2.0" implementation "androidx.work:work-runtime-ktx:2.7.1" diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt index 93d2cf29..8b9c55f7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt @@ -193,11 +193,14 @@ class MainActivity : SimpleActivity() { FAQItem(R.string.faq_1_title, R.string.faq_1_text), FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons), FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons), - 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_9_title_commons, R.string.faq_9_text_commons) ) + 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)) + } + startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) } }