From 5c1452ff579828956a7d0e55c5b1cd2f211bdde2 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:24:13 +0300 Subject: [PATCH] Fixed msg strange bug + fixes --- smali/res/drawable/action_button_overflow.xml | 6 ++-- smali/res/values-v21/styles.xml | 10 +++--- smali/res/values-v22/styles.xml | 6 ++-- smali/res/values/styles.xml | 12 +++---- .../api_parsers/AttachApiParser.smali | 19 ----------- .../com/vk/dto/newsfeed/entries/Post$b.smali | 33 ------------------- 6 files changed, 17 insertions(+), 69 deletions(-) diff --git a/smali/res/drawable/action_button_overflow.xml b/smali/res/drawable/action_button_overflow.xml index 41843f4d7..a9791b446 100644 --- a/smali/res/drawable/action_button_overflow.xml +++ b/smali/res/drawable/action_button_overflow.xml @@ -9,7 +9,7 @@ - + - + - + \ No newline at end of file diff --git a/smali/res/values-v21/styles.xml b/smali/res/values-v21/styles.xml index 823c2b0bb..bc61c55cc 100644 --- a/smali/res/values-v21/styles.xml +++ b/smali/res/values-v21/styles.xml @@ -28,7 +28,7 @@ @color/toolbar_blue_background enterAlways|scroll|snap @style/ToolbarTitle - @color/toolbar_blue_textColorSecondary + ?header_text @@ -343,7 +343,7 @@ @drawable/bg_toolbar_shadow_dark @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true @@ -405,7 +405,7 @@ @drawable/bg_toolbar_shadow_dark @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true @@ -469,7 +469,7 @@ @color/toolbar_blueDialog_statusBarColorFront @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true diff --git a/smali/res/values-v22/styles.xml b/smali/res/values-v22/styles.xml index c3a6e7948..97d042dbc 100644 --- a/smali/res/values-v22/styles.xml +++ b/smali/res/values-v22/styles.xml @@ -54,7 +54,7 @@ @drawable/bg_toolbar_shadow_dark @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true @@ -107,7 +107,7 @@ @drawable/bg_toolbar_shadow_dark @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true @@ -161,7 +161,7 @@ @drawable/bg_toolbar_shadow_dark @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml index ee786aab2..cad2b427d 100644 --- a/smali/res/values/styles.xml +++ b/smali/res/values/styles.xml @@ -29,11 +29,11 @@ ?header_tint @drawable/highlight_toolbar @drawable/highlight_icon_white_unbounded - #ffffffff + ?header_text @color/toolbar_blue_background enterAlways|scroll|snap @style/ToolbarTitle - @color/toolbar_blue_textColorSecondary + ?header_text @@ -1739,7 +1739,7 @@ @drawable/bg_toolbar_shadow_dark @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true @@ -1799,7 +1799,7 @@ @drawable/bg_toolbar_shadow_dark @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true @@ -1859,7 +1859,7 @@ @color/toolbar_blueDialog_statusBarColorFront @drawable/tab_bar_blue_border @style/TabBarTheme - @color/toolbar_blue_textColorSecondary + ?header_text true diff --git a/smali/smali_classes2/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali b/smali/smali_classes2/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali index 14dac3c84..6446365e9 100644 --- a/smali/smali_classes2/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali +++ b/smali/smali_classes2/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali @@ -2418,25 +2418,6 @@ :goto_0 invoke-virtual {v0, v2}, Lcom/vk/im/engine/models/attaches/AttachWall;->a(Z)V - const-string v2, "copyright" - - .line 213 - invoke-static {p1, v2, v1}, Lcom/vk/core/extensions/JsonObjectExt;->a(Lorg/json/JSONObject;Ljava/lang/String;I)I - - move-result v2 - - if-eqz v2, :cond_1 - - const/4 v2, 0x1 - - goto :goto_1 - - :cond_1 - const/4 v2, 0x0 - - :goto_1 - invoke-virtual {v0, v2}, Lcom/vk/im/engine/models/attaches/AttachWall;->a(Z)V - const-string v2, "to_id" .line 214 diff --git a/smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali b/smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali index 03bd6429e..1cec88bd2 100644 --- a/smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali +++ b/smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali @@ -1457,39 +1457,6 @@ const/16 v25, 0x0 :goto_16 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->GetCopyright()Ljava/lang/String; - - move-result-object v2 - - .line 373 - invoke-virtual {v0, v2}, Lorg/json/JSONObject;->has(Ljava/lang/String;)Z - - move-result v2 - - if-eqz v2, :cond_28 - - const-string v2, "copyright" - - .line 373 - invoke-virtual {v0, v2}, Lorg/json/JSONObject;->optJSONObject(Ljava/lang/String;)Lorg/json/JSONObject; - - move-result-object v2 - - .line 374 - sget-object v4, Lcom/vk/dto/newsfeed/entries/Post$EasyPromote;->a:Lcom/vk/dto/newsfeed/entries/Post$EasyPromote$b; - - invoke-virtual {v4, v2}, Lcom/vk/dto/newsfeed/entries/Post$EasyPromote$b;->a(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/entries/Post$EasyPromote; - - move-result-object v2 - - move-object/from16 v25, v2 - - goto :goto_17 - - :cond_28 - const/16 v25, 0x0 - - :goto_17 const-string v2, "poster" .line 377