phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* display backstack correctly on home button

Browse Source 
* clear backstack on home button pressed
This commit is contained in:
Philipp Schaefer 2013-05-25 15:37:49 +02:00
parent 818aec09c4
commit 37dac3b197
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -130,7 +130,7 @@ public class IITC_Mobile extends Activity {
// Clear the back stack // Clear the back stack
backStack.clear(); backStack.clear();
SetActionBarHomeEnabledWithUp(false); setActionBarHomeEnabledWithUp(false);
handleIntent(getIntent(), true); handleIntent(getIntent(), true);
} }
@ -253,16 +253,18 @@ public class IITC_Mobile extends Activity {
} }
} }
private void SetActionBarHomeEnabledWithUp(boolean enabled) { private void setActionBarHomeEnabledWithUp(boolean enabled) {
actionBar.setDisplayHomeAsUpEnabled(enabled); actionBar.setDisplayHomeAsUpEnabled(enabled);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
actionBar.setHomeButtonEnabled(enabled); actionBar.setHomeButtonEnabled(enabled);
} }
public void backStackPop() { public void backStackPop() {
// shouldn't be called when back stack is empty
// catch wrong usage
if (backStack.isEmpty()) { if (backStack.isEmpty()) {
// Empty back stack means we should be at home (ie map) screen // Empty back stack means we should be at home (ie map) screen
SetActionBarHomeEnabledWithUp(false); setActionBarHomeEnabledWithUp(false);
actionBar.setTitle(getString(R.string.app_name)); actionBar.setTitle(getString(R.string.app_name));
iitc_view.loadUrl("javascript: window.show('map');"); iitc_view.loadUrl("javascript: window.show('map');");
return; return;
@ -271,13 +273,18 @@ public class IITC_Mobile extends Activity {
int itemId = backStack.remove(index); int itemId = backStack.remove(index);
currentPane = itemId; currentPane = itemId;
handleMenuItemSelected(itemId, false); handleMenuItemSelected(itemId, false);
// if we popped our last item from stack...illustrate it on home button
if (backStack.isEmpty()) {
// Empty back stack means we should be at home (ie map) screen
setActionBarHomeEnabledWithUp(false);
}
} }
public void backStackUpdate(int itemId) { public void backStackUpdate(int itemId) {
if (itemId == currentPane) return; if (itemId == currentPane) return;
backStack.add(currentPane); backStack.add(currentPane);
currentPane = itemId; currentPane = itemId;
if (backStack.size() == 1) SetActionBarHomeEnabledWithUp(true); if (backStack.size() == 1) setActionBarHomeEnabledWithUp(true);
} }
@Override @Override
@ -307,16 +314,15 @@ public class IITC_Mobile extends Activity {
public boolean handleMenuItemSelected(int itemId, boolean addToBackStack) { public boolean handleMenuItemSelected(int itemId, boolean addToBackStack) {
switch (itemId) { switch (itemId) {
case android.R.id.home: case android.R.id.home:
if (!backStack.isEmpty()) {
backStackPop();
}
iitc_view.loadUrl("javascript: window.show('map');"); iitc_view.loadUrl("javascript: window.show('map');");
actionBar.setTitle(getString(R.string.app_name)); actionBar.setTitle(getString(R.string.app_name));
this.backStack.clear();
setActionBarHomeEnabledWithUp(false);
return true; return true;
case R.id.reload_button: case R.id.reload_button:
actionBar.setTitle(getString(R.string.app_name)); actionBar.setTitle(getString(R.string.app_name));
backStack.clear(); backStack.clear();
SetActionBarHomeEnabledWithUp(false); setActionBarHomeEnabledWithUp(false);
this.loadUrl(intel_url); this.loadUrl(intel_url);
return true; return true;
case R.id.toggle_fullscreen: case R.id.toggle_fullscreen: