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

updated themes and disabled auto theme (dead)

Browse Source
This commit is contained in:
gdlbo
2022-06-22 20:43:57 +03:00
parent 4b7fb82710
commit bce4952254
4 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+7 -3
View File
@@ -90,13 +90,17 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
PreferencesUtil.addMaterialSwitchPreference(this, "isdark", Globals.getString("vtsettdarktheme"), "", oldicons() ? "ic_palette_24" : "ic_palette_outline_28", false, (preference, o) -> {
boolean value = (boolean) o;
edit().putBoolean("isdark", value).commit();
if(!value){ // inverted
setTheme(getLightTheme(), this.getActivity());
} else {
setTheme(getDarkTheme(), this.getActivity());
}
setTheme(this.getActivity());
edit().putBoolean("isdark", value).commit();
return true;
});
if (Build.VERSION.SDK_INT >= 28) {
if (Build.VERSION.SDK_INT >= 28 && false) {
PreferencesUtil.addMaterialSwitchPreference(this, "systemtheme", Globals.getString("appearance_theme_use_system"), Globals.getString("appearance_theme_use_system_summary"), oldicons() ? "ic_recent_24" : "ic_recent_outline_28", true, (preference, o) -> {
boolean value = (boolean) o;
app/src/main/java/ru/vtosters/lite/utils/Globals.java
+1
View File
@@ -5,6 +5,7 @@ import static ru.vtosters.lite.utils.Preferences.checkupdates;
import static ru.vtosters.lite.utils.Preferences.getLocale;
import static ru.vtosters.lite.utils.Preferences.preferences;
import static ru.vtosters.lite.utils.Themes.isDarkTheme;
import static ru.vtosters.lite.utils.Themes.systemThemeChanger;
import android.app.Activity;
import android.app.Application;
app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+2 -2
View File
@@ -57,7 +57,7 @@ public class Preferences {
if(dev()){
LoadLibrary("vkopustest");
}
// systemThemeChanger();
systemThemeChanger(null);
getInstance().autoCleaningCache();
} // VK Init
@@ -86,7 +86,7 @@ public class Preferences {
}
public static boolean systemtheme() {
return getBoolValue("systemtheme", true) && VERSION.SDK_INT >= 28;
return false; //getBoolValue("systemtheme", true) && VERSION.SDK_INT >= 28;
}
public static boolean authorsrecomm() {
app/src/main/java/ru/vtosters/lite/utils/Themes.java
+17 -31
View File
@@ -3,10 +3,12 @@ package ru.vtosters.lite.utils;
import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
import static ru.vtosters.lite.utils.Globals.edit;
import static ru.vtosters.lite.utils.Globals.getCenterScreenCoords;
import static ru.vtosters.lite.utils.Globals.getContext;
import static ru.vtosters.lite.utils.Globals.getCurrentActivity;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Globals.getPrefsValue;
import static ru.vtosters.lite.utils.Globals.getResources;
import static ru.vtosters.lite.utils.Globals.sendToast;
import static ru.vtosters.lite.utils.Preferences.color_grishka;
import static ru.vtosters.lite.utils.Preferences.isBGStickersEnabled;
import static ru.vtosters.lite.utils.Preferences.navbar;
@@ -34,6 +36,7 @@ import androidx.core.graphics.ColorUtils;
import com.vk.articles.preload.WebCachePreloader;
import com.vk.core.drawable.RecoloredDrawable;
import com.vk.core.preference.Preference;
import com.vk.core.ui.themes.MilkshakeHelper;
import com.vk.core.ui.themes.VKTheme;
import com.vk.core.ui.themes.VKThemeHelper;
@@ -50,11 +53,12 @@ public class Themes {
);
public static void applyTheme(VKTheme theme) {
setSelectedTheme(getCurrentActivity(), theme);
VKThemeHelper.theme(theme, getCurrentActivity(), getCenterScreenCoords());
} // Apply VKTheme and ImTheme (hard applying without dynamic theme changing)
public static void setTheme(Activity activity) {
VKThemeHelper.b(activity, getCenterScreenCoords());
public static void setTheme(VKTheme theme, Activity activity) {
if(activity == null) activity = getCurrentActivity();
VKThemeHelper.theme(theme, activity, getCenterScreenCoords());
ThemeTracker.a();
isLoaded = false;
new WebView(activity).clearCache(true);
@@ -65,14 +69,6 @@ public class Themes {
return VKThemeHelper.r();
}
public static void setSelectedTheme(Activity paramActivity, VKTheme theme) {
try {
invokeMethod(VKThemeHelper.class, "a", VKThemeHelper.k, paramActivity, theme, getCenterScreenCoords());
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
e.printStackTrace();
}
}
public static int getAccentColor() {
return getColorFromAttr(getAttrId("accent"));
} // Color accent
@@ -148,28 +144,14 @@ public class Themes {
//case "amoled":
//return VKTheme.AMOLED;
default:
return VKTheme.VKAPP_DARK;
return isMilkshake()? VKTheme.VKAPP_MILK_DARK : VKTheme.VKAPP_DARK;
}
} // Return needed theme for theme changer
public static VKTheme getLightTheme() {
switch (getPrefsValue("lighttheme")) {
default:
return VKTheme.VKAPP_LIGHT;
}
} // Return needed theme for theme changer
public static VKTheme getDarkMilkTheme() {
switch (getPrefsValue("darktheme")) {
default:
return VKTheme.VKAPP_MILK_DARK;
}
} // Return needed theme for theme changer
public static VKTheme getLightMilkTheme() {
switch (getPrefsValue("lighttheme")) {
default:
return VKTheme.VKAPP_MILK_LIGHT;
return isMilkshake()? VKTheme.VKAPP_MILK_LIGHT : VKTheme.VKAPP_LIGHT;
}
} // Return needed theme for theme changer
@@ -380,10 +362,14 @@ public class Themes {
return vkme()? VKME : Default;
}
public static void systemThemeChanger() {
private void getCurrentThemeID(VKTheme paramVKTheme) {
Preference.b("vk_theme_helper", "current_theme", paramVKTheme.getId());
}
public static void systemThemeChanger(Activity activity) { // ded
boolean isDarkTheme = isDarkTheme();
if (isDarkTheme){
if (!isDarkTheme){
applyTheme(getDarkTheme());
} else {
applyTheme(getLightTheme());
@@ -399,11 +385,11 @@ public class Themes {
case Configuration.UI_MODE_NIGHT_UNDEFINED:
case Configuration.UI_MODE_NIGHT_NO:
edit().putBoolean("isdark", false).commit();
applyTheme(getLightTheme());
setTheme(getLightTheme(), activity);
break;
case Configuration.UI_MODE_NIGHT_YES:
edit().putBoolean("isdark", true).commit();
applyTheme(getDarkTheme());
setTheme(getDarkTheme(), activity);
break;
}
}