Commit 2ff3e103 authored by Thomas's avatar Thomas
Browse files

Fix custom emojis

parent 02a066a2

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ dependencies { 
    implementation("com.vanniktech:android-image-cropper:4.3.3")

    annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"

    implementation 'jp.wasabeef:glide-transformations:4.3.0'

    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.23.0'

    implementation 'com.github.penfeizhou.android.animation:glide-plugin:3.0.5'

    implementation 'androidx.media3:media3-exoplayer-hls:1.2.1'

    implementation "androidx.media3:media3-exoplayer:1.2.1"

    implementation "androidx.media3:media3-exoplayer-dash:1.2.1"

app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java

+1 −7
Original line number Diff line number Diff line
@@ -540,13 +540,7 @@ public class ProfileActivity extends BaseActivity { 
        });

        binding.accountNote.setText(

                account.getSpanNote(ProfileActivity.this,

                        new WeakReference<>(binding.accountNote), () -> {

                            //TODO: replace this hack

                            binding.accountNote.setText(

                                    account.getSpanNote(ProfileActivity.this,

                                            new WeakReference<>(binding.accountNote)), TextView.BufferType.SPANNABLE);



                        }),

                        new WeakReference<>(binding.accountNote)),

                TextView.BufferType.SPANNABLE);



        binding.accountNote.setMovementMethod(LinkMovementMethod.getInstance());

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java

+4 −6
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class Account implements Serializable { 
        if (display_name == null || display_name.isEmpty()) {

            display_name = username;

        }

        return SpannableHelper.convert(context, display_name, null, this, null, viewWeakReference, null, true, false);

        return SpannableHelper.convert(context, display_name, null, this, null, viewWeakReference,  true, false);

    }



    public synchronized Spannable getSpanDisplayNameEmoji(Activity activity, WeakReference<View> viewWeakReference) {
@@ -106,16 +106,14 @@ public class Account implements Serializable { 
    }



    public synchronized Spannable getSpanDisplayNameTitle(Context context, WeakReference<View> viewWeakReference, String title) {

        return SpannableHelper.convert(context, title, null, this, null, viewWeakReference, null, true, false);

        return SpannableHelper.convert(context, title, null, this, null, viewWeakReference,  true, false);

    }



    public synchronized Spannable getSpanNote(Context context, WeakReference<View> viewWeakReference) {

        return SpannableHelper.convert(context, note, null, this, null, viewWeakReference, null, true, false);

    }

    public synchronized Spannable getSpanNote(Context context, WeakReference<View> viewWeakReference, Status.Callback callback) {

        return SpannableHelper.convert(context, note, null, this, null, viewWeakReference, callback, true, false);

        return SpannableHelper.convert(context, note, null, this, null, viewWeakReference,  true, false);

    }





    @Override

    public boolean equals(@Nullable Object obj) {

        boolean same = false;

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Announcement.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class Announcement { 




    public synchronized Spannable getSpanContent(Context context, WeakReference<View> viewWeakReference) {

        return SpannableHelper.convert(context, content, null, null, this, viewWeakReference, null, true, false);

        return SpannableHelper.convert(context, content, null, null, this, viewWeakReference,  true, false);

    }



}

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Field.java

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class Field implements Serializable { 
        if (verified_at != null && value != null) {

            value_span = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.verified_text));

        }

        Spannable spannable = SpannableHelper.convert(context, value, null, account, null, viewWeakReference, null, true, false);

        Spannable spannable = SpannableHelper.convert(context, value, null, account, null, viewWeakReference,  true, false);

        if (value_span != null && spannable != null) {

            spannable.setSpan(value_span, 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);

        }
@@ -57,7 +57,7 @@ public class Field implements Serializable { 


    public synchronized Spannable getLabelSpan(Context context, Account account, WeakReference<View> viewWeakReference) {



        Spannable spannable = SpannableHelper.convert(context, name, null, account, null, viewWeakReference, null, true, false);

        Spannable spannable = SpannableHelper.convert(context, name, null, account, null, viewWeakReference,  true, false);

        if (name_span != null && spannable != null) {

            spannable.setSpan(name_span, 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);

        }