y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Amoled Theme Styles for VKIM + fixed vk refl

Browse Source
This commit is contained in:
gdlbo
2022-04-22 17:39:37 +03:00
parent f1b7a52f0c
commit 80e5145742
5 changed files with 314 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/utils/Themes.java
+4
View File
@@ -33,6 +33,10 @@ public class Themes {
return Helper.GetContext().getResources().getIdentifier("BaseAmoledStyle", "style", Helper.GetContext().getPackageName());
}
public static int getAmoledImTheme() {
return Helper.GetContext().getResources().getIdentifier("VkIm.Theme.VkApp.Amoled", "style", Helper.GetContext().getPackageName());
}
public static VKTheme getCurrentDarkTheme() {
return amoled() ? VKTheme.AMOLED : VKTheme.DARK;
}
smali/res/values/styles.xml
+274
View File
@@ -1158,6 +1158,280 @@
<item name="appkitRetryButtonText">@string/retry</item>
</style>
<style name="VkIm.Theme.VkApp.Amoled" parent="@style/VkIm.Theme.VkApp">
<item name="accent">@color/sky_300</item>
<item name="action_sheet_action_foreground">@color/white</item>
<item name="action_sheet_separator">@color/white_alpha12</item>
<item name="activity_indicator_tint">@color/gray_600</item>
<item name="attach_picker_tab_active_background">@color/gray_100</item>
<item name="attach_picker_tab_active_icon">@color/black</item>
<item name="attach_picker_tab_active_text">@color/gray_100</item>
<item name="attach_picker_tab_inactive_background">@color/black</item>
<item name="attach_picker_tab_inactive_icon">@color/gray_100</item>
<item name="attach_picker_tab_inactive_text">@color/gray_500</item>
<item name="background_content">@color/black</item>
<item name="background_highlighted">@color/white_alpha12</item>
<item name="background_keyboard">@color/black</item>
<item name="background_light">@color/black</item>
<item name="background_page">@color/black</item>
<item name="background_suggestions">@color/black</item>
<item name="button_bot_shadow">@color/black</item>
<item name="button_bot_shadow_disabled">#6619191a</item>
<item name="button_commerce_background">@color/green</item>
<item name="button_commerce_background_disabled">#664bb34b</item>
<item name="button_commerce_foreground">@color/white</item>
<item name="button_commerce_foreground_disabled">#66ffffff</item>
<item name="button_muted_background">@color/black</item>
<item name="button_muted_background_disabled">#662c2d2e</item>
<item name="button_muted_foreground">@color/gray_100</item>
<item name="button_muted_foreground_disabled">#66e1e3e6</item>
<item name="button_outline_border">@color/gray_100</item>
<item name="button_outline_border_disabled">#66e1e3e6</item>
<item name="button_outline_foreground">@color/gray_100</item>
<item name="button_outline_foreground_disabled">#66e1e3e6</item>
<item name="button_primary_background">@color/gray_100</item>
<item name="button_primary_background_disabled">#66e1e3e6</item>
<item name="button_primary_foreground">@color/black</item>
<item name="button_primary_foreground_disabled">#6619191a</item>
<item name="button_secondary_background">@color/gray_700</item>
<item name="button_secondary_background_disabled">#66454647</item>
<item name="button_secondary_foreground">@color/gray_100</item>
<item name="button_secondary_foreground_disabled">#66e1e3e6</item>
<item name="button_tertiary_background">@color/clear</item>
<item name="button_tertiary_background_disabled">#66000000</item>
<item name="button_tertiary_foreground">@color/gray_100</item>
<item name="button_tertiary_foreground_disabled">#66e1e3e6</item>
<item name="cell_button_foreground">@color/gray_100</item>
<item name="cell_button_foreground_disabled">#66e1e3e6</item>
<item name="content_placeholder_icon">@color/gray_300</item>
<item name="content_placeholder_text">@color/gray_300</item>
<item name="content_tint_background">@color/black</item>
<item name="content_tint_foreground">@color/gray_400</item>
<item name="control_background">@color/gray_700</item>
<item name="control_foreground">@color/gray_100</item>
<item name="control_tint">@color/black</item>
<item name="control_tint_muted">@color/gray_400</item>
<item name="counter_primary_background">@color/sky_300</item>
<item name="counter_primary_text">@color/white</item>
<item name="counter_secondary_background">@color/gray_500</item>
<item name="counter_secondary_text">@color/black</item>
<item name="destructive">@color/red_light</item>
<item name="feed_recommended_friend_promo_background">@color/steel_gray_500</item>
<item name="field_background">@color/black</item>
<item name="field_border">@color/white_alpha12</item>
<item name="field_error_background">@color/red_dark</item>
<item name="field_error_border">@color/red_light</item>
<item name="field_text_placeholder">@color/gray_500</item>
<item name="field_valid_border">@color/green</item>
<item name="float_button_background">@color/gray_700</item>
<item name="float_button_background_disabled">#66454647</item>
<item name="float_button_background_highlighted">@color/black</item>
<item name="float_button_background_highlighted_disabled">#660a0a0a</item>
<item name="float_button_border">@color/black_alpha12</item>
<item name="float_button_border_disabled">#0c000000</item>
<item name="float_button_foreground">@color/gray_300</item>
<item name="float_button_foreground_disabled">#66aaaeb3</item>
<item name="header_alternate_background">@color/black</item>
<item name="header_alternate_tab_active_indicator">@color/gray_100</item>
<item name="header_alternate_tab_active_text">@color/gray_100</item>
<item name="header_alternate_tab_inactive_text">@color/gray_500</item>
<item name="header_background">@color/black</item>
<item name="header_background_before_blur">@color/black</item>
<item name="header_background_before_blur_alternate">@color/black</item>
<item name="header_search_field_background">@color/gray_700</item>
<item name="header_search_field_tint">@color/gray_100</item>
<item name="header_tab_active_background">@color/gray_600</item>
<item name="header_tab_active_indicator">@color/gray_100</item>
<item name="header_tab_active_text">@color/gray_100</item>
<item name="header_tab_inactive_text">@color/gray_500</item>
<item name="header_text">@color/gray_100</item>
<item name="header_text_alternate">@color/gray_100</item>
<item name="header_text_secondary">@color/white_alpha60</item>
<item name="header_tint">@color/gray_100</item>
<item name="header_tint_alternate">@color/gray_100</item>
<item name="icon_alpha_placeholder">@color/gray_100</item>
<item name="icon_medium">@color/gray_400</item>
<item name="icon_name">@color/gray_300</item>
<item name="icon_outline_medium">@color/gray_300</item>
<item name="icon_outline_secondary">@color/gray_400</item>
<item name="icon_secondary">@color/gray_500</item>
<item name="icon_tertiary">@color/gray_700</item>
<item name="im_accent">@color/im_old_accent_muted</item>
<item name="im_accent_dark">@color/im_old_accent_muted</item>
<item name="im_alert">@color/red</item>
<item name="im_app_background_chat">?background_content</item>
<item name="im_app_background_navbar">@color/black</item>
<item name="im_app_background_navbar_light">false</item>
<item name="im_app_background_secondary">#ffebedf0</item>
<item name="im_app_background_statusbar">@color/muted_blue</item>
<item name="im_app_background_statusbar_light">false</item>
<item name="im_app_background_tabbar">#fffafafa</item>
<item name="im_app_icon">@color/im_old_accent</item>
<item name="im_app_icon_destructive">@color/red</item>
<item name="im_app_icon_inv">@color/white</item>
<item name="im_app_icon_secondary">@color/im_old_blue_gray_light</item>
<item name="im_app_icon_toolbar">@color/white</item>
<item name="im_app_swipe_background_end">#ff4cb8ff</item>
<item name="im_app_swipe_background_start">#ff3f7fe0</item>
<item name="im_app_toolbar_foreground">@color/white</item>
<item name="im_app_toolbar_foreground_end">@color/white</item>
<item name="im_app_toolbar_foreground_semitransparent">#80ffffff</item>
<item name="im_app_toolbar_foreground_start">@color/white</item>
<item name="im_app_toolbar_tabs_indicator">@color/white</item>
<item name="im_attach_tint">@color/sky_300</item>
<item name="im_btn_accept_background">@color/black</item>
<item name="im_btn_accept_background_dark">@color/black</item>
<item name="im_btn_accept_foreground">@color/white</item>
<item name="im_btn_confirm">@drawable/vkim_btn_confirm_default</item>
<item name="im_btn_confirm_background">@color/blue_300</item>
<item name="im_btn_confirm_background_dark">?accent</item>
<item name="im_btn_confirm_background_disabled">@color/blue_200_muted</item>
<item name="im_btn_reject_background">@color/black</item>
<item name="im_btn_reject_background_dark">@color/black</item>
<item name="im_btn_reject_foreground">@color/white</item>
<item name="im_bubble_border_alternate">@color/clear</item>
<item name="im_bubble_border_alternate_highlighted">@color/clear</item>
<item name="im_bubble_button_background">@color/gray_750</item>
<item name="im_bubble_button_background_disabled">#66313233</item>
<item name="im_bubble_button_foreground">@color/gray_100</item>
<item name="im_bubble_button_foreground_disabled">#66e1e3e6</item>
<item name="im_bubble_gift_background">@color/gold_300</item>
<item name="im_bubble_gift_text">@color/gold_100</item>
<item name="im_bubble_gift_text_secondary">@color/gold_150</item>
<item name="im_bubble_incoming">@color/black</item>
<item name="im_bubble_incoming_alternate">@color/black</item>
<item name="im_bubble_incoming_alternate_highlighted">@color/gray_600</item>
<item name="im_bubble_incoming_highlighted">@color/gray_600</item>
<item name="im_bubble_outgoing">@color/gray_700</item>
<item name="im_bubble_outgoing_alternate">@color/gray_700</item>
<item name="im_bubble_outgoing_alternate_highlighted">@color/gray_500</item>
<item name="im_bubble_outgoing_highlighted">@color/gray_600</item>
<item name="im_conversation_error_icon">@color/red_error</item>
<item name="im_conversation_sending_icon">@color/im_old_accent</item>
<item name="im_conversation_unread_counter_background">@color/im_old_accent</item>
<item name="im_conversation_unread_counter_foreground">@color/white</item>
<item name="im_conversation_unread_counter_muted_background">#ffa9b0b8</item>
<item name="im_conversation_verified_icon">#ff67a5eb</item>
<item name="im_forward_line_tint">@color/white</item>
<item name="im_history_common_badge_background">#66000000</item>
<item name="im_history_common_badge_foreground">@color/white</item>
<item name="im_history_divider_background">@color/white</item>
<item name="im_history_divider_foreground">@color/im_old_blue_gray_medium</item>
<item name="im_history_divider_separator">#1e000000</item>
<item name="im_history_image_bubbleless_border">#1e000000</item>
<item name="im_history_incoming_attachment_icon">@color/im_old_accent_muted</item>
<item name="im_history_incoming_background">#ffebeced</item>
<item name="im_history_incoming_background_selected">#ffc2c7cc</item>
<item name="im_history_incoming_button">@color/im_old_accent</item>
<item name="im_history_incoming_foreground">@color/black</item>
<item name="im_history_incoming_foreground_caption">@color/im_old_gray_medium</item>
<item name="im_history_incoming_foreground_caption_inv">@color/white</item>
<item name="im_history_incoming_foreground_link">@color/im_old_accent_muted</item>
<item name="im_history_incoming_foreground_name">@color/im_old_accent_muted</item>
<item name="im_history_incoming_image_placeholder_background">#14000c1a</item>
<item name="im_history_incoming_snippet_placeholder_background">@color/im_old_accent_muted_14</item>
<item name="im_history_incoming_snippet_placeholder_icon">@color/im_old_accent_muted</item>
<item name="im_history_info_bar_background">#fffafbfc</item>
<item name="im_history_info_bar_border">#26000000</item>
<item name="im_history_live_badge_background">#ffff3347</item>
<item name="im_history_outgoing_attachment_icon">@color/im_old_accent_muted</item>
<item name="im_history_outgoing_background">#ffc2ddfc</item>
<item name="im_history_outgoing_background_selected">#ffa3bedc</item>
<item name="im_history_outgoing_button">@color/im_old_accent_muted</item>
<item name="im_history_outgoing_foreground">@color/black</item>
<item name="im_history_outgoing_foreground_caption">@color/im_old_gray_medium</item>
<item name="im_history_outgoing_foreground_link">@color/im_old_accent</item>
<item name="im_history_outgoing_foreground_name">@color/im_old_accent_muted</item>
<item name="im_history_outgoing_image_placeholder_background">#14000c1a</item>
<item name="im_history_outgoing_snippet_placeholder_background">@color/im_old_accent_muted_14</item>
<item name="im_history_outgoing_snippet_placeholder_icon">@color/im_old_accent_muted</item>
<item name="im_history_sending_icon">@color/im_old_accent</item>
<item name="im_history_sticker_badge_background">#e6ffffff</item>
<item name="im_history_sticker_badge_foreground">@color/im_old_gray_medium</item>
<item name="im_history_unread_icon">@color/im_old_accent</item>
<item name="im_is_vk_me">false</item>
<item name="im_item_foreground_caption">@color/im_old_gray_medium</item>
<item name="im_item_foreground_name">@color/im_old_accent_muted</item>
<item name="im_item_foreground_subhead">@color/im_old_gray_dark</item>
<item name="im_item_foreground_tertiary">@color/im_old_gray_light</item>
<item name="im_menu_foreground">@color/black</item>
<item name="im_reply_sender_text">@color/white</item>
<item name="im_reply_separator">@color/white</item>
<item name="im_service_message_text">@color/steel_gray_400</item>
<item name="im_tabbar_icon_active">@color/im_old_accent</item>
<item name="im_tabbar_icon_inactive">@color/im_old_blue_gray_light</item>
<item name="im_toolbar_separator">@color/gray_300</item>
<item name="im_toolbar_voice_msg_background">@color/gray_700</item>
<item name="image_border">@color/white_alpha8</item>
<item name="input_background">@color/gray_700</item>
<item name="input_border">@color/gray_700</item>
<item name="landing_background">?accent</item>
<item name="landing_primary_button_background">@color/white</item>
<item name="landing_primary_button_background_disabled">#66ffffff</item>
<item name="landing_primary_button_foreground">?accent</item>
<item name="landing_primary_button_foreground_disabled">#665181b8</item>
<item name="landing_snippet_border">@color/clear</item>
<item name="landing_text_secondary">@color/white_alpha60</item>
<item name="landing_text_title">@color/white</item>
<item name="like_text_tint">@color/red_light</item>
<item name="link_alternate">@color/sky_300</item>
<item name="loader_background">@color/black</item>
<item name="loader_tint">@color/gray_500</item>
<item name="loader_track_fill">@color/gray_700</item>
<item name="loader_track_value_fill">@color/sky_300</item>
<item name="media_overlay_button_background">@color/white</item>
<item name="media_overlay_button_background_disabled">#66ffffff</item>
<item name="media_overlay_button_foreground">@color/black</item>
<item name="media_overlay_button_foreground_disabled">#662c2d2e</item>
<item name="modal_card_background">@color/black</item>
<item name="modal_card_border">@color/white_alpha12</item>
<item name="modal_card_header_close">@color/white</item>
<item name="music_playback_icon">@color/white</item>
<item name="overlay_status_background">@color/black</item>
<item name="overlay_status_foreground">@color/gray_100</item>
<item name="overlay_status_icon">@color/gray_50</item>
<item name="panel_tab_active_background">@color/gray_700</item>
<item name="panel_tab_active_text">@color/gray_100</item>
<item name="panel_tab_inactive_text">@color/gray_500</item>
<item name="placeholder_icon_background">@color/white_alpha8</item>
<item name="placeholder_icon_foreground_primary">@color/gray_400</item>
<item name="placeholder_icon_foreground_secondary">@color/gray_600</item>
<item name="placeholder_icon_tint">@color/white</item>
<item name="poll_option_background">@color/white</item>
<item name="search_bar_background">@color/black</item>
<item name="search_bar_field_background">@color/gray_700</item>
<item name="search_bar_field_tint">@color/gray_300</item>
<item name="search_bar_segmented_control_tint">@color/gray_400</item>
<item name="segmented_control_bar_background">@color/black</item>
<item name="segmented_control_tint">@color/gray_500</item>
<item name="selection_off_icon">@color/gray_700</item>
<item name="separator_alpha">@color/white_alpha15</item>
<item name="separator_alternate">@color/black</item>
<item name="separator_common">@color/gray_750</item>
<item name="snippet_background">@color/black</item>
<item name="snippet_border">@color/white_alpha12</item>
<item name="snippet_icon_tertiary">@color/gray_600</item>
<item name="splashscreen_icon">@color/black</item>
<item name="statusbar_alternate_legacy_background">@color/clear</item>
<item name="stories_skeleton_loader_background">@color/gray_700</item>
<item name="switch_ios_off_border">@color/black</item>
<item name="tabbar_active_icon">@color/white</item>
<item name="tabbar_background">@color/black</item>
<item name="tabbar_inactive_icon">@color/gray_500</item>
<item name="text_action_counter">@color/gray_300</item>
<item name="text_link">@color/sky_300</item>
<item name="text_link_hightlighted_background">@color/sky_300</item>
<item name="text_muted">@color/gray_200</item>
<item name="text_name">@color/gray_100</item>
<item name="text_placeholder">@color/gray_300</item>
<item name="text_primary">@color/gray_100</item>
<item name="text_secondary">@color/gray_500</item>
<item name="text_subhead">@color/gray_400</item>
<item name="text_tertiary">@color/gray_600</item>
<item name="toolbar_attach_background_from">@color/gray_500</item>
<item name="toolbar_attach_background_to">@color/gray_600</item>
<item name="writebar_icon">@color/gray_400</item>
</style>
<style name="BaseAmoledStyle" parent="@style/BaseAmoledTheme">
<item name="android:textColorSecondary">@color/prefs_subtitle</item>
<item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
smali/smali/com/vk/navigation/NavigationDelegateBottom$c.smali
+2 -2
View File
@@ -109,7 +109,7 @@
move-result-object p4
const-string v0, "scrollerField"
const-string v0, "m"
.line 777
invoke-static {p4, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
@@ -123,7 +123,7 @@
move-result-object p1
const-string v0, "interpolator"
const-string v0, "f"
.line 779
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
smali/smali_classes2/com/vtosters/lite/fragments/SettingsListFragment$b$1.smali
+9
View File
@@ -89,6 +89,15 @@
sget-object v1, Lcom/vk/im/ui/themes/ImTheme;->VKME_DARK:Lcom/vk/im/ui/themes/ImTheme;
:cond_2
invoke-static {}, Lru/vtosters/lite/utils/Themes;->amoled()Z
move-result v3
if-eqz v3, :cond_3
sget-object v1, Lcom/vk/im/ui/themes/ImTheme;->VKAPP_AMOLED:Lcom/vk/im/ui/themes/ImTheme;
:cond_3
invoke-virtual {v0, v1}, Lcom/vk/im/ui/themes/ImThemeHelper;->a(Lcom/vk/im/ui/themes/ImTheme;)V
.line 190
smali/smali_classes4/com/vk/im/ui/themes/ImTheme.smali
+25 -1
View File
@@ -24,6 +24,8 @@
.field public static final enum VKME_LIGHT:Lcom/vk/im/ui/themes/ImTheme;
.field public static final enum VKAPP_AMOLED:Lcom/vk/im/ui/themes/ImTheme;
# instance fields
.field private final id:I
@@ -35,7 +37,7 @@
.method static constructor <clinit>()V
.locals 7
const/4 v0, 0x4
const/4 v0, 0x5
new-array v0, v0, [Lcom/vk/im/ui/themes/ImTheme;
@@ -99,6 +101,28 @@
aput-object v1, v0, v4
new-instance v1, Lcom/vk/im/ui/themes/ImTheme;
const-string v2, "VKAPP_AMOLED"
.line 58
invoke-static {}, Lru/vtosters/lite/utils/Themes;->getAmoledImTheme()I
move-result v3
const/4 v4, 0x4
const/4 v5, 0x4
invoke-direct {v1, v2, v5, v4, v3}, Lcom/vk/im/ui/themes/ImTheme;-><init>(Ljava/lang/String;III)V
sput-object v1, Lcom/vk/im/ui/themes/ImTheme;->VKAPP_AMOLED:Lcom/vk/im/ui/themes/ImTheme;
aput-object v1, v0, v5
sput-object v0, Lcom/vk/im/ui/themes/ImTheme;->$VALUES:[Lcom/vk/im/ui/themes/ImTheme;
return-void