tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed proper navigation.

master
Tomasz Półgrabia 2016-09-18 17:21:33 +02:00
parent 4d68d7fce3
commit a9af2c2015
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java
View File

@ -208,7 +208,9 @@ public class MainActivity extends ActionBarActivity {
} else { } else {
ctx.replace(R.id.fragments, panoramioShower, PanoramioShowerFragment.TAG); ctx.replace(R.id.fragments, panoramioShower, PanoramioShowerFragment.TAG);
} }
ctx.addToBackStack(PHOTO_BACKSTACK); if (!savedConfiguration) {
ctx.addToBackStack(PHOTO_BACKSTACK);
}
ctx.commit(); ctx.commit();
@ -220,8 +222,6 @@ public class MainActivity extends ActionBarActivity {
photoInfo = null; photoInfo = null;
} }
savedConfiguration = false;
if (photoInfo != null) { if (photoInfo != null) {
switchToPhoto(photoInfo); switchToPhoto(photoInfo);
return; return;
@ -241,6 +241,8 @@ public class MainActivity extends ActionBarActivity {
break; break;
} }
savedConfiguration = false;
} }
private void switchFragment(Fragment fragment, String tag) { private void switchFragment(Fragment fragment, String tag) {
@ -274,7 +276,7 @@ public class MainActivity extends ActionBarActivity {
} else { } else {
ctx.replace(R.id.fragments, frag); ctx.replace(R.id.fragments, frag);
} }
ctx.addToBackStack(MAIN_BACKSTACK); // ctx.addToBackStack(MAIN_BACKSTACK);
ctx.commit(); ctx.commit();
updateSwipeHandler(); updateSwipeHandler();
} }