mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-12-27 19:38:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show status of loading more posts in MorePostsInfoFragment.

Browse Source
This commit is contained in:
Docile-Alligator 2022-11-05 19:51:40 +11:00
parent c86408dbe5
commit fa472a3ad8
5 changed files with 199 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java
View File

@ -68,6 +68,7 @@ import ml.docilealligator.infinityforreddit.fragments.CommentsListingFragment;
import ml.docilealligator.infinityforreddit.fragments.FollowedUsersListingFragment;
import ml.docilealligator.infinityforreddit.fragments.HistoryPostFragment;
import ml.docilealligator.infinityforreddit.fragments.InboxFragment;
import ml.docilealligator.infinityforreddit.fragments.MorePostsInfoFragment;
import ml.docilealligator.infinityforreddit.fragments.MultiRedditListingFragment;
import ml.docilealligator.infinityforreddit.fragments.PostFragment;
import ml.docilealligator.infinityforreddit.fragments.SidebarFragment;
@ -306,4 +307,6 @@ public interface AppComponent {
void inject(HistoryPostFragment historyPostFragment);
void inject(HistoryActivity historyActivity);
void inject(MorePostsInfoFragment morePostsInfoFragment);
}

99
app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
View File

@ -9,6 +9,7 @@ import android.content.res.ColorStateList;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.view.KeyEvent;
import android.view.MenuItem;
import android.view.View;
@ -72,6 +73,7 @@ import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
import ml.docilealligator.infinityforreddit.events.NeedForPostListFromPostFragmentEvent;
import ml.docilealligator.infinityforreddit.events.ProvidePostListToViewPostDetailActivityEvent;
import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
import ml.docilealligator.infinityforreddit.fragments.MorePostsInfoFragment;
import ml.docilealligator.infinityforreddit.fragments.ViewPostDetailFragment;
import ml.docilealligator.infinityforreddit.post.HistoryPostPagingSource;
import ml.docilealligator.infinityforreddit.post.ParsePost;
@ -373,7 +375,7 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
viewPager2.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@Override
public void onPageSelected(int position) {
if (posts != null && position > posts.size() - 5) {
if (posts != null && position > posts.size() - 2) {
fetchMorePosts();
}
}
@ -516,7 +518,7 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
isFetchingMorePosts = true;
fetchMorePostsFailed = false;
Handler handler = new Handler();
Handler handler = new Handler(Looper.getMainLooper());
if (postType != HistoryPostPagingSource.TYPE_READ_POSTS) {
mExecutor.execute(() -> {
@ -639,27 +641,53 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
String responseString = response.body();
LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, readPostList);
if (newPosts == null) {
noMorePosts = true;
handler.post(() -> {
noMorePosts = true;
MorePostsInfoFragment fragment = sectionsPagerAdapter.getMorePostsInfoFragment();
if (fragment != null) {
fragment.setStatus(MorePostsInfoFragment.Status.NO_MORE_POSTS);
}
});
} else {
LinkedHashSet<Post> postLinkedHashSet = new LinkedHashSet<>(posts);
int currentPostsSize = postLinkedHashSet.size();
postLinkedHashSet.addAll(newPosts);
if (currentPostsSize == postLinkedHashSet.size()) {
noMorePosts = true;
handler.post(() -> {
noMorePosts = true;
MorePostsInfoFragment fragment = sectionsPagerAdapter.getMorePostsInfoFragment();
if (fragment != null) {
fragment.setStatus(MorePostsInfoFragment.Status.NO_MORE_POSTS);
}
});
} else {
posts = new ArrayList<>(postLinkedHashSet);
handler.post(() -> sectionsPagerAdapter.notifyItemRangeInserted(currentPostsSize, postLinkedHashSet.size() - currentPostsSize));
}
}
} else {
fetchMorePostsFailed = true;
handler.post(() -> {
fetchMorePostsFailed = true;
MorePostsInfoFragment fragment = sectionsPagerAdapter.getMorePostsInfoFragment();
if (fragment != null) {
fragment.setStatus(MorePostsInfoFragment.Status.FAILED);
}
});
}
} catch (IOException e) {
e.printStackTrace();
fetchMorePostsFailed = true;
handler.post(() -> {
fetchMorePostsFailed = true;
MorePostsInfoFragment fragment = sectionsPagerAdapter.getMorePostsInfoFragment();
if (fragment != null) {
fragment.setStatus(MorePostsInfoFragment.Status.FAILED);
}
});
}
isFetchingMorePosts = false;
handler.post(() -> {
isFetchingMorePosts = false;
});
});
} else {
mExecutor.execute((Runnable) () -> {
@ -686,25 +714,53 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
String responseString = response.body();
LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, null);
if (newPosts == null || newPosts.isEmpty()) {
noMorePosts = true;
handler.post(() -> {
noMorePosts = true;
MorePostsInfoFragment fragment = sectionsPagerAdapter.getMorePostsInfoFragment();
if (fragment != null) {
fragment.setStatus(MorePostsInfoFragment.Status.NO_MORE_POSTS);
}
});
} else {
LinkedHashSet<Post> postLinkedHashSet = new LinkedHashSet<>(posts);
int currentPostsSize = postLinkedHashSet.size();
postLinkedHashSet.addAll(newPosts);
if (currentPostsSize == postLinkedHashSet.size()) {
noMorePosts = true;
handler.post(() -> {
noMorePosts = true;
MorePostsInfoFragment fragment = sectionsPagerAdapter.getMorePostsInfoFragment();
if (fragment != null) {
fragment.setStatus(MorePostsInfoFragment.Status.NO_MORE_POSTS);
}
});
} else {
posts = new ArrayList<>(postLinkedHashSet);
handler.post(() -> sectionsPagerAdapter.notifyItemRangeInserted(currentPostsSize, postLinkedHashSet.size() - currentPostsSize));
}
}
} else {
fetchMorePostsFailed = true;
handler.post(() -> {
fetchMorePostsFailed = true;
MorePostsInfoFragment fragment = sectionsPagerAdapter.getMorePostsInfoFragment();
if (fragment != null) {
fragment.setStatus(MorePostsInfoFragment.Status.NO_MORE_POSTS);
}
});
}
} catch (IOException e) {
e.printStackTrace();
fetchMorePostsFailed = true;
handler.post(() -> {
fetchMorePostsFailed = true;
MorePostsInfoFragment fragment = sectionsPagerAdapter.getMorePostsInfoFragment();
if (fragment != null) {
fragment.setStatus(MorePostsInfoFragment.Status.NO_MORE_POSTS);
}
});
}
handler.post(() -> {
isFetchingMorePosts = false;
});
});
}
}
@ -877,6 +933,13 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
bundle.putString(ViewPostDetailFragment.EXTRA_CONTEXT_NUMBER, getIntent().getStringExtra(EXTRA_CONTEXT_NUMBER));
bundle.putString(ViewPostDetailFragment.EXTRA_MESSAGE_FULLNAME, getIntent().getStringExtra(EXTRA_MESSAGE_FULLNAME));
} else {
if (position >= posts.size()) {
MorePostsInfoFragment morePostsInfoFragment = new MorePostsInfoFragment();
Bundle moreBundle = new Bundle();
moreBundle.putInt(MorePostsInfoFragment.EXTRA_STATUS, MorePostsInfoFragment.Status.LOADING);
morePostsInfoFragment.setArguments(moreBundle);
return morePostsInfoFragment;
}
bundle.putParcelable(ViewPostDetailFragment.EXTRA_POST_DATA, posts.get(position));
bundle.putInt(ViewPostDetailFragment.EXTRA_POST_LIST_POSITION, position);
}
@ -897,7 +960,7 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
@Override
public int getItemCount() {
return posts == null ? 1 : posts.size();
return posts == null ? 1 : posts.size() + 1;
}
@Nullable
@ -911,5 +974,17 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
}
return null;
}
@Nullable
MorePostsInfoFragment getMorePostsInfoFragment() {
if (posts == null || fragmentManager == null) {
return null;
}
Fragment fragment = fragmentManager.findFragmentByTag("f" + posts.size());
if (fragment instanceof MorePostsInfoFragment) {
return (MorePostsInfoFragment) fragment;
}
return null;
}
}
}

