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

Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Jon Atkins 2013-09-29 00:12:26 +01:00
commit 6ea87573f1
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/res/values/strings.xml
View File

@ -63,7 +63,9 @@
to evoke the Layer Drawer]]>
</string>
<string name="notice_info">
<![CDATA[Hint: The info screen will open if you tap and hold a portal for a second.]]>
<![CDATA[Hint: Alternative ways to open the info screen:<br><br>
• tap and hold a portal for a second<br>
• tap on the left half of the status bar]]>
</string>
<string name="pref_ui_cat">UI</string>

8
mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java
View File

@ -43,7 +43,13 @@ public class CheckHttpResponse extends AsyncTask<String, Void, Boolean> {
int code = response.getStatusLine().getStatusCode();
if (code != HttpStatus.SC_OK) {
Log.d("iitcm", "received error code: " + code);
((IITC_Mobile) mContext).setLoadingState(false);
final IITC_Mobile iitc = (IITC_Mobile) mContext;
iitc.runOnUiThread(new Runnable() {
@Override
public void run() {
iitc.setLoadingState(false);
}
});
// TODO: remove when google login issue is fixed
if (urls[0].contains("uberauth=WILL_NOT_SIGN_IN")) {
return true;

5
plugins/portals-list.user.js
View File

@ -301,6 +301,7 @@ window.plugin.portalslist.portalTable = function(sortBy, sortOrder, filter) {
+ '<th ' + sort('s2', sortBy, -1) + '>M2</th>'
+ '<th ' + sort('s3', sortBy, -1) + '>M3</th>'
+ '<th ' + sort('s4', sortBy, -1) + '>M4</th>'
+ '<th ' + sort('mitigation', sortBy, -1) + '>Mit.</th>'
+ '<th ' + sort('APgain', sortBy, -1) + '>AP Gain</th>'
+ '<th title="Energy / AP Gain ratio" ' + sort('EAP', sortBy, -1) + '>E/AP</th>'
+ '<th ' + sort('age', sortBy, -1) + '>Age</th></tr>';
@ -314,6 +315,9 @@ window.plugin.portalslist.portalTable = function(sortBy, sortOrder, filter) {
+ '<td class="L' + Math.floor(portal.level) +'">' + portal.level + '</td>'
+ '<td style="text-align:center;">' + portal.team + '</td>';
var mitigationDetails = getPortalMitigationDetails(portal.portal);
portal.mitigation = mitigationDetails.total + mitigationDetails.excess;
var title;
var percent;
$.each([0, 1, 2, 3 ,4 ,5 ,6 ,7], function(ind, slot) {
@ -333,6 +337,7 @@ window.plugin.portalslist.portalTable = function(sortBy, sortOrder, filter) {
+ '<td style="cursor:help; background-color: '+COLORS_MOD[portal.mods[1][0]]+';" title="Mod : ' + portal.mods[1][3] + '\nInstalled by : ' + portal.mods[1][1] + '\nRarity : ' + portal.mods[1][0] + '">' + portal.mods[1][2] + '</td>'
+ '<td style="cursor:help; background-color: '+COLORS_MOD[portal.mods[2][0]]+';" title="Mod : ' + portal.mods[2][3] + '\nInstalled by : ' + portal.mods[2][1] + '\nRarity : ' + portal.mods[2][0] + '">' + portal.mods[2][2] + '</td>'
+ '<td style="cursor:help; background-color: '+COLORS_MOD[portal.mods[3][0]]+';" title="Mod : ' + portal.mods[3][3] + '\nInstalled by : ' + portal.mods[3][1] + '\nRarity : ' + portal.mods[3][0] + '">' + portal.mods[3][2] + '</td>'
+ '<td>' + portal.mitigation + '</td>'
+ '<td>' + portal.APgain + '</td>'
+ '<td>' + portal.EAP + '</td>'
+ '<td style="cursor:help;" title="' + portal.age_string_long + '">' + portal.age_string_short + '</td>';