Merge pull request #33 from Fueled/changes

Refactor clear back stack call

Author: v3n3

build.gradle

@@ -16,6 +16,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com'
+        }
     }
 }
 

extra/gradle/libraries.gradle

@@ -1,18 +1,18 @@
 ext {
 
     //app
-    compileSdk = 25
-    buildTools = "25.0.2"
+    compileSdk = 26
+    buildTools = "26.0.1"
     minSdk = 16
-    targetSdk = 25
+    targetSdk = 26
     appId = "com.fueled.flowr.sample"
 
     //library
     libraryGroup = 'com.github.fueled'
     libraryVersion = '1.4.0'
 
     //android libraries
-    supportVersion = '25.1.1'
+    supportVersion = '26.1.0'
 
     // Rx
     rxJavaVersion = '2.0.4'

flowr/build.gradle

@@ -34,3 +34,27 @@ dependencies {
     testCompile testLibraries.junit
     testCompile testLibraries.mockito
 }
+
+// build a jar with source files
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    failOnError  false
+    source = android.sourceSets.main.java.sourceFiles
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    classpath += configurations.compile
+}
+
+// build a jar with javadoc
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}

flowr/src/main/java/com/fueled/flowr/Flowr.java

@@ -262,18 +262,12 @@ protected <T extends Fragment & FlowrFragment> void displayFragment(TransactionD
                 clearBackStack();
             }
 
-            FragmentTransaction transaction = screen.getScreenFragmentManager().beginTransaction();
-
             currentFragment = retrieveCurrentFragment();
 
-            if (data.isReplaceCurrentFragment() && data.isSkipBackStack() && currentFragment != null) {
-                transaction.remove(currentFragment).commit();
-            }
-
             Fragment fragment = data.getFragmentClass().newInstance();
             fragment.setArguments(data.getArgs());
 
-            transaction = screen.getScreenFragmentManager().beginTransaction();
+            FragmentTransaction transaction = screen.getScreenFragmentManager().beginTransaction();
 
             if (!data.isSkipBackStack()) {
                 String id = tagPrefix + screen.getScreenFragmentManager().getBackStackEntryCount();
@@ -282,7 +276,7 @@ protected <T extends Fragment & FlowrFragment> void displayFragment(TransactionD
 
             setCustomAnimations(transaction, data.getEnterAnim(), data.getExitAnim(), data.getPopEnterAnim(), data.getPopExitAnim());
 
-            if (data.isReplaceCurrentFragment() && !data.isSkipBackStack()) {
+            if (data.isReplaceCurrentFragment()) {
                 transaction.replace(mainContainerId, fragment);
             } else {
                 transaction.add(mainContainerId, fragment);
@@ -439,7 +433,7 @@ public void closeWithResults(ResultResponse resultResponse, int n) {
     public void clearBackStack() {
         if (screen != null) {
             screen.getScreenFragmentManager()
-                    .popBackStackImmediate(tagPrefix + "0", FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                    .popBackStack(tagPrefix + "0", FragmentManager.POP_BACK_STACK_INCLUSIVE);
             currentFragment = null;
         }
     }