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

Fix issue with indexation

This commit is contained in:
Thomas 2020-07-15 15:19:19 +02:00
parent f22c5b98d1
commit 63cc25b1cc
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/common/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -28,6 +28,7 @@ import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
import app.fedilab.android.client.API; import app.fedilab.android.client.API;
import app.fedilab.android.client.Entities.Reaction; import app.fedilab.android.client.Entities.Reaction;
import app.fedilab.android.client.Entities.StatusDrawerParams; import app.fedilab.android.client.Entities.StatusDrawerParams;
import app.fedilab.android.client.Entities.Status;
import static android.content.Context.INPUT_METHOD_SERVICE; import static android.content.Context.INPUT_METHOD_SERVICE;
@ -36,7 +37,7 @@ public class StatusListAdapter extends BaseStatusListAdapter {
super(statusDrawerParams); super(statusDrawerParams);
} }
public void statusAddReactionClick(){ public void statusAddReactionClick(Status status){
EmojiManager.install(new EmojiOneProvider()); EmojiManager.install(new EmojiOneProvider());
final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.status_add_reaction).setOnEmojiPopupDismissListener(() -> { final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.status_add_reaction).setOnEmojiPopupDismissListener(() -> {
InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
@ -76,7 +77,7 @@ public class StatusListAdapter extends BaseStatusListAdapter {
emojiPopup.toggle(); emojiPopup.toggle();
} }
protected void notificationCharts(){ protected void notificationCharts(Status status){
Intent intent = new Intent(context, OwnerNotificationChartsActivity.class); Intent intent = new Intent(context, OwnerNotificationChartsActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString("status_id", status.getReblog() != null ? status.getReblog().getId() : status.getId()); b.putString("status_id", status.getReblog() != null ? status.getReblog().getId() : status.getId());

5
app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -17,6 +17,7 @@ package app.fedilab.android.drawers;
import android.app.Activity; import android.app.Activity;
import android.view.WindowManager; import android.view.WindowManager;
import app.fedilab.android.client.Entities.Status;
import app.fedilab.android.client.Entities.StatusDrawerParams; import app.fedilab.android.client.Entities.StatusDrawerParams;
public class StatusListAdapter extends BaseStatusListAdapter { public class StatusListAdapter extends BaseStatusListAdapter {
@ -24,11 +25,11 @@ public class StatusListAdapter extends BaseStatusListAdapter {
super(statusDrawerParams); super(statusDrawerParams);
} }
protected void statusAddReactionClick() { protected void statusAddReactionClick(Status status) {
((Activity) context).getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); ((Activity) context).getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
} }
protected void notificationCharts() { protected void notificationCharts(Status status) {
} }
} }

15
app/src/main/java/app/fedilab/android/drawers/BaseStatusListAdapter.java
View File

@ -203,7 +203,6 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
public static boolean fetch_all_more = false; public static boolean fetch_all_more = false;
private final Object lock = new Object(); private final Object lock = new Object();
protected Context context; protected Context context;
protected Status status;
protected ViewHolder holder; protected ViewHolder holder;
protected RetrieveFeedsAsyncTask.Type type; protected RetrieveFeedsAsyncTask.Type type;
protected int style; protected int style;
@ -576,11 +575,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
return COMPACT_STATUS; return COMPACT_STATUS;
} else { } else {
if (instanceType == null || instanceType.compareTo("NITTER") != 0) { if (instanceType == null || instanceType.compareTo("NITTER") != 0) {
if(BuildConfig.lite) {
return COMPACT_STATUS;
}else{
return statuses.get(position).getViewType(); return statuses.get(position).getViewType();
}
} else { } else {
return COMPACT_STATUS; return COMPACT_STATUS;
} }
@ -618,7 +613,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
holder = (ViewHolder) viewHolder; holder = (ViewHolder) viewHolder;
holder.startUpdateTimer(); holder.startUpdateTimer();
status = statuses.get(i); final Status status = statuses.get(i);
if (status == null) if (status == null)
@ -1017,7 +1012,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
holder.reactions_view.setLayoutManager(layoutManager); holder.reactions_view.setLayoutManager(layoutManager);
holder.status_add_reaction.setOnClickListener(v -> statusAddReactionClick()); holder.status_add_reaction.setOnClickListener(v -> statusAddReactionClick(status));
} }
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header)); holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
@ -2752,7 +2747,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
} }
return true; return true;
case R.id.action_stats: case R.id.action_stats:
notificationCharts(); notificationCharts(status);
return true; return true;
case R.id.action_timed_mute: case R.id.action_timed_mute:
timedMuteAction(status); timedMuteAction(status);
@ -3022,9 +3017,9 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
} }
protected abstract void statusAddReactionClick(); protected abstract void statusAddReactionClick(Status status);
protected abstract void notificationCharts(); protected abstract void notificationCharts(Status status);
private void loadAttachments(final Status status, final ViewHolder holder, boolean blur) { private void loadAttachments(final Status status, final ViewHolder holder, boolean blur) {
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);