84
app/src/main/java/ml/docilealligator/infinityforreddit/fragments/MorePostsInfoFragment.java Normal file
View File

@ -0,0 +1,84 @@
package ml.docilealligator.infinityforreddit.fragments;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import javax.inject.Inject;
import ml.docilealligator.infinityforreddit.Infinity;
import ml.docilealligator.infinityforreddit.R;
import ml.docilealligator.infinityforreddit.activities.BaseActivity;
import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
import ml.docilealligator.infinityforreddit.databinding.FragmentMorePostsInfoBinding;
public class MorePostsInfoFragment extends Fragment {
public static final String EXTRA_STATUS = "ES";
@Inject
CustomThemeWrapper mCustomThemeWrapper;
private FragmentMorePostsInfoBinding binding;
private BaseActivity mActivity;
@Status
int status;
public MorePostsInfoFragment() {
// Required empty public constructor
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
((Infinity) mActivity.getApplication()).getAppComponent().inject(this);
binding = FragmentMorePostsInfoBinding.inflate(inflater, container, false);
applyTheme();
setStatus(getArguments().getInt(EXTRA_STATUS, Status.LOADING));
return binding.getRoot();
}
public void setStatus(@Status int status) {
this.status = status;
switch (status) {
case Status.LOADING:
binding.infoTextViewMorePostsInfoFragment.setText(R.string.loading);
break;
case Status.FAILED:
binding.infoTextViewMorePostsInfoFragment.setText(R.string.load_more_posts_failed);
break;
case Status.NO_MORE_POSTS:
binding.infoTextViewMorePostsInfoFragment.setText(R.string.no_more_posts);
}
}
private void applyTheme() {
binding.infoTextViewMorePostsInfoFragment.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
}
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
mActivity = (BaseActivity) context;
}
@IntDef({Status.LOADING, Status.FAILED, Status.NO_MORE_POSTS})
@Retention(RetentionPolicy.SOURCE)
public @interface Status {
int LOADING = 0;
int FAILED = 1;
int NO_MORE_POSTS = 2;
}
}

22
app/src/main/res/layout/fragment_more_posts_info.xml Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".fragments.MorePostsInfoFragment">
<TextView
android:id="@+id/info_text_view_more_posts_info_fragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/values/strings.xml
View File

@ -1312,4 +1312,7 @@
<string name="invalid_regex">Invalid regex pattern</string>
<string name="load_more_posts_failed">Failed to load more posts</string>
<string name="no_more_posts">No more posts</string>
</resources>