mirror
/
Look4Sat
kopia lustrzana https://github.com/rt-bishop/Look4Sat
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

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
pull/70/head
Yuhui Su 2021-08-23 19:25:33 +08:00 zatwierdzone przez GitHub
rodzic d603a343ca
commit 69d256e008
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 71 dodań i 27 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/res/layout/fragment_passes.xml
Wyświetl plik

@ -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"

96
app/src/main/res/layout/item_pass_leo.xml
Wyświetl plik

@ -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"