From 7c808f608f7aef7acdbae322242c813543d0ba09 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 22 Jun 2022 14:47:26 +0300 Subject: [PATCH] fixed settings opening --- .../java/ru/vtosters/lite/f0x1d/VTVerifications.java | 3 --- .../vtosters/lite/ui/fragments/ActivityFragment.java | 4 +++- .../ru/vtosters/lite/ui/fragments/FeedFragment.java | 4 +++- .../vtosters/lite/ui/fragments/InstallGMSFragment.java | 4 +++- .../vtosters/lite/ui/fragments/InterfaceFragment.java | 3 ++- .../vtosters/lite/ui/fragments/MessagesFragment.java | 3 ++- .../ru/vtosters/lite/ui/fragments/MusicFragment.java | 4 +++- .../ru/vtosters/lite/ui/fragments/OtherFragment.java | 3 ++- .../lite/ui/fragments/ProxySettingsFragment.java | 4 +++- .../ru/vtosters/lite/ui/fragments/ThemesFragment.java | 5 +++-- .../lite/ui/fragments/tgstickers/StickersFragment.java | 10 +++++----- smali/assets/version.properties | 8 ++++---- smali/res/xml/preferences_activity.xml | 5 ----- smali/res/xml/preferences_feed.xml | 3 --- smali/res/xml/preferences_gms.xml | 2 -- smali/res/xml/preferences_interface.xml | 3 --- smali/res/xml/preferences_messages.xml | 4 ---- smali/res/xml/preferences_music.xml | 1 - smali/res/xml/preferences_other.xml | 3 --- smali/res/xml/preferences_proxy.xml | 7 +------ smali/res/xml/preferences_themes.xml | 2 -- 21 files changed, 34 insertions(+), 51 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java b/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java index 01348fe5b..0c8842f0f 100644 --- a/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java +++ b/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java @@ -4,7 +4,6 @@ import static ru.vtosters.lite.utils.Preferences.getBoolValue; import android.content.Context; import android.content.SharedPreferences; -import android.net.Uri; import android.util.Base64; import android.util.Log; import android.widget.Toast; @@ -20,7 +19,6 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import okhttp3.CacheControl; import okhttp3.Call; import okhttp3.Callback; import okhttp3.MediaType; @@ -28,7 +26,6 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; -import ru.vtosters.lite.utils.Globals; public class VTVerifications { public static final HashMap sServiceAccountsMap = new HashMap<>(); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java index c7fa2e96f..daaf22b87 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java @@ -1,5 +1,7 @@ package ru.vtosters.lite.ui.fragments; +import static ru.vtosters.lite.utils.Globals.getIdentifier; + import android.os.Bundle; import com.vtosters.lite.R; @@ -9,6 +11,6 @@ public class ActivityFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_activity); + addPreferencesFromResource(getIdentifier("preferences_activity", "xml")); } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java index 658721dea..d16bd48ca 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java @@ -1,5 +1,7 @@ package ru.vtosters.lite.ui.fragments; +import static ru.vtosters.lite.utils.Globals.getIdentifier; + import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -15,7 +17,7 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_feed); + addPreferencesFromResource(getIdentifier("preferences_feed", "xml")); prefs(); } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java index c8ad73b0c..a3f404437 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java @@ -1,5 +1,7 @@ package ru.vtosters.lite.ui.fragments; +import static ru.vtosters.lite.utils.Globals.getIdentifier; + import android.os.Bundle; import com.vtosters.lite.R; @@ -9,6 +11,6 @@ public class InstallGMSFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_gms); + addPreferencesFromResource(getIdentifier("preferences_gms", "xml")); } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java index 309f278ee..06a3f00bf 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java @@ -1,5 +1,6 @@ package ru.vtosters.lite.ui.fragments; +import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer; import android.os.Bundle; @@ -13,7 +14,7 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_interface); + addPreferencesFromResource(getIdentifier("preferences_interface", "xml")); prefs(); } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java index cc88cbaa4..fd8c23895 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java @@ -1,6 +1,7 @@ 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; @@ -16,7 +17,7 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_messages); + addPreferencesFromResource(getIdentifier("preferences_messages", "xml")); prefs(); } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java index d0a119831..6eb9f271a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java @@ -1,5 +1,7 @@ package ru.vtosters.lite.ui.fragments; +import static ru.vtosters.lite.utils.Globals.getIdentifier; + import android.os.Bundle; import com.vtosters.lite.R; @@ -9,6 +11,6 @@ public class MusicFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_music); + addPreferencesFromResource(getIdentifier("preferences_music", "xml")); } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java index 0152172c7..7ce936a60 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java @@ -3,6 +3,7 @@ package ru.vtosters.lite.ui.fragments; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; import static ru.vtosters.lite.utils.CacheUtils.deleteCache; +import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getUserToken; import static ru.vtosters.lite.utils.Globals.restartApplication; import static ru.vtosters.lite.utils.SettBackup.backupSettings; @@ -35,7 +36,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_other); + addPreferencesFromResource(getIdentifier("preferences_other", "xml")); prefs(); } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java index a1b48117a..4bc444781 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java @@ -1,5 +1,7 @@ package ru.vtosters.lite.ui.fragments; +import static ru.vtosters.lite.utils.Globals.getIdentifier; + import android.os.Bundle; import com.vtosters.lite.R; @@ -9,6 +11,6 @@ public class ProxySettingsFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_proxy); + addPreferencesFromResource(getIdentifier("preferences_proxy", "xml")); } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java index 5d5171ba8..9ce01477a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java @@ -1,6 +1,7 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.utils.Globals.componentSwitcher; +import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer; import android.os.Bundle; @@ -19,12 +20,12 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - addPreferencesFromResource(R.xml.preferences_themes); + addPreferencesFromResource(getIdentifier("preferences_themes", "xml")); prefs(); } public boolean apply(Preference preference, Object obj) { - if (((Boolean) obj).booleanValue()) { + if ((Boolean) obj) { componentSwitcher("VTIconDefault", false); componentSwitcher("VTIconVK", true); } else { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java index 90c4f6553..3c60048a9 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java @@ -129,7 +129,7 @@ public class StickersFragment extends MaterialPreferenceToolbarFragment { super.onCreateOptionsMenu(menu, menuInflater); MenuItem add = menu.add(0, 0, 0, ""); add.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); - add.setIcon(getResources().getDrawable(com.vtosters.lite.R.drawable.ic_settings_24)); + add.setIcon(getResources().getDrawable(getIdentifier("ic_settings_24", "drawable"))); } @@ -221,7 +221,7 @@ public class StickersFragment extends MaterialPreferenceToolbarFragment { recycler.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)); fab = new FloatingActionButton(container.getContext()); - fab.setImageResource(R.drawable.ic_add_24); + fab.setImageResource(getIdentifier("ic_add_24", "drawable")); fab.setBackgroundTintList(ColorStateList.valueOf(getAccentColor())); fab.setOnClickListener(v2 -> fabClick()); FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT); @@ -344,19 +344,19 @@ public class StickersFragment extends MaterialPreferenceToolbarFragment { if (f.exists()) { holder.stickerImage.setImageURI(Uri.parse("file://" + f.getAbsolutePath())); } else { - holder.stickerImage.setImageDrawable(getResources().getDrawable(R.drawable.icon_vk_104)); + holder.stickerImage.setImageDrawable(getResources().getDrawable(getIdentifier("icon_vk_104", "drawable"))); } } catch (Exception e) { e.printStackTrace(); } - holder.updateButton.setImageDrawable(recolorDrawable(getResources().getDrawable(R.drawable.ic_camera_switch_48))); + holder.updateButton.setImageDrawable(recolorDrawable(getResources().getDrawable(getIdentifier("ic_camera_switch_48", "drawable")))); holder.updateButton.setOnClickListener(listener -> { stickersService.setBotKey(TGPref.getTGBotKey()); stickersService.requestPackDownload(pack.id, new File(getContext().getFilesDir(), new File("VT-Stickers", pack.id).getAbsolutePath())); }); - holder.deleteButton.setImageDrawable(recolorDrawable(getResources().getDrawable(R.drawable.vkim_ic_msg_delete))); + holder.deleteButton.setImageDrawable(recolorDrawable(getResources().getDrawable(getIdentifier("vkim_ic_msg_delete", "drawable")))); holder.deleteButton.setOnClickListener(listener -> { stickersService.deletePack(pack); notifyItemRemoved(position); diff --git a/smali/assets/version.properties b/smali/assets/version.properties index d9cea1159..19cf97902 100644 --- a/smali/assets/version.properties +++ b/smali/assets/version.properties @@ -1,12 +1,12 @@ -VERSION_BUILD=8a7763c +VERSION_BUILD=fb8252e VERSION_BRANCH=vtl-remaster VERSION_BASE= VERSION_BRANCHID=vtl-remaster VERSION_BRANCHTYPE=vtl-remaster -VERSION_COMMIT=8a7763c356be1153c0bde11673714e7a671e9e14 +VERSION_COMMIT=fb8252eebe32850caeac8a25e2273ce785c37f31 VERSION_GRADLE= -VERSION_DISPLAY=vtl-remaster-8a7763c-dirty -VERSION_FULL=vtl-remaster-8a7763c-dirty +VERSION_DISPLAY=vtl-remaster-fb8252e-dirty +VERSION_FULL=vtl-remaster-fb8252e-dirty VERSION_SCM=git VERSION_TAG= VERSION_LAST_TAG=v0.2.9-beta2 diff --git a/smali/res/xml/preferences_activity.xml b/smali/res/xml/preferences_activity.xml index 053263f75..b38ad5b45 100644 --- a/smali/res/xml/preferences_activity.xml +++ b/smali/res/xml/preferences_activity.xml @@ -13,7 +13,6 @@ android:key="undeletemsg" android:summary="@string/activity_undel_attachments" android:title="@string/activity_undel_enable" /> - - - - - - - - - - - - - - - - - - - - - + - - - - - - -