Added support for bottom alignment

3 files changed, 31 insertions, 18 deletions

diff --git a/app/src/main/java/app/olauncher/data/Prefs.kt b/app/src/main/java/app/olauncher/data/Prefs.kt
index 3bde587..e553433 100644
--- a/app/src/main/java/app/olauncher/data/Prefs.kt
+++ b/app/src/main/java/app/olauncher/data/Prefs.kt
@@ -18,6 +18,7 @@ class Prefs(context: Context) {
     private val DAILY_WALLPAPER_URL = "DAILY_WALLPAPER_URL"
     private val WALLPAPER_UPDATED_DAY = "WALLPAPER_UPDATED_DAY"
     private val HOME_ALIGNMENT = "HOME_ALIGNMENT"
+    private val HOME_BOTTOM_ALIGNMENT = "HOME_BOTTOM_ALIGNMENT"
     private val APP_LABEL_ALIGNMENT = "APP_LABEL_ALIGNMENT"
     private val STATUS_BAR = "STATUS_BAR"
     private val DATE_TIME = "DATE_TIME"
@@ -105,6 +106,10 @@ class Prefs(context: Context) {
         get() = prefs.getInt(HOME_ALIGNMENT, Gravity.START)
         set(value) = prefs.edit().putInt(HOME_ALIGNMENT, value).apply()
 
+    var homeBottomAlignment: Boolean
+        get() = prefs.getBoolean(HOME_BOTTOM_ALIGNMENT, false)
+        set(value) = prefs.edit().putBoolean(HOME_BOTTOM_ALIGNMENT, value).apply()
+
     var appLabelAlignment: Int
         get() = prefs.getInt(APP_LABEL_ALIGNMENT, Gravity.START)
         set(value) = prefs.edit().putInt(APP_LABEL_ALIGNMENT, value).apply()
diff --git a/app/src/main/java/app/olauncher/ui/HomeFragment.kt b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
index 087d50d..d43250c 100644
--- a/app/src/main/java/app/olauncher/ui/HomeFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
@@ -8,10 +8,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Vibrator
 import android.provider.Settings
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowInsets
+import android.view.*
 import android.widget.TextView
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
@@ -137,17 +134,18 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
         setDefaultLauncher.setOnClickListener(this)
     }
 
-    private fun setHomeAlignment(gravity: Int) {
-        dateTimeLayout.gravity = gravity
-        homeAppsLayout.gravity = gravity
-        homeApp1.gravity = gravity
-        homeApp2.gravity = gravity
-        homeApp3.gravity = gravity
-        homeApp4.gravity = gravity
-        homeApp5.gravity = gravity
-        homeApp6.gravity = gravity
-        homeApp7.gravity = gravity
-        homeApp8.gravity = gravity
+    private fun setHomeAlignment(horizontalGravity: Int) {
+        val verticalGravity = if (prefs.homeBottomAlignment) Gravity.BOTTOM else Gravity.CENTER_VERTICAL
+        homeAppsLayout.gravity = horizontalGravity or verticalGravity
+        dateTimeLayout.gravity = horizontalGravity
+        homeApp1.gravity = horizontalGravity
+        homeApp2.gravity = horizontalGravity
+        homeApp3.gravity = horizontalGravity
+        homeApp4.gravity = horizontalGravity
+        homeApp5.gravity = horizontalGravity
+        homeApp6.gravity = horizontalGravity
+        homeApp7.gravity = horizontalGravity
+        homeApp8.gravity = horizontalGravity
     }
 
     private fun populateDateTime() {
diff --git a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index a190784..fa629cc 100644
--- a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -21,7 +21,6 @@ import app.olauncher.data.Constants
 import app.olauncher.data.Prefs
 import app.olauncher.helper.*
 import app.olauncher.listener.DeviceAdmin
-import kotlinx.android.synthetic.main.fragment_home.*
 import kotlinx.android.synthetic.main.fragment_settings.*
 
 class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListener {
@@ -68,8 +67,9 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
     override fun onClick(view: View) {
         appsNumSelectLayout.visibility = View.GONE
         dateTimeSelectLayout.visibility = View.GONE
-        alignmentSelectLayout.visibility = View.GONE
         appThemeSelectLayout.visibility = View.GONE
+        if (view.id != R.id.alignmentBottom)
+            alignmentSelectLayout.visibility = View.GONE
         when (view.id) {
             R.id.olauncherHiddenApps -> showHiddenApps()
             R.id.appInfo -> openAppInfo(requireContext(), android.os.Process.myUserHandle(), BuildConfig.APPLICATION_ID)
@@ -84,6 +84,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
             R.id.alignmentLeft -> viewModel.updateHomeAlignment(Gravity.START)
             R.id.alignmentCenter -> viewModel.updateHomeAlignment(Gravity.CENTER)
             R.id.alignmentRight -> viewModel.updateHomeAlignment(Gravity.END)
+            R.id.alignmentBottom -> updateHomeBottomAlignment()
             R.id.statusBar -> toggleStatusBar()
             R.id.dateTime -> dateTimeSelectLayout.visibility = View.VISIBLE
             R.id.dateTimeOn -> toggleDateTime(Constants.DateTime.ON)
@@ -156,6 +157,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         alignmentLeft.setOnClickListener(this)
         alignmentCenter.setOnClickListener(this)
         alignmentRight.setOnClickListener(this)
+        alignmentBottom.setOnClickListener(this)
         statusBar.setOnClickListener(this)
         dateTime.setOnClickListener(this)
         dateTimeOn.setOnClickListener(this)
@@ -400,7 +402,6 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         }
     }
 
-
     private fun populateAppThemeText(appTheme: Int = prefs.appTheme) {
         when (appTheme) {
             AppCompatDelegate.MODE_NIGHT_YES -> appThemeText.text = getString(R.string.dark)
@@ -419,12 +420,21 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         else dailyWallpaper.text = getString(R.string.off)
     }
 
+    private fun updateHomeBottomAlignment() {
+        prefs.homeBottomAlignment = !prefs.homeBottomAlignment
+        populateAlignment()
+        viewModel.updateHomeAlignment(prefs.homeAlignment)
+    }
+
     private fun populateAlignment() {
         when (prefs.homeAlignment) {
             Gravity.START -> alignment.text = getString(R.string.left)
             Gravity.CENTER -> alignment.text = getString(R.string.center)
             Gravity.END -> alignment.text = getString(R.string.right)
         }
+        alignmentBottom.text = if (prefs.homeBottomAlignment)
+            getString(R.string.bottom_on)
+        else getString(R.string.bottom_off)
     }
 
     private fun populateLockSettings() {