mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-12-26 02:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use StaggeredGridLayoutManager in PostFragment in landscape and tablet. Reimplement lazy mode. Prevent resuming lazy mode twice after configuration changes. Fix regex.

Browse Source
This commit is contained in:
Alex Ning 2019-08-29 11:39:56 +08:00
parent cc0d78aedd
commit 2acfcb1d60
2 changed files with 70 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java
View File

@ -11,6 +11,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.os.Handler; import android.os.Handler;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -29,6 +30,7 @@ import androidx.paging.PagedList;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.LinearSmoothScroller; import androidx.recyclerview.widget.LinearSmoothScroller;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.RequestManager; import com.bumptech.glide.RequestManager;
@ -61,6 +63,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
static final String EXTRA_ACCESS_TOKEN = "EAT"; static final String EXTRA_ACCESS_TOKEN = "EAT";
private static final String IS_IN_LAZY_MODE_STATE = "IILMS"; private static final String IS_IN_LAZY_MODE_STATE = "IILMS";
private static final String RECYCLER_VIEW_POSITION_STATE = "RVPS";
@BindView(R.id.recycler_view_post_fragment) RecyclerView mPostRecyclerView; @BindView(R.id.recycler_view_post_fragment) RecyclerView mPostRecyclerView;
@BindView(R.id.progress_bar_post_fragment) CircleProgressBar mProgressBar; @BindView(R.id.progress_bar_post_fragment) CircleProgressBar mProgressBar;
@ -72,6 +75,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
private Activity activity; private Activity activity;
private LinearLayoutManager mLinearLayoutManager; private LinearLayoutManager mLinearLayoutManager;
private StaggeredGridLayoutManager mStaggeredGridLayoutManager;
private boolean isInLazyMode = false; private boolean isInLazyMode = false;
private boolean isLazyModePaused = false; private boolean isLazyModePaused = false;
@ -84,7 +88,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
private Window window; private Window window;
private Handler lazyModeHandler; private Handler lazyModeHandler;
private Runnable lazyModeRunnable; private LazyModeRunnable lazyModeRunnable;
private CountDownTimer resumeLazyModeCountDownTimer; private CountDownTimer resumeLazyModeCountDownTimer;
private float lazyModeInterval; private float lazyModeInterval;
@ -149,17 +153,39 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
} }
} }
if (resources.getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT && !resources.getBoolean(R.bool.isTablet)) {
mLinearLayoutManager = new LinearLayoutManager(activity);
mPostRecyclerView.setLayoutManager(mLinearLayoutManager);
} else {
mStaggeredGridLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
mPostRecyclerView.setLayoutManager(mStaggeredGridLayoutManager);
}
mGlide = Glide.with(activity); mGlide = Glide.with(activity);
lazyModeRunnable = new Runnable() { lazyModeRunnable = new LazyModeRunnable() {
@Override @Override
public void run() { public void run() {
if(isInLazyMode && !isLazyModePaused) { if(isInLazyMode && !isLazyModePaused) {
int nPosts = mAdapter.getItemCount(); int nPosts = mAdapter.getItemCount();
int firstVisiblePosition = mLinearLayoutManager.findFirstVisibleItemPosition(); if(getCurrentPosition() == -1) {
if(firstVisiblePosition != RecyclerView.NO_POSITION && nPosts > firstVisiblePosition) { if(mLinearLayoutManager != null) {
smoothScroller.setTargetPosition(firstVisiblePosition + 1); setCurrentPosition(mLinearLayoutManager.findFirstVisibleItemPosition());
mLinearLayoutManager.startSmoothScroll(smoothScroller); } else {
int[] into = new int[2];
setCurrentPosition(mStaggeredGridLayoutManager.findFirstVisibleItemPositions(into)[1]);
}
}
if(getCurrentPosition() != RecyclerView.NO_POSITION && nPosts > getCurrentPosition()) {
incrementCurrentPosition();
smoothScroller.setTargetPosition(getCurrentPosition());
if(mLinearLayoutManager != null) {
mLinearLayoutManager.startSmoothScroll(smoothScroller);
} else {
mStaggeredGridLayoutManager.startSmoothScroll(smoothScroller);
}
} }
} }
lazyModeHandler.postDelayed(this, (long) (lazyModeInterval * 1000)); lazyModeHandler.postDelayed(this, (long) (lazyModeInterval * 1000));
@ -179,14 +205,17 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
}; };
if(savedInstanceState != null) { if(savedInstanceState != null) {
int recyclerViewPosition = savedInstanceState.getInt(RECYCLER_VIEW_POSITION_STATE);
if(recyclerViewPosition > 0) {
mPostRecyclerView.scrollToPosition(recyclerViewPosition);
}
isInLazyMode = savedInstanceState.getBoolean(IS_IN_LAZY_MODE_STATE); isInLazyMode = savedInstanceState.getBoolean(IS_IN_LAZY_MODE_STATE);
if(isInLazyMode) { if(isInLazyMode) {
resumeLazyMode(false); resumeLazyMode(false);
} }
} }
mLinearLayoutManager = new LinearLayoutManager(activity);
mPostRecyclerView.setLayoutManager(mLinearLayoutManager);
mPostRecyclerView.setOnTouchListener((view, motionEvent) -> { mPostRecyclerView.setOnTouchListener((view, motionEvent) -> {
if(isInLazyMode) { if(isInLazyMode) {
pauseLazyMode(true); pauseLazyMode(true);
@ -399,6 +428,13 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
public void onSaveInstanceState(@NonNull Bundle outState) { public void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putBoolean(IS_IN_LAZY_MODE_STATE, isInLazyMode); outState.putBoolean(IS_IN_LAZY_MODE_STATE, isInLazyMode);
if(mLinearLayoutManager != null) {
outState.putInt(RECYCLER_VIEW_POSITION_STATE, mLinearLayoutManager.findFirstVisibleItemPosition());
} else if(mStaggeredGridLayoutManager != null) {
int[] into = new int[2];
outState.putInt(RECYCLER_VIEW_POSITION_STATE,
mStaggeredGridLayoutManager.findFirstVisibleItemPositions(into)[0]);
}
} }
@Override @Override
@ -459,6 +495,9 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
if(isInLazyMode) { if(isInLazyMode) {
isLazyModePaused = false; isLazyModePaused = false;
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
lazyModeRunnable.resetOldPosition();
if(resumeNow) { if(resumeNow) {
lazyModeHandler.post(lazyModeRunnable); lazyModeHandler.post(lazyModeRunnable);
} else { } else {
@ -506,7 +545,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
if(isInLazyMode) { if(isInLazyMode && isLazyModePaused) {
resumeLazyMode(false); resumeLazyMode(false);
} }
} }
@ -524,4 +563,24 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);
super.onDestroy(); super.onDestroy();
} }
private static abstract class LazyModeRunnable implements Runnable {
private int currentPosition = -1;
int getCurrentPosition() {
return currentPosition;
}
void setCurrentPosition(int currentPosition) {
this.currentPosition = currentPosition;
}
void incrementCurrentPosition() {
currentPosition++;
}
void resetOldPosition() {
currentPosition = -1;
}
}
} }

4
app/src/main/java/ml/docilealligator/infinityforreddit/Utils.java
View File

@ -2,7 +2,7 @@ package ml.docilealligator.infinityforreddit;
class Utils { class Utils {
static String addSubredditAndUserLink(String markdown) { static String addSubredditAndUserLink(String markdown) {
return markdown.replaceAll("(?<!\\w)/{0,1}u/\\w+/{0,1}", "[$0]($0)") return markdown.replaceAll("(?<!\\s)/{0,1}u/\\w+/{0,1}(?<!\\s)$", "[$0]($0)")
.replaceAll("(?<!\\w)/{0,1}r/\\w+/{0,1}", "[$0]($0)"); .replaceAll("(?<!\\s)/{0,1}r/\\w+/{0,1}(?<!\\s)$", "[$0]($0)");
} }
} }