Merge pull request #1172 from liaolintao/master

fix some bugs

Author: YoKeyword

build.gradle

@@ -13,8 +13,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }
 

demo/build.gradle

@@ -52,17 +52,17 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile "com.android.support:appcompat-v7:$rootProject.v4Version"
-    compile "com.android.support:design:$rootProject.v4Version"
-    compile "com.android.support:cardview-v7:$rootProject.v4Version"
-    compile "com.android.support:recyclerview-v7:$rootProject.v4Version"
-    compile project(':fragmentation')
-    compile project(':fragmentation_swipeback')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testApi 'junit:junit:4.12'
+    api "com.android.support:appcompat-v7:$rootProject.v4Version"
+    api "com.android.support:design:$rootProject.v4Version"
+    api "com.android.support:cardview-v7:$rootProject.v4Version"
+    api "com.android.support:recyclerview-v7:$rootProject.v4Version"
+    api project(':fragmentation')
+    api project(':fragmentation_swipeback')
     // EventBus
-    compile project(':eventbus_activity_scope')
-    compile 'org.greenrobot:eventbus:3.0.0'
+    api project(':eventbus_activity_scope')
+    api 'org.greenrobot:eventbus:3.0.0'
     //    apt 'org.greenrobot:eventbus-annotation-processor:3.0.1'
 }
 

eventbus_activity_scope/build.gradle

@@ -13,5 +13,5 @@ android {
 }
 
 dependencies {
-    provided 'org.greenrobot:eventbus:3.0.0'
+    compileOnly 'org.greenrobot:eventbus:3.0.0'
 }

fragmentation/build.gradle

@@ -12,6 +12,6 @@ android {
 }
 
 dependencies {
-    provided "com.android.support:appcompat-v7:$rootProject.v4Version"
-    compile project(':fragmentation_core')
+    compileOnly "com.android.support:appcompat-v7:$rootProject.v4Version"
+    api project(':fragmentation_core')
 }

fragmentation/src/main/java/me/yokeyword/fragmentation/SupportFragment.java

@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.view.View;
 import android.view.animation.Animation;
 
@@ -18,7 +19,7 @@
  */
 public class SupportFragment extends Fragment implements ISupportFragment {
     final SupportFragmentDelegate mDelegate = new SupportFragmentDelegate(this);
-    protected SupportActivity _mActivity;
+    protected FragmentActivity _mActivity;
 
     @Override
     public SupportFragmentDelegate getSupportDelegate() {
@@ -38,7 +39,7 @@ public ExtraTransaction extraTransaction() {
     public void onAttach(Activity activity) {
         super.onAttach(activity);
         mDelegate.onAttach(activity);
-        _mActivity = (SupportActivity) mDelegate.getActivity();
+        _mActivity = mDelegate.getActivity();
     }
 
     @Override

fragmentation_core/build.gradle

@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-    provided "com.android.support:appcompat-v7:$rootProject.v4Version"
+    compileOnly "com.android.support:appcompat-v7:$rootProject.v4Version"
 }
 
 //publish {

fragmentation_core/src/main/java/me/yokeyword/fragmentation/helper/internal/VisibleDelegate.java

@@ -26,6 +26,8 @@ public class VisibleDelegate {
     private boolean mInvisibleWhenLeave;
     private boolean mIsFirstVisible = true;
     private boolean mFirstCreateViewCompatReplace = true;
+    private boolean mAbortInitVisible = false;
+    private Runnable taskDispatchSupportVisible;
 
     private Handler mHandler;
     private Bundle mSaveInstanceState;
@@ -61,6 +63,10 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
             mFirstCreateViewCompatReplace = false;
         }
 
+        initVisible();
+    }
+
+    private void initVisible() {
         if (!mInvisibleWhenLeave && !mFragment.isHidden() && mFragment.getUserVisibleHint()) {
             if ((mFragment.getParentFragment() != null && isFragmentVisible(mFragment.getParentFragment()))
                     || mFragment.getParentFragment() == null) {
@@ -76,10 +82,21 @@ public void onResume() {
                 mNeedDispatch = false;
                 dispatchSupportVisible(true);
             }
+        } else {
+            if (mAbortInitVisible) {
+                mAbortInitVisible = false;
+                initVisible();
+            }
         }
     }
 
     public void onPause() {
+        if (taskDispatchSupportVisible != null) {
+            getHandler().removeCallbacks(taskDispatchSupportVisible);
+            mAbortInitVisible = true;
+            return;
+        }
+
         if (mIsSupportVisible && isFragmentVisible(mFragment)) {
             mNeedDispatch = false;
             mInvisibleWhenLeave = false;
@@ -92,7 +109,7 @@ public void onPause() {
     public void onHiddenChanged(boolean hidden) {
         if (!hidden && !mFragment.isResumed()) {
             //if fragment is shown but not resumed, ignore...
-            mInvisibleWhenLeave = false;
+            onFragmentShownWhenNotResumed();
             return;
         }
         if (hidden) {
@@ -102,6 +119,23 @@ public void onHiddenChanged(boolean hidden) {
         }
     }
 
+    private void onFragmentShownWhenNotResumed() {
+        mInvisibleWhenLeave = false;
+        dispatchChildOnFragmentShownWhenNotResumed();
+    }
+
+    private void dispatchChildOnFragmentShownWhenNotResumed() {
+        FragmentManager fragmentManager = mFragment.getChildFragmentManager();
+        List<Fragment> childFragments = FragmentationMagician.getActiveFragments(fragmentManager);
+        if (childFragments != null) {
+            for (Fragment child : childFragments) {
+                if (child instanceof ISupportFragment && !child.isHidden() && child.getUserVisibleHint()) {
+                    ((ISupportFragment) child).getSupportDelegate().getVisibleDelegate().onFragmentShownWhenNotResumed();
+                }
+            }
+        }
+    }
+
     public void onDestroyView() {
         mIsFirstVisible = true;
     }
@@ -126,12 +160,14 @@ private void safeDispatchUserVisibleHint(boolean visible) {
     }
 
     private void enqueueDispatchVisible() {
-        getHandler().post(new Runnable() {
+        taskDispatchSupportVisible = new Runnable() {
             @Override
             public void run() {
+                taskDispatchSupportVisible = null;
                 dispatchSupportVisible(true);
             }
-        });
+        };
+        getHandler().post(taskDispatchSupportVisible);
     }
 
     private void dispatchSupportVisible(boolean visible) {

fragmentation_swipeback/build.gradle

@@ -13,6 +13,6 @@ android {
 }
 
 dependencies {
-    provided "com.android.support:appcompat-v7:$rootProject.v4Version"
-    provided project(':fragmentation')
+    compileOnly "com.android.support:appcompat-v7:$rootProject.v4Version"
+    compileOnly project(':fragmentation')
 }