From 740ce71ac93ec8de9a7e75af4cc75ee599dd2af2 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 15 Mar 2023 18:56:55 +0100
Subject: Release 3.21.0

---
 app/build.gradle                                                   | 4 ++--
 app/src/main/assets/release_notes/notes.json                       | 5 +++++
 .../app/fedilab/android/mastodon/activities/ProfileActivity.java   | 4 ++--
 src/fdroid/fastlane/metadata/android/en/changelogs/487.txt         | 7 +++++++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 src/fdroid/fastlane/metadata/android/en/changelogs/487.txt

diff --git a/app/build.gradle b/app/build.gradle
index 7a40f5574..7c68d26af 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 33
-        versionCode 486
-        versionName "3.20.3"
+        versionCode 487
+        versionName "3.21.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 7bd7c1082..b2e921f23 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.21.0",
+    "code": "487",
+    "note": "Added:\n- Dedicated Peertube entry in main menu (My app)\n- Select instances (Instances picker with Filters)\n- Comment/Boost/Fav Peertube videos with Mastodon accounts\n\nFixed:\n- Fix a crash when searching and with the user directory"
+  },
   {
     "version": "3.20.3",
     "code": "486",
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java
index ccb980f65..5d12a90fc 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java
@@ -362,7 +362,7 @@ public class ProfileActivity extends BaseActivity {
         if (account.locked) {
             Drawable img = ContextCompat.getDrawable(ProfileActivity.this, R.drawable.ic_baseline_lock_24);
             assert img != null;
-            img.setBounds(0, 0, (int) (16 * scale + 0.5f), (int) (16 * scale + 0.5f));
+            img.setBounds(0, 0, (int) (Helper.convertDpToPixel(14, this) * scale + 0.5f), (int) (Helper.convertDpToPixel(14, this) * scale + 0.5f));
             binding.accountUn.setCompoundDrawables(null, null, img, null);
         } else {
             binding.accountUn.setCompoundDrawables(null, null, null, null);
@@ -399,7 +399,7 @@ public class ProfileActivity extends BaseActivity {
             binding.accountMoved.setVisibility(View.VISIBLE);
             Drawable imgTravel = ContextCompat.getDrawable(ProfileActivity.this, R.drawable.ic_baseline_card_travel_24);
             assert imgTravel != null;
-            imgTravel.setBounds(0, 0, (int) (20 * scale + 0.5f), (int) (20 * scale + 0.5f));
+            imgTravel.setBounds(0, 0, (int) (Helper.convertDpToPixel(20, this) * scale + 0.5f), (int) (Helper.convertDpToPixel(20, this) * scale + 0.5f));
             binding.accountMoved.setCompoundDrawables(imgTravel, null, null, null);
             //Retrieves content and make account names clickable
             SpannableString spannableString = SpannableHelper.moveToText(ProfileActivity.this, account);
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/487.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/487.txt
new file mode 100644
index 000000000..de857e5ad
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/487.txt
@@ -0,0 +1,7 @@
+Added:
+- Dedicated Peertube entry in main menu (My app)
+- Select instances (Instances picker with Filters)
+- Comment/Boost/Fav Peertube videos with Mastodon accounts
+
+Fixed:
+- Fix a crash when searching and with the user directory
\ No newline at end of file
-- 
cgit v1.2.3