From 69d256e0089d6c2a8d80bb7ba437e42a054ba3fb Mon Sep 17 00:00:00 2001
From: Yuhui Su <807587186@qq.com>
Date: Mon, 23 Aug 2021 19:25:33 +0800
Subject: [PATCH] Fixed the overlapping and blocked texts on the "passes" page
 #65

* fixed the blocked time string
* fixed the overlapped texts for items on the 'passes' page
---
 app/src/main/res/layout/fragment_passes.xml |  2 +-
 app/src/main/res/layout/item_pass_leo.xml   | 96 +++++++++++++++------
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml
index 1dc726e6..4c857f82 100644
--- a/app/src/main/res/layout/fragment_passes.xml
+++ b/app/src/main/res/layout/fragment_passes.xml
@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         android:elevation="4dp"
         android:text="@string/timer_zero"
-        android:textSize="40sp"
+        android:textSize="40dp"
         app:layout_constraintBottom_toBottomOf="@+id/passes_bar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/passes_bar"
diff --git a/app/src/main/res/layout/item_pass_leo.xml b/app/src/main/res/layout/item_pass_leo.xml
index 26bdd296..d5e40087 100644
--- a/app/src/main/res/layout/item_pass_leo.xml
+++ b/app/src/main/res/layout/item_pass_leo.xml
@@ -24,8 +24,12 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pass_leo_satName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            app:layout_constraintWidth_percent="0.50"
+            app:layout_constraintHeight_percent="0.25"
             android:layout_marginStart="6dp"
             android:layout_marginTop="6dp"
             android:text="@string/pass_satName"
@@ -35,8 +39,12 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pass_leo_satId"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:textAlignment="textEnd"
+            android:gravity="end"
+            app:layout_constraintWidth_percent="0.50"
+            app:layout_constraintHeight_percent="0.25"
             android:layout_marginEnd="6dp"
             android:text="@string/pass_satId"
             android:textColor="@color/themeLight"
@@ -45,28 +53,47 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pass_leo_aosAz"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:layout_marginTop="2dp"
             android:text="@string/pass_aosAz"
+            app:layout_constraintWidth_percent="0.30"
+            app:layout_constraintHeight_percent="0.23"
+            android:maxLines="1"
+            android:autoSizeTextType="uniform"
+            android:ellipsize="marquee"
             app:layout_constraintEnd_toStartOf="@+id/pass_leo_losAz"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintStart_toStartOf="@+id/pass_leo_satName"
             app:layout_constraintTop_toBottomOf="@+id/pass_leo_satName" />
 
         <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/pass_leo_maxEl"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/pass_maxEl"
-            app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_start"
-            app:layout_constraintEnd_toEndOf="@+id/pass_leo_end"
-            app:layout_constraintStart_toStartOf="@+id/pass_leo_start" />
+            android:id="@+id/pass_leo_tcaAz"
+            android:layout_width="0dp"
+            app:layout_constraintWidth_percent="0.30"
+            app:layout_constraintHeight_percent="0.23"
+            android:maxLines="1"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:autoSizeTextType="uniform"
+            android:ellipsize="marquee"
+            android:layout_height="0dp"
+            android:text="@string/pass_tcaAz"
+            app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz"
+            app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz"
+            app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pass_leo_losAz"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            app:layout_constraintWidth_percent="0.30"
+            app:layout_constraintHeight_percent="0.23"
+            android:maxLines="1"
+            android:textAlignment="textEnd"
+            android:gravity="end"
+            android:autoSizeTextType="uniform"
+            android:ellipsize="marquee"
+            android:layout_height="0dp"
             android:text="@string/pass_losAz"
             app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz"
             app:layout_constraintEnd_toEndOf="@+id/pass_leo_satId"
@@ -74,10 +101,15 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pass_leo_start"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintWidth_percent="0.30"
+            app:layout_constraintHeight_percent="0.23"
             android:layout_marginTop="2dp"
             android:text="@string/pass_startTime"
+            android:autoSizeTextType="uniform"
+            android:ellipsize="marquee"
+            android:maxLines="1"
             app:layout_constraintEnd_toStartOf="@+id/pass_leo_end"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -85,18 +117,30 @@
             app:layout_constraintTop_toBottomOf="@+id/pass_leo_aosAz" />
 
         <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/pass_leo_tcaAz"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/pass_tcaAz"
-            app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz"
-            app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz"
-            app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz" />
+            android:id="@+id/pass_leo_maxEl"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintWidth_percent="0.30"
+            app:layout_constraintHeight_percent="0.23"
+            android:autoSizeTextType="uniform"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="@string/pass_maxEl"
+            app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_start"
+            app:layout_constraintEnd_toEndOf="@+id/pass_leo_end"
+            app:layout_constraintStart_toStartOf="@+id/pass_leo_start" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pass_leo_end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintWidth_percent="0.30"
+            app:layout_constraintHeight_percent="0.23"
+            android:autoSizeTextType="uniform"
+            android:gravity="end"
+            android:maxLines="1"
+            android:ellipsize="marquee"
             android:text="@string/pass_endTime"
             app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_start"
             app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz"