formatted code.

mariotaku · Nov 13, 2012 · 4ff3a62 · 4ff3a62
1 parent de8d667
commit 4ff3a62
Show file tree

Hide file tree

Showing 40 changed files with 281 additions and 257 deletions.
diff --git a/src/android/support/v4/app/FragmentManagerTrojan.java b/src/android/support/v4/app/FragmentManagerTrojan.java
@@ -4,15 +4,14 @@
 
 public class FragmentManagerTrojan {
 
-	public static boolean isStateSaved(final FragmentManager fm) {
-		if (fm instanceof FragmentManagerImpl) return ((FragmentManagerImpl) fm).mStateSaved;
+	public static boolean dispatchOptionsItemSelected(final FragmentManager fm, final MenuItem item) {
+		if (fm instanceof FragmentManagerImpl) return ((FragmentManagerImpl) fm).dispatchOptionsItemSelected(item);
 		return false;
 	}
-
-	public static boolean dispatchOptionsItemSelected(final FragmentManager fm, final MenuItem item) {
-		if (fm instanceof FragmentManagerImpl) 
-				return ((FragmentManagerImpl) fm).dispatchOptionsItemSelected(item);
+
+	public static boolean isStateSaved(final FragmentManager fm) {
+		if (fm instanceof FragmentManagerImpl) return ((FragmentManagerImpl) fm).mStateSaved;
 		return false;
 	}
-	
+
 }
diff --git a/src/org/mariotaku/twidere/activity/ComposeActivity.java b/src/org/mariotaku/twidere/activity/ComposeActivity.java
@@ -39,6 +39,7 @@
 import org.mariotaku.popupmenu.PopupMenu;
 import org.mariotaku.twidere.R;
 import org.mariotaku.twidere.fragment.BaseDialogFragment;
+import org.mariotaku.twidere.model.ParcelableLocation;
 import org.mariotaku.twidere.provider.TweetStore.Drafts;
 import org.mariotaku.twidere.util.ArrayUtils;
 import org.mariotaku.twidere.util.BitmapDecodeHelper;
@@ -94,7 +95,6 @@
 import android.widget.Toast;
 
 import com.twitter.Validator;
-import org.mariotaku.twidere.model.ParcelableLocation;
 
 public class ComposeActivity extends BaseActivity implements TextWatcher, LocationListener, OnMenuItemClickListener,
 		OnClickListener, OnLongClickListener, PopupMenu.OnMenuItemClickListener, OnEditorActionListener,
@@ -600,9 +600,12 @@ public boolean onPrepareOptionsMenu(final Menu menu) {
 				FAKE_IMAGE_LINK, text_orig) : text_orig + " " + FAKE_IMAGE_LINK : text_orig;
 		if (mTextCount != null) {
 			final int count = mValidator.getTweetLength(text);
-			final float hue = count < Validator.MAX_TWEET_LENGTH ? count >= Validator.MAX_TWEET_LENGTH - 10 ? 5 * (Validator.MAX_TWEET_LENGTH - count) : 50 : 0;
+			final float hue = count < Validator.MAX_TWEET_LENGTH ? count >= Validator.MAX_TWEET_LENGTH - 10 ? 5 * (Validator.MAX_TWEET_LENGTH - count)
+					: 50
+					: 0;
 			final float[] hsv = new float[] { hue, 1.0f, 1.0f };
-			mTextCount.setTextColor(count >= Validator.MAX_TWEET_LENGTH - 10 ? Color.HSVToColor(0x80, hsv) : 0x80808080);
+			mTextCount
+					.setTextColor(count >= Validator.MAX_TWEET_LENGTH - 10 ? Color.HSVToColor(0x80, hsv) : 0x80808080);
 			mTextCount.setText(parseString(Validator.MAX_TWEET_LENGTH - count));
 		}
 		final MenuItem sendItem = menu.findItem(MENU_SEND);

diff --git a/src/org/mariotaku/twidere/activity/FiltersActivity.java b/src/org/mariotaku/twidere/activity/FiltersActivity.java
@@ -29,22 +29,25 @@
 import android.os.Bundle;
 import android.support.v4.view.PagerTabStrip;
 import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
 
 public class FiltersActivity extends BaseActivity {
 
 	private ActionBar mActionBar;
-	
+
 	private ViewPager mViewPager;
 	private PagerTabStrip mPagerTab;
 
 	private TabsAdapter mAdapter;
 
+	@Override
+	public void onContentChanged() {
+		super.onContentChanged();
+		mViewPager = (ViewPager) findViewById(R.id.pager);
+		mPagerTab = (PagerTabStrip) findViewById(R.id.pager_tab);
+	}
+
 	@Override
 	public void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -61,14 +64,6 @@ public void onCreate(final Bundle savedInstanceState) {
 		mPagerTab.setTabIndicatorColorResource(R.color.holo_blue_light);
 	}
 
-
-	@Override
-	public void onContentChanged() {
-		super.onContentChanged();
-		mViewPager = (ViewPager) findViewById(R.id.pager);
-		mPagerTab = (PagerTabStrip) findViewById(R.id.pager_tab);
-	}
-
 	@Override
 	public boolean onCreateOptionsMenu(final Menu menu) {
 		getMenuInflater().inflate(R.menu.menu_filter, menu);

diff --git a/src/org/mariotaku/twidere/activity/HomeActivity.java b/src/org/mariotaku/twidere/activity/HomeActivity.java
@@ -73,7 +73,6 @@
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 import edu.ucdavis.earlybird.ProfilingUtil;
 
 public class HomeActivity extends MultiSelectActivity implements OnClickListener, OnPageChangeListener {
@@ -93,7 +92,6 @@ public class HomeActivity extends MultiSelectActivity implements OnClickListener
 
 	private boolean mProgressBarIndeterminateVisible = false;
 
-	private boolean mIsNavigateToDefaultAccount = false;
 	private boolean mDisplayAppIcon;
 
 	public static final int TAB_POSITION_HOME = 0;
@@ -230,7 +228,7 @@ public void onCreate(final Bundle savedInstanceState) {
 		mProgress = (ProgressBar) view.findViewById(android.R.id.progress);
 		mIndicator = (TabPageIndicator) view.findViewById(android.R.id.tabs);
 		final boolean tab_display_label = res.getBoolean(R.bool.tab_display_label);
-		mAdapter = new TabsAdapter(this, getSupportFragmentManager(), mIndicator);		
+		mAdapter = new TabsAdapter(this, getSupportFragmentManager(), mIndicator);
 		mShowHomeTab = mPreferences.getBoolean(PREFERENCE_KEY_SHOW_HOME_TAB, true);
 		mShowMentionsTab = mPreferences.getBoolean(PREFERENCE_KEY_SHOW_MENTIONS_TAB, true);
 		mShowMessagesTab = mPreferences.getBoolean(PREFERENCE_KEY_SHOW_MESSAGES_TAB, true);
@@ -451,10 +449,6 @@ protected void onActivityResult(final int requestCode, final int resultCode, fin
 		super.onActivityResult(requestCode, resultCode, intent);
 	}
 
-	protected void onDefaultAccountSet() {
-		mIsNavigateToDefaultAccount = false;
-	}
-
 	@Override
 	protected void onDestroy() {
 		// Delete unused items in databases.

diff --git a/src/org/mariotaku/twidere/activity/InternalSettingsActivity.java b/src/org/mariotaku/twidere/activity/InternalSettingsActivity.java
@@ -26,15 +26,15 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.view.KeyEvent;
-import android.view.ViewGroup;
 import android.view.View;
-import android.widget.ListView;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.content.res.Resources;
+import android.widget.ListView;
 
 @SuppressWarnings("deprecation")
 public class InternalSettingsActivity extends PreferenceActivity implements Constants {
@@ -69,7 +69,8 @@ public void setContentView(final int layoutRes) {
 
 	@Override
 	public void setContentView(final View view) {
-		setContentView(null, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+		setContentView(null, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
+				FrameLayout.LayoutParams.MATCH_PARENT));
 	}
 
 	@Override
@@ -79,7 +80,7 @@ public void setContentView(final View view, final ViewGroup.LayoutParams params)
 		final float density = res.getDisplayMetrics().density;
 		final int padding = (int) density * 16;
 		lv.setId(android.R.id.list);
-		lv.setPadding(padding, 0, padding ,0);
+		lv.setPadding(padding, 0, padding, 0);
 		super.setContentView(lv, params);
 	}
 

diff --git a/src/org/mariotaku/twidere/activity/InternalSettingsDetailsActivity.java b/src/org/mariotaku/twidere/activity/InternalSettingsDetailsActivity.java
@@ -7,15 +7,15 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.view.KeyEvent;
 import android.view.View;
-import android.widget.FrameLayout;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ListView;
-import android.content.res.Resources;
 
 public class InternalSettingsDetailsActivity extends PreferenceActivity implements Constants {
 
@@ -47,7 +47,6 @@ public boolean onKeyUp(final int keyCode, final KeyEvent event) {
 		}
 		return super.onKeyUp(keyCode, event);
 	}
-
 
 	@Override
 	public void setContentView(final int layoutRes) {
@@ -56,7 +55,8 @@ public void setContentView(final int layoutRes) {
 
 	@Override
 	public void setContentView(final View view) {
-		setContentView(null, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+		setContentView(null, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
+				FrameLayout.LayoutParams.MATCH_PARENT));
 	}
 
 	@Override
@@ -66,7 +66,7 @@ public void setContentView(final View view, final ViewGroup.LayoutParams params)
 		final float density = res.getDisplayMetrics().density;
 		final int padding = (int) density * 16;
 		lv.setId(android.R.id.list);
-		lv.setPadding(padding, 0, padding ,0);
+		lv.setPadding(padding, 0, padding, 0);
 		super.setContentView(lv, params);
 	}
 

diff --git a/src/org/mariotaku/twidere/activity/SearchActivity.java b/src/org/mariotaku/twidere/activity/SearchActivity.java
@@ -31,7 +31,6 @@
 import org.mariotaku.twidere.fragment.SearchUsersFragment;
 import org.mariotaku.twidere.provider.RecentSearchProvider;
 import org.mariotaku.twidere.view.ExtendedViewPager;
-import org.mariotaku.twidere.view.TabPageIndicator;
 
 import android.app.SearchManager;
 import android.content.Intent;
@@ -42,10 +41,8 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentManagerTrojan;
 import android.support.v4.app.NavUtils;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ProgressBar;
 import android.support.v4.view.PagerTabStrip;
+import android.view.MenuItem;
 
 public class SearchActivity extends MultiSelectActivity {
 
@@ -125,10 +122,9 @@ public void onCreate(final Bundle savedInstanceState) {
 		mActionBar = getSupportActionBar();
 		mActionBar.setDisplayHomeAsUpEnabled(true);
 		mAdapter = new TabsAdapter(this, getSupportFragmentManager(), null);
-		mAdapter.addTab(SearchTweetsFragment.class, mArguments, getString(R.string.tweets),
-				R.drawable.ic_tab_twitter, 0);
-		mAdapter.addTab(SearchUsersFragment.class, mArguments, getString(R.string.users),
-				R.drawable.ic_tab_person, 1);
+		mAdapter.addTab(SearchTweetsFragment.class, mArguments, getString(R.string.tweets), R.drawable.ic_tab_twitter,
+				0);
+		mAdapter.addTab(SearchUsersFragment.class, mArguments, getString(R.string.users), R.drawable.ic_tab_person, 1);
 		mViewPager.setAdapter(mAdapter);
 		mViewPager.setCurrentItem(is_search_user ? 1 : 0);
 		mPagerTab.setTabIndicatorColorResource(R.color.holo_blue_light);

diff --git a/src/org/mariotaku/twidere/activity/SettingsActivity.java b/src/org/mariotaku/twidere/activity/SettingsActivity.java
@@ -25,6 +25,7 @@
 import org.mariotaku.twidere.fragment.ActivityHostFragment;
 import org.mariotaku.twidere.fragment.CustomTabsFragment;
 import org.mariotaku.twidere.fragment.ExtensionsListFragment;
+import org.mariotaku.twidere.fragment.FiltersListFragment;
 import org.mariotaku.twidere.fragment.InternalSettingsFragment;
 import org.mariotaku.twidere.fragment.SettingsDetailsFragment;
 
@@ -39,11 +40,6 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.view.MenuItem;
-import org.mariotaku.twidere.fragment.FiltersListFragment;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ListView;
-import android.widget.FrameLayout;
 
 public class SettingsActivity extends DualPaneActivity implements OnSharedPreferenceChangeListener,
 		OnPreferenceClickListener {
@@ -136,7 +132,7 @@ public boolean onPreferenceClick(final Preference preference) {
 				startActivity(intent);
 			}
 			return true;
-		}else if (KEY_FILTERS.equals(key)) {
+		} else if (KEY_FILTERS.equals(key)) {
 			if (isDualPaneMode()) {
 				final Fragment fragment = new FiltersListFragment();
 				showFragment(fragment, false);

diff --git a/src/org/mariotaku/twidere/activity/SettingsDetailsActivity.java b/src/org/mariotaku/twidere/activity/SettingsDetailsActivity.java
@@ -1,12 +1,12 @@
 package org.mariotaku.twidere.activity;
 
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.FrameLayout;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ListView;
-import android.content.res.Resources;
 
 public class SettingsDetailsActivity extends BasePreferenceActivity {
 
@@ -23,7 +23,16 @@ public void onCreate(final Bundle savedInstanceState) {
 		}
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 	}
-
+
+	@Override
+	public boolean onOptionsItemSelected(final MenuItem item) {
+		switch (item.getItemId()) {
+			case MENU_HOME:
+				finish();
+				break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
 
 	@Override
 	public void setContentView(final int layoutRes) {
@@ -32,7 +41,8 @@ public void setContentView(final int layoutRes) {
 
 	@Override
 	public void setContentView(final View view) {
-		setContentView(null, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+		setContentView(null, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
+				FrameLayout.LayoutParams.MATCH_PARENT));
 	}
 
 	@Override
@@ -42,17 +52,7 @@ public void setContentView(final View view, final ViewGroup.LayoutParams params)
 		final float density = res.getDisplayMetrics().density;
 		final int padding = (int) density * 16;
 		lv.setId(android.R.id.list);
-		lv.setPadding(padding, 0, padding ,0);
+		lv.setPadding(padding, 0, padding, 0);
 		super.setContentView(lv, params);
 	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
-		switch (item.getItemId()) {
-			case MENU_HOME:
-				finish();
-				break;
-		}
-		return super.onOptionsItemSelected(item);
-	}
 }
diff --git a/src/org/mariotaku/twidere/adapter/CursorStatusesAdapter.java b/src/org/mariotaku/twidere/adapter/CursorStatusesAdapter.java
@@ -106,7 +106,7 @@ public void bindView(final View view, final Context context, final Cursor cursor
 			final String name = cursor.getString(mIndices.name);
 			final String in_reply_to_screen_name = cursor.getString(mIndices.in_reply_to_screen_name);
 			final String account_screen_name = getAccountScreenName(mContext, account_id);
-			
+
 			final boolean is_favorite = cursor.getShort(mIndices.is_favorite) == 1;
 			final boolean is_protected = cursor.getShort(mIndices.is_protected) == 1;
 			final boolean is_verified = cursor.getShort(mIndices.is_verified) == 1;
@@ -126,8 +126,8 @@ public void bindView(final View view, final Context context, final Cursor cursor
 
 			holder.setUserColor(getUserColor(mContext, user_id));
 			if (text != null) {
-				holder.setHighlightColor(getStatusBackground(
-						mMentionsHighlightDisabled ? false : is_mention, is_favorite, is_retweet));
+				holder.setHighlightColor(getStatusBackground(mMentionsHighlightDisabled ? false : is_mention,
+						is_favorite, is_retweet));
 			}
 
 			holder.setAccountColorEnabled(mShowAccountColor);
@@ -246,8 +246,8 @@ public View newView(final Context context, final Cursor cursor, final ViewGroup
 			view.setTag(holder);
 			holder.profile_image.setOnClickListener(mMultiSelectEnabled ? null : this);
 			holder.image_preview.setOnClickListener(mMultiSelectEnabled ? null : this);
-			//holder.image_preview.setClickable(!mMultiSelectEnabled);
-			//holder.profile_image.setClickable(!mMultiSelectEnabled);
+			// holder.image_preview.setClickable(!mMultiSelectEnabled);
+			// holder.profile_image.setClickable(!mMultiSelectEnabled);
 		}
 		return view;
 	}

diff --git a/src/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java b/src/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java
@@ -148,8 +148,8 @@ public View getView(final int position, final View convertView, final ViewGroup
 			view.setTag(holder);
 			holder.profile_image.setOnClickListener(mMultiSelectEnabled ? null : this);
 			holder.image_preview.setOnClickListener(mMultiSelectEnabled ? null : this);
-			//holder.image_preview.setClickable(!mMultiSelectEnabled);
-			//holder.profile_image.setClickable(!mMultiSelectEnabled);
+			// holder.image_preview.setClickable(!mMultiSelectEnabled);
+			// holder.profile_image.setClickable(!mMultiSelectEnabled);
 		}
 
 		final ParcelableStatus status = getItem(position);
@@ -176,10 +176,11 @@ public View getView(final int position, final View convertView, final ViewGroup
 				holder.setSelected(false);
 			}
 			final String account_screen_name = getAccountScreenName(mContext, status.account_id);
-			final boolean is_mention = status.text_plain.toLowerCase().contains('@' + account_screen_name.toLowerCase());
+			final boolean is_mention = status.text_plain.toLowerCase()
+					.contains('@' + account_screen_name.toLowerCase());
 			holder.setUserColor(getUserColor(mContext, status.user_id));
-			holder.setHighlightColor(getStatusBackground(
-					mMentionsHighlightDisabled ? false : is_mention, status.is_favorite, status.is_retweet));
+			holder.setHighlightColor(getStatusBackground(mMentionsHighlightDisabled ? false : is_mention,
+					status.is_favorite, status.is_retweet));
 			holder.setTextSize(mTextSize);
 			holder.name.setCompoundDrawablesWithIntrinsicBounds(0, 0,
 					getUserTypeIconRes(status.is_verified, status.is_protected), 0);