Changes in message dialogs

2 files changed, 9 insertions, 10 deletions

diff --git a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
index efb73f4..d7866c1 100644
--- a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
@@ -22,13 +22,13 @@ import app.olauncher.data.AppModel
 import app.olauncher.data.Constants
 import app.olauncher.data.Prefs
 import app.olauncher.helper.openAppInfo
-import app.olauncher.helper.showToastLong
 import app.olauncher.helper.showToastShort
 import kotlinx.android.synthetic.main.fragment_app_drawer.*
 
 class AppDrawerFragment : Fragment() {
 
     private lateinit var prefs: Prefs
+    private lateinit var viewModel: MainViewModel
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -41,6 +41,10 @@ class AppDrawerFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         prefs = Prefs(requireContext())
+        viewModel = activity?.run {
+            ViewModelProvider(this).get(MainViewModel::class.java)
+        } ?: throw Exception("Invalid Activity")
+
         val flag = arguments?.getInt("flag", Constants.FLAG_LAUNCH_APP) ?: Constants.FLAG_LAUNCH_APP
         val rename = arguments?.getBoolean("rename", false) ?: false
         if (rename) {
@@ -52,10 +56,6 @@ class AppDrawerFragment : Fragment() {
             }
         }
 
-        val viewModel = activity?.run {
-            ViewModelProvider(this).get(MainViewModel::class.java)
-        } ?: throw Exception("Invalid Activity")
-
         val appAdapter = AppDrawerAdapter(
             flag,
             prefs.appLabelAlignment,
@@ -176,9 +176,7 @@ class AppDrawerFragment : Fragment() {
             if (newSet.isEmpty()) findNavController().popBackStack()
             if (prefs.firstHide) {
                 prefs.firstHide = false
-                // Deploying a weird strategy to make sure that people read this message
-                showToastShort(requireContext(), "To see hidden apps, tap Olauncher text on the top.")
-                showToastLong(requireContext(), "To see hidden apps, tap Olauncher text on the top.")
+                viewModel.showMessageDialog(getString(R.string.hidden_apps_message))
                 findNavController().navigate(R.id.action_appListFragment_to_settingsFragment2)
             }
         }
diff --git a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index dc00c43..074f9d9 100644
--- a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -511,9 +511,10 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
                 }
             }
         }
-        if (prefs.aboutClicked.not())
+        if (viewModel.isOlauncherDefault.value != true) return
+        if (prefs.aboutClicked.not() && prefs.toShowHintCounter < Constants.HINT_RATE_US)
             about.setCompoundDrawablesWithIntrinsicBounds(0, android.R.drawable.arrow_down_float, 0, 0)
-        if (prefs.rateClicked.not() && prefs.toShowHintCounter > Constants.HINT_RATE_US)
+        if (prefs.rateClicked.not() && prefs.toShowHintCounter > Constants.HINT_RATE_US && prefs.toShowHintCounter < Constants.HINT_RATE_US + 10)
             rate.setCompoundDrawablesWithIntrinsicBounds(0, android.R.drawable.arrow_down_float, 0, 0)
     }
 }
\ No newline at end of file