diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index f5659971..d369b1e9 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -1,8 +1,8 @@
+ package="com.cradle.iitc_mobile"
+ android:versionCode="47"
+ android:versionName="0.6.3">
+ android:theme="@style/AppBaseTheme">
@@ -37,7 +37,7 @@
-
+
@@ -49,12 +49,12 @@
+ android:pathPrefix="/intel"
+ android:scheme="https"/>
+ android:pathPrefix="/intel"
+ android:scheme="http"/>
@@ -68,24 +68,24 @@
-
+
+ android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
+ android:label="@string/activity_settings"
+ android:theme="@style/AppBaseTheme"/>
-
+ android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
+ android:label="@string/activity_plugins"
+ android:theme="@style/AppBaseTheme"/>
@@ -100,7 +100,7 @@
android:excludeFromRecents="true"
android:exported="false"
android:icon="@drawable/copy"
- android:label="Copy to clipboard"
+ android:label="@string/activity_share_to_clipboard"
android:noHistory="false">
@@ -137,4 +137,4 @@
android:value="com.cradle.iitc_mobile.IITC_Mobile"/>
-
+
\ No newline at end of file
diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml
index c1265866..d4696eee 100644
--- a/mobile/res/values/strings.xml
+++ b/mobile/res/values/strings.xml
@@ -2,6 +2,10 @@
IITC Mobile
+ IITC Mobile Settings
+ IITC Plugins
+ Share using…
+ Copy to clipboard
Settings
Reload IITC
Print Version
@@ -17,7 +21,7 @@
About IITC Mobile
- Ingress Intel Total Conversion Mobile
+Ingress Intel Total Conversion Mobile
by cradle and contributors
Icon by Giuseppe Lucido
IITC Mobile is an optimized mobile browser for the
@@ -67,9 +71,9 @@
Press back button twice to exit
Avoids accidental exits
Developer options
- Enable developer mode
- If enabled, all IITC sources will be loaded from external storage of the Android device.
- Please copy all sources from $IITC_folder/build/mobile/ to /sdcard/IITC_Mobile/dev/.
+ Enable developer mode
+ If enabled, all IITC sources will be loaded from external storage of the Android device.
+ Please copy all sources from $IITC_folder/build/mobile/ to /sdcard/IITC_Mobile/dev/.
Display advanced menu
In addition to the default IITC buttons the advanced menu
contains a debug pane plus an option to clear cookies
@@ -99,4 +103,5 @@
Base Layers
Overlay Layers
Deselect/Select all
-
+
+
\ No newline at end of file
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java
index d05562cc..701ae608 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java
@@ -1,6 +1,14 @@
package com.cradle.iitc_mobile;
-import android.app.ActionBar;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.TreeMap;
+
import android.content.Context;
import android.content.res.AssetManager;
import android.os.Bundle;
@@ -16,15 +24,6 @@ import android.widget.ArrayAdapter;
import android.widget.ListAdapter;
import android.widget.TextView;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Scanner;
-import java.util.TreeMap;
-
public class IITC_PluginPreferenceActivity extends PreferenceActivity {
private List mHeaders;
@@ -43,9 +42,8 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
@Override
public void onBuildHeaders(List target) {
- ActionBar bar = getActionBar();
- bar.setTitle("IITC Plugins");
- bar.setDisplayHomeAsUpEnabled(true);
+ getActionBar().setDisplayHomeAsUpEnabled(true);
+
mHeaders = target;
// since the plugins container is static,
// it is enough to parse the plugin only on first start.
@@ -62,8 +60,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- // exit settings when home button (iitc icon) is pressed
- case android.R.id.home:
+ case android.R.id.home: // exit settings when home button (iitc icon) is pressed
onBackPressed();
return true;
default:
@@ -157,8 +154,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
}
}
- void addPluginPreference(String src, String plugin_key,
- boolean user) {
+ void addPluginPreference(String src, String plugin_key, boolean user) {
// now parse plugin name, description and category
String header = src.substring(src.indexOf("==UserScript=="),
@@ -306,20 +302,20 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
if (convertView == null) {
holder = new HeaderViewHolder();
switch (headerType) {
- case HEADER_TYPE_CATEGORY:
- view = new TextView(getContext(), null,
- android.R.attr.listSeparatorTextViewStyle);
- holder.title = (TextView) view;
- break;
+ case HEADER_TYPE_CATEGORY:
+ view = new TextView(getContext(), null,
+ android.R.attr.listSeparatorTextViewStyle);
+ holder.title = (TextView) view;
+ break;
- case HEADER_TYPE_NORMAL:
- view = mInflater.inflate(R.layout.preference_header_item,
- parent, false);
- holder.title = (TextView) view
- .findViewById(R.id.plug_pref_title);
- holder.summary = (TextView) view
- .findViewById(R.id.plug_pref_summary);
- break;
+ case HEADER_TYPE_NORMAL:
+ view = mInflater.inflate(R.layout.preference_header_item,
+ parent, false);
+ holder.title = (TextView) view
+ .findViewById(R.id.plug_pref_title);
+ holder.summary = (TextView) view
+ .findViewById(R.id.plug_pref_summary);
+ break;
}
view.setTag(holder);
} else {
@@ -330,22 +326,22 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
// All view fields must be updated every time, because the view may
// be recycled
switch (headerType) {
- case HEADER_TYPE_CATEGORY:
- holder.title.setText(header.getTitle(getContext()
- .getResources()));
- break;
- case HEADER_TYPE_NORMAL:
- holder.title.setText(header.getTitle(getContext()
- .getResources()));
- CharSequence summary = header.getSummary(getContext()
- .getResources());
- if (!TextUtils.isEmpty(summary)) {
- holder.summary.setVisibility(View.VISIBLE);
- holder.summary.setText(summary);
- } else {
- holder.summary.setVisibility(View.GONE);
- }
- break;
+ case HEADER_TYPE_CATEGORY:
+ holder.title.setText(header.getTitle(getContext()
+ .getResources()));
+ break;
+ case HEADER_TYPE_NORMAL:
+ holder.title.setText(header.getTitle(getContext()
+ .getResources()));
+ CharSequence summary = header.getSummary(getContext()
+ .getResources());
+ if (!TextUtils.isEmpty(summary)) {
+ holder.summary.setVisibility(View.VISIBLE);
+ holder.summary.setText(summary);
+ } else {
+ holder.summary.setVisibility(View.GONE);
+ }
+ break;
}
return view;
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_PreferenceActivity.java b/mobile/src/com/cradle/iitc_mobile/IITC_PreferenceActivity.java
index ad222eff..2595d41b 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_PreferenceActivity.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_PreferenceActivity.java
@@ -14,8 +14,6 @@ public class IITC_PreferenceActivity extends Activity {
MainSettings settings = new MainSettings();
- // set action bar title
- getActionBar().setTitle("IITC Mobile Settings");
getActionBar().setHomeButtonEnabled(true);
// iitc version
@@ -23,15 +21,16 @@ public class IITC_PreferenceActivity extends Activity {
settings.setArguments(bundle);
// Display the fragment as the main content.
- getFragmentManager().beginTransaction()
- .replace(android.R.id.content, settings).commit();
+ getFragmentManager()
+ .beginTransaction()
+ .replace(android.R.id.content, settings)
+ .commit();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- // exit settings when home button (iitc icon) is pressed
- case android.R.id.home:
+ case android.R.id.home: // exit settings when home button (iitc icon) is pressed
onBackPressed();
return true;
default: