From 752c59e2a2efd0147c400f365161a356501ab43b Mon Sep 17 00:00:00 2001 From: Vologhat Date: Tue, 22 Nov 2022 11:45:52 +0300 Subject: [PATCH] removed old ui hooks for recoloring and added some new --- .../java/ru/vtosters/lite/themes/Recolor.java | 56 ++----------------- .../FloatingActionButtonRecolor.java | 29 ---------- .../lite/themes/modifiers/IModifier.java | 8 --- .../themes/modifiers/ImageViewRecolor.java | 29 ---------- .../themes/modifiers/ProgressBarRecolor.java | 33 ----------- .../themes/modifiers/SwitchCompatRecolor.java | 31 ---------- .../themes/modifiers/TabLayoutRecolor.java | 26 --------- .../themes/modifiers/TextViewRecolor.java | 43 -------------- .../themes/modifiers/TintTextViewRecolor.java | 26 --------- .../lite/themes/modifiers/ToolbarRecolor.java | 34 ----------- .../lite/themes/modifiers/ViewRecolor.java | 27 --------- ...CarouselViewHolder$CarouselAppHolder.smali | 2 + .../com/vk/apps/AppsFragment$k.smali | 2 + .../holders/ArticleAuthorPageSortHolder.smali | 6 +- .../stickers/post/BaseStoryPostSticker.smali | 2 + ...tityContextAdapter$AddIdentityHolder.smali | 2 + .../music/attach/a/MusicAdapterHelper$a.smali | 4 ++ .../attach/a/PlaylistsController$c.smali | 4 ++ .../a/PlaylistsSearchController$b.smali | 4 ++ .../com/vk/navigation/right/RightMenu.smali | 6 +- .../holders/ActivityEventHolder.smali | 2 + .../attachments/AudioPlaylistHolder.smali | 2 + .../holders/attachments/EventHolder.smali | 2 + .../holders/c1/InlineCommentHolder.smali | 2 + .../items/DetailsUserCategoryItem$a.smali | 2 + .../holders/SuperAppWidgetSportsHolder.smali | 2 + .../gifts/ProfileGiftsFragment$f.smali | 2 + .../ui/holder/gamepage/GameSectionTitle.smali | 4 ++ 28 files changed, 53 insertions(+), 339 deletions(-) delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/FloatingActionButtonRecolor.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/IModifier.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/ImageViewRecolor.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/ProgressBarRecolor.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/SwitchCompatRecolor.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/TabLayoutRecolor.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/TextViewRecolor.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/TintTextViewRecolor.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/ToolbarRecolor.java delete mode 100644 app/src/main/java/ru/vtosters/lite/themes/modifiers/ViewRecolor.java diff --git a/app/src/main/java/ru/vtosters/lite/themes/Recolor.java b/app/src/main/java/ru/vtosters/lite/themes/Recolor.java index 944939ca4..467483419 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/Recolor.java +++ b/app/src/main/java/ru/vtosters/lite/themes/Recolor.java @@ -1,67 +1,17 @@ package ru.vtosters.lite.themes; import android.content.res.ColorStateList; -import android.util.SparseArray; -import android.view.View; -import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; import androidx.appcompat.widget.Toolbar; -import java.util.ArrayList; -import java.util.List; +import com.vk.core.view.TintTextView; -import ru.vtosters.lite.themes.models.ViewModel; -import ru.vtosters.lite.themes.modifiers.FloatingActionButtonRecolor; -import ru.vtosters.lite.themes.modifiers.IModifier; -import ru.vtosters.lite.themes.modifiers.ImageViewRecolor; -import ru.vtosters.lite.themes.modifiers.ProgressBarRecolor; -import ru.vtosters.lite.themes.modifiers.SwitchCompatRecolor; -import ru.vtosters.lite.themes.modifiers.TabLayoutRecolor; -import ru.vtosters.lite.themes.modifiers.TextViewRecolor; -import ru.vtosters.lite.themes.modifiers.TintTextViewRecolor; -import ru.vtosters.lite.themes.modifiers.ToolbarRecolor; -import ru.vtosters.lite.themes.modifiers.ViewRecolor; import ru.vtosters.lite.utils.ThemesUtils; public class Recolor { - private static final List recolors = new ArrayList<>(); - - static { - recolors.add(new FloatingActionButtonRecolor()); - recolors.add(new ImageViewRecolor()); - recolors.add(new ProgressBarRecolor()); - recolors.add(new SwitchCompatRecolor()); - recolors.add(new TabLayoutRecolor()); - recolors.add(new TextViewRecolor()); - recolors.add(new TintTextViewRecolor()); - recolors.add(new ToolbarRecolor()); - recolors.add(new ViewRecolor()); - } - - public static void recolorViewOrViewGroup(View target, SparseArray satts) { - if (target instanceof ViewGroup) { - var viewGroup = (ViewGroup) target; - for (int i = 0; i < viewGroup.getChildCount(); i++) - recolorViewOrViewGroup(viewGroup.getChildAt(i), satts); - } - var viewModel = satts.get(target.getId(), null); - if (viewModel != null) - recolorView(target, viewModel); - } - - private static void recolorView(View target, ViewModel viewModel) { - for (var recolor : recolors) { - if (!recolor.isModifiable(target)) continue; - for (var attr : viewModel.attrs) { - int aname = attr.first, avalue = attr.second; - recolor.modify(target, aname, getColor(avalue)); - } - } - } - private static int getColor(int original) { var color = VTLColors.getColor(original); if (color != -1) return color; @@ -81,4 +31,8 @@ public class Recolor { public static void recolorTextToAccent(TextView iv) { iv.setTextColor(VTLColors.getAccentColor()); } + + public static void recolorTintTextViewToAccent(TintTextView ttv) { + ttv.setDrawableTint(VTLColors.getAccentColor()); + } } diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/FloatingActionButtonRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/FloatingActionButtonRecolor.java deleted file mode 100644 index f93583a28..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/FloatingActionButtonRecolor.java +++ /dev/null @@ -1,29 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.content.res.ColorStateList; -import android.view.View; - -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.vtosters.lite.R; - -public class FloatingActionButtonRecolor implements IModifier { - - public static final int tint = R.attr.tint; - public static final int androidTint = android.R.attr.tint; - - @Override - public boolean isModifiable(View target) { - return target instanceof FloatingActionButton; - } - - @Override - public void modify(View target, int attr, int color) { - var fab = (FloatingActionButton) target; - switch (attr) { - case tint: - case androidTint: - fab.setImageTintList(ColorStateList.valueOf(color)); - break; - } - } -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/IModifier.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/IModifier.java deleted file mode 100644 index faa7f44fb..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/IModifier.java +++ /dev/null @@ -1,8 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -public interface IModifier { - - boolean isModifiable(T target); - - void modify(T target, int attr, int color); -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/ImageViewRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/ImageViewRecolor.java deleted file mode 100644 index df141a340..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/ImageViewRecolor.java +++ /dev/null @@ -1,29 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.content.res.ColorStateList; -import android.util.Log; -import android.view.View; -import android.widget.ImageView; - -public class ImageViewRecolor implements IModifier { - - public static final int tint = com.vtosters.lite.R.attr.tint; - public static final int androidTint = android.R.attr.tint; - - @Override - public boolean isModifiable(View target) { - return target instanceof ImageView; - } - - @Override - public void modify(View target, int attr, int color) { - var iv = (ImageView) target; - switch (attr) { - case tint: - case androidTint: - Log.d("ImageViewRecolor", "setColor"); - iv.setImageTintList(ColorStateList.valueOf(color)); - break; - } - } -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/ProgressBarRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/ProgressBarRecolor.java deleted file mode 100644 index d0e912a0d..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/ProgressBarRecolor.java +++ /dev/null @@ -1,33 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.content.res.ColorStateList; -import android.view.View; -import android.widget.ProgressBar; - -public class ProgressBarRecolor implements IModifier { - - public static final int progressBackgroundTint = android.R.attr.progressBackgroundTint; - public static final int progressTint = android.R.attr.progressTint; - public static final int indeterminateTint = android.R.attr.indeterminateTint; - - @Override - public boolean isModifiable(View target) { - return target instanceof ProgressBar; - } - - @Override - public void modify(View target, int attr, int color) { - var pb = (ProgressBar) target; - switch (attr) { - case progressBackgroundTint: - pb.setProgressBackgroundTintList(ColorStateList.valueOf(color)); - break; - case progressTint: - pb.setProgressTintList(ColorStateList.valueOf(color)); - break; - case indeterminateTint: - pb.setIndeterminateTintList(ColorStateList.valueOf(color)); - break; - } - } -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/SwitchCompatRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/SwitchCompatRecolor.java deleted file mode 100644 index dd08170df..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/SwitchCompatRecolor.java +++ /dev/null @@ -1,31 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.content.res.ColorStateList; -import android.view.View; - -import androidx.appcompat.widget.SwitchCompat; -import com.vtosters.lite.R; - -public class SwitchCompatRecolor implements IModifier { - - public static final int thumbTint = R.attr.thumbTint; - public static final int trackTint = R.attr.trackTint; - - @Override - public boolean isModifiable(View target) { - return target instanceof SwitchCompat; - } - - @Override - public void modify(View target, int attr, int color) { - var sc = (SwitchCompat) target; - switch (attr) { - case thumbTint: - sc.setThumbTintList(ColorStateList.valueOf(color)); - break; - case trackTint: - sc.setTrackTintList(ColorStateList.valueOf(color)); - break; - } - } -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/TabLayoutRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/TabLayoutRecolor.java deleted file mode 100644 index 80a794e8b..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/TabLayoutRecolor.java +++ /dev/null @@ -1,26 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.view.View; - -import com.google.android.material.tabs.TabLayout; -import com.vtosters.lite.R; - -public class TabLayoutRecolor implements IModifier { - - public static final int tabIndicatorColor = R.attr.tabIndicatorColor; - - @Override - public boolean isModifiable(View target) { - return target instanceof TabLayout; - } - - @Override - public void modify(View target, int attr, int color) { - var tl = (TabLayout) target; - switch (attr) { - case tabIndicatorColor: - tl.setSelectedTabIndicatorColor(color); - break; - } - } -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/TextViewRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/TextViewRecolor.java deleted file mode 100644 index 3d6721786..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/TextViewRecolor.java +++ /dev/null @@ -1,43 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.graphics.Color; -import android.view.View; -import android.widget.TextView; - -import com.vk.core.drawable.RecoloredDrawable; - -public class TextViewRecolor implements IModifier { - - public static final int textColor = android.R.attr.textColor; - public static final int textColorLink = android.R.attr.textColorLink; - public static final int textColorHint = android.R.attr.textColorHint; - - @Override - public boolean isModifiable(View target) { - return target instanceof TextView; - } - - @Override - public void modify(View target, int attr, int color) { - var tv = (TextView) target; - switch (attr) { - case textColor: - tv.setTextColor(color); - break; - case textColorLink: - tv.setLinkTextColor(color); - break; - case textColorHint: - tv.setHintTextColor(color); - break; - } - var drawables = tv.getCompoundDrawablesRelative(); - - for (int i = 0; i < drawables.length; i++) { - var drawable = drawables[i]; - if (drawable != null) - drawables[i] = new RecoloredDrawable(drawable, Color.BLACK); - } - tv.invalidate(); - } -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/TintTextViewRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/TintTextViewRecolor.java deleted file mode 100644 index 744826f24..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/TintTextViewRecolor.java +++ /dev/null @@ -1,26 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.view.View; - -import com.vk.core.view.TintTextView; -import com.vtosters.lite.R; - -public class TintTextViewRecolor implements IModifier { - - public static final int drawableTint = R.attr.drawableTint; - - @Override - public boolean isModifiable(View target) { - return target instanceof TintTextView; - } - - @Override - public void modify(View target, int attr, int color) { - var ttv = (TintTextView) target; - switch (attr) { - case drawableTint: - ttv.setDrawableTint(color); - break; - } - } -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/ToolbarRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/ToolbarRecolor.java deleted file mode 100644 index a4372c855..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/ToolbarRecolor.java +++ /dev/null @@ -1,34 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.view.View; - -import androidx.appcompat.widget.Toolbar; -import com.vtosters.lite.R; - -public class ToolbarRecolor implements IModifier { - - public static final int subtitleTextColor = R.attr.subtitleTextColor; - public static final int titleTextColor = R.attr.titleTextColor; - public static final int textColorPrimary = android.R.attr.textColorPrimary; - public static final int background = android.R.attr.background; - - @Override - public boolean isModifiable(View target) { - return target instanceof Toolbar; - } - - @Override - public void modify(View target, int attr, int color) { - var t = (Toolbar) target; - switch (attr) { - case subtitleTextColor: - t.setSubtitleTextColor(color); - break; - case titleTextColor: - t.setTitleTextColor(color); - break; - case background: - t.setBackgroundColor(color); - } - } -} diff --git a/app/src/main/java/ru/vtosters/lite/themes/modifiers/ViewRecolor.java b/app/src/main/java/ru/vtosters/lite/themes/modifiers/ViewRecolor.java deleted file mode 100644 index 1d6ba9c04..000000000 --- a/app/src/main/java/ru/vtosters/lite/themes/modifiers/ViewRecolor.java +++ /dev/null @@ -1,27 +0,0 @@ -package ru.vtosters.lite.themes.modifiers; - -import android.content.res.ColorStateList; -import android.view.View; - -public class ViewRecolor implements IModifier { - - public static final int backgroundTint = android.R.attr.backgroundTint; - public static final int background = android.R.attr.background; - - @Override - public boolean isModifiable(View target) { - return true; - } - - @Override - public void modify(View target, int attr, int color) { - switch (attr) { - case backgroundTint: - target.setBackgroundTintList(ColorStateList.valueOf(color)); - break; - case background: - target.setBackgroundColor(color); - break; - } - } -} diff --git a/smali/smali_classes2/com/vk/apps/AppsFragment$CarouselViewHolder$CarouselAppHolder.smali b/smali/smali_classes2/com/vk/apps/AppsFragment$CarouselViewHolder$CarouselAppHolder.smali index 13e0b48b7..84e34cc80 100644 --- a/smali/smali_classes2/com/vk/apps/AppsFragment$CarouselViewHolder$CarouselAppHolder.smali +++ b/smali/smali_classes2/com/vk/apps/AppsFragment$CarouselViewHolder$CarouselAppHolder.smali @@ -67,6 +67,8 @@ check-cast p1, Lcom/vk/imageloader/view/VKImageView; + + iput-object p1, p0, Lcom/vk/apps/AppsFragment$CarouselViewHolder$CarouselAppHolder;->c:Lcom/vk/imageloader/view/VKImageView; .line 3 diff --git a/smali/smali_classes2/com/vk/apps/AppsFragment$k.smali b/smali/smali_classes2/com/vk/apps/AppsFragment$k.smali index d74ec1dc7..f6b05e201 100644 --- a/smali/smali_classes2/com/vk/apps/AppsFragment$k.smali +++ b/smali/smali_classes2/com/vk/apps/AppsFragment$k.smali @@ -74,6 +74,8 @@ check-cast p1, Landroid/widget/TextView; + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + iput-object p1, p0, Lcom/vk/apps/AppsFragment$k;->c:Landroid/widget/TextView; .line 4 diff --git a/smali/smali_classes2/com/vk/articles/authorpage/holders/ArticleAuthorPageSortHolder.smali b/smali/smali_classes2/com/vk/articles/authorpage/holders/ArticleAuthorPageSortHolder.smali index d46e074d5..0b3e03cdb 100644 --- a/smali/smali_classes2/com/vk/articles/authorpage/holders/ArticleAuthorPageSortHolder.smali +++ b/smali/smali_classes2/com/vk/articles/authorpage/holders/ArticleAuthorPageSortHolder.smali @@ -67,7 +67,11 @@ move-result-object p1 - check-cast p1, Landroid/widget/TextView; + check-cast p1, Lcom/vk/core/view/TintTextView; + + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTintTextViewToAccent(Lcom/vk/core/view/TintTextView;)V iput-object p1, p0, Lcom/vk/articles/authorpage/holders/ArticleAuthorPageSortHolder;->c:Landroid/widget/TextView; diff --git a/smali/smali_classes2/com/vk/attachpicker/stickers/post/BaseStoryPostSticker.smali b/smali/smali_classes2/com/vk/attachpicker/stickers/post/BaseStoryPostSticker.smali index b79c53d17..2ff997eb1 100644 --- a/smali/smali_classes2/com/vk/attachpicker/stickers/post/BaseStoryPostSticker.smali +++ b/smali/smali_classes2/com/vk/attachpicker/stickers/post/BaseStoryPostSticker.smali @@ -156,6 +156,8 @@ check-cast p1, Landroid/widget/TextView; + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + iput-object p1, p0, Lcom/vk/attachpicker/stickers/post/BaseStoryPostSticker;->g:Landroid/widget/TextView; .line 6 diff --git a/smali/smali_classes2/com/vk/identity/adapters/IdentityContextAdapter$AddIdentityHolder.smali b/smali/smali_classes2/com/vk/identity/adapters/IdentityContextAdapter$AddIdentityHolder.smali index e293949f8..c31e00394 100644 --- a/smali/smali_classes2/com/vk/identity/adapters/IdentityContextAdapter$AddIdentityHolder.smali +++ b/smali/smali_classes2/com/vk/identity/adapters/IdentityContextAdapter$AddIdentityHolder.smali @@ -58,6 +58,8 @@ check-cast p1, Landroid/widget/TextView; + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + iput-object p1, p0, Lcom/vk/identity/adapters/IdentityContextAdapter$AddIdentityHolder;->b:Landroid/widget/TextView; const p1, 0x7f080329 diff --git a/smali/smali_classes3/com/vk/music/attach/a/MusicAdapterHelper$a.smali b/smali/smali_classes3/com/vk/music/attach/a/MusicAdapterHelper$a.smali index bb1c299a9..24524654d 100644 --- a/smali/smali_classes3/com/vk/music/attach/a/MusicAdapterHelper$a.smali +++ b/smali/smali_classes3/com/vk/music/attach/a/MusicAdapterHelper$a.smali @@ -70,6 +70,10 @@ move-result-object v0 + check-cast v0, Landroid/widget/TextView; + + invoke-static {v0}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + new-instance v1, Lcom/vk/music/attach/a/MusicAdapterHelper$a$a; invoke-direct {v1, p0}, Lcom/vk/music/attach/a/MusicAdapterHelper$a$a;->(Lcom/vk/music/attach/a/MusicAdapterHelper$a;)V diff --git a/smali/smali_classes3/com/vk/music/attach/a/PlaylistsController$c.smali b/smali/smali_classes3/com/vk/music/attach/a/PlaylistsController$c.smali index d50946168..af1ed9ddf 100644 --- a/smali/smali_classes3/com/vk/music/attach/a/PlaylistsController$c.smali +++ b/smali/smali_classes3/com/vk/music/attach/a/PlaylistsController$c.smali @@ -70,6 +70,10 @@ move-result-object v0 + check-cast v0, Landroid/widget/TextView; + + invoke-static {v0}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + new-instance v1, Lcom/vk/music/attach/a/PlaylistsController$c$a; invoke-direct {v1, p0}, Lcom/vk/music/attach/a/PlaylistsController$c$a;->(Lcom/vk/music/attach/a/PlaylistsController$c;)V diff --git a/smali/smali_classes3/com/vk/music/attach/a/PlaylistsSearchController$b.smali b/smali/smali_classes3/com/vk/music/attach/a/PlaylistsSearchController$b.smali index 2fcc15f66..c47b8d74b 100644 --- a/smali/smali_classes3/com/vk/music/attach/a/PlaylistsSearchController$b.smali +++ b/smali/smali_classes3/com/vk/music/attach/a/PlaylistsSearchController$b.smali @@ -70,6 +70,10 @@ move-result-object v0 + check-cast v0, Landroid/widget/TextView; + + invoke-static {v0}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + new-instance v1, Lcom/vk/music/attach/a/PlaylistsSearchController$b$a; invoke-direct {v1, p0}, Lcom/vk/music/attach/a/PlaylistsSearchController$b$a;->(Lcom/vk/music/attach/a/PlaylistsSearchController$b;)V diff --git a/smali/smali_classes3/com/vk/navigation/right/RightMenu.smali b/smali/smali_classes3/com/vk/navigation/right/RightMenu.smali index 5367f3ee0..3d2ebfd49 100644 --- a/smali/smali_classes3/com/vk/navigation/right/RightMenu.smali +++ b/smali/smali_classes3/com/vk/navigation/right/RightMenu.smali @@ -154,7 +154,9 @@ move-result-object v2 - check-cast v2, Landroid/widget/TextView; + check-cast v2, Lcom/vk/core/view/TintTextView; + + invoke-static {v2}, Lru/vtosters/lite/themes/Recolor;->recolorTintTextViewToAccent(Lcom/vk/core/view/TintTextView;)V .line 6 new-instance v3, Lcom/vk/navigation/right/RightMenu$initView$1; @@ -172,6 +174,8 @@ check-cast v2, Landroid/widget/ImageView; + invoke-static {v2}, Lru/vtosters/lite/themes/Recolor;->recolorIconToAccent(Landroid/widget/ImageView;)V + .line 8 new-instance v3, Lcom/vk/navigation/right/RightMenu$initView$2; diff --git a/smali/smali_classes3/com/vk/newsfeed/holders/ActivityEventHolder.smali b/smali/smali_classes3/com/vk/newsfeed/holders/ActivityEventHolder.smali index 4d5dcc2cd..fed5a008b 100644 --- a/smali/smali_classes3/com/vk/newsfeed/holders/ActivityEventHolder.smali +++ b/smali/smali_classes3/com/vk/newsfeed/holders/ActivityEventHolder.smali @@ -89,6 +89,8 @@ check-cast p1, Landroid/widget/TextView; + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + iput-object p1, p0, Lcom/vk/newsfeed/holders/ActivityEventHolder;->H:Landroid/widget/TextView; .line 5 diff --git a/smali/smali_classes3/com/vk/newsfeed/holders/attachments/AudioPlaylistHolder.smali b/smali/smali_classes3/com/vk/newsfeed/holders/attachments/AudioPlaylistHolder.smali index 67b91471a..2dd9bed57 100644 --- a/smali/smali_classes3/com/vk/newsfeed/holders/attachments/AudioPlaylistHolder.smali +++ b/smali/smali_classes3/com/vk/newsfeed/holders/attachments/AudioPlaylistHolder.smali @@ -323,6 +323,8 @@ check-cast p3, Landroid/widget/TextView; + invoke-static/range {p3 .. p3}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + .line 27 invoke-virtual {p3}, Landroid/widget/TextView;->getContext()Landroid/content/Context; diff --git a/smali/smali_classes3/com/vk/newsfeed/holders/attachments/EventHolder.smali b/smali/smali_classes3/com/vk/newsfeed/holders/attachments/EventHolder.smali index ce0ca8d31..545ab1fa2 100644 --- a/smali/smali_classes3/com/vk/newsfeed/holders/attachments/EventHolder.smali +++ b/smali/smali_classes3/com/vk/newsfeed/holders/attachments/EventHolder.smali @@ -84,6 +84,8 @@ check-cast p1, Landroid/widget/TextView; + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + iput-object p1, p0, Lcom/vk/newsfeed/holders/attachments/EventHolder;->I:Landroid/widget/TextView; .line 4 diff --git a/smali/smali_classes3/com/vk/newsfeed/holders/c1/InlineCommentHolder.smali b/smali/smali_classes3/com/vk/newsfeed/holders/c1/InlineCommentHolder.smali index 6301d70e8..2d8104ba4 100644 --- a/smali/smali_classes3/com/vk/newsfeed/holders/c1/InlineCommentHolder.smali +++ b/smali/smali_classes3/com/vk/newsfeed/holders/c1/InlineCommentHolder.smali @@ -170,6 +170,8 @@ check-cast p1, Landroid/widget/TextView; + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + iput-object p1, p0, Lcom/vk/newsfeed/holders/c1/InlineCommentHolder;->K:Landroid/widget/TextView; .line 8 diff --git a/smali/smali_classes4/com/vk/profile/adapter/items/DetailsUserCategoryItem$a.smali b/smali/smali_classes4/com/vk/profile/adapter/items/DetailsUserCategoryItem$a.smali index 415953ed0..50585620a 100644 --- a/smali/smali_classes4/com/vk/profile/adapter/items/DetailsUserCategoryItem$a.smali +++ b/smali/smali_classes4/com/vk/profile/adapter/items/DetailsUserCategoryItem$a.smali @@ -86,6 +86,8 @@ check-cast p1, Lcom/vk/imageloader/view/VKImageView; + invoke-static {p1}, Lru/vtosters/lite/themes/Recolor;->recolorIconToAccent(Landroid/widget/ImageView;)V + iput-object p1, p0, Lcom/vk/profile/adapter/items/DetailsUserCategoryItem$a;->e:Lcom/vk/imageloader/view/VKImageView; .line 5 diff --git a/smali/smali_classes4/com/vk/superapp/holders/SuperAppWidgetSportsHolder.smali b/smali/smali_classes4/com/vk/superapp/holders/SuperAppWidgetSportsHolder.smali index 143544c46..695e3b4a7 100644 --- a/smali/smali_classes4/com/vk/superapp/holders/SuperAppWidgetSportsHolder.smali +++ b/smali/smali_classes4/com/vk/superapp/holders/SuperAppWidgetSportsHolder.smali @@ -404,6 +404,8 @@ check-cast v0, Landroid/widget/TextView; + invoke-static {v0}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + .line 39 new-instance v1, Lcom/vk/superapp/holders/SuperAppWidgetSportsHolder$e; diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/gifts/ProfileGiftsFragment$f.smali b/smali/smali_classes4/com/vtosters/lite/fragments/gifts/ProfileGiftsFragment$f.smali index 933509629..ecda84adc 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/gifts/ProfileGiftsFragment$f.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/gifts/ProfileGiftsFragment$f.smali @@ -100,6 +100,8 @@ check-cast p1, Landroid/widget/TextView; + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + iput-object p1, p0, Lcom/vtosters/lite/fragments/gifts/ProfileGiftsFragment$f;->e:Landroid/widget/TextView; const p1, 0x7f0a0e55 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/holder/gamepage/GameSectionTitle.smali b/smali/smali_classes5/com/vtosters/lite/ui/holder/gamepage/GameSectionTitle.smali index 866784645..58a933ee6 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/holder/gamepage/GameSectionTitle.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/holder/gamepage/GameSectionTitle.smali @@ -71,6 +71,10 @@ iput-object p1, p0, Lcom/vtosters/lite/ui/holder/gamepage/GameSectionTitle;->d:Landroid/view/View; + check-cast p1, Landroid/widget/TextView; + + invoke-static/range {p1 .. p1}, Lru/vtosters/lite/themes/Recolor;->recolorTextToAccent(Landroid/widget/TextView;)V + return-void .end method