Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-10 00:30:51 +01:00
Code Issues Releases Wiki Activity

fixed dm divider

Browse Source
This commit is contained in:
Mariotaku Lee 2016-05-30 17:41:13 +08:00
parent 8ccc78d7f2
commit 788f634bd2
9 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -599,8 +599,7 @@ public abstract class AbsActivitiesFragment extends AbsContentListRecyclerViewFr
} }
@Override @Override
protected void setupRecyclerView(Context context) { protected void setupRecyclerView(Context context, RecyclerView recyclerView) {
final RecyclerView recyclerView = getRecyclerView();
final ParcelableActivitiesAdapter adapter = getAdapter(); final ParcelableActivitiesAdapter adapter = getAdapter();
// Dividers are drawn on bottom of view // Dividers are drawn on bottom of view
recyclerView.addItemDecoration(new DividerItemDecoration(context, getLayoutManager().getOrientation()) { recyclerView.addItemDecoration(new DividerItemDecoration(context, getLayoutManager().getOrientation()) {

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

@ -23,6 +23,7 @@ import android.content.Context;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.widget.FixedLinearLayoutManager; import android.support.v7.widget.FixedLinearLayoutManager;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import org.mariotaku.twidere.adapter.LoadMoreSupportAdapter; import org.mariotaku.twidere.adapter.LoadMoreSupportAdapter;
import org.mariotaku.twidere.adapter.decorator.DividerItemDecoration; import org.mariotaku.twidere.adapter.decorator.DividerItemDecoration;
@ -38,7 +39,7 @@ public abstract class AbsContentListRecyclerViewFragment<A extends LoadMoreSuppo
private DividerItemDecoration mItemDecoration; private DividerItemDecoration mItemDecoration;
@Override @Override
protected void setupRecyclerView(Context context) { protected void setupRecyclerView(Context context, RecyclerView recyclerView) {
mItemDecoration = new DividerItemDecoration(context, getLayoutManager().getOrientation()); mItemDecoration = new DividerItemDecoration(context, getLayoutManager().getOrientation());
getRecyclerView().addItemDecoration(mItemDecoration); getRecyclerView().addItemDecoration(mItemDecoration);
} }

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

@ -245,7 +245,7 @@ public abstract class AbsContentRecyclerViewFragment<A extends LoadMoreSupportAd
}); });
} }
setupRecyclerView(context); setupRecyclerView(context, mRecyclerView);
mRecyclerView.setAdapter(mAdapter); mRecyclerView.setAdapter(mAdapter);
mScrollListener = new RecyclerViewScrollHandler(this, new RecyclerViewScrollHandler.RecyclerViewCallback(mRecyclerView)); mScrollListener = new RecyclerViewScrollHandler(this, new RecyclerViewScrollHandler.RecyclerViewCallback(mRecyclerView));
@ -253,7 +253,7 @@ public abstract class AbsContentRecyclerViewFragment<A extends LoadMoreSupportAd
mRecyclerView.setOnTouchListener(mScrollListener.getOnTouchListener()); mRecyclerView.setOnTouchListener(mScrollListener.getOnTouchListener());
} }
protected abstract void setupRecyclerView(Context context); protected abstract void setupRecyclerView(Context context, RecyclerView recyclerView);
@NonNull @NonNull
protected abstract L onCreateLayoutManager(Context context); protected abstract L onCreateLayoutManager(Context context);

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

