Extract 'forward' to reuse in replace when localStackCopy.size > 0

terrakok · Feb 20, 2020 · 05a8ec8 · 05a8ec8
1 parent d08e6b1
commit 05a8ec8
Showing 1 changed file with 27 additions and 32 deletions.
diff --git a/library/src/main/java/ru/terrakok/cicerone/android/support/SupportAppNavigator.java b/library/src/main/java/ru/terrakok/cicerone/android/support/SupportAppNavigator.java
@@ -105,21 +105,7 @@ protected void fragmentForward(@NotNull Forward command) {
         FragmentParams fragmentParams = screen.getFragmentParams();
         Fragment fragment = fragmentParams == null ? createFragment(screen) : null;
 
-        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-
-        setupFragmentTransaction(
-                command,
-                fragmentManager.findFragmentById(containerId),
-                fragment,
-                fragmentTransaction);
-
-        fragmentReplaceInternal(fragmentTransaction, screen, fragmentParams, fragment);
-
-        fragmentTransaction
-                .addToBackStack(screen.getScreenKey())
-                .commit();
-
-        localStackCopy.add(screen.getScreenKey());
+        forwardFragmentInternal(command, screen, fragmentParams, fragment);
     }
 
     protected void fragmentBack() {
@@ -159,6 +145,9 @@ protected void fragmentReplace(@NotNull Replace command) {
             fragmentManager.popBackStack();
             localStackCopy.removeLast();
 
+            forwardFragmentInternal(command, screen, fragmentParams, fragment);
+
+        } else {
             FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
             setupFragmentTransaction(
@@ -168,31 +157,37 @@ protected void fragmentReplace(@NotNull Replace command) {
                     fragmentTransaction
             );
 
-            fragmentReplaceInternal(fragmentTransaction, screen, fragmentParams, fragment);
+            replaceFragmentInternal(fragmentTransaction, screen, fragmentParams, fragment);
 
-            fragmentTransaction
-                    .addToBackStack(screen.getScreenKey())
-                    .commit();
+            fragmentTransaction.commit();
+        }
+    }
 
-            localStackCopy.add(screen.getScreenKey());
+    private void forwardFragmentInternal(
+            @NotNull Command command,
+            @NotNull SupportAppScreen screen,
+            @Nullable FragmentParams fragmentParams,
+            @Nullable Fragment fragment
+    ) {
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
-        } else {
-            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        setupFragmentTransaction(
+                command,
+                fragmentManager.findFragmentById(containerId),
+                fragment,
+                fragmentTransaction
+        );
 
-            setupFragmentTransaction(
-                    command,
-                    fragmentManager.findFragmentById(containerId),
-                    fragment,
-                    fragmentTransaction
-            );
+        replaceFragmentInternal(fragmentTransaction, screen, fragmentParams, fragment);
 
-            fragmentReplaceInternal(fragmentTransaction, screen, fragmentParams, fragment);
+        fragmentTransaction
+                .addToBackStack(screen.getScreenKey())
+                .commit();
 
-            fragmentTransaction.commit();
-        }
+        localStackCopy.add(screen.getScreenKey());
     }
 
-    private void fragmentReplaceInternal(
+    private void replaceFragmentInternal(
             @NotNull FragmentTransaction transaction,
             @NotNull SupportAppScreen screen,
             @Nullable FragmentParams params,