feat: always show thank you feature in color customization (#141)

* feat: always show thank you feature in color customization

Only affects gplay builds.

See: https://en.wikipedia.org/wiki/First_law_of_thermodynamics

* feat: use thank you as donation in gplay builds

`R.bools.show_donate_in_about` is not needed anymore.

* style: add names to call arguments

Author: naveensingh

commons/src/main/kotlin/org/fossify/commons/activities/AboutActivity.kt

@@ -30,8 +30,10 @@ import org.fossify.commons.compose.theme.AppThemeSurface
 import org.fossify.commons.dialogs.ConfirmationAdvancedAlertDialog
 import org.fossify.commons.extensions.baseConfig
 import org.fossify.commons.extensions.getStoreUrl
+import org.fossify.commons.extensions.isThankYouInstalled
 import org.fossify.commons.extensions.launchAppRatingPage
 import org.fossify.commons.extensions.launchMoreAppsFromUsIntent
+import org.fossify.commons.extensions.launchPurchaseThankYouIntent
 import org.fossify.commons.extensions.launchViewIntent
 import org.fossify.commons.extensions.showErrorToast
 import org.fossify.commons.extensions.toast
@@ -67,8 +69,7 @@ class AboutActivity : BaseComposeActivity() {
                 val showGoogleRelations =
                     remember { !resources.getBoolean(R.bool.hide_google_relations) }
                 val showGithubRelations = showGithubRelations()
-                val showDonationLinks =
-                    remember { resources.getBoolean(R.bool.show_donate_in_about) }
+                val showDonationLinks = remember { !isThankYouInstalled() || !showGoogleRelations }
                 val onEmailClickAlertDialogState = getOnEmailClickAlertDialogState()
                 AboutScreen(
                     goBack = ::finish,
@@ -258,7 +259,11 @@ class AboutActivity : BaseComposeActivity() {
     }
 
     private fun onDonateClick() {
-        startActivity(Intent(applicationContext, DonationActivity::class.java))
+        if (resources.getBoolean(R.bool.hide_google_relations)) {
+            startActivity(Intent(applicationContext, DonationActivity::class.java))
+        } else {
+            launchPurchaseThankYouIntent()
+        }
     }
 
     private fun onGithubClick() {

commons/src/main/kotlin/org/fossify/commons/activities/CustomizationActivity.kt

@@ -392,11 +392,7 @@ fun BaseSimpleActivity.showOTGPermissionDialog(path: String) {
 
 fun Activity.launchPurchaseThankYouIntent() {
     hideKeyboard()
-    try {
-        launchViewIntent("market://details?id=org.fossify.thankyou")
-    } catch (ignored: Exception) {
-        launchViewIntent(getString(R.string.thank_you_url))
-    }
+    launchViewIntent(getString(R.string.thank_you_url))
 }
 
 fun Activity.launchUpgradeToProIntent() {

commons/src/main/kotlin/org/fossify/commons/extensions/Activity.kt

@@ -219,11 +219,37 @@
                 tools:visibility="visible">
 
                 <org.fossify.commons.views.MyMaterialSwitch
-                    android:id="@+id/apply_to_all"
+                    android:id="@+id/apply_to_all_switch"
                     style="@style/SettingsSwitchStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true" />
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/apply_to_all_apps" />
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_toStartOf="@id/apply_to_all_switch"
+                    android:orientation="vertical">
+
+                    <org.fossify.commons.views.MyTextView
+                        android:id="@+id/apply_to_all_label"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/apply_to_all_apps" />
+
+                    <org.fossify.commons.views.MyTextView
+                        android:id="@+id/apply_to_all_note"
+                        style="@style/SettingsTextValueStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/requires_fossify_thank_you"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+                </LinearLayout>
 
             </RelativeLayout>
 

commons/src/main/res/layout/activity_customization.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="default_vibrate_on_press">false</bool>          <!-- used in some apps like Calculator -->
-    <bool name="show_donate_in_about">false</bool>              <!-- we cannot show Donate in the Google Play version as we aren't a charity -->
     <bool name="hide_google_relations">false</bool>             <!-- hide everything related to Google, used in cases when our apps are preinstalled -->
     <bool name="pretend_thank_you_installed">false</bool>       <!-- do not require Thank You for color customization and widgets -->
 </resources>

commons/src/main/res/values/bools.xml

@@ -385,7 +385,7 @@
     <string name="shared_theme_note">Note that even though you are using the Pro app version, you still need Fossify Thank You for technical reasons. It takes care of the color synchronization.</string>
     <string name="purchase_thank_you">
         <![CDATA[
-            Please purchase <a href="https://play.google.com/store/apps/details?id=org.fossify.thankyou">Fossify Thank You</a> to unlock this function and support the development. Thanks!
+            Please purchase <a href="https://play.google.com/store/apps/details?id=org.fossify.thankyou">Fossify Thank You</a> to unlock this feature and support development. Thank you!
         ]]>
     </string>
 
@@ -690,6 +690,7 @@
     <!-- Settings -->
     <string name="settings">Settings</string>
     <string name="purchase_simple_thank_you">Purchase Fossify Thank You</string>
+    <string name="requires_fossify_thank_you">Requires Fossify Thank You</string>
     <string name="general_settings">General</string>
     <string name="color_customization">Color customization</string>
     <string name="improved_color_customization">Improved color customization</string>

commons/src/main/res/values/strings.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>
 </resources>

samples/src/foss/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>
 </resources>