From b439165246f1774f43820c814e560703354c4829 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Thu, 15 Sep 2022 21:35:50 +0300 Subject: [PATCH] fixed icon + vkx playlists playing --- .../vtosters/lite/hooks/ui/MusicBottomSheetHook.java | 8 +++++++- .../d/VkMusicTrackBottomSheetActionsFactory.smali | 10 ++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ui/MusicBottomSheetHook.java b/app/src/main/java/ru/vtosters/lite/hooks/ui/MusicBottomSheetHook.java index cae2f4b47..afbdc1ebd 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/ui/MusicBottomSheetHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/ui/MusicBottomSheetHook.java @@ -1,5 +1,7 @@ package ru.vtosters.lite.hooks.ui; +import static ru.vtosters.lite.utils.Preferences.milkshake; + import com.vk.dto.music.MusicTrack; import com.vk.dto.music.Playlist; import com.vk.music.bottomsheets.a.MusicAction; @@ -21,6 +23,8 @@ public class MusicBottomSheetHook { } public static ArrayList hook(ArrayList actions, Playlist playlist) { + if (LibVKXClient.isVkxInstalled()) + actions.add(getPlayInVKXAction()); return actions; } @@ -33,6 +37,8 @@ public class MusicBottomSheetHook { } public static boolean injectOnClick(int actionId, Playlist playlist) { // playlist inj + if (actionId == AndroidUtils.getIdentifier("play_in_vkx", "id")) + return tryPlayInVKX(null, null, playlist); return false; } @@ -53,7 +59,7 @@ public class MusicBottomSheetHook { private static MusicAction getPlayInVKXAction() { return new MusicAction( AndroidUtils.getIdentifier("play_in_vkx", "id"), - R.drawable.ic_music_24, + milkshake() ? R.drawable.ic_music_outline_24 : R.drawable.ic_music_24, AndroidUtils.getIdentifier("play_in_vkx", "string"), R.color.caption_gray, R.string.music_talkback_empty, diff --git a/smali/smali_classes3/com/vk/music/bottomsheets/track/d/VkMusicTrackBottomSheetActionsFactory.smali b/smali/smali_classes3/com/vk/music/bottomsheets/track/d/VkMusicTrackBottomSheetActionsFactory.smali index caf87743d..698d7933b 100644 --- a/smali/smali_classes3/com/vk/music/bottomsheets/track/d/VkMusicTrackBottomSheetActionsFactory.smali +++ b/smali/smali_classes3/com/vk/music/bottomsheets/track/d/VkMusicTrackBottomSheetActionsFactory.smali @@ -697,6 +697,10 @@ .line 31 :cond_9 + invoke-static {v3, v1}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->hook(Ljava/util/ArrayList;Lcom/vk/dto/music/MusicTrack;)Ljava/util/ArrayList; + + move-result-object v3 + invoke-interface/range {p2 .. p2}, Lcom/vk/music/bottomsheets/track/MusicTrackBottomSheetModel1;->k()Z move-result v2 @@ -738,11 +742,5 @@ :cond_a :goto_3 - - # invoke static ru.vtosters.lite.hooks.ui.MusicBottomSheetHook.hook(ArrayList actions) - invoke-static {v3, v1}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->hook(Ljava/util/ArrayList;Lcom/vk/dto/music/MusicTrack;)Ljava/util/ArrayList; - - move-result-object v3 - return-object v3 .end method