@ -281,13 +281,6 @@ public class DirectMessagesFragment extends AbsContentListRecyclerViewFragment<M
adapter.setListener(this); adapter.setListener(this);
final DividerItemDecoration itemDecoration = new DividerItemDecoration(viewContext, layoutManager.getOrientation());
final Resources res = viewContext.getResources();
final int decorPaddingLeft = res.getDimensionPixelSize(R.dimen.element_spacing_normal) * 3
+ res.getDimensionPixelSize(R.dimen.icon_size_status_profile_image);
itemDecoration.setPadding(decorPaddingLeft, 0, 0, 0);
itemDecoration.setDecorationEndOffset(1);
recyclerView.addItemDecoration(itemDecoration);
getLoaderManager().initLoader(0, null, this); getLoaderManager().initLoader(0, null, this);
showProgress(); showProgress();
} }
@ -344,6 +337,18 @@ public class DirectMessagesFragment extends AbsContentListRecyclerViewFragment<M
} }
} }
@Override
protected void setupRecyclerView(Context context, RecyclerView recyclerView) {
final DividerItemDecoration itemDecoration = new DividerItemDecoration(context,
((LinearLayoutManager) recyclerView.getLayoutManager()).getOrientation());
final Resources res = context.getResources();
final int decorPaddingLeft = res.getDimensionPixelSize(R.dimen.element_spacing_normal) * 3
+ res.getDimensionPixelSize(R.dimen.icon_size_status_profile_image);
itemDecoration.setPadding(decorPaddingLeft, 0, 0, 0);
itemDecoration.setDecorationEndOffset(1);
recyclerView.addItemDecoration(itemDecoration);
}
@NonNull @NonNull
protected UserKey[] getAccountKeys() { protected UserKey[] getAccountKeys() {
final Bundle args = getArguments(); final Bundle args = getArguments();

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

@ -65,8 +65,8 @@ public abstract class ParcelableGroupsFragment extends AbsContentListRecyclerVie
} }
@Override @Override
protected void setupRecyclerView(Context context) { protected void setupRecyclerView(Context context, RecyclerView recyclerView) {
super.setupRecyclerView(context); super.setupRecyclerView(context, recyclerView);
} }
@Nullable @Nullable

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

@ -66,8 +66,8 @@ public abstract class ParcelableUserListsFragment extends AbsContentListRecycler
} }
@Override @Override
protected void setupRecyclerView(Context context) { protected void setupRecyclerView(Context context, RecyclerView recyclerView) {
super.setupRecyclerView(context); super.setupRecyclerView(context, recyclerView);
} }
@Nullable @Nullable

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

@ -195,8 +195,8 @@ public abstract class ParcelableUsersFragment extends AbsContentListRecyclerView
final boolean fromUser); final boolean fromUser);
@Override @Override
protected void setupRecyclerView(Context context) { protected void setupRecyclerView(Context context, RecyclerView recyclerView) {
super.setupRecyclerView(context); super.setupRecyclerView(context, recyclerView);
} }
private int findPosition(ParcelableUsersAdapter adapter, UserKey accountKey, UserKey userKey) { private int findPosition(ParcelableUsersAdapter adapter, UserKey accountKey, UserKey userKey) {

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

@ -63,7 +63,7 @@ public class UserMediaTimelineFragment extends AbsContentRecyclerViewFragment<St
} }
@Override @Override
protected void setupRecyclerView(Context context) { protected void setupRecyclerView(Context context, RecyclerView recyclerView) {
} }

4
twidere/src/main/res/values-notnight/themes.xml
View File

@ -11,7 +11,7 @@
<item name="cardActionButtonStyle">@style/Widget.Light.CardActionButton</item> <item name="cardActionButtonStyle">@style/Widget.Light.CardActionButton</item>
<item name="profileImageStyle">@style/Widget.Light.ProfileImage</item> <item name="profileImageStyle">@style/Widget.Light.ProfileImage</item>
<item name="profileImageStyleLarge">@style/Widget.Light.ProfileImage.Large</item> <item name="profileImageStyleLarge">@style/Widget.Light.ProfileImage.Large</item>
<item name="cardItemBackgroundColor">#f8f8f8</item> <item name="cardItemBackgroundColor">@color/background_color_card_item_light</item>
<!-- Twidere specific styles --> <!-- Twidere specific styles -->
<item name="menuIconColor">@color/action_icon_dark</item> <item name="menuIconColor">@color/action_icon_dark</item>
@ -40,7 +40,7 @@
<item name="cardActionButtonStyle">@style/Widget.Light.CardActionButton</item> <item name="cardActionButtonStyle">@style/Widget.Light.CardActionButton</item>
<item name="profileImageStyle">@style/Widget.Light.ProfileImage</item> <item name="profileImageStyle">@style/Widget.Light.ProfileImage</item>
<item name="profileImageStyleLarge">@style/Widget.Light.ProfileImage.Large</item> <item name="profileImageStyleLarge">@style/Widget.Light.ProfileImage.Large</item>
<item name="cardItemBackgroundColor">#f8f8f8</item> <item name="cardItemBackgroundColor">@color/background_color_card_item_light</item>
<!-- Twidere specific styles --> <!-- Twidere specific styles -->
<item name="menuIconColor">@color/action_icon_dark</item> <item name="menuIconColor">@color/action_icon_dark</item>