diff --git a/app/build.gradle b/app/build.gradle index bd4a33a9..a9ee5bce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,8 +30,8 @@ android { applicationId "com.rtbishop.look4sat" minSdkVersion 24 targetSdkVersion 29 - versionCode 1 - versionName '1.0' + versionCode 2 + versionName '1.1' } buildTypes { release { diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt index a4797e01..7a8eacc5 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt @@ -193,13 +193,12 @@ class MapViewFragment : Fragment() { val lat = gsp.latitude.toFloat() * -1 val cx = lon * degLon val cy = lat * degLat + val gspName = context.getString(R.string.map_gsp) + txtPaint.getTextBounds(gspName, 0, gspName.length, rect) canvas.drawCircle(cx, cy, scale * 2, txtPaint) - canvas.drawText( - context.getString(R.string.map_gsp), - cx - txtPaint.textSize, - cy - txtPaint.textSize, - txtPaint - ) + canvas.drawText(gspName, cx - rect.width() / 2, cy - txtPaint.textSize, outlinePaint) + canvas.drawText(gspName, cx - rect.width() / 2, cy - txtPaint.textSize, txtPaint) + } private fun setTextViewsToSelectedSatPos(position: SatPos) { diff --git a/app/src/main/res/layout/card_pass.xml b/app/src/main/res/layout/card_pass.xml index 8fc6a14c..42dd675b 100644 --- a/app/src/main/res/layout/card_pass.xml +++ b/app/src/main/res/layout/card_pass.xml @@ -38,7 +38,7 @@ 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_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/pass_maxEl" /> + app:layout_constraintTop_toBottomOf="@+id/drawer_sat_img" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e9674132..d0abdbaa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -73,7 +73,7 @@ Uplink: Null Downlink: Null No satellites were selected - No transmitters found for this Satellite + No transceivers found for this Satellite Missing permissions Certain satellites shall not pass diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d2df4461..488f1d41 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -44,17 +44,17 @@ @@ -85,7 +85,7 @@