From bf229f7f05c7b70732f7e4a99b5d26c051d0a014 Mon Sep 17 00:00:00 2001 From: fkloft Date: Wed, 18 Sep 2013 17:40:05 +0200 Subject: [PATCH] Code formatting --- mobile/res/values/strings.xml | 2 +- ...arHelper.java => IITC_ActionBarHelper.java} | 10 +++++----- .../cradle/iitc_mobile/IITC_JSInterface.java | 12 ++++++------ .../com/cradle/iitc_mobile/IITC_Mobile.java | 16 ++++++++-------- .../IITC_PluginPreferenceActivity.java | 18 +++++++++--------- .../iitc_mobile/async/CheckHttpResponse.java | 16 ++++++++-------- .../share/IntentFragmentAdapter.java | 6 +++--- .../iitc_mobile/share/IntentListView.java | 10 +++++----- .../iitc_mobile/share/SendToClipboard.java | 1 + .../iitc_mobile/share/ShareActivity.java | 8 ++++---- 10 files changed, 50 insertions(+), 49 deletions(-) rename mobile/src/com/cradle/iitc_mobile/{ActionBarHelper.java => IITC_ActionBarHelper.java} (96%) diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml index d4696eee..2e067082 100644 --- a/mobile/res/values/strings.xml +++ b/mobile/res/values/strings.xml @@ -21,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 diff --git a/mobile/src/com/cradle/iitc_mobile/ActionBarHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_ActionBarHelper.java similarity index 96% rename from mobile/src/com/cradle/iitc_mobile/ActionBarHelper.java rename to mobile/src/com/cradle/iitc_mobile/IITC_ActionBarHelper.java index c8499b8e..fe9f8bbe 100644 --- a/mobile/src/com/cradle/iitc_mobile/ActionBarHelper.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_ActionBarHelper.java @@ -7,17 +7,17 @@ import android.preference.PreferenceManager; import android.widget.ArrayAdapter; import android.widget.Toast; -public class ActionBarHelper implements OnNavigationListener { +public class IITC_ActionBarHelper implements OnNavigationListener { /* * Show/hide the up arrow on the left end * getActionBar().setDisplayHomeAsUpEnabled(enabled); - * + * * Show/hide the activity icon/logo * getActionBar().setDisplayShowHomeEnabled(enabled); - * + * * Show/hide the activity title * getActionBar().setDisplayShowTitleEnabled(enabled); - * + * * Makes the icon/title clickable * getActionBar().setHomeButtonEnabled(enabled); */ @@ -52,7 +52,7 @@ public class ActionBarHelper implements OnNavigationListener { private boolean mHideInFullscreen = false; private int mPane = android.R.id.home; - public ActionBarHelper(IITC_Mobile activity, ActionBar bar) { + public IITC_ActionBarHelper(IITC_Mobile activity, ActionBar bar) { mIitc = activity; mActionBar = bar; mPrefs = PreferenceManager.getDefaultSharedPreferences(activity); diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java index 99dc95bb..cd3cbf94 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java @@ -1,10 +1,5 @@ package com.cradle.iitc_mobile; -import java.util.HashMap; - -import org.json.JSONArray; -import org.json.JSONException; - import android.app.Activity; import android.app.AlertDialog; import android.content.ClipData; @@ -25,6 +20,11 @@ import android.widget.Toast; import com.cradle.iitc_mobile.share.ShareActivity; +import org.json.JSONArray; +import org.json.JSONException; + +import java.util.HashMap; + // provide communication between IITC script and android app public class IITC_JSInterface { @@ -102,7 +102,7 @@ public class IITC_JSInterface { iitcm.runOnUiThread(new Runnable() { @Override public void run() { - ActionBarHelper actionbar = iitcm.getActionBarHelper(); + IITC_ActionBarHelper actionbar = iitcm.getActionBarHelper(); Integer button = IITC_Mobile.PANES.get(id); if (button == null) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index 40ed984b..9678ce6c 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -1,10 +1,5 @@ package com.cradle.iitc_mobile; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.HashMap; - import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; @@ -35,6 +30,11 @@ import android.webkit.WebView; import android.widget.SearchView; import android.widget.Toast; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.HashMap; + public class IITC_Mobile extends Activity { private static final int REQUEST_LOGIN = 1; @@ -54,7 +54,7 @@ public class IITC_Mobile extends Activity { private boolean mReloadNeeded = false; private final ArrayList mDialogStack = new ArrayList(); private SharedPreferences mSharedPrefs; - private ActionBarHelper mActionBarHelper; + private IITC_ActionBarHelper mActionBarHelper; // Used for custom back stack handling private final ArrayList mBackStack = new ArrayList(); @@ -94,7 +94,7 @@ public class IITC_Mobile extends Activity { mIitcWebView = (IITC_WebView) findViewById(R.id.iitc_webview); // pass ActionBar to helper because we deprecated getActionBar - mActionBarHelper = new ActionBarHelper(this, super.getActionBar()); + mActionBarHelper = new IITC_ActionBarHelper(this, super.getActionBar()); // do something if user changed something in the settings mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -638,7 +638,7 @@ public class IITC_Mobile extends Activity { return super.getActionBar(); } - public ActionBarHelper getActionBarHelper() { + public IITC_ActionBarHelper getActionBarHelper() { return mActionBarHelper; } } diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java index 701ae608..0f4ff502 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java @@ -1,14 +1,5 @@ package com.cradle.iitc_mobile; -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; @@ -24,6 +15,15 @@ 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; diff --git a/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java b/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java index ff64d42f..e7df6056 100644 --- a/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java +++ b/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java @@ -1,13 +1,5 @@ package com.cradle.iitc_mobile.async; -import java.io.IOException; - -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.DefaultHttpClient; - import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -17,6 +9,14 @@ import android.util.Log; import com.cradle.iitc_mobile.IITC_JSInterface; import com.cradle.iitc_mobile.IITC_Mobile; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; + +import java.io.IOException; + /* * this class parses the http response of a web page. * since network operations shouldn't be done on main UI thread diff --git a/mobile/src/com/cradle/iitc_mobile/share/IntentFragmentAdapter.java b/mobile/src/com/cradle/iitc_mobile/share/IntentFragmentAdapter.java index 1460348c..68743a08 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/IntentFragmentAdapter.java +++ b/mobile/src/com/cradle/iitc_mobile/share/IntentFragmentAdapter.java @@ -1,12 +1,12 @@ package com.cradle.iitc_mobile.share; -import java.util.ArrayList; -import java.util.List; - import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; +import java.util.ArrayList; +import java.util.List; + public class IntentFragmentAdapter extends FragmentPagerAdapter { private List mTabs; diff --git a/mobile/src/com/cradle/iitc_mobile/share/IntentListView.java b/mobile/src/com/cradle/iitc_mobile/share/IntentListView.java index 435edc6c..d0a72cc6 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/IntentListView.java +++ b/mobile/src/com/cradle/iitc_mobile/share/IntentListView.java @@ -1,10 +1,5 @@ package com.cradle.iitc_mobile.share; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; - import android.app.Activity; import android.content.ComponentName; import android.content.Context; @@ -24,6 +19,11 @@ import android.widget.TextView; import com.cradle.iitc_mobile.R; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; + public class IntentListView extends ListView { private static class CopyHandler extends Pair { public CopyHandler(ResolveInfo resolveInfo) { diff --git a/mobile/src/com/cradle/iitc_mobile/share/SendToClipboard.java b/mobile/src/com/cradle/iitc_mobile/share/SendToClipboard.java index 2f9b332f..3134452e 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/SendToClipboard.java +++ b/mobile/src/com/cradle/iitc_mobile/share/SendToClipboard.java @@ -7,6 +7,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.widget.Toast; + import com.cradle.iitc_mobile.R; public class SendToClipboard extends Activity { diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java index 4a442ab6..71200af3 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java +++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java @@ -1,9 +1,5 @@ package com.cradle.iitc_mobile.share; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.ArrayList; - import android.app.ActionBar; import android.app.FragmentTransaction; import android.content.Intent; @@ -18,6 +14,10 @@ import android.view.MenuItem; import com.cradle.iitc_mobile.R; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.ArrayList; + public class ShareActivity extends FragmentActivity implements ActionBar.TabListener { private boolean mIsPortal; private String mLl;