Skip to content

Commit a465baa

Browse files
author
Hussein Aladeen
committed
refactor(Flowr): Remove workaround for fragment replace issue
1 parent 43c9471 commit a465baa

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,18 +262,12 @@ protected <T extends Fragment & FlowrFragment> void displayFragment(TransactionD
262262
clearBackStack();
263263
}
264264

265-
FragmentTransaction transaction = screen.getScreenFragmentManager().beginTransaction();
266-
267265
currentFragment = retrieveCurrentFragment();
268266

269-
if (data.isReplaceCurrentFragment() && data.isSkipBackStack() && currentFragment != null) {
270-
transaction.remove(currentFragment).commit();
271-
}
272-
273267
Fragment fragment = data.getFragmentClass().newInstance();
274268
fragment.setArguments(data.getArgs());
275269

276-
transaction = screen.getScreenFragmentManager().beginTransaction();
270+
FragmentTransaction transaction = screen.getScreenFragmentManager().beginTransaction();
277271

278272
if (!data.isSkipBackStack()) {
279273
String id = tagPrefix + screen.getScreenFragmentManager().getBackStackEntryCount();
@@ -282,7 +276,7 @@ protected <T extends Fragment & FlowrFragment> void displayFragment(TransactionD
282276

283277
setCustomAnimations(transaction, data.getEnterAnim(), data.getExitAnim(), data.getPopEnterAnim(), data.getPopExitAnim());
284278

285-
if (data.isReplaceCurrentFragment() && !data.isSkipBackStack()) {
279+
if (data.isReplaceCurrentFragment()) {
286280
transaction.replace(mainContainerId, fragment);
287281
} else {
288282
transaction.add(mainContainerId, fragment);

0 commit comments

Comments
 (0)