diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java index 55d3f50bd..0529d63a8 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java +++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java @@ -84,9 +84,7 @@ public class TextViewHook implements BaseHook { } public static boolean isVkUiButton(View view) { - return !ThemesUtils.isDarkTheme() && ( - view.getId() == R.id.empty_button - ); + return !ThemesUtils.isDarkTheme() && (view.getId() == R.id.empty_button || view.getId() == R.id.button); } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java index e714b76cd..09b008417 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java @@ -21,6 +21,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.vtosters.lite.R; +import ru.vtosters.lite.themes.hooks.TextViewHook; import ru.vtosters.lite.ui.adapters.CategorizedAdapter; import ru.vtosters.lite.ui.components.DockBarEditorManager; import ru.vtosters.lite.ui.components.ItemMovingCallback; @@ -54,6 +55,8 @@ public class DockBarEditorFragment extends BaseToolbarFragment { restartApplication(); }); + new TextViewHook().inject(save, 0, false); + LinearLayout.LayoutParams saveParams = new LinearLayout.LayoutParams(0, -2); saveParams.weight = 1.0f; buttonsContainer.addView(save, saveParams); @@ -68,6 +71,8 @@ public class DockBarEditorFragment extends BaseToolbarFragment { restartApplication(); }); + new TextViewHook().inject(reset, 0, false); + LinearLayout.LayoutParams resetParams = new LinearLayout.LayoutParams(0, -2); resetParams.weight = 1.0f; buttonsContainer.addView(reset, resetParams); diff --git a/smali/smali_classes2/com/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh.smali b/smali/smali_classes2/com/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh.smali index 0c2719242..bfc7fc430 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh.smali @@ -298,6 +298,16 @@ invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + + move-result p2 + + invoke-static {p2}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList; + + move-result-object p2 + + invoke-virtual {p1, p2}, Landroid/widget/TextView;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V + .line 40 iget-object p1, p0, Lcom/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh;->F:Landroid/widget/TextView; diff --git a/smali/smali_classes4/com/vk/notifications/NotificationView.smali b/smali/smali_classes4/com/vk/notifications/NotificationView.smali index cfceafd3a..5cc89e8c8 100644 --- a/smali/smali_classes4/com/vk/notifications/NotificationView.smali +++ b/smali/smali_classes4/com/vk/notifications/NotificationView.smali @@ -1970,6 +1970,16 @@ .line 36 invoke-virtual {p1, p2}, Landroid/widget/TextView;->setBackgroundResource(I)V + invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + + move-result p2 + + invoke-static {p2}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList; + + move-result-object p2 + + invoke-virtual {p1, p2}, Landroid/widget/TextView;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V + goto :goto_2 :cond_2 diff --git a/smali/smali_classes4/com/vk/polls/ui/views/AbstractPollView$e.smali b/smali/smali_classes4/com/vk/polls/ui/views/AbstractPollView$e.smali index 3f669ca43..e1caf7cf7 100644 --- a/smali/smali_classes4/com/vk/polls/ui/views/AbstractPollView$e.smali +++ b/smali/smali_classes4/com/vk/polls/ui/views/AbstractPollView$e.smali @@ -160,6 +160,10 @@ .method private final a(IF)Landroid/graphics/drawable/Drawable; .locals 1 + invoke-static {p1}, Lru/vtosters/lite/themes/utils/RecolorUtils;->recolorHexColor(I)I + + move-result p1 + .line 11 new-instance v0, Landroid/graphics/drawable/GradientDrawable;