Copy changes

4 files changed, 22 insertions, 2 deletions

diff --git a/app/src/main/java/app/olauncher/MainActivity.kt b/app/src/main/java/app/olauncher/MainActivity.kt
index fbf4dd5..afe4321 100644
--- a/app/src/main/java/app/olauncher/MainActivity.kt
+++ b/app/src/main/java/app/olauncher/MainActivity.kt
@@ -26,6 +26,7 @@ import app.olauncher.helper.isDefaultLauncher
 import app.olauncher.helper.isEinkDisplay
 import app.olauncher.helper.isOlauncherDefault
 import app.olauncher.helper.isTablet
+import app.olauncher.helper.openUrl
 import app.olauncher.helper.rateApp
 import app.olauncher.helper.resetLauncherViaFakeActivity
 import app.olauncher.helper.setPlainWallpaper
@@ -173,7 +174,12 @@ class MainActivity : AppCompatActivity() {
                 Constants.Dialog.DIGITAL_WELLBEING -> {
                     showMessageDialog(getString(R.string.screen_time), getString(R.string.app_usage_message), getString(R.string.permission)) {
                         startActivity(Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS))
-                        // openUrl(Constants.URL_DIGITAL_WELLBEING_LEARN_MORE)
+                    }
+                }
+
+                Constants.Dialog.PRO_MESSAGE -> {
+                    showMessageDialog(getString(R.string.hey), getString(R.string.pro_message), getString(R.string.olauncher_pro)) {
+                        openUrl(Constants.URL_OLAUNCHER_PRO)
                     }
                 }
             }
@@ -215,7 +221,7 @@ class MainActivity : AppCompatActivity() {
             }
 
             Constants.UserState.SHARE -> {
-                if (isOlauncherDefault(this) && prefs.firstOpenTime.hasBeenDays(14)
+                if (isOlauncherDefault(this) && prefs.firstOpenTime.hasBeenDays(21)
                     && prefs.shareShownTime.hasBeenDays(42)
                     && Calendar.getInstance().get(Calendar.HOUR_OF_DAY) >= 18
                 ) viewModel.showDialog.postValue(Constants.Dialog.SHARE)
diff --git a/app/src/main/java/app/olauncher/data/Constants.kt b/app/src/main/java/app/olauncher/data/Constants.kt
index 12f9a75..bb28b6c 100644
--- a/app/src/main/java/app/olauncher/data/Constants.kt
+++ b/app/src/main/java/app/olauncher/data/Constants.kt
@@ -15,6 +15,7 @@ object Constants {
         const val HIDDEN = "HIDDEN"
         const val KEYBOARD = "KEYBOARD"
         const val DIGITAL_WELLBEING = "DIGITAL_WELLBEING"
+        const val PRO_MESSAGE = "PRO_MESSAGE"
     }
 
     object UserState {
diff --git a/app/src/main/java/app/olauncher/data/Prefs.kt b/app/src/main/java/app/olauncher/data/Prefs.kt
index c1ab5ad..6db3119 100644
--- a/app/src/main/java/app/olauncher/data/Prefs.kt
+++ b/app/src/main/java/app/olauncher/data/Prefs.kt
@@ -36,6 +36,7 @@ class Prefs(context: Context) {
     private val SHARE_SHOWN_TIME = "SHARE_SHOWN_TIME"
     private val SWIPE_DOWN_ACTION = "SWIPE_DOWN_ACTION"
     private val TEXT_SIZE_SCALE = "TEXT_SIZE_SCALE"
+    private val PRO_MESSAGE_SHOWN = "PRO_MESSAGE_SHOWN"
 
     private val APP_NAME_1 = "APP_NAME_1"
     private val APP_NAME_2 = "APP_NAME_2"
@@ -167,6 +168,10 @@ class Prefs(context: Context) {
         get() = prefs.getFloat(TEXT_SIZE_SCALE, 1.0f)
         set(value) = prefs.edit().putFloat(TEXT_SIZE_SCALE, value).apply()
 
+    var proMessageShown: Boolean
+        get() = prefs.getBoolean(PRO_MESSAGE_SHOWN, false)
+        set(value) = prefs.edit().putBoolean(PRO_MESSAGE_SHOWN, value).apply()
+
     var hiddenApps: MutableSet<String>
         get() = prefs.getStringSet(HIDDEN_APPS, mutableSetOf()) as MutableSet<String>
         set(value) = prefs.edit().putStringSet(HIDDEN_APPS, value).apply()
diff --git a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index 94a4fc3..bfa1a1b 100644
--- a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -68,6 +68,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         checkAdminPermission()
 
         binding.homeAppsNum.text = prefs.homeAppsNum.toString()
+        populateProMessage()
         populateKeyboardText()
         populateScreenTimeOnOff()
         populateLockSettings()
@@ -622,6 +623,13 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
             binding.rate.setCompoundDrawablesWithIntrinsicBounds(0, android.R.drawable.arrow_down_float, 0, 0)
     }
 
+    private fun populateProMessage() {
+        if (prefs.proMessageShown.not() && prefs.userState == Constants.UserState.SHARE) {
+            prefs.proMessageShown = true
+            viewModel.showDialog.postValue(Constants.Dialog.PRO_MESSAGE)
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null