mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-10 04:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename some classes and layout resources. Feature added: view posts in ViewSubredditDetailActivity.

Browse Source
This commit is contained in:
Alex Ning 2018-08-20 22:33:00 +08:00
parent 07b32b3900
commit 0fa03cba21
14 changed files with 286 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser
View File

Binary file not shown.

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

@ -28,7 +28,7 @@ class FetchComment {
void queryComment(FetchCommentListener fetchCommentListener) {
mFetchCommentListener = fetchCommentListener;
Uri uri = Uri.parse(RedditUtils.getQueryCommentUri(subredditName, article))
Uri uri = Uri.parse(RedditUtils.getQueryCommentUrl(subredditName, article))
.buildUpon().appendQueryParameter(RedditUtils.RAW_JSON_KEY, RedditUtils.RAW_JSON_VALUE)
.build();

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

@ -23,7 +23,7 @@ class FetchSubredditData {
void querySubredditData(FetchSubredditDataListener fetchSubredditDataListener) {
mFetchSubredditDataListener = fetchSubredditDataListener;
StringRequest commentRequest = new StringRequest(Request.Method.GET, RedditUtils.getQuerySubredditDataUri(subredditName), new Response.Listener<String>() {
StringRequest commentRequest = new StringRequest(Request.Method.GET, RedditUtils.getQuerySubredditDataUrl(subredditName), new Response.Listener<String>() {
@Override
public void onResponse(String response) {
mFetchSubredditDataListener.onFetchSubredditDataSuccess(response);

14
app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java
View File

@ -5,11 +5,11 @@ import android.arch.lifecycle.ViewModelProviders;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
@ -79,9 +79,15 @@ public class MainActivity extends AppCompatActivity {
startActivity(loginIntent);
} else {
if(savedInstanceState == null) {
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
mFragment = new BestPostFragment();
fragmentTransaction.replace(R.id.frame_layout_content_main, mFragment).commit();
mFragment = new PostFragment();
Uri uri = Uri.parse(RedditUtils.OAUTH_API_BASE_URI + RedditUtils.BEST_POST_SUFFIX)
.buildUpon().appendQueryParameter(RedditUtils.RAW_JSON_KEY, RedditUtils.RAW_JSON_VALUE)
.build();
Bundle bundle = new Bundle();
bundle.putString(PostFragment.QUERY_POST_URL_KEY, uri.toString());
bundle.putBoolean(PostFragment.IS_BEST_POST_KEY, true);
mFragment.setArguments(bundle);
getSupportFragmentManager().beginTransaction().replace(R.id.frame_layout_content_main, mFragment).commit();
} else {
mFragment = getSupportFragmentManager().getFragment(savedInstanceState, "outStateFragment");
getSupportFragmentManager().beginTransaction().replace(R.id.frame_layout_content_main, mFragment).commit();

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

@ -32,7 +32,7 @@ class ParsePost {
mParseBetPostListener = parsePostListener;
}
void parseBestPost(String response, ArrayList<PostData> postData) {
void parsePost(String response, ArrayList<PostData> postData) {
new ParsePostDataAsyncTask(response, postData).execute();
}

177
app/src/main/java/ml/docilealligator/infinityforreddit/BestPostFragment.java → app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java
View File

@ -1,16 +1,16 @@
package ml.docilealligator.infinityforreddit;
import android.support.v4.app.Fragment;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
@ -35,10 +35,13 @@ import java.util.Map;
/**
* A simple {@link Fragment} subclass.
*/
public class BestPostFragment extends Fragment {
public class PostFragment extends Fragment {
static final String QUERY_POST_URL_KEY = "QPUK";
static final String IS_BEST_POST_KEY = "IBPK";
private CoordinatorLayout mCoordinatorLayout;
private RecyclerView mBestPostRecyclerView;
private RecyclerView mPostRecyclerView;
private LinearLayoutManager mLinearLayoutManager;
private ProgressBar mProgressBar;
private ArrayList<PostData> mPostData;
@ -46,7 +49,9 @@ public class BestPostFragment extends Fragment {
private PaginationSynchronizer mPaginationSynchronizer;
private PostRecyclerViewAdapter mAdapter;
private String bestPostDataParcelableState = "BPDPS";
private boolean mIsBestPost;
private String mQueryPostUrl;
private String PostDataParcelableState = "BPDPS";
private String lastItemState = "LIS";
private String paginationSynchronizerState = "PSS";
@ -55,7 +60,7 @@ public class BestPostFragment extends Fragment {
private RequestQueue mAcquireAccessTokenRequestQueue;
private RequestQueue mVoteThingRequestQueue;
public BestPostFragment() {
public PostFragment() {
// Required empty public constructor
}
@ -63,22 +68,29 @@ public class BestPostFragment extends Fragment {
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if(savedInstanceState != null) {
if(savedInstanceState.containsKey(bestPostDataParcelableState)) {
mPostData = savedInstanceState.getParcelableArrayList(bestPostDataParcelableState);
if(savedInstanceState.containsKey(PostDataParcelableState)) {
mPostData = savedInstanceState.getParcelableArrayList(PostDataParcelableState);
mLastItem = savedInstanceState.getString(lastItemState);
mAdapter = new PostRecyclerViewAdapter(getActivity(), mPostData, mPaginationSynchronizer, mVoteThingRequestQueue, mAcquireAccessTokenRequestQueue);
mBestPostRecyclerView.setAdapter(mAdapter);
mBestPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener(getActivity(), mLinearLayoutManager, mAdapter, mLastItem, mPostData, mPaginationSynchronizer,
mAcquireAccessTokenRequestQueue, mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess()));
mPostRecyclerView.setAdapter(mAdapter);
mPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener(
getActivity(), mLinearLayoutManager, mAdapter, mLastItem, mPostData,
mPaginationSynchronizer, mAcquireAccessTokenRequestQueue,
mQueryPostUrl, mIsBestPost,
mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess()));
mProgressBar.setVisibility(View.GONE);
} else {
queryBestPost(1);
if(mIsBestPost) {
queryBestPost(mQueryPostUrl, 1);
} else {
queryPost(mQueryPostUrl, 1);
}
}
}
}
@Override
public void onSaveInstanceState(Bundle outState) {
public void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
if(mRequestQueue != null) {
@ -98,7 +110,7 @@ public class BestPostFragment extends Fragment {
}
if(mPostData != null) {
outState.putParcelableArrayList(bestPostDataParcelableState, mPostData);
outState.putParcelableArrayList(PostDataParcelableState, mPostData);
outState.putString(lastItemState, mLastItem);
outState.putParcelable(paginationSynchronizerState, mPaginationSynchronizer);
}
@ -116,30 +128,37 @@ public class BestPostFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View rootView = inflater.inflate(R.layout.fragment_best_post, container, false);
mCoordinatorLayout = rootView.findViewById(R.id.coordinator_layout_best_post_fragment);
mBestPostRecyclerView = rootView.findViewById(R.id.recycler_view_best_post_fragment);
View rootView = inflater.inflate(R.layout.fragment_post, container, false);
mCoordinatorLayout = rootView.findViewById(R.id.coordinator_layout_post_fragment);
mPostRecyclerView = rootView.findViewById(R.id.recycler_view_post_fragment);
mLinearLayoutManager = new LinearLayoutManager(getActivity());
mBestPostRecyclerView.setLayoutManager(mLinearLayoutManager);
mProgressBar = rootView.findViewById(R.id.progress_bar_best_post_fragment);
FloatingActionButton fab = rootView.findViewById(R.id.fab_best_post_fragment);
mPostRecyclerView.setLayoutManager(mLinearLayoutManager);
mProgressBar = rootView.findViewById(R.id.progress_bar_post_fragment);
/*FloatingActionButton fab = rootView.findViewById(R.id.fab_post_fragment);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
});
});*/
mRequestQueue = Volley.newRequestQueue(getActivity());
mAcquireAccessTokenRequestQueue = Volley.newRequestQueue(getActivity());
mVoteThingRequestQueue = Volley.newRequestQueue(getActivity());
mIsBestPost = getArguments().getBoolean(IS_BEST_POST_KEY);
mQueryPostUrl = getArguments().getString(QUERY_POST_URL_KEY);
if(savedInstanceState != null && savedInstanceState.getParcelable(paginationSynchronizerState) != null) {
mPaginationSynchronizer = savedInstanceState.getParcelable(paginationSynchronizerState);
} else {
mPaginationSynchronizer = new PaginationSynchronizer();
queryBestPost(1);
if(mIsBestPost) {
queryBestPost(mQueryPostUrl, 1);
} else {
queryPost(mQueryPostUrl, 1);
}
}
LastItemSynchronizer lastItemSynchronizer = new LastItemSynchronizer() {
@ -161,7 +180,7 @@ public class BestPostFragment extends Fragment {
return rootView;
}
private void queryBestPost(final int refreshTime) {
private void queryBestPost(final String queryPostUrl, final int refreshTime) {
if(refreshTime < 0) {
showErrorSnackbar();
return;
@ -169,11 +188,11 @@ public class BestPostFragment extends Fragment {
mProgressBar.setVisibility(View.VISIBLE);
Uri uri = Uri.parse(RedditUtils.OAUTH_API_BASE_URI + RedditUtils.BEST_POST_SUFFIX)
/*Uri uri = Uri.parse(RedditUtils.OAUTH_API_BASE_URI + RedditUtils.BEST_POST_SUFFIX)
.buildUpon().appendQueryParameter(RedditUtils.RAW_JSON_KEY, RedditUtils.RAW_JSON_VALUE)
.build();
.build();*/
StringRequest bestPostRequest = new StringRequest(Request.Method.GET, uri.toString(), new Response.Listener<String>() {
StringRequest postRequest = new StringRequest(Request.Method.GET, mQueryPostUrl, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
if(getActivity() != null) {
@ -183,24 +202,27 @@ public class BestPostFragment extends Fragment {
//new ParsePostDataAsyncTask(response, accessToken).execute();
new ParsePost(getActivity(), new ParsePost.ParsePostListener() {
@Override
public void onParsePostSuccess(ArrayList<PostData> bestPostData, String lastItem) {
mPostData = bestPostData;
public void onParsePostSuccess(ArrayList<PostData> postData, String lastItem) {
mPostData = postData;
mLastItem = lastItem;
mAdapter = new PostRecyclerViewAdapter(getActivity(), bestPostData, mPaginationSynchronizer, mVoteThingRequestQueue, mAcquireAccessTokenRequestQueue);
mAdapter = new PostRecyclerViewAdapter(getActivity(), postData, mPaginationSynchronizer, mVoteThingRequestQueue, mAcquireAccessTokenRequestQueue);
mBestPostRecyclerView.setAdapter(mAdapter);
mBestPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener(getActivity(), mLinearLayoutManager, mAdapter, lastItem, bestPostData, mPaginationSynchronizer,
mAcquireAccessTokenRequestQueue, mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess()));
mPostRecyclerView.setAdapter(mAdapter);
mPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener(
getActivity(), mLinearLayoutManager, mAdapter, lastItem, postData,
mPaginationSynchronizer, mAcquireAccessTokenRequestQueue,
mQueryPostUrl, mIsBestPost,
mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess()));
mProgressBar.setVisibility(View.GONE);
}
@Override
public void onParsePostFail() {
Toast.makeText(getActivity(), "Error parsing data", Toast.LENGTH_SHORT).show();
Log.i("Best post fetch error", "Error parsing data");
Log.i("Post fetch error", "Error parsing data");
mProgressBar.setVisibility(View.GONE);
}
}).parseBestPost(response, new ArrayList<PostData>());
}).parsePost(response, new ArrayList<PostData>());
}
}
}, new Response.ErrorListener() {
@ -213,14 +235,14 @@ public class BestPostFragment extends Fragment {
new AcquireAccessToken.AcquireAccessTokenListener() {
@Override
public void onAcquireAccessTokenSuccess() {
queryBestPost(refreshTime - 1);
queryBestPost(queryPostUrl, refreshTime - 1);
}
@Override
public void onAcquireAccessTokenFail() {}
});
} else {
Log.i("best post fetch error", error.toString());
Log.i("Post fetch error", error.toString());
showErrorSnackbar();
}
}
@ -231,17 +253,92 @@ public class BestPostFragment extends Fragment {
return RedditUtils.getOAuthHeader(accessToken);
}
};
bestPostRequest.setTag(BestPostFragment.class);
mRequestQueue.add(bestPostRequest);
postRequest.setTag(PostFragment.class);
mRequestQueue.add(postRequest);
}
private void queryPost(final String queryPostUrl, final int refreshTime) {
if(refreshTime < 0) {
showErrorSnackbar();
return;
}
mProgressBar.setVisibility(View.VISIBLE);
Uri uri = Uri.parse(RedditUtils.OAUTH_API_BASE_URI + RedditUtils.BEST_POST_SUFFIX)
.buildUpon().appendQueryParameter(RedditUtils.RAW_JSON_KEY, RedditUtils.RAW_JSON_VALUE)
.build();
StringRequest postRequest = new StringRequest(Request.Method.GET, queryPostUrl, new Response.Listener<String>() {
@Override
public void onResponse(String response) {
if(getActivity() != null) {
ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText("response", response);
clipboard.setPrimaryClip(clip);
//new ParsePostDataAsyncTask(response, accessToken).execute();
new ParsePost(getActivity(), new ParsePost.ParsePostListener() {
@Override
public void onParsePostSuccess(ArrayList<PostData> postData, String lastItem) {
mPostData = postData;
mLastItem = lastItem;
mAdapter = new PostRecyclerViewAdapter(getActivity(), postData, mPaginationSynchronizer, mVoteThingRequestQueue, mAcquireAccessTokenRequestQueue);
mPostRecyclerView.setAdapter(mAdapter);
mPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener(
getActivity(), mLinearLayoutManager, mAdapter, lastItem, postData,
mPaginationSynchronizer, mAcquireAccessTokenRequestQueue,
mQueryPostUrl, mIsBestPost,
mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess()));
mProgressBar.setVisibility(View.GONE);
}
@Override
public void onParsePostFail() {
Toast.makeText(getActivity(), "Error parsing data", Toast.LENGTH_SHORT).show();
Log.i("Post fetch error", "Error parsing data");
mProgressBar.setVisibility(View.GONE);
}
}).parsePost(response, new ArrayList<PostData>());
}
}
}, new Response.ErrorListener() {
@Override
public void onErrorResponse(VolleyError error) {
if (error instanceof AuthFailureError) {
// Error indicating that there was an Authentication Failure while performing the request
// Access token expired
new AcquireAccessToken(getActivity()).refreshAccessToken(mAcquireAccessTokenRequestQueue,
new AcquireAccessToken.AcquireAccessTokenListener() {
@Override
public void onAcquireAccessTokenSuccess() {
queryPost(queryPostUrl, refreshTime - 1);
}
@Override
public void onAcquireAccessTokenFail() {}
});
} else {
Log.i("Post fetch error", error.toString());
showErrorSnackbar();
}
}
});
postRequest.setTag(PostFragment.class);
mRequestQueue.add(postRequest);
}
private void showErrorSnackbar() {
mProgressBar.setVisibility(View.GONE);
Snackbar snackbar = Snackbar.make(mCoordinatorLayout, "Error getting best post", Snackbar.LENGTH_INDEFINITE);
Snackbar snackbar = Snackbar.make(mCoordinatorLayout, "Error getting post", Snackbar.LENGTH_INDEFINITE);
snackbar.setAction(R.string.retry, new View.OnClickListener() {
@Override
public void onClick(View view) {
queryBestPost(1);
if(mIsBestPost) {
queryBestPost(mQueryPostUrl, 1);
} else {
queryPost(mQueryPostUrl, 1);
}
}
});
snackbar.show();

103
app/src/main/java/ml/docilealligator/infinityforreddit/PostPaginationScrollListener.java
View File

@ -4,6 +4,7 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
@ -34,14 +35,18 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
private LastItemSynchronizer mLastItemSynchronizer;
private PaginationRequestQueueSynchronizer mPaginationRequestQueueSynchronizer;
private String mQueryPostUrl;
private boolean isBestPost;
private boolean isLoading;
private boolean loadSuccess;
private String mLastItem;
private RequestQueue mRequestQueue;
private RequestQueue mAcquireAccessTokenRequestQueue;
PostPaginationScrollListener(Context context, LinearLayoutManager layoutManager, PostRecyclerViewAdapter adapter, String lastItem, ArrayList<PostData> postData, PaginationSynchronizer paginationSynchronizer,
RequestQueue acquireAccessTokenRequestQueue, boolean isLoading, boolean loadSuccess) {
PostPaginationScrollListener(Context context, LinearLayoutManager layoutManager, PostRecyclerViewAdapter adapter,
String lastItem, ArrayList<PostData> postData, PaginationSynchronizer paginationSynchronizer,
RequestQueue acquireAccessTokenRequestQueue, final String queryPostUrl,
final boolean isBestPost, boolean isLoading, boolean loadSuccess) {
if(context != null) {
this.mContext = context;
this.mLayoutManager = layoutManager;
@ -50,6 +55,8 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
this.mPostData = postData;
this.mPaginationSynchronizer = paginationSynchronizer;
this.mAcquireAccessTokenRequestQueue = acquireAccessTokenRequestQueue;
this.mQueryPostUrl = queryPostUrl;
this.isBestPost = isBestPost;
this.isLoading = isLoading;
this.loadSuccess = loadSuccess;
@ -58,7 +65,11 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
mPaginationRetryNotifier = new PaginationRetryNotifier() {
@Override
public void retry() {
fetchBestPost(1);
if(isBestPost) {
fetchBestPost(queryPostUrl, 1);
} else {
fetchPost(queryPostUrl, 1);
}
}
};
mPaginationSynchronizer.setPaginationRetryNotifier(mPaginationRetryNotifier);
@ -69,7 +80,7 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
}
@Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
super.onScrolled(recyclerView, dx, dy);
if(!isLoading && loadSuccess) {
int visibleItemCount = mLayoutManager.getChildCount();
@ -77,13 +88,17 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
int firstVisibleItemPosition = mLayoutManager.findFirstVisibleItemPosition();
if((visibleItemCount + firstVisibleItemPosition >= totalItemCount) && firstVisibleItemPosition >= 0) {
fetchBestPost(1);
if(isBestPost) {
fetchBestPost(mQueryPostUrl, 1);
} else {
fetchPost(mQueryPostUrl, 1);
}
}
}
}
private void fetchBestPost(final int refreshTime) {
private void fetchBestPost(final String queryPostUrl, final int refreshTime) {
if(refreshTime < 0) {
loadFailed();
return;
@ -93,9 +108,8 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
loadSuccess = false;
mPaginationSynchronizer.setLoading(true);
Uri uri = Uri.parse(RedditUtils.OAUTH_API_BASE_URI + RedditUtils.BEST_POST_SUFFIX)
.buildUpon().appendQueryParameter(RedditUtils.AFTER_KEY, mLastItem)
.appendQueryParameter(RedditUtils.RAW_JSON_KEY, RedditUtils.RAW_JSON_VALUE).build();
Uri uri = Uri.parse(queryPostUrl)
.buildUpon().appendQueryParameter(RedditUtils.AFTER_KEY, mLastItem).build();
StringRequest bestPostRequest = new StringRequest(Request.Method.GET, uri.toString(), new Response.Listener<String>() {
@Override
@ -122,7 +136,7 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
Log.i("Best post", "Error parsing data");
loadFailed();
}
}).parseBestPost(response, mPostData);
}).parsePost(response, mPostData);
}
}, new Response.ErrorListener() {
@Override
@ -133,7 +147,7 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
new AcquireAccessToken.AcquireAccessTokenListener() {
@Override
public void onAcquireAccessTokenSuccess() {
fetchBestPost(refreshTime - 1);
fetchBestPost(queryPostUrl, refreshTime - 1);
}
@Override
@ -157,6 +171,73 @@ class PostPaginationScrollListener extends RecyclerView.OnScrollListener {
mRequestQueue.add(bestPostRequest);
}
private void fetchPost(final String queryPostUrl, final int refreshTime) {
if(refreshTime < 0) {
loadFailed();
return;
}
isLoading = true;
loadSuccess = false;
mPaginationSynchronizer.setLoading(true);
Uri uri = Uri.parse(queryPostUrl)
.buildUpon().appendQueryParameter(RedditUtils.AFTER_KEY, mLastItem).build();
StringRequest bestPostRequest = new StringRequest(Request.Method.GET, uri.toString(), new Response.Listener<String>() {
@Override
public void onResponse(String response) {
ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText("response", response);
clipboard.setPrimaryClip(clip);
new ParsePost(mContext, new ParsePost.ParsePostListener() {
@Override
public void onParsePostSuccess(ArrayList<PostData> bestPostData, String lastItem) {
mAdapter.notifyDataSetChanged();
mLastItem = lastItem;
mLastItemSynchronizer.lastItemChanged(mLastItem);
isLoading = false;
loadSuccess = true;
mPaginationSynchronizer.setLoading(false);
mPaginationSynchronizer.setLoadingState(true);
}
@Override
public void onParsePostFail() {
Toast.makeText(mContext, "Error parsing data", Toast.LENGTH_SHORT).show();
Log.i("Best post", "Error parsing data");
loadFailed();
}
}).parsePost(response, mPostData);
}
}, new Response.ErrorListener() {
@Override
public void onErrorResponse(VolleyError error) {
if (error instanceof AuthFailureError) {
//Access token expired
new AcquireAccessToken(mContext).refreshAccessToken(mAcquireAccessTokenRequestQueue,
new AcquireAccessToken.AcquireAccessTokenListener() {
@Override
public void onAcquireAccessTokenSuccess() {
fetchPost(queryPostUrl, refreshTime - 1);
}
@Override
public void onAcquireAccessTokenFail() {
}
});
} else {
Toast.makeText(mContext, "Error getting best post", Toast.LENGTH_SHORT).show();
Log.i("best post", error.toString());
loadFailed();
}
}
});
bestPostRequest.setTag(PostPaginationScrollListener.class);
mRequestQueue.add(bestPostRequest);
}
private void loadFailed() {
isLoading = false;
loadSuccess = false;

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

@ -77,7 +77,7 @@ class PostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
if(viewType == VIEW_TYPE_DATA) {
CardView cardView = (CardView) LayoutInflater.from(parent.getContext()).inflate(R.layout.item_best_post, parent, false);
CardView cardView = (CardView) LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post, parent, false);
return new DataViewHolder(cardView);
} else {
LinearLayout linearLayout = (LinearLayout) LayoutInflater.from(parent.getContext()).inflate(R.layout.item_footer_progress_bar, parent, false);

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

@ -70,11 +70,15 @@ class RedditUtils {
return params;
}
static String getQueryCommentUri(String subredditName, String article) {
static String getQueryCommentUrl(String subredditName, String article) {
return API_BASE_URI + "/" + subredditName + "/comments/" + article + ".json";
}
static String getQuerySubredditDataUri(String subredditName) {
static String getQuerySubredditDataUrl(String subredditName) {
return API_BASE_URI + "/r/" + subredditName + "/about.json";
}
static String getQuerySubredditPostUrl(String subredditName) {
return API_BASE_URI + "/r/" + subredditName + ".json";
}
}

29
app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java
View File

@ -2,13 +2,13 @@ package ml.docilealligator.infinityforreddit;
import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
@ -27,6 +27,8 @@ public class ViewSubredditDetailActivity extends AppCompatActivity {
static final String EXTRA_SUBREDDIT_NAME = "ESN";
static final String EXTRA_SUBREDDIT_ID = "ESI";
private Fragment mFragment;
private SubredditViewModel mSubredditViewModel;
@Override
@ -120,9 +122,20 @@ public class ViewSubredditDetailActivity extends AppCompatActivity {
}
});
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
Fragment mFragment = new BestPostFragment();
fragmentTransaction.replace(R.id.frame_layout_view_subreddit_detail_activity, mFragment).commit();
if(savedInstanceState == null) {
mFragment = new PostFragment();
Uri uri = Uri.parse(RedditUtils.getQuerySubredditPostUrl(subredditName))
.buildUpon().appendQueryParameter(RedditUtils.RAW_JSON_KEY, RedditUtils.RAW_JSON_VALUE)
.build();
Bundle bundle = new Bundle();
bundle.putString(PostFragment.QUERY_POST_URL_KEY, uri.toString());
bundle.putBoolean(PostFragment.IS_BEST_POST_KEY, false);
mFragment.setArguments(bundle);
getSupportFragmentManager().beginTransaction().replace(R.id.frame_layout_view_subreddit_detail_activity, mFragment).commit();
} else {
mFragment = getSupportFragmentManager().getFragment(savedInstanceState, "outStateFragment");
getSupportFragmentManager().beginTransaction().replace(R.id.frame_layout_view_subreddit_detail_activity, mFragment).commit();
}
}
@Override
@ -135,6 +148,14 @@ public class ViewSubredditDetailActivity extends AppCompatActivity {
return false;
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
if(mFragment != null) {
getSupportFragmentManager().putFragment(outState, "outStateFragment", mFragment);
}
}
private static class InsertSubredditDataAsyncTask extends AsyncTask<Void, Void, Void> {
private final SubredditDao mSubredditDao;

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

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/coordinator_layout_view_subreddit_detail_activity"
android:fitsSystemWindows="true"
tools:context=".ViewSubredditDetailActivity">

16
app/src/main/res/layout/fragment_best_post.xml → app/src/main/res/layout/fragment_post.xml
View File

@ -3,26 +3,28 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/coordinator_layout_best_post_fragment"
tools:context="ml.docilealligator.infinityforreddit.BestPostFragment">
android:id="@+id/coordinator_layout_post_fragment"
tools:context="ml.docilealligator.infinityforreddit.PostFragment">
<ProgressBar
android:id="@+id/progress_bar_best_post_fragment"
android:id="@+id/progress_bar_post_fragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_gravity="center" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view_best_post_fragment"
android:id="@+id/recycler_view_post_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_best_post_fragment"
<!--<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_post_fragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/baseline_add_white_24" />
app:srcCompat="@drawable/baseline_add_white_24" />-->
</android.support.design.widget.CoordinatorLayout>

2
app/src/main/res/layout/item_footer_progress_bar.xml
View File

@ -10,6 +10,7 @@
android:id="@+id/progress_bar_footer_progress_bar_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:layout_gravity="center" />
@ -17,6 +18,7 @@
android:id="@+id/relative_layout_footer_progress_bar_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"

0
app/src/main/res/layout/item_best_post.xml → app/src/main/res/layout/item_post.xml
View File