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-05-14 22:36:34 +01:00
parent 73487d7e50 fceb09901b
commit 6a35059cf9
5 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cradle.iitc_mobile" package="com.cradle.iitc_mobile"
android:versionCode="18" android:versionCode="19"
android:versionName="0.3.6" > android:versionName="0.3.7" >
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"

7
mobile/res/menu/main.xml
View File

@ -75,13 +75,6 @@
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
android:title="@string/action_settings"> android:title="@string/action_settings">
</item> </item>
<item
android:id="@+id/cache_clear"
android:icon="@drawable/content_remove"
android:orderInCategory="150"
android:showAsAction="never"
android:title="@string/cache_clear">
</item>
<item <item
android:id="@+id/menu_debug" android:id="@+id/menu_debug"
android:icon="@drawable/alerts_and_states_warning" android:icon="@drawable/alerts_and_states_warning"

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

@ -5,7 +5,6 @@
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="reload">Reload IITC</string> <string name="reload">Reload IITC</string>
<string name="version">Print Version</string> <string name="version">Print Version</string>
<string name="cache_clear">Clear Cache</string>
<string name="toggle_fullscreen">Toggle fullscreen</string> <string name="toggle_fullscreen">Toggle fullscreen</string>
<string name="locate">Get Location</string> <string name="locate">Get Location</string>
<string name="local">local</string> <string name="local">local</string>

8
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -68,7 +68,7 @@ public class IITC_Mobile extends Activity {
user_loc = sharedPreferences.getBoolean("pref_user_loc", user_loc = sharedPreferences.getBoolean("pref_user_loc",
false); false);
if (key.equals("pref_fullscreen_actionbar")) { if (key.equals("pref_fullscreen_actionbar")) {
fullscreen_actionbar =sharedPreferences.getBoolean("pref_fullscreen_actionbar", fullscreen_actionbar = sharedPreferences.getBoolean("pref_fullscreen_actionbar",
false); false);
if (fullscreen_mode) if (fullscreen_mode)
IITC_Mobile.this.getActionBar().hide(); IITC_Mobile.this.getActionBar().hide();
@ -251,12 +251,6 @@ public class IITC_Mobile extends Activity {
this.loadUrl(intel_url); this.loadUrl(intel_url);
actionBar.setTitle(getString(R.string.menu_map)); actionBar.setTitle(getString(R.string.menu_map));
return true; return true;
// clear cache
case R.id.cache_clear :
iitc_view.clearHistory();
iitc_view.clearFormData();
iitc_view.clearCache(true);
return true;
case R.id.toggle_fullscreen : case R.id.toggle_fullscreen :
toggleFullscreen(); toggleFullscreen();
return true; return true;

22
plugins/speech-search.user.js
View File

@ -1,15 +1,15 @@
// ==UserScript== // ==UserScript==
// @id iitc-plugin-speech-search // @id iitc-plugin-speech-search
// @name IITC Plugin: Speech Search // @name IITC Plugin: Speech Search
// @version 0.0.1.@@DATETIMEVERSION@@ // @version 0.0.1.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@ // @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@ // @downloadURL @@DOWNLOADURL@@
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Allow speech input for location search (webkit only for now - NOT Firefox) // @description [@@BUILDNAME@@-@@BUILDDATE@@] Allow speech input for location search (webkit only for now - NOT Firefox)
// @include https://www.ingress.com/intel* // @include https://www.ingress.com/intel*
// @include http://www.ingress.com/intel* // @include http://www.ingress.com/intel*
// @match https://www.ingress.com/intel* // @match https://www.ingress.com/intel*
// @match http://www.ingress.com/intel* // @match http://www.ingress.com/intel*
// ==/UserScript== // ==/UserScript==
function wrapper() { function wrapper() {