diff --git a/code/player_names.js b/code/player_names.js index d8bfda37..e79cf874 100644 --- a/code/player_names.js +++ b/code/player_names.js @@ -43,11 +43,11 @@ window.playerNameToGuid = function(playerName) { $.each(Object.keys(sessionStorage), function(ind,key) { if(playerName === sessionStorage[key]) { guid = key; + window._playerNameToGuidCache[playerName] = guid; return false; //break from $.each } }); - window._playerNameToGuidCache[playerName] = guid; return guid; } diff --git a/code/portal_highlighter.js b/code/portal_highlighter.js index 7e6feb15..ba72f52e 100644 --- a/code/portal_highlighter.js +++ b/code/portal_highlighter.js @@ -66,7 +66,6 @@ window.changePortalHighlights = function(name) { window.highlightPortal = function(p) { if(_highlighters !== null && _highlighters[_current_highlighter] !== undefined) { - p.options.highligher = _current_highlighter; _highlighters[_current_highlighter]({portal: p}); } } diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml index bb2ce6b3..f23c1d2b 100644 --- a/mobile/AndroidManifest.xml +++ b/mobile/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="49" + android:versionName="0.6.5"> { + + // Move "No Highlights" on top. Sort the rest alphabetically + private class HighlighterComparator implements Comparator { + @Override + public int compare(String lhs, String rhs) { + if (lhs.equals("No Highlights")) + return -1000; + else if (rhs.equals("No Highlights")) + return 1000; + else + return lhs.compareTo(rhs); + } + } + + private HighlighterComparator mComparator = new HighlighterComparator(); + public HighlighterAdapter() { super(mIitc, android.R.layout.simple_list_item_1); clear(); @@ -39,6 +57,7 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa public void add(String object) { super.remove(object); // to avoid duplicates super.add(object); + super.sort(mComparator); } @Override @@ -177,8 +196,8 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa if (mHighlighters.getCount() < 2) // there should always be "No Highlights" showHighlighter = false; - - if(mDrawerOpened) + + if (mDrawerOpened) showHighlighter = false; if (showHighlighter) { @@ -240,7 +259,7 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa public void onDrawerOpened(View drawerView) { // TODO change menu? (via invalidateOptionsMenu) super.onDrawerOpened(drawerView); - mDrawerOpened=true; + mDrawerOpened = true; updateActionBar(); } diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java index 610e08d7..209db065 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java @@ -15,6 +15,8 @@ import android.widget.ArrayAdapter; import android.widget.ListAdapter; import android.widget.TextView; +import com.cradle.iitc_mobile.fragments.PluginsFragment; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -30,6 +32,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity { // we use a tree map to have a map with alphabetical order private static TreeMap> sPlugins = null; public static final String USER_PLUGIN = "00000"; + private static int mDeletedPlugins = 0; @Override public void setListAdapter(ListAdapter adapter) { @@ -57,6 +60,36 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity { addHeaders(); } + @Override + protected void onCreate(Bundle savedInstanceState) { + if(onIsMultiPane()) getIntent() + .putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, PluginsFragment.class.getName()); + super.onCreate(savedInstanceState); + } + + @Override + protected void onResume() { + + // Call super : + super.onResume(); + + // Select the displayed fragment in the headers (when using a tablet) : + // This should be done by Android, it is a bug fix + // thx to http://stackoverflow.com/a/16793839 + if(mHeaders != null) { + + final String displayedFragment = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT); + if (displayedFragment != null) { + for (final Header header : mHeaders) { + if (displayedFragment.equals(header.fragment)) { + switchToHeader(header); + break; + } + } + } + } + } + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -106,7 +139,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity { for (Map.Entry> entry : sPlugins.entrySet()) { numPlugins += entry.getValue().size(); } - if ((user.length + official.length) != numPlugins) { + if ((user.length + official.length) != (numPlugins + mDeletedPlugins)) { Log.d("iitcm", "new or less plugins found since last start, rebuild preferences"); sPlugins.clear(); setUpPluginPreferenceScreen(); @@ -188,6 +221,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity { // do not add deleted plugins if (plugin_cat.equals("Deleted")) { + mDeletedPlugins++; return; } diff --git a/mobile/src/com/cradle/iitc_mobile/fragments/PluginsFragment.java b/mobile/src/com/cradle/iitc_mobile/fragments/PluginsFragment.java index 76b46134..69546e84 100644 --- a/mobile/src/com/cradle/iitc_mobile/fragments/PluginsFragment.java +++ b/mobile/src/com/cradle/iitc_mobile/fragments/PluginsFragment.java @@ -22,21 +22,23 @@ public class PluginsFragment extends PreferenceFragment { // alphabetical order getPreferenceScreen().setOrderingAsAdded(false); - // get plugins category for this fragments and plugins list - String category = getArguments().getString("category"); - ArrayList prefs = - IITC_PluginPreferenceActivity.getPluginPreference(category); + if (getArguments() != null) { + // get plugins category for this fragments and plugins list + String category = getArguments().getString("category"); + ArrayList prefs = + IITC_PluginPreferenceActivity.getPluginPreference(category); - // add plugin checkbox preferences - for (IITC_PluginPreference pref : prefs) { - getPreferenceScreen().addPreference(pref); + // add plugin checkbox preferences + for (IITC_PluginPreference pref : prefs) { + getPreferenceScreen().addPreference(pref); + } + + // set action bar stuff + ActionBar bar = getActivity().getActionBar(); + category = category.replace(IITC_PluginPreferenceActivity.USER_PLUGIN, "User "); + bar.setTitle("IITC Plugins: " + category); + bar.setDisplayHomeAsUpEnabled(true); } - - // set action bar stuff - ActionBar bar = getActivity().getActionBar(); - category = category.replace(IITC_PluginPreferenceActivity.USER_PLUGIN, "User "); - bar.setTitle("IITC Plugins: " + category); - bar.setDisplayHomeAsUpEnabled(true); } } diff --git a/website/page/home.php b/website/page/home.php index 24c8b3fe..e8fd2093 100644 --- a/website/page/home.php +++ b/website/page/home.php @@ -13,21 +13,39 @@ offers many more features. It is available for

Latest news

-

2nd September 2013

+

22nd September 2013

-IITC 0.14.0, and IITC Mobile 0.5.6, have just been released. This is (yet another) change required to work with -the latest changes to the standard intel website. +Update: IITC Mobile 0.6.5 replaces 0.6.4. This fixes a crash on entering plugin preferences on some tablets.

-Also, as part of some long-term improvements, the data loading and portal rendering code has been completely rewritten. -This should ensure much more reliable loading of portal data, and faster rendering when lots of portals are shown. -However, this code is new, and may have bugs. Some known issues are: +IITC 0.14.1 and IITC Mobile 0.6.4 have been released. Changes in this version include:

    -
  • Resonators are not displayed when zoomed in.
    • -
  • Some smaller links/fields are not displayed. Often this is due to changes in the stock map (it doesn't show these -links/fields either), but I think there are cases where IITC is getting it wrong.
    • +
  • Better performance when a very large number of portals are within view (country/continent level)
    • +
  • Add layer chooser options to hide resistance/enlightened portals/links/fields
    • +
  • Chat tab now remembers which was active when reloading IITC
    • +
  • Fix some shorter links not showing on the map
    • +
  • Add details of hack information (number/cooldown time, taking account of mods) and mitigation (from shields and links) +to the portal information panel
    • +
  • Mobile +
      +
    • increase the size of various links on the info page to make them easier to tap
      • +
    • move the highlight selection dropdown to the native android app bar at the top
      • +
-However, as the current IITC release was broken I think it's better to release this build now rather than wait longer. +And plugins: +
    +
  • Major update to bookmarks-by-zaso, including sync support
    • +
  • New features added to the resonators plugin
    • +
  • max-links plugin - start of rename to 'tidy links' - as this is a better description of what it does
    • +
  • show-linked-portals - indicate which are incoming/outgoing links in the tooltip
    • +
  • New Plugins +
      +
    • show-link-direction, to indicate visually which portal a link was created from
      • +
    • highlighter for portal mitigation - to show strength of defence from shields and links at a glance
      • +
    • +
+And, as always, numerous other bug fixes, tweaks and improvements.

+ Older news diff --git a/website/page/news.php b/website/page/news.php index a0a60527..fea95b02 100644 --- a/website/page/news.php +++ b/website/page/news.php @@ -1,5 +1,39 @@

News

+

22nd September 2013

+

+Update: IITC Mobile 0.6.5 replaces 0.6.4. This fixes a crash on entering plugin preferences on some tablets. +

+

+IITC 0.14.1 and IITC Mobile 0.6.4 have been released. Changes in this version include: +

    +
  • Better performance when a very large number of portals are within view (country/continent level)
    • +
  • Add layer chooser options to hide resistance/enlightened portals/links/fields
    • +
  • Chat tab now remembers which was active when reloading IITC
    • +
  • Fix some shorter links not showing on the map
    • +
  • Add details of hack information (number/cooldown time, taking account of mods) and mitigation (from shields and links) +to the portal information panel
    • +
  • Mobile +
      +
    • increase the size of various links on the info page to make them easier to tap
      • +
    • move the highlight selection dropdown to the native android app bar at the top
      • +
    • +
+And plugins: +
    +
  • Major update to bookmarks-by-zaso, including sync support
    • +
  • New features added to the resonators plugin
    • +
  • max-links plugin - start of rename to 'tidy links' - as this is a better description of what it does
    • +
  • show-linked-portals - indicate which are incoming/outgoing links in the tooltip
    • +
  • New Plugins +
      +
    • show-link-direction, to indicate visually which portal a link was created from
      • +
    • highlighter for portal mitigation - to show strength of defence from shields and links at a glance
      • +
    • +
+And, as always, numerous other bug fixes, tweaks and improvements. +

+

2nd September 2013

IITC 0.14.0, and IITC Mobile 0.5.6, have just been released. This is (yet another) change required to work with