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

migrated new panes to iitcm

Browse Source
This commit is contained in:
Philipp Schaefer
2015-01-24 12:30:23 +01:00
parent dc44b5d61d
commit 239a5d5c61
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/chat.js
View File

@@ -563,7 +563,7 @@ window.chat.needMoreMessages = function() {
window.chat.chooseTab = function(tab) { window.chat.chooseTab = function(tab) {
if (tab != 'all' && tab != 'faction' && tab != 'alerts') { if (tab != 'all' && tab != 'faction' && tab != 'alerts') {
console.warn('chat tab "'+t+'" requested - but only "all", "faction" and "alerts" are valid - assuming "all" wanted'); console.warn('chat tab "'+tab+'" requested - but only "all", "faction" and "alerts" are valid - assuming "all" wanted');
tab = 'all'; tab = 'all';
} }

13
code/panes.js
View File

@@ -6,18 +6,15 @@ window.show = function(id) {
runHooks("paneChanged", id); runHooks("paneChanged", id);
switch(id) { switch(id) {
case 'full': case 'all':
window.chat.show('full'); window.chat.show('all');
break;
case 'compact':
window.chat.show('compact');
break;
case 'public':
window.chat.show('public');
break; break;
case 'faction': case 'faction':
window.chat.show('faction'); window.chat.show('faction');
break; break;
case 'alerts':
window.chat.show('alerts');
break;
case 'debug': case 'debug':
window.debug.console.show(); window.debug.console.show();
break; break;

10
mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
View File

@@ -270,20 +270,18 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
clear(); clear();
add(Pane.INFO); add(Pane.INFO);
add(Pane.FULL); add(Pane.ALL);
add(Pane.COMPACT);
add(Pane.PUBLIC);
add(Pane.FACTION); add(Pane.FACTION);
add(Pane.ALERTS);
} }
} }
public static class Pane { public static class Pane {
public static final Pane COMPACT = new Pane("compact", "Compact", R.drawable.ic_action_view_as_list_compact); public static final Pane ALL = new Pane("all", "All", R.drawable.ic_action_view_as_list);
public static final Pane FACTION = new Pane("faction", "Faction", R.drawable.ic_action_cc_bcc); public static final Pane FACTION = new Pane("faction", "Faction", R.drawable.ic_action_cc_bcc);
public static final Pane FULL = new Pane("full", "Full", R.drawable.ic_action_view_as_list); public static final Pane ALERTS = new Pane("alerts", "Alerts", R.drawable.ic_action_warning);
public static final Pane INFO = new Pane("info", "Info", R.drawable.ic_action_about); public static final Pane INFO = new Pane("info", "Info", R.drawable.ic_action_about);
public static final Pane MAP = new Pane("map", "Map", R.drawable.ic_action_map); public static final Pane MAP = new Pane("map", "Map", R.drawable.ic_action_map);
public static final Pane PUBLIC = new Pane("public", "Public", R.drawable.ic_action_group);
private final int icon; private final int icon;
public String label; public String label;