mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-01-24 08:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Display a custom error view when there is something wrong when loading best posts. Probably fix a bug that holder.getAdapterPosition() returns -1 when loading subreddit icons in the RecyclerView of PostFragment. Subreddit banners are parsed correctly in ParseSubscribedThing. Check if the api call is successful in onResponse. Rewrite some methods.

Browse Source
This commit is contained in:
Alex Ning 2018-08-30 14:08:02 +08:00
parent 3fa6257428
commit 4364e20e36
12 changed files with 172 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/ml/docilealligator/infinityforreddit/FetchComment.java
View File

@ -27,7 +27,12 @@ class FetchComment {
comments.enqueue(new Callback<String>() { comments.enqueue(new Callback<String>() {
@Override @Override
public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) { public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
if(response.isSuccessful()) {
fetchCommentListener.onFetchCommentSuccess(response.body()); fetchCommentListener.onFetchCommentSuccess(response.body());
} else {
Log.i("call failed", response.message());
fetchCommentListener.onFetchCommentFail();
}
} }
@Override @Override

5
app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubredditData.java
View File

@ -27,7 +27,12 @@ class FetchSubredditData {
subredditData.enqueue(new Callback<String>() { subredditData.enqueue(new Callback<String>() {
@Override @Override
public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) { public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
if(response.isSuccessful()) {
fetchSubredditDataListener.onFetchSubredditDataSuccess(response.body()); fetchSubredditDataListener.onFetchSubredditDataSuccess(response.body());
} else {
Log.i("call failed", response.message());
fetchSubredditDataListener.onFetchSubredditDataFail();
}
} }
@Override @Override

19
app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java
View File

@ -44,6 +44,7 @@ class FetchSubscribedThing {
subredditDataCall.enqueue(new Callback<String>() { subredditDataCall.enqueue(new Callback<String>() {
@Override @Override
public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) { public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
if(response.isSuccessful()) {
ParseSubscribedThing.parseSubscribedSubreddits(response.body(), subscribedSubredditData, ParseSubscribedThing.parseSubscribedSubreddits(response.body(), subscribedSubredditData,
subscribedUserData, subredditData, subscribedUserData, subredditData,
new ParseSubscribedThing.ParseSubscribedSubredditsListener() { new ParseSubscribedThing.ParseSubscribedSubredditsListener() {
@ -68,21 +69,27 @@ class FetchSubscribedThing {
fetchSubscribedThingListener.onFetchSubscribedThingFail(); fetchSubscribedThingListener.onFetchSubscribedThingFail();
} }
}); });
} } else if(response.code() == 401) {
@Override
public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
Log.i("call failed", t.getMessage());
RefreshAccessToken.refreshAccessToken(context, new RefreshAccessToken.RefreshAccessTokenListener() { RefreshAccessToken.refreshAccessToken(context, new RefreshAccessToken.RefreshAccessTokenListener() {
@Override @Override
public void onRefreshAccessTokenSuccess() { public void onRefreshAccessTokenSuccess() {
fetchSubscribedThing(context, lastItem, subscribedSubredditData, fetchSubscribedThing(context, lastItem, subscribedSubredditData,
subscribedUserData, subredditData, fetchSubscribedThingListener, refreshTime); subscribedUserData, subredditData, fetchSubscribedThingListener, refreshTime - 1);
} }
@Override @Override
public void onRefreshAccessTokenFail() {} public void onRefreshAccessTokenFail() {}
}); });
} else {
Log.i("call failed", response.message());
fetchSubscribedThingListener.onFetchSubscribedThingFail();
}
}
@Override
public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
Log.i("call failed", t.getMessage());
fetchSubscribedThingListener.onFetchSubscribedThingFail();
} }
}); });
} }

17
app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserInfo.java
View File

