Commit dd924cba authored by Thomas's avatar Thomas
Browse files

some tries

parent 96680343

app/src/main/java/app/fedilab/android/activities/AdminAccountActivity.java

+7 −11
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.content.SharedPreferences; 
import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.text.SpannableString;

import android.text.Spanned;

import android.text.method.LinkMovementMethod;
@@ -46,6 +44,7 @@ import com.bumptech.glide.Glide; 
import com.bumptech.glide.request.target.CustomTarget;

import com.bumptech.glide.request.transition.Transition;



import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.List;

import java.util.Locale;
@@ -105,14 +104,7 @@ public class AdminAccountActivity extends BaseActivity { 
        }

        binding.toolbar.setPopupTheme(Helper.popupStyle());

        if (account != null) {

            new Thread(() -> {

                account = SpannableHelper.convertAccount(AdminAccountActivity.this, account);

                Handler mainHandler = new Handler(Looper.getMainLooper());

                Runnable myRunnable = () -> initializeView(account);

                mainHandler.post(myRunnable);



            }).start();



            initializeView(account);

        } else {

            Toasty.error(AdminAccountActivity.this, getString(R.string.toast_error_loading_account), Toast.LENGTH_LONG).show();

            finish();
@@ -314,7 +306,11 @@ public class AdminAccountActivity extends BaseActivity { 
        }





        binding.accountDn.setText(account.span_display_name != null ? account.span_display_name : account.display_name, TextView.BufferType.SPANNABLE);

        binding.accountDn.setText(

                account.getSpanDisplayName(AdminAccountActivity.this,

                        new WeakReference<>(binding.accountDn),

                        id -> binding.accountDn.invalidate()),

                TextView.BufferType.SPANNABLE);

        binding.accountUn.setText(String.format("@%s", account.acct));

        binding.accountUn.setOnLongClickListener(v -> {

            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);

app/src/main/java/app/fedilab/android/activities/AdminReportActivity.java

+7 −12
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.content.SharedPreferences; 
import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.text.SpannableString;

import android.text.Spanned;

import android.text.method.LinkMovementMethod;
@@ -46,6 +44,7 @@ import com.bumptech.glide.Glide; 
import com.bumptech.glide.request.target.CustomTarget;

import com.bumptech.glide.request.transition.Transition;



import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.List;

import java.util.Locale;
@@ -105,14 +104,7 @@ public class AdminReportActivity extends BaseActivity { 
        }

        binding.toolbar.setPopupTheme(Helper.popupStyle());

        if (account != null) {

            new Thread(() -> {

                account = SpannableHelper.convertAccount(AdminReportActivity.this, account);

                Handler mainHandler = new Handler(Looper.getMainLooper());

                Runnable myRunnable = () -> initializeView(account);

                mainHandler.post(myRunnable);



            }).start();



            initializeView(account);

        } else {

            Toasty.error(AdminReportActivity.this, getString(R.string.toast_error_loading_account), Toast.LENGTH_LONG).show();

            finish();
@@ -331,8 +323,11 @@ public class AdminReportActivity extends BaseActivity { 
            binding.accountMoved.setMovementMethod(LinkMovementMethod.getInstance());

        }





        binding.accountDn.setText(account.span_display_name != null ? account.span_display_name : account.display_name, TextView.BufferType.SPANNABLE);

        binding.accountDn.setText(

                account.getSpanDisplayName(AdminReportActivity.this,

                        new WeakReference<>(binding.accountDn),

                        id -> binding.accountDn.invalidate()),

                TextView.BufferType.SPANNABLE);

        binding.accountUn.setText(String.format("@%s", account.acct));

        binding.accountUn.setOnLongClickListener(v -> {

            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);

app/src/main/java/app/fedilab/android/activities/ComposeActivity.java

+0 −5
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ import app.fedilab.android.helper.DividerDecorationSimple; 
import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.MediaHelper;

import app.fedilab.android.helper.SpannableHelper;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.interfaces.OnDownloadInterface;

import app.fedilab.android.jobs.ScheduleThreadWorker;
@@ -268,9 +267,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                        }

                    });

        } else if (statusDraft != null) {//Restore a draft with all messages

            if (statusDraft.statusReplyList != null) {

                statusDraft.statusReplyList = SpannableHelper.convertStatus(getApplication().getApplicationContext(), statusDraft.statusReplyList);

            }

            if (statusDraft.statusReplyList != null) {

                statusList.addAll(statusDraft.statusReplyList);

                binding.recyclerView.addItemDecoration(new DividerDecorationSimple(ComposeActivity.this, statusList));
@@ -285,7 +281,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
            binding.recyclerView.scrollToPosition(composeAdapter.getItemCount() - 1);



        } else if (statusReply != null) {

            statusReply = SpannableHelper.convertStatus(getApplication().getApplicationContext(), statusReply);

            statusList.add(statusReply);

            int statusCount = statusList.size();

            statusDraftList.get(0).in_reply_to_id = statusReply.id;

app/src/main/java/app/fedilab/android/activities/ContextActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import app.fedilab.android.databinding.ActivityConversationBinding; 
import app.fedilab.android.exception.DBException;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.SpannableHelper;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonContext;

import app.fedilab.android.viewmodel.mastodon.StatusesVM;
@@ -88,7 +87,6 @@ public class ContextActivity extends BaseActivity { 
        }

        MastodonHelper.loadPPMastodon(binding.profilePicture, currentAccount.mastodon_account);

        Bundle bundle = new Bundle();

        focusedStatus = SpannableHelper.convertStatus(getApplication().getApplicationContext(), focusedStatus);

        bundle.putSerializable(Helper.ARG_STATUS, focusedStatus);

        currentFragment = Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_content_main, new FragmentMastodonContext(), bundle, null, null);

        StatusesVM timelinesVM = new ViewModelProvider(ContextActivity.this).get(StatusesVM.class);

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

+13 −30
Original line number Diff line number Diff line
@@ -27,12 +27,7 @@ import android.content.SharedPreferences; 
import android.content.res.ColorStateList;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.text.Html;

import android.text.Spannable;

import android.text.SpannableString;

import android.text.Spanned;

import android.text.method.LinkMovementMethod;
@@ -65,6 +60,7 @@ import com.bumptech.glide.request.target.CustomTarget; 
import com.bumptech.glide.request.transition.Transition;

import com.google.android.material.tabs.TabLayout;



import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;
@@ -90,7 +86,6 @@ import app.fedilab.android.client.entities.app.WellKnownNodeinfo; 
import app.fedilab.android.databinding.ActivityProfileBinding;

import app.fedilab.android.exception.DBException;

import app.fedilab.android.helper.CrossActionHelper;

import app.fedilab.android.helper.CustomEmoji;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.SpannableHelper;
@@ -165,14 +160,7 @@ public class ProfileActivity extends BaseActivity { 
        binding.toolbar.setPopupTheme(Helper.popupStyle());

        accountsVM = new ViewModelProvider(ProfileActivity.this).get(AccountsVM.class);

        if (account != null) {

            new Thread(() -> {

                account = SpannableHelper.convertAccount(ProfileActivity.this, account);

                Handler mainHandler = new Handler(Looper.getMainLooper());

                Runnable myRunnable = () -> initializeView(account);

                mainHandler.post(myRunnable);



            }).start();



            initializeView(account);

        } else if (account_id != null) {

            accountsVM.getAccount(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account_id).observe(ProfileActivity.this, fetchedAccount -> {

                account = fetchedAccount;
@@ -359,15 +347,12 @@ public class ProfileActivity extends BaseActivity { 
            binding.fieldsContainer.setAdapter(fieldAdapter);

            binding.fieldsContainer.setLayoutManager(new LinearLayoutManager(ProfileActivity.this));

        }

        if (account.span_display_name == null && account.display_name == null) {

            binding.accountDn.setText(account.username);

        } else {

            Spannable textAccount = account.span_display_name != null ? account.span_display_name : new SpannableString(account.display_name);

            CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textAccount, binding.accountDn, null, id -> {

                binding.accountDn.setText(textAccount, TextView.BufferType.SPANNABLE);

            });

            binding.accountDn.setText(textAccount, TextView.BufferType.SPANNABLE);

        }



        binding.accountDn.setText(

                account.getSpanDisplayName(ProfileActivity.this,

                        new WeakReference<>(binding.accountDn),

                        id -> binding.accountDn.invalidate()),

                TextView.BufferType.SPANNABLE);



        binding.accountUn.setText(String.format("@%s", account.acct));

        binding.accountUn.setOnLongClickListener(v -> {
@@ -381,13 +366,11 @@ public class ProfileActivity extends BaseActivity { 
            clipboard.setPrimaryClip(clip);

            return false;

        });

        Spannable textNote;

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)

            textNote = account.span_note != null ? account.span_note : new SpannableString(Html.fromHtml(account.note, Html.FROM_HTML_MODE_COMPACT));

        else

            textNote = account.span_note != null ? account.span_note : new SpannableString(Html.fromHtml(account.note));

        CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textNote, binding.accountNote, null, id -> binding.accountNote.setText(textNote, TextView.BufferType.SPANNABLE));

        binding.accountNote.setText(textNote, TextView.BufferType.SPANNABLE);

        binding.accountNote.setText(

                account.getSpanNote(ProfileActivity.this,

                        new WeakReference<>(binding.accountNote),

                        id -> binding.accountNote.invalidate()),

                TextView.BufferType.SPANNABLE);

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



        MastodonHelper.loadPPMastodon(binding.accountPp, account);