Fix issues #8

Author: liang02.wang

core/src/main/java/me/liam/helper/FragmentUtils.java

@@ -8,7 +8,6 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import me.liam.support.SupportFragment;
-import me.liam.support.SupportTransaction;
 
 public class FragmentUtils {
 
@@ -105,4 +104,17 @@ public static SupportFragment getBeforeOne(List<SupportFragment> list, SupportFr
         }
         return null;
     }
+
+    public static LinkedList<SupportFragment> getBackStackFragments(FragmentManager fm){
+        LinkedList<SupportFragment> linkedList = new LinkedList<>();
+        for (Fragment f : fm.getFragments()){
+            if (f instanceof SupportFragment
+                    && !f.isRemoving()
+                    && !f.isDetached()
+                    && ((SupportFragment)f).isBackStack()){
+                linkedList.add((SupportFragment)f);
+            }
+        }
+        return linkedList;
+    }
 }

core/src/main/java/me/liam/support/ISupportFragment.java

@@ -15,6 +15,8 @@ public interface ISupportFragment {
 
     public boolean onBackPressed();
 
+    public boolean isBackStack();
+
     public FragmentAnimation onCreateCustomerAnimation();
 
     public void onLazyInit(Bundle savedInstanceState);

core/src/main/java/me/liam/support/SupportActivity.java

@@ -5,6 +5,7 @@
 import android.view.MotionEvent;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 import androidx.annotation.Nullable;
@@ -33,15 +34,21 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     public void onBackPressed() {
         if (fragmentSwipeDrag) return;
-        SupportFragment activeFragment = FragmentUtils.getLastFragment(getSupportFragmentManager());
-        if (activeFragment != null && activeFragment.dispatcherOnBackPressed()){
-            return;
-        }
-        if (FragmentUtils.getInManagerFragments(getSupportFragmentManager()).size() > 1){
+        if (FragmentUtils.getActiveList(getSupportFragmentManager()).size() > 1){
+            SupportFragment activeFragment = FragmentUtils.getLastActiveFragment(getSupportFragmentManager());
+            if (activeFragment == null) {
+                ActivityCompat.finishAfterTransition(this);
+                return;
+            }
+            if (activeFragment.dispatcherOnBackPressed()){
+                return;
+            }
             pop();
         }else {
             ActivityCompat.finishAfterTransition(this);
         }
+
+
     }
 
     @Override

core/src/main/java/me/liam/support/SupportFragment.java

@@ -10,6 +10,8 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 
+import java.util.LinkedList;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -251,8 +253,9 @@ public <T extends SupportFragment> T findChildFragmentByClass(Class cls) {
      */
     @Override
     public boolean dispatcherOnBackPressed() {
-        if (getChildFragmentManager().getFragments().size() > 0){
-            SupportFragment lastActive = FragmentUtils.getLastFragment(getChildFragmentManager());
+        LinkedList<SupportFragment> backStackList = FragmentUtils.getBackStackFragments(getChildFragmentManager());
+        if (backStackList.size() > 0){
+            SupportFragment lastActive = backStackList.getLast();
             if (lastActive != null){
                 return lastActive.dispatcherOnBackPressed();
             }
@@ -266,13 +269,23 @@ public boolean dispatcherOnBackPressed() {
      */
     @Override
     public boolean onBackPressed() {
-        if (getArguments().getBoolean(SupportTransaction.FRAGMENTATION_BACK_STACK)){
+        if (isBackStack()){
             pop();
             return true;
         }
         return false;
     }
 
+    /**
+     * 当前Fragment是否被加入back键回退栈
+     * @return
+     */
+    @Override
+    public boolean isBackStack() {
+        if (getArguments() == null) return false;
+        return getArguments().getBoolean(SupportTransaction.FRAGMENTATION_BACK_STACK);
+    }
+
     /**
      * 重写此方法可完成自定义Fragment动画
      * 重写返回null并不会将Fragment设置为空动画

core/src/main/java/me/liam/support/SupportTransaction.java

@@ -16,7 +16,7 @@
 import me.liam.queue.Action;
 import me.liam.queue.ActionQueue;
 
-public class SupportTransaction {
+class SupportTransaction {
 
     final public static String FRAGMENTATION_CONTAINER_ID = "Fragmentation:ContainerId";
     final public static String FRAGMENTATION_TAG = "Fragmentation:Tag";

demo/src/main/java/wechat/MineFragment.java

@@ -64,17 +64,17 @@ public void onClick(View view) {
         });
         return rootView;
     }
-
-    @Override
-    public boolean onBackPressed() {
-        if (getChildFragmentManager().getFragments().size() > 0){
-            popChild();
-            return true;
-        }else {
-            ((RootFragment)getParentFragment()).onBackPressed();
-            return true;
-        }
-    }
+//
+//    @Override
+//    public boolean onBackPressed() {
+//        if (getChildFragmentManager().getFragments().size() > 0){
+//            popChild();
+//            return true;
+//        }else {
+//            ((RootFragment)getParentFragment()).onBackPressed();
+//            return true;
+//        }
+//    }
 
     @Override
     public void onLazyInit(Bundle savedInstanceState) {

demo/src/main/java/wechat/RootFragment.java

@@ -77,13 +77,13 @@ public void onSelect(int position) {
 
     @Override
     public boolean onBackPressed() {
-//        return super.onBackPressed();
-        if (!homePageFragment.isVisible()){
-            showHideAllFragment(homePageFragment);
-            return true;
-        }else {
-            getActivity().finish();
-            return true;
-        }
+        return super.onBackPressed();
+//        if (!homePageFragment.isVisible()){
+//            showHideAllFragment(homePageFragment);
+//            return true;
+//        }else {
+//            getActivity().finish();
+//            return true;
+//        }
     }
 }