diff --git a/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java b/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java index daf21361b..7cf333e40 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java +++ b/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java @@ -8,21 +8,27 @@ import android.content.res.Resources; import androidx.fragment.app.FragmentTransaction; public class FragAnimationKit { + // Q private static final int actOpenEnter = getIdentifier("q_enter", "anim"); + private static final int actOpenExit = getIdentifier("q_exit", "anim"); + private static final int actCloseEnter = getIdentifier("q_pop_enter", "anim"); private static final int actCloseExit = getIdentifier("q_pop_exit", "anim"); // Slide private static final int SactOpenEnter = getIdentifier("legacy_enter", "anim"); + private static final int SactOpenExit = getIdentifier("legacy_exit", "anim"); + private static final int SactCloseEnter = getIdentifier("legacy_pop_enter", "anim"); private static final int SactCloseExit = getIdentifier("legacy_pop_exit", "anim"); - // Fade - private static final int FadeOpenEnter = getIdentifier("vkme_enter_slide_up", "anim"); - private static final int FadeCloseExit = getIdentifier("vkme_enter_slide_down", "anim"); // System private static final Resources resources = Resources.getSystem(); private static final int SSactOpenEnter = resources.getIdentifier("activity_open_enter", "anim","android"); + private static final int SSactOpenExit = resources.getIdentifier("activity_open_exit", "anim", "android"); + private static final int SSactCloseEnter = resources.getIdentifier("activity_close_enter", "anim", "android"); private static final int SSactCloseExit = resources.getIdentifier("activity_close_exit", "anim", "android"); // System [task] private static final int SSTactOpenEnter = resources.getIdentifier("task_open_enter", "anim","android"); + private static final int SSTactOpenExit = resources.getIdentifier("task_open_exit", "anim", "android"); + private static final int SSTactCloseEnter = resources.getIdentifier("task_close_enter", "anim", "android"); private static final int SSTactCloseExit = resources.getIdentifier("task_close_exit", "anim", "android"); public static void animateOpen(FragmentTransaction transaction) { @@ -37,32 +43,40 @@ public class FragAnimationKit { if (transaction != null && !getPrefsValue("anim_rtrn_type").equals("noanim")) { switch (getPrefsValue("anim_rtrn_type")) { case "q": - transaction.a( + transaction.setCustomAnimations( actOpenEnter, + actOpenExit, + actCloseEnter, actCloseExit ); break; - case "fade": - transaction.a( - FadeOpenEnter, - FadeCloseExit - ); - break; case "slide": - transaction.a( + transaction.setCustomAnimations( SactOpenEnter, + SactOpenExit, + SactCloseEnter, SactCloseExit ); break; case "system": - transaction.a( + transaction.setCustomAnimations( SSactOpenEnter, + SSactOpenExit, + SSactCloseEnter, SSactCloseExit ); break; + case "frag_enter": + transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN); + break; + case "frag_fade": + transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE); + break; case "system_task": - transaction.a( + transaction.setCustomAnimations( SSTactOpenEnter, + SSTactOpenExit, + SSTactCloseEnter, SSTactCloseExit ); break; diff --git a/smali/assets/version.properties b/smali/assets/version.properties index 8f0fa7f10..4896248d6 100644 --- a/smali/assets/version.properties +++ b/smali/assets/version.properties @@ -1,15 +1,15 @@ -VERSION_BUILD=ae722e6 -VERSION_BRANCH=master +VERSION_BUILD=3125ba2 +VERSION_BRANCH=vtl-remaster VERSION_BASE= -VERSION_BRANCHID=master -VERSION_BRANCHTYPE=master -VERSION_COMMIT=ae722e689ea4a7f7eb2563c36b1bbb7fe7f57192 +VERSION_BRANCHID=vtl-remaster +VERSION_BRANCHTYPE=vtl-remaster +VERSION_COMMIT=3125ba2f8a9b725397c92552df50429b838c36f5 VERSION_GRADLE= -VERSION_DISPLAY=master-ae722e6-dirty -VERSION_FULL=master-ae722e6-dirty +VERSION_DISPLAY=vtl-remaster-3125ba2-dirty +VERSION_FULL=vtl-remaster-3125ba2-dirty VERSION_SCM=git VERSION_TAG= -VERSION_LAST_TAG= +VERSION_LAST_TAG=v0.2.9-beta2 VERSION_DIRTY=true VERSION_VERSIONCODE=0 VERSION_MAJOR=0 diff --git a/smali/res/anim/abc_grow_fade_in_from_bottom.xml b/smali/res/anim/abc_grow_fade_in_from_bottom.xml index c406d8a44..3901a3a3f 100644 --- a/smali/res/anim/abc_grow_fade_in_from_bottom.xml +++ b/smali/res/anim/abc_grow_fade_in_from_bottom.xml @@ -1,6 +1,18 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/abc_popup_enter.xml b/smali/res/anim/abc_popup_enter.xml index 6f69f109d..d75541d91 100644 --- a/smali/res/anim/abc_popup_enter.xml +++ b/smali/res/anim/abc_popup_enter.xml @@ -1,5 +1,9 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/abc_popup_exit.xml b/smali/res/anim/abc_popup_exit.xml index 9cef3bab9..a92110f30 100644 --- a/smali/res/anim/abc_popup_exit.xml +++ b/smali/res/anim/abc_popup_exit.xml @@ -1,5 +1,9 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/abc_shrink_fade_out_from_bottom.xml b/smali/res/anim/abc_shrink_fade_out_from_bottom.xml index 7c33048fe..d7a82caa8 100644 --- a/smali/res/anim/abc_shrink_fade_out_from_bottom.xml +++ b/smali/res/anim/abc_shrink_fade_out_from_bottom.xml @@ -1,6 +1,18 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/abc_tooltip_enter.xml b/smali/res/anim/abc_tooltip_enter.xml index 97dfcc276..f7d7771a5 100644 --- a/smali/res/anim/abc_tooltip_enter.xml +++ b/smali/res/anim/abc_tooltip_enter.xml @@ -1,3 +1,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/abc_tooltip_exit.xml b/smali/res/anim/abc_tooltip_exit.xml index 1cdba77cd..d3ebde7f3 100644 --- a/smali/res/anim/abc_tooltip_exit.xml +++ b/smali/res/anim/abc_tooltip_exit.xml @@ -1,3 +1,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/activity_close_enter.xml b/smali/res/anim/activity_close_enter.xml index ceefa3171..f737dd9c3 100644 --- a/smali/res/anim/activity_close_enter.xml +++ b/smali/res/anim/activity_close_enter.xml @@ -1,5 +1,11 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/activity_close_exit.xml b/smali/res/anim/activity_close_exit.xml index a0856c6ac..ec8fbe68c 100644 --- a/smali/res/anim/activity_close_exit.xml +++ b/smali/res/anim/activity_close_exit.xml @@ -1,6 +1,25 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/activity_posting_slide_in.xml b/smali/res/anim/activity_posting_slide_in.xml index 535a88401..3fe4e5391 100644 --- a/smali/res/anim/activity_posting_slide_in.xml +++ b/smali/res/anim/activity_posting_slide_in.xml @@ -1,5 +1,8 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/activity_posting_slide_out.xml b/smali/res/anim/activity_posting_slide_out.xml index eddbe7b24..4a1cb3856 100644 --- a/smali/res/anim/activity_posting_slide_out.xml +++ b/smali/res/anim/activity_posting_slide_out.xml @@ -1,5 +1,8 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/bottom_sheet_slide_in.xml b/smali/res/anim/bottom_sheet_slide_in.xml index 40f87fb69..3c0d60187 100644 --- a/smali/res/anim/bottom_sheet_slide_in.xml +++ b/smali/res/anim/bottom_sheet_slide_in.xml @@ -1,5 +1,8 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/bottom_sheet_slide_out.xml b/smali/res/anim/bottom_sheet_slide_out.xml index 31bf5e631..9aebffc36 100644 --- a/smali/res/anim/bottom_sheet_slide_out.xml +++ b/smali/res/anim/bottom_sheet_slide_out.xml @@ -1,5 +1,8 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/button_raise.xml b/smali/res/anim/button_raise.xml index a4d44d268..4009e4f63 100644 --- a/smali/res/anim/button_raise.xml +++ b/smali/res/anim/button_raise.xml @@ -1,10 +1,19 @@ - - - + + + - + \ No newline at end of file diff --git a/smali/res/anim/button_raise_big.xml b/smali/res/anim/button_raise_big.xml index f4e4caab0..78598097d 100644 --- a/smali/res/anim/button_raise_big.xml +++ b/smali/res/anim/button_raise_big.xml @@ -1,10 +1,19 @@ - - - + + + - + \ No newline at end of file diff --git a/smali/res/anim/design_bottom_sheet_slide_in.xml b/smali/res/anim/design_bottom_sheet_slide_in.xml index 97b797e2c..2c565017b 100644 --- a/smali/res/anim/design_bottom_sheet_slide_in.xml +++ b/smali/res/anim/design_bottom_sheet_slide_in.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/design_bottom_sheet_slide_out.xml b/smali/res/anim/design_bottom_sheet_slide_out.xml index e41f359c4..c095a1101 100644 --- a/smali/res/anim/design_bottom_sheet_slide_out.xml +++ b/smali/res/anim/design_bottom_sheet_slide_out.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/design_snackbar_in.xml b/smali/res/anim/design_snackbar_in.xml index b6382c8e1..6f281931a 100644 --- a/smali/res/anim/design_snackbar_in.xml +++ b/smali/res/anim/design_snackbar_in.xml @@ -1,3 +1,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/design_snackbar_out.xml b/smali/res/anim/design_snackbar_out.xml index f2048ab6c..1bd19ebe5 100644 --- a/smali/res/anim/design_snackbar_out.xml +++ b/smali/res/anim/design_snackbar_out.xml @@ -1,3 +1,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/fade_out_fast.xml b/smali/res/anim/fade_out_fast.xml index df291ed8b..2ba6dd18b 100644 --- a/smali/res/anim/fade_out_fast.xml +++ b/smali/res/anim/fade_out_fast.xml @@ -1,3 +1,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/fast_out_extra_slow_in.xml b/smali/res/anim/fast_out_extra_slow_in.xml new file mode 100644 index 000000000..c16e16ce6 --- /dev/null +++ b/smali/res/anim/fast_out_extra_slow_in.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/smali/res/anim/fast_out_linear_in.xml b/smali/res/anim/fast_out_linear_in.xml index 07ccd53d9..9fda06e59 100644 --- a/smali/res/anim/fast_out_linear_in.xml +++ b/smali/res/anim/fast_out_linear_in.xml @@ -1,3 +1,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/fr_exit.xml b/smali/res/anim/fr_exit.xml index 03ffb6f27..7fbdb7ed1 100644 --- a/smali/res/anim/fr_exit.xml +++ b/smali/res/anim/fr_exit.xml @@ -1,5 +1,7 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/grow_fade_in.xml b/smali/res/anim/grow_fade_in.xml index c19a56de7..67bbcc284 100644 --- a/smali/res/anim/grow_fade_in.xml +++ b/smali/res/anim/grow_fade_in.xml @@ -1,6 +1,16 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/item_animation_fall_down.xml b/smali/res/anim/item_animation_fall_down.xml index 052cb7e0d..2e1ca395e 100644 --- a/smali/res/anim/item_animation_fall_down.xml +++ b/smali/res/anim/item_animation_fall_down.xml @@ -1,6 +1,12 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/item_animation_fall_up.xml b/smali/res/anim/item_animation_fall_up.xml index c9df7ee37..444675459 100644 --- a/smali/res/anim/item_animation_fall_up.xml +++ b/smali/res/anim/item_animation_fall_up.xml @@ -1,6 +1,12 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/keyboard_pop_up_animation_enter.xml b/smali/res/anim/keyboard_pop_up_animation_enter.xml index 1cda33826..910e94904 100644 --- a/smali/res/anim/keyboard_pop_up_animation_enter.xml +++ b/smali/res/anim/keyboard_pop_up_animation_enter.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/keyboard_pop_up_animation_exit.xml b/smali/res/anim/keyboard_pop_up_animation_exit.xml index 29de4fda1..24db262bc 100644 --- a/smali/res/anim/keyboard_pop_up_animation_exit.xml +++ b/smali/res/anim/keyboard_pop_up_animation_exit.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/layout_animation_fall_down.xml b/smali/res/anim/layout_animation_fall_down.xml index dced53325..288892295 100644 --- a/smali/res/anim/layout_animation_fall_down.xml +++ b/smali/res/anim/layout_animation_fall_down.xml @@ -1,3 +1,5 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/layout_animation_fall_up.xml b/smali/res/anim/layout_animation_fall_up.xml index 7140625c0..76ab3de36 100644 --- a/smali/res/anim/layout_animation_fall_up.xml +++ b/smali/res/anim/layout_animation_fall_up.xml @@ -1,3 +1,5 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/legacy_enter.xml b/smali/res/anim/legacy_enter.xml new file mode 100644 index 000000000..423a22935 --- /dev/null +++ b/smali/res/anim/legacy_enter.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/smali/res/anim/legacy_exit.xml b/smali/res/anim/legacy_exit.xml new file mode 100644 index 000000000..fae2891fb --- /dev/null +++ b/smali/res/anim/legacy_exit.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/smali/res/anim/legacy_pop_enter.xml b/smali/res/anim/legacy_pop_enter.xml new file mode 100644 index 000000000..32597e9a6 --- /dev/null +++ b/smali/res/anim/legacy_pop_enter.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/smali/res/anim/legacy_pop_exit.xml b/smali/res/anim/legacy_pop_exit.xml new file mode 100644 index 000000000..b074ed8b8 --- /dev/null +++ b/smali/res/anim/legacy_pop_exit.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/smali/res/anim/linear.xml b/smali/res/anim/linear.xml new file mode 100644 index 000000000..d9686f65d --- /dev/null +++ b/smali/res/anim/linear.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/smali/res/anim/linear_out_slow_in.xml b/smali/res/anim/linear_out_slow_in.xml index ef340a5c4..f2dcf4c92 100644 --- a/smali/res/anim/linear_out_slow_in.xml +++ b/smali/res/anim/linear_out_slow_in.xml @@ -1,3 +1,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/live_combo_bounce.xml b/smali/res/anim/live_combo_bounce.xml index 0c5f1ff03..aee605df9 100644 --- a/smali/res/anim/live_combo_bounce.xml +++ b/smali/res/anim/live_combo_bounce.xml @@ -1,5 +1,16 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/live_like_butt_bounce.xml b/smali/res/anim/live_like_butt_bounce.xml index 5fcb743ce..2c21e9068 100644 --- a/smali/res/anim/live_like_butt_bounce.xml +++ b/smali/res/anim/live_like_butt_bounce.xml @@ -1,5 +1,16 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/noop.xml b/smali/res/anim/noop.xml index e04aefcd5..cdf6350da 100644 --- a/smali/res/anim/noop.xml +++ b/smali/res/anim/noop.xml @@ -1,5 +1,8 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/picker_dialog_enter.xml b/smali/res/anim/picker_dialog_enter.xml index 4a851939d..ce513c20a 100644 --- a/smali/res/anim/picker_dialog_enter.xml +++ b/smali/res/anim/picker_dialog_enter.xml @@ -1,3 +1,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/picker_dialog_exit.xml b/smali/res/anim/picker_dialog_exit.xml index dcc71a3d6..f85057d3f 100644 --- a/smali/res/anim/picker_dialog_exit.xml +++ b/smali/res/anim/picker_dialog_exit.xml @@ -1,3 +1,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/picker_dialog_no_animation.xml b/smali/res/anim/picker_dialog_no_animation.xml index 768e3f7c5..c2f356314 100644 --- a/smali/res/anim/picker_dialog_no_animation.xml +++ b/smali/res/anim/picker_dialog_no_animation.xml @@ -1,3 +1,3 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/player_exit.xml b/smali/res/anim/player_exit.xml index eb2e91e48..f73bfe655 100644 --- a/smali/res/anim/player_exit.xml +++ b/smali/res/anim/player_exit.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/popup_menu_open.xml b/smali/res/anim/popup_menu_open.xml index 20cd0d16b..cca40c8c5 100644 --- a/smali/res/anim/popup_menu_open.xml +++ b/smali/res/anim/popup_menu_open.xml @@ -1,6 +1,18 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/push_down_in.xml b/smali/res/anim/push_down_in.xml index c3dabb0eb..c80824c3f 100644 --- a/smali/res/anim/push_down_in.xml +++ b/smali/res/anim/push_down_in.xml @@ -1,5 +1,9 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/push_down_out.xml b/smali/res/anim/push_down_out.xml index 2470f9a78..84c57d361 100644 --- a/smali/res/anim/push_down_out.xml +++ b/smali/res/anim/push_down_out.xml @@ -1,5 +1,10 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/push_up_in.xml b/smali/res/anim/push_up_in.xml index 4856e6223..a8cf86b7b 100644 --- a/smali/res/anim/push_up_in.xml +++ b/smali/res/anim/push_up_in.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/push_up_out.xml b/smali/res/anim/push_up_out.xml index 636a19b58..803a5af73 100644 --- a/smali/res/anim/push_up_out.xml +++ b/smali/res/anim/push_up_out.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/q_enter.xml b/smali/res/anim/q_enter.xml new file mode 100644 index 000000000..effbef55c --- /dev/null +++ b/smali/res/anim/q_enter.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/smali/res/anim/q_exit.xml b/smali/res/anim/q_exit.xml new file mode 100644 index 000000000..c699ae373 --- /dev/null +++ b/smali/res/anim/q_exit.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/smali/res/anim/q_pop_enter.xml b/smali/res/anim/q_pop_enter.xml new file mode 100644 index 000000000..3b20e178b --- /dev/null +++ b/smali/res/anim/q_pop_enter.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/smali/res/anim/q_pop_exit.xml b/smali/res/anim/q_pop_exit.xml new file mode 100644 index 000000000..ab3b76c92 --- /dev/null +++ b/smali/res/anim/q_pop_exit.xml @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/smali/res/anim/shrink_fade_out.xml b/smali/res/anim/shrink_fade_out.xml index 51c361aeb..85c2e7662 100644 --- a/smali/res/anim/shrink_fade_out.xml +++ b/smali/res/anim/shrink_fade_out.xml @@ -1,6 +1,16 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/slide_bottom_in_fast.xml b/smali/res/anim/slide_bottom_in_fast.xml index 88727e7d3..6c0d535f0 100644 --- a/smali/res/anim/slide_bottom_in_fast.xml +++ b/smali/res/anim/slide_bottom_in_fast.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/slide_in.xml b/smali/res/anim/slide_in.xml index fc1e8b88d..4bfb9d9ef 100644 --- a/smali/res/anim/slide_in.xml +++ b/smali/res/anim/slide_in.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/slide_top_in.xml b/smali/res/anim/slide_top_in.xml index addc5fd57..369926547 100644 --- a/smali/res/anim/slide_top_in.xml +++ b/smali/res/anim/slide_top_in.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/slide_top_out.xml b/smali/res/anim/slide_top_out.xml index ddc1b6a3f..541f969b0 100644 --- a/smali/res/anim/slide_top_out.xml +++ b/smali/res/anim/slide_top_out.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/sticker_dialog_in.xml b/smali/res/anim/sticker_dialog_in.xml index 55e68819a..9eb1c142b 100644 --- a/smali/res/anim/sticker_dialog_in.xml +++ b/smali/res/anim/sticker_dialog_in.xml @@ -1,6 +1,13 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/sticker_dialog_out.xml b/smali/res/anim/sticker_dialog_out.xml index 2b068ab65..4cf1495f8 100644 --- a/smali/res/anim/sticker_dialog_out.xml +++ b/smali/res/anim/sticker_dialog_out.xml @@ -1,6 +1,13 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/stories_ask_question_author_in.xml b/smali/res/anim/stories_ask_question_author_in.xml index 3e371ae6d..e7a6d0fdc 100644 --- a/smali/res/anim/stories_ask_question_author_in.xml +++ b/smali/res/anim/stories_ask_question_author_in.xml @@ -1,6 +1,13 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/stories_ask_question_author_out.xml b/smali/res/anim/stories_ask_question_author_out.xml index c7861b9ac..9847c4d70 100644 --- a/smali/res/anim/stories_ask_question_author_out.xml +++ b/smali/res/anim/stories_ask_question_author_out.xml @@ -1,6 +1,13 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/stories_no_anim.xml b/smali/res/anim/stories_no_anim.xml index aed6fbf67..64a1b4c7a 100644 --- a/smali/res/anim/stories_no_anim.xml +++ b/smali/res/anim/stories_no_anim.xml @@ -1,5 +1,7 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/stories_slide_in_from_bottom.xml b/smali/res/anim/stories_slide_in_from_bottom.xml index 1232ceaa7..7c02fc73c 100644 --- a/smali/res/anim/stories_slide_in_from_bottom.xml +++ b/smali/res/anim/stories_slide_in_from_bottom.xml @@ -1,5 +1,8 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/stories_slide_out.xml b/smali/res/anim/stories_slide_out.xml index 36b135b76..2d043849d 100644 --- a/smali/res/anim/stories_slide_out.xml +++ b/smali/res/anim/stories_slide_out.xml @@ -1,6 +1,11 @@ - - - + + + \ No newline at end of file diff --git a/smali/res/anim/vkim_activity_slide_in.xml b/smali/res/anim/vkim_activity_slide_in.xml index c3f5a14cd..413ede59b 100644 --- a/smali/res/anim/vkim_activity_slide_in.xml +++ b/smali/res/anim/vkim_activity_slide_in.xml @@ -1,5 +1,11 @@ - - + + \ No newline at end of file diff --git a/smali/res/anim/vkim_change_theme_enter.xml b/smali/res/anim/vkim_change_theme_enter.xml new file mode 100644 index 000000000..7d59b380f --- /dev/null +++ b/smali/res/anim/vkim_change_theme_enter.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/smali/res/anim/vkim_change_theme_exit.xml b/smali/res/anim/vkim_change_theme_exit.xml new file mode 100644 index 000000000..7aad386be --- /dev/null +++ b/smali/res/anim/vkim_change_theme_exit.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/smali/res/anim/vkme_enter_interpolator.xml b/smali/res/anim/vkme_enter_interpolator.xml index 70e798ffd..61742a920 100644 --- a/smali/res/anim/vkme_enter_interpolator.xml +++ b/smali/res/anim/vkme_enter_interpolator.xml @@ -1,3 +1,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/smali/res/anim/vkme_enter_slide_down.xml b/smali/res/anim/vkme_enter_slide_down.xml index b9de68ee5..eac2e7eb1 100644 --- a/smali/res/anim/vkme_enter_slide_down.xml +++ b/smali/res/anim/vkme_enter_slide_down.xml @@ -1,7 +1,21 @@ - - - - + + + + \ No newline at end of file diff --git a/smali/res/anim/vkme_enter_slide_up.xml b/smali/res/anim/vkme_enter_slide_up.xml index 0f94795e6..90b2acbba 100644 --- a/smali/res/anim/vkme_enter_slide_up.xml +++ b/smali/res/anim/vkme_enter_slide_up.xml @@ -1,7 +1,21 @@ - - - - + + + + \ No newline at end of file diff --git a/smali/res/anim/vkme_exit_noop.xml b/smali/res/anim/vkme_exit_noop.xml index 077ec034e..330c65e68 100644 --- a/smali/res/anim/vkme_exit_noop.xml +++ b/smali/res/anim/vkme_exit_noop.xml @@ -1,5 +1,10 @@ - - + + \ No newline at end of file diff --git a/smali/res/values-ru/arrays.xml b/smali/res/values-ru/arrays.xml index e95fe4eee..8997388ff 100644 --- a/smali/res/values-ru/arrays.xml +++ b/smali/res/values-ru/arrays.xml @@ -543,4 +543,81 @@ В субботу В воскресенье + + Без анимации + Системный + Системный (task) + + + Без анимации + Android Q + Fade + AndroidX + Слайд + Системный + Системный (task) + + + Системный + Английский + Русский + Украинский + + + По умолчанию + Новости + Диалоги + Меню + Профиль + Документы + Прямые эфиры + Дни рождения + Группы + Музыка + Друзья + Фото + Видео + Настройки + Приложения + Дискавер + Уведомления + Перевод средств + Игры + Закладки + + + Без прокси + zaborona.help + Сторонний прокси для API + Сторонний HTTP + Сторонний HTTPS + Сторонний SOCKS + + + По умолчанию + 40 сообщений + 50 сообщений + 70 сообщений + 100 сообщений + 150 сообщений + 200 сообщений + + + По умолчанию + Полностью чёрная + + + По умолчанию + + + [Удалено] + 🗑 + ❌ + + + По умолчанию + 15 апреля в 18:42 + 15 апреля в 18:42:28 + 15 апреля 2022 в 18:42:28 + diff --git a/smali/res/values/arrays.xml b/smali/res/values/arrays.xml index e23518c46..bf7adbc0a 100644 --- a/smali/res/values/arrays.xml +++ b/smali/res/values/arrays.xml @@ -642,4 +642,163 @@ Saturday Sunday + + No Animation + Android Q + Fade + AndroidX + Slide + System + System task + + + noanim + q + frag_fade + frag_enter + slide + system + system_task + + + No Animation + System + System task + + + noanim + system + system_task + + + System + English + Russian + Ukraininan + + + system + en + ru + uk + + + Default + Newsfeed + Dialogs + Menu + Profile + Documents + Lives + Birthdays + Groups + Music + Friends + Photos + Videos + Settings + Apps + Discover + Notifications + Money Transfer + Games + Bookmarks + + + default + newsfeed + messenger + menu + profile + docs + lives + brtd + groups + music + friends + photos + videos + settings + apps + discover + notifications + money + games + liked + + + No Proxy + zaborona.help + Custom API proxy + Custom HTTP + Custom HTTPS + Custom SOCKS + + + noproxy + zaborona + apiproxy + http + https + socks + + + Default + 40 messages + 50 messages + 70 messages + 100 messages + 150 messages + 200 messages + + + 30 + 40 + 50 + 70 + 100 + 150 + 200 + + + Default + + + default + + + Default + Amoled + + + default + amoled + + + Default + Do not update + Immediately update + + + default + no_update + imd_update + + + [Deleted] + 🗑 + ❌ + + + Default + 15 april 18:42 + 15 april 18:42:28 + 15 april 2022 18:42:28 + + + default + noseconds + noyear + full + diff --git a/smali/res/values/ids.xml b/smali/res/values/ids.xml index d46d608f5..895d6aeba 100644 --- a/smali/res/values/ids.xml +++ b/smali/res/values/ids.xml @@ -3893,4 +3893,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml index 300e50eb3..c7790b3b8 100644 --- a/smali/res/values/strings.xml +++ b/smali/res/values/strings.xml @@ -5461,4 +5461,485 @@ with video" Your balance:  Your feedback… Your gender: + + Feed + Interface + Music + Proxy + Other + Activity + Telegram Stickers + Appearance + Messages + VK ID + Bugtracker + Activate promocode + Telegram Channel + Telegram Chat + Our VK Group + FAQ + All your questions are answered here + Our site + Install Google Play Services + Disable Ads + Disable Groups Ads + Posts with ads mark + Disable ad carousel + Disable ads in stories + Ads + Filters + How to make filters? + "Filter format: words or sentences, separated by a comma with a space +Example: #sponsored, Free gift cards, #PROMO +Filters are case-sensitive!" + Custom filter + Standard adblock filter + Blocks posts with common tags, such as #ad, #pr and so on + Use VKUI + Disable away.php redirect + Interface + Calls button + Recording voice messages + The icon for recording voice messages in the message input field + Color navigation bar + Donate + dd MMMM yyyy HH:mm:ss + dd MMMM HH:mm:ss + dd MMMM HH:mm + Short link filter + "Blocks posts containing short links, such as bit.ly or cutt.ly +Does not affect vk.cc links" + Referral links filter + Blocks posts containing referral links, such as ali.pub and so on + Recommendations + Disable friends recommendations + Disable authors recommendations + Disable recommended friends posts + Sticker outlines + Posts like You may be interested + Other + Automatic feed update + Cache feed posts + Disable posts with recommended mark + Message tails + Flat Messages + Update + You need to clear the application cache after toggling this option + VK + Additional information + Copy ID + VT Features + App Icon + Use original icon + The original name and icon of VK + Copy your access token + Kill the app process + Experts + Disable Do Not Type + Enable Do Not Type + Accounts + For Bots/Groups + For Conversations + For Private messages + Alternative type of emoji menu + Alrernative selection of emojis and stickers in the miniature menu + Alternative design of newsfeed + Design with dynamic tabs in the feed + Restart application + Benchmark api + Testing the speed of sending requests. Useless function for everyone except VKontakte developers + Cache cleared + Clear all cache + Clears app cache (except for feed cache) + Fix showing online in conversations + "Fix showing other users online in conversations (only needed if you have hidden your online one) + +Warning! It can cause long downloads of user lists if there are a lot of users in the conversation" + Copied! + Direct + Not set + Socks + Do not read + Status of viewing/checking stories + Do not write + Counters in dockbar + "Disabling doesn't work in the tablet interface" + Notifications have been restored! + FCM token received + FCM token deleted + Update Firebase registration + Correction of receiving notifications after installing GMS or after restoring the backup of the application + " +Days from the date of registration:" + Issues when loading data! + Profile ID: + " +Registration date:" + Get verification on your profile + Applying changes + Emoji and stickers + Global features + Date rounding + "Date rounding of posts and users + +01 Jan 1970 00:00:00 -> 1 Jan 00:00" + Round up numbers + "Round up the numbers of views, comments, likes and reposts + +10000 -> 10k" + Shorten posts + "Shorten the text in posts + +Expand text..." + Feed + Side camera in the news + Works only with classic newsfeed design + Default start fragment + Select start fragment + Video + Use external video player + Use an external video player to play videos + Disable recommended videos + Disable video recommendations at the bottom of the video player with video recommendations + Disable menu shortening + Removes the shortening of items in the application section menu + Add new account + New video catalog + Offline + Online + Open commit + Select update branch + Enable updates at start + Check for updates + Check your internet connection and try again + No updates found + OK + Try again + Update + Update available! + Changelog + Warning! + "Please don't close the app until the end of the update download" + Privacy + Advanced proxy settings + API Domain + Domain + Donate + HTTP Proxy + HTTPS Proxy + Warning! + "Don't use proxy if VK is available in your country + +You need to restart the application to apply proxy settings" + OAuth Domain + Proxy owners + xtrafrancyz site + Proxy server sources + zaborona site + Port + Socks Proxy + Static Domain + Report a bug + Auto cleaning app cache + Cache size: + "Don't clear cache" + Bug reports help us fix them + Please, restart app + Saved messages + Select account + The same type of news + Filter for cleaning posts with the Russian Federation and actions related in Ukraine + Show stories + The story section at the top of the feed + Disable recommendations about donation + Show special verifications + Show verifications + Connection type + Delete the Telegram bot key + The key was deleted successfully + Network + Stickers + Socks Settings + Authorization + Host + Login + Password + Port + Invalid port + Checking API key + 2. Copy the bot token that the bot will send you and paste it into the application + Invalid Bot API key + Error checking the key! + Try again + Enter the TG Bot API key + Get it using the bot @BotFather + More details + Instructions for obtaining a key + "1. Create a bot at @BotFather (Telegram) +" + Choose the connection method! + stickers + Enter the URL or the sticker pack ID + The link must be in the format https://t.me/addstickers/\"ID\" + Configure the IP proxy! + Stories + Use system emojis + Your system emojis - 😀😁🤑🥵👍 + "Don't give this token to anyone if you don't know what to do!" + Proxy variant + Information about using a proxy + Select the proxy variant + Coloring web pages + Tracking the user to personalize ads. Also checking links to the blacklist from VKontakte and antivirus + Send online status + Force offline + "Works only when online status sending is disabled. Sends instantly offline after sending messages and other api methods that are sent online + +May look like a fake leaving the online" + Disabling online will allow you to stay offline + Internal settings + VTosters verifications + What are VTosters verifications? + This is our gratitude for the support of the project + Updates + + Regular ads in feed between posts + Ads with list (of goods) + Ads in stories + Disable posts with source + More often posts ad posts with advertiser source tag + + Recommend potential friends + Recommend popular authors\' posts friends + Recommend posts that your friends like + + Audo update news + Choose update type + Sort comments + Sort comments by newest + Keep cached posts in feed + Built-in news settings + Official news settings built-in into the client + + Useful information + To apply theme changes you should toggle the theme + Choose a theme + Dark app theme + Light app theme + Use system theme + Apply system theme on app start + + If systemically available + Color pages such as VKID in app theme + + Old icons + You should reset its setting to apply changes + + What is it? + Function lets you don\'t send read message status + Function lets you don\'t send write message status + Function lets you don\'t send read stories status + + Warning! + Visually may not work correctly (locally read), but companion will see that it wasn\'t read. + + Anti-delete messages + Deleted message tag + Choose message tag + Keep deleted messages + May not save attachments + + Call icon in messages + May not work correctly with attachments + Choose count + Amount of messages downloaded at once + + VK X + Why? + Integration let you use VK X features directly in VTosters Lite\n\nIn addition to playback, cached tracks also will work in client + Download VK X + VK X Integration + Other + Fix the music tab + Use when music tab doesn\'t work (no tracks/\'listen in official VK app\') or there is no GMS component + + If available + Login + Password + + Fixing the app + Clear stickers cache + Fix loading stickers when they are completely absent + Reset settings + Resets turned on functions of VTLite to defaults + Fix colors on Android 12+ + + Dockbar editor + Save + Reset + Selected items + Disabled items + + Add new account + + Check for updates + + Warning! + These options are for testing this app only. If you are a regular user, please, don\'t use them + Show debug category in settings + + Experimental + Profile editing? + Page stats + VK Devs seems to have stopped sending info + VK Sans font + VK Me dialogs mode + libverify support + Turning on may fix 2fa login + Opus Module + App language + Choose language of the app + + Developer options + Developer mode + Force tester/dev/employee account and debug/deploy version. Only for extended debugging + SSL Pinning + HTTPS certificate checking. Turning off let sniff app\'s traffic + Dark mode + isMusicRestricted + VK music restriction. Actually doesn\'t restrict anything, because everything is removed + hasMusicSubscription + Music subscription + Return old about screen + SSFS domain + + Domains + Domain editing + All domain editing logic moved to proxy settings + API domain + OAuth domain + VK UI host uri + VK UI SPA uri + away.php domain + + Logging + Record logs to file + Record app logs. Works until app\'s full stop + API logging + Log API along with main logging + Show API errors + Display API errors as toasts + WebView debugging + Immediately send stats + view_post_time visualisation + Highlight posts on view_post_time event + Allow breakpoints + Allow request breakpoints through proxy (Charles) + Apply spaces + Apply spaces for messages after longpoll history + Turn on MemLeak detect + + Cache + Clear 2fa hash + Clear WebView cache + Clear video cache + + System + Language override + Kill the app + Update Firebase device registration + Copy push token + Update Google Now + + Tests + Test BD notification + Test need_validation error + Test captcha error + Test system error + Test ad + pretty_cards demo + Test VK UI uri + Test VK UI + + Official VK Proxy + Force VK Proxy features + VK solutions for their proxy + Proxy + Won\'t work + + Other + + Enable Do Not Read + Disable Do Not Read + + An error has occurred in VTL! + Upload logs + Save to local file + + Disable battery optimization! + Due to the fact that you are using a third-party firmware from the list below, notifications may come with a delay or not at all. \n Click on the \"Disable optimization\" button to fix this problem. \n\nThird-party firmware on which problems with push are observed:\nFlyme, EMUI, MIUI, ColorOS, Samsung Experience or TouchWiz, Magic UI, ZenUI, Funtouch OS + Disable optimization + Ignore + + There is no Google Play Services (GMS) component on your device, which is necessary for VTosters Lite to work correctly + Continue without GMS + Install GMS + + The VTosters Lite modification has nothing with VK Group!\nDistributed completely free of fee! + \n\nThe application may not work correctly due to the fact that you are most likely using the shell from the list below. All problems with the display and work of the application are related only to your firmware and only with it. All bug reports sent due to problems on this firmware are not considered by the developers and will not be fixed.\n\n Pressing the \"Continue\" button, you agree that possible application bugs may occur due to the specifics of your firmware. We recommend using AOSP-based firmware for maximum stability.\n\n Firmware on which there are problems with applications:\nFlyme, EMUI, MIUI, ColorOS, Samsung Experience or TouchWiz, Magic UI, ZenUI, Funtouch OS + News + Continue + + This video cannot be downloaded + + Rounded messages + + Select the date display type + + Fragment animation (beta) + Select fragment animation + + VK Me mode + Replacing the dock and some elements with something similar as in VK Me + + Account + Dark theme + About modification + Mod settings + + Enabled + Disabled + + No + Yes + + Block ads + Dockbar elements + VKX Integration + VK Me mode + Offline mode + Navbar coloring + Installed packs + Round numbers + Proxy + Show verifications + Available accounts + Hide settings summaries + + Have access + Auto updates + Updates + + Back notification tab to dock + Update + New version + Changelog + Download error + Online is hidden + + Download as mp3 + Delete from cache + + Disable protection + VK has started blocking the use of third-party applications, so for the stable operation of all parts of the application, it is necessary to disable Protection from suspicious applications \n\nVK ID -> Security and Login -> Protection from suspicious applications diff --git a/smali/res/xml/empty.xml b/smali/res/xml/empty.xml new file mode 100644 index 000000000..aa4cb0ecb --- /dev/null +++ b/smali/res/xml/empty.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/smali/res/xml/preferences_activity.xml b/smali/res/xml/preferences_activity.xml new file mode 100644 index 000000000..053263f75 --- /dev/null +++ b/smali/res/xml/preferences_activity.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml new file mode 100644 index 000000000..47b9403b9 --- /dev/null +++ b/smali/res/xml/preferences_feed.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smali/res/xml/preferences_gms.xml b/smali/res/xml/preferences_gms.xml new file mode 100644 index 000000000..578cc12c2 --- /dev/null +++ b/smali/res/xml/preferences_gms.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smali/res/xml/preferences_interface.xml b/smali/res/xml/preferences_interface.xml new file mode 100644 index 000000000..5b0397ea9 --- /dev/null +++ b/smali/res/xml/preferences_interface.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smali/res/xml/preferences_messages.xml b/smali/res/xml/preferences_messages.xml new file mode 100644 index 000000000..3637c4a28 --- /dev/null +++ b/smali/res/xml/preferences_messages.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smali/res/xml/preferences_music.xml b/smali/res/xml/preferences_music.xml new file mode 100644 index 000000000..2c78184de --- /dev/null +++ b/smali/res/xml/preferences_music.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smali/res/xml/preferences_other.xml b/smali/res/xml/preferences_other.xml new file mode 100644 index 000000000..41ed8cb71 --- /dev/null +++ b/smali/res/xml/preferences_other.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smali/res/xml/preferences_proxy.xml b/smali/res/xml/preferences_proxy.xml new file mode 100644 index 000000000..06d5e5e10 --- /dev/null +++ b/smali/res/xml/preferences_proxy.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smali/res/xml/preferences_tgs.xml b/smali/res/xml/preferences_tgs.xml new file mode 100644 index 000000000..aa4cb0ecb --- /dev/null +++ b/smali/res/xml/preferences_tgs.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/smali/res/xml/preferences_themes.xml b/smali/res/xml/preferences_themes.xml new file mode 100644 index 000000000..117686c99 --- /dev/null +++ b/smali/res/xml/preferences_themes.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file