Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

reformatted code

This commit is contained in:
Mariotaku Lee 2016-05-27 23:20:43 +08:00
parent d9e63a7cb1
commit 921a36f4b5
185 changed files with 738 additions and 1302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
twidere/src/androidTest/java/org/mariotaku/twidere/activity/ImagePageFragmentTest.java
View File

@ -3,7 +3,6 @@ package org.mariotaku.twidere.activity;
import android.net.Uri;
import org.junit.Test;
import org.mariotaku.twidere.activity.MediaViewerActivity;
import static org.junit.Assert.assertEquals;

1
twidere/src/androidTest/java/org/mariotaku/twidere/util/UriUtilsTest.java
View File

@ -2,7 +2,6 @@ package org.mariotaku.twidere.util;
import org.junit.Test;
import org.mariotaku.twidere.util.UriUtils;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull;

6
twidere/src/main/java/org/mariotaku/microblog/library/twitter/UserStreamCallback.java
View File

@ -25,8 +25,7 @@ import android.util.Log;
import com.bluelinelabs.logansquare.LoganSquare;
import com.fasterxml.jackson.core.TreeNode;
import org.mariotaku.restfu.callback.RawCallback;
import org.mariotaku.restfu.http.HttpResponse;
import org.mariotaku.commons.logansquare.LoganSquareMapperFinder;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.DeletionEvent;
import org.mariotaku.microblog.library.twitter.model.DirectMessage;
@ -38,7 +37,8 @@ import org.mariotaku.microblog.library.twitter.model.User;
import org.mariotaku.microblog.library.twitter.model.UserList;
import org.mariotaku.microblog.library.twitter.model.Warning;
import org.mariotaku.microblog.library.twitter.util.CRLFLineReader;
import org.mariotaku.commons.logansquare.LoganSquareMapperFinder;
import org.mariotaku.restfu.callback.RawCallback;
import org.mariotaku.restfu.http.HttpResponse;
import java.io.IOException;
import java.io.InputStreamReader;

17
twidere/src/main/java/org/mariotaku/twidere/activity/APIEditorActivity.java
View File

@ -56,8 +56,8 @@ import org.mariotaku.twidere.model.CustomAPIConfig;
import org.mariotaku.twidere.model.ParcelableCredentials;
import org.mariotaku.twidere.provider.TwidereDataStore.Accounts;
import org.mariotaku.twidere.util.JsonSerializer;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
@ -67,9 +67,6 @@ import java.util.List;
import javax.inject.Inject;
import static org.mariotaku.twidere.util.Utils.getNonEmptyString;
import static org.mariotaku.twidere.util.Utils.trim;
public class APIEditorActivity extends BaseActivity implements OnCheckedChangeListener,
OnClickListener, CompoundButton.OnCheckedChangeListener {
@ -212,12 +209,12 @@ public class APIEditorActivity extends BaseActivity implements OnCheckedChangeLi
String consumerKey, consumerSecret;
final SharedPreferences pref = getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
final String prefApiUrlFormat = getNonEmptyString(pref, KEY_API_URL_FORMAT, DEFAULT_TWITTER_API_URL_FORMAT);
final String prefApiUrlFormat = Utils.getNonEmptyString(pref, KEY_API_URL_FORMAT, DEFAULT_TWITTER_API_URL_FORMAT);
final int prefAuthType = pref.getInt(KEY_AUTH_TYPE, ParcelableCredentials.AuthType.OAUTH);
final boolean prefSameOAuthSigningUrl = pref.getBoolean(KEY_SAME_OAUTH_SIGNING_URL, false);
final boolean prefNoVersionSuffix = pref.getBoolean(KEY_NO_VERSION_SUFFIX, false);
final String prefConsumerKey = getNonEmptyString(pref, KEY_CONSUMER_KEY, TWITTER_CONSUMER_KEY);
final String prefConsumerSecret = getNonEmptyString(pref, KEY_CONSUMER_SECRET, TWITTER_CONSUMER_SECRET);
final String prefConsumerKey = Utils.getNonEmptyString(pref, KEY_CONSUMER_KEY, TWITTER_CONSUMER_KEY);
final String prefConsumerSecret = Utils.getNonEmptyString(pref, KEY_CONSUMER_SECRET, TWITTER_CONSUMER_SECRET);
final Bundle bundle;
if (savedInstanceState != null) {
bundle = savedInstanceState;
@ -226,12 +223,12 @@ public class APIEditorActivity extends BaseActivity implements OnCheckedChangeLi
} else {
bundle = new Bundle();
}
apiUrlFormat = trim(bundle.getString(Accounts.API_URL_FORMAT, prefApiUrlFormat));
apiUrlFormat = Utils.trim(bundle.getString(Accounts.API_URL_FORMAT, prefApiUrlFormat));
authType = bundle.getInt(Accounts.AUTH_TYPE, prefAuthType);
sameOAuthSigningUrl = bundle.getBoolean(Accounts.SAME_OAUTH_SIGNING_URL, prefSameOAuthSigningUrl);
noVersionSuffix = bundle.getBoolean(Accounts.NO_VERSION_SUFFIX, prefNoVersionSuffix);
consumerKey = trim(bundle.getString(Accounts.CONSUMER_KEY, prefConsumerKey));
consumerSecret = trim(bundle.getString(Accounts.CONSUMER_SECRET, prefConsumerSecret));
consumerKey = Utils.trim(bundle.getString(Accounts.CONSUMER_KEY, prefConsumerKey));
consumerSecret = Utils.trim(bundle.getString(Accounts.CONSUMER_SECRET, prefConsumerSecret));
mEditAuthType.setOnCheckedChangeListener(this);
mEditNoVersionSuffix.setOnCheckedChangeListener(this);

6
twidere/src/main/java/org/mariotaku/twidere/activity/BrowserSignInActivity.java
View File

@ -37,19 +37,19 @@ import android.webkit.WebView;
import android.widget.Toast;
import org.attoparser.AttoParseException;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.TwitterOAuth;
import org.mariotaku.restfu.http.Authorization;
import org.mariotaku.restfu.http.Endpoint;
import org.mariotaku.restfu.oauth.OAuthAuthorization;
import org.mariotaku.restfu.oauth.OAuthToken;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.R;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.TwitterOAuth;
import org.mariotaku.twidere.model.SingleResponse;
import org.mariotaku.twidere.provider.TwidereDataStore.Accounts;
import org.mariotaku.twidere.util.AsyncTaskUtils;
import org.mariotaku.twidere.util.OAuthPasswordAuthenticator;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.OAuthPasswordAuthenticator;
import org.mariotaku.twidere.util.webkit.DefaultWebViewClient;
import java.io.IOException;

4
twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java
View File

@ -1516,9 +1516,7 @@ public class ComposeActivity extends BaseActivity implements OnMenuItemClickList
private void updateTextCount() {
if (mSendTextCountView == null || mEditText == null) return;
final String textOrig = ParseUtils.parseString(mEditText.getText());
final String text = hasMedia() && textOrig != null ? mImageUploaderUsed ? Utils.getMediaUploadStatus(this,
new String[]{FAKE_IMAGE_LINK}, textOrig) : textOrig + " " + FAKE_IMAGE_LINK : textOrig;
final String text = ParseUtils.parseString(mEditText.getText());
final int validatedCount = text != null ? mValidator.getTweetLength(text) : 0;
mSendTextCountView.setTextCount(validatedCount);
}

5
twidere/src/main/java/org/mariotaku/twidere/activity/CreateComposeShortcutActivity.java
View File

@ -24,10 +24,11 @@ import android.content.Intent;
import android.content.Intent.ShortcutIconResource;
import android.os.Bundle;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
public class CreateComposeShortcutActivity extends Activity implements Constants {
import static org.mariotaku.twidere.constant.IntentConstants.INTENT_ACTION_COMPOSE;
public class CreateComposeShortcutActivity extends Activity {
@Override
protected void onCreate(final Bundle savedInstanceState) {

3
twidere/src/main/java/org/mariotaku/twidere/activity/HiddenSettingsActivity.java
View File

@ -24,11 +24,10 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.fragment.SettingsDetailsFragment;
public class HiddenSettingsActivity extends BaseActivity implements Constants {
public class HiddenSettingsActivity extends BaseActivity {
@Override
protected void onCreate(final Bundle savedInstanceState) {

3
twidere/src/main/java/org/mariotaku/twidere/activity/KeyboardShortcutPreferenceCompatActivity.java
View File

@ -28,7 +28,6 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.util.KeyboardShortcutsHandler;
import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutSpec;
@ -37,7 +36,7 @@ import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutSpec;
* Created by mariotaku on 15/4/20.
*/
public class KeyboardShortcutPreferenceCompatActivity extends BaseActivity implements
Constants, OnClickListener {
OnClickListener {
public static final String EXTRA_CONTEXT_TAG = "context_tag";
public static final String EXTRA_KEY_ACTION = "key_action";

3
twidere/src/main/java/org/mariotaku/twidere/activity/MainActivity.java
View File

@ -25,12 +25,11 @@ import android.content.res.Configuration;
import android.os.Bundle;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.util.StrictModeUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.Utils;
public class MainActivity extends Activity implements Constants {
public class MainActivity extends Activity {
@Override
protected void onCreate(final Bundle savedInstanceState) {

3
twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java
View File

@ -72,7 +72,6 @@ import org.mariotaku.mediaviewer.library.IMediaViewerActivity;
import org.mariotaku.mediaviewer.library.MediaDownloader;
import org.mariotaku.mediaviewer.library.MediaViewerFragment;
import org.mariotaku.mediaviewer.library.subsampleimageview.SubsampleImageViewerFragment;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.iface.IExtendedActivity;
import org.mariotaku.twidere.fragment.ProgressDialogFragment;
@ -106,7 +105,7 @@ import edu.tsinghua.hotmobi.model.MediaDownloadEvent;
import pl.droidsonroids.gif.GifTextureView;
import pl.droidsonroids.gif.InputSource;
public final class MediaViewerActivity extends BaseActivity implements Constants, IExtendedActivity,
public final class MediaViewerActivity extends BaseActivity implements IExtendedActivity,
ATEToolbarCustomizer, IMediaViewerActivity {
private static final int REQUEST_SHARE_MEDIA = 201;

6
twidere/src/main/java/org/mariotaku/twidere/activity/NyanActivity.java
View File

@ -33,13 +33,15 @@ import android.view.View;
import android.view.View.OnLongClickListener;
import android.widget.Toast;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.nyan.NyanDaydreamService;
import org.mariotaku.twidere.nyan.NyanSurfaceHelper;
import org.mariotaku.twidere.nyan.NyanWallpaperService;
public class NyanActivity extends Activity implements Constants, OnLongClickListener, OnSharedPreferenceChangeListener {
import static org.mariotaku.twidere.TwidereConstants.SHARED_PREFERENCES_NAME;
import static org.mariotaku.twidere.constant.SharedPreferenceConstants.KEY_LIVE_WALLPAPER_SCALE;
public class NyanActivity extends Activity implements OnLongClickListener, OnSharedPreferenceChangeListener {
private SurfaceView mSurfaceView;
private SharedPreferences mPreferences;

5
twidere/src/main/java/org/mariotaku/twidere/activity/SettingsWizardActivity.java
View File

@ -48,12 +48,11 @@ import com.afollestad.appthemeengine.Config;
import com.afollestad.appthemeengine.util.ATEUtil;
import com.afollestad.materialdialogs.AlertDialogWrapper;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.SupportTabsAdapter;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.fragment.BasePreferenceFragment;
import org.mariotaku.twidere.fragment.BaseDialogFragment;
import org.mariotaku.twidere.fragment.BasePreferenceFragment;
import org.mariotaku.twidere.fragment.BaseSupportFragment;
import org.mariotaku.twidere.fragment.DirectMessagesFragment;
import org.mariotaku.twidere.fragment.HomeTimelineFragment;
@ -79,7 +78,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class SettingsWizardActivity extends BaseActivity implements Constants {
public class SettingsWizardActivity extends BaseActivity {
public static final String WIZARD_PREFERENCE_KEY_NEXT_PAGE = "next_page";
public static final String WIZARD_PREFERENCE_KEY_USE_DEFAULTS = "use_defaults";

3
twidere/src/main/java/org/mariotaku/twidere/activity/UsageStatisticsActivity.java
View File

@ -25,11 +25,10 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.fragment.SettingsDetailsFragment;
public class UsageStatisticsActivity extends BaseActivity implements Constants {
public class UsageStatisticsActivity extends BaseActivity {
@Override
protected void onDestroy() {

10
twidere/src/main/java/org/mariotaku/twidere/activity/UserListSelectorActivity.java
View File

@ -36,10 +36,6 @@ import android.widget.ListView;
import com.squareup.otto.Subscribe;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.SimpleParcelableUserListsAdapter;
import org.mariotaku.twidere.adapter.SimpleParcelableUsersAdapter;
import org.mariotaku.twidere.adapter.UserAutoCompleteAdapter;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.http.HttpResponseCode;
@ -47,6 +43,10 @@ import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.User;
import org.mariotaku.microblog.library.twitter.model.UserList;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.SimpleParcelableUserListsAdapter;
import org.mariotaku.twidere.adapter.SimpleParcelableUsersAdapter;
import org.mariotaku.twidere.adapter.UserAutoCompleteAdapter;
import org.mariotaku.twidere.fragment.CreateUserListDialogFragment;
import org.mariotaku.twidere.fragment.ProgressDialogFragment;
import org.mariotaku.twidere.model.ParcelableUser;
@ -57,8 +57,8 @@ import org.mariotaku.twidere.model.message.UserListCreatedEvent;
import org.mariotaku.twidere.model.util.ParcelableUserListUtils;
import org.mariotaku.twidere.model.util.ParcelableUserUtils;
import org.mariotaku.twidere.util.AsyncTaskUtils;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.ParseUtils;
import java.util.ArrayList;
import java.util.List;

3
twidere/src/main/java/org/mariotaku/twidere/adapter/AccountsAdapter.java
View File

@ -27,7 +27,6 @@ import android.widget.CompoundButton;
import com.mobeta.android.dslv.SimpleDragSortCursorAdapter;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.iface.IBaseAdapter;
import org.mariotaku.twidere.model.ParcelableAccount;
@ -43,7 +42,7 @@ import org.mariotaku.twidere.view.holder.AccountViewHolder;
import javax.inject.Inject;
public class AccountsAdapter extends SimpleDragSortCursorAdapter implements Constants, IBaseAdapter {
public class AccountsAdapter extends SimpleDragSortCursorAdapter implements IBaseAdapter {
@Inject
MediaLoaderWrapper mImageLoader;

7
twidere/src/main/java/org/mariotaku/twidere/adapter/AccountsSpinnerAdapter.java
View File

@ -27,7 +27,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.fragment.MessagesConversationFragment;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.constant.SharedPreferenceConstants;
import org.mariotaku.twidere.model.ParcelableCredentials;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.util.MediaLoaderWrapper;
@ -53,8 +54,8 @@ public class AccountsSpinnerAdapter extends ArrayAdapter<ParcelableCredentials>
super(context, itemViewResource);
GeneralComponentHelper.build(context).inject(this);
mContext = context;
mDisplayProfileImage = context.getSharedPreferences(MessagesConversationFragment.SHARED_PREFERENCES_NAME,
Context.MODE_PRIVATE).getBoolean(MessagesConversationFragment.KEY_DISPLAY_PROFILE_IMAGE, true);
mDisplayProfileImage = context.getSharedPreferences(TwidereConstants.SHARED_PREFERENCES_NAME,
Context.MODE_PRIVATE).getBoolean(SharedPreferenceConstants.KEY_DISPLAY_PROFILE_IMAGE, true);
}
public AccountsSpinnerAdapter(final Context context, final Collection<ParcelableCredentials> accounts) {

4
twidere/src/main/java/org/mariotaku/twidere/adapter/BaseArrayAdapter.java
View File

@ -23,6 +23,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.adapter.iface.IBaseAdapter;
import org.mariotaku.twidere.app.TwidereApplication;
import org.mariotaku.twidere.util.MediaLoaderWrapper;
@ -38,7 +39,8 @@ import java.util.Collection;
import javax.inject.Inject;
public class BaseArrayAdapter<T> extends ArrayAdapter<T> implements IBaseAdapter, OnSharedPreferenceChangeListener {
public class BaseArrayAdapter<T> extends ArrayAdapter<T> implements Constants, IBaseAdapter,
OnSharedPreferenceChangeListener {
private final TwidereLinkify mLinkify;
@Inject

2
twidere/src/main/java/org/mariotaku/twidere/adapter/ComposeAutoCompleteAdapter.java
View File

@ -39,11 +39,9 @@ import org.mariotaku.twidere.util.MediaLoaderWrapper;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.UserColorNameManager;
import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
import org.mariotaku.twidere.view.ProfileImageView;
import javax.inject.Inject;
public class ComposeAutoCompleteAdapter extends SimpleCursorAdapter implements Constants {
private static final String[] FROM = new String[0];

6
twidere/src/main/java/org/mariotaku/twidere/adapter/DraftsAdapter.java
View File

@ -27,14 +27,12 @@ import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.Draft;
import org.mariotaku.twidere.model.DraftCursorIndices;
import org.mariotaku.twidere.model.ParcelableMedia;
import org.mariotaku.twidere.model.ParcelableMediaUpdate;
import org.mariotaku.twidere.model.util.ParcelableMediaUtils;
import org.mariotaku.twidere.model.util.UserKeyUtils;
import org.mariotaku.twidere.util.DataStoreUtils;
import org.mariotaku.twidere.util.JsonSerializer;
import org.mariotaku.twidere.util.MediaLoaderWrapper;
@ -47,7 +45,9 @@ import org.mariotaku.twidere.view.holder.DraftViewHolder;
import javax.inject.Inject;
public class DraftsAdapter extends SimpleCursorAdapter implements Constants {
import static org.mariotaku.twidere.constant.SharedPreferenceConstants.KEY_MEDIA_PREVIEW_STYLE;
public class DraftsAdapter extends SimpleCursorAdapter {
@Inject
MediaLoaderWrapper mImageLoader;

3
twidere/src/main/java/org/mariotaku/twidere/adapter/ExtensionsAdapter.java
View File

@ -24,7 +24,6 @@ import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.loader.ExtensionsListLoader.ExtensionInfo;
import org.mariotaku.twidere.util.PermissionsManager;
@ -32,7 +31,7 @@ import org.mariotaku.twidere.view.holder.CheckableTwoLineWithIconViewHolder;
import java.util.List;
public class ExtensionsAdapter extends ArrayAdapter<ExtensionInfo> implements Constants {
public class ExtensionsAdapter extends ArrayAdapter<ExtensionInfo> {
private final PermissionsManager mPermissionsManager;

25
twidere/src/main/java/org/mariotaku/twidere/adapter/ListParcelableStatusesAdapter.java
View File

@ -2,7 +2,6 @@ package org.mariotaku.twidere.adapter;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.CardView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -17,8 +16,8 @@ import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder;
*/
public class ListParcelableStatusesAdapter extends ParcelableStatusesAdapter {
public ListParcelableStatusesAdapter(Context context, boolean compact) {
super(context, compact);
public ListParcelableStatusesAdapter(Context context) {
super(context);
}
@Override
@ -28,24 +27,16 @@ public class ListParcelableStatusesAdapter extends ParcelableStatusesAdapter {
@NonNull
@Override
protected IStatusViewHolder onCreateStatusViewHolder(ViewGroup parent, boolean compact) {
return createStatusViewHolder(this, getInflater(), parent, compact,
getCardBackgroundColor());
protected IStatusViewHolder onCreateStatusViewHolder(ViewGroup parent) {
return createStatusViewHolder(this, getInflater(), parent, getCardBackgroundColor());
}
public static StatusViewHolder createStatusViewHolder(IStatusesAdapter<?> adapter,
LayoutInflater inflater, ViewGroup parent,
boolean compact, int cardBackgroundColor) {
final View view;
if (compact) {
view = inflater.inflate(R.layout.card_item_status_compact, parent, false);
final View itemContent = view.findViewById(R.id.item_content);
itemContent.setBackgroundColor(cardBackgroundColor);
} else {
view = inflater.inflate(R.layout.card_item_status, parent, false);
final CardView cardView = (CardView) view.findViewById(R.id.card);
cardView.setCardBackgroundColor(cardBackgroundColor);
}
int cardBackgroundColor) {
final View view = inflater.inflate(R.layout.card_item_status_compact, parent, false);
final View itemContent = view.findViewById(R.id.item_content);
itemContent.setBackgroundColor(cardBackgroundColor);
final StatusViewHolder holder = new StatusViewHolder(adapter, view);
holder.setOnClickListeners();
holder.setupViewOptions();

4
twidere/src/main/java/org/mariotaku/twidere/adapter/MessageConversationAdapter.java
View File

@ -46,8 +46,8 @@ import org.mariotaku.twidere.view.holder.MessageViewHolder;
import java.lang.ref.WeakReference;
public class MessageConversationAdapter extends BaseRecyclerViewAdapter<ViewHolder> implements Constants,
IDirectMessagesAdapter {
public class MessageConversationAdapter extends BaseRecyclerViewAdapter<ViewHolder> implements
Constants, IDirectMessagesAdapter {
private static final int ITEM_VIEW_TYPE_MESSAGE_OUTGOING = 1;
private static final int ITEM_VIEW_TYPE_MESSAGE_INCOMING = 2;

4
twidere/src/main/java/org/mariotaku/twidere/adapter/MessageEntriesAdapter.java
View File

@ -41,8 +41,8 @@ import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.view.holder.LoadIndicatorViewHolder;
import org.mariotaku.twidere.view.holder.MessageEntryViewHolder;
public class MessageEntriesAdapter extends LoadMoreSupportAdapter<ViewHolder> implements Constants,
IContentCardAdapter, OnClickListener, OnReadStateChangeListener {
public class MessageEntriesAdapter extends LoadMoreSupportAdapter<ViewHolder> implements
Constants, IContentCardAdapter, OnClickListener, OnReadStateChangeListener {
public static final int ITEM_VIEW_TYPE_MESSAGE = 0;
public static final int ITEM_VIEW_TYPE_LOAD_INDICATOR = 1;

34
twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.java
View File

@ -23,7 +23,6 @@ import android.content.Context;
import android.database.Cursor;
import android.support.annotation.Nullable;
import android.support.v4.widget.Space;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
@ -32,10 +31,9 @@ import android.widget.TextView;
import org.apache.commons.lang3.ArrayUtils;
import org.mariotaku.library.objectcursor.ObjectCursor;
import org.mariotaku.twidere.Constants;
import org.mariotaku.microblog.library.twitter.model.Activity;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.iface.IActivitiesAdapter;
import org.mariotaku.microblog.library.twitter.model.Activity;
import org.mariotaku.twidere.fragment.CursorActivitiesFragment;
import org.mariotaku.twidere.fragment.UserFragment;
import org.mariotaku.twidere.model.ParcelableActivity;
@ -59,11 +57,13 @@ import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder;
import java.lang.ref.WeakReference;
import java.util.List;
import static org.mariotaku.twidere.constant.SharedPreferenceConstants.KEY_NEW_DOCUMENT_API;
/**
* Created by mariotaku on 15/1/3.
*/
public class ParcelableActivitiesAdapter extends LoadMoreSupportAdapter<RecyclerView.ViewHolder>
implements Constants, IActivitiesAdapter<List<ParcelableActivity>> {
implements IActivitiesAdapter<List<ParcelableActivity>> {
public static final int ITEM_VIEW_TYPE_STUB = 0;
public static final int ITEM_VIEW_TYPE_GAP = 1;
@ -74,7 +74,6 @@ public class ParcelableActivitiesAdapter extends LoadMoreSupportAdapter<Recycler
private final LayoutInflater mInflater;
private final MediaLoadingHandler mLoadingHandler;
private final int mCardBackgroundColor;
private final boolean mCompactCards;
private final DummyItemAdapter mStatusAdapterDelegate;
private final EventListener mEventListener;
private List<ParcelableActivity> mData;
@ -84,7 +83,7 @@ public class ParcelableActivitiesAdapter extends LoadMoreSupportAdapter<Recycler
private boolean mFollowingOnly;
private boolean mMentionsOnly;
public ParcelableActivitiesAdapter(Context context, boolean compact, boolean byFriends) {
public ParcelableActivitiesAdapter(Context context, boolean byFriends) {
super(context);
mStatusAdapterDelegate = new DummyItemAdapter(context,
new TwidereLinkify(new OnLinkClickHandler(context, null, mPreferences)), this);
@ -94,7 +93,6 @@ public class ParcelableActivitiesAdapter extends LoadMoreSupportAdapter<Recycler
mInflater = LayoutInflater.from(context);
mLoadingHandler = new MediaLoadingHandler(R.id.media_preview_progress);
mEventListener = new EventListener(this);
mCompactCards = compact;
mStatusAdapterDelegate.updateOptions();
mIsByFriends = byFriends;
}
@ -253,30 +251,18 @@ public class ParcelableActivitiesAdapter extends LoadMoreSupportAdapter<Recycler
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
switch (viewType) {
case ITEM_VIEW_TYPE_STATUS: {
final View view;
if (mCompactCards) {
view = mInflater.inflate(R.layout.card_item_status_compact, parent, false);
final View itemContent = view.findViewById(R.id.item_content);
itemContent.setBackgroundColor(mCardBackgroundColor);
} else {
view = mInflater.inflate(R.layout.card_item_status, parent, false);
final CardView cardView = (CardView) view.findViewById(R.id.card);
cardView.setCardBackgroundColor(mCardBackgroundColor);
}
final View view = mInflater.inflate(R.layout.card_item_status_compact, parent, false);
final View itemContent = view.findViewById(R.id.item_content);
itemContent.setBackgroundColor(mCardBackgroundColor);
final StatusViewHolder holder = new StatusViewHolder(mStatusAdapterDelegate, view);
holder.setupViewOptions();
holder.setStatusClickListener(mEventListener);
return holder;
}
case ITEM_VIEW_TYPE_TITLE_SUMMARY: {
final View view;
if (mCompactCards) {
view = mInflater.inflate(R.layout.card_item_activity_summary_compact, parent, false);
} else {
view = mInflater.inflate(R.layout.card_item_activity_summary, parent, false);
}
final View view = mInflater.inflate(R.layout.card_item_activity_summary_compact, parent, false);
final ActivityTitleSummaryViewHolder holder = new ActivityTitleSummaryViewHolder(this,
view, mCompactCards);
view);
holder.setOnClickListeners();
holder.setTextSize(getTextSize());
return holder;

9
twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java
View File

@ -68,7 +68,7 @@ public abstract class ParcelableStatusesAdapter extends LoadMoreSupportAdapter<R
private final int mMediaPreviewStyle;
@TwidereLinkify.HighlightStyle
private final int mLinkHighlightingStyle;
private final boolean mCompactCards;
private final boolean mCompactCards = true;
private final boolean mNameFirst;
private final boolean mDisplayMediaPreview;
private final boolean mDisplayProfileImage;
@ -84,14 +84,13 @@ public abstract class ParcelableStatusesAdapter extends LoadMoreSupportAdapter<R
private long mShowingActionCardId = RecyclerView.NO_ID;
private boolean mLastItemFiltered;
public ParcelableStatusesAdapter(Context context, boolean compact) {
public ParcelableStatusesAdapter(Context context) {
super(context);
mCardBackgroundColor = ThemeUtils.getCardBackgroundColor(context, ThemeUtils.getThemeBackgroundOption(context),
ThemeUtils.getUserThemeBackgroundAlpha(context));
mInflater = LayoutInflater.from(context);
mLoadingHandler = new MediaLoadingHandler(getProgressViewIds());
mTextSize = mPreferences.getInt(KEY_TEXT_SIZE, context.getResources().getInteger(R.integer.default_text_size));
mCompactCards = compact;
mProfileImageStyle = Utils.getProfileImageStyle(mPreferences.getString(KEY_PROFILE_IMAGE_STYLE, null));
mMediaPreviewStyle = Utils.getMediaPreviewStyle(mPreferences.getString(KEY_MEDIA_PREVIEW_STYLE, null));
mLinkHighlightingStyle = Utils.getLinkHighlightingStyleInt(mPreferences.getString(KEY_LINK_HIGHLIGHT_OPTION, null));
@ -348,7 +347,7 @@ public abstract class ParcelableStatusesAdapter extends LoadMoreSupportAdapter<R
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
switch (viewType) {
case ITEM_VIEW_TYPE_STATUS: {
return (RecyclerView.ViewHolder) onCreateStatusViewHolder(parent, mCompactCards);
return (RecyclerView.ViewHolder) onCreateStatusViewHolder(parent);
}
case ITEM_VIEW_TYPE_GAP: {
final View view = mInflater.inflate(R.layout.card_item_gap, parent, false);
@ -374,7 +373,7 @@ public abstract class ParcelableStatusesAdapter extends LoadMoreSupportAdapter<R
}
@NonNull
protected abstract IStatusViewHolder onCreateStatusViewHolder(ViewGroup parent, boolean compact);
protected abstract IStatusViewHolder onCreateStatusViewHolder(ViewGroup parent);
@Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {

3
twidere/src/main/java/org/mariotaku/twidere/adapter/SourceAutoCompleteAdapter.java
View File

@ -26,12 +26,11 @@ import android.support.v4.widget.SimpleCursorAdapter;
import android.view.View;
import android.widget.TextView;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.app.TwidereApplication;
import org.mariotaku.twidere.provider.TwidereDataStore.CachedStatuses;
import org.mariotaku.twidere.util.HtmlEscapeHelper;
public class SourceAutoCompleteAdapter extends SimpleCursorAdapter implements Constants {
public class SourceAutoCompleteAdapter extends SimpleCursorAdapter {
private static final String[] COLUMNS = new String[]{CachedStatuses._ID, CachedStatuses.SOURCE};
private static final String[] FROM = new String[0];

6
twidere/src/main/java/org/mariotaku/twidere/adapter/StaggeredGridParcelableStatusesAdapter.java
View File

@ -46,8 +46,8 @@ import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder;
*/
public class StaggeredGridParcelableStatusesAdapter extends ParcelableStatusesAdapter {
public StaggeredGridParcelableStatusesAdapter(Context context, boolean compact) {
super(context, compact);
public StaggeredGridParcelableStatusesAdapter(Context context) {
super(context);
}
@Override
@ -57,7 +57,7 @@ public class StaggeredGridParcelableStatusesAdapter extends ParcelableStatusesAd
@NonNull
@Override
protected IStatusViewHolder onCreateStatusViewHolder(ViewGroup parent, boolean compact) {
protected IStatusViewHolder onCreateStatusViewHolder(ViewGroup parent) {
final View view = getInflater().inflate(R.layout.adapter_item_media_status, parent, false);
final MediaStatusViewHolder holder = new MediaStatusViewHolder(this, view);
holder.setOnClickListeners();

4
twidere/src/main/java/org/mariotaku/twidere/adapter/SupportTabsAdapter.java
View File

@ -28,7 +28,6 @@ import android.support.v4.app.FragmentManager;
import android.view.View;
import android.view.ViewGroup;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.fragment.iface.RefreshScrollTopInterface;
import org.mariotaku.twidere.fragment.iface.SupportFragmentCallback;
import org.mariotaku.twidere.model.SupportTabSpec;
@ -43,8 +42,7 @@ import java.util.List;
import static org.mariotaku.twidere.util.CustomTabUtils.getTabIconDrawable;
import static org.mariotaku.twidere.util.Utils.announceForAccessibilityCompat;
public class SupportTabsAdapter extends SupportFixedFragmentStatePagerAdapter implements TabProvider, TabListener,
Constants {
public class SupportTabsAdapter extends SupportFixedFragmentStatePagerAdapter implements TabProvider, TabListener {
private static final String EXTRA_ADAPTER_POSITION = "adapter_position";

6
twidere/src/main/java/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.java
View File

@ -32,8 +32,6 @@ import android.widget.TextView;
import org.mariotaku.sqliteqb.library.Columns;
import org.mariotaku.sqliteqb.library.Expression;
import org.mariotaku.sqliteqb.library.OrderBy;
import org.mariotaku.sqliteqb.library.RawItemArray;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.provider.TwidereDataStore.CachedUsers;
@ -45,8 +43,10 @@ import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
import javax.inject.Inject;
import static org.mariotaku.twidere.constant.SharedPreferenceConstants.KEY_DISPLAY_PROFILE_IMAGE;
public class UserAutoCompleteAdapter extends SimpleCursorAdapter implements Constants {
public class UserAutoCompleteAdapter extends SimpleCursorAdapter {
private static final String[] FROM = new String[0];
private static final int[] TO = new int[0];

6
twidere/src/main/java/org/mariotaku/twidere/adapter/VariousItemsAdapter.java
View File

@ -26,16 +26,14 @@ public class VariousItemsAdapter extends LoadMoreSupportAdapter<RecyclerView.Vie
public static final int VIEW_TYPE_USER = 2;
public static final int VIEW_TYPE_USER_LIST = 3;
private final boolean mCompact;
private final LayoutInflater mInflater;
private final int mCardBackgroundColor;
private final DummyItemAdapter mDummyAdapter;
private List<?> mData;
public VariousItemsAdapter(Context context, boolean compact) {
public VariousItemsAdapter(Context context) {
super(context);
mCompact = compact;
mInflater = LayoutInflater.from(context);
mCardBackgroundColor = ThemeUtils.getCardBackgroundColor(context,
ThemeUtils.getThemeBackgroundOption(context),
@ -53,7 +51,7 @@ public class VariousItemsAdapter extends LoadMoreSupportAdapter<RecyclerView.Vie
switch (viewType) {
case VIEW_TYPE_STATUS: {
return ListParcelableStatusesAdapter.createStatusViewHolder(mDummyAdapter,
mInflater, parent, mCompact, mCardBackgroundColor);
mInflater, parent, mCardBackgroundColor);
}
case VIEW_TYPE_USER: {
return ParcelableUsersAdapter.createUserViewHolder(mDummyAdapter, mInflater, parent,

3
twidere/src/main/java/org/mariotaku/twidere/adapter/iface/IBaseAdapter.java
View File

@ -21,10 +21,9 @@ package org.mariotaku.twidere.adapter.iface;
import android.widget.ListAdapter;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.util.MediaLoaderWrapper;
public interface IBaseAdapter extends Constants, ListAdapter {
public interface IBaseAdapter extends ListAdapter {
MediaLoaderWrapper getImageLoader();

18
twidere/src/main/java/org/mariotaku/twidere/backup/TwidereBackupAgentHelper.java
View File

@ -29,14 +29,14 @@ import org.mariotaku.twidere.Constants;
@TargetApi(Build.VERSION_CODES.FROYO)
public class TwidereBackupAgentHelper extends BackupAgentHelper implements Constants {
// A key to uniquely identify the set of backup data
static final String PREFS_BACKUP_KEY = "preference_backup";
// A key to uniquely identify the set of backup data
static final String PREFS_BACKUP_KEY = "preference_backup";
@Override
public void onCreate() {
addHelper(PREFS_BACKUP_KEY, new SharedPreferencesBackupHelper(this, SHARED_PREFERENCES_NAME));
addHelper(PREFS_BACKUP_KEY, new SharedPreferencesBackupHelper(this, HOST_MAPPING_PREFERENCES_NAME));
addHelper(PREFS_BACKUP_KEY, new SharedPreferencesBackupHelper(this, USER_COLOR_PREFERENCES_NAME));
addHelper(PREFS_BACKUP_KEY, new SharedPreferencesBackupHelper(this, PERMISSION_PREFERENCES_NAME));
}
@Override
public void onCreate() {
addHelper(PREFS_BACKUP_KEY, new SharedPreferencesBackupHelper(this, SHARED_PREFERENCES_NAME));
addHelper(PREFS_BACKUP_KEY, new SharedPreferencesBackupHelper(this, HOST_MAPPING_PREFERENCES_NAME));
addHelper(PREFS_BACKUP_KEY, new SharedPreferencesBackupHelper(this, USER_COLOR_PREFERENCES_NAME));
addHelper(PREFS_BACKUP_KEY, new SharedPreferencesBackupHelper(this, PERMISSION_PREFERENCES_NAME));
}
}

21
twidere/src/main/java/org/mariotaku/twidere/fragment/AbsActivitiesFragment.java
View File

@ -599,7 +599,7 @@ public abstract class AbsActivitiesFragment extends AbsContentListRecyclerViewFr
}
@Override
protected void setupRecyclerView(Context context, final boolean compact) {
protected void setupRecyclerView(Context context) {
final RecyclerView recyclerView = getRecyclerView();
final ParcelableActivitiesAdapter adapter = getAdapter();
// Dividers are drawn on bottom of view
@ -612,26 +612,9 @@ public abstract class AbsActivitiesFragment extends AbsContentListRecyclerViewFr
return false;
}
final int itemViewType = adapter.getItemViewType(childPos);
if (compact) {
return itemViewType != ParcelableActivitiesAdapter.ITEM_VIEW_TYPE_EMPTY;
}
if (shouldUseDividerFor(itemViewType)) {
if (shouldUseDividerFor(adapter.getItemViewType(childPos + 1))) {
return true;
}
}
return false;
return itemViewType != ParcelableActivitiesAdapter.ITEM_VIEW_TYPE_EMPTY;
}
private boolean shouldUseDividerFor(int itemViewType) {
switch (itemViewType) {
case ParcelableActivitiesAdapter.ITEM_VIEW_TYPE_TITLE_SUMMARY:
case ParcelableActivitiesAdapter.ITEM_VIEW_TYPE_GAP:
return true;
default:
return false;
}
}
});
}

8
twidere/src/main/java/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.java
View File

@ -38,11 +38,9 @@ public abstract class AbsContentListRecyclerViewFragment<A extends LoadMoreSuppo
private DividerItemDecoration mItemDecoration;
@Override
protected void setupRecyclerView(Context context, boolean compact) {
if (compact) {
mItemDecoration = new DividerItemDecoration(context, getLayoutManager().getOrientation());
getRecyclerView().addItemDecoration(mItemDecoration);
}
protected void setupRecyclerView(Context context) {
mItemDecoration = new DividerItemDecoration(context, getLayoutManager().getOrientation());
getRecyclerView().addItemDecoration(mItemDecoration);
}
@Override

6
twidere/src/main/java/org/mariotaku/twidere/fragment/AbsContentListViewFragment.java
View File

@ -47,7 +47,6 @@ import org.mariotaku.twidere.util.ContentScrollHandler.ContentListSupport;
import org.mariotaku.twidere.util.ListViewScrollHandler;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.TwidereColorUtils;
import org.mariotaku.twidere.util.Utils;
/**
* Created by mariotaku on 15/4/16.
@ -155,13 +154,12 @@ public abstract class AbsContentListViewFragment<A extends ListAdapter> extends
final View view = getView();
assert view != null;
final Context context = view.getContext();
final boolean compact = Utils.isCompactCards(context);
final int backgroundColor = ThemeUtils.getThemeBackgroundColor(context);
final int colorRes = TwidereColorUtils.getContrastYIQ(backgroundColor,
R.color.bg_refresh_progress_color_light, R.color.bg_refresh_progress_color_dark);
mSwipeRefreshLayout.setOnRefreshListener(this);
mSwipeRefreshLayout.setProgressBackgroundColorSchemeResource(colorRes);
mAdapter = onCreateAdapter(context, compact);
mAdapter = onCreateAdapter(context);
mListView.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
@ -221,7 +219,7 @@ public abstract class AbsContentListViewFragment<A extends ListAdapter> extends
}
@NonNull
protected abstract A onCreateAdapter(Context context, boolean compact);
protected abstract A onCreateAdapter(Context context);
protected final void showContent() {
mErrorContainer.setVisibility(View.GONE);

12
twidere/src/main/java/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.java
View File

@ -46,10 +46,9 @@ import org.mariotaku.twidere.util.RecyclerViewScrollHandler;
import org.mariotaku.twidere.util.SimpleDrawerCallback;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.TwidereColorUtils;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.view.ExtendedSwipeRefreshLayout;
import org.mariotaku.twidere.view.HeaderDrawerLayout;
import org.mariotaku.twidere.view.iface.IExtendedView;
import org.mariotaku.twidere.view.ExtendedSwipeRefreshLayout;
/**
* Created by mariotaku on 15/10/26.
@ -215,13 +214,12 @@ public abstract class AbsContentRecyclerViewFragment<A extends LoadMoreSupportAd
final View view = getView();
assert view != null;
final Context context = view.getContext();
final boolean compact = Utils.isCompactCards(context);
final int backgroundColor = ThemeUtils.getThemeBackgroundColor(context);
final int colorRes = TwidereColorUtils.getContrastYIQ(backgroundColor,
R.color.bg_refresh_progress_color_light, R.color.bg_refresh_progress_color_dark);
mSwipeRefreshLayout.setOnRefreshListener(this);
mSwipeRefreshLayout.setProgressBackgroundColorSchemeResource(colorRes);
mAdapter = onCreateAdapter(context, compact);
mAdapter = onCreateAdapter(context);
mLayoutManager = onCreateLayoutManager(context);
mRecyclerView.setLayoutManager(mLayoutManager);
mRecyclerView.setHasFixedSize(true);
@ -247,7 +245,7 @@ public abstract class AbsContentRecyclerViewFragment<A extends LoadMoreSupportAd
});
}
setupRecyclerView(context, compact);
setupRecyclerView(context);
mRecyclerView.setAdapter(mAdapter);
mScrollListener = new RecyclerViewScrollHandler(this, new RecyclerViewScrollHandler.RecyclerViewCallback(mRecyclerView));
@ -255,7 +253,7 @@ public abstract class AbsContentRecyclerViewFragment<A extends LoadMoreSupportAd
mRecyclerView.setOnTouchListener(mScrollListener.getOnTouchListener());
}
protected abstract void setupRecyclerView(Context context, boolean compact);
protected abstract void setupRecyclerView(Context context);
@NonNull
protected abstract L onCreateLayoutManager(Context context);
@ -320,7 +318,7 @@ public abstract class AbsContentRecyclerViewFragment<A extends LoadMoreSupportAd
}
@NonNull
protected abstract A onCreateAdapter(Context context, boolean compact);
protected abstract A onCreateAdapter(Context context);
protected final void showContent() {
mErrorContainer.setVisibility(View.GONE);

3
twidere/src/main/java/org/mariotaku/twidere/fragment/BaseAccountPreferenceFragment.java
View File

@ -35,11 +35,10 @@ import android.view.View;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableAccount;
public abstract class BaseAccountPreferenceFragment extends BasePreferenceFragment implements Constants,
public abstract class BaseAccountPreferenceFragment extends BasePreferenceFragment implements
OnCheckedChangeListener, OnSharedPreferenceChangeListener {
@Override

6
twidere/src/main/java/org/mariotaku/twidere/fragment/BaseFiltersFragment.java
View File

@ -245,7 +245,7 @@ public abstract class BaseFiltersFragment extends AbsContentListViewFragment<Sim
@NonNull
@Override
protected SimpleCursorAdapter onCreateAdapter(Context context, boolean compact) {
protected SimpleCursorAdapter onCreateAdapter(Context context) {
return new FilterListAdapter(context);
}
@ -442,8 +442,8 @@ public abstract class BaseFiltersFragment extends AbsContentListViewFragment<Sim
@NonNull
@Override
protected SimpleCursorAdapter onCreateAdapter(Context context, boolean isCompact) {
return new FilterUsersListAdapter(getActivity());
protected SimpleCursorAdapter onCreateAdapter(Context context) {
return new FilterUsersListAdapter(context);
}
public static final class FilterUsersListAdapter extends SimpleCursorAdapter {

3
twidere/src/main/java/org/mariotaku/twidere/fragment/BaseSupportWebViewFragment.java
View File

@ -28,12 +28,11 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.util.support.WebSettingsSupport;
import org.mariotaku.twidere.util.webkit.DefaultWebViewClient;
@SuppressLint("SetJavaScriptEnabled")
public class BaseSupportWebViewFragment extends BaseSupportFragment implements Constants {
public class BaseSupportWebViewFragment extends BaseSupportFragment {
private WebView mWebView;
private boolean mIsWebViewAvailable;

4
twidere/src/main/java/org/mariotaku/twidere/fragment/CursorStatusesFragment.java
View File

@ -236,8 +236,8 @@ public abstract class CursorStatusesFragment extends AbsStatusesFragment {
@NonNull
@Override
protected ListParcelableStatusesAdapter onCreateAdapter(final Context context, final boolean compact) {
return new ListParcelableStatusesAdapter(context, compact);
protected ListParcelableStatusesAdapter onCreateAdapter(final Context context) {
return new ListParcelableStatusesAdapter(context);
}
@Override

1
twidere/src/main/java/org/mariotaku/twidere/fragment/CursorSupportUsersListFragment.java
View File

@ -27,7 +27,6 @@ import android.support.v4.content.Loader;
import org.mariotaku.twidere.adapter.iface.ILoadMoreSupportAdapter.IndicatorPosition;
import org.mariotaku.twidere.loader.CursorSupportUsersLoader;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.view.holder.UserViewHolder;
import java.util.List;

18
twidere/src/main/java/org/mariotaku/twidere/fragment/CustomTabsFragment.java
View File

@ -68,6 +68,7 @@ import org.mariotaku.twidere.model.CustomTabConfiguration;
import org.mariotaku.twidere.model.CustomTabConfiguration.CustomTabConfigurationComparator;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.provider.TwidereDataStore.Tabs;
import org.mariotaku.twidere.util.CustomTabUtils;
import org.mariotaku.twidere.util.DataStoreUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.view.holder.TwoLineWithIconViewHolder;
@ -78,13 +79,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import static org.mariotaku.twidere.util.CustomTabUtils.getConfigurationMap;
import static org.mariotaku.twidere.util.CustomTabUtils.getTabIconDrawable;
import static org.mariotaku.twidere.util.CustomTabUtils.getTabIconObject;
import static org.mariotaku.twidere.util.CustomTabUtils.getTabTypeName;
import static org.mariotaku.twidere.util.CustomTabUtils.isTabAdded;
import static org.mariotaku.twidere.util.CustomTabUtils.isTabTypeValid;
public class CustomTabsFragment extends BaseSupportFragment implements LoaderCallbacks<Cursor>,
MultiChoiceModeListener, OnItemClickListener {
@ -228,7 +222,7 @@ public class CustomTabsFragment extends BaseSupportFragment implements LoaderCal
if (itemAdd != null && itemAdd.hasSubMenu()) {
final SubMenu subMenu = itemAdd.getSubMenu();
subMenu.clear();
final HashMap<String, CustomTabConfiguration> map = getConfigurationMap();
final HashMap<String, CustomTabConfiguration> map = CustomTabUtils.getConfigurationMap();
final List<Entry<String, CustomTabConfiguration>> tabs = new ArrayList<>(
map.entrySet());
Collections.sort(tabs, CustomTabConfigurationComparator.SINGLETON);
@ -244,7 +238,7 @@ public class CustomTabsFragment extends BaseSupportFragment implements LoaderCal
final MenuItem subItem = subMenu.add(conf.getDefaultTitle());
final boolean disabledByNoAccount = accountIdRequired && accountIds.length == 0;
final boolean disabledByDuplicateTab = conf.isSingleTab() && isTabAdded(activity, type);
final boolean disabledByDuplicateTab = conf.isSingleTab() && CustomTabUtils.isTabAdded(activity, type);
final boolean shouldDisable = disabledByDuplicateTab || disabledByNoAccount;
subItem.setVisible(!shouldDisable);
subItem.setEnabled(!shouldDisable);
@ -350,8 +344,8 @@ public class CustomTabsFragment extends BaseSupportFragment implements LoaderCal
final String type = cursor.getString(mIndices.type);
final String name = cursor.getString(mIndices.name);
final String iconKey = cursor.getString(mIndices.icon);
if (isTabTypeValid(type)) {
final String typeName = getTabTypeName(context, type);
if (CustomTabUtils.isTabTypeValid(type)) {
final String typeName = CustomTabUtils.getTabTypeName(context, type);
holder.text1.setText(TextUtils.isEmpty(name) ? typeName : name);
holder.text1.setPaintFlags(holder.text1.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
holder.text2.setVisibility(View.VISIBLE);
@ -361,7 +355,7 @@ public class CustomTabsFragment extends BaseSupportFragment implements LoaderCal
holder.text1.setPaintFlags(holder.text1.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
holder.text2.setText(R.string.invalid_tab);
}
final Drawable icon = getTabIconDrawable(context, getTabIconObject(iconKey));
final Drawable icon = CustomTabUtils.getTabIconDrawable(context, CustomTabUtils.getTabIconObject(iconKey));
holder.icon.setVisibility(View.VISIBLE);
if (icon != null) {
holder.icon.setImageDrawable(icon);

2
twidere/src/main/java/org/mariotaku/twidere/fragment/DirectMessagesFragment.java
View File

@ -95,7 +95,7 @@ public class DirectMessagesFragment extends AbsContentListRecyclerViewFragment<M
@NonNull
@Override
protected MessageEntriesAdapter onCreateAdapter(Context context, boolean compact) {
protected MessageEntriesAdapter onCreateAdapter(Context context) {
return new MessageEntriesAdapter(context);
}

3
twidere/src/main/java/org/mariotaku/twidere/fragment/DraftsFragment.java
View File

@ -60,7 +60,6 @@ import org.apache.commons.lang3.ArrayUtils;
import org.mariotaku.sqliteqb.library.Columns.Column;
import org.mariotaku.sqliteqb.library.Expression;
import org.mariotaku.sqliteqb.library.RawItemArray;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.DraftsAdapter;
import org.mariotaku.twidere.model.Draft;
@ -81,7 +80,7 @@ import java.util.List;
import static org.mariotaku.twidere.util.Utils.getDefaultTextSize;
public class DraftsFragment extends BaseSupportFragment implements Constants, LoaderCallbacks<Cursor>,
public class DraftsFragment extends BaseSupportFragment implements LoaderCallbacks<Cursor>,
OnItemClickListener, MultiChoiceModeListener {
private ContentResolver mResolver;

3
twidere/src/main/java/org/mariotaku/twidere/fragment/ExtensionsListFragment.java
View File

@ -35,7 +35,6 @@ import android.view.View;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.ListView;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.ExtensionsAdapter;
import org.mariotaku.twidere.loader.ExtensionsListLoader;
@ -45,7 +44,7 @@ import org.mariotaku.twidere.util.PermissionsManager;
import java.util.List;
public class ExtensionsListFragment extends BaseListFragment implements Constants, LoaderCallbacks<List<ExtensionInfo>> {
public class ExtensionsListFragment extends BaseListFragment implements LoaderCallbacks<List<ExtensionInfo>> {
private ExtensionsAdapter mAdapter;
private PackageManager mPackageManager;

6
twidere/src/main/java/org/mariotaku/twidere/fragment/GroupFragment.java
View File

@ -12,11 +12,11 @@ import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.AsyncTaskLoader;
import android.support.v4.content.Loader;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.SupportTabsAdapter;
import org.mariotaku.microblog.library.statusnet.model.Group;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.statusnet.model.Group;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.SupportTabsAdapter;
import org.mariotaku.twidere.model.ParcelableGroup;
import org.mariotaku.twidere.model.SingleResponse;
import org.mariotaku.twidere.model.UserKey;

4
twidere/src/main/java/org/mariotaku/twidere/fragment/IncomingFriendshipsFragment.java
View File

@ -50,8 +50,8 @@ public class IncomingFriendshipsFragment extends CursorSupportUsersListFragment
@NonNull
@Override
protected ParcelableUsersAdapter onCreateAdapter(Context context, boolean compact) {
final ParcelableUsersAdapter adapter = super.onCreateAdapter(context, compact);
protected ParcelableUsersAdapter onCreateAdapter(Context context) {
final ParcelableUsersAdapter adapter = super.onCreateAdapter(context);
final Bundle args = getArguments();
final UserKey accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY);
if (accountKey == null) {

6
twidere/src/main/java/org/mariotaku/twidere/fragment/InteractionsTimelineFragment.java
View File

@ -26,10 +26,10 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import org.apache.commons.lang3.ArrayUtils;
import org.mariotaku.microblog.library.twitter.model.Activity;
import org.mariotaku.sqliteqb.library.Expression;
import org.mariotaku.twidere.adapter.ParcelableActivitiesAdapter;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.microblog.library.twitter.model.Activity;
import org.mariotaku.twidere.model.RefreshTaskParam;
import org.mariotaku.twidere.model.tab.extra.InteractionsTabExtras;
import org.mariotaku.twidere.provider.TwidereDataStore.Activities;
@ -94,8 +94,8 @@ public class InteractionsTimelineFragment extends CursorActivitiesFragment {
@NonNull
@Override
protected ParcelableActivitiesAdapter onCreateAdapter(Context context, boolean compact) {
final ParcelableActivitiesAdapter adapter = new ParcelableActivitiesAdapter(context, compact, false);
protected ParcelableActivitiesAdapter onCreateAdapter(Context context) {
final ParcelableActivitiesAdapter adapter = new ParcelableActivitiesAdapter(context, false);
final Bundle arguments = getArguments();
if (arguments != null) {
final InteractionsTabExtras extras = arguments.getParcelable(EXTRA_EXTRAS);

44
twidere/src/main/java/org/mariotaku/twidere/fragment/ItemsListFragment.java
View File

@ -19,7 +19,6 @@ import android.view.View;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.DummyItemAdapter;
import org.mariotaku.twidere.adapter.VariousItemsAdapter;
import org.mariotaku.twidere.adapter.decorator.DividerItemDecoration;
import org.mariotaku.twidere.adapter.iface.IUsersAdapter;
import org.mariotaku.twidere.model.ParcelableMedia;
import org.mariotaku.twidere.model.ParcelableStatus;
@ -55,8 +54,8 @@ public class ItemsListFragment extends AbsContentListRecyclerViewFragment<Variou
@NonNull
@Override
protected VariousItemsAdapter onCreateAdapter(Context context, boolean compact) {
final VariousItemsAdapter adapter = new VariousItemsAdapter(context, compact);
protected VariousItemsAdapter onCreateAdapter(Context context) {
final VariousItemsAdapter adapter = new VariousItemsAdapter(context);
final DummyItemAdapter dummyItemAdapter = adapter.getDummyAdapter();
dummyItemAdapter.setStatusClickListener(new IStatusViewHolder.SimpleStatusClickListener() {
@Override
@ -135,45 +134,6 @@ public class ItemsListFragment extends AbsContentListRecyclerViewFragment<Variou
getAdapter().setData(null);
}
@Override
protected void setupRecyclerView(Context context, boolean compact) {
if (compact) {
super.setupRecyclerView(context, true);
return;
}
final RecyclerView recyclerView = getRecyclerView();
final VariousItemsAdapter adapter = getAdapter();
// Dividers are drawn on bottom of view
recyclerView.addItemDecoration(new DividerItemDecoration(context, getLayoutManager().getOrientation()) {
@Override
protected boolean isDividerEnabled(int childPos) {
// Don't draw for last item
if (childPos == RecyclerView.NO_POSITION || childPos == adapter.getItemCount() - 1) {
return false;
}
final int itemViewType = adapter.getItemViewType(childPos);
// Draw only if current item and next item is TITLE_SUMMARY
if (shouldUseDividerFor(itemViewType)) {
if (shouldUseDividerFor(adapter.getItemViewType(childPos + 1))) {
return true;
}
}
return false;
}
private boolean shouldUseDividerFor(int itemViewType) {
switch (itemViewType) {
case VariousItemsAdapter.VIEW_TYPE_USER:
case VariousItemsAdapter.VIEW_TYPE_USER_LIST:
return true;
default:
return false;
}
}
});
}
@Override
public boolean isRefreshing() {
return false;

8
twidere/src/main/java/org/mariotaku/twidere/fragment/NetworkDiagnosticsFragment.java
View File

@ -22,6 +22,9 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.restfu.RestAPIFactory;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.http.Endpoint;
@ -30,15 +33,12 @@ import org.mariotaku.restfu.http.HttpResponse;
import org.mariotaku.restfu.http.RestHttpClient;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.R;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.twidere.model.ParcelableCredentials;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.model.util.ParcelableCredentialsUtils;
import org.mariotaku.twidere.util.DataStoreUtils;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.util.dagger.DependencyHolder;
import org.mariotaku.twidere.util.net.TwidereDns;

6
twidere/src/main/java/org/mariotaku/twidere/fragment/ParcelableGroupsFragment.java
View File

@ -60,13 +60,13 @@ public abstract class ParcelableGroupsFragment extends AbsContentListRecyclerVie
@NonNull
@Override
protected final ParcelableGroupsAdapter onCreateAdapter(Context context, boolean compact) {
protected final ParcelableGroupsAdapter onCreateAdapter(Context context) {
return new ParcelableGroupsAdapter(context);
}
@Override
protected void setupRecyclerView(Context context, boolean compact) {
super.setupRecyclerView(context, true);
protected void setupRecyclerView(Context context) {
super.setupRecyclerView(context);
}
@Nullable

4
twidere/src/main/java/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.java
View File

@ -134,8 +134,8 @@ public abstract class ParcelableStatusesFragment extends AbsStatusesFragment {
@NonNull
@Override
protected ListParcelableStatusesAdapter onCreateAdapter(final Context context, final boolean compact) {
return new ListParcelableStatusesAdapter(context, compact);
protected ListParcelableStatusesAdapter onCreateAdapter(final Context context) {
return new ListParcelableStatusesAdapter(context);
}
@Override

6
twidere/src/main/java/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.java
View File

@ -61,13 +61,13 @@ public abstract class ParcelableUserListsFragment extends AbsContentListRecycler
@NonNull
@Override
protected final ParcelableUserListsAdapter onCreateAdapter(Context context, boolean compact) {
protected final ParcelableUserListsAdapter onCreateAdapter(Context context) {
return new ParcelableUserListsAdapter(context);
}
@Override
protected void setupRecyclerView(Context context, boolean compact) {
super.setupRecyclerView(context, true);
protected void setupRecyclerView(Context context) {
super.setupRecyclerView(context);
}
@Nullable

6
twidere/src/main/java/org/mariotaku/twidere/fragment/ParcelableUsersFragment.java
View File

@ -100,7 +100,7 @@ public abstract class ParcelableUsersFragment extends AbsContentListRecyclerView
@NonNull
@Override
protected ParcelableUsersAdapter onCreateAdapter(Context context, boolean compact) {
protected ParcelableUsersAdapter onCreateAdapter(Context context) {
final ParcelableUsersAdapter adapter = new ParcelableUsersAdapter(context);
adapter.setFollowClickListener(this);
return adapter;
@ -195,8 +195,8 @@ public abstract class ParcelableUsersFragment extends AbsContentListRecyclerView
final boolean fromUser);
@Override
protected void setupRecyclerView(Context context, boolean compact) {
super.setupRecyclerView(context, true);
protected void setupRecyclerView(Context context) {
super.setupRecyclerView(context);
}
private int findPosition(ParcelableUsersAdapter adapter, UserKey accountKey, UserKey userKey) {

3
twidere/src/main/java/org/mariotaku/twidere/fragment/RetweetQuoteDialogFragment.java
View File

@ -41,7 +41,6 @@ import android.widget.EditText;
import com.twitter.Validator;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.DummyItemAdapter;
import org.mariotaku.twidere.model.Draft;
@ -65,7 +64,7 @@ import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder;
import static org.mariotaku.twidere.util.Utils.isMyRetweet;
public class RetweetQuoteDialogFragment extends BaseDialogFragment implements Constants {
public class RetweetQuoteDialogFragment extends BaseDialogFragment {
public static final String FRAGMENT_TAG = "retweet_quote";
private static final boolean SHOW_PROTECTED_CONFIRM = Boolean.parseBoolean("false");

4
twidere/src/main/java/org/mariotaku/twidere/fragment/SavedSearchesListFragment.java
View File

@ -30,9 +30,9 @@ import android.widget.ListView;
import com.squareup.otto.Subscribe;
import org.mariotaku.twidere.adapter.SavedSearchesAdapter;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.SavedSearch;
import org.mariotaku.twidere.adapter.SavedSearchesAdapter;
import org.mariotaku.twidere.loader.SavedSearchesLoader;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.model.message.SavedSearchDestroyedEvent;
@ -78,7 +78,7 @@ public class SavedSearchesListFragment extends AbsContentListViewFragment<SavedS
@NonNull
@Override
protected SavedSearchesAdapter onCreateAdapter(Context context, boolean compact) {
protected SavedSearchesAdapter onCreateAdapter(Context context) {
return new SavedSearchesAdapter(getActivity());
}

3
twidere/src/main/java/org/mariotaku/twidere/fragment/SettingsDetailsFragment.java
View File

@ -27,11 +27,10 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.activity.SettingsActivity;
import org.mariotaku.twidere.util.Utils;
public class SettingsDetailsFragment extends BasePreferenceFragment implements Constants,
public class SettingsDetailsFragment extends BasePreferenceFragment implements
OnSharedPreferenceChangeListener {

40
twidere/src/main/java/org/mariotaku/twidere/fragment/StatusFragment.java
View File

@ -363,7 +363,6 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
final View view = getView();
assert view != null;
final Context context = view.getContext();
final boolean compact = Utils.isCompactCards(context);
Utils.setNdefPushMessageCallback(getActivity(), new CreateNdefMessageCallback() {
@Override
public NdefMessage createNdefMessage(NfcEvent event) {
@ -374,12 +373,10 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
});
}
});
mStatusAdapter = new StatusAdapter(this, compact);
mStatusAdapter = new StatusAdapter(this);
mLayoutManager = new StatusListLinearLayoutManager(context, mRecyclerView);
mItemDecoration = new StatusDividerItemDecoration(context, mStatusAdapter, mLayoutManager.getOrientation());
if (compact) {
mRecyclerView.addItemDecoration(mItemDecoration);
}
mRecyclerView.addItemDecoration(mItemDecoration);
mLayoutManager.setRecycleChildrenOnDetach(true);
mRecyclerView.setLayoutManager(mLayoutManager);
mRecyclerView.setClipToPadding(false);
@ -1693,10 +1690,8 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
private final int[] mItemCounts;
private final boolean mNameFirst;
private final int mCardLayoutResource;
private final int mTextSize;
private final int mCardBackgroundColor;
private final boolean mIsCompact;
private final int mProfileImageStyle;
private final int mMediaPreviewStyle;
private final int mLinkHighlightingStyle;
@ -1718,7 +1713,7 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
private int mReplyStart;
private int mShowingActionCardPosition;
public StatusAdapter(StatusFragment fragment, boolean compact) {
public StatusAdapter(StatusFragment fragment) {
super(fragment.getContext());
setHasStableIds(true);
final Context context = fragment.getActivity();
@ -1740,18 +1735,12 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
mProfileImageStyle = Utils.getProfileImageStyle(mPreferences.getString(KEY_PROFILE_IMAGE_STYLE, null));
mMediaPreviewStyle = Utils.getMediaPreviewStyle(mPreferences.getString(KEY_MEDIA_PREVIEW_STYLE, null));
mLinkHighlightingStyle = Utils.getLinkHighlightingStyleInt(mPreferences.getString(KEY_LINK_HIGHLIGHT_OPTION, null));
mIsCompact = compact;
mDisplayProfileImage = mPreferences.getBoolean(KEY_DISPLAY_PROFILE_IMAGE, true);
mDisplayMediaPreview = Utils.isMediaPreviewEnabled(context, mPreferences);
mSensitiveContentEnabled = mPreferences.getBoolean(KEY_DISPLAY_SENSITIVE_CONTENTS, false);
mShowCardActions = !mPreferences.getBoolean(KEY_HIDE_CARD_ACTIONS, false);
mUseStarsForLikes = mPreferences.getBoolean(KEY_I_WANT_MY_STARS_BACK);
mShowAbsoluteTime = mPreferences.getBoolean(KEY_SHOW_ABSOLUTE_TIME);
if (compact) {
mCardLayoutResource = R.layout.card_item_status_compact;
} else {
mCardLayoutResource = R.layout.card_item_status;
}
final StatusAdapterLinkClickHandler<List<ParcelableStatus>> listener = new StatusAdapterLinkClickHandler<>(context,
mPreferences);
listener.setAdapter(this);
@ -2017,20 +2006,13 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
if (mStatusViewHolder != null) {
return mStatusViewHolder;
}
final View view;
if (mIsCompact) {
view = mInflater.inflate(R.layout.header_status_compact, parent, false);
final View cardView = view.findViewById(R.id.compact_card);
cardView.setBackgroundColor(mCardBackgroundColor);
} else {
view = mInflater.inflate(R.layout.header_status, parent, false);
final CardView cardView = (CardView) view.findViewById(R.id.card);
cardView.setCardBackgroundColor(mCardBackgroundColor);
}
final View view = mInflater.inflate(R.layout.header_status_compact, parent, false);
final View cardView = view.findViewById(R.id.compact_card);
cardView.setBackgroundColor(mCardBackgroundColor);
return new DetailStatusViewHolder(this, view);
}
case VIEW_TYPE_LIST_STATUS: {
final View view = mInflater.inflate(mCardLayoutResource, parent, false);
final View view = mInflater.inflate(R.layout.card_item_status_compact, parent, false);
final CardView cardView = (CardView) view.findViewById(R.id.card);
if (cardView != null) {
cardView.setCardBackgroundColor(mCardBackgroundColor);
@ -2659,13 +2641,5 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
return true;
}
private boolean shouldDrawDivider(int viewType) {
switch (viewType) {
case StatusAdapter.VIEW_TYPE_LIST_STATUS:
case StatusAdapter.VIEW_TYPE_DETAIL_STATUS:
return true;
}
return false;
}
}
}

5
twidere/src/main/java/org/mariotaku/twidere/fragment/StubFragment.java
View File

@ -27,13 +27,14 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import static org.mariotaku.twidere.constant.IntentConstants.EXTRA_TAB_POSITION;
/**
* Created by mariotaku on 15/7/4.
*/
public class StubFragment extends Fragment implements Constants {
public class StubFragment extends Fragment {
private TextView mTextView;
@Override

2
twidere/src/main/java/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.java
View File

@ -59,7 +59,7 @@ public class TrendsSuggestionsFragment extends AbsContentListViewFragment<Trends
@NonNull
@Override
protected TrendsAdapter onCreateAdapter(Context context, boolean compact) {
protected TrendsAdapter onCreateAdapter(Context context) {
return new TrendsAdapter(getActivity());
}

10
twidere/src/main/java/org/mariotaku/twidere/fragment/UserListFragment.java
View File

@ -50,14 +50,14 @@ import android.widget.CheckBox;
import com.rengwuxian.materialedittext.MaterialEditText;
import com.squareup.otto.Subscribe;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.AccountSelectorActivity;
import org.mariotaku.twidere.activity.UserListSelectorActivity;
import org.mariotaku.twidere.adapter.SupportTabsAdapter;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.UserList;
import org.mariotaku.microblog.library.twitter.model.UserListUpdate;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.AccountSelectorActivity;
import org.mariotaku.twidere.activity.UserListSelectorActivity;
import org.mariotaku.twidere.adapter.SupportTabsAdapter;
import org.mariotaku.twidere.fragment.iface.IBaseFragment.SystemWindowsInsetsCallback;
import org.mariotaku.twidere.fragment.iface.SupportFragmentCallback;
import org.mariotaku.twidere.model.ParcelableUser;
@ -72,8 +72,8 @@ import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.IntentUtils;
import org.mariotaku.twidere.util.LinkCreator;
import org.mariotaku.twidere.util.MenuUtils;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.Utils;
public class UserListFragment extends AbsToolbarTabPagesFragment implements OnClickListener,

6
twidere/src/main/java/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.java
View File

@ -63,7 +63,7 @@ public class UserMediaTimelineFragment extends AbsContentRecyclerViewFragment<St
}
@Override
protected void setupRecyclerView(Context context, boolean compact) {
protected void setupRecyclerView(Context context) {
}
@ -88,8 +88,8 @@ public class UserMediaTimelineFragment extends AbsContentRecyclerViewFragment<St
@NonNull
@Override
protected StaggeredGridParcelableStatusesAdapter onCreateAdapter(Context context, boolean compact) {
return new StaggeredGridParcelableStatusesAdapter(context, compact);
protected StaggeredGridParcelableStatusesAdapter onCreateAdapter(Context context) {
return new StaggeredGridParcelableStatusesAdapter(context);
}
@Override

8
twidere/src/main/java/org/mariotaku/twidere/fragment/UserProfileEditorFragment.java
View File

@ -49,13 +49,13 @@ import com.twitter.Validator;
import org.mariotaku.abstask.library.AbstractTask;
import org.mariotaku.abstask.library.TaskStarter;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.ColorPickerDialogActivity;
import org.mariotaku.twidere.activity.ThemedImagePickerActivity;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.ProfileUpdate;
import org.mariotaku.microblog.library.twitter.model.User;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.ColorPickerDialogActivity;
import org.mariotaku.twidere.activity.ThemedImagePickerActivity;
import org.mariotaku.twidere.fragment.iface.IBaseFragment;
import org.mariotaku.twidere.loader.ParcelableUserLoader;
import org.mariotaku.twidere.model.ParcelableAccount;
@ -71,8 +71,8 @@ import org.mariotaku.twidere.task.UpdateProfileBannerImageTask;
import org.mariotaku.twidere.util.AsyncTwitterWrapper.UpdateProfileImageTask;
import org.mariotaku.twidere.util.HtmlEscapeHelper;
import org.mariotaku.twidere.util.KeyboardShortcutsHandler;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.TwitterValidatorMETLengthChecker;
import org.mariotaku.twidere.util.TwitterWrapper;
import org.mariotaku.twidere.util.Utils;

2
twidere/src/main/java/org/mariotaku/twidere/fragment/card/CardPollFragment.java
View File

@ -47,11 +47,11 @@ import android.widget.TextView;
import org.apache.commons.lang3.math.NumberUtils;
import org.mariotaku.abstask.library.AbstractTask;
import org.mariotaku.abstask.library.TaskStarter;
import org.mariotaku.twidere.R;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.TwitterCaps;
import org.mariotaku.microblog.library.twitter.model.CardDataMap;
import org.mariotaku.microblog.library.twitter.model.CardEntity;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.fragment.BaseSupportFragment;
import org.mariotaku.twidere.model.ParcelableCardEntity;
import org.mariotaku.twidere.model.ParcelableStatus;

4
twidere/src/main/java/org/mariotaku/twidere/loader/BaseGroupsLoader.java
View File

@ -23,12 +23,12 @@ import android.content.Context;
import android.support.v4.content.AsyncTaskLoader;
import android.util.Log;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.microblog.library.statusnet.model.Group;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.statusnet.model.Group;
import org.mariotaku.microblog.library.twitter.model.CursorSupport;
import org.mariotaku.microblog.library.twitter.model.PageableResponseList;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.loader.iface.ICursorSupportLoader;
import org.mariotaku.twidere.model.ParcelableGroup;
import org.mariotaku.twidere.model.UserKey;

2
twidere/src/main/java/org/mariotaku/twidere/loader/BaseUserListsLoader.java
View File

@ -23,12 +23,12 @@ import android.content.Context;
import android.support.v4.content.AsyncTaskLoader;
import android.util.Log;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.CursorSupport;
import org.mariotaku.microblog.library.twitter.model.PageableResponseList;
import org.mariotaku.microblog.library.twitter.model.UserList;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.loader.iface.ICursorSupportLoader;
import org.mariotaku.twidere.model.ParcelableUserList;
import org.mariotaku.twidere.model.UserKey;

2
twidere/src/main/java/org/mariotaku/twidere/loader/ConversationLoader.java
View File

@ -37,8 +37,8 @@ import org.mariotaku.twidere.model.ParcelableStatus;
import org.mariotaku.twidere.model.util.ParcelableAccountUtils;
import org.mariotaku.twidere.model.util.ParcelableStatusUtils;
import org.mariotaku.twidere.util.InternalTwitterContentUtils;
import org.mariotaku.twidere.util.Nullables;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.Nullables;
import org.mariotaku.twidere.util.Utils;
import java.util.ArrayList;

7
twidere/src/main/java/org/mariotaku/twidere/loader/ExtensionsListLoader.java
View File

@ -36,14 +36,13 @@ import android.support.v4.content.AsyncTaskLoader;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.PermissionsManager;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ExtensionsListLoader extends AsyncTaskLoader<List<ExtensionsListLoader.ExtensionInfo>> implements
Constants {
public class ExtensionsListLoader extends AsyncTaskLoader<List<ExtensionsListLoader.ExtensionInfo>>
implements Constants {
private PackageIntentReceiver mPackageObserver;
private final InterestingConfigChanges mLastConfig = new InterestingConfigChanges();
@ -125,7 +124,7 @@ public class ExtensionsListLoader extends AsyncTaskLoader<List<ExtensionsListLoa
final Bundle meta = info.metaData;
final String permissionString = meta.getString(METADATA_KEY_EXTENSION_PERMISSIONS);
permissions = permissionString != null ? permissionString
.split(PermissionsManager.SEPARATOR_PERMISSION_REGEX) : null;
.split(SEPARATOR_PERMISSION_REGEX) : null;
settings = meta.getString(METADATA_KEY_EXTENSION_SETTINGS);
icon = info.loadIcon(pm);
pname = info.packageName;

2
twidere/src/main/java/org/mariotaku/twidere/loader/IntentExtrasStatusesLoader.java
View File

@ -28,6 +28,8 @@ import org.mariotaku.twidere.model.ParcelableStatus;
import java.util.Collections;
import java.util.List;
import static org.mariotaku.twidere.constant.IntentConstants.EXTRA_STATUSES;
public class IntentExtrasStatusesLoader extends ParcelableStatusesLoader {
private final Bundle mExtras;

2
twidere/src/main/java/org/mariotaku/twidere/loader/IntentExtrasUsersLoader.java
View File

@ -27,6 +27,8 @@ import org.mariotaku.twidere.model.ParcelableUser;
import java.util.Collections;
import java.util.List;
import static org.mariotaku.twidere.constant.IntentConstants.EXTRA_USERS;
public class IntentExtrasUsersLoader extends ParcelableUsersLoader {
private final Bundle mExtras;

6
twidere/src/main/java/org/mariotaku/twidere/loader/MicroBlogAPIStatusesLoader.java
View File

@ -30,11 +30,12 @@ import com.nostra13.universalimageloader.cache.disc.DiskCache;
import com.nostra13.universalimageloader.utils.IoUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.commons.logansquare.LoganSquareMapperFinder;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.Status;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.app.TwidereApplication;
import org.mariotaku.twidere.model.ListResponse;
import org.mariotaku.twidere.model.ParcelableCredentials;
@ -44,10 +45,9 @@ import org.mariotaku.twidere.model.util.ParcelableCredentialsUtils;
import org.mariotaku.twidere.model.util.ParcelableStatusUtils;
import org.mariotaku.twidere.util.InternalTwitterContentUtils;
import org.mariotaku.twidere.util.JsonSerializer;
import org.mariotaku.commons.logansquare.LoganSquareMapperFinder;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.TwidereArrayUtils;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import org.mariotaku.twidere.util.UserColorNameManager;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;

5
twidere/src/main/java/org/mariotaku/twidere/loader/ParcelableStatusLoader.java
View File

@ -27,6 +27,7 @@ import android.support.v4.content.AsyncTaskLoader;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.ErrorInfo;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.constant.IntentConstants;
import org.mariotaku.twidere.model.ParcelableCredentials;
import org.mariotaku.twidere.model.ParcelableStatus;
@ -40,13 +41,13 @@ import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
import javax.inject.Inject;
import static org.mariotaku.twidere.constant.IntentConstants.EXTRA_ACCOUNT;
import static org.mariotaku.twidere.util.Utils.findStatus;
/**
* Created by mariotaku on 14/12/5.
*/
public class ParcelableStatusLoader extends AsyncTaskLoader<SingleResponse<ParcelableStatus>> {
public class ParcelableStatusLoader extends AsyncTaskLoader<SingleResponse<ParcelableStatus>>
implements Constants {
private final boolean mOmitIntentExtra;
private final Bundle mExtras;

9
twidere/src/main/java/org/mariotaku/twidere/loader/ParcelableUserLoader.java
View File

@ -30,12 +30,12 @@ import android.util.Log;
import android.util.Pair;
import org.mariotaku.abstask.library.TaskStarter;
import org.mariotaku.sqliteqb.library.Columns;
import org.mariotaku.sqliteqb.library.Expression;
import org.mariotaku.twidere.Constants;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.User;
import org.mariotaku.sqliteqb.library.Columns;
import org.mariotaku.sqliteqb.library.Expression;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.fragment.UserFragment;
import org.mariotaku.twidere.model.ParcelableAccount;
import org.mariotaku.twidere.model.ParcelableCredentials;
@ -58,7 +58,8 @@ import javax.inject.Inject;
import static org.mariotaku.twidere.util.ContentValuesCreator.createCachedUser;
public final class ParcelableUserLoader extends AsyncTaskLoader<SingleResponse<ParcelableUser>> implements Constants {
public final class ParcelableUserLoader extends AsyncTaskLoader<SingleResponse<ParcelableUser>>
implements Constants {
private final boolean mOmitIntentExtra, mLoadFromCache;
private final Bundle mExtras;

5
twidere/src/main/java/org/mariotaku/twidere/loader/SavedSearchesLoader.java
View File

@ -27,12 +27,11 @@ import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.SavedSearch;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import static org.mariotaku.twidere.TwidereConstants.LOGTAG;
public class SavedSearchesLoader extends AsyncTaskLoader<ResponseList<SavedSearch>> {
public class SavedSearchesLoader extends AsyncTaskLoader<ResponseList<SavedSearch>> implements Constants {
private final UserKey mAccountId;

2
twidere/src/main/java/org/mariotaku/twidere/loader/UserGroupsLoader.java
View File

@ -21,9 +21,9 @@ package org.mariotaku.twidere.loader;
import android.content.Context;
import org.mariotaku.microblog.library.statusnet.model.Group;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.statusnet.model.Group;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.twidere.model.ParcelableGroup;
import org.mariotaku.twidere.model.UserKey;

4
twidere/src/main/java/org/mariotaku/twidere/menu/SupportStatusShareProvider.java
View File

@ -26,16 +26,16 @@ import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.model.ParcelableStatus;
import org.mariotaku.twidere.util.MenuUtils;
import static org.mariotaku.twidere.Constants.MENU_GROUP_STATUS_SHARE;
import static org.mariotaku.twidere.util.Utils.createStatusShareIntent;
/**
* Created by mariotaku on 14/12/7.
*/
public class SupportStatusShareProvider extends ActionProvider implements Constants {
public class SupportStatusShareProvider extends ActionProvider {
private final Context mContext;
private ParcelableStatus mStatus;

2
twidere/src/main/java/org/mariotaku/twidere/model/ActivityTitleSummaryMessage.java
View File

@ -12,8 +12,8 @@ import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.StyleSpan;
import org.mariotaku.twidere.R;
import org.mariotaku.microblog.library.twitter.model.Activity;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.util.ParcelableActivityUtils;
import org.mariotaku.twidere.util.UserColorNameManager;
import org.oshkimaadziig.george.androidutils.SpanFormatter;

7
twidere/src/main/java/org/mariotaku/twidere/model/CustomAPIConfig.java
View File

@ -9,7 +9,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.bluelinelabs.logansquare.typeconverters.StringBasedTypeConverter;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.util.JsonSerializer;
import org.mariotaku.twidere.util.Utils;
@ -19,11 +18,15 @@ import java.io.InputStream;
import java.util.Collections;
import java.util.List;
import static org.mariotaku.twidere.TwidereConstants.DEFAULT_TWITTER_API_URL_FORMAT;
import static org.mariotaku.twidere.TwidereConstants.TWITTER_CONSUMER_KEY;
import static org.mariotaku.twidere.TwidereConstants.TWITTER_CONSUMER_SECRET;
/**
* Created by mariotaku on 16/3/12.
*/
@JsonObject
public final class CustomAPIConfig implements Constants {
public final class CustomAPIConfig {
@JsonField(name = "name")
String name;

1
twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableAccountUtils.java
View File

@ -9,7 +9,6 @@ import org.mariotaku.sqliteqb.library.ArgsArray;
import org.mariotaku.sqliteqb.library.Columns;
import org.mariotaku.sqliteqb.library.Expression;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.SignInActivity;
import org.mariotaku.twidere.model.ParcelableAccount;
import org.mariotaku.twidere.model.ParcelableAccountCursorIndices;
import org.mariotaku.twidere.model.UserKey;

2
twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableCardEntityUtils.java
View File

@ -6,9 +6,9 @@ import android.support.annotation.Nullable;
import android.support.v4.util.ArrayMap;
import org.apache.commons.lang3.math.NumberUtils;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.microblog.library.twitter.model.CardEntity;
import org.mariotaku.microblog.library.twitter.util.ThreadLocalSimpleDateFormat;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.model.ParcelableCardEntity;
import org.mariotaku.twidere.model.UserKey;

3
twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableStatusUpdateUtils.java
View File

@ -2,7 +2,6 @@ package org.mariotaku.twidere.model.util;
import android.content.Context;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.model.Draft;
import org.mariotaku.twidere.model.ParcelableStatusUpdate;
import org.mariotaku.twidere.model.draft.UpdateStatusActionExtra;
@ -10,7 +9,7 @@ import org.mariotaku.twidere.model.draft.UpdateStatusActionExtra;
/**
* Created by mariotaku on 16/2/12.
*/
public class ParcelableStatusUpdateUtils implements Constants {
public class ParcelableStatusUpdateUtils {
private ParcelableStatusUpdateUtils() {
}

11
twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableStatusUtils.java
View File

@ -8,7 +8,6 @@ import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.URLSpan;
import org.mariotaku.twidere.Constants;
import org.mariotaku.microblog.library.statusnet.model.Attention;
import org.mariotaku.microblog.library.twitter.model.GeoLocation;
import org.mariotaku.microblog.library.twitter.model.Place;
@ -28,10 +27,12 @@ import org.mariotaku.twidere.util.UserColorNameManager;
import java.util.Date;
import java.util.List;
import static org.mariotaku.twidere.TwidereConstants.USER_TYPE_FANFOU_COM;
/**
* Created by mariotaku on 16/1/3.
*/
public class ParcelableStatusUtils implements Constants {
public class ParcelableStatusUtils {
private ParcelableStatusUtils() {
}
@ -85,7 +86,7 @@ public class ParcelableStatusUtils implements Constants {
// Twitter will escape <> to &lt;&gt;, so if a status contains those symbols unescaped
// We should treat this as an html
if (isHtml(quotedText)) {
final CharSequence html = HtmlSpanBuilder.fromHtml(quotedText, quoted.getText());
final CharSequence html = HtmlSpanBuilder.fromHtml(quotedText, quoted.getExtendedText());
result.quoted_text_unescaped = html.toString();
result.quoted_text_plain = result.quoted_text_unescaped;
result.quoted_spans = getSpanItems(html);
@ -152,14 +153,14 @@ public class ParcelableStatusUtils implements Constants {
// Twitter will escape <> to &lt;&gt;, so if a status contains those symbols unescaped
// We should treat this as an html
if (isHtml(text)) {
final CharSequence html = HtmlSpanBuilder.fromHtml(text, status.getText());
final CharSequence html = HtmlSpanBuilder.fromHtml(text, status.getExtendedText());
result.text_unescaped = html.toString();
result.text_plain = result.text_unescaped;
result.spans = getSpanItems(html);
} else {
final Pair<String, List<SpanItem>> textWithIndices = InternalTwitterContentUtils.formatStatusTextWithIndices(status);
result.text_plain = InternalTwitterContentUtils.unescapeTwitterStatusText(text);
result.text_unescaped = textWithIndices.first;
result.text_plain = InternalTwitterContentUtils.unescapeTwitterStatusText(text);
result.spans = textWithIndices.second.toArray(new SpanItem[textWithIndices.second.size()]);
}
result.media = ParcelableMediaUtils.fromStatus(status);

2
twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableUserUtils.java
View File

@ -5,9 +5,9 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.microblog.library.twitter.model.UrlEntity;
import org.mariotaku.microblog.library.twitter.model.User;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.model.ParcelableAccount;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.model.UserKey;

2
twidere/src/main/java/org/mariotaku/twidere/model/util/UserKeyUtils.java
View File

@ -6,8 +6,8 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.microblog.library.twitter.model.User;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.provider.TwidereDataStore.Accounts;

3
twidere/src/main/java/org/mariotaku/twidere/preference/AsyncTaskPreference.java
View File

@ -26,10 +26,9 @@ import android.os.AsyncTask.Status;
import android.support.v7.preference.Preference;
import android.util.AttributeSet;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
public abstract class AsyncTaskPreference extends Preference implements Constants {
public abstract class AsyncTaskPreference extends Preference {
private Task mTask;

22
twidere/src/main/java/org/mariotaku/twidere/preference/CardPreviewPreference.java
View File

@ -27,17 +27,17 @@ import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.widget.RecyclerView;
import android.util.AttributeSet;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.DummyItemAdapter;
import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable;
import org.mariotaku.twidere.view.holder.StatusViewHolder;
import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder;
public class CardPreviewPreference extends Preference implements Constants, OnSharedPreferenceChangeListener {
import static org.mariotaku.twidere.TwidereConstants.SHARED_PREFERENCES_NAME;
public class CardPreviewPreference extends Preference implements OnSharedPreferenceChangeListener {
private StatusViewHolder mHolder;
private boolean mCompactModeChanged;
private DummyItemAdapter mAdapter;
public CardPreviewPreference(final Context context) {
@ -52,7 +52,7 @@ public class CardPreviewPreference extends Preference implements Constants, OnSh
super(context, attrs, defStyle);
final SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES_NAME,
Context.MODE_PRIVATE);
setLayoutResources(preferences);
setLayoutResource(R.layout.layout_preferences_card_preview_compact);
preferences.registerOnSharedPreferenceChangeListener(this);
mAdapter = new DummyItemAdapter(context);
}
@ -60,29 +60,15 @@ public class CardPreviewPreference extends Preference implements Constants, OnSh
@Override
public void onSharedPreferenceChanged(final SharedPreferences preferences, final String key) {
if (mHolder == null) return;
if (KEY_COMPACT_CARDS.equals(key)) {
setLayoutResources(preferences);
}
mAdapter.updateOptions();
notifyChanged();
}
protected void setLayoutResources(SharedPreferences preferences) {
if (preferences.getBoolean(KEY_COMPACT_CARDS, false)) {
setLayoutResource(R.layout.layout_preferences_card_preview_compact);
mHolder = null;
} else {
setLayoutResource(R.layout.layout_preferences_card_preview);
mHolder = null;
}
}
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
if (mHolder == null) {
mHolder = new StatusViewHolder(mAdapter, holder.itemView);
}
mCompactModeChanged = false;
mHolder.setupViewOptions();
mHolder.displaySampleStatus();
mHolder.setStatusClickListener(new IStatusViewHolder.SimpleStatusClickListener() {

2
twidere/src/main/java/org/mariotaku/twidere/preference/ClearCachePreference.java
View File

@ -27,6 +27,8 @@ import org.mariotaku.twidere.R;
import java.io.File;
import static org.mariotaku.twidere.TwidereConstants.LOGTAG;
public class ClearCachePreference extends AsyncTaskPreference {
public ClearCachePreference(final Context context) {

3
twidere/src/main/java/org/mariotaku/twidere/preference/ClearSearchHistoryPreference.java
View File

@ -24,12 +24,11 @@ import android.content.Context;
import android.provider.SearchRecentSuggestions;
import android.util.AttributeSet;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.provider.RecentSearchProvider;
import org.mariotaku.twidere.provider.TwidereDataStore.SearchHistory;
public class ClearSearchHistoryPreference extends AsyncTaskPreference implements Constants {
public class ClearSearchHistoryPreference extends AsyncTaskPreference {
public ClearSearchHistoryPreference(final Context context) {
this(context, null);

6
twidere/src/main/java/org/mariotaku/twidere/preference/ColorPickerPreference.java
View File

@ -39,14 +39,16 @@ import android.widget.ImageView;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.preference.iface.IDialogPreference;
import org.mariotaku.twidere.util.TwidereColorUtils;
import me.uucky.colorpicker.ColorPickerDialog;
public class ColorPickerPreference extends DialogPreference implements Constants,
import static org.mariotaku.twidere.Constants.PRESET_COLORS;
import static org.mariotaku.twidere.TwidereConstants.LOGTAG;
public class ColorPickerPreference extends DialogPreference implements
IDialogPreference {
private int mDefaultValue = Color.WHITE;

1
twidere/src/main/java/org/mariotaku/twidere/preference/ComponentPickerPreference.java
View File

@ -24,7 +24,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.support.v7.preference.ListPreference;
import android.text.TextUtils;
import android.util.AttributeSet;

5
twidere/src/main/java/org/mariotaku/twidere/preference/KeyboardShortcutPreference.java
View File

@ -17,7 +17,6 @@ import android.widget.TextView;
import com.afollestad.materialdialogs.AlertDialogWrapper;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.fragment.ThemedPreferenceDialogFragmentCompat;
import org.mariotaku.twidere.preference.iface.IDialogPreference;
@ -27,6 +26,8 @@ import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
import javax.inject.Inject;
import static org.mariotaku.twidere.TwidereConstants.LOGTAG;
/**
* Created by mariotaku on 16/3/15.
*/
@ -116,7 +117,7 @@ public class KeyboardShortcutPreference extends DialogPreference implements IDia
}
public static class KeyboardShortcutDialogFragment extends ThemedPreferenceDialogFragmentCompat
implements Constants, DialogInterface.OnKeyListener {
implements DialogInterface.OnKeyListener {
private TextView mKeysLabel;
private TextView mConflictLabel;

5
twidere/src/main/java/org/mariotaku/twidere/preference/MediaUploaderPreference.java
View File

@ -22,10 +22,11 @@ package org.mariotaku.twidere.preference;
import android.content.Context;
import android.util.AttributeSet;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
public class MediaUploaderPreference extends ServicePickerPreference implements Constants {
import static org.mariotaku.twidere.constant.IntentConstants.INTENT_ACTION_EXTENSION_UPLOAD_MEDIA;
public class MediaUploaderPreference extends ServicePickerPreference {
public MediaUploaderPreference(final Context context) {
super(context);

4
twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java
View File

@ -35,8 +35,8 @@ import org.mariotaku.twidere.R;
import org.mariotaku.twidere.fragment.ThemedPreferenceDialogFragmentCompat;
import org.mariotaku.twidere.preference.iface.IDialogPreference;
public class NotificationTypePreference extends DialogPreference implements Constants,
IDialogPreference {
public class NotificationTypePreference extends DialogPreference implements
Constants, IDialogPreference {
private final int mDefaultValue;

28
twidere/src/main/java/org/mariotaku/twidere/preference/StatusShortenerPreference.java
View File

@ -27,22 +27,22 @@ import org.mariotaku.twidere.R;
public class StatusShortenerPreference extends ServicePickerPreference implements Constants {
public StatusShortenerPreference(final Context context) {
this(context, null);
}
public StatusShortenerPreference(final Context context) {
this(context, null);
}
public StatusShortenerPreference(final Context context, final AttributeSet attrs) {
super(context, attrs);
}
public StatusShortenerPreference(final Context context, final AttributeSet attrs) {
super(context, attrs);
}
@Override
protected String getIntentAction() {
return INTENT_ACTION_EXTENSION_SHORTEN_STATUS;
}
@Override
protected String getIntentAction() {
return INTENT_ACTION_EXTENSION_SHORTEN_STATUS;
}
@Override
protected String getNoneEntry() {
return getContext().getString(R.string.status_shortener_default);
}
@Override
protected String getNoneEntry() {
return getContext().getString(R.string.status_shortener_default);
}
}

5
twidere/src/main/java/org/mariotaku/twidere/preference/TimelineSyncPreference.java
View File

@ -22,10 +22,11 @@ package org.mariotaku.twidere.preference;
import android.content.Context;
import android.util.AttributeSet;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
public class TimelineSyncPreference extends ServicePickerPreference implements Constants {
import static org.mariotaku.twidere.constant.IntentConstants.INTENT_ACTION_EXTENSION_SYNC_TIMELINE;
public class TimelineSyncPreference extends ServicePickerPreference {
public TimelineSyncPreference(final Context context) {
this(context, null);

7
twidere/src/main/java/org/mariotaku/twidere/preference/TranslationDestinationPreference.java
View File

@ -36,19 +36,20 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Language;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import java.text.Collator;
import java.util.Comparator;
import java.util.List;
public class TranslationDestinationPreference extends Preference implements Constants, OnClickListener {
import static org.mariotaku.twidere.TwidereConstants.LOGTAG;
public class TranslationDestinationPreference extends Preference implements OnClickListener {
private String mSelectedLanguageCode = "en";

9
twidere/src/main/java/org/mariotaku/twidere/preference/TrendsLocationPreference.java
View File

@ -39,12 +39,11 @@ import android.widget.BaseExpandableListAdapter;
import android.widget.ExpandableListView;
import android.widget.TextView;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Location;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
import java.text.Collator;
@ -54,7 +53,9 @@ import java.util.Comparator;
import java.util.List;
import java.util.Locale;
public class TrendsLocationPreference extends Preference implements Constants {
import static org.mariotaku.twidere.TwidereConstants.LOGTAG;
public class TrendsLocationPreference extends Preference {
private static final long EMPTY = 0;
private static final long WORLDWIDE = 1;

7
twidere/src/main/java/org/mariotaku/twidere/provider/CacheProvider.java
View File

@ -5,25 +5,21 @@ import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.provider.MediaStore.Files.FileColumns;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringDef;
import android.util.Log;
import android.webkit.MimeTypeMap;
import com.bluelinelabs.logansquare.JsonMapper;
import com.nostra13.universalimageloader.cache.disc.DiskCache;
import org.apache.commons.lang3.ArrayUtils;
import org.mariotaku.commons.logansquare.LoganSquareMapperFinder;
import org.mariotaku.restfu.RestFuUtils;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.model.CacheMetadata;
import org.mariotaku.twidere.task.SaveFileTask;
import org.mariotaku.commons.logansquare.LoganSquareMapperFinder;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
@ -31,7 +27,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Arrays;
import java.util.Locale;
import javax.inject.Inject;

6
twidere/src/main/java/org/mariotaku/twidere/provider/TwidereDataProvider.java
View File

@ -66,6 +66,7 @@ import com.squareup.otto.Bus;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.mariotaku.microblog.library.twitter.model.Activity;
import org.mariotaku.sqliteqb.library.ArgsArray;
import org.mariotaku.sqliteqb.library.Columns.Column;
import org.mariotaku.sqliteqb.library.Expression;
@ -81,7 +82,6 @@ import org.mariotaku.twidere.activity.HomeActivity;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.annotation.NotificationType;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.microblog.library.twitter.model.Activity;
import org.mariotaku.twidere.app.TwidereApplication;
import org.mariotaku.twidere.model.AccountPreferences;
import org.mariotaku.twidere.model.ActivityTitleSummaryMessage;
@ -162,8 +162,8 @@ import java.util.regex.Pattern;
import javax.inject.Inject;
public final class TwidereDataProvider extends ContentProvider implements Constants, OnSharedPreferenceChangeListener,
LazyLoadCallback {
public final class TwidereDataProvider extends ContentProvider implements Constants,
OnSharedPreferenceChangeListener, LazyLoadCallback {
public static final String TAG_OLDEST_MESSAGES = "oldest_messages";
private static final Pattern PATTERN_SCREEN_NAME = Pattern.compile("(?i)[@\uFF20]?([a-z0-9_]{1,20})");

Some files were not shown because too many files have changed in this diff Show More