mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-11-04 08:08:55 +01:00 
			
		
		
		
	Add new "Lavender" theme (#7343)
* Add new "Lavender" theme * Add light theme values for Lavender theme * Fix order of enums * Fix accented UI elements in set categories sheet being different colors Co-authored-by: CrepeTF <trungnguyen02@outlookcom>
This commit is contained in:
		@@ -30,13 +30,14 @@ object PreferenceValues {
 | 
			
		||||
    enum class AppTheme(val titleResId: Int?) {
 | 
			
		||||
        DEFAULT(R.string.label_default),
 | 
			
		||||
        MONET(R.string.theme_monet),
 | 
			
		||||
        GREEN_APPLE(R.string.theme_greenapple),
 | 
			
		||||
        LAVENDER(R.string.theme_lavender),
 | 
			
		||||
        MIDNIGHT_DUSK(R.string.theme_midnightdusk),
 | 
			
		||||
        STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
 | 
			
		||||
        YOTSUBA(R.string.theme_yotsuba),
 | 
			
		||||
        TAKO(R.string.theme_tako),
 | 
			
		||||
        GREEN_APPLE(R.string.theme_greenapple),
 | 
			
		||||
        TEALTURQUOISE(R.string.theme_tealturquoise),
 | 
			
		||||
        YINYANG(R.string.theme_yinyang),
 | 
			
		||||
        YOTSUBA(R.string.theme_yotsuba),
 | 
			
		||||
 | 
			
		||||
        // Deprecated
 | 
			
		||||
        DARK_BLUE(null),
 | 
			
		||||
 
 | 
			
		||||
@@ -20,6 +20,9 @@ interface ThemingDelegate {
 | 
			
		||||
                PreferenceValues.AppTheme.GREEN_APPLE -> {
 | 
			
		||||
                    resIds += R.style.Theme_Tachiyomi_GreenApple
 | 
			
		||||
                }
 | 
			
		||||
                PreferenceValues.AppTheme.LAVENDER -> {
 | 
			
		||||
                    resIds += R.style.Theme_Tachiyomi_Lavender
 | 
			
		||||
                }
 | 
			
		||||
                PreferenceValues.AppTheme.MIDNIGHT_DUSK -> {
 | 
			
		||||
                    resIds += R.style.Theme_Tachiyomi_MidnightDusk
 | 
			
		||||
                }
 | 
			
		||||
 
 | 
			
		||||
@@ -29,7 +29,7 @@ class QuadStateTextView @JvmOverloads constructor(context: Context, attrs: Attri
 | 
			
		||||
        val tint = if (state == State.UNCHECKED) {
 | 
			
		||||
            context.getThemeColor(R.attr.colorControlNormal)
 | 
			
		||||
        } else {
 | 
			
		||||
            context.getThemeColor(R.attr.colorAccent)
 | 
			
		||||
            context.getThemeColor(R.attr.colorPrimary)
 | 
			
		||||
        }
 | 
			
		||||
        if (tint != 0) {
 | 
			
		||||
            TextViewCompat.setCompoundDrawableTintList(this, ColorStateList.valueOf(tint))
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user