@ -34,12 +34,9 @@ class FetchUserInfo {
userInfo.enqueue(new Callback<String>() { userInfo.enqueue(new Callback<String>() {
@Override @Override
public void onResponse(@NonNull Call<String> call, @NonNull retrofit2.Response<String> response) { public void onResponse(@NonNull Call<String> call, @NonNull retrofit2.Response<String> response) {
if(response.isSuccessful()) {
fetchUserInfoListener.onFetchUserInfoSuccess(response.body()); fetchUserInfoListener.onFetchUserInfoSuccess(response.body());
} } else if(response.code() == 401){
@Override
public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
Log.i("call failed", t.getMessage());
RefreshAccessToken.refreshAccessToken(context, new RefreshAccessToken.RefreshAccessTokenListener() { RefreshAccessToken.refreshAccessToken(context, new RefreshAccessToken.RefreshAccessTokenListener() {
@Override @Override
public void onRefreshAccessTokenSuccess() { public void onRefreshAccessTokenSuccess() {
@ -49,6 +46,16 @@ class FetchUserInfo {
@Override @Override
public void onRefreshAccessTokenFail() {} public void onRefreshAccessTokenFail() {}
}); });
} else {
Log.i("call failed", response.message());
fetchUserInfoListener.onFetchUserInfoFail();
}
}
@Override
public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
Log.i("call failed", t.getMessage());
fetchUserInfoListener.onFetchUserInfoFail();
} }
}); });
} }

2
app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java
View File

