From eb96137c3aeb194da42dac6ce68cc295745da7ae Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Mon, 5 Dec 2022 01:20:02 +0300
Subject: [PATCH] ultra upgraded theming csl

---
 .../vtosters/lite/themes/ColorReferences.java |  2 ++
 .../lite/themes/utils/RecolorUtils.java       | 34 +++++++------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/themes/ColorReferences.java b/app/src/main/java/ru/vtosters/lite/themes/ColorReferences.java
index 05297d4c4..cad7b344b 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/ColorReferences.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/ColorReferences.java
@@ -13,6 +13,8 @@ public class ColorReferences {
             Color.parseColor("#4986cc"), // azure_a400
             Color.parseColor("#528bcc"), // another light accent
             Color.parseColor("#71aaeb"), // vk_sky_300 (dark accent)
+            ThemesUtils.getColorFromAttr(com.vtosters.lite.R.attr.button_muted_foreground_disabled),
+            ThemesUtils.getColorFromAttr(com.vtosters.lite.R.attr.button_muted_foreground),
             Color.parseColor("#5181b8") // header_blue
     );
 
diff --git a/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java b/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java
index 023e2ec8e..ad67f793d 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java
@@ -53,41 +53,33 @@ public class RecolorUtils {
             csl = context.getResources().getColorStateList(color);
         }
 
+        return themeCSL(csl);
+    } // Recolor ColorStateList
+
+    public static ColorStateList themeCSL(ColorStateList csl){
         try {
             int unsel = csl.getColorForState(new int[]{-android.R.attr.state_selected}, Color.BLACK);
             int sel = csl.getColorForState(new int[]{android.R.attr.state_selected}, Color.BLACK);
+            int enabled = csl.getColorForState(new int[]{android.R.attr.state_enabled}, Color.BLACK);
+            int disabled = csl.getColorForState(new int[]{-android.R.attr.state_enabled}, Color.BLACK);
 
             boolean isUnselAccent = ColorReferences.isAccentedColor(unsel);
             boolean isSelAccent = ColorReferences.isAccentedColor(sel);
+            boolean isEnabledAccent = ColorReferences.isAccentedColor(enabled);
+            boolean isDisabledAccent = ColorReferences.isAccentedColor(disabled);
 
             if (isUnselAccent || isSelAccent) {
-
                 return new ColorStateList(new int[][]{
                         new int[]{android.R.attr.state_selected}, new int[]{-android.R.attr.state_selected}
                 }, new int[]{isSelAccent ? ThemesUtils.getAccentColor() : sel, isUnselAccent ? ThemesUtils.getAccentColor() : unsel});
             }
 
-            return csl;
-        } catch (Exception e) {
-
-            e.printStackTrace();
-            return null;
-        }
-    } // Recolor ColorStateList
-
-    public static ColorStateList themeCSL(ColorStateList csl){
-        try {
-            int unsel = csl.getColorForState(new int[] {-android.R.attr.state_selected}, Color.BLACK);
-            int sel = csl.getColorForState(new int[] {android.R.attr.state_selected}, Color.BLACK);
-
-            boolean isUnselAccent = ColorReferences.isAccentedColor(unsel);
-            boolean isSelAccent = ColorReferences.isAccentedColor(sel);
-
-            if (isUnselAccent || isSelAccent) {
-                return new ColorStateList(new int[][] {
-                        new int[] {android.R.attr.state_selected}, new int[] {-android.R.attr.state_selected}
-                }, new int[] {isSelAccent ? ThemesUtils.getAccentColor() : sel, isUnselAccent ? ThemesUtils.getAccentColor() : unsel});
+            if (isDisabledAccent || isEnabledAccent) {
+                return new ColorStateList(new int[][]{
+                        new int[]{android.R.attr.state_enabled}, new int[]{-android.R.attr.state_enabled}
+                }, new int[]{isEnabledAccent ? ThemesUtils.getAccentColor() : enabled, isDisabledAccent ? ThemesUtils.getAccentColor() : disabled});
             }
+
             return csl;
         } catch (Exception e) {
             e.printStackTrace();