Further refactoring and strings cleanup. Changed the look of a transmission recycler item.

app/src/main/res/layout/card_pass.xml

@@ -51,7 +51,7 @@
             android:id="@+id/pass_aosTime"
             style="@style/CardPassText"
             android:layout_marginBottom="4dp"
-            android:text="@string/pass_aosTime"
+            android:text="@string/pass_aos"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/pass_progress"
             app:layout_constraintTop_toBottomOf="@+id/pass_progress" />
@@ -59,7 +59,7 @@
         <TextView
             android:id="@+id/pass_losTime"
             style="@style/CardPassText"
-            android:text="@string/pass_losTime"
+            android:text="@string/pass_los"
             app:layout_constraintBaseline_toBaselineOf="@+id/pass_aosTime"
             app:layout_constraintEnd_toEndOf="@+id/pass_progress" />
 

app/src/main/res/layout/card_trans.xml

@@ -16,42 +16,81 @@
         <TextView
             android:id="@+id/trans_description"
             style="@style/CardTransText"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="4dp"
             android:text="@string/trans_description"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintBottom_toBottomOf="@+id/imageView"
+            app:layout_constraintStart_toEndOf="@+id/imageView"
+            app:layout_constraintTop_toTopOf="@+id/imageView" />
 
         <TextView
             android:id="@+id/trans_downlink"
             style="@style/CardTransText"
-            android:text="@string/trans_downlink"
-            app:layout_constraintStart_toStartOf="@+id/trans_description"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/trans_down_lowHigh"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/trans_description" />
 
         <TextView
             android:id="@+id/trans_uplink"
             style="@style/CardTransText"
-            android:text="@string/trans_uplink"
-            app:layout_constraintStart_toStartOf="@+id/trans_description"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/trans_up_lowHigh"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/trans_downlink" />
 
         <TextView
             android:id="@+id/trans_mode"
             style="@style/CardTransText"
-            android:layout_marginBottom="4dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginBottom="2dp"
             android:text="@string/trans_mode"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/trans_description"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/trans_uplink" />
 
         <TextView
             android:id="@+id/trans_inverted"
             style="@style/CardTransText"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="6dp"
             android:text="@string/trans_inverted"
             app:layout_constraintBaseline_toBaselineOf="@+id/trans_mode"
             app:layout_constraintEnd_toEndOf="parent" />
 
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginTop="4dp"
+            android:contentDescription="@string/placeholder"
+            android:rotation="90"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_trans" />
+
+        <ImageView
+            android:id="@+id/imageView2"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:contentDescription="@string/placeholder"
+            android:rotation="180"
+            app:layout_constraintBottom_toBottomOf="@+id/trans_downlink"
+            app:layout_constraintEnd_toStartOf="@+id/trans_downlink"
+            app:layout_constraintTop_toTopOf="@+id/trans_downlink"
+            app:srcCompat="@drawable/ic_arrow" />
+
+        <ImageView
+            android:id="@+id/imageView3"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:contentDescription="@string/placeholder"
+            app:layout_constraintBottom_toBottomOf="@+id/trans_uplink"
+            app:layout_constraintEnd_toStartOf="@+id/trans_uplink"
+            app:layout_constraintTop_toBottomOf="@+id/trans_downlink"
+            app:srcCompat="@drawable/ic_arrow" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>

app/src/main/res/layout/drawer_header.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/launcher_background"
     android:gravity="bottom"
@@ -11,8 +11,9 @@
         android:id="@+id/drawer_sat_img"
         android:layout_width="104dp"
         android:layout_height="104dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="24dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="16dp"
         android:contentDescription="@string/app_name"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/drawer_title"
@@ -25,13 +26,14 @@
         android:layout_marginStart="8dp"
         android:text="@string/drawer_title"
         app:layout_constraintBottom_toBottomOf="@+id/drawer_sat_img"
+        app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/drawer_sat_img" />
 
     <TextView
         android:id="@+id/drawer_lat"
         style="@style/DrawerHeader.Item"
-        android:text="@string/drawer_lat"
+        android:text="@string/drawer_lat_text"
         app:layout_constraintBaseline_toBaselineOf="@+id/drawer_lat_value"
         app:layout_constraintStart_toStartOf="@+id/drawer_title" />
 
@@ -40,14 +42,14 @@
         style="@style/DrawerHeader.ItemValue"
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
-        android:text="@string/drawer_lat_value"
+        android:text="@string/pat_location"
         app:layout_constraintStart_toEndOf="@+id/drawer_lat"
         app:layout_constraintTop_toBottomOf="@+id/drawer_sat_img" />
 
     <TextView
         android:id="@+id/drawer_lon"
         style="@style/DrawerHeader.Item"
-        android:text="@string/drawer_lon"
+        android:text="@string/drawer_lon_text"
         app:layout_constraintStart_toStartOf="@+id/drawer_lat"
         app:layout_constraintTop_toBottomOf="@+id/drawer_lat" />
 
@@ -55,7 +57,7 @@
         android:id="@+id/drawer_lon_value"
         style="@style/DrawerHeader.ItemValue"
         android:layout_marginStart="8dp"
-        android:text="@string/drawer_lon_value"
+        android:text="@string/pat_location"
         app:layout_constraintBaseline_toBaselineOf="@+id/drawer_lon"
         app:layout_constraintStart_toEndOf="@+id/drawer_lon" />
 

app/src/main/res/layout/fragment_map_view.xml

@@ -32,7 +32,7 @@
         style="@style/MapText"
         android:layout_marginStart="4dp"
         android:layout_marginTop="4dp"
-        android:text="@string/pattern_value_lat"
+        android:text="@string/pat_latitude"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -41,7 +41,7 @@
         style="@style/MapText"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
-        android:text="@string/pattern_value_lon"
+        android:text="@string/pat_longitude"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -50,7 +50,7 @@
         style="@style/MapText"
         android:layout_marginEnd="4dp"
         android:layout_marginBottom="4dp"
-        android:text="@string/pattern_value_rng"
+        android:text="@string/pat_range"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 

app/src/main/res/layout/fragment_polar_view.xml

@@ -19,31 +19,31 @@
         android:id="@+id/polar_azimuth"
         style="@style/PolarViewText"
         android:layout_marginStart="4dp"
-        android:text="@string/polar_azimuth"
-        app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"
-        app:layout_constraintStart_toStartOf="@+id/polar_view_frame" />
+        android:text="@string/pat_azimuth"
+        app:layout_constraintStart_toStartOf="@+id/polar_view_frame"
+        app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />
 
     <TextView
         android:id="@+id/polar_elevation"
         style="@style/PolarViewText"
         android:layout_marginEnd="4dp"
-        android:text="@string/polar_elevation"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/pat_elevation"
+        app:layout_constraintEnd_toEndOf="@+id/polar_view_frame"
         app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />
 
     <TextView
         android:id="@+id/polar_altitude"
         style="@style/PolarViewText"
         android:layout_marginStart="4dp"
-        android:text="@string/polar_altitude"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />
+        android:text="@string/pat_altitude"
+        app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"
+        app:layout_constraintStart_toStartOf="@+id/polar_view_frame" />
 
     <TextView
         android:id="@+id/polar_range"
         style="@style/PolarViewText"
         android:layout_marginEnd="4dp"
-        android:text="@string/polar_range"
+        android:text="@string/pat_range"
         app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"
         app:layout_constraintEnd_toEndOf="@+id/polar_view_frame" />