Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Reverted LED type font to the regular bold one

Arty Bishop791a9c206f2c
diff --git a/app/src/main/res/font/digital_dismay.otf b/app/src/main/res/font/digital_dismay.otf
deleted file mode 100644
index af43ceba..00000000
Binary files a/app/src/main/res/font/digital_dismay.otf and /dev/null differ
diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml
index 53c28d29..19e08508 100644
--- a/app/src/main/res/layout/fragment_passes.xml
+++ b/app/src/main/res/layout/fragment_passes.xml
@@ -17,46 +17,17 @@
<com.google.android.material.textview.MaterialTextView
android:id="@+id/passes_timer"
+ style="@style/TimerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="4dp"
- android:fontFamily="@font/digital_dismay"
android:text="@string/timer_zero"
- android:textColor="@color/themeLight"
- android:textSize="48sp"
+ android:textSize="42sp"
app:layout_constraintBottom_toBottomOf="@+id/passes_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/passes_bar"
app:layout_constraintTop_toTopOf="parent" />
- <com.google.android.material.textview.MaterialTextView
- android:id="@+id/stub_left"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:elevation="4dp"
- android:fontFamily="@font/digital_dismay"
- android:text="@string/timer_placeholder"
- android:textColor="@color/themeLight"
- android:textSize="48sp"
- app:layout_constraintBottom_toBottomOf="@+id/passes_timer"
- app:layout_constraintEnd_toStartOf="@+id/passes_timer"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@+id/passes_timer" />
-
- <com.google.android.material.textview.MaterialTextView
- android:id="@+id/stub_right"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:elevation="4dp"
- android:fontFamily="@font/digital_dismay"
- android:text="@string/timer_placeholder"
- android:textColor="@color/themeLight"
- android:textSize="48sp"
- app:layout_constraintBottom_toBottomOf="@+id/passes_timer"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/passes_timer"
- app:layout_constraintTop_toTopOf="@+id/passes_timer" />
-
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/passes_recycler"
android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_polar.xml b/app/src/main/res/layout/fragment_polar.xml
index df129ab7..9d7668af 100644
--- a/app/src/main/res/layout/fragment_polar.xml
+++ b/app/src/main/res/layout/fragment_polar.xml
@@ -14,46 +14,17 @@
<com.google.android.material.textview.MaterialTextView
android:id="@+id/polar_timer"
+ style="@style/TimerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="4dp"
- android:fontFamily="@font/digital_dismay"
android:text="@string/timer_zero"
- android:textColor="@color/themeLight"
- android:textSize="48sp"
+ android:textSize="42sp"
app:layout_constraintBottom_toBottomOf="@+id/polar_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/polar_bar"
app:layout_constraintTop_toTopOf="parent" />
- <com.google.android.material.textview.MaterialTextView
- android:id="@+id/stub_left"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:elevation="4dp"
- android:fontFamily="@font/digital_dismay"
- android:text="@string/timer_placeholder"
- android:textColor="@color/themeLight"
- android:textSize="48sp"
- app:layout_constraintBottom_toBottomOf="@+id/polar_timer"
- app:layout_constraintEnd_toStartOf="@+id/polar_timer"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@+id/polar_timer" />
-
- <com.google.android.material.textview.MaterialTextView
- android:id="@+id/stub_right"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:elevation="4dp"
- android:fontFamily="@font/digital_dismay"
- android:text="@string/timer_placeholder"
- android:textColor="@color/themeLight"
- android:textSize="48sp"
- app:layout_constraintBottom_toBottomOf="@+id/polar_timer"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/polar_timer"
- app:layout_constraintTop_toTopOf="@+id/polar_timer" />
-
<FrameLayout
android:id="@+id/frame"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_trans.xml b/app/src/main/res/layout/item_trans.xml
index 8b313702..cfaa3d19 100644
--- a/app/src/main/res/layout/item_trans.xml
+++ b/app/src/main/res/layout/item_trans.xml
@@ -28,25 +28,22 @@
<com.google.android.material.textview.MaterialTextView
android:id="@+id/downlink"
+ style="@style/TimerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="4dp"
- android:fontFamily="@font/digital_dismay"
android:text="@string/trans_link_low"
- android:textColor="@color/themeLight"
- android:textSize="30sp"
+ android:textSize="24sp"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/description" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/uplink"
+ style="@style/TimerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:fontFamily="@font/digital_dismay"
android:text="@string/trans_link_low"
- android:textColor="@color/themeLight"
- android:textSize="30sp"
+ android:textSize="24sp"
app:layout_constraintBaseline_toBaselineOf="@+id/downlink"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline" />
@@ -56,7 +53,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
- android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:text="@string/trans_mode"
android:textSize="15sp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6aa3f381..8e13fd95 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,7 +40,7 @@
<string name="trans_no_mode">Mode: null</string>
<string name="trans_inverted">Inverted: %s</string>
<string name="trans_description" translatable="false">%s</string>
- <string name="trans_no_link" translatable="false">- -</string>
+ <string name="trans_no_link" translatable="false">- - . - -</string>
<string name="trans_link_low" translatable="false">%.4f</string>
<string name="trans_link_lowHigh" translatable="false">%.4f - %.4f</string>
<string name="trans_no_data">No transceivers found for this satellite</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 99b37b6d..9825f41f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -58,4 +58,10 @@
<item name="textAllCaps">false</item>
</style>
+ <style name="TimerText">
+ <item name="android:textColor">@color/themeLight</item>
+ <item name="android:textStyle">bold</item>
+ <item name="android:includeFontPadding">false</item>
+ </style>
+
</resources>