diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c33a08611..a17dbb08b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -87,7 +87,6 @@ android { flavorDimensions.add("variants") productFlavors { - register("core") register("foss") register("gplay") } diff --git a/app/src/foss/res/values/bools.xml b/app/src/foss/res/values/bools.xml index ac02880ed..fcdfa9461 100644 --- a/app/src/foss/res/values/bools.xml +++ b/app/src/foss/res/values/bools.xml @@ -1,6 +1,5 @@ true - true - true + false diff --git a/app/src/gplay/res/values/bools.xml b/app/src/gplay/res/values/bools.xml index 41c48b217..d89a62c67 100644 --- a/app/src/gplay/res/values/bools.xml +++ b/app/src/gplay/res/values/bools.xml @@ -1,6 +1,5 @@ false - false - true + true diff --git a/app/src/main/kotlin/org/fossify/keyboard/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/keyboard/activities/MainActivity.kt index ac52f9b8f..7b1bab143 100644 --- a/app/src/main/kotlin/org/fossify/keyboard/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/activities/MainActivity.kt @@ -81,7 +81,7 @@ class MainActivity : SimpleActivity() { private fun refreshMenuItems() { binding.mainToolbar.menu.apply { findItem(R.id.more_apps_from_us).isVisible = - !resources.getBoolean(R.bool.hide_google_relations) + resources.getBoolean(R.bool.is_google_play_build) } } @@ -94,7 +94,7 @@ class MainActivity : SimpleActivity() { val licenses = LICENSE_GSON val faqItems = ArrayList() - if (!resources.getBoolean(R.bool.hide_google_relations)) { + if (resources.getBoolean(R.bool.is_google_play_build)) { 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)) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8306dd0b9..4f0597bb6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ detektCompose = "0.4.28" #Room room = "2.8.5" #Fossify -commons = "6.1.6" +commons = "7.1.0" #Gradle gradlePlugins-agp = "9.4.1" #build