From 99644a7e64fb581285c3dca93b7bb227b0ef9e4c Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 25 Nov 2022 17:30:04 +0100
Subject: [PATCH] Some improvements

---
 .../fedilab/android/activities/ProfileActivity.java |  2 +-
 .../app/fedilab/android/helper/CustomEmoji.java     |  7 +++----
 .../app/fedilab/android/ui/drawer/FieldAdapter.java | 13 ++++++++++---
 .../ui/fragment/admin/FragmentAdminDomain.java      |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
index 24f350b6..38be0df2 100644
--- a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
@@ -364,7 +364,7 @@ public class ProfileActivity extends BaseActivity {
         //Fields for profile
         List<Field> fields = account.fields;
         if (fields != null && fields.size() > 0) {
-            FieldAdapter fieldAdapter = new FieldAdapter(fields);
+            FieldAdapter fieldAdapter = new FieldAdapter(fields, account);
             binding.fieldsContainer.setAdapter(fieldAdapter);
             binding.fieldsContainer.setLayoutManager(new LinearLayoutManager(ProfileActivity.this));
         }
diff --git a/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java b/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
index 51ce2fc8..10835111 100644
--- a/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
+++ b/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
@@ -52,12 +52,11 @@ public class CustomEmoji extends ReplacementSpan {
         if (imageDrawable != null) {
             canvas.save();
             int emojiSize = (int) (paint.getTextSize() * scale);
-            Drawable drawable = imageDrawable;
-            drawable.setBounds(0, 0, emojiSize, emojiSize);
-            int transY = bottom - drawable.getBounds().bottom;
+            imageDrawable.setBounds(0, 0, emojiSize, emojiSize);
+            int transY = bottom - imageDrawable.getBounds().bottom;
             transY -= paint.getFontMetrics().descent / 2;
             canvas.translate(x, (float) transY);
-            drawable.draw(canvas);
+            imageDrawable.draw(canvas);
             canvas.restore();
         }
     }
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/FieldAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/FieldAdapter.java
index b4b39fc1..3513525e 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/FieldAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/FieldAdapter.java
@@ -38,10 +38,11 @@ public class FieldAdapter extends RecyclerView.Adapter<FieldAdapter.FieldViewHol
 
     private final List<Field> fields;
     private Context context;
-    private Account account;
+    private final Account account;
 
-    public FieldAdapter(List<Field> fields) {
+    public FieldAdapter(List<Field> fields, Account account) {
         this.fields = fields;
+        this.account = account;
     }
 
     @Override
@@ -68,12 +69,18 @@ public class FieldAdapter extends RecyclerView.Adapter<FieldAdapter.FieldViewHol
         if (field.verified_at != null) {
             holder.binding.value.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(context, R.drawable.ic_baseline_verified_24), null);
         }
+
         holder.binding.value.setText(
                 field.getValueSpan(context, account,
                         new WeakReference<>(holder.binding.value)),
                 TextView.BufferType.SPANNABLE);
         holder.binding.value.setMovementMethod(LinkMovementMethod.getInstance());
-        holder.binding.label.setText(field.name);
+
+        holder.binding.label.setText(
+                field.getValueSpan(context, account,
+                        new WeakReference<>(holder.binding.label)),
+                TextView.BufferType.SPANNABLE);
+        holder.binding.label.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
 
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminDomain.java b/app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminDomain.java
index 5204eacb..6123be6a 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminDomain.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminDomain.java
@@ -122,6 +122,7 @@ public class FragmentAdminDomain extends Fragment {
 
         adminVM = new ViewModelProvider(FragmentAdminDomain.this).get(viewModelKey, AdminVM.class);
 
+        binding.noActionText.setText(R.string.no_blocked_domains);
         binding.loader.setVisibility(View.VISIBLE);
         binding.recyclerView.setVisibility(View.GONE);
         flagLoading = false;