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

fixed dialog style

Browse Source
This commit is contained in:
gdlbo
2022-07-11 19:11:51 +03:00
parent 1e876a9217
commit 3bf1a8d398
16 changed files with 59 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java
-4
View File
@@ -1,11 +1,7 @@
package ru.vtosters.lite.downloaders;
import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.provider.MediaStore;
import android.util.Log;
import android.widget.Toast;
import com.vk.core.util.ToastUtils;
import com.vk.dto.music.MusicTrack;
app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java
-1
View File
@@ -1,6 +1,5 @@
package ru.vtosters.lite.music;
import android.os.StrictMode;
import android.util.Log;
import java.io.File;
app/src/main/java/ru/vtosters/lite/music/VKM3UParser.java
-2
View File
@@ -1,7 +1,5 @@
package ru.vtosters.lite.music;
import android.util.Log;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java
+7 -4
View File
@@ -3,6 +3,10 @@ package ru.vtosters.lite.ui;
import static ru.vtosters.lite.utils.Globals.convertDpToPixel;
import static ru.vtosters.lite.utils.Globals.getContext;
import static ru.vtosters.lite.utils.Themes.*;
import static ru.vtosters.lite.utils.Themes.getAccentColor;
import static ru.vtosters.lite.utils.Themes.getAlertStyle;
import static ru.vtosters.lite.utils.Themes.getSTextAttr;
import static ru.vtosters.lite.utils.Themes.getTextAttr;
import android.app.AlertDialog;
import android.content.Context;
@@ -10,7 +14,6 @@ import android.content.DialogInterface;
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.preference.PreferenceManager;
import android.util.TypedValue;
import android.view.ViewGroup;
@@ -19,7 +22,6 @@ import android.widget.LinearLayout;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.view.ViewCompat;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
@@ -172,7 +174,8 @@ public class PreferencesUtil{
final EditText editText = new EditText(getContext());
editText.setText(PreferenceManager.getDefaultSharedPreferences(getContext()).getString(key, ""));
editText.setHint(title);
editText.setHintTextColor(PreferencesUtil.getSTextColor(getContext()));
editText.setTextColor(getTextAttr());
editText.setHintTextColor(getSTextColor(getContext()));
editText.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
@@ -182,7 +185,7 @@ public class PreferencesUtil{
margin.setMargins(convertDpToPixel(20f), 0, convertDpToPixel(20f), 0);
editText.setLayoutParams(margin);
AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getContext(), com.vtosters.lite.R.style.Base_Theme_MaterialComponents_Dialog_Alert);
AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getContext(), getAlertStyle());
builder.setTitle(title);
builder.setView(linearLayout);
builder.setPositiveButton("OK", (dialog, which) -> {
app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
+7 -5
View File
@@ -1,13 +1,13 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.Globals.convertDpToPixel;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Themes.*;
import static ru.vtosters.lite.utils.Themes.getAlertStyle;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.ColorStateList;
import android.os.Bundle;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
@@ -21,7 +21,7 @@ import ru.vtosters.lite.utils.Themes;
public class MediaFragment extends MaterialPreferenceToolbarFragment{
public static void download(Context ctx){
AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx, com.vtosters.lite.R.style.Base_Theme_MaterialComponents_Dialog_Alert);
AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx, getAlertStyle());
alertDialog.setTitle("Введите ссылку на видео");
final EditText input = new EditText(ctx);
@@ -31,7 +31,9 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment{
input.setLayoutParams(lp);
input.setBackgroundTintList(ColorStateList.valueOf(Themes.getAccentColor()));
input.setTextColor(getTextAttr());
input.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
alertDialog.setView(input);
@@ -41,7 +43,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment{
alert.show();
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(Themes.getAccentColor());
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
}
@Override
app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
+16 -12
View File
@@ -1,17 +1,19 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.CacheUtils.deleteCache;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.Intent;
import android.os.Bundle;
import androidx.preference.Preference;
import com.vk.navigation.Navigator;
import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
public class MessagesFragment extends MaterialPreferenceToolbarFragment{
@Override
public void onCreate(Bundle bundle){
@@ -24,6 +26,7 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment{
findPreference("vkme").setOnPreferenceClickListener(new MessagesFragment.restart());
findPreference("vkme_notifs").setOnPreferenceClickListener(new MessagesFragment.restart());
findPreference("systememoji").setOnPreferenceClickListener(new MessagesFragment.restart());
findPreference("wallpapers").setOnPreferenceClickListener(new MessagesFragment.openwp());
}
public boolean restart(Preference preference){
@@ -31,16 +34,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment{
return true;
}
public boolean clearCache(Preference preference, Object obj){
SharedPreferences prefs = getContext().getSharedPreferences("stickers", Context.MODE_PRIVATE);
SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
prefs.edit().clear().commit();
prefs2.edit().clear().commit();
deleteCache();
restartApplicationWithTimer();
return true;
}
public class restart implements Preference.OnPreferenceClickListener{
@Override
public boolean onPreferenceClick(Preference preference){
@@ -54,4 +47,15 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment{
return MessagesFragment.this.restart(preference);
}
}
public class openwp implements Preference.OnPreferenceClickListener{
@Override
public boolean onPreferenceClick(Preference preference){
Context context = getContext();
Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(a2);
return true;
}
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
-22
View File
@@ -5,7 +5,6 @@ import static ru.vtosters.lite.f0x1d.VTVerifications.vtverif;
import static ru.vtosters.lite.ui.vkui.VBListBuilder.VBListItem;
import static ru.vtosters.lite.ui.vkui.VBListBuilder.buildListOf;
import static ru.vtosters.lite.ui.vkui.VBottomSheetBuilder.VBSContent;
import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaper;
import static ru.vtosters.lite.utils.About.getBuildNumber;
import static ru.vtosters.lite.utils.About.getCommitLink;
import static ru.vtosters.lite.utils.CacheUtils.humanReadableByteCountBin;
@@ -65,7 +64,6 @@ import ru.vtosters.lite.ui.fragments.dockbar.DockBarFragment;
import ru.vtosters.lite.ui.fragments.dockbar.DockBarManager;
import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
import ru.vtosters.lite.ui.vkui.VBottomSheetBuilder;
import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
import ru.vtosters.lite.utils.CacheUtils;
import ru.vtosters.lite.utils.Globals;
import ru.vtosters.lite.utils.SSFS;
@@ -131,18 +129,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{
return Globals.getString("autoclearcachesumm") + " " + humanReadableByteCountBin(CacheUtils.getInstance().size);
}
public static String getWallpapersumm(){
if(disableSettingsSumms()) return null;
var hasWP = getWallpaper() != null;
if(hasWP){
return "Фон: " + "Установлен";
}
return "Фон: " + "Не установлен";
}
@Override
public void onCreate(Bundle bundle){
super.onCreate(bundle);
@@ -339,14 +325,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{
return false;
});
PreferencesUtil.addPreference(this, "", "Обои в сообщениях", getWallpapersumm(), "ic_media_outline_28", preference -> {
Context context = getContext();
Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", Globals.getString("vtlmessages"), msgsumm, !DoNotUseOldIcons() ? "ic_message_24" : "ic_message_outline_28", preference -> {
Context context = getContext();
Intent a2 = new Navigator(MessagesFragment.class).b(context);
app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java
+1 -1
View File
@@ -1,6 +1,6 @@
package ru.vtosters.lite.ui.vkui;
import static ru.vtosters.lite.foaf.FoafBase.*;
import static ru.vtosters.lite.foaf.FoafBase.loadAndShow;
import static ru.vtosters.lite.utils.Globals.getUserID;
import android.content.ClipData;
app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperPreferences.java
-2
View File
@@ -1,5 +1,4 @@
package ru.vtosters.lite.ui.wallpapers;
import static ru.vtosters.lite.ui.PreferencesUtil.*;
import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaper;
import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaperFile;
import static ru.vtosters.lite.utils.Globals.convertDpToPixel;
@@ -14,7 +13,6 @@ import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java
-1
View File
@@ -2,7 +2,6 @@ package ru.vtosters.lite.utils;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Globals.getPrefsValue;
import static ru.vtosters.lite.utils.Globals.sendToast;
import android.content.res.Resources;
app/src/main/java/ru/vtosters/lite/utils/Preferences.java
-1
View File
@@ -12,7 +12,6 @@ import static ru.vtosters.lite.utils.Globals.getPrefsValue;
import static ru.vtosters.lite.utils.Globals.getUserId;
import static ru.vtosters.lite.utils.Globals.registerActivities;
import static ru.vtosters.lite.utils.Newsfeed.setupFilters;
import static ru.vtosters.lite.utils.OpusLoader.LoadLibrary;
import static ru.vtosters.lite.utils.Proxy.setProxy;
import static ru.vtosters.lite.utils.SignatureChecker.validateAppSignature;
import static ru.vtosters.lite.utils.Themes.isDarkTheme;
app/src/main/java/ru/vtosters/lite/utils/ProxyHook.java
+7 -6
View File
@@ -1,9 +1,10 @@
package ru.vtosters.lite.utils;
import static ru.vtosters.lite.utils.Globals.convertDpToPixel;
import static ru.vtosters.lite.utils.Globals.edit;
import static ru.vtosters.lite.utils.Globals.getResources;
import static ru.vtosters.lite.utils.Globals.restartApplication;
import static ru.vtosters.lite.utils.Proxy.isZaboronaEnabled;
import static ru.vtosters.lite.utils.Themes.*;
import static ru.vtosters.lite.utils.Themes.getAlertStyle;
import android.annotation.SuppressLint;
import android.content.Context;
@@ -45,15 +46,15 @@ public class ProxyHook{
rg.setPadding(convertDpToPixel(18f), convertDpToPixel(12f), convertDpToPixel(18f), 0);
rgDefault.setText("Отключить");
rgDefault.setTextColor(Themes.getTextAttr());
rgDefault.setTextColor(getTextAttr());
rgProxy.setText("Включить (Zaborona)");
rgProxy.setTextColor(Themes.getTextAttr());
rgProxy.setTextColor(getTextAttr());
rgProxy.setChecked(isZaboronaEnabled());
rgDefault.setChecked(!isZaboronaEnabled());
AlertDialog.Builder builder = new AlertDialog.Builder(ctx, com.vtosters.lite.R.style.Base_Theme_MaterialComponents_Dialog_Alert);
AlertDialog.Builder builder = new AlertDialog.Builder(ctx, getAlertStyle());
builder.setTitle("Прокси");
builder.setMessage("Zaborona никак не связана с ВТостерс и мы не можем гарантировать её работу и безопасность");
builder.setView(rg);
@@ -81,7 +82,7 @@ public class ProxyHook{
alert.show();
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(Themes.getAccentColor());
alert.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(Themes.getAccentColor());
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
alert.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(getAccentColor());
}
}
app/src/main/java/ru/vtosters/lite/utils/RenameTool.java
+12 -8
View File
@@ -1,6 +1,5 @@
package ru.vtosters.lite.utils;
import static ru.vtosters.lite.ui.PreferencesUtil.getSTextColor;
import static ru.vtosters.lite.ui.PreferencesUtil.getTextColor;
import static ru.vtosters.lite.utils.Globals.convertDpToPixel;
import static ru.vtosters.lite.utils.Globals.fromEup;
import static ru.vtosters.lite.utils.Globals.getContext;
@@ -11,6 +10,8 @@ import static ru.vtosters.lite.utils.Globals.getUserID;
import static ru.vtosters.lite.utils.Globals.getUserId;
import static ru.vtosters.lite.utils.Globals.getUserLastName;
import static ru.vtosters.lite.utils.Globals.sendToast;
import static ru.vtosters.lite.utils.Themes.*;
import static ru.vtosters.lite.utils.Themes.getAlertStyle;
import android.content.Context;
import android.content.DialogInterface;
@@ -160,8 +161,9 @@ public class RenameTool{
final EditText fn = new EditText(ctx);
fn.setHint("Имя");
fn.setTextColor(getTextAttr());
fn.setHintTextColor(getSTextColor(ctx));
fn.setBackgroundTintList(ColorStateList.valueOf(Themes.getAccentColor()));
fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
linearLayout.addView(fn);
fn.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) fn.getLayoutParams());
@@ -170,8 +172,9 @@ public class RenameTool{
final EditText ln = new EditText(ctx);
ln.setHint("Фамилия");
ln.setTextColor(getTextAttr());
ln.setHintTextColor(getSTextColor(ctx));
ln.setBackgroundTintList(ColorStateList.valueOf(Themes.getAccentColor()));
ln.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
linearLayout.addView(ln);
ln.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
ln.setLayoutParams(margin);
@@ -182,7 +185,7 @@ public class RenameTool{
int id = getUserID(profile);
AlertDialog.Builder builder = new AlertDialog.Builder(ctx, com.vtosters.lite.R.style.Base_Theme_MaterialComponents_Dialog_Alert);
AlertDialog.Builder builder = new AlertDialog.Builder(ctx, getAlertStyle());
builder.setTitle("Смена имени");
builder.setMessage("Это локальное изменение, которое будет отображатся только в данном клиенте.");
builder.setView(linearLayout);
@@ -221,7 +224,7 @@ public class RenameTool{
alert.show();
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(Themes.getAccentColor());
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
alert.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(getResources().getColor(com.vtosters.lite.R.color.red));
}
@@ -232,7 +235,8 @@ public class RenameTool{
final EditText fn = new EditText(ctx);
fn.setHint("Имя");
fn.setHintTextColor(getSTextColor(ctx));
fn.setBackgroundTintList(ColorStateList.valueOf(Themes.getAccentColor()));
fn.setTextColor(getTextAttr());
fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
linearLayout.addView(fn);
fn.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) fn.getLayoutParams());
@@ -247,7 +251,7 @@ public class RenameTool{
final int id = fid;
AlertDialog.Builder builder = new AlertDialog.Builder(ctx, com.vtosters.lite.R.style.Base_Theme_MaterialComponents_Dialog_Alert);
AlertDialog.Builder builder = new AlertDialog.Builder(ctx, getAlertStyle());
builder.setTitle("Смена имени");
builder.setMessage("Это локальное изменение, которое будет отображатся только в данном клиенте");
builder.setView(linearLayout);
@@ -276,7 +280,7 @@ public class RenameTool{
alert.show();
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(Themes.getAccentColor());
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
alert.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(getResources().getColor(com.vtosters.lite.R.color.red));
}
app/src/main/java/ru/vtosters/lite/utils/StreamUtils.java
-1
View File
@@ -7,7 +7,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
app/src/main/java/ru/vtosters/lite/utils/Themes.java
+6 -3
View File
@@ -24,7 +24,6 @@ import android.os.Build;
import android.view.View;
import android.view.Window;
import android.webkit.WebView;
import android.widget.EditText;
import android.widget.ImageButton;
import androidx.appcompat.widget.Toolbar;
@@ -36,10 +35,8 @@ 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;
import com.vk.im.ui.views.RichEditText;
import com.vtosters.lite.R;
import com.vtosters.lite.data.ThemeTracker;
import com.vtosters.lite.ui.WriteBar;
import java.util.Arrays;
import java.util.List;
@@ -300,6 +297,12 @@ public class Themes{
return getResources().getColor(i);
} // Android Support color injector + accent color checker
public static int getAlertStyle(){
if(isDarkTheme()) return R.style.Theme_MaterialComponents_Dialog_Alert;
return R.style.Theme_MaterialComponents_Light_Dialog_Alert;
} // Android Support color injector + accent color checker
public static void setNavbarColor(Window window, int i){
if(navbar()){
window.setNavigationBarColor(getTabbarBackground());
smali/res/xml/preferences_messages.xml
+3
View File
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/vtlinterfacemsg">
<Preference
android:key="wallpapers"
android:title="Обои в сообщениях" />
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="voice"