diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 25cf4bea9..2d00e740e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -85,7 +85,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 b0ad1f66e..d89a62c67 100644 --- a/app/src/gplay/res/values/bools.xml +++ b/app/src/gplay/res/values/bools.xml @@ -1,5 +1,5 @@ false - false + true diff --git a/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt index 725778452..a655144b9 100644 --- a/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt @@ -275,7 +275,7 @@ class MainActivity : SimpleActivity() { findItem(R.id.unlock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && mCurrentNote.isLocked()) findItem(R.id.more_apps_from_us).isVisible = - !resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations) + resources.getBoolean(org.fossify.commons.R.bool.is_google_play_build) findItem(R.id.delete_note).isVisible = !isDefaultEmptyNote || mNotes.size > 1 saveNoteButton = findItem(R.id.save_note) @@ -793,7 +793,7 @@ class MainActivity : SimpleActivity() { ) ) - if (!resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)) { + if (resources.getBoolean(org.fossify.commons.R.bool.is_google_play_build)) { faqItems.add( FAQItem( title = org.fossify.commons.R.string.faq_2_title_commons, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 31c379a1b..2a147d3b3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ androidx-documentfile = "1.1.0" #Room room = "2.8.5" #Fossify -commons = "6.1.6" +commons = "7.1.0" #Gradle gradlePlugins-agp = "9.4.1" #build