Fixed the following issues:

- Screen rotation allowed in settings menu
- Work profile drawable not changing color on home screen
- Shortcut app menu title color
- Dependency Info blob
This commit is contained in:
ottoptj 2024-08-15 02:10:24 +03:00
commit 1798401de3
4 changed files with 52 additions and 33 deletions

View file

@ -11,8 +11,13 @@ android {
applicationId = "eu.ottop.yamlauncher"
minSdk = 31
targetSdk = 34
versionCode = 1
versionName = "0.5-test"
versionCode = 2
versionName = "0.6-test"
}
dependenciesInfo {
includeInApk = false
includeInBundle = false
}
buildTypes {

View file

@ -29,7 +29,9 @@
<activity
android:name=".settings.SettingsActivity"
android:theme="@style/SettingsTheme"
android:exported="false" />
android:exported="false"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
<activity
android:name=".MainActivity"
android:excludeFromRecents="true"

View file

@ -105,10 +105,10 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
setMainVariables()
setPreferences()
setShortcuts()
setPreferences()
setHomeListeners()
// Task to update the app menu every 5 seconds
@ -159,25 +159,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
preferences = PreferenceManager.getDefaultSharedPreferences(this)
}
private fun setPreferences() {
uiUtils.setBackground(window)
uiUtils.setTextColors(binding.homeView)
uiUtils.setSearchColors(searchView)
uiUtils.setClockAlignment(clock, dateText)
uiUtils.setSearchAlignment(searchView)
uiUtils.setClockSize(clock)
uiUtils.setDateSize(dateText)
uiUtils.setShortcutsSize(binding.homeView)
uiUtils.setSearchSize(searchView)
uiUtils.setStatusBar(window)
leftSwipeActivity = gestureUtils.getSwipeInfo(launcherApps, "left")
rightSwipeActivity = gestureUtils.getSwipeInfo(launcherApps, "right")
}
private fun setShortcuts() {
val shortcuts = arrayOf(R.id.app1, R.id.app2, R.id.app3, R.id.app4, R.id.app5, R.id.app6, R.id.app7, R.id.app8)
@ -283,6 +264,26 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
}
}
private fun setPreferences() {
uiUtils.setBackground(window)
uiUtils.setTextColors(binding.homeView)
uiUtils.setMenuItemColors(searchView)
uiUtils.setMenuItemColors(binding.menuTitle, "A9")
uiUtils.setClockAlignment(clock, dateText)
uiUtils.setSearchAlignment(searchView)
uiUtils.setClockSize(clock)
uiUtils.setDateSize(dateText)
uiUtils.setShortcutsSize(binding.homeView)
uiUtils.setSearchSize(searchView)
uiUtils.setStatusBar(window)
leftSwipeActivity = gestureUtils.getSwipeInfo(launcherApps, "left")
rightSwipeActivity = gestureUtils.getSwipeInfo(launcherApps, "right")
}
@SuppressLint("ClickableViewAccessibility")
private fun setHomeListeners() {
registerBatteryReceiver()
@ -331,7 +332,8 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
"textColor" -> {
uiUtils.setTextColors(binding.homeView)
uiUtils.setSearchColors(searchView)
uiUtils.setMenuItemColors(searchView)
uiUtils.setMenuItemColors(binding.menuTitle, "A9")
}
"clockAlignment" -> {

View file

@ -39,7 +39,15 @@ class UIUtils(context: Context) {
}
}
hasMethod(view, "setTextColor") -> {
(view as? TextView)?.setTextColor(color)
(view as TextView).setTextColor(color)
view.compoundDrawables[0]?.colorFilter =
BlendModeColorFilter(sharedPreferenceManager.getTextColor(), BlendMode.SRC_ATOP)
view.compoundDrawables[2]?.colorFilter =
BlendModeColorFilter(sharedPreferenceManager.getTextColor(), BlendMode.SRC_ATOP)
}
view is TextView && view.compoundDrawables[0] != null -> {
println(view.text)
}
else -> {
view.setBackgroundColor(color)
@ -56,16 +64,18 @@ class UIUtils(context: Context) {
}
}
fun setSearchColors(searchView: TextInputEditText) {
val viewTreeObserver = searchView.viewTreeObserver
fun setMenuItemColors(view: TextView, alphaHex: String = "FF") {
val viewTreeObserver = view.viewTreeObserver
val globalLayoutListener = object : ViewTreeObserver.OnGlobalLayoutListener {
override fun onGlobalLayout() {
searchView.viewTreeObserver.removeOnGlobalLayoutListener(this)
view.viewTreeObserver.removeOnGlobalLayoutListener(this)
val color = sharedPreferenceManager.getTextColor()
searchView.setTextColor(color)
searchView.setHintTextColor(setAlpha(color, "A9"))
searchView.compoundDrawables[0].mutate().colorFilter = BlendModeColorFilter(color, BlendMode.SRC_ATOP)
view.setTextColor(setAlpha(color, alphaHex))
view.setHintTextColor(setAlpha(color, "A9"))
if (view.compoundDrawables[0] != null) {
view.compoundDrawables[0].mutate().colorFilter = BlendModeColorFilter(color, BlendMode.SRC_ATOP)
}
}
}