Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Improves retrieve replies number

This commit is contained in:
stom79 2017-10-30 16:08:42 +01:00
parent 705643dcce
commit 6763d025f4
4 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRepliesAsyncTask.java
View File

@ -35,10 +35,12 @@ public class RetrieveRepliesAsyncTask extends AsyncTask<Void, Void, Void> {
private OnRetrieveRepliesInterface listener;
private fr.gouv.etalab.mastodon.client.Entities.Status status;
private WeakReference<Context> contextReference;
private int position;
public RetrieveRepliesAsyncTask(Context context, fr.gouv.etalab.mastodon.client.Entities.Status status, OnRetrieveRepliesInterface onRetrieveRepliesInterface){
public RetrieveRepliesAsyncTask(Context context, int position, fr.gouv.etalab.mastodon.client.Entities.Status status, OnRetrieveRepliesInterface onRetrieveRepliesInterface){
this.contextReference = new WeakReference<>(context);
this.status = status;
this.position = position;
this.listener = onRetrieveRepliesInterface;
}
@ -57,7 +59,7 @@ public class RetrieveRepliesAsyncTask extends AsyncTask<Void, Void, Void> {
@Override
protected void onPostExecute(Void result) {
listener.onRetrieveReplies(apiResponse);
listener.onRetrieveReplies(position, apiResponse);
}
}

61
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -170,23 +170,14 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
@Override
public void onRetrieveReplies(APIResponse apiResponse) {
public void onRetrieveReplies(int position, APIResponse apiResponse) {
if( apiResponse.getError() != null || apiResponse.getStatuses() == null || apiResponse.getStatuses().size() == 0){
return;
}
List<Status> modifiedStatus = apiResponse.getStatuses();
int position = 0;
if( modifiedStatus != null && modifiedStatus.size() == 1){
for(Status status: statuses){
if( status.getId().equals(modifiedStatus.get(0).getId())) {
if (modifiedStatus.get(0).getReplies() != null)
status.setReplies(modifiedStatus.get(0).getReplies());
else
status.setReplies(new ArrayList<Status>());
statusListAdapter.notifyItemChanged(position);
}
position++;
}
if( statuses !=null && statuses.size() > position && modifiedStatus != null && modifiedStatus.size() == 1){
statuses.get(position).setReplies(modifiedStatus.get(0).getReplies());
statusListAdapter.notifyItemChanged(position, modifiedStatus.get(0).getReplies());
}
}
@ -316,6 +307,48 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
return new ViewHolderEmpty(layoutInflater.inflate(R.layout.drawer_empty, parent, false));
}
/*
@Override
public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, int position, List<Object> payload) {
if( viewHolder.getItemViewType() == DISPLAYED_STATUS) {
if (!payload.isEmpty()) {
if (payload.get(0) instanceof Integer) {
final ViewHolder holder = (ViewHolder) viewHolder;
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
final Status status = statuses.get(position);
boolean showPreviewPP = sharedpreferences.getBoolean(Helper.SET_PREVIEW_REPLIES_PP, false);
if (showPreviewPP) {
ArrayList<String> addedPictures = new ArrayList<>();
holder.status_replies_profile_pictures.removeAllViews();
int i = 0;
for (Status replies : status.getReplies()) {
if (i > 10)
break;
if (!addedPictures.contains(replies.getAccount().getAcct())) {
DisplayImageOptions options = new DisplayImageOptions.Builder().displayer(new RoundedBitmapDisplayer(10)).cacheInMemory(false)
.cacheOnDisk(true).resetViewBeforeLoading(true).build();
ImageView imageView = new ImageView(context);
imageView.setMaxHeight((int) Helper.convertDpToPixel(30, context));
imageView.setMaxWidth((int) Helper.convertDpToPixel(30, context));
imageLoader.displayImage(replies.getAccount().getAvatar(), imageView, options);
LinearLayout.LayoutParams imParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
imParams.setMargins(10, 5, 10, 5);
imParams.height = (int) Helper.convertDpToPixel(30, context);
imParams.width = (int) Helper.convertDpToPixel(30, context);
holder.status_replies_profile_pictures.addView(imageView, imParams);
i++;
addedPictures.add(replies.getAccount().getAcct());
}
}
}
if (status.getReplies() != null && status.getReplies().size() > 0)
holder.status_reply.setText(String.valueOf(status.getReplies().size()));
holder.status_replies.setVisibility(View.VISIBLE);
holder.loader_replies.setVisibility(View.GONE);
}
}
}
}*/
@Override
public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, @SuppressLint("RecyclerView") final int position) {
@ -343,7 +376,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
boolean showPreview = sharedpreferences.getBoolean(Helper.SET_PREVIEW_REPLIES, false);
//Retrieves attached replies to a toot
if (showPreview && status.getReplies() == null) {
new RetrieveRepliesAsyncTask(context, status, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRepliesAsyncTask(context, position, status, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}

2
app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRepliesInterface.java
View File

@ -21,5 +21,5 @@ import fr.gouv.etalab.mastodon.client.APIResponse;
* Interface when replies have been retrieved
*/
public interface OnRetrieveRepliesInterface {
void onRetrieveReplies(APIResponse apiResponse);
void onRetrieveReplies(int position, APIResponse apiResponse);
}

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

@ -358,6 +358,8 @@
<ProgressBar
android:id="@+id/loader_replies"
android:visibility="gone"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:indeterminate="true"