projects
/
DHBWCampusApp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed title for popups
[DHBWCampusApp.git]
/
app
/
src
/
main
/
java
/
de
/
dhbwloe
/
campusapp
/
NavigationManager.java
diff --git
a/app/src/main/java/de/dhbwloe/campusapp/NavigationManager.java
b/app/src/main/java/de/dhbwloe/campusapp/NavigationManager.java
index 1330940689b5f8bb3efcfdf4821e1f8a7ff18b15..daa84eabf49d4cf158f53ededd30729b99ccae77 100644
(file)
--- a/
app/src/main/java/de/dhbwloe/campusapp/NavigationManager.java
+++ b/
app/src/main/java/de/dhbwloe/campusapp/NavigationManager.java
@@
-12,6
+12,7
@@
import android.widget.PopupWindow;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.List;
import de.dhbwloe.campusapp.fragments.PopupFragment;
import de.dhbwloe.campusapp.fragments.PopupFragment;
@@
-65,7
+66,8
@@
public class NavigationManager {
return null;
if(oCurrentPage.fragmentType != 3)
return (CampusAppFragment)oCurrentFragment;
return null;
if(oCurrentPage.fragmentType != 3)
return (CampusAppFragment)oCurrentFragment;
- return null;
+ else
+ return ((PopupFragment)oCurrentFragment).getCurrentFragment();
}
public void navigatePage(String name) {
}
public void navigatePage(String name) {
@@
-108,9
+110,16
@@
public class NavigationManager {
oParentPage = oCurrentPage;
oParentFragment = oCurrentFragment;
history = false;
oParentPage = oCurrentPage;
oParentFragment = oCurrentFragment;
history = false;
- } else if (oCurrentPage != null) {
- transaction.replace(iFragmentContainerId, fragment);
} else {
} else {
+ // remove fragments
+ List<Fragment> al = fragmentActivity.getSupportFragmentManager().getFragments();
+ if(al != null) {
+ for (Fragment frag : al) {
+ if (frag != null && frag.isAdded()) {
+ transaction.remove(frag);
+ }
+ }
+ }
transaction.add(iFragmentContainerId, fragment);
}
if (history)
transaction.add(iFragmentContainerId, fragment);
}
if (history)