修正逻辑

Author: anzewei

parallaxbacklayout2/.gitignore renamed to parallaxbacklayout/.gitignore

@@ -5,8 +5,8 @@ ext {
     bintrayName = 'com.github.anzewei'
 
     publishedGroupId = 'com.github.anzewei'
-    libraryName = 'parallaxbacklayout2'
-    artifact = 'parallaxbacklayout2'
+    libraryName = 'parallaxbacklayout'
+    artifact = 'parallaxbacklayout'
 
     libraryDescription = 'An Android library that help you to finish activity with swipe back gesture and you can get parallax scrolling effect'
 

parallaxbacklayout2/build.gradle renamed to parallaxbacklayout/build.gradle

@@ -42,10 +42,7 @@ public void onActivityCreated(final Activity activity, Bundle savedInstanceState
         mLinkedStack.put(activity, traceInfo);
         traceInfo.mCurrent = activity;
         if (mLinkedStack.size() > 0 && activity.getClass().getAnnotation(ParallaxBack.class) != null) {
-            traceInfo.mBackLayout = new ParallaxBackLayout(activity);
-            traceInfo.mBackLayout.setId(R.id.pllayout);
-            traceInfo.mBackLayout.attachToActivity(activity);
-            traceInfo.mBackLayout.setBackgroundView(new GoBackView(activity));
+            enableParallaxBack(activity);
         }
     }
 
@@ -80,7 +77,25 @@ public void onActivityDestroyed(Activity activity) {
         Log.d(ParallaxHelper.class.getSimpleName(), activity + "onActivityDestroyed");
     }
 
-    public ParallaxBackLayout getParallaxBackLayout(Activity activity){
+    public static void disableParallaxBack(Activity activity){
+        ParallaxBackLayout layout =  getParallaxBackLayout(activity);
+        if (layout != null)
+            layout.setEnableGesture(false);
+    }
+
+    public static void enableParallaxBack(Activity activity){
+        ParallaxBackLayout layout =  getParallaxBackLayout(activity);
+        if (layout != null)
+            layout.setEnableGesture(true);
+        else {
+            ParallaxBackLayout backLayout = new ParallaxBackLayout(activity);
+            backLayout.setId(R.id.pllayout);
+            backLayout.attachToActivity(activity);
+            backLayout.setBackgroundView(new GoBackView(activity));
+        }
+    }
+
+    public static ParallaxBackLayout getParallaxBackLayout(Activity activity){
        View view = ((ViewGroup)activity.getWindow().getDecorView()).getChildAt(0);
         if (view instanceof ParallaxBackLayout)
             return (ParallaxBackLayout) view;
@@ -92,7 +107,6 @@ public ParallaxBackLayout getParallaxBackLayout(Activity activity){
 
     public static class TraceInfo {
         private Activity mCurrent;
-        private ParallaxBackLayout mBackLayout;
     }
 
     private static class GoBackView implements ParallaxBackLayout.IBackgroundView {

parallaxbacklayout2/proguard-rules.pro renamed to parallaxbacklayout/proguard-rules.pro

@@ -24,5 +24,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:24.1.1'
     compile 'com.android.support:design:24.1.1'
-    compile project(':parallaxbacklayout2')
+    compile project(':parallaxbacklayout')
 }

parallaxbacklayout2/src/androidTest/java/com/github/anzewei/parallaxbacklayout/ApplicationTest.java renamed to parallaxbacklayout/src/androidTest/java/com/github/anzewei/parallaxbacklayout/ApplicationTest.java

@@ -1 +1 @@
-include ':parallaxbacklayout2', ':sample'
+include ':parallaxbacklayout', ':sample'