@ -65,7 +65,7 @@ class ParseSubscribedThing {
for(int i = 0; i < children.length(); i++) { for(int i = 0; i < children.length(); i++) {
JSONObject data = children.getJSONObject(i).getJSONObject(JSONUtils.DATA_KEY); JSONObject data = children.getJSONObject(i).getJSONObject(JSONUtils.DATA_KEY);
String name = data.getString(JSONUtils.DISPLAY_NAME); String name = data.getString(JSONUtils.DISPLAY_NAME);
String bannerImageUrl = data.getString(JSONUtils.BANNER_IMG_KEY); String bannerImageUrl = data.getString(JSONUtils.BANNER_BACKGROUND_IMAGE_KEY);
if(bannerImageUrl.equals("") || bannerImageUrl.equals("null")) { if(bannerImageUrl.equals("") || bannerImageUrl.equals("null")) {
bannerImageUrl= data.getString(JSONUtils.BANNER_IMG_KEY); bannerImageUrl= data.getString(JSONUtils.BANNER_IMG_KEY);
if(bannerImageUrl.equals("null")) { if(bannerImageUrl.equals("null")) {

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

@ -16,8 +16,11 @@ 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;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.Toast;
import com.bumptech.glide.Glide;
import java.util.ArrayList; import java.util.ArrayList;
@ -43,6 +46,8 @@ public class PostFragment extends Fragment {
private String mLastItem; private String mLastItem;
private PaginationSynchronizer mPaginationSynchronizer; private PaginationSynchronizer mPaginationSynchronizer;
private PostRecyclerViewAdapter mAdapter; private PostRecyclerViewAdapter mAdapter;
private LinearLayout mFetchPostErrorLinearLayout;
private ImageView mFetchPostErrorImageView;
private boolean mIsBestPost; private boolean mIsBestPost;
private String mSubredditName; private String mSubredditName;
@ -73,7 +78,7 @@ public class PostFragment extends Fragment {
if(mIsBestPost) { if(mIsBestPost) {
fetchBestPost(1); fetchBestPost(1);
} else { } else {
fetchPost(mSubredditName, 1); fetchPost();
} }
} }
} }
@ -108,6 +113,8 @@ public class PostFragment extends Fragment {
mLinearLayoutManager = new LinearLayoutManager(getActivity()); mLinearLayoutManager = new LinearLayoutManager(getActivity());
mPostRecyclerView.setLayoutManager(mLinearLayoutManager); mPostRecyclerView.setLayoutManager(mLinearLayoutManager);
mProgressBar = rootView.findViewById(R.id.progress_bar_post_fragment); mProgressBar = rootView.findViewById(R.id.progress_bar_post_fragment);
mFetchPostErrorLinearLayout = rootView.findViewById(R.id.fetch_post_error_linear_layout_post_fragment);
mFetchPostErrorImageView = rootView.findViewById(R.id.fetch_post_error_image_view_post_fragment);
/*FloatingActionButton fab = rootView.findViewById(R.id.fab_post_fragment); /*FloatingActionButton fab = rootView.findViewById(R.id.fab_post_fragment);
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
@Override @Override
@ -120,6 +127,17 @@ public class PostFragment extends Fragment {
mIsBestPost = getArguments().getBoolean(IS_BEST_POST_KEY); mIsBestPost = getArguments().getBoolean(IS_BEST_POST_KEY);
if(!mIsBestPost) { if(!mIsBestPost) {
mSubredditName = getArguments().getString(SUBREDDIT_NAME_KEY); mSubredditName = getArguments().getString(SUBREDDIT_NAME_KEY);
} else {
mFetchPostErrorLinearLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if(mIsBestPost) {
fetchBestPost(1);
} else {
fetchPost();
}
}
});
} }
if(savedInstanceState != null && savedInstanceState.getParcelable(paginationSynchronizerState) != null) { if(savedInstanceState != null && savedInstanceState.getParcelable(paginationSynchronizerState) != null) {
@ -129,7 +147,7 @@ public class PostFragment extends Fragment {
if(mIsBestPost) { if(mIsBestPost) {
fetchBestPost(1); fetchBestPost(1);
} else { } else {
fetchPost(mSubredditName, 1); fetchPost();
} }
} }
@ -146,10 +164,11 @@ public class PostFragment extends Fragment {
private void fetchBestPost(final int refreshTime) { private void fetchBestPost(final int refreshTime) {
if(refreshTime < 0) { if(refreshTime < 0) {
showErrorSnackbar(); showErrorView();
return; return;
} }
mFetchPostErrorLinearLayout.setVisibility(View.GONE);
mProgressBar.setVisibility(View.VISIBLE); mProgressBar.setVisibility(View.VISIBLE);
Retrofit retrofit = new Retrofit.Builder() Retrofit retrofit = new Retrofit.Builder()
@ -166,7 +185,6 @@ public class PostFragment extends Fragment {
@Override @Override
public void onResponse(Call<String> call, retrofit2.Response<String> response) { public void onResponse(Call<String> call, retrofit2.Response<String> response) {
if(getActivity() != null) { if(getActivity() != null) {
if(response.isSuccessful()) { if(response.isSuccessful()) {
ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE); ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText("response", response.body()); ClipData clip = ClipData.newPlainText("response", response.body());
@ -191,9 +209,8 @@ public class PostFragment extends Fragment {
@Override @Override
public void onParsePostFail() { public void onParsePostFail() {
Toast.makeText(getActivity(), "Error parsing data", Toast.LENGTH_SHORT).show();
Log.i("Post fetch error", "Error parsing data"); Log.i("Post fetch error", "Error parsing data");
mProgressBar.setVisibility(View.GONE); showErrorView();
} }
}); });
} else if(response.code() == 401) { } else if(response.code() == 401) {
@ -211,24 +228,20 @@ public class PostFragment extends Fragment {
}); });
} else { } else {
Log.i("Post fetch error", response.message()); Log.i("Post fetch error", response.message());
showErrorSnackbar(); showErrorView();
} }
} }
} }
@Override @Override
public void onFailure(Call<String> call, Throwable t) { public void onFailure(Call<String> call, Throwable t) {
showErrorSnackbar(); showErrorView();
} }
}); });
} }
private void fetchPost(final String queryPostUrl, final int refreshTime) { private void fetchPost() {
if(refreshTime < 0) { mFetchPostErrorLinearLayout.setVisibility(View.GONE);
showErrorSnackbar();
return;
}
mProgressBar.setVisibility(View.VISIBLE); mProgressBar.setVisibility(View.VISIBLE);
Retrofit retrofit = new Retrofit.Builder() Retrofit retrofit = new Retrofit.Builder()
@ -242,7 +255,6 @@ public class PostFragment extends Fragment {
@Override @Override
public void onResponse(Call<String> call, retrofit2.Response<String> response) { public void onResponse(Call<String> call, retrofit2.Response<String> response) {
if(getActivity() != null) { if(getActivity() != null) {
Log.i("response_code", Integer.toString(response.code()));
if(response.isSuccessful()) { if(response.isSuccessful()) {
ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE); ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText("response", response.body()); ClipData clip = ClipData.newPlainText("response", response.body());
@ -267,27 +279,30 @@ public class PostFragment extends Fragment {
@Override @Override
public void onParsePostFail() { public void onParsePostFail() {
Toast.makeText(getActivity(), "Error parsing data", Toast.LENGTH_SHORT).show();
Log.i("Post fetch error", "Error parsing data"); Log.i("Post fetch error", "Error parsing data");
mProgressBar.setVisibility(View.GONE); showErrorView();
} }
}); });
} else { } else {
Log.i("Post fetch error", response.message()); Log.i("Post fetch error", response.message());
showErrorSnackbar(); showErrorView();
} }
} }
} }
@Override @Override
public void onFailure(Call<String> call, Throwable t) { public void onFailure(Call<String> call, Throwable t) {
showErrorSnackbar(); showErrorView();
} }
}); });
} }
private void showErrorSnackbar() { private void showErrorView() {
mProgressBar.setVisibility(View.GONE); mProgressBar.setVisibility(View.GONE);
if(mIsBestPost) {
mFetchPostErrorLinearLayout.setVisibility(View.VISIBLE);
Glide.with(this).load(R.drawable.load_post_error_indicator).into(mFetchPostErrorImageView);
} else {
Snackbar snackbar = Snackbar.make(mCoordinatorLayout, "Error getting post", Snackbar.LENGTH_INDEFINITE); Snackbar snackbar = Snackbar.make(mCoordinatorLayout, "Error getting post", Snackbar.LENGTH_INDEFINITE);
snackbar.setAction(R.string.retry, new View.OnClickListener() { snackbar.setAction(R.string.retry, new View.OnClickListener() {
@Override @Override
@ -295,10 +310,11 @@ public class PostFragment extends Fragment {
if (mIsBestPost) { if (mIsBestPost) {
fetchBestPost(1); fetchBestPost(1);
} else { } else {
fetchPost(mSubredditName, 1); fetchPost();
} }
} }
}); });
snackbar.show(); snackbar.show();
} }
} }
}

59
app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java
View File

@ -80,21 +80,22 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
} }
@Override @Override
public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, final int position) {
if(holder instanceof DataViewHolder) { if(holder instanceof DataViewHolder) {
if(mPostData.get(position) == null) { if(mPostData.get(position) == null) {
Log.i("is null", Integer.toString(position)); Log.i("is null", Integer.toString(position));
} else { } else {
final String id = mPostData.get(holder.getAdapterPosition()).getFullName(); final int adapterPosition = holder.getAdapterPosition();
final String subredditName = mPostData.get(holder.getAdapterPosition()).getSubredditNamePrefixed(); final String id = mPostData.get(adapterPosition).getFullName();
final String postTime = mPostData.get(holder.getAdapterPosition()).getPostTime(); final String subredditName = mPostData.get(adapterPosition).getSubredditNamePrefixed();
final String title = mPostData.get(holder.getAdapterPosition()).getTitle(); final String postTime = mPostData.get(adapterPosition).getPostTime();
final String permalink = mPostData.get(holder.getAdapterPosition()).getPermalink(); final String title = mPostData.get(adapterPosition).getTitle();
int voteType = mPostData.get(holder.getAdapterPosition()).getVoteType(); final String permalink = mPostData.get(adapterPosition).getPermalink();
int gilded = mPostData.get(holder.getAdapterPosition()).getGilded(); int voteType = mPostData.get(adapterPosition).getVoteType();
boolean nsfw = mPostData.get(holder.getAdapterPosition()).isNSFW(); int gilded = mPostData.get(adapterPosition).getGilded();
boolean nsfw = mPostData.get(adapterPosition).isNSFW();
if(mPostData.get(holder.getAdapterPosition()).getSubredditIconUrl() == null) { if(mPostData.get(adapterPosition).getSubredditIconUrl() == null) {
new LoadSubredditIconAsyncTask(subredditDao, subredditName, new LoadSubredditIconAsyncTask(subredditDao, subredditName,
new LoadSubredditIconAsyncTask.LoadSubredditIconAsyncTaskListener() { new LoadSubredditIconAsyncTask.LoadSubredditIconAsyncTaskListener() {
@Override @Override
@ -107,7 +108,7 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
.into(((DataViewHolder) holder).subredditIconCircleImageView); .into(((DataViewHolder) holder).subredditIconCircleImageView);
} }
mPostData.get(holder.getAdapterPosition()).setSubredditIconUrl(iconImageUrl); mPostData.get(adapterPosition).setSubredditIconUrl(iconImageUrl);
} }
}).execute(); }).execute();
} else if(!mPostData.get(position).getSubredditIconUrl().equals("")) { } else if(!mPostData.get(position).getSubredditIconUrl().equals("")) {
@ -123,7 +124,7 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
canStartActivity = false; canStartActivity = false;
Intent intent = new Intent(mContext, ViewPostDetailActivity.class); Intent intent = new Intent(mContext, ViewPostDetailActivity.class);
intent.putExtra(ViewPostDetailActivity.EXTRA_TITLE, title); intent.putExtra(ViewPostDetailActivity.EXTRA_TITLE, title);
intent.putExtra(ViewPostDetailActivity.EXTRA_POST_DATA, mPostData.get(holder.getAdapterPosition())); intent.putExtra(ViewPostDetailActivity.EXTRA_POST_DATA, mPostData.get(adapterPosition));
mContext.startActivity(intent); mContext.startActivity(intent);
} }
} }
@ -134,7 +135,7 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
public void onClick(View view) { public void onClick(View view) {
Intent intent = new Intent(mContext, ViewSubredditDetailActivity.class); Intent intent = new Intent(mContext, ViewSubredditDetailActivity.class);
intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY,
mPostData.get(holder.getAdapterPosition()).getSubredditNamePrefixed().substring(2)); mPostData.get(adapterPosition).getSubredditNamePrefixed().substring(2));
} }
}); });
@ -259,10 +260,10 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
Intent intent = new Intent(mContext, ViewVideoActivity.class); Intent intent = new Intent(mContext, ViewVideoActivity.class);
intent.setData(gifVideoUri); intent.setData(gifVideoUri);
intent.putExtra(ViewVideoActivity.TITLE_KEY, title); intent.putExtra(ViewVideoActivity.TITLE_KEY, title);
intent.putExtra(ViewVideoActivity.IS_DASH_VIDEO_KEY, mPostData.get(holder.getAdapterPosition()).isDashVideo()); intent.putExtra(ViewVideoActivity.IS_DASH_VIDEO_KEY, mPostData.get(adapterPosition).isDashVideo());
intent.putExtra(ViewVideoActivity.IS_DOWNLOADABLE_KEY, mPostData.get(holder.getAdapterPosition()).isDownloadableGifOrVideo()); intent.putExtra(ViewVideoActivity.IS_DOWNLOADABLE_KEY, mPostData.get(adapterPosition).isDownloadableGifOrVideo());
if(mPostData.get(holder.getAdapterPosition()).isDownloadableGifOrVideo()) { if(mPostData.get(adapterPosition).isDownloadableGifOrVideo()) {
intent.putExtra(ViewVideoActivity.DOWNLOAD_URL_KEY, mPostData.get(holder.getAdapterPosition()).getGifOrVideoDownloadUrl()); intent.putExtra(ViewVideoActivity.DOWNLOAD_URL_KEY, mPostData.get(adapterPosition).getGifOrVideoDownloadUrl());
intent.putExtra(ViewVideoActivity.SUBREDDIT_KEY, subredditName); intent.putExtra(ViewVideoActivity.SUBREDDIT_KEY, subredditName);
intent.putExtra(ViewVideoActivity.ID_KEY, id); intent.putExtra(ViewVideoActivity.ID_KEY, id);
} }
@ -295,10 +296,10 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
Intent intent = new Intent(mContext, ViewVideoActivity.class); Intent intent = new Intent(mContext, ViewVideoActivity.class);
intent.setData(videoUri); intent.setData(videoUri);
intent.putExtra(ViewVideoActivity.TITLE_KEY, title); intent.putExtra(ViewVideoActivity.TITLE_KEY, title);
intent.putExtra(ViewVideoActivity.IS_DASH_VIDEO_KEY, mPostData.get(holder.getAdapterPosition()).isDashVideo()); intent.putExtra(ViewVideoActivity.IS_DASH_VIDEO_KEY, mPostData.get(adapterPosition).isDashVideo());
intent.putExtra(ViewVideoActivity.IS_DOWNLOADABLE_KEY, mPostData.get(holder.getAdapterPosition()).isDownloadableGifOrVideo()); intent.putExtra(ViewVideoActivity.IS_DOWNLOADABLE_KEY, mPostData.get(adapterPosition).isDownloadableGifOrVideo());
if(mPostData.get(holder.getAdapterPosition()).isDownloadableGifOrVideo()) { if(mPostData.get(adapterPosition).isDownloadableGifOrVideo()) {
intent.putExtra(ViewVideoActivity.DOWNLOAD_URL_KEY, mPostData.get(holder.getAdapterPosition()).getGifOrVideoDownloadUrl()); intent.putExtra(ViewVideoActivity.DOWNLOAD_URL_KEY, mPostData.get(adapterPosition).getGifOrVideoDownloadUrl());
intent.putExtra(ViewVideoActivity.SUBREDDIT_KEY, subredditName); intent.putExtra(ViewVideoActivity.SUBREDDIT_KEY, subredditName);
intent.putExtra(ViewVideoActivity.ID_KEY, id); intent.putExtra(ViewVideoActivity.ID_KEY, id);
} }
@ -337,9 +338,9 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
if (((DataViewHolder) holder).upvoteButton.getColorFilter() == null) { if (((DataViewHolder) holder).upvoteButton.getColorFilter() == null) {
((DataViewHolder) holder).upvoteButton.setColorFilter(ContextCompat.getColor(mContext, R.color.colorPrimary), android.graphics.PorterDuff.Mode.SRC_IN); ((DataViewHolder) holder).upvoteButton.setColorFilter(ContextCompat.getColor(mContext, R.color.colorPrimary), android.graphics.PorterDuff.Mode.SRC_IN);
if(isDownvotedBefore) { if(isDownvotedBefore) {
((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(holder.getAdapterPosition()).getScore() + 2)); ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(adapterPosition).getScore() + 2));
} else { } else {
((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(holder.getAdapterPosition()).getScore() + 1)); ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(adapterPosition).getScore() + 1));
} }
VoteThing.voteThing(mContext, new VoteThing.VoteThingListener() { VoteThing.voteThing(mContext, new VoteThing.VoteThingListener() {
@ -364,7 +365,7 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
} else { } else {
//Upvoted before //Upvoted before
((DataViewHolder) holder).upvoteButton.clearColorFilter(); ((DataViewHolder) holder).upvoteButton.clearColorFilter();
((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(holder.getAdapterPosition()).getScore() - 1)); ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(adapterPosition).getScore() - 1));
VoteThing.voteThing(mContext, new VoteThing.VoteThingListener() { VoteThing.voteThing(mContext, new VoteThing.VoteThingListener() {
@Override @Override
@ -395,9 +396,9 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
if (((DataViewHolder) holder).downvoteButton.getColorFilter() == null) { if (((DataViewHolder) holder).downvoteButton.getColorFilter() == null) {
((DataViewHolder) holder).downvoteButton.setColorFilter(ContextCompat.getColor(mContext, R.color.minusButtonColor), android.graphics.PorterDuff.Mode.SRC_IN); ((DataViewHolder) holder).downvoteButton.setColorFilter(ContextCompat.getColor(mContext, R.color.minusButtonColor), android.graphics.PorterDuff.Mode.SRC_IN);
if (isUpvotedBefore) { if (isUpvotedBefore) {
((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(holder.getAdapterPosition()).getScore() - 2)); ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(adapterPosition).getScore() - 2));
} else { } else {
((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(holder.getAdapterPosition()).getScore() - 1)); ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(adapterPosition).getScore() - 1));
} }
VoteThing.voteThing(mContext, new VoteThing.VoteThingListener() { VoteThing.voteThing(mContext, new VoteThing.VoteThingListener() {
@ -418,11 +419,11 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(position).getScore())); ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(position).getScore()));
((DataViewHolder) holder).upvoteButton.setColorFilter(upvoteButtonColorFilter); ((DataViewHolder) holder).upvoteButton.setColorFilter(upvoteButtonColorFilter);
} }
}, id, RedditUtils.DIR_DOWNVOTE, holder.getAdapterPosition(), 1); }, id, RedditUtils.DIR_DOWNVOTE, adapterPosition, 1);
} else { } else {
//Down voted before //Down voted before
((DataViewHolder) holder).downvoteButton.clearColorFilter(); ((DataViewHolder) holder).downvoteButton.clearColorFilter();
((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(holder.getAdapterPosition()).getScore() + 1)); ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(adapterPosition).getScore() + 1));
VoteThing.voteThing(mContext, new VoteThing.VoteThingListener() { VoteThing.voteThing(mContext, new VoteThing.VoteThingListener() {
@Override @Override
@ -438,7 +439,7 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(position).getScore())); ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(mPostData.get(position).getScore()));
mPostData.get(position).setScore(mPostData.get(position).getScore()); mPostData.get(position).setScore(mPostData.get(position).getScore());
} }
}, id, RedditUtils.DIR_UNVOTE, holder.getAdapterPosition(), 1); }, id, RedditUtils.DIR_UNVOTE, adapterPosition, 1);
} }
} }
}); });

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

@ -60,8 +60,4 @@ class RedditUtils {
params.put(RedditUtils.USER_AGENT_KEY, RedditUtils.USER_AGENT); params.put(RedditUtils.USER_AGENT_KEY, RedditUtils.USER_AGENT);
return params; return params;
} }
static String getQuerySubredditPostUrl(String subredditName) {
return API_BASE_URI + "/r/" + subredditName + ".json";
}
} }

BIN
app/src/main/res/drawable/load_post_error_indicator.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

3
app/src/main/res/layout/activity_view_subreddit_detail.xml
View File

@ -21,7 +21,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
app:contentScrim="?attr/colorPrimary" app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed" app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
app:toolbarId="@+id/toolbar"> app:toolbarId="@+id/toolbar">
<RelativeLayout <RelativeLayout
@ -109,6 +109,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin" app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
app:popupTheme="@style/AppTheme.PopupOverlay" app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator" /> app:navigationIcon="?attr/homeAsUpIndicator" />

22
app/src/main/res/layout/fragment_post.xml
View File

@ -19,6 +19,28 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/fetch_post_error_linear_layout_post_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/fetch_post_error_image_view_post_fragment"
android:layout_width="150dp"
android:layout_height="wrap_content" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/load_posts_error"/>
</LinearLayout>
<!--<android.support.design.widget.FloatingActionButton <!--<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_post_fragment" android:id="@+id/fab_post_fragment"
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -8,6 +8,8 @@
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="action_download">Download</string> <string name="action_download">Download</string>
<string name="load_posts_error">Error loading posts.\nTap to retry.</string>
<string name="load_data_failed">Cannot load posts</string> <string name="load_data_failed">Cannot load posts</string>
<string name="load_comment_failed">Error loading comments</string> <string name="load_comment_failed">Error loading comments</string>
<string name="retry">Retry</string> <string name="retry">Retry</string>