updated some defaults and instructions

6 files changed, 24 insertions, 18 deletions

diff --git a/app/src/main/java/app/sidephonelauncher/MainActivity.kt b/app/src/main/java/app/sidephonelauncher/MainActivity.kt
index cc2621e..e8e4aa7 100644
--- a/app/src/main/java/app/sidephonelauncher/MainActivity.kt
+++ b/app/src/main/java/app/sidephonelauncher/MainActivity.kt
@@ -261,6 +261,16 @@ class MainActivity : AppCompatActivity() {
                     }
                 }
 
+                Constants.Dialog.HOME_TIPS -> {
+                    showMessageDialog(
+                        R.string.app_name,
+                        R.string.swipe_up_for_apps,
+                        R.string.okay
+                    ) {
+                        binding.messageLayout.visibility = View.GONE
+                    }
+                }
+
                 Constants.Dialog.WALLPAPER -> {
                     prefs.wallpaperMsgShown = true
                     prefs.userState = Constants.UserState.REVIEW
diff --git a/app/src/main/java/app/sidephonelauncher/data/Constants.kt b/app/src/main/java/app/sidephonelauncher/data/Constants.kt
index dd812fc..1b2ca32 100644
--- a/app/src/main/java/app/sidephonelauncher/data/Constants.kt
+++ b/app/src/main/java/app/sidephonelauncher/data/Constants.kt
@@ -9,6 +9,7 @@ object Constants {
 
     object Dialog {
         const val ABOUT = "ABOUT"
+        const val HOME_TIPS = "HOME_TIPS"
         const val WALLPAPER = "WALLPAPER"
         const val REVIEW = "REVIEW"
         const val RATE = "RATE"
diff --git a/app/src/main/java/app/sidephonelauncher/data/Prefs.kt b/app/src/main/java/app/sidephonelauncher/data/Prefs.kt
index 2ef7a88..dc7b631 100644
--- a/app/src/main/java/app/sidephonelauncher/data/Prefs.kt
+++ b/app/src/main/java/app/sidephonelauncher/data/Prefs.kt
@@ -168,11 +168,11 @@ class Prefs(context: Context) {
         set(value) = prefs.edit { putInt(HOME_APPS_NUM, value).apply() }
 
     var homeAlignment: Int
-        get() = prefs.getInt(HOME_ALIGNMENT, Gravity.START)
+        get() = prefs.getInt(HOME_ALIGNMENT, Gravity.CENTER)
         set(value) = prefs.edit { putInt(HOME_ALIGNMENT, value).apply() }
 
     var homeBottomAlignment: Boolean
-        get() = prefs.getBoolean(HOME_BOTTOM_ALIGNMENT, false)
+        get() = prefs.getBoolean(HOME_BOTTOM_ALIGNMENT, true)
         set(value) = prefs.edit { putBoolean(HOME_BOTTOM_ALIGNMENT, value).apply() }
 
     var appLabelAlignment: Int
diff --git a/app/src/main/java/app/sidephonelauncher/ui/HomeFragment.kt b/app/src/main/java/app/sidephonelauncher/ui/HomeFragment.kt
index d381a74..25b4376 100644
--- a/app/src/main/java/app/sidephonelauncher/ui/HomeFragment.kt
+++ b/app/src/main/java/app/sidephonelauncher/ui/HomeFragment.kt
@@ -188,11 +188,15 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
     }
 
     private fun initObservers() {
-        if (prefs.firstSettingsOpen) {
-            binding.firstRunTips.visibility = View.VISIBLE
-            binding.setDefaultLauncher.visibility = View.GONE
-        } else binding.firstRunTips.visibility = View.GONE
+        binding.firstRunTips.visibility = View.GONE
+        binding.setDefaultLauncher.visibility = View.GONE
 
+        viewModel.firstOpen.observe(viewLifecycleOwner) {
+            if (it == true) {
+                viewModel.showDialog.postValue(Constants.Dialog.HOME_TIPS)
+                viewModel.firstOpen(false)
+            }
+        }
         viewModel.refreshHome.observe(viewLifecycleOwner) {
             populateHomeScreen(it)
         }
@@ -202,11 +206,8 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
                     prefs.dailyWallpaper = false
                     viewModel.cancelWallpaperWorker()
                 }
-                prefs.homeBottomAlignment = false
-                setHomeAlignment()
             }
-            if (binding.firstRunTips.isVisible) return@Observer
-            binding.setDefaultLauncher.isVisible = it.not() && prefs.hideSetDefaultLauncher.not()
+            binding.setDefaultLauncher.isVisible = false
         })
         viewModel.homeAppAlignment.observe(viewLifecycleOwner) {
             setHomeAlignment(it)
diff --git a/app/src/main/java/app/sidephonelauncher/ui/SettingsFragment.kt b/app/src/main/java/app/sidephonelauncher/ui/SettingsFragment.kt
index 5bece50..6919d07 100644
--- a/app/src/main/java/app/sidephonelauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/sidephonelauncher/ui/SettingsFragment.kt
@@ -621,13 +621,6 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
     }
 
     private fun updateHomeBottomAlignment() {
-        if (viewModel.isSidePhOnelauncherDefault.value != true) {
-            requireContext().showToast(
-                getString(R.string.please_set_sidephonelauncher_as_default_first),
-                Toast.LENGTH_LONG
-            )
-            return
-        }
         prefs.homeBottomAlignment = !prefs.homeBottomAlignment
         populateAlignment()
         viewModel.updateHomeAlignment(prefs.homeAlignment)
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index 1a8b955..9bd9f13 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -201,7 +201,8 @@
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginHorizontal="8dp"
         android:layout_marginBottom="56dp"
-        android:text="@string/swipe_up_for_apps" />
+        android:text="@string/swipe_up_for_apps"
+        android:visibility="gone" />
 
     <!-- Set default launcher -->
     <TextView