Fixed msg strange bug + fixes

This commit is contained in:
gdlbo
2022-04-25 17:24:13 +03:00
parent e467044e41
commit 5c1452ff57
6 changed files with 17 additions and 69 deletions
@@ -9,7 +9,7 @@
<size
android:height="4.0dip"
android:width="4.0dip" />
<solid android:color="@color/toolbar_blue_textColorSecondary" />
<solid android:color="?header_text" />
</shape>
</item>
<item
@@ -21,7 +21,7 @@
<size
android:height="4.0dip"
android:width="4.0dip" />
<solid android:color="@color/toolbar_blue_textColorSecondary" />
<solid android:color="?header_text" />
</shape>
</item>
<item
@@ -33,7 +33,7 @@
<size
android:height="4.0dip"
android:width="4.0dip" />
<solid android:color="@color/toolbar_blue_textColorSecondary" />
<solid android:color="?header_text" />
</shape>
</item>
</layer-list>
+5 -5
View File
@@ -28,7 +28,7 @@
<item name="colorPrimary">@color/toolbar_blue_background</item>
<item name="layout_scrollFlags">enterAlways|scroll|snap</item>
<item name="titleTextAppearance">@style/ToolbarTitle</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
</style>
<style name="ActionBarTheme.ItemsFull" parent="@style/ActionBarTheme">
@@ -282,7 +282,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -343,7 +343,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -405,7 +405,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -469,7 +469,7 @@
<item name="statusBarColorFront">@color/toolbar_blueDialog_statusBarColorFront</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
+3 -3
View File
@@ -54,7 +54,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -107,7 +107,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -161,7 +161,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
+6 -6
View File
@@ -29,11 +29,11 @@
<item name="android:textColorSecondary">?header_tint</item>
<item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
<item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
<item name="colorAccent">#ffffffff</item>
<item name="colorAccent">?header_text</item>
<item name="colorPrimary">@color/toolbar_blue_background</item>
<item name="layout_scrollFlags">enterAlways|scroll|snap</item>
<item name="titleTextAppearance">@style/ToolbarTitle</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
</style>
<style name="ActionBarTheme.ItemsFull" parent="@style/ActionBarTheme" />
@@ -1405,7 +1405,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -1739,7 +1739,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -1799,7 +1799,7 @@
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -1859,7 +1859,7 @@
<item name="statusBarColorFront">@color/toolbar_blueDialog_statusBarColorFront</item>
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
<item name="tabBarTheme">@style/TabBarTheme</item>
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
<item name="toolbarIconsColor">?header_text</item>
<item name="windowActionModeOverlay">true</item>
</style>
@@ -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
@@ -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