Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code Cleanup

Browse source
This commit is contained in:
Prathamesh More 2021-10-25 20:51:40 +05:30
parent aca697f6ff
commit db01ce6ee8
15 changed files with 32 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

7
appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
View file

@ -10,6 +10,7 @@ import androidx.preference.PreferenceManager
import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor
import code.name.monkey.appthemehelper.util.ColorUtil
import code.name.monkey.appthemehelper.util.VersionUtils
/**
@ -205,6 +206,10 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
@CheckResult
@ColorInt
fun accentColor(context: Context): Int {
// Set MD3 accent if MD3 is enabled or in-app accent otherwise
if (isMD3Enabled(context) && VersionUtils.hasS()) {
return ContextCompat.getColor(context, R.color.m3_accent_color)
}
val desaturatedColor = prefs(context).getBoolean("desaturated_color", false)
val color = prefs(context).getInt(
ThemeStorePrefKeys.KEY_ACCENT_COLOR,
@ -301,7 +306,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
return true
}
fun isMD3Enabled(context: Context): Boolean {
private fun isMD3Enabled(context: Context): Boolean {
return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ThemeStorePrefKeys.KEY_MATERIAL_YOU, false)
}
}

10
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt
View file

@ -17,12 +17,9 @@ package code.name.monkey.appthemehelper.common.prefs.supportv7
import android.content.Context
import android.util.AttributeSet
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceViewHolder
import code.name.monkey.appthemehelper.R
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.appthemehelper.util.VersionUtils
class ATEPreferenceCategory @JvmOverloads constructor(
context: Context?,
@ -35,12 +32,7 @@ class ATEPreferenceCategory @JvmOverloads constructor(
super.onBindViewHolder(holder)
val title = holder.itemView.findViewById<TextView>(android.R.id.title)
title.setTextColor(
// Set MD3 accent if MD3 is enabled or in-app accent otherwise
if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) {
ContextCompat.getColor(context, R.color.m3_accent_color)
} else {
ThemeStore.accentColor(context)
}
ThemeStore.accentColor(context)
)
}
}

6
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt
View file

@ -47,11 +47,7 @@ class ATESeekBarPreference @JvmOverloads constructor(
val seekBar = view.findViewById(R.id.seekbar) as SeekBar
TintHelper.setTintAuto(
seekBar, // Set MD3 accent if MD3 is enabled or in-app accent otherwise
if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) {
ContextCompat.getColor(context, R.color.m3_accent_color)
} else {
ThemeStore.accentColor(context)
}, false
ThemeStore.accentColor(context), false
)
(view.findViewById(R.id.seekbar_value) as TextView).apply {
appendUnit(editableText)

9
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
View file

@ -17,10 +17,7 @@ package code.name.monkey.appthemehelper.common.views
import android.content.Context
import android.util.AttributeSet
import androidx.appcompat.widget.AppCompatTextView
import androidx.core.content.ContextCompat
import code.name.monkey.appthemehelper.R
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.appthemehelper.util.VersionUtils
class ATEAccentTextView @JvmOverloads constructor(
context: Context,
@ -31,11 +28,7 @@ class ATEAccentTextView @JvmOverloads constructor(
init {
setTextColor(
// Set MD3 accent if MD3 is enabled or in-app accent otherwise
if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) {
ContextCompat.getColor(context, R.color.m3_accent_color)
} else {
ThemeStore.accentColor(context)
}
ThemeStore.accentColor(context)
)
}
}

9
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
View file

@ -3,12 +3,9 @@ package code.name.monkey.appthemehelper.common.views
import android.content.Context
import android.util.AttributeSet
import androidx.appcompat.widget.SwitchCompat
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import code.name.monkey.appthemehelper.ATH
import code.name.monkey.appthemehelper.R
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.appthemehelper.util.VersionUtils
/**
* @author Aidan Follestad (afollestad)
@ -32,11 +29,7 @@ class ATESwitch : SwitchCompat {
}
private fun init(context: Context) {
if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) {
ATH.setTint(this, ContextCompat.getColor(context, R.color.m3_accent_color))
} else {
ATH.setTint(this, ThemeStore.accentColor(context))
}
ATH.setTint(this, ThemeStore.accentColor(context))
}
override fun isShown(): Boolean {