From bb2b66ce6af70d9288becb608ae103ce22304630 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Thu, 12 Jan 2023 17:52:34 +0100
Subject: [PATCH] Release 3.14.2

---
 app/build.gradle                                    |  4 ++--
 app/src/main/assets/release_notes/notes.json        |  5 +++++
 .../java/app/fedilab/android/helper/Helper.java     |  2 +-
 .../fedilab/android/ui/drawer/StatusAdapter.java    |  4 +++-
 app/src/main/res/layout/popup_release_notes.xml     | 13 ++++++-------
 .../fastlane/metadata/android/en/changelogs/464.txt |  1 +
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e39b62ae..eaabe38d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 33
-        versionCode 463
-        versionName "3.14.1"
+        versionCode 464
+        versionName "3.14.2"
         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 53210353..c4bd320a 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.14.2",
+    "code": "464",
+    "note": "Added:\n- Display familiar followers on profiles\n- Display and filter Instance directory\n\nChanged:\n- Bot and reply icon indicators more visible\n- Single media are hidden with link previews\n\nFixed:\n- Fix a crash with Art timelines\n- Friendica: media cannot be downloaded/shared\n- Fix a crash with pinned timelines"
+  },
   {
     "version": "3.14.1",
     "code": "463",
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 23fd97a3..e443b786 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1811,7 +1811,7 @@ public class Helper {
                     binding.aboutSupport.setVisibility(View.GONE);
                     binding.aboutSupportPaypal.setVisibility(View.GONE);
                 }
-                binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
+                binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
                 binding.aboutSupport.setOnClickListener(v -> {
                     Intent intentLiberapay = new Intent(Intent.ACTION_VIEW);
                     intentLiberapay.setData(Uri.parse("https://liberapay.com/tom79"));
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
index f1ed7df8..ca686c88 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
@@ -1287,7 +1287,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         }
         LayoutInflater inflater = ((Activity) context).getLayoutInflater();
         //--- MEDIA ATTACHMENT ---
-        if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) {
+        boolean cardDisplayed = (statusToDeal.card != null && (display_card || statusToDeal.isFocused) && statusToDeal.quote_id == null);
+        if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0 && (!cardDisplayed || statusToDeal.media_attachments.size() > 1)) {
+
             holder.binding.attachmentsList.removeAllViews();
             holder.binding.mediaContainer.removeAllViews();
             if ((loadMediaType.equals("ASK") || (loadMediaType.equals("WIFI") && !TimelineHelper.isOnWIFI(context))) && !statusToDeal.canLoadMedia) {
diff --git a/app/src/main/res/layout/popup_release_notes.xml b/app/src/main/res/layout/popup_release_notes.xml
index 1d251813..b6ca774f 100644
--- a/app/src/main/res/layout/popup_release_notes.xml
+++ b/app/src/main/res/layout/popup_release_notes.xml
@@ -72,20 +72,19 @@
         </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-        <androidx.appcompat.widget.AppCompatImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/account_follow"
-            style="@style/Widget.AppCompat.Button.Colored"
+            style="@style/Widget.Material3.Button.Icon"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_margin="10dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="6dp"
             android:contentDescription="@string/make_an_action"
             android:scaleType="fitCenter"
             android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@id/avatar_container"
-            app:layout_constraintTop_toBottomOf="@id/banner_container"
-            tools:src="@drawable/ic_baseline_person_add_24"
+            tools:icon="@drawable/ic_baseline_person_add_24"
             tools:visibility="visible" />
-
     </androidx.appcompat.widget.LinearLayoutCompat>
 
     <com.google.android.material.button.MaterialButton
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/464.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/464.txt
index 38199488..b35d2e68 100644
--- a/src/fdroid/fastlane/metadata/android/en/changelogs/464.txt
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/464.txt
@@ -4,6 +4,7 @@ Added:
 
 Changed:
 - Bot and reply icon indicators more visible
+- Single media are hidden with link previews
 
 Fixed:
 - Fix a crash with Art timelines