Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Adjusted the toolbar and pass card text size
Arty Bishopb3a47dc5db49
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xmlindex b69b36ea..7639ba45 100644--- a/app/src/main/res/layout/app_bar_main.xml+++ b/app/src/main/res/layout/app_bar_main.xml@@ -19,11 +19,13 @@<androidx.constraintlayout.widget.ConstraintLayoutandroid:id="@+id/toolbar_layout"android:layout_width="match_parent"- android:layout_height="wrap_content">+ android:layout_height="match_parent"><TextViewandroid:id="@+id/toolbar_timer"style="@style/ToolbarText"+ android:layout_width="0dp"+ android:layout_height="0dp"android:layout_marginEnd="16dp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toStartOf="@+id/toolbar_filter"diff --git a/app/src/main/res/layout/card_pass.xml b/app/src/main/res/layout/card_pass.xmlindex ac7f62b1..8fc6a14c 100644--- a/app/src/main/res/layout/card_pass.xml+++ b/app/src/main/res/layout/card_pass.xml@@ -29,17 +29,44 @@<androidx.constraintlayout.widget.ConstraintLayoutandroid:layout_width="match_parent"- android:layout_height="match_parent"+ android:layout_height="wrap_content"android:background="@drawable/card_pass_bg">+ <TextView+ android:id="@+id/pass_losAz"+ style="@style/CardPassText"+ android:text="@string/pass_los_az"+ app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"+ app:layout_constraintEnd_toEndOf="@+id/pass_progress"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toEndOf="@+id/pass_maxEl" />++ <TextView+ android:id="@+id/pass_satId"+ style="@style/CardPassName"+ android:layout_marginTop="4dp"+ android:text="@string/pass_satId"+ app:layout_constraintEnd_toEndOf="@+id/pass_progress"+ app:layout_constraintTop_toTopOf="parent" />++ <TextView+ android:id="@+id/pass_maxEl"+ style="@style/CardPassText"+ android:layout_marginTop="4dp"+ android:text="@string/pass_maxEl"+ app:layout_constraintEnd_toStartOf="@+id/pass_losAz"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toEndOf="@+id/pass_aosAz"+ app:layout_constraintTop_toBottomOf="@+id/pass_satId" />+<ImageViewandroid:id="@+id/pass_img"- android:layout_width="22dp"- android:layout_height="22dp"- android:layout_marginStart="8dp"+ android:layout_width="20dp"+ android:layout_height="20dp"android:contentDescription="@string/placeholder"app:layout_constraintBottom_toBottomOf="@+id/pass_satName"- app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintStart_toStartOf="@+id/pass_progress"+ app:layout_constraintTop_toTopOf="@+id/pass_satName"app:srcCompat="@drawable/ic_pass_inactive" /><TextView@@ -47,68 +74,53 @@style="@style/CardPassName"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="2dp"android:text="@string/pass_satName"- app:layout_constraintBaseline_toBaselineOf="@+id/pass_satId"- app:layout_constraintStart_toEndOf="@+id/pass_img" />-- <TextView- android:id="@+id/pass_satId"- style="@style/CardPassName"- android:layout_marginTop="4dp"- android:layout_marginEnd="8dp"- android:text="@string/pass_satId"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintTop_toTopOf="parent" />+ app:layout_constraintBottom_toBottomOf="@+id/pass_satId"+ app:layout_constraintEnd_toStartOf="@+id/pass_satId"+ app:layout_constraintHorizontal_bias="0.02"+ app:layout_constraintStart_toEndOf="@+id/pass_img"+ app:layout_constraintTop_toTopOf="@+id/pass_satId" /><TextViewandroid:id="@+id/pass_aosAz"style="@style/CardPassText"android:text="@string/pass_aos_az"app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"- app:layout_constraintStart_toStartOf="@+id/pass_progress" />-- <TextView- android:id="@+id/pass_losAz"- style="@style/CardPassText"- android:text="@string/pass_los_az"- app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"- app:layout_constraintEnd_toEndOf="@+id/pass_progress" />-- <TextView- android:id="@+id/pass_maxEl"- style="@style/CardPassText"- android:layout_marginTop="4dp"- android:text="@string/pass_maxEl"- app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintEnd_toStartOf="@+id/pass_maxEl"app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintStart_toEndOf="@+id/pass_aosAz"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/pass_satId" />+ app:layout_constraintHorizontal_chainStyle="spread_inside"+ app:layout_constraintStart_toStartOf="@+id/pass_progress" /><TextViewandroid:id="@+id/pass_aosTime"style="@style/CardPassText"- android:layout_marginBottom="6dp"android:text="@string/pass_dateTime"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintStart_toStartOf="@+id/pass_progress"- app:layout_constraintTop_toBottomOf="@+id/pass_progress" />+ app:layout_constraintBaseline_toBaselineOf="@+id/pass_losTime"+ app:layout_constraintEnd_toStartOf="@+id/pass_losTime"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintHorizontal_chainStyle="spread_inside"+ app:layout_constraintStart_toStartOf="@+id/pass_progress" /><TextViewandroid:id="@+id/pass_losTime"style="@style/CardPassText"+ android:layout_marginBottom="4dp"android:text="@string/pass_dateTime"- app:layout_constraintBaseline_toBaselineOf="@+id/pass_aosTime"- app:layout_constraintEnd_toEndOf="@+id/pass_progress" />+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="@+id/pass_progress"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toEndOf="@+id/pass_aosTime"+ app:layout_constraintTop_toBottomOf="@+id/pass_progress" /><ProgressBarandroid:id="@+id/pass_progress"style="?android:attr/progressBarStyleHorizontal"android:layout_width="0dp"- android:layout_height="14dp"- app:layout_constraintEnd_toEndOf="@+id/pass_satId"- app:layout_constraintStart_toStartOf="@+id/pass_img"+ android:layout_height="wrap_content"+ android:layout_marginStart="6dp"+ android:layout_marginEnd="6dp"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/pass_maxEl" /></androidx.constraintlayout.widget.ConstraintLayout>diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xmlindex b926653f..febea87c 100644--- a/app/src/main/res/values/styles.xml+++ b/app/src/main/res/values/styles.xml@@ -70,7 +70,7 @@<item name="android:layout_width">wrap_content</item><item name="android:layout_height">wrap_content</item><item name="android:gravity">center</item>- <item name="android:textSize">32sp</item>+ <item name="android:textSize">28sp</item><item name="android:textStyle">bold</item><item name="android:textColor">@color/themeAccent</item></style>@@ -91,7 +91,7 @@<style name="CardPassName"><item name="android:layout_width">wrap_content</item><item name="android:layout_height">wrap_content</item>- <item name="android:textSize">18sp</item>+ <item name="android:textSize">16sp</item><item name="android:textColor">@color/themeAccent</item></style>