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 5bb142e65..4fa95b45b 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java +++ b/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java @@ -2,6 +2,7 @@ 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; @@ -31,8 +32,10 @@ public class FragAnimationKit{ 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){ + public static boolean animateOpen(FragmentTransaction transaction){ setAnimations(transaction); + + return getPrefsValue("anim_rtrn_type").equals("noanim") || getPrefsValue("anim_rtrn_type").isEmpty(); } public static void animateClose(FragmentTransaction transaction){ diff --git a/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali b/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali index a6dbd46ae..c3e6cb3b7 100644 --- a/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali +++ b/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali @@ -179,16 +179,20 @@ .end method .method public a(II)V - .locals 1 + .locals 2 .line 7 iget-object v0, p0, Lcom/vk/core/fragments/j/b/ParentSupportFragmentManager;->b:Landroidx/fragment/app/FragmentTransaction; if-eqz v0, :cond_0 - invoke-virtual {v0, p1, p2}, Landroidx/fragment/app/FragmentTransaction;->setCustomAnimations(II)Landroidx/fragment/app/FragmentTransaction; + invoke-static {v0}, Lru/vtosters/lite/utils/FragAnimationKit;->animateOpen(Landroidx/fragment/app/FragmentTransaction;)Z - invoke-static {v0}, Lru/vtosters/lite/utils/FragAnimationKit;->animateOpen(Landroidx/fragment/app/FragmentTransaction;)V + move-result v1 + + if-eqz v1, :cond_0 + + invoke-virtual {v0, p1, p2}, Landroidx/fragment/app/FragmentTransaction;->setCustomAnimations(II)Landroidx/fragment/app/FragmentTransaction; :cond_0 return-void