diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt
index da49c807..013e4667 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt
@@ -1,6 +1,6 @@
/*
- * LookingSat. Amateur radio & weather satellite tracker and passes calculator.
- * Copyright (C) 2019 Arty Bishop (bishop.arty@gmail.com)
+ * Look4Sat. Amateur radio & weather satellites passes calculator for Android.
+ * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -188,13 +188,33 @@ class PolarViewFragment : Fragment() {
}
private fun drawRadarText(cvs: Canvas) {
- cvs.drawText("N", center - txtSize / 3, center - radius - scale * 2, txtPaint)
- cvs.drawText("E", center + radius + scale * 2, center + txtSize / 3, txtPaint)
- cvs.drawText("S", center - txtSize / 3, center + radius + txtSize, txtPaint)
- cvs.drawText("W", center - radius - txtSize, center + txtSize / 3, txtPaint)
- cvs.drawText("0°", center + scale, center - scale * 2, txtPaint)
- cvs.drawText("30°", center + scale, center - (radius / 3) - scale * 2, txtPaint)
- cvs.drawText("60°", center + scale, center - ((radius / 3) * 2) - scale * 2, txtPaint)
+ cvs.drawText(
+ context.getString(R.string.polar_north),
+ center - txtSize / 3,
+ center - radius - scale * 2,
+ txtPaint
+ )
+ cvs.drawText(
+ context.getString(R.string.polar_east),
+ center + radius + scale * 2,
+ center + txtSize / 3,
+ txtPaint
+ )
+ cvs.drawText(
+ context.getString(R.string.polar_south),
+ center - txtSize / 3,
+ center + radius + txtSize,
+ txtPaint
+ )
+ cvs.drawText(
+ context.getString(R.string.polar_west),
+ center - radius - txtSize,
+ center + txtSize / 3,
+ txtPaint
+ )
+ cvs.drawText("90°", center + scale, center - scale * 2, txtPaint)
+ cvs.drawText("60°", center + scale, center - (radius / 3) - scale * 2, txtPaint)
+ cvs.drawText("30°", center + scale, center - ((radius / 3) * 2) - scale * 2, txtPaint)
}
private fun drawPassTrajectory(cvs: Canvas) {
diff --git a/app/src/main/res/layout/card_pass.xml b/app/src/main/res/layout/card_pass.xml
index 45e5edeb..ee40e721 100644
--- a/app/src/main/res/layout/card_pass.xml
+++ b/app/src/main/res/layout/card_pass.xml
@@ -1,4 +1,23 @@
+
+
+ app:layout_constraintStart_toStartOf="@+id/pass_progress" />
+ app:layout_constraintEnd_toEndOf="@+id/pass_progress" />
diff --git a/app/src/main/res/layout/fragment_polar_view.xml b/app/src/main/res/layout/fragment_polar_view.xml
index 95d09a3d..90b50724 100644
--- a/app/src/main/res/layout/fragment_polar_view.xml
+++ b/app/src/main/res/layout/fragment_polar_view.xml
@@ -1,4 +1,23 @@
+
+
+
+
Look4Sat
@@ -68,10 +87,15 @@
%s
Id: %d
AOS — %2d°
- MaxEl: %.1f°
- LOS — %2d°
+ MaxElev: %.1f°
+ %2d° — LOS
MMM dd @ HH:mm:ss
+ N
+ E
+ S
+ W
+
%.4f
Azimuth: %.1f°
Elevation: %.1f°