Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added emoji support to user profile

This commit is contained in:
nuclearfog 2023-03-24 22:14:22 +01:00
parent fa37cd32fd
commit 3a38db5055
No known key found for this signature in database
GPG Key ID: 03488A185C476379
2 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java
View File

@ -21,10 +21,14 @@ import static org.nuclearfog.twidda.ui.activities.UsersActivity.USERS_REQUESTS;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.ImageSpan;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@ -61,6 +65,9 @@ import org.nuclearfog.textviewtool.LinkAndScrollMovement;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
import org.nuclearfog.twidda.backend.async.EmojiLoader;
import org.nuclearfog.twidda.backend.async.EmojiLoader.EmojiParam;
import org.nuclearfog.twidda.backend.async.EmojiLoader.EmojiResult;
import org.nuclearfog.twidda.backend.async.RelationLoader;
import org.nuclearfog.twidda.backend.async.RelationLoader.RelationParam;
import org.nuclearfog.twidda.backend.async.RelationLoader.RelationResult;
@ -71,6 +78,7 @@ import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.backend.utils.PicassoBuilder;
import org.nuclearfog.twidda.backend.utils.StringTools;
import org.nuclearfog.twidda.config.Configuration;
import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.database.impl.DatabaseUser;
import org.nuclearfog.twidda.model.Relation;
@ -81,6 +89,7 @@ import org.nuclearfog.twidda.ui.dialogs.ConfirmDialog.OnConfirmListener;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation;
@ -134,6 +143,7 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
private ActivityResultLauncher<Intent> activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), this);
private AsyncCallback<RelationResult> relationCallback = this::setRelationResult;
private AsyncCallback<UserResult> userCallback = this::setUserResult;
private AsyncCallback<EmojiResult> emojiResultCallback = this::onEmojiResult;
private FragmentAdapter adapter;
private GlobalSettings settings;
@ -141,6 +151,7 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
private ConfirmDialog confirmDialog;
private RelationLoader relationLoader;
private UserLoader userLoader;
private EmojiLoader emojiLoader;
private NestedScrollView root;
private ConstraintLayout header;
@ -191,6 +202,7 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
relationLoader = new RelationLoader(this);
userLoader = new UserLoader(this);
emojiLoader = new EmojiLoader(this);
picasso = PicassoBuilder.get(this);
settings = GlobalSettings.getInstance(this);
if (!settings.toolbarOverlapEnabled()) {
@ -796,5 +808,31 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
profileImage.setImageResource(0);
}
}
if (user.getEmojis().length > 0 && emojiLoader.isIdle()) {
EmojiParam param = new EmojiParam(user.getEmojis(), username.getLineHeight());
emojiLoader.execute(param, emojiResultCallback);
}
}
/**
* set emojis, replace emoji tags with images
*/
private void onEmojiResult(EmojiLoader.EmojiResult result) {
if (settings.getLogin().getConfiguration() == Configuration.MASTODON && result.images != null) {
TextView[] textViews = {username, user_bio};
for (TextView textView: textViews) {
if (textView.length() > 0) {
SpannableStringBuilder builder = new SpannableStringBuilder(textView.getText());
for (Map.Entry<String, Bitmap> item : result.images.entrySet()) {
int idx = TextUtils.indexOf(builder, ':' + item.getKey() + ':');
if (idx >= 0) {
ImageSpan imgSpan = new ImageSpan(getApplicationContext(), item.getValue());
builder.setSpan(imgSpan, idx, idx + item.getKey().length() + 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
}
textView.setText(builder);
}
}
}
}
}

33
app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
View File

@ -22,7 +22,6 @@ import android.graphics.BlurMaskFilter;
import android.net.Uri;
import android.os.Bundle;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
@ -80,6 +79,7 @@ import org.nuclearfog.twidda.config.GlobalSettings;
import org.nuclearfog.twidda.database.impl.DatabaseNotification;
import org.nuclearfog.twidda.database.impl.DatabaseStatus;
import org.nuclearfog.twidda.model.Card;
import org.nuclearfog.twidda.model.Emoji;
import org.nuclearfog.twidda.model.Location;
import org.nuclearfog.twidda.model.Media;
import org.nuclearfog.twidda.model.Notification;
@ -929,8 +929,14 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
cardList.setVisibility(View.GONE);
statusText.setMaxLines(10);
}
if (status.getEmojis().length > 0 && emojiAsync.isIdle()) {
EmojiParam param = new EmojiParam(status.getEmojis(), statusText.getLineHeight());
if ((status.getEmojis().length > 0 || status.getAuthor().getEmojis().length > 0) && emojiAsync.isIdle()) {
int index = 0;
Emoji[] emojis = new Emoji[status.getEmojis().length + status.getAuthor().getEmojis().length];
for (Emoji emoji : status.getEmojis())
emojis[index++] = emoji;
for (Emoji emoji : status.getAuthor().getEmojis())
emojis[index++] = emoji;
EmojiParam param = new EmojiParam(emojis, statusText.getLineHeight());
emojiAsync.execute(param, emojiResultCallback);
}
}
@ -1145,17 +1151,20 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
* set emojis, replace emoji tags with images
*/
private void onEmojiResult(EmojiResult result) {
if (settings.getLogin().getConfiguration() == Configuration.MASTODON) {
if (result.images != null && statusText.getText() instanceof SpannableString) {
SpannableStringBuilder builder = new SpannableStringBuilder(statusText.getText());
for (Map.Entry<String, Bitmap> item : result.images.entrySet()) {
int idx = TextUtils.indexOf(builder, ':' + item.getKey() + ':');
if (idx >= 0) {
ImageSpan imgSpan = new ImageSpan(getApplicationContext(), item.getValue());
builder.setSpan(imgSpan, idx, idx + item.getKey().length() + 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (settings.getLogin().getConfiguration() == Configuration.MASTODON && result.images != null) {
TextView[] textViews = {statusText, userName};
for (TextView textView : textViews) {
if (textView.length() > 0) {
SpannableStringBuilder builder = new SpannableStringBuilder(textView.getText());
for (Map.Entry<String, Bitmap> item : result.images.entrySet()) {
int idx = TextUtils.indexOf(builder, ':' + item.getKey() + ':');
if (idx >= 0) {
ImageSpan imgSpan = new ImageSpan(getApplicationContext(), item.getValue());
builder.setSpan(imgSpan, idx, idx + item.getKey().length() + 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
}
textView.setText(builder);
}
statusText.setText(builder);
}
}
}