updated jars + added amoled theme values to code
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -135,8 +135,8 @@ public class Themes{
|
|||||||
|
|
||||||
public static VKTheme getDarkTheme(){
|
public static VKTheme getDarkTheme(){
|
||||||
switch(getPrefsValue("darktheme")) {
|
switch(getPrefsValue("darktheme")) {
|
||||||
//case "amoled":
|
case "amoled":
|
||||||
//return VKTheme.AMOLED;
|
return isMilkshake() ? VKTheme.VKAPP_MILK_AMOLED : VKTheme.VKAPP_AMOLED;
|
||||||
default:
|
default:
|
||||||
return isMilkshake() ? VKTheme.VKAPP_MILK_DARK : VKTheme.VKAPP_DARK;
|
return isMilkshake() ? VKTheme.VKAPP_MILK_DARK : VKTheme.VKAPP_DARK;
|
||||||
}
|
}
|
||||||
@@ -215,7 +215,6 @@ public class Themes{
|
|||||||
|
|
||||||
@SuppressLint("UseCompatLoadingForColorStateLists")
|
@SuppressLint("UseCompatLoadingForColorStateLists")
|
||||||
public static ColorStateList themeCSL(Context context, int color){
|
public static ColorStateList themeCSL(Context context, int color){
|
||||||
|
|
||||||
if(isColorRefAccented(color) && isAndroidMonet()){
|
if(isColorRefAccented(color) && isAndroidMonet()){
|
||||||
return ColorStateList.valueOf(getAccentColor());
|
return ColorStateList.valueOf(getAccentColor());
|
||||||
}
|
}
|
||||||
@@ -309,34 +308,6 @@ public class Themes{
|
|||||||
return String.format("#%06X", Integer.valueOf(i & 16777215));
|
return String.format("#%06X", Integer.valueOf(i & 16777215));
|
||||||
} // Get color as hex string
|
} // Get color as hex string
|
||||||
|
|
||||||
// public static int vk_sans_display_demibold(){
|
|
||||||
// return vksans() ? R.font.vk_sans_display_demibold : R.font.tt_commons_demi_bold;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public static int vk_sans_text_black(){
|
|
||||||
// return vksans() ? R.font.vk_sans_display_bold : R.font.roboto_black;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public static int vk_sans_text_bold(){
|
|
||||||
// return vksans() ? R.font.vk_sans_text_bold : R.font.roboto_bold;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public static int vk_sans_text_demibold(){
|
|
||||||
// return vksans() ? R.font.vk_sans_text_demibold : R.font.roboto_bold_italic;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public static int vk_sans_text_light(){
|
|
||||||
// return vksans() ? R.font.vk_sans_text_light : R.font.roboto_light;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public static int vk_sans_text_medium(){
|
|
||||||
// return vksans() ? R.font.vk_sans_text_medium : R.font.roboto_medium;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public static int vk_sans_text_regular(){
|
|
||||||
// return vksans() ? R.font.vk_sans_text_regular : R.font.roboto_regular;
|
|
||||||
// }
|
|
||||||
|
|
||||||
public static int getNavigationHeight(int Default){
|
public static int getNavigationHeight(int Default){
|
||||||
int VKME = R.dimen.design_bottom_sheet_peek_height_min;
|
int VKME = R.dimen.design_bottom_sheet_peek_height_min;
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
|
|
||||||
.field public static final enum VKAPP_MILK_DARK:Lcom/vk/core/ui/themes/VKTheme;
|
.field public static final enum VKAPP_MILK_DARK:Lcom/vk/core/ui/themes/VKTheme;
|
||||||
|
|
||||||
|
.field public static final enum VKAPP_MILK_AMOLED:Lcom/vk/core/ui/themes/VKTheme;
|
||||||
|
|
||||||
|
.field public static final enum VKAPP_AMOLED:Lcom/vk/core/ui/themes/VKTheme;
|
||||||
|
|
||||||
.field public static final enum VKAPP_MILK_LIGHT:Lcom/vk/core/ui/themes/VKTheme;
|
.field public static final enum VKAPP_MILK_LIGHT:Lcom/vk/core/ui/themes/VKTheme;
|
||||||
|
|
||||||
.field public static final enum VKME_DARK:Lcom/vk/core/ui/themes/VKTheme;
|
.field public static final enum VKME_DARK:Lcom/vk/core/ui/themes/VKTheme;
|
||||||
@@ -53,7 +57,7 @@
|
|||||||
.method static constructor <clinit>()V
|
.method static constructor <clinit>()V
|
||||||
.locals 20
|
.locals 20
|
||||||
|
|
||||||
const/4 v0, 0x6
|
const/16 v0, 0x8
|
||||||
|
|
||||||
new-array v0, v0, [Lcom/vk/core/ui/themes/VKTheme;
|
new-array v0, v0, [Lcom/vk/core/ui/themes/VKTheme;
|
||||||
|
|
||||||
@@ -215,6 +219,53 @@
|
|||||||
|
|
||||||
aput-object v1, v0, v2
|
aput-object v1, v0, v2
|
||||||
|
|
||||||
|
|
||||||
|
.line 6
|
||||||
|
sget v10, Lb/h/g/e;->VkMilkDarkStyle:I
|
||||||
|
|
||||||
|
const-string v4, "VKAPP_MILK_AMOLED"
|
||||||
|
|
||||||
|
const/4 v5, 0x6
|
||||||
|
|
||||||
|
const-wide/16 v6, 0x6
|
||||||
|
|
||||||
|
const/4 v8, 0x0
|
||||||
|
|
||||||
|
const-string v11, "space_gray"
|
||||||
|
|
||||||
|
move-object v3, v1
|
||||||
|
|
||||||
|
invoke-direct/range {v3 .. v11}, Lcom/vk/core/ui/themes/VKTheme;-><init>(Ljava/lang/String;IJZZILjava/lang/String;)V
|
||||||
|
|
||||||
|
sput-object v1, Lcom/vk/core/ui/themes/VKTheme;->VKAPP_MILK_AMOLED:Lcom/vk/core/ui/themes/VKTheme;
|
||||||
|
|
||||||
|
const/4 v2, 0x6
|
||||||
|
|
||||||
|
aput-object v1, v0, v2
|
||||||
|
|
||||||
|
.line 6
|
||||||
|
sget v10, Lb/h/g/e;->VkMilkDarkStyle:I
|
||||||
|
|
||||||
|
const-string v4, "VKAPP_AMOLED"
|
||||||
|
|
||||||
|
const/4 v5, 0x7
|
||||||
|
|
||||||
|
const-wide/16 v6, 0x7
|
||||||
|
|
||||||
|
const/4 v8, 0x0
|
||||||
|
|
||||||
|
const-string v11, "space_gray"
|
||||||
|
|
||||||
|
move-object v3, v1
|
||||||
|
|
||||||
|
invoke-direct/range {v3 .. v11}, Lcom/vk/core/ui/themes/VKTheme;-><init>(Ljava/lang/String;IJZZILjava/lang/String;)V
|
||||||
|
|
||||||
|
sput-object v1, Lcom/vk/core/ui/themes/VKTheme;->VKAPP_AMOLED:Lcom/vk/core/ui/themes/VKTheme;
|
||||||
|
|
||||||
|
const/4 v2, 0x7
|
||||||
|
|
||||||
|
aput-object v1, v0, v2
|
||||||
|
|
||||||
sput-object v0, Lcom/vk/core/ui/themes/VKTheme;->$VALUES:[Lcom/vk/core/ui/themes/VKTheme;
|
sput-object v0, Lcom/vk/core/ui/themes/VKTheme;->$VALUES:[Lcom/vk/core/ui/themes/VKTheme;
|
||||||
|
|
||||||
new-instance v0, Lcom/vk/core/ui/themes/VKTheme$a;
|
new-instance v0, Lcom/vk/core/ui/themes/VKTheme$a;
|
||||||
|
|||||||
Reference in New Issue
Block a user