diff --git a/app/src/main/java/com/vk/im/ui/themes/ImTheme.java b/app/src/main/java/com/vk/im/ui/themes/ImTheme.java index b862ad7e0..04b71b563 100644 --- a/app/src/main/java/com/vk/im/ui/themes/ImTheme.java +++ b/app/src/main/java/com/vk/im/ui/themes/ImTheme.java @@ -12,6 +12,7 @@ public enum ImTheme { VKAPP_DARK(3, VkIm_Theme_VkApp_Dark), VKME_LIGHT(1, VkIm_Theme_VkMe_Light), VKME_DARK(2, VkIm_Theme_VkMe_Dark), + VKME_AMOLED(5, Themes.getAmoledMeTheme()), VKAPP_AMOLED(4, Themes.getAmoledImTheme()); private final int id; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java index d36d3aa54..495ea6398 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -88,6 +88,10 @@ public class Themes { return getIdentifier("VkIm.Theme.VkApp.Amoled", "style"); } // Get Amoled theme id for messages + public static int getAmoledMeTheme() { + return getIdentifier("VkIm.Theme.VkMe.Amoled", "style"); + } // Get Amoled theme id for messages with rounded msg + public static int getAttrId(String attr) { return getIdentifier(attr, "attr"); } @@ -122,7 +126,7 @@ public class Themes { public static ImTheme getImDarkTheme() { switch (getPrefsValue("darktheme")) { case "amoled": - return ImTheme.VKAPP_AMOLED; + return roundedmsgs() ? ImTheme.VKME_AMOLED : ImTheme.VKAPP_AMOLED; default: return roundedmsgs() ? ImTheme.VKME_DARK : ImTheme.VKAPP_DARK; } diff --git a/smali/res/values-v31/styles.xml b/smali/res/values-v31/styles.xml index ce7b0bf33..9a9d17068 100644 --- a/smali/res/values-v31/styles.xml +++ b/smali/res/values-v31/styles.xml @@ -559,7 +559,7 @@ ?accent @color/white #ffa9b0b8 - #ff67a5eb + ?accent ?accent #66000000 @color/white @@ -844,7 +844,7 @@ @color/white #ffa9b0b8 - @android:color/system_neutral1_50 + ?accent @color/white #66000000 @color/white @@ -1316,7 +1316,7 @@ ?accent @color/white #ffa9b0b8 - #ff67a5eb + ?accent @color/white #66000000 @color/white diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml index 9cd57d8bd..7e43111eb 100644 --- a/smali/res/values/styles.xml +++ b/smali/res/values/styles.xml @@ -1580,7 +1580,7 @@ @color/im_old_accent @color/white #ffa9b0b8 - #ff67a5eb + ?accent @color/white #66000000 @color/white @@ -6642,7 +6642,7 @@ @color/im_old_accent @color/white #ffa9b0b8 - #ff67a5eb + ?accent @color/white #66000000 @color/white @@ -6917,7 +6917,7 @@ @color/im_old_accent @color/white #ffa9b0b8 - #ff67a5eb + ?accent @color/blue_600 #66000000 @color/white @@ -7292,7 +7292,7 @@ @color/im_old_accent @color/white #ffa9b0b8 - #ff67a5eb + ?accent @color/white #66000000 @color/white @@ -7414,6 +7414,281 @@ @color/gray_400 + +