From b67f8b9a7f7bf4d6b0463500a2b287f091669c1f Mon Sep 17 00:00:00 2001 From: fkloft Date: Sat, 24 Jan 2015 12:19:09 +0100 Subject: [PATCH 1/3] Use new chat streams in IITCm --- .../com/cradle/iitc_mobile/IITC_NavigationHelper.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java index 826388f2..08d9fc5b 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java @@ -270,20 +270,18 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt clear(); add(Pane.INFO); - add(Pane.FULL); - add(Pane.COMPACT); - add(Pane.PUBLIC); + add(Pane.ALL); add(Pane.FACTION); + add(Pane.ALERTS); } } 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 ALERTS = new Pane("alerts", "Alerts", R.drawable.ic_action_error); + 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 FULL = new Pane("full", "Full", R.drawable.ic_action_view_as_list); 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 PUBLIC = new Pane("public", "Public", R.drawable.ic_action_group); private final int icon; public String label; From 5c18e0fe6b39acfb6d32684d7a51461fab5b60c9 Mon Sep 17 00:00:00 2001 From: fkloft Date: Sat, 24 Jan 2015 12:19:31 +0100 Subject: [PATCH 2/3] More cleanup --- code/chat.js | 1 - code/panes.js | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/code/chat.js b/code/chat.js index e969d9f2..34297b9f 100644 --- a/code/chat.js +++ b/code/chat.js @@ -530,7 +530,6 @@ window.chat.request = function() { chat.requestFaction(false); } if (channel == 'all' || (window.chat.backgroundChannels && window.chat.backgroundChannels['all'])) { - // the 'public', 'full' and 'compact' tabs are all based off the 'public' COMM data chat.requestPublic(false); } if (channel == 'alerts' || (window.chat.backgroundChannels && window.chat.backgroundChannels['alerts'])) { diff --git a/code/panes.js b/code/panes.js index c5ea4eea..5b74fd17 100644 --- a/code/panes.js +++ b/code/panes.js @@ -6,17 +6,10 @@ window.show = function(id) { runHooks("paneChanged", id); switch(id) { - case 'full': - window.chat.show('full'); - break; - case 'compact': - window.chat.show('compact'); - break; - case 'public': - window.chat.show('public'); - break; + case 'all': case 'faction': - window.chat.show('faction'); + case 'alerts': + window.chat.show(id); break; case 'debug': window.debug.console.show(); From 818728600e854cb9a38a8349dcab93864fe081e1 Mon Sep 17 00:00:00 2001 From: fkloft Date: Sat, 24 Jan 2015 11:47:41 +0100 Subject: [PATCH 3/3] Little formatting --- mobile/src/com/cradle/iitc_mobile/compass/Compass.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/compass/Compass.java b/mobile/src/com/cradle/iitc_mobile/compass/Compass.java index 43070e6d..958cb443 100644 --- a/mobile/src/com/cradle/iitc_mobile/compass/Compass.java +++ b/mobile/src/com/cradle/iitc_mobile/compass/Compass.java @@ -16,10 +16,9 @@ public abstract class Compass return new GyroCompass(context); else return new AccMagCompass(context); - } - private final ArrayList mListeners = new ArrayList(); + private final ArrayList mListeners = new ArrayList(); private boolean mStarted = false; protected abstract void onStart();