Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

Commit

Permalink
Fix: Fixed Accent Colors When Disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
@CreativeCodeCat
CreativeCodeCat committed Apr 29, 2024
1 parent 142be17 commit e25ffa2
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 28 deletions.
30 changes: 15 additions & 15 deletions app/src/main/java/com/github/droidworksstudio/mlauncher/helper/Colors.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ class Colors {

else -> {
when (accentNumber) {
1 -> getHexFontColor(context)
2 -> getHexFontColor(context)
3 -> getHexFontColor(context)
4 -> getHexFontColor(context)
else -> getHexFontColor(context)
1 -> getHexFontColor(context, prefs)
2 -> getHexFontColor(context, prefs)
3 -> getHexFontColor(context, prefs)
4 -> getHexFontColor(context, prefs)
else -> getHexFontColor(context, prefs)
}
}
}
Expand Down Expand Up @@ -182,22 +182,22 @@ class Colors {

else -> {
when (accentNumber) {
1 -> getHexFontColor(context)
2 -> getHexFontColor(context)
3 -> getHexFontColor(context)
4 -> getHexFontColor(context)
else -> getHexFontColor(context)
1 -> getHexFontColor(context, prefs)
2 -> getHexFontColor(context, prefs)
3 -> getHexFontColor(context, prefs)
4 -> getHexFontColor(context, prefs)
else -> getHexFontColor(context, prefs)
}
}
}
}
else -> {
when (accentNumber) {
1 -> getHexFontColor(context)
2 -> getHexFontColor(context)
3 -> getHexFontColor(context)
4 -> getHexFontColor(context)
else -> getHexFontColor(context)
1 -> getHexFontColor(context, prefs)
2 -> getHexFontColor(context, prefs)
3 -> getHexFontColor(context, prefs)
4 -> getHexFontColor(context, prefs)
else -> getHexFontColor(context, prefs)
}
}
}
Expand Down
14 changes: 10 additions & 4 deletions app/src/main/java/com/github/droidworksstudio/mlauncher/helper/Utils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,11 +430,17 @@ fun getHexForOpacity(context: Context, prefs: Prefs): Int {
}

@RequiresApi(Build.VERSION_CODES.Q)
fun getHexFontColor(context: Context): Int {
val accentColor = getAccentColor(context)
val hexAccentColor = java.lang.String.format("#%06X", 0xFFFFFF and accentColor)
fun getHexFontColor(context: Context, prefs: Prefs): Int {
return if (prefs.followAccentColors) {
val accentColor = getAccentColor(context)
val hexAccentColor = java.lang.String.format("#%06X", 0xFFFFFF and accentColor)

return android.graphics.Color.parseColor(hexAccentColor)
android.graphics.Color.parseColor(hexAccentColor)
} else {
val typedValue = TypedValue()
context.theme.resolveAttribute(R.attr.colorPrimary, typedValue, true)
typedValue.data
}
}

@RequiresApi(Build.VERSION_CODES.Q)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/droidworksstudio/mlauncher/ui/AppDrawerAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class AppDrawerAdapter(
binding.appTitle.typeface = typeface
}
if (prefs.followAccentColors) {
val fontColor = getHexFontColor(parent.context)
val fontColor = getHexFontColor(parent.context, prefs)
binding.appTitle.setTextColor(fontColor)
}
binding.appTitle.textSize = prefs.textSizeLauncher.toFloat()
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/github/droidworksstudio/mlauncher/ui/AppDrawerFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class AppDrawerFragment : Fragment() {
binding.recyclerView.addOnScrollListener(getRecyclerViewOnScrollListener())

if (flag == AppDrawerFlag.HiddenApps) {
val fontColor = getHexFontColor(requireActivity())
val fontColor = getHexFontColor(requireActivity(), prefs)
val hiddenAppsHint = getString(R.string.hidden_apps)
if (prefs.followAccentColors) {
val coloredHint = SpannableString(hiddenAppsHint)
Expand All @@ -150,7 +150,7 @@ class AppDrawerFragment : Fragment() {
binding.search.queryHint = hiddenAppsHint
}
if (flag == AppDrawerFlag.SetHomeApp) {
val fontColor = getHexFontColor(requireActivity())
val fontColor = getHexFontColor(requireActivity(), prefs)
val hiddenAppsHint = getString(R.string.please_select_app)
if (prefs.followAccentColors) {
val coloredHint = SpannableString(hiddenAppsHint)
Expand All @@ -166,9 +166,9 @@ class AppDrawerFragment : Fragment() {
binding.search.queryHint = hiddenAppsHint
}
if (flag == AppDrawerFlag.LaunchApp && prefs.useAllAppsText) {
val fontColor = getHexFontColor(requireActivity())
val allAppsHint = getString(R.string.show_apps)
if (prefs.followAccentColors) {
val fontColor = getHexFontColor(requireActivity(), prefs)
val coloredHint = SpannableString(allAppsHint)
coloredHint.setSpan(
ForegroundColorSpan(fontColor),
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/github/droidworksstudio/mlauncher/ui/HomeFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
binding.batteryIcon.typeface = typeface
binding.mainLayout.setBackgroundColor(colors.background(requireContext(), prefs))
if (prefs.followAccentColors) {
val fontColor = getHexFontColor(requireContext())
val fontColor = getHexFontColor(requireContext(), prefs)
binding.clock.setTextColor(fontColor)
binding.date.setTextColor(fontColor)
binding.batteryIcon.setTextColor(fontColor)
Expand Down Expand Up @@ -733,7 +733,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
typeface?.let { setTypeface(it) }
}
if (prefs.followAccentColors) {
val fontColor = getHexFontColor(requireContext())
val fontColor = getHexFontColor(requireContext(), prefs)
setTextColor(fontColor)
} else {
setTextColor(colors.accents(requireContext(), prefs, 4))
Expand Down Expand Up @@ -762,7 +762,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
typeface?.let { setTypeface(it) }
}
if (prefs.followAccentColors) {
val fontColor = getHexFontColor(requireContext())
val fontColor = getHexFontColor(requireContext(), prefs)
setTextColor(fontColor)
} else {
setTextColor(colors.accents(requireContext(), prefs, 3))
Expand Down Expand Up @@ -837,7 +837,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
typeface?.let { setTypeface(it) }
}
if (prefs.followAccentColors) {
val fontColor = getHexFontColor(requireContext())
val fontColor = getHexFontColor(requireContext(), prefs)
setTextColor(fontColor)
} else {
setTextColor(colors.accents(requireContext(), prefs, 4))
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/droidworksstudio/mlauncher/ui/ReorderHomeAppsFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class ReorderHomeAppsFragment : Fragment() {
binding.pageName.textSize = prefs.textSizeLauncher * 1.5f

if (prefs.followAccentColors) {
val fontColor = getHexFontColor(requireContext())
val fontColor = getHexFontColor(requireContext(), prefs)
view.setTextColor(fontColor)
}

Expand Down

0 comments on commit e25ffa2

Please sign in to comment.