From b3bd648310fa815ef7bc0909d05830b6063cdd83 Mon Sep 17 00:00:00 2001
From: Conny Duck <gitlab@connyduck.at>
Date: Tue, 20 Feb 2024 14:54:21 +0000
Subject: [PATCH] Fix new badge sometimes being hidden

---
 .../drawable/app_version_item_status_new.xml  |  1 +
 .../main/res/layout/app_card_horizontal.xml   | 27 +++++------
 app/src/main/res/layout/app_card_large.xml    | 46 +++++++++----------
 .../main/res/layout/app_card_list_item.xml    | 25 +++++-----
 4 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/app/src/main/res/drawable/app_version_item_status_new.xml b/app/src/main/res/drawable/app_version_item_status_new.xml
index 393c74738..efdec52ca 100644
--- a/app/src/main/res/drawable/app_version_item_status_new.xml
+++ b/app/src/main/res/drawable/app_version_item_status_new.xml
@@ -5,4 +5,5 @@
         android:width="1dp"
         android:color="#429fff" />
     <corners android:radius="2dp" />
+    <solid android:color="?colorSurface" />
 </shape>
diff --git a/app/src/main/res/layout/app_card_horizontal.xml b/app/src/main/res/layout/app_card_horizontal.xml
index 952756cae..d3d72901f 100644
--- a/app/src/main/res/layout/app_card_horizontal.xml
+++ b/app/src/main/res/layout/app_card_horizontal.xml
@@ -12,43 +12,40 @@
         android:layout_height="wrap_content"
         android:padding="8dp">
 
-        <!-- Ignore ContentDescription because it is kind of meaningless to have TTS read out "App icon"
-             when it will inevitably read out the name of the app straight after. -->
         <ImageView
             android:id="@+id/icon"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            tools:src="@drawable/ic_launcher"
+            android:importantForAccessibility="no"
             android:scaleType="fitCenter"
             android:transitionName="@string/transition_app_item_icon"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
+            tools:src="@drawable/ic_launcher" />
 
         <TextView
-            tools:text="F-Droid An application summary which takes up too much space and must ellipsize"
+            android:id="@+id/summary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:id="@+id/summary"
+            android:layout_marginStart="8dp"
+            android:ellipsize="end"
             android:maxLines="4"
             android:textColor="?android:textColorPrimary"
             android:textSize="14sp"
-            android:ellipsize="end"
-            android:layout_marginLeft="8dp"
-            android:layout_marginStart="8dp"
-            app:layout_constraintStart_toEndOf="@+id/icon"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintStart_toEndOf="@+id/icon"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="F-Droid An application summary which takes up too much space and must ellipsize" />
 
         <include
+            android:id="@+id/new_tag"
             layout="@layout/app_status_new"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/new_tag"
             android:layout_marginTop="4dp"
-            app:layout_constraintTop_toBottomOf="@+id/summary"
-            app:layout_constraintStart_toStartOf="@+id/summary"
-            app:layout_constraintLeft_toLeftOf="@+id/summary" />
+            app:layout_constraintEnd_toEndOf="@+id/icon"
+            app:layout_constraintStart_toStartOf="@+id/icon"
+            app:layout_constraintTop_toBottomOf="@+id/icon" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/app_card_large.xml b/app/src/main/res/layout/app_card_large.xml
index bc07ffcd7..7a29256ce 100644
--- a/app/src/main/res/layout/app_card_large.xml
+++ b/app/src/main/res/layout/app_card_large.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="220dp"
+    android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true">
 
@@ -12,49 +12,45 @@
         android:layout_height="match_parent"
         android:padding="8dp">
 
-        <!-- Ignore ContentDescription because it is kind of meaningless to have TTS read out "App icon"
-             when it will inevitably read out the name of the app straight after. -->
         <ImageView
             android:id="@+id/icon"
             android:layout_width="96dip"
             android:layout_height="96dip"
-            tools:src="@drawable/ic_launcher"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="8dp"
+            android:importantForAccessibility="no"
             android:scaleType="fitCenter"
             android:transitionName="@string/transition_app_item_icon"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
+            tools:src="@drawable/ic_launcher" />
 
         <TextView
-            tools:text="F-Droid An application summary which takes up too much space and must ellipsize"
+            android:id="@+id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/summary"
-            android:maxLines="4"
+            android:layout_marginTop="8dp"
+            android:ellipsize="end"
+            android:lines="4"
             android:textColor="?android:textColorPrimary"
             android:textSize="14sp"
-            android:ellipsize="end"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/icon"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            android:layout_marginTop="8dp" />
+            tools:text="F-Droid An application summary which takes up too much space and must ellipsize" />
 
         <include
+            android:id="@+id/new_tag"
             layout="@layout/app_status_new"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/new_tag"
-            android:layout_marginTop="4dp"
-            app:layout_constraintTop_toBottomOf="@+id/summary"
-            app:layout_constraintStart_toStartOf="@+id/summary"
-            app:layout_constraintLeft_toLeftOf="@+id/summary" />
+            android:layout_marginEnd="-4dp"
+            android:layout_marginBottom="-4dp"
+            app:layout_constraintBottom_toBottomOf="@id/icon"
+            app:layout_constraintEnd_toEndOf="@id/icon" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/app_card_list_item.xml b/app/src/main/res/layout/app_card_list_item.xml
index cec46577c..9a0d4a114 100644
--- a/app/src/main/res/layout/app_card_list_item.xml
+++ b/app/src/main/res/layout/app_card_list_item.xml
@@ -12,44 +12,41 @@
         android:layout_height="match_parent"
         android:padding="8dp">
 
-        <!-- Ignore ContentDescription because it is kind of meaningless to have TTS read out "App icon"
-             when it will inevitably read out the name of the app straight after. -->
         <ImageView
             android:id="@+id/icon"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            tools:src="@drawable/ic_launcher"
+            android:importantForAccessibility="no"
             android:scaleType="fitCenter"
             android:transitionName="@string/transition_app_item_icon"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_launcher" />
 
         <TextView
-            tools:text="F-Droid An application summary which takes up too much space and must ellipsize"
+            android:id="@+id/summary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:id="@+id/summary"
+            android:layout_marginStart="16dp"
+            android:ellipsize="end"
             android:lines="2"
             android:textColor="?android:textColorPrimary"
             android:textSize="14sp"
-            android:ellipsize="end"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            app:layout_constraintStart_toEndOf="@+id/icon"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/icon"
             app:layout_constraintTop_toTopOf="parent"
-            tools:layout_editor_absoluteY="8dp" />
+            tools:layout_editor_absoluteY="8dp"
+            tools:text="F-Droid An application summary which takes up too much space and must ellipsize" />
 
         <include
+            android:id="@+id/new_tag"
             layout="@layout/app_status_new"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/new_tag"
             android:layout_marginTop="4dp"
-            app:layout_constraintTop_toBottomOf="@+id/summary"
             app:layout_constraintStart_toStartOf="@+id/summary"
-            app:layout_constraintLeft_toLeftOf="@+id/summary" />
+            app:layout_constraintTop_toBottomOf="@+id/summary" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>