diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java index 495ea6398..ff243c043 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -8,8 +8,8 @@ import static ru.vtosters.lite.utils.Globals.getResources; import static ru.vtosters.lite.utils.Preferences.color_grishka; import static ru.vtosters.lite.utils.Preferences.isBGStickersEnabled; import static ru.vtosters.lite.utils.Preferences.navbar; -import static ru.vtosters.lite.utils.Preferences.systemtheme; import static ru.vtosters.lite.utils.Preferences.roundedmsgs; +import static ru.vtosters.lite.utils.Preferences.systemtheme; import static ru.vtosters.lite.utils.Preferences.vksans; import android.content.Context; @@ -18,14 +18,17 @@ import android.content.res.Configuration; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Build; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.Toolbar; import android.view.View; import android.view.Window; import android.widget.ImageButton; +import android.widget.TextView; import androidx.core.graphics.ColorUtils; import com.vk.core.d.RecoloredDrawable; +import com.vk.core.extensions.TextViewExt; import com.vk.core.ui.themes.VKTheme; import com.vk.core.ui.themes.VKThemeHelper; import com.vk.im.ui.themes.ImTheme; @@ -35,9 +38,7 @@ import com.vtosters.lite.R; import java.util.List; public class Themes { - public static List accentColors = asList( - "71AAEB", "3F8AE0", "528BCC", "4986CC", "5181B8", "74A2D6", "518BCC" - ); + public static List accentColors; public static void applyTheme(VKTheme theme, ImTheme imtheme) { VKThemeHelper.b.a(theme); // VKThemeHelper.b.a(VKTheme value) VK Theme apply @@ -187,7 +188,6 @@ public class Themes { } // Recolor ColorStateList to accent color public static ColorStateList themeCSL(ColorStateList csl) { - int color = csl.getDefaultColor(); 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); @@ -210,6 +210,16 @@ public class Themes { } } // Recolor ColorStateList + public static void recolorTextView(TextView paramTextView, int resid, int colorid) { + if (resid == 0) { + TextViewExt.a(paramTextView, (Drawable) null); + } else if (colorid == 0) { + TextViewExt.a(paramTextView, ContextCompat.a(paramTextView.getContext(), resid)); + } else { + TextViewExt.a(paramTextView, ContextCompat.a(paramTextView.getContext(), resid), themeCSL(paramTextView.getContext().getColorStateList(colorid))); + } + } // Recolor TextView + public static int darken(int color, float by) { float[] hsl = new float[3]; ColorUtils.colorToHSL(color, hsl); diff --git a/smali/res/layout/music_search_recent_item.xml b/smali/res/layout/music_search_recent_item.xml index b1d3a05f4..9108a5358 100644 --- a/smali/res/layout/music_search_recent_item.xml +++ b/smali/res/layout/music_search_recent_item.xml @@ -1,7 +1,7 @@ recolorTextView(Landroid/widget/TextView;II)V + + return-void + const-string v0, "textView" invoke-static {p0, v0}, Lkotlin/jvm/internal/Intrinsics;->b(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/smali/smali_classes5/com/vk/core/extensions/TextViewExt.smali b/smali/smali_classes5/com/vk/core/extensions/TextViewExt.smali index 0c3b3b5b3..dfdabcdb7 100644 --- a/smali/smali_classes5/com/vk/core/extensions/TextViewExt.smali +++ b/smali/smali_classes5/com/vk/core/extensions/TextViewExt.smali @@ -99,6 +99,10 @@ .method public static final a(Landroid/widget/TextView;II)V .locals 1 + invoke-static {p0, p1, p2}, Lru/vtosters/lite/utils/Themes;->recolorTextView(Landroid/widget/TextView;II)V + + return-void + const-string v0, "receiver$0" invoke-static {p0, v0}, Lkotlin/jvm/internal/Intrinsics;->b(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/smali/smali_classes5/com/vk/core/util/DrawableUtils.smali b/smali/smali_classes5/com/vk/core/util/DrawableUtils.smali index d5d03044f..2c87c7a04 100644 --- a/smali/smali_classes5/com/vk/core/util/DrawableUtils.smali +++ b/smali/smali_classes5/com/vk/core/util/DrawableUtils.smali @@ -108,6 +108,10 @@ .method public static a(Landroid/widget/TextView;II)V .locals 1 + invoke-static {p0, p1, p2}, Lru/vtosters/lite/utils/Themes;->recolorTextView(Landroid/widget/TextView;II)V + + return-void + if-nez p1, :cond_0 const/4 p1, 0x0