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

Some fixes with emojis

This commit is contained in:
Thomas 2020-06-17 13:57:49 +02:00
parent f4de89f2fa
commit 049faa0102
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
View File

@ -17,7 +17,6 @@ package app.fedilab.android.asynctasks;
import android.content.Context; import android.content.Context;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.util.Log;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
@ -26,17 +25,14 @@ import java.util.List;
import app.fedilab.android.activities.MainActivity; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.API; import app.fedilab.android.client.API;
import app.fedilab.android.client.APIResponse; import app.fedilab.android.client.APIResponse;
import app.fedilab.android.client.Entities.Account;
import app.fedilab.android.client.Entities.ManageTimelines; import app.fedilab.android.client.Entities.ManageTimelines;
import app.fedilab.android.client.Entities.Peertube; import app.fedilab.android.client.Entities.Peertube;
import app.fedilab.android.client.Entities.RemoteInstance; import app.fedilab.android.client.Entities.RemoteInstance;
import app.fedilab.android.client.Entities.Results; import app.fedilab.android.client.Entities.Results;
import app.fedilab.android.client.Entities.RetrieveFeedsParam; import app.fedilab.android.client.Entities.RetrieveFeedsParam;
import app.fedilab.android.client.Entities.Status;
import app.fedilab.android.client.GNUAPI; import app.fedilab.android.client.GNUAPI;
import app.fedilab.android.client.PeertubeAPI; import app.fedilab.android.client.PeertubeAPI;
import app.fedilab.android.helper.FilterToots; import app.fedilab.android.helper.FilterToots;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.interfaces.OnRetrieveFeedsInterface; import app.fedilab.android.interfaces.OnRetrieveFeedsInterface;
import app.fedilab.android.sqlite.InstancesDAO; import app.fedilab.android.sqlite.InstancesDAO;
import app.fedilab.android.sqlite.PeertubeFavoritesDAO; import app.fedilab.android.sqlite.PeertubeFavoritesDAO;
@ -421,10 +417,6 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
peertubeAPI = new PeertubeAPI(this.contextReference.get()); peertubeAPI = new PeertubeAPI(this.contextReference.get());
apiResponse = peertubeAPI.getLocalTL(max_id); apiResponse = peertubeAPI.getLocalTL(max_id);
break; break;
case PMYVIDEOS:
peertubeAPI = new PeertubeAPI(this.contextReference.get());
apiResponse = peertubeAPI.getLocalTL(max_id);
break;
case PF_HOME: case PF_HOME:
api = new API(this.contextReference.get()); api = new API(this.contextReference.get());
apiResponse = api.getHomeTimeline(max_id); apiResponse = api.getHomeTimeline(max_id);
@ -508,7 +500,6 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
POVERVIEW, POVERVIEW,
PTRENDING, PTRENDING,
PRECENTLYADDED, PRECENTLYADDED,
PMYVIDEOS,
PLOCAL, PLOCAL,
CHANNEL, CHANNEL,
MYVIDEOS, MYVIDEOS,

3
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -758,6 +758,7 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
ProgressBar poll_item_value = item.findViewById(R.id.poll_item_value); ProgressBar poll_item_value = item.findViewById(R.id.poll_item_value);
poll_item_percent.setText(String.format("%s %%", (int) value)); poll_item_percent.setText(String.format("%s %%", (int) value));
poll_item_text.setText(pollOption.getTitleSpan(), TextView.BufferType.SPANNABLE); poll_item_text.setText(pollOption.getTitleSpan(), TextView.BufferType.SPANNABLE);
poll_item_text.setText(pollOption.getTitle());
makeEmojis(context, poll_item_text, pollOption.getTitleSpan(), poll.getEmojis()); makeEmojis(context, poll_item_text, pollOption.getTitleSpan(), poll.getEmojis());
poll_item_value.setProgress((int) value); poll_item_value.setProgress((int) value);
holder.rated.addView(item); holder.rated.addView(item);
@ -782,6 +783,7 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
(holder.multiple_choice).removeAllViews(); (holder.multiple_choice).removeAllViews();
for (PollOptions pollOption : poll.getOptionsList()) { for (PollOptions pollOption : poll.getOptionsList()) {
CheckBox cb = new CheckBox(context); CheckBox cb = new CheckBox(context);
cb.setText(pollOption.getTitle());
makeEmojis(context, cb, pollOption.getTitleSpan(), poll.getEmojis()); makeEmojis(context, cb, pollOption.getTitleSpan(), poll.getEmojis());
holder.multiple_choice.addView(cb); holder.multiple_choice.addView(cb);
@ -793,6 +795,7 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
(holder.radio_group).removeAllViews(); (holder.radio_group).removeAllViews();
for (PollOptions pollOption : poll.getOptionsList()) { for (PollOptions pollOption : poll.getOptionsList()) {
RadioButton rb = new RadioButton(context); RadioButton rb = new RadioButton(context);
rb.setText(pollOption.getTitle());
makeEmojis(context, rb, pollOption.getTitleSpan(), poll.getEmojis()); makeEmojis(context, rb, pollOption.getTitleSpan(), poll.getEmojis());
holder.radio_group.addView(rb); holder.radio_group.addView(rb);
} }

5
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -92,6 +92,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.SwitchCompat;
import androidx.browser.customtabs.CustomTabsIntent; import androidx.browser.customtabs.CustomTabsIntent;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
@ -4516,7 +4517,6 @@ public class Helper {
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false); boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
if (emojis != null && emojis.size() > 0) { if (emojis != null && emojis.size() > 0) {
for (final Emojis emoji : emojis) { for (final Emojis emoji : emojis) {
Glide.with(context) Glide.with(context)
@ -4539,13 +4539,14 @@ public class Helper {
contentSpan.setSpan( contentSpan.setSpan(
imageSpan, startPosition, imageSpan, startPosition,
endPosition, Spannable.SPAN_INCLUSIVE_EXCLUSIVE); endPosition, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
Log.v(Helper.TAG,emoji.getShortcode() + " -> " + customTextView.getClass().getName());
if( customTextView instanceof CustomTextView) { if( customTextView instanceof CustomTextView) {
((CustomTextView)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE); ((CustomTextView)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE);
}else if (customTextView instanceof RadioButton){ }else if (customTextView instanceof RadioButton){
((RadioButton)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE); ((RadioButton)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE);
}else if (customTextView instanceof CheckBox){ }else if (customTextView instanceof CheckBox){
((CheckBox)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE); ((CheckBox)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE);
}else if (customTextView instanceof AppCompatTextView){
((AppCompatTextView)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE);
}else if (customTextView instanceof TextView){ }else if (customTextView instanceof TextView){
((TextView)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE); ((TextView)customTextView).setText(contentSpan, TextView.BufferType.SPANNABLE);
} }