Added splash screen. Minor refactoring.

app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
             android:name=".ui.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt

@@ -66,6 +66,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var appBarConfig: AppBarConfiguration
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         setupComponents()

app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt

@@ -107,7 +107,7 @@ class SkyFragment : Fragment() {
             selectionList.forEach { this[it] = true }
         }
         val builder = AlertDialog.Builder(activity as MainActivity)
-        builder.setTitle(getString(R.string.title_select_sat))
+        builder.setTitle(getString(R.string.dialog_select_sat))
             .setMultiChoiceItems(tleNameArray, tleCheckedArray) { _, which, isChecked ->
                 if (isChecked) selectionList.add(which)
                 else if (selectionList.contains(which)) selectionList.remove(which)

app/src/main/java/com/rtbishop/lookingsat/ui/TransAdapter.kt

@@ -92,22 +92,19 @@ class TransAdapter : RecyclerView.Adapter<TransAdapter.TransHolder>() {
 
         if (transmitter.mode != null) {
             mode.text =
-                String.format(
+                String.format(context.getString(R.string.pattern_trans_mode), transmitter.mode)
-                    context.getString(R.string.pattern_trans_mode),
-                    transmitter.mode
-                )
         } else {
             mode.text = context.getString(R.string.no_mode)
         }
         if (transmitter.isInverted) {
             inverted.text = String.format(
                 context.getString(R.string.pattern_trans_inverted),
-                context.getString(R.string.yes)
+                context.getString(R.string.btn_yes)
             )
         } else {
             inverted.text = String.format(
                 context.getString(R.string.pattern_trans_inverted),
-                context.getString(R.string.no)
+                context.getString(R.string.btn_no)
             )
         }
     }

app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt

@@ -93,7 +93,11 @@ class WorldMapFragment : Fragment() {
             )
         } else {
             fab.setOnClickListener {
-                Toast.makeText(mainActivity, "No satellites were shortlisted", Toast.LENGTH_SHORT)
+                Toast.makeText(
+                    mainActivity,
+                    getString(R.string.no_selected_sat),
+                    Toast.LENGTH_SHORT
+                )
                     .show()
             }
         }
@@ -107,7 +111,7 @@ class WorldMapFragment : Fragment() {
         }
 
         val builder = AlertDialog.Builder(mainActivity)
-        builder.setTitle("Select Sat to track")
+        builder.setTitle(getString(R.string.dialog_show_track))
             .setSingleChoiceItems(tleNameArray, checkedItem) { dialog, which ->
                 checkedItem = which
                 selectedSat = tleMainList[selectionList[which]]
@@ -173,7 +177,12 @@ class WorldMapFragment : Fragment() {
             val cx = lon * degLon
             val cy = lat * degLat
             cvs.drawCircle(cx, cy, scale * 2, txtPaint)
-            cvs.drawText("GSP", cx - txtPaint.textSize, cy - txtPaint.textSize, txtPaint)
+            cvs.drawText(
+                context.getString(R.string.map_gsp),
+                cx - txtPaint.textSize,
+                cy - txtPaint.textSize,
+                txtPaint
+            )
         }
 
         private fun drawGroundTrack(cvs: Canvas, degLon: Float, degLat: Float, list: List<SatPos>) {

app/src/main/res/drawable/splash_drawable.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/darkOnLight" />
+    <item
+        android:width="240dp"
+        android:height="240dp"
+        android:drawable="@drawable/splash_foreground"
+        android:gravity="center" />
+</layer-list>

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

@@ -9,9 +9,10 @@
 
     <ImageView
         android:id="@+id/drawer_sat_img"
-        android:layout_width="108dp"
+        android:layout_width="104dp"
-        android:layout_height="108dp"
+        android:layout_height="104dp"
         android:layout_marginTop="24dp"
+        android:layout_marginEnd="8dp"
         android:contentDescription="@string/app_name"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/drawer_title"
@@ -23,29 +24,22 @@
         style="@style/DrawerHeader.Title"
         android:layout_marginStart="8dp"
         android:text="@string/title"
+        app:layout_constraintBottom_toBottomOf="@+id/drawer_sat_img"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/drawer_sat_img" />
 
-    <TextView
-        android:id="@+id/drawer_subtitle"
-        style="@style/DrawerHeader.Title"
-        android:text="@string/subtitle"
-        app:layout_constraintBottom_toBottomOf="@+id/drawer_sat_img"
-        app:layout_constraintStart_toStartOf="@+id/drawer_title"
-        app:layout_constraintTop_toBottomOf="@+id/drawer_title" />
-
     <TextView
         android:id="@+id/drawer_lat"
         style="@style/DrawerHeader.Item"
         android:text="@string/drawer_latitude"
         app:layout_constraintBaseline_toBaselineOf="@+id/drawer_lat_value"
-        app:layout_constraintStart_toStartOf="@+id/drawer_subtitle" />
+        app:layout_constraintStart_toStartOf="@+id/drawer_title" />
 
     <TextView
         android:id="@+id/drawer_lat_value"
         style="@style/DrawerHeader.ItemValue"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="4dp"
         android:text="@string/drawer_latitude_value"
         app:layout_constraintStart_toEndOf="@+id/drawer_lat"
         app:layout_constraintTop_toBottomOf="@+id/drawer_sat_img" />

app/src/main/res/values/strings.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">LookingSat</string>
+    <string name="app_name">Look4Sat</string>
-    <string name="title">L∞king</string>
+    <string name="title">L∞king \n4Sat…</string>
-    <string name="subtitle">S@t</string>
 
     <string name="drawer_latitude">Latitude: </string>
     <string name="drawer_latitude_value">51.5074</string>
@@ -18,6 +17,7 @@
     <string name="menu_sky">Sky at a Glance</string>
     <string name="menu_radar">Radar View</string>
     <string name="menu_map">World Map View</string>
+    <string name="menu_settings">Settings</string>
     <string name="menu_credits">Credits</string>
     <string name="menu_about">About the App</string>
 
@@ -35,8 +35,11 @@
     <string name="btn_ok">OK</string>
     <string name="btn_cancel">Cancel</string>
     <string name="btn_clear">Clear All</string>
+    <string name="btn_no">No</string>
+    <string name="btn_yes">Yes</string>
 
-    <string name="title_select_sat">Select satellites to track</string>
+    <string name="dialog_select_sat">Select satellites to track</string>
+    <string name="dialog_show_track">Show ground track for…</string>
 
     <string name="pref_gsp_title">Ground station position settings</string>
     <string name="pref_lat_title">Latitude</string>
@@ -65,13 +68,11 @@
     <string name="tle_main_list_file_name">tleFile.txt</string>
     <string name="tle_selection_file_name">tleSelection</string>
 
-    <string name="no">No</string>
-    <string name="yes">Yes</string>
-
     <string name="no_mode">Mode: Null</string>
     <string name="no_uplink">Uplink: Null</string>
     <string name="no_downlink">Downlink: Null</string>
     <string name="no_trans">No transmitters found for this Satellite</string>
+    <string name="no_selected_sat">No satellites were shortlisted</string>
 
     <string name="trans_description">ARGOS-3 A-DCS 465.9875MHz</string>
     <string name="trans_downlink">Downlink: 465.9875 MHz</string>
@@ -88,7 +89,7 @@
     <string name="pattern_trans_downlink_low">Downlink: %.4f MHz</string>
     <string name="pattern_trans_downlink_lowHigh">Downlink: %.4f - %.4f MHz</string>
 
+    <string name="map_gsp">GSP</string>
     <string name="map_content">Nasa Map</string>
     <string name="placeholder">Placeholder</string>
-    <string name="menu_settings">Settings</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -10,14 +10,16 @@
         <item name="colorOnSecondary">@color/darkOnLight</item>
         <item name="colorOnSurface">@color/lightOnDark</item>
         <item name="colorOnError">@color/lightOnDark</item>
-    </style>
 
-    <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
+    <style name="AppTheme.Splash" parent="AppTheme">
+        <item name="android:windowBackground">@drawable/splash_drawable</item>
+    </style>
+
     <style name="DrawerHeader">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -25,7 +27,7 @@
     </style>
 
     <style name="DrawerHeader.Title">
-        <item name="android:textSize">40sp</item>
+        <item name="android:textSize">42sp</item>
         <item name="android:textStyle">bold</item>
     </style>