Skip to content

feat(apps): app drawer obeys home alignment #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(apps): app drawer obeys home alignment #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/main/java/app/olauncher/MainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
val isOlauncherDefault = MutableLiveData<Boolean>()
val launcherResetFailed = MutableLiveData<Boolean>()
val homeAppAlignment = MutableLiveData<Int>()
val appLabelAlignment = MutableLiveData<Int>()
val screenTimeValue = MutableLiveData<String>()

val showDialog = SingleLiveEvent<String>()
Expand Down Expand Up @@ -255,6 +256,16 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
homeAppAlignment.value = prefs.homeAlignment
}

fun updateAppAlignment(gravity: Int) {
prefs.appLabelAlignment = gravity
appLabelAlignment.value = prefs.appLabelAlignment
}

fun updateAllAlignment(gravity: Int) {
updateHomeAlignment(gravity)
updateAppAlignment(gravity)
}

fun getTodaysScreenTime() {
if (prefs.screenTimeLastUpdated.hasBeenMinutes(1).not()) return

Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package app.olauncher.ui

import android.os.Bundle
import android.view.Gravity
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
Expand Down Expand Up @@ -58,6 +59,7 @@ class AppDrawerFragment : Fragment() {
flag = it.getInt(Constants.Key.FLAG, Constants.FLAG_LAUNCH_APP)
canRename = it.getBoolean(Constants.Key.RENAME, false)
}
setAppAlignment(prefs.appLabelAlignment)
initViews()
initSearch()
initAdapter()
Expand Down Expand Up @@ -284,4 +286,8 @@ class AppDrawerFragment : Fragment() {
super.onDestroyView()
_binding = null
}

private fun setAppAlignment(horizontalGravity: Int = prefs.appLabelAlignment) {
viewModel.updateAppAlignment(horizontalGravity)
}
}
8 changes: 5 additions & 3 deletions app/src/main/java/app/olauncher/ui/SettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
R.id.dailyWallpaperUrl -> requireContext().openUrl(prefs.dailyWallpaperUrl)
R.id.dailyWallpaper -> toggleDailyWallpaperUpdate()
R.id.alignment -> binding.alignmentSelectLayout.visibility = View.VISIBLE
R.id.alignmentLeft -> viewModel.updateHomeAlignment(Gravity.START)
R.id.alignmentCenter -> viewModel.updateHomeAlignment(Gravity.CENTER)
R.id.alignmentRight -> viewModel.updateHomeAlignment(Gravity.END)
// TODO separate setting for app drawer alignment?
R.id.alignmentLeft -> viewModel.updateAllAlignment(Gravity.START)
R.id.alignmentCenter -> viewModel.updateAllAlignment(Gravity.CENTER)
R.id.alignmentRight -> viewModel.updateAllAlignment(Gravity.END)
R.id.alignmentBottom -> updateHomeBottomAlignment()
R.id.statusBar -> toggleStatusBar()
R.id.dateTime -> binding.dateTimeSelectLayout.visibility = View.VISIBLE
Expand Down Expand Up @@ -546,6 +547,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
prefs.homeBottomAlignment = !prefs.homeBottomAlignment
populateAlignment()
viewModel.updateHomeAlignment(prefs.homeAlignment)
viewModel.updateAppAlignment(prefs.homeAlignment)
}

private fun populateAlignment() {
Expand Down