y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
gdlbo
2022-05-17 18:40:56 +03:00
parent e09994cd30
commit abc37de666
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java
+2 -2
View File
@@ -8,8 +8,8 @@ import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Globals.getResources;
import static ru.vtosters.lite.utils.Globals.getString;
import static ru.vtosters.lite.utils.Themes.getAccentColor;
import static ru.vtosters.lite.utils.Themes.getNavbarColor;
import static ru.vtosters.lite.utils.Themes.getSTextAttr;
import static ru.vtosters.lite.utils.Themes.getTabbarBackground;
import static ru.vtosters.lite.utils.Themes.getTextAttr;
import static ru.vtosters.lite.utils.Themes.recolorDrawable;
@@ -372,7 +372,7 @@ public class StickersFragment extends ToolbarFragment {
holder.switchCompat.setOnCheckedChangeListener((buttonView, isChecked) -> stickersService.setPackEnabled(pack, isChecked, false));
holder.count.setText(pack.stickersCount + " " + getString("stickerscount"));
holder.layout.setBackgroundColor(getNavbarColor());
holder.layout.setBackgroundColor(getTabbarBackground());
// Color костыль
int color = getTextAttr();
app/src/main/java/ru/vtosters/lite/utils/Themes.java
+9 -10
View File
@@ -1,6 +1,5 @@
package ru.vtosters.lite.utils;
import static android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
import static ru.vtosters.lite.utils.Globals.getContext;
import static ru.vtosters.lite.utils.Globals.getPrefsValue;
import static ru.vtosters.lite.utils.Preferences.color_grishka;
@@ -43,6 +42,10 @@ public class Themes {
return VKThemeHelper.a(R.attr.tabbar_background);
}
public static int getBackgroundContent() {
return VKThemeHelper.a(R.attr.background_content);
}
public static int getHeaderBackground() {
return VKThemeHelper.a(R.attr.header_background);
}
@@ -59,6 +62,10 @@ public class Themes {
return getContext().getResources().getIdentifier("VkIm.Theme.VkApp.Amoled", "style", getContext().getPackageName());
}
public static int getHeaderText() {
return VKThemeHelper.a(R.attr.header_text);
}
public static void setStatusBarTheme(View getview) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
getview.setSystemUiVisibility(getview.getSystemUiVisibility() + getNeededColorStatusbar());
@@ -112,10 +119,6 @@ public class Themes {
return VKThemeHelper.a(attr);
}
public static int getHeaderText() {
return VKThemeHelper.a(R.attr.header_text);
}
public static boolean isAndroidMonet() {
return color_grishka() && Build.VERSION.SDK_INT >= 31;
}
@@ -171,7 +174,7 @@ public class Themes {
public static void setNavbarColor(Window window, int i) {
if (navbar() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
window.setNavigationBarColor(getNavbarColor());
window.setNavigationBarColor(getTabbarBackground());
}
}
@@ -206,10 +209,6 @@ public class Themes {
return vksans() ? R.font.vk_sans_text_regular : R.font.roboto_regular;
}
public static int getNavbarColor() {
return VKThemeHelper.a(R.attr.tabbar_background);
}
public static String getBackgroundStickers() {
if (isBGStickersEnabled()) {
return "images_with_background";