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

added user list beam sharing 

direct message now support quick return
This commit is contained in:
Mariotaku Lee 2015-03-15 22:40:45 +08:00
parent 94fa9f1c72
commit 11dbc7eb7c
16 changed files with 333 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
twidere/src/main/java/org/mariotaku/twidere/adapter/AbsStatusesAdapter.java
View File

@ -118,6 +118,7 @@ public abstract class AbsStatusesAdapter<D> extends Adapter<ViewHolder> implemen
return mTextSize;
}
@Override
public boolean hasLoadMoreIndicator() {
return mLoadMoreIndicatorEnabled;
}
@ -148,7 +149,7 @@ public abstract class AbsStatusesAdapter<D> extends Adapter<ViewHolder> implemen
}
public boolean isStatus(int position) {
return position < getStatusCount();
return position < getStatusesCount();
}
@Override
@ -194,7 +195,7 @@ public abstract class AbsStatusesAdapter<D> extends Adapter<ViewHolder> implemen
@Override
public int getItemViewType(int position) {
if (position == getStatusCount()) {
if (position == getStatusesCount()) {
return ITEM_VIEW_TYPE_LOAD_INDICATOR;
} else if (isGapItem(position)) {
return ITEM_VIEW_TYPE_GAP;
@ -204,7 +205,7 @@ public abstract class AbsStatusesAdapter<D> extends Adapter<ViewHolder> implemen
@Override
public final int getItemCount() {
return getStatusCount() + (mLoadMoreIndicatorEnabled ? 1 : 0);
return getStatusesCount() + (mLoadMoreIndicatorEnabled ? 1 : 0);
}
@Override
@ -255,6 +256,7 @@ public abstract class AbsStatusesAdapter<D> extends Adapter<ViewHolder> implemen
mStatusAdapterListener = listener;
}
@Override
public void setLoadMoreIndicatorEnabled(boolean enabled) {
if (mLoadMoreIndicatorEnabled == enabled) return;
mLoadMoreIndicatorEnabled = enabled;

8
twidere/src/main/java/org/mariotaku/twidere/adapter/CursorStatusesAdapter.java
View File

@ -48,7 +48,7 @@ public class CursorStatusesAdapter extends AbsStatusesAdapter<Cursor> {
@Override
public long getItemId(int position) {
if (position == getStatusCount()) return -1;
if (position == getStatusesCount()) return -1;
final Cursor c = mCursor;
if (c != null && !c.isClosed() && c.moveToPosition(position)) {
final long account_id = c.getLong(mIndices.account_id);
@ -70,7 +70,7 @@ public class CursorStatusesAdapter extends AbsStatusesAdapter<Cursor> {
@Override
public ParcelableStatus getStatus(int position) {
if (hasLoadMoreIndicator() && position == getStatusCount() - 1) return null;
if (hasLoadMoreIndicator() && position == getStatusesCount() - 1) return null;
final Cursor c = mCursor;
if (c != null && !c.isClosed() && c.moveToPosition(position)) {
return new ParcelableStatus(c, mIndices);
@ -79,14 +79,14 @@ public class CursorStatusesAdapter extends AbsStatusesAdapter<Cursor> {
}
@Override
public int getStatusCount() {
public int getStatusesCount() {
if (mCursor == null) return 0;
return mCursor.getCount();
}
@Override
public long getStatusId(int position) {
if (position == getStatusCount()) return position;
if (position == getStatusesCount()) return position;
final Cursor c = mCursor;
if (c != null && !c.isClosed() && c.moveToPosition(position)) {
return c.getLong(mIndices.status_id);

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

@ -39,6 +39,7 @@ import org.mariotaku.twidere.util.ImageLoadingHandler;
import org.mariotaku.twidere.util.MultiSelectManager;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.view.holder.LoadIndicatorViewHolder;
import org.mariotaku.twidere.view.holder.MessageEntryViewHolder;
public class MessageEntriesAdapter extends Adapter<ViewHolder> implements Constants, IContentCardAdapter, OnClickListener {
@ -48,6 +49,7 @@ public class MessageEntriesAdapter extends Adapter<ViewHolder> implements Consta
private final ImageLoaderWrapper mImageLoader;
private final MultiSelectManager mMultiSelectManager;
private final boolean mNicknameOnly;
private boolean mLoadMoreIndicatorEnabled;
private final int mTextSize;
private final int mProfileImageStyle;
private final int mMediaPreviewStyle;
@ -83,6 +85,19 @@ public class MessageEntriesAdapter extends Adapter<ViewHolder> implements Consta
return mTextSize;
}
@Override
public void setLoadMoreIndicatorEnabled(boolean enabled) {
if (mLoadMoreIndicatorEnabled == enabled) return;
mLoadMoreIndicatorEnabled = enabled;
notifyDataSetChanged();
}
@Override
public boolean hasLoadMoreIndicator() {
return mLoadMoreIndicatorEnabled;
}
public ImageLoaderWrapper getImageLoader() {
return mImageLoader;
}
@ -101,17 +116,48 @@ public class MessageEntriesAdapter extends Adapter<ViewHolder> implements Consta
return mNicknameOnly;
}
public static final int ITEM_VIEW_TYPE_MESSAGE = 0;
public static final int ITEM_VIEW_TYPE_LOAD_INDICATOR = 1;
@Override
public int getItemViewType(int position) {
if (position == getMessagesCount()) {
return ITEM_VIEW_TYPE_LOAD_INDICATOR;
}
return ITEM_VIEW_TYPE_MESSAGE;
}
private int getMessagesCount() {
final Cursor c = mCursor;
if (c == null || c.isClosed()) return 0;
return c.getCount();
}
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
final View view = mInflater.inflate(R.layout.list_item_message_entry, parent, false);
return new MessageEntryViewHolder(this, view);
switch (viewType) {
case ITEM_VIEW_TYPE_MESSAGE: {
final View view = mInflater.inflate(R.layout.list_item_message_entry, parent, false);
return new MessageEntryViewHolder(this, view);
}
case ITEM_VIEW_TYPE_LOAD_INDICATOR: {
final View view = mInflater.inflate(R.layout.card_item_load_indicator, parent, false);
return new LoadIndicatorViewHolder(view);
}
}
throw new IllegalStateException("Unknown view type " + viewType);
}
@Override
public void onBindViewHolder(ViewHolder holder, int position) {
final Cursor c = mCursor;
c.moveToPosition(position);
((MessageEntryViewHolder) holder).displayMessage(c);
switch (getItemViewType(position)) {
case ITEM_VIEW_TYPE_MESSAGE: {
final Cursor c = mCursor;
c.moveToPosition(position);
((MessageEntryViewHolder) holder).displayMessage(c);
break;
}
}
}
@Override
@ -135,10 +181,8 @@ public class MessageEntriesAdapter extends Adapter<ViewHolder> implements Consta
}
@Override
public int getItemCount() {
final Cursor c = mCursor;
if (c == null) return 0;
return c.getCount();
public final int getItemCount() {
return getMessagesCount() + (mLoadMoreIndicatorEnabled ? 1 : 0);
}
public MessageEntriesAdapter(final Context context) {

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

@ -21,7 +21,7 @@ public class ParcelableStatusesAdapter extends AbsStatusesAdapter<List<Parcelabl
@Override
public boolean isGapItem(int position) {
return getStatus(position).is_gap && position != getStatusCount() - 1;
return getStatus(position).is_gap && position != getStatusesCount() - 1;
}
@Override
@ -31,12 +31,12 @@ public class ParcelableStatusesAdapter extends AbsStatusesAdapter<List<Parcelabl
@Override
public ParcelableStatus getStatus(int position) {
if (position == getStatusCount()) return null;
if (position == getStatusesCount()) return null;
return mData.get(position);
}
@Override
public int getStatusCount() {
public int getStatusesCount() {
if (mData == null) return 0;
return mData.size();
}
@ -44,13 +44,13 @@ public class ParcelableStatusesAdapter extends AbsStatusesAdapter<List<Parcelabl
@Override
public long getItemId(int position) {
if (position == getStatusCount()) return position;
if (position == getStatusesCount()) return position;
return mData.get(position).hashCode();
}
@Override
public long getStatusId(int position) {
if (position == getStatusCount()) return -1;
if (position == getStatusesCount()) return -1;
return mData.get(position).id;
}

5
twidere/src/main/java/org/mariotaku/twidere/adapter/iface/IContentCardAdapter.java
View File

@ -36,6 +36,8 @@ public interface IContentCardAdapter extends IGapSupportedAdapter, ContentCardCl
ImageLoadingHandler getImageLoadingHandler();
int getItemCount();
@ShapeStyle
int getProfileImageStyle();
@ -45,4 +47,7 @@ public interface IContentCardAdapter extends IGapSupportedAdapter, ContentCardCl
float getTextSize();
boolean hasLoadMoreIndicator();
void setLoadMoreIndicatorEnabled(boolean enabled);
}

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

@ -10,7 +10,7 @@ public interface IStatusesAdapter<Data> extends IContentCardAdapter, StatusClick
ParcelableStatus getStatus(int position);
int getStatusCount();
int getStatusesCount();
long getStatusId(int position);

51
twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java
View File

@ -15,7 +15,6 @@ import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.OnScrollListener;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@ -38,6 +37,8 @@ import org.mariotaku.twidere.loader.iface.IExtendedLoader;
import org.mariotaku.twidere.model.ParcelableStatus;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ColorUtils;
import org.mariotaku.twidere.util.ContentListScrollListener;
import org.mariotaku.twidere.util.ContentListScrollListener.ContentListAware;
import org.mariotaku.twidere.util.SimpleDrawerCallback;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.Utils;
@ -55,47 +56,16 @@ import static org.mariotaku.twidere.util.Utils.setMenuForStatus;
*/
public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment implements LoaderCallbacks<Data>,
OnRefreshListener, DrawerCallback, RefreshScrollTopInterface, StatusAdapterListener,
ControlBarOffsetListener {
ControlBarOffsetListener, ContentListAware {
private final Object mStatusesBusCallback;
private AbsStatusesAdapter<Data> mAdapter;
private LinearLayoutManager mLayoutManager;
private View mContentView;
private SharedPreferences mPreferences;
private View mProgressContainer;
private SwipeRefreshLayout mSwipeRefreshLayout;
private RecyclerView mRecyclerView;
private SimpleDrawerCallback mDrawerCallback;
private int mTouchSlop;
private OnScrollListener mOnScrollListener = new OnScrollListener() {
private int mScrollState;
private int mScrollSum;
@Override
public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
super.onScrollStateChanged(recyclerView, newState);
mScrollState = newState;
}
@Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
//Reset mScrollSum when scrolling in reverse direction
if (dy * mScrollSum < 0) {
mScrollSum = 0;
}
mScrollSum += dy;
if (Math.abs(mScrollSum) > mTouchSlop) {
setControlVisible(dy < 0);
mScrollSum = 0;
}
final LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
if (!isRefreshing() && mAdapter.hasLoadMoreIndicator() && mScrollState != RecyclerView.SCROLL_STATE_IDLE
&& layoutManager.findLastVisibleItemPosition() == mAdapter.getItemCount() - 1) {
onLoadMoreStatuses();
}
}
};
private Rect mSystemWindowsInsets = new Rect();
private int mControlBarOffsetPixels;
private PopupMenu mPopupMenu;
@ -157,7 +127,7 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
public void setRefreshing(boolean refreshing) {
if (refreshing == mSwipeRefreshLayout.isRefreshing()) return;
if (!refreshing)
updateRefreshProgressOffset();
updateRefreshProgressOffset();
mSwipeRefreshLayout.setRefreshing(refreshing);
}
@ -181,7 +151,6 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
if (view == null) throw new AssertionError();
final Context context = view.getContext();
final boolean compact = Utils.isCompactCards(context);
mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
mDrawerCallback = new SimpleDrawerCallback(mRecyclerView);
mSwipeRefreshLayout.setOnRefreshListener(this);
mSwipeRefreshLayout.setColorSchemeColors(ThemeUtils.getUserAccentColor(context));
@ -197,7 +166,10 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
mRecyclerView.addItemDecoration(new DividerItemDecoration(context, mLayoutManager.getOrientation()));
}
mRecyclerView.setAdapter(mAdapter);
mRecyclerView.setOnScrollListener(mOnScrollListener);
final ContentListScrollListener scrollListener = new ContentListScrollListener(this);
scrollListener.setTouchSlop(ViewConfiguration.get(context).getScaledTouchSlop());
mRecyclerView.setOnScrollListener(scrollListener);
mAdapter.setListener(this);
final Bundle loaderArgs = new Bundle(getArguments());
loaderArgs.putBoolean(EXTRA_FROM_USER, true);
@ -230,7 +202,6 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
@Override
public void onBaseViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onBaseViewCreated(view, savedInstanceState);
mContentView = view.findViewById(R.id.fragment_content);
mProgressContainer = view.findViewById(R.id.progress_container);
mSwipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.swipe_layout);
mRecyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
@ -322,7 +293,7 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
@Override
public void onGapClick(GapViewHolder holder, int position) {
final ParcelableStatus status = mAdapter.getStatus(position);
final long sinceId = position + 1 < mAdapter.getStatusCount() ? mAdapter.getStatus(position + 1).id : -1;
final long sinceId = position + 1 < mAdapter.getStatusesCount() ? mAdapter.getStatus(position + 1).id : -1;
final long[] accountIds = {status.account_id};
final long[] maxIds = {status.id};
final long[] sinceIds = {sinceId};
@ -420,9 +391,7 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
protected abstract AbsStatusesAdapter<Data> onCreateAdapter(Context context, boolean compact);
protected abstract void onLoadMoreStatuses();
private void setControlVisible(boolean visible) {
public void setControlVisible(boolean visible) {
final FragmentActivity activity = getActivity();
if (activity instanceof BaseActionBarActivity) {
((BaseActionBarActivity) activity).setControlBarVisibleAnimate(visible);

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

@ -161,7 +161,7 @@ public abstract class CursorStatusesFragment extends AbsStatusesFragment<Cursor>
}
@Override
protected void onLoadMoreStatuses() {
public void onLoadMoreContents() {
new TwidereAsyncTask<Void, Void, long[][]>() {
@Override

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

@ -19,6 +19,7 @@
package org.mariotaku.twidere.fragment.support;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.content.SharedPreferences;
@ -28,6 +29,7 @@ import android.graphics.Rect;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
@ -39,6 +41,7 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewGroup;
import com.squareup.otto.Bus;
@ -48,6 +51,9 @@ import org.mariotaku.querybuilder.Columns.Column;
import org.mariotaku.querybuilder.Expression;
import org.mariotaku.querybuilder.RawItemArray;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.iface.IControlBarActivity;
import org.mariotaku.twidere.activity.iface.IControlBarActivity.ControlBarOffsetListener;
import org.mariotaku.twidere.activity.support.BaseActionBarActivity;
import org.mariotaku.twidere.adapter.MessageEntriesAdapter;
import org.mariotaku.twidere.adapter.MessageEntriesAdapter.DirectMessageEntry;
import org.mariotaku.twidere.adapter.MessageEntriesAdapter.MessageEntriesAdapterListener;
@ -59,6 +65,8 @@ import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages;
import org.mariotaku.twidere.provider.TwidereDataStore.Statuses;
import org.mariotaku.twidere.task.TwidereAsyncTask;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ContentListScrollListener;
import org.mariotaku.twidere.util.ContentListScrollListener.ContentListAware;
import org.mariotaku.twidere.util.MultiSelectManager;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.Utils;
@ -72,7 +80,9 @@ import java.util.Set;
import static org.mariotaku.twidere.util.Utils.getActivatedAccountIds;
import static org.mariotaku.twidere.util.Utils.openMessageConversation;
public class DirectMessagesFragment extends BaseSupportFragment implements LoaderCallbacks<Cursor>, RefreshScrollTopInterface, OnRefreshListener, MessageEntriesAdapterListener {
public class DirectMessagesFragment extends BaseSupportFragment implements LoaderCallbacks<Cursor>,
RefreshScrollTopInterface, OnRefreshListener, MessageEntriesAdapterListener,
ControlBarOffsetListener, ContentListAware {
private final SupportFragmentReloadCursorObserver mReloadContentObserver = new SupportFragmentReloadCursorObserver(
this, 0, this);
@ -85,7 +95,6 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
private int mFirstVisibleItem;
private RemoveUnreadCountsTask mRemoveUnreadCountsTask;
private SwipeRefreshLayout mSwipeRefreshLayout;
private View mContentView;
private View mProgressContainer;
private LinearLayoutManager mLayoutManager;
@ -93,6 +102,53 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
return mUnreadCountsToRemove;
}
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
if (activity instanceof IControlBarActivity) {
((IControlBarActivity) activity).registerControlBarOffsetListener(this);
}
}
private Rect mSystemWindowsInsets = new Rect();
private int mControlBarOffsetPixels;
@Override
protected void fitSystemWindows(Rect insets) {
super.fitSystemWindows(insets);
mRecyclerView.setPadding(insets.left, insets.top, insets.right, insets.bottom);
mSystemWindowsInsets.set(insets);
updateRefreshProgressOffset();
}
@Override
public void onControlBarOffsetChanged(IControlBarActivity activity, float offset) {
mControlBarOffsetPixels = Math.round(activity.getControlBarHeight() * (1 - offset));
updateRefreshProgressOffset();
}
private void updateRefreshProgressOffset() {
if (mSystemWindowsInsets.top == 0 || mSwipeRefreshLayout == null || isRefreshing()) return;
// 40: SwipeRefreshLayout.CIRCLE_DIAMETER
final float density = getResources().getDisplayMetrics().density;
final int swipeStart = (mSystemWindowsInsets.top - mControlBarOffsetPixels) - Math.round(40 * density);
// 64: SwipeRefreshLayout.DEFAULT_CIRCLE_TARGET
final int swipeDistance = Math.round(64 * density);
mSwipeRefreshLayout.setProgressViewOffset(true, swipeStart, swipeStart + swipeDistance);
}
@Override
public void onDetach() {
final FragmentActivity activity = getActivity();
if (activity instanceof IControlBarActivity) {
((IControlBarActivity) activity).unregisterControlBarOffsetListener(this);
}
super.onDetach();
}
@Subscribe
public void notifyTaskStateChanged(TaskStateChangedEvent event) {
updateRefreshState();
@ -135,7 +191,6 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
@Override
public void onBaseViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onBaseViewCreated(view, savedInstanceState);
mContentView = view.findViewById(R.id.fragment_content);
mProgressContainer = view.findViewById(R.id.progress_container);
mSwipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.swipe_layout);
mRecyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
@ -169,19 +224,6 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
mAdapter.setCursor(null);
}
// @Override
// public void onListItemClick(final ListView l, final View v, final int position, final long id) {
// if (mMultiSelectManager.isActive()) return;
// final int pos = position - l.getHeaderViewsCount();
// final long conversationId = mAdapter.getConversationId(pos);
// final long accountId = mAdapter.getAccountId(pos);
// mReadPositions.add(pos);
// removeUnreadCounts();
// if (conversationId > 0 && accountId > 0) {
// openMessageConversation(getActivity(), accountId, conversationId);
// }
// }
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_recycler_view, container, false);
@ -203,6 +245,11 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
mSwipeRefreshLayout.setColorSchemeColors(ThemeUtils.getUserAccentColor(viewContext));
mRecyclerView.setLayoutManager(mLayoutManager);
mRecyclerView.setAdapter(mAdapter);
final ContentListScrollListener scrollListener = new ContentListScrollListener(this);
scrollListener.setTouchSlop(ViewConfiguration.get(viewContext).getScaledTouchSlop());
mRecyclerView.setOnScrollListener(scrollListener);
final DividerItemDecoration itemDecoration = new DividerItemDecoration(viewContext, mLayoutManager.getOrientation());
final Resources res = viewContext.getResources();
final int decorPaddingLeft = res.getDimensionPixelSize(R.dimen.element_spacing_normal) * 3
@ -222,34 +269,6 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
bus.register(this);
}
// @Override
// public void onRefresh() {
// }
// @Override
// public void onScroll(final AbsListView view, final int firstVisibleItem, final int visibleItemCount,
// final int totalItemCount) {
// super.onScroll(view, firstVisibleItem, visibleItemCount, totalItemCount);
// addReadPosition(firstVisibleItem);
// }
//
// @Override
// public void onScrollStateChanged(final AbsListView view, final int scrollState) {
// switch (scrollState) {
// case SCROLL_STATE_FLING:
// case SCROLL_STATE_TOUCH_SCROLL: {
// break;
// }
// case SCROLL_STATE_IDLE: {
// for (int i = mRecyclerView.getFirstVisiblePosition(), j = mRecyclerView.getLastVisiblePosition(); i < j; i++) {
// mReadPositions.add(i);
// }
// removeUnreadCounts();
// break;
// }
// }
// }
@Override
public void onStop() {
@ -292,30 +311,12 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
super.setUserVisibleHint(isVisibleToUser);
}
@Override
protected void fitSystemWindows(Rect insets) {
super.fitSystemWindows(insets);
mContentView.setPadding(insets.left, insets.top, insets.right, insets.bottom);
}
// @Override
// protected void onListTouched() {
// final AsyncTwitterWrapper twitter = getTwitterWrapper();
// if (twitter != null) {
// twitter.clearNotificationAsync(NOTIFICATION_ID_DIRECT_MESSAGES, getAccountId());
// }
// }
protected long getAccountId() {
final Bundle args = getArguments();
return args != null ? args.getLong(EXTRA_ACCOUNT_ID, -1) : -1;
}
// @Override
// protected void onReachedBottom() {
// loadMoreMessages();
// }
protected void updateRefreshState() {
final AsyncTwitterWrapper twitter = getTwitterWrapper();
setRefreshing(twitter != null && (twitter.isReceivedDirectMessagesRefreshing() || twitter.isSentDirectMessagesRefreshing()));
@ -372,10 +373,23 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
}.executeTask();
}
private MessageEntriesAdapter getAdapter() {
public MessageEntriesAdapter getAdapter() {
return mAdapter;
}
@Override
public void setControlVisible(boolean visible) {
final FragmentActivity activity = getActivity();
if (activity instanceof BaseActionBarActivity) {
((BaseActionBarActivity) activity).setControlBarVisibleAnimate(visible);
}
}
@Override
public void onLoadMoreContents() {
loadMoreMessages();
}
private void removeUnreadCounts() {
if (mRemoveUnreadCountsTask != null && mRemoveUnreadCountsTask.getStatus() == TwidereAsyncTask.Status.RUNNING)
return;

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

@ -112,9 +112,9 @@ public abstract class ParcelableStatusesFragment extends AbsStatusesFragment<Lis
}
@Override
protected void onLoadMoreStatuses() {
public void onLoadMoreContents() {
final IStatusesAdapter<List<ParcelableStatus>> adapter = getAdapter();
final long[] maxIds = new long[]{adapter.getStatus(adapter.getStatusCount() - 1).id};
final long[] maxIds = new long[]{adapter.getStatus(adapter.getStatusesCount() - 1).id};
getStatuses(null, maxIds, null);
}
@ -133,7 +133,7 @@ public abstract class ParcelableStatusesFragment extends AbsStatusesFragment<Lis
public boolean triggerRefresh() {
final IStatusesAdapter<List<ParcelableStatus>> adapter = getAdapter();
final long[] accountIds = getAccountIds();
if (adapter.getStatusCount() > 0) {
if (adapter.getStatusesCount() > 0) {
final long[] sinceIds = new long[]{adapter.getStatus(0).id};
getStatuses(accountIds, null, sinceIds);
} else {

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

@ -31,7 +31,6 @@ import android.graphics.Rect;
import android.net.Uri;
import android.nfc.NdefMessage;
import android.nfc.NdefRecord;
import android.nfc.NfcAdapter;
import android.nfc.NfcAdapter.CreateNdefMessageCallback;
import android.nfc.NfcEvent;
import android.os.Bundle;
@ -136,7 +135,7 @@ import static org.mariotaku.twidere.util.Utils.showOkMessage;
*/
public class StatusFragment extends BaseSupportFragment
implements LoaderCallbacks<SingleResponse<ParcelableStatus>>, OnMediaClickListener,
StatusAdapterListener, CreateNdefMessageCallback {
StatusAdapterListener {
private static final int LOADER_ID_DETAIL_STATUS = 1;
private static final int LOADER_ID_STATUS_REPLIES = 2;
@ -180,14 +179,6 @@ public class StatusFragment extends BaseSupportFragment
}
};
@Override
public NdefMessage createNdefMessage(NfcEvent event) {
final ParcelableStatus status = getStatus();
if (status == null) return null;
return new NdefMessage(new NdefRecord[]{
NdefRecord.createUri(LinkCreator.getStatusTwitterLink(status.user_screen_name, status.id)),
});
}
private ParcelableStatus getStatus() {
return mStatusAdapter.getStatus();
@ -234,7 +225,16 @@ public class StatusFragment extends BaseSupportFragment
if (view == null) throw new AssertionError();
final Context context = view.getContext();
final boolean compact = Utils.isCompactCards(context);
initNdefCallback();
Utils.setNdefPushMessageCallback(getActivity(), new CreateNdefMessageCallback() {
@Override
public NdefMessage createNdefMessage(NfcEvent event) {
final ParcelableStatus status = getStatus();
if (status == null) return null;
return new NdefMessage(new NdefRecord[]{
NdefRecord.createUri(LinkCreator.getTwitterStatusLink(status.user_screen_name, status.id)),
});
}
});
mLayoutManager = new StatusListLinearLayoutManager(context, mRecyclerView);
mItemDecoration = new DividerItemDecoration(context, mLayoutManager.getOrientation());
if (compact) {
@ -381,7 +381,7 @@ public class StatusFragment extends BaseSupportFragment
}
getLoaderManager().initLoader(LOADER_ID_STATUS_REPLIES, args, mRepliesLoaderCallback);
mRepliesLoaderInitialized = true;
//spice
//spice
if (status.media == null) {
SpiceProfilingUtil.profile(getActivity(), status.account_id,
status.id + ",Words," + status.account_id + "," + status.user_id + "," + status.reply_count + "," + status.retweet_count + "," + status.favorite_count
@ -534,7 +534,7 @@ public class StatusFragment extends BaseSupportFragment
}
@Override
public int getStatusCount() {
public int getStatusesCount() {
return getConversationCount() + 1 + getRepliesCount() + 1;
}
@ -601,6 +601,16 @@ public class StatusFragment extends BaseSupportFragment
return mTextSize;
}
@Override
public boolean hasLoadMoreIndicator() {
return false;
}
@Override
public void setLoadMoreIndicatorEnabled(boolean enabled) {
}
public ParcelableStatus getStatus() {
return mStatus;
}
@ -760,7 +770,7 @@ public class StatusFragment extends BaseSupportFragment
@Override
public int getItemCount() {
return getStatusCount();
return getStatusesCount();
}
@Override
@ -1232,17 +1242,6 @@ public class StatusFragment extends BaseSupportFragment
}
private void initNdefCallback() {
try {
final NfcAdapter adapter = NfcAdapter.getDefaultAdapter(getActivity());
if (adapter == null) return;
adapter.setNdefPushMessageCallback(this, getActivity());
} catch (SecurityException e) {
Log.w(LOGTAG, e);
}
}
private static class StatusListLinearLayoutManager extends LinearLayoutManager {
private final RecyclerView recyclerView;

36
twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java
View File

@ -44,10 +44,8 @@ import android.graphics.drawable.LayerDrawable;
import android.net.Uri;
import android.nfc.NdefMessage;
import android.nfc.NdefRecord;
import android.nfc.NfcAdapter;
import android.nfc.NfcAdapter.CreateNdefMessageCallback;
import android.nfc.NfcEvent;
import android.nfc.tech.Ndef;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcelable;
@ -167,8 +165,7 @@ import static org.mariotaku.twidere.util.Utils.showInfoMessage;
public class UserFragment extends BaseSupportFragment implements OnClickListener,
OnLinkClickListener, OnSizeChangedListener, OnSharedPreferenceChangeListener,
OnTouchListener, DrawerCallback, SupportFragmentCallback, SystemWindowsInsetsCallback,
CreateNdefMessageCallback {
OnTouchListener, DrawerCallback, SupportFragmentCallback, SystemWindowsInsetsCallback {
public static final String TRANSITION_NAME_PROFILE_IMAGE = "profile_image";
public static final String TRANSITION_NAME_PROFILE_TYPE = "profile_type";
@ -652,7 +649,17 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
mProfileImageLoader = getApplication().getImageLoaderWrapper();
final FragmentActivity activity = getActivity();
initNdefCallback();
Utils.setNdefPushMessageCallback(activity, new CreateNdefMessageCallback() {
@Override
public NdefMessage createNdefMessage(NfcEvent event) {
final ParcelableUser user = getUser();
if (user == null) return null;
return new NdefMessage(new NdefRecord[]{
NdefRecord.createUri(LinkCreator.getTwitterUserLink(user.screen_name)),
});
}
});
activity.setEnterSharedElementCallback(new SharedElementCallback() {
@ -725,25 +732,6 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
setupUserPages();
}
private void initNdefCallback() {
try {
final NfcAdapter adapter = NfcAdapter.getDefaultAdapter(getActivity());
if (adapter == null) return;
adapter.setNdefPushMessageCallback(this, getActivity());
} catch (SecurityException e) {
Log.w(LOGTAG, e);
}
}
@Override
public NdefMessage createNdefMessage(NfcEvent event) {
final ParcelableUser user = getUser();
if (user == null) return null;
return new NdefMessage(new NdefRecord[]{
NdefRecord.createUri(LinkCreator.getUserTwitterLink(user.screen_name)),
});
}
@Override
public void onStart() {
super.onStart();

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

@ -29,6 +29,10 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Rect;
import android.nfc.NdefMessage;
import android.nfc.NdefRecord;
import android.nfc.NfcAdapter.CreateNdefMessageCallback;
import android.nfc.NfcEvent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
@ -67,6 +71,7 @@ import org.mariotaku.twidere.model.ParcelableUserList;
import org.mariotaku.twidere.model.SingleResponse;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ImageLoaderWrapper;
import org.mariotaku.twidere.util.LinkCreator;
import org.mariotaku.twidere.util.OnLinkClickHandler;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.ThemeUtils;
@ -290,6 +295,18 @@ public class UserListFragment extends BaseSupportFragment implements OnClickList
final FragmentActivity activity = getActivity();
Utils.setNdefPushMessageCallback(activity, new CreateNdefMessageCallback() {
@Override
public NdefMessage createNdefMessage(NfcEvent event) {
final ParcelableUserList userList = getUserList();
if (userList == null) return null;
return new NdefMessage(new NdefRecord[]{
NdefRecord.createUri(LinkCreator.getTwitterUserListLink(userList.user_screen_name, userList.name)),
});
}
});
mHeaderDrawerLayout.setDrawerCallback(this);
mPagerAdapter = new SupportTabsAdapter(activity, getChildFragmentManager());
@ -313,6 +330,10 @@ public class UserListFragment extends BaseSupportFragment implements OnClickList
setupUserPages();
}
private ParcelableUserList getUserList() {
return mUserList;
}
@Override
public void onStart() {
super.onStart();

86
twidere/src/main/java/org/mariotaku/twidere/util/ContentListScrollListener.java Normal file
View File

@ -0,0 +1,86 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.util;
import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.OnScrollListener;
import org.mariotaku.twidere.adapter.iface.IContentCardAdapter;
/**
* Created by mariotaku on 15/3/15.
*/
public class ContentListScrollListener extends OnScrollListener {
private int mScrollState;
private int mScrollSum;
private int mTouchSlop;
private ContentListAware mContentListAware;
public ContentListScrollListener(@NonNull ContentListAware contentListAware) {
mContentListAware = contentListAware;
}
@Override
public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
super.onScrollStateChanged(recyclerView, newState);
mScrollState = newState;
}
@Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
//Reset mScrollSum when scrolling in reverse direction
if (dy * mScrollSum < 0) {
mScrollSum = 0;
}
mScrollSum += dy;
if (Math.abs(mScrollSum) > mTouchSlop) {
mContentListAware.setControlVisible(dy < 0);
mScrollSum = 0;
}
final IContentCardAdapter adapter = mContentListAware.getAdapter();
final LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
if (!mContentListAware.isRefreshing() && adapter.hasLoadMoreIndicator() && mScrollState != RecyclerView.SCROLL_STATE_IDLE
&& layoutManager.findLastVisibleItemPosition() == adapter.getItemCount() - 1) {
mContentListAware.onLoadMoreContents();
}
}
public void setTouchSlop(int touchSlop) {
mTouchSlop = touchSlop;
}
public static interface ContentListAware {
boolean isRefreshing();
IContentCardAdapter getAdapter();
void setControlVisible(boolean visible);
void onLoadMoreContents();
}
}

13
twidere/src/main/java/org/mariotaku/twidere/util/LinkCreator.java
View File

@ -30,7 +30,7 @@ public class LinkCreator implements Constants {
private static final String AUTHORITY_TWITTER = "twitter.com";
public static Uri getStatusTwitterLink(String screenName, long statusId) {
public static Uri getTwitterStatusLink(String screenName, long statusId) {
Uri.Builder builder = new Uri.Builder();
builder.scheme(SCHEME_HTTPS);
builder.authority(AUTHORITY_TWITTER);
@ -67,7 +67,16 @@ public class LinkCreator implements Constants {
return builder.build();
}
public static Uri getUserTwitterLink(String screenName) {
public static Uri getTwitterUserListLink(String userScreenName, String listName) {
Uri.Builder builder = new Uri.Builder();
builder.scheme(SCHEME_HTTPS);
builder.authority(AUTHORITY_TWITTER);
builder.appendPath(userScreenName);
builder.appendPath(listName);
return builder.build();
}
public static Uri getTwitterUserLink(String screenName) {
Uri.Builder builder = new Uri.Builder();
builder.scheme(SCHEME_HTTPS);
builder.authority(AUTHORITY_TWITTER);

16
twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
View File

@ -58,6 +58,8 @@ import android.graphics.drawable.TransitionDrawable;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
import android.nfc.NfcAdapter;
import android.nfc.NfcAdapter.CreateNdefMessageCallback;
import android.os.BatteryManager;
import android.os.Build;
import android.os.Bundle;
@ -1101,7 +1103,7 @@ public final class Utils implements Constants, TwitterConstants {
}
public static String getStatusShareText(final Context context, final ParcelableStatus status) {
final Uri link = LinkCreator.getStatusTwitterLink(status.user_screen_name, status.id);
final Uri link = LinkCreator.getTwitterStatusLink(status.user_screen_name, status.id);
return context.getString(R.string.status_share_text_format_with_link,
status.text_plain, link.toString());
}
@ -3377,6 +3379,18 @@ public final class Utils implements Constants, TwitterConstants {
openUserListTimeline(activity, list.account_id, list.id, list.user_id, list.user_screen_name, list.name);
}
public static boolean setNdefPushMessageCallback(Activity activity, CreateNdefMessageCallback callback) {
try {
final NfcAdapter adapter = NfcAdapter.getDefaultAdapter(activity);
if (adapter == null) return false;
adapter.setNdefPushMessageCallback(callback, activity);
return true;
} catch (SecurityException e) {
Log.w(LOGTAG, e);
}
return false;
}
public static void openUserMentions(final Activity activity, final long account_id, final String screen_name) {
if (activity == null) return;
final Uri.Builder builder = new Uri.Builder();