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 59dfa58f7..5a0848b7d 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -63,6 +63,10 @@ public class Themes { return ru.vtosters.lite.utils.Prefs.BooleanFalse("vkim_msg"); } + public static boolean amoled() { + return ru.vtosters.lite.utils.Prefs.BooleanFalse("amoled"); + } + public static boolean vkme_msg() { return ru.vtosters.lite.utils.Prefs.BooleanFalse("vkme_msg"); } diff --git a/build.gradle b/build.gradle index fdbcecf8a..549048d4e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0-alpha01' + classpath 'com.android.tools.build:gradle:7.2.0-rc01' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6116eb88c..648b950c2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 28 23:46:30 MSK 2022 +#Fri Apr 22 13:33:27 MSK 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml index 4b0b4c971..d59b9d6e4 100644 --- a/smali/res/xml/preferences_debug.xml +++ b/smali/res/xml/preferences_debug.xml @@ -4,6 +4,7 @@ + diff --git a/smali/smali/com/vk/core/ui/themes/VKTheme.smali b/smali/smali/com/vk/core/ui/themes/VKTheme.smali index 58e0162b8..0519fe137 100644 --- a/smali/smali/com/vk/core/ui/themes/VKTheme.smali +++ b/smali/smali/com/vk/core/ui/themes/VKTheme.smali @@ -18,6 +18,8 @@ .field public static final enum DARK:Lcom/vk/core/ui/themes/VKTheme; +.field public static final enum AMOLED:Lcom/vk/core/ui/themes/VKTheme; + .field public static final enum DEFAULT_LIGHT:Lcom/vk/core/ui/themes/VKTheme; @@ -31,7 +33,7 @@ .method static constructor ()V .locals 14 - const/4 v0, 0x2 + const/4 v0, 0x3 new-array v0, v0, [Lcom/vk/core/ui/themes/VKTheme; @@ -77,6 +79,27 @@ aput-object v1, v0, v2 + new-instance v1, Lcom/vk/core/ui/themes/VKTheme; + + const-string v9, "AMOLED" + + .line 292 + sget v13, Lcom/vk/s/R$g;->BaseDarkStyle:I + + const/4 v10, 0x2 + + const-wide/16 v11, 0x2 + + move-object v8, v1 + + invoke-direct/range {v8 .. v13}, Lcom/vk/core/ui/themes/VKTheme;->(Ljava/lang/String;IJI)V + + sput-object v1, Lcom/vk/core/ui/themes/VKTheme;->AMOLED:Lcom/vk/core/ui/themes/VKTheme; + + const/4 v2, 0x2 + + aput-object v1, v0, v2 + sput-object v0, Lcom/vk/core/ui/themes/VKTheme;->$VALUES:[Lcom/vk/core/ui/themes/VKTheme; return-void diff --git a/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali b/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali index 1e9587729..b4d314180 100644 --- a/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali +++ b/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali @@ -351,6 +351,17 @@ if-eqz v0, :cond_0 + invoke-static {}, Lru/vtosters/lite/utils/Themes;->amoled()Z + + move-result v1 + + if-eqz v1, :cond_10 + + sget-object v0, Lcom/vk/core/ui/themes/VKTheme;->AMOLED:Lcom/vk/core/ui/themes/VKTheme; + + goto :goto_0 + + :cond_10 sget-object v0, Lcom/vk/core/ui/themes/VKTheme;->DARK:Lcom/vk/core/ui/themes/VKTheme; goto :goto_0 diff --git a/smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali b/smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali index 4647df17d..4bbe93fce 100644 --- a/smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali +++ b/smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali @@ -915,8 +915,20 @@ move-result-object v0 + invoke-static {}, Lru/vtosters/lite/utils/Themes;->amoled()Z + + move-result v3 + + if-eqz v3, :cond_10 + + sget-object v2, Lcom/vk/core/ui/themes/VKTheme;->AMOLED:Lcom/vk/core/ui/themes/VKTheme; + + goto :goto_0 + + :cond_10 sget-object v2, Lcom/vk/core/ui/themes/VKTheme;->DARK:Lcom/vk/core/ui/themes/VKTheme; + goto :goto_0 if-ne v0, v2, :cond_5 :cond_4