From debbb7fa2207c5cdfe34e902a70e7b7a20c3f25c Mon Sep 17 00:00:00 2001
From: "fossifybot[bot]" <212866877+fossifybot[bot]@users.noreply.github.com>
Date: Thu, 8 Oct 2026 00:54:28 +0000
Subject: [PATCH 1/2] chore(deps): bump org.fossify.commons from 6.1.6 to 7.1.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 64b0088c..52bf7c95 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ detektCompose = "0.4.28"
 #AndroidX
 androidx-print = "1.1.0"
 #Fossify
-commons = "6.1.6"
+commons = "7.1.0"
 #Gradle
 gradlePlugins-agp = "9.4.1"
 #build

From 40592f21ecaa18c2517262de36508d7118145a4c Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Thu, 8 Oct 2026 07:21:31 +0530
Subject: [PATCH 2/2] fix: migrate to commons v7.1.0

---
 app/build.gradle.kts                                          | 1 -
 app/src/foss/res/values/bools.xml                             | 3 +--
 app/src/gplay/res/values/bools.xml                            | 3 +--
 .../main/kotlin/org/fossify/paint/activities/MainActivity.kt  | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8310808d..c464dc63 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -82,7 +82,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 ac02880e..fcdfa946 100644
--- a/app/src/foss/res/values/bools.xml
+++ b/app/src/foss/res/values/bools.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="show_donate_in_about">true</bool>
-    <bool name="hide_google_relations">true</bool>
-    <bool name="pretend_thank_you_installed">true</bool>
+    <bool name="is_google_play_build">false</bool>
 </resources>
diff --git a/app/src/gplay/res/values/bools.xml b/app/src/gplay/res/values/bools.xml
index 41c48b21..d89a62c6 100644
--- a/app/src/gplay/res/values/bools.xml
+++ b/app/src/gplay/res/values/bools.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="show_donate_in_about">false</bool>
-    <bool name="hide_google_relations">false</bool>
-    <bool name="pretend_thank_you_installed">true</bool>
+    <bool name="is_google_play_build">true</bool>
 </resources>
diff --git a/app/src/main/kotlin/org/fossify/paint/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/paint/activities/MainActivity.kt
index 8aef8c92..9702d4d3 100644
--- a/app/src/main/kotlin/org/fossify/paint/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/paint/activities/MainActivity.kt
@@ -218,7 +218,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
             findItem(R.id.menu_share).isVisible = !isImageCaptureIntent && !isEditIntent
             findItem(R.id.open_file).isVisible = !isEditIntent
             findItem(R.id.more_apps_from_us).isVisible =
-                !resources.getBoolean(R.bool.hide_google_relations)
+                resources.getBoolean(R.bool.is_google_play_build)
         }
     }
 
@@ -273,7 +273,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
 
         val faqItems = ArrayList<FAQItem>()
 
-        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))
             faqItems.add(FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons))