From 94e4b5fb316cfcf6c713ad92164c4bd5a1cc28b0 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Thu, 30 Jan 2020 10:08:52 +0000
Subject: [PATCH] Final minor fixes and changes to strings and layouts, libs
 and version update

---
 app/build.gradle                                    |  4 ++--
 .../com/rtbishop/look4sat/ui/MapViewFragment.kt     | 11 +++++------
 app/src/main/res/layout/card_pass.xml               | 13 ++++++-------
 app/src/main/res/layout/drawer_header.xml           |  8 +++++---
 app/src/main/res/values/strings.xml                 |  2 +-
 app/src/main/res/values/styles.xml                  |  8 ++++----
 build.gradle                                        |  8 ++++----
 7 files changed, 27 insertions(+), 27 deletions(-)

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" />
 
         <TextView
@@ -52,11 +52,11 @@
         <TextView
             android:id="@+id/pass_maxEl"
             style="@style/CardPassText"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="2dp"
             android:text="@string/pass_maxEl"
-            app:layout_constraintEnd_toStartOf="@+id/pass_losAz"
+            app:layout_constraintEnd_toEndOf="parent"
             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" />
 
         <ImageView
@@ -87,8 +87,7 @@
             android:text="@string/pass_aos_az"
             app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"
             app:layout_constraintEnd_toStartOf="@+id/pass_maxEl"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/pass_progress" />
 
         <TextView
@@ -116,7 +115,7 @@
             android:id="@+id/pass_progress"
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="14dp"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 7ef9c383..df4b20c2 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -24,7 +24,9 @@
         android:id="@+id/drawer_sat_img"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
+        android:layout_marginBottom="4dp"
         android:contentDescription="@string/app_name"
         app:layout_constraintBottom_toBottomOf="@+id/drawer_title"
         app:layout_constraintDimensionRatio="1:1"
@@ -48,9 +50,8 @@
         android:layout_width="wrap_content"
         android:layout_marginTop="4dp"
         android:text="@string/pat_location"
-        app:layout_constraintEnd_toEndOf="@+id/drawer_lon_value"
         app:layout_constraintStart_toStartOf="@+id/drawer_lon_value"
-        app:layout_constraintTop_toBottomOf="@+id/drawer_title" />
+        app:layout_constraintTop_toBottomOf="@+id/drawer_sat_img" />
 
     <TextView
         android:id="@+id/drawer_lon"
@@ -64,8 +65,9 @@
         android:id="@+id/drawer_lon_value"
         style="@style/DrawerHeader.ItemValue"
         android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
         android:text="@string/pat_location"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.1"
         app:layout_constraintStart_toEndOf="@+id/barrier"
         app:layout_constraintTop_toBottomOf="@+id/drawer_lat_value" />
 
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 @@
     <string name="no_uplink">Uplink: Null</string>
     <string name="no_downlink">Downlink: Null</string>
     <string name="no_selected_sat">No satellites were selected</string>
-    <string name="no_trans">No transmitters found for this Satellite</string>
+    <string name="no_trans">No transceivers found for this Satellite</string>
 
     <string name="err_no_permissions">Missing permissions</string>
     <string name="err_sat_wont_pass">Certain satellites shall not pass</string>
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 @@
     </style>
 
     <style name="DrawerHeader.Title">
-        <item name="android:textSize">42sp</item>
+        <item name="android:textSize">46sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="DrawerHeader.Item">
-        <item name="android:textSize">21sp</item>
+        <item name="android:textSize">22sp</item>
         <item name="android:fontFamily">serif</item>
     </style>
 
     <style name="DrawerHeader.ItemValue">
-        <item name="android:textSize">25sp</item>
+        <item name="android:textSize">26sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
@@ -85,7 +85,7 @@
     <style name="CardPassText">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">15sp</item>
     </style>
 
     <style name="CardPassName">
diff --git a/build.gradle b/build.gradle
index a6e5f224..9bb9f673 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:3.5.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.0"
     }
 }
 
@@ -44,15 +44,15 @@ task clean(type: Delete) {
 }
 
 ext {
-    material = '1.2.0-alpha03'
+    material = '1.2.0-alpha04'
     supportLib = '1.0.0'
     constraintLayout = '1.1.3'
 
     ktx = '1.1.0'
     preference = '1.1.0'
 
-    navigation = '2.1.0'
-    lifecycle = '2.2.0-rc03'
+    navigation = '2.2.0'
+    lifecycle = '2.2.0'
 
     room = '2.2.3'