From dca3e444d703bc6a41699817d48fccda2bd0e305 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 22 Mar 2023 16:35:36 +0100
Subject: [PATCH] Fix issue #832 - Fetch More with wrong width

---
 .../layout/drawer_status_filtered.xml         | 25 +++++++------------
 .../layout/drawer_status_filtered_hide.xml    | 20 ++++-----------
 .../metadata/android/en/changelogs/488.txt    | 13 ++++++++++
 3 files changed, 27 insertions(+), 31 deletions(-)
 create mode 100644 src/fdroid/fastlane/metadata/android/en/changelogs/488.txt

diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status_filtered.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status_filtered.xml
index ad55cf66c..ee840b61b 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_status_filtered.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_status_filtered.xml
@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:textSize="16sp"
-            app:layout_constraintBottom_toTopOf="@+id/container_fetchmore"
+            app:layout_constraintBottom_toTopOf="@+id/layout_fetch_more"
             app:layout_constraintEnd_toStartOf="@+id/display_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -57,28 +57,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/show_anyway"
-            app:layout_constraintBottom_toTopOf="@+id/container_fetchmore"
+            app:layout_constraintBottom_toTopOf="@+id/layout_fetch_more"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/filtered_text"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:id="@+id/container_fetchmore"
+        <include
+            android:id="@+id/layout_fetch_more"
+            layout="@layout/drawer_fetch_more"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/filtered_text">
-
-            <include
-                android:id="@+id/layout_fetch_more"
-                layout="@layout/drawer_fetch_more"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/filtered_text"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible" />
-        </androidx.appcompat.widget.LinearLayoutCompat>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/filtered_text"
+            tools:visibility="visible" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status_filtered_hide.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status_filtered_hide.xml
index a4b85bdf4..5de56a203 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_status_filtered_hide.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_status_filtered_hide.xml
@@ -33,21 +33,11 @@
         android:layout_height="1px"
         android:background="?colorOutline" />
 
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/container_fetchmore"
+    <include
+        android:id="@+id/layout_fetch_more"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="5dp">
-
-        <include
-            android:id="@+id/layout_fetch_more"
-            layout="@layout/drawer_fetch_more"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/filtered_text"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-    </androidx.appcompat.widget.LinearLayoutCompat>
+        layout="@layout/drawer_fetch_more"
+        android:visibility="gone"
+        tools:visibility="visible" />
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/488.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/488.txt
new file mode 100644
index 000000000..1e988c7c9
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/488.txt
@@ -0,0 +1,13 @@
+Added:
+
+
+Changed:
+- Some layout improvements for Peertube
+- Better management of resolution with Peertube
+- Improve instance picker for Peertube
+
+Fixed:
+- URL in upper cases
+- GIF does not honor nsfw
+- Issues with Peertube player
+- Fix crashes when scrolling timeline with animated gif
\ No newline at end of file