From 3f7b9eb79671d5096b31ede041924999daf0d172 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 31 Jul 2022 03:09:33 +0300 Subject: [PATCH] some imp --- .../java/ru/vtosters/lite/hooks/MessagesHook.java | 11 ++++++++++- .../vtosters/lite/ui/fragments/MessagesFragment.java | 10 ++++++++++ .../main/java/ru/vtosters/lite/utils/Preferences.java | 9 +++++++++ smali/res/values-ru/strings.xml | 4 ++-- smali/res/values/strings.xml | 4 ++-- smali/res/xml/preferences_messages.xml | 7 ++++++- .../msg_list/entry/MsgAttachBuilder.smali | 4 ++-- .../msg_list/entry/MsgContentBuilder.smali | 4 ++-- 8 files changed, 43 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java b/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java index 7d380fff5..dfb273fd2 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java @@ -3,6 +3,8 @@ package ru.vtosters.lite.hooks; import static ru.vtosters.lite.ui.dialogs.MessageSettings.argDialog; import static ru.vtosters.lite.ui.dialogs.MessageSettings.bombCount; import static ru.vtosters.lite.ui.dialogs.MessageSettings.isSilentEnabled; +import static ru.vtosters.lite.utils.Preferences.autoalltranslate; +import static ru.vtosters.lite.utils.Preferences.autotranslate; import static ru.vtosters.lite.utils.Preferences.getBoolValue; import static ru.vtosters.lite.utils.Preferences.savemsgsett; @@ -15,11 +17,18 @@ import ru.vtosters.lite.translators.BaseTranslator; public class MessagesHook { public static String injectOwnText(String oldText) { - if (!getBoolValue("autotranslate", false) || TextUtils.isEmpty(oldText)) + if (!autotranslate() || TextUtils.isEmpty(oldText)) return oldText; return BaseTranslator.getInstance().getTranslation(oldText); } + public static String injectOwnTextAll(String oldText) { + if (!autoalltranslate() || TextUtils.isEmpty(oldText)) { + return oldText; + } + return BaseTranslator.getInstance().getTranslation(oldText); + } + public static void onLongClick(View view) { view.setOnLongClickListener(v -> { argDialog(v.getContext()); 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 9ee947e40..21dde136a 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 @@ -3,6 +3,8 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; import static ru.vtosters.lite.utils.AndroidUtils.getPreferences; import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer; +import static ru.vtosters.lite.utils.Preferences.autoalltranslate; +import static ru.vtosters.lite.utils.Preferences.offline; import android.content.Context; import android.content.Intent; @@ -35,6 +37,8 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { findPreference("systememoji").setOnPreferenceClickListener(new MessagesFragment.restart()); findPreference("wallpapers").setOnPreferenceClickListener(new MessagesFragment.openwp()); + findPreference("autotranslate").setEnabled(!autoalltranslate()); + findPreference("lang_service").setOnPreferenceClickListener(preference -> { var items = Arrays.asList( new ImagineArrayAdapter.ImagineArrayAdapterItem(getIdentifier("ic_yandex_translate_icon", "drawable"), "Yandex Translate"), @@ -59,6 +63,12 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { }); } + @Override + public boolean onPreferenceTreeClick(Preference preference) { + findPreference("autotranslate").setEnabled(!autoalltranslate()); + return super.onPreferenceTreeClick(preference); + } + public boolean restart(Preference preference) { restartApplicationWithTimer(); return true; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 712896e73..2147789f7 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -261,6 +261,15 @@ public class Preferences { return getBoolValue("setoffline", false); } + public static boolean autotranslate() { + if (autoalltranslate()) return true; + return getBoolValue("autotranslate", false); + } + + public static boolean autoalltranslate() { + return getBoolValue("autoalltranslate", false); + } + public static boolean shortinfo() { return getBoolValue("shortinfo", true); } diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml index c6a3c03cd..aebf13dcf 100644 --- a/smali/res/values-ru/strings.xml +++ b/smali/res/values-ru/strings.xml @@ -5391,8 +5391,8 @@ Эксперты Отключить неписалку Включить неписалку - Закрепить сообщение - Открепить сообщение + Закрепить чат + Открепить чат Аккаунты Для ботов/групп Для бесед diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml index 97f22977c..59af39516 100644 --- a/smali/res/values/strings.xml +++ b/smali/res/values/strings.xml @@ -5543,8 +5543,8 @@ Does not affect vk.cc links" Experts Disable Do Not Type Enable Do Not Type - Pin message - Unpin message + Pin chat + Unpin chat Accounts For Bots/Groups For Conversations diff --git a/smali/res/xml/preferences_messages.xml b/smali/res/xml/preferences_messages.xml index a5413c5ec..80e5b5109 100644 --- a/smali/res/xml/preferences_messages.xml +++ b/smali/res/xml/preferences_messages.xml @@ -40,8 +40,13 @@ + injectOwnText(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnTextAll(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 @@ -2521,7 +2521,7 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnText(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnTextAll(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder.smali index 14391ae39..8bcc175c3 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder.smali @@ -306,7 +306,7 @@ move-result-object v4 - invoke-static {v4}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnText(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnTextAll(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -678,7 +678,7 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnText(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnTextAll(Ljava/lang/String;)Ljava/lang/String; move-result-object v2