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

Fixed some translations + fixed settings logic

Browse Source
This commit is contained in:
gdlbo
2022-06-07 11:24:44 +03:00
parent 55d02a8412
commit 897382de2b
10 changed files with 71 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vtosters/lite/R.java
+3 -3
View File
@@ -15130,10 +15130,10 @@ public final class R {
public static final int proxy_login_title = 0x7f1112b6;
public static final int proxy_password_title = 0x7f1112b7;
public static final int vkx_download = 0x7f1112b8;
public static final int vkx_fix_music = 0x7f1112b9;
public static final int vkx_fix_music_summary = 0x7f1112ba;
public static final int vk_fix_music = 0x7f1112b9;
public static final int vk_fix_music_summary = 0x7f1112ba;
public static final int vkx_integration = 0x7f1112bb;
public static final int vkx_other = 0x7f1112bc;
public static final int vk_fix_music_other = 0x7f1112bc;
public static final int vkx_title = 0x7f1112bd;
public static final int vkx_why = 0x7f1112be;
public static final int vkx_why_summary = 0x7f1112bf;
app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class DeletedMessagesHandler {
}
public static boolean hook() {
return getBoolValue("undeletemsg", false);
return getBoolValue("undeletemsg", true);
}
public static void setBodyDBParser(Msg msg) {
app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
+8 -8
View File
@@ -108,16 +108,16 @@ public class Newsfeed {
} // json newsfeed/posts injector to detect and delete posts
public static boolean authors_rec(String str) {
return str.equals("authors_rec") && !authorsrecomm();
return str.equals("authors_rec") && authorsrecomm();
}
public static boolean captions(JSONObject jSONObject) {
try {
JSONObject jSONObject2 = jSONObject.getJSONObject("caption");
if (!Preferences.captions()) {
if (Preferences.captions()) {
return true;
}
return (jSONObject2.getString(NavigatorKeys.j).equals("explorebait") && !postsrecomm()) || ((jSONObject2.getString(NavigatorKeys.j).equals("shared") && postsrecomm()) || ((jSONObject.getString(NavigatorKeys.j).equals("digest") && postsrecomm()) || ((jSONObject2.getString(NavigatorKeys.j).equals("commented") && postsrecomm()) || (jSONObject2.getString(NavigatorKeys.j).equals("voted") && postsrecomm()))));
return (jSONObject2.getString(NavigatorKeys.j).equals("explorebait") && postsrecomm()) || ((jSONObject2.getString(NavigatorKeys.j).equals("shared") && !postsrecomm()) || ((jSONObject.getString(NavigatorKeys.j).equals("digest") && !postsrecomm()) || ((jSONObject2.getString(NavigatorKeys.j).equals("commented") && !postsrecomm()) || (jSONObject2.getString(NavigatorKeys.j).equals("voted") && !postsrecomm()))));
} catch (JSONException unused) {
return false;
}
@@ -131,11 +131,11 @@ public class Newsfeed {
}
public static boolean recomm(String str) {
return (str.equals("user_rec") || str.equals("live_recommended") || str.equals("inline_user_rec")) && !postsrecomm();
return (str.equals("user_rec") || str.equals("live_recommended") || str.equals("inline_user_rec")) && postsrecomm();
}
public static boolean friendrecomm(String str) {
return str.equals("friends_recommendations") && !friendsrecomm();
return str.equals("friends_recommendations") && friendsrecomm();
}
public static boolean AD(JSONObject jSONObject) {
@@ -147,15 +147,15 @@ public class Newsfeed {
}
public static String friendsads() {
return postsrecomm() ? "user_rec" : "null";
return !postsrecomm() ? "user_rec" : "null";
}
public static String getFriendRecomm() {
return friendsrecomm() ? "friends_recommendations" : "null";
return !friendsrecomm() ? "friends_recommendations" : "null";
}
public static String authorsads() {
return authorsrecomm() ? "authors_rec" : "null";
return !authorsrecomm() ? "authors_rec" : "null";
}
public static String widgetads() {
app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+6 -6
View File
@@ -59,11 +59,11 @@ public class Preferences {
}
public static boolean authorsrecomm() {
return getBoolValue("authorsrecomm", true);
return getBoolValue("authorsrecomm", false);
}
public static boolean captions() {
return getBoolValue("captions", true);
return getBoolValue("captions", false);
}
public static boolean copyright_post() {
@@ -79,7 +79,7 @@ public class Preferences {
}
public static boolean friendsrecomm() {
return getBoolValue("friendsrecomm", true);
return getBoolValue("friendsrecomm", false);
}
public static boolean isBGStickersEnabled() {
@@ -175,7 +175,7 @@ public class Preferences {
}
public static void forceOffline() {
if (setoffline()) {
if (setoffline() && !offline()) {
Users.b();
}
setupFilters();
@@ -234,7 +234,7 @@ public class Preferences {
}
public static boolean postsrecomm() {
return getBoolValue("postsrecomm", true);
return getBoolValue("postsrecomm", false);
}
public static String readstatus() {
@@ -250,7 +250,7 @@ public class Preferences {
}
public static boolean setoffline() {
return getBoolValue("setoffline", false);
return getBoolValue("setoffline", true);
}
public static boolean shortinfo() {
smali/res/values-ru/strings.xml
+7 -7
View File
@@ -4070,15 +4070,15 @@
<string name="vtlsfilterrefs">Фильтр реферальных ссылок</string>
<string name="vtlsfilterrefssummary">Фильтр для блокировки постов с реферальными ссылками, такими как ali.pub и тд</string>
<string name="vtlrecommend">Рекомендации</string>
<string name="vtlrecommendfriend">Рекомендации друзей</string>
<string name="vtlrecommendauthor">Рекомендации авторов</string>
<string name="vtlrecommendfriendpost">Рекомендации постов друзей</string>
<string name="vtlrecommendfriend">Отключить рекомендации друзей</string>
<string name="vtlrecommendauthor">Отключить рекомендации авторов</string>
<string name="vtlrecommendfriendpost">Отключить рекомендации постов друзей</string>
<string name="BGStickers">Обводка стикеров</string>
<string name="vtlrecommendmarksummary">Посты по типу Вам может быть интересно и тд</string>
<string name="vtlfeedwork">Прочее</string>
<string name="vtlfeedreload">Автоматическое обновление ленты</string>
<string name="vtlfeedcache">Кэшировать посты в ленте</string>
<string name="vtlrecommendmark">Посты с пометкой рекомендовано</string>
<string name="vtlrecommendmark">Отключить посты с пометкой рекомендовано</string>
<string name="vtlmsgtails">Хвосты сообщений</string>
<string name="vtlmsgflat">Плоские сообщения</string>
<string name="vtlupdmsg">Обновить</string>
@@ -4309,9 +4309,9 @@
<string name="vkx_why_summary">Интеграция позволит использовать возможности VK X прямиком в VTosters Lite\n\nКроме воспроизведения, в клиенте будет работать и кеш из плеера</string>
<string name="vkx_download">Скачать VKX</string>
<string name="vkx_integration">Интеграция с VK X</string>
<string name="vkx_other">Прочее</string>
<string name="vkx_fix_music">Исправление музыкального раздела</string>
<string name="vkx_fix_music_summary">Актуально если музыкальный раздел не работает (не отображается музыка или вместо музыки написано Слушайте в официальном приложении ВКонтакте) или же отсутствует компонент GMS</string>
<string name="vk_fix_music_other">Прочее</string>
<string name="vk_fix_music">Исправление музыкального раздела</string>
<string name="vk_fix_music_summary">Актуально если музыкальный раздел не работает (не отображается музыка или вместо музыки написано Слушайте в официальном приложении ВКонтакте) или же отсутствует компонент GMS</string>
<string name="proxy_if">Если имеется</string>
<string name="proxy_login_title">Логин</string>
smali/res/values/public.xml
+3 -3
View File
@@ -15076,10 +15076,10 @@
<public type="string" name="proxy_login_title" id="0x7f1112b6" />
<public type="string" name="proxy_password_title" id="0x7f1112b7" />
<public type="string" name="vkx_download" id="0x7f1112b8" />
<public type="string" name="vkx_fix_music" id="0x7f1112b9" />
<public type="string" name="vkx_fix_music_summary" id="0x7f1112ba" />
<public type="string" name="vk_fix_music" id="0x7f1112b9" />
<public type="string" name="vk_fix_music_summary" id="0x7f1112ba" />
<public type="string" name="vkx_integration" id="0x7f1112bb" />
<public type="string" name="vkx_other" id="0x7f1112bc" />
<public type="string" name="vk_fix_music_other" id="0x7f1112bc" />
<public type="string" name="vkx_title" id="0x7f1112bd" />
<public type="string" name="vkx_why" id="0x7f1112be" />
<public type="string" name="vkx_why_summary" id="0x7f1112bf" />
smali/res/values/strings.xml
+8 -8
View File
@@ -4195,15 +4195,15 @@ Does not affect vk.cc links"</string>
<string name="vtlsfilterrefs">Referral links filter</string>
<string name="vtlsfilterrefssummary">Blocks posts containing referral links, such as ali.pub and so on</string>
<string name="vtlrecommend">Recommendations</string>
<string name="vtlrecommendfriend">Friends recommendations</string>
<string name="vtlrecommendauthor">Authors recommendations</string>
<string name="vtlrecommendfriendpost">"Recommended friends' posts"</string>
<string name="vtlrecommendfriend">Disable friends recommendations</string>
<string name="vtlrecommendauthor">Disable authors recommendations</string>
<string name="vtlrecommendfriendpost">Disable recommended friends posts</string>
<string name="BGStickers">Sticker outlines</string>
<string name="vtlrecommendmarksummary">Posts like You may be interested</string>
<string name="vtlfeedwork">Other</string>
<string name="vtlfeedreload">Automatic feed update</string>
<string name="vtlfeedcache">Cache feed posts</string>
<string name="vtlrecommendmark">Posts with recommended mark</string>
<string name="vtlrecommendmark">Disable posts with recommended mark</string>
<string name="vtlmsgtails">Message tails</string>
<string name="vtlmsgflat">Flat Messages</string>
<string name="vtlupdmsg">Update</string>
@@ -4428,16 +4428,16 @@ May look like a fake leaving the online"</string>
<string name="messages_interface_calls_summary">Call icon in messages</string>
<string name="messages_interface_tails_summary">May not work correctly with attachments</string>
<string name="messages_other_choose_count">Choose count</string>
<string name="messages_other_download_first">First downloaded messages count</string>
<string name="messages_other_download_first">Amount of messages downloaded at once</string>
<string name="vkx_title" translatable="false">VK X</string>
<string name="vkx_why">Why?</string>
<string name="vkx_why_summary">Integration let you use VK X features directly in VTosters Lite\n\nIn addition to playback, cached tracks also will work in client</string>
<string name="vkx_download">Download VK X</string>
<string name="vkx_integration">VK X Integration</string>
<string name="vkx_other">Other</string>
<string name="vkx_fix_music">Fix music section</string>
<string name="vkx_fix_music_summary">Use when music section doesn\'t work (no tracks/\'listen in official VK app\') or there is no GMS component</string>
<string name="vk_fix_music_other">Other</string>
<string name="vk_fix_music">Fix the music tab</string>
<string name="vk_fix_music_summary">Use when music tab doesn\'t work (no tracks/\'listen in official VK app\') or there is no GMS component</string>
<string name="proxy_if">If available</string>
<string name="proxy_login_title">Login</string>
smali/res/xml/preferences_activity.xml
+28 -31
View File
@@ -1,5 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/activity_undel">
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="default"
android:dialogTitle="@string/activity_undel_dial"
android:entries="@array/undel_value"
android:entryValues="@array/undel"
android:key="undeletemsg_prefix"
android:title="@string/activity_undel_tag" />
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="undeletemsg"
android:summary="@string/activity_undel_attachments"
android:title="@string/activity_undel_enable" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/online_vtl">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="offline"
android:summary="@string/vtlofflinesummary"
android:title="@string/vtloffline" />
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="setoffline"
android:summary="@string/vtloffline2summary"
android:title="@string/vtloffline2" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/dnr">
<Preference
android:enabled="false"
@@ -53,37 +81,6 @@
android:title="@string/dns" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/activity_undel">
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="default"
android:dialogTitle="@string/activity_undel_dial"
android:entries="@array/undel_value"
android:entryValues="@array/undel"
android:key="undeletemsg_prefix"
android:title="@string/activity_undel_tag" />
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="undeletemsg"
android:summary="@string/activity_undel_attachments"
android:title="@string/activity_undel_enable" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/online_vtl">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="offline"
android:summary="@string/vtlofflinesummary"
android:title="@string/vtloffline" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/offline_vtl">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="setoffline"
android:summary="@string/vtloffline2summary"
android:title="@string/vtloffline2" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/privacy_vtl">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
smali/res/xml/preferences_feed.xml
+4 -4
View File
@@ -61,22 +61,22 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlrecommend">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="friendsrecomm"
android:summary="@string/feed_recommendations_friends_summary"
android:title="@string/vtlrecommendfriend" />
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="authorsrecomm"
android:summary="@string/feed_recommendations_authors_summary"
android:title="@string/vtlrecommendauthor" />
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="postsrecomm"
android:summary="@string/feed_recommendations_friends_reacted_summary"
android:title="@string/vtlrecommendfriendpost" />
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="captions"
android:summary="@string/vtlrecommendmarksummary"
android:title="@string/vtlrecommendmark" />
smali/res/xml/preferences_music.xml
+3 -3
View File
@@ -18,11 +18,11 @@
android:title="@string/vkx_integration" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vkx_other">
<PreferenceCategory android:title="@string/vk_fix_music_other">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="gcmfix"
android:summary="@string/vkx_fix_music_summary"
android:title="@string/vkx_fix_music" />
android:summary="@string/vk_fix_music_summary"
android:title="@string/vk_fix_music" />
</PreferenceCategory>
</PreferenceScreen>