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

Merge branch 'master' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft-master

Browse Source
This commit is contained in:
Philipp Schaefer 2013-09-24 01:31:08 +02:00
commit b34fccf10f
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java
View File

@ -111,7 +111,8 @@ public class IITC_JSInterface {
@Override
public void run() {
mIitc.setLoadingState(false);
mIitc.getMapSettings().updateLayers();
mIitc.getMapSettings().onBootFinished();
}
});
}

19
mobile/src/com/cradle/iitc_mobile/IITC_MapSettings.java
View File

@ -97,6 +97,8 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
private String mActiveHighlighter;
private int mActiveLayer;
private boolean mLoading = true;
public IITC_MapSettings(IITC_Mobile activity) {
mIitc = activity;
@ -127,8 +129,9 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
}
private void setLayer(Layer layer) {
mIitc.getWebView().loadUrl(
"javascript: window.layerChooser.showLayer(" + layer.id + "," + layer.active + ");");
if (!mLoading)
mIitc.getWebView().loadUrl(
"javascript: window.layerChooser.showLayer(" + layer.id + "," + layer.active + ");");
}
public void addPortalHighlighter(String name) {
@ -138,6 +141,11 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
setActiveHighlighter(name);
}
public void onBootFinished() {
mLoading = false;
updateLayers();
}
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
position--; // The ListView header counts as an item as well.
@ -168,6 +176,8 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
if (mLoading) return;
if (parent.equals(mSpinnerHighlighter)) {
String name = mHighlighters.getItem(position);
mIitc.getWebView().loadUrl("javascript: window.changePortalHighlights('" + name + "')");
@ -190,6 +200,8 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
mHighlighters.clear();
mBaseLayers.clear();
mOverlayLayers.clear();
mLoading = true;
}
public void setActiveHighlighter(String name) {
@ -264,6 +276,7 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
}
public void updateLayers() {
mIitc.getWebView().loadUrl("javascript: window.layerChooser.getLayers()");
if (!mLoading)
mIitc.getWebView().loadUrl("javascript: window.layerChooser.getLayers()");
}
}