Added second recycler for current passes. FAB now initiates passes recalculation. Minor fixes.

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#C0C0C0"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#C0C0C0"
-        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,17h18v-2L3,15v2zM3,20h18v-1L3,19v1zM3,13h18v-3L3,10v3zM3,4v4h18L21,4L3,4z" />
-</vector>

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

@@ -1,10 +1,8 @@
 <?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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.SkyFragment">
+    android:layout_height="match_parent">
 
     <ProgressBar
         android:id="@+id/sky_progressbar"
@@ -12,20 +10,32 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="@+id/sky_recycler"
-        app:layout_constraintEnd_toEndOf="@+id/sky_recycler"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/sky_recycler"
+        android:id="@+id/sky_recycler_current"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </androidx.recyclerview.widget.RecyclerView>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/sky_recycler_future"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/sky_recycler_current">
+
+    </androidx.recyclerview.widget.RecyclerView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/sky_fab"
@@ -37,4 +47,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/ic_sat_asc_left" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/drawer_menu.xml

@@ -6,12 +6,8 @@
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_sky"
-            android:icon="@drawable/ic_sky"
-            android:title="@string/menu_sky" />
-        <item
-            android:id="@+id/nav_single_sat"
             android:icon="@drawable/ic_sat_asc_right"
-            android:title="@string/menu_single_sat" />
+            android:title="@string/menu_sky" />
         <item
             android:id="@+id/nav_map"
             android:icon="@drawable/ic_map"

app/src/main/res/navigation/nav_graph.xml

@@ -11,12 +11,6 @@
         android:label="@string/menu_sky"
         tools:layout="@layout/fragment_sky" />
 
-    <fragment
-        android:id="@+id/nav_single_sat"
-        android:name="com.rtbishop.lookingsat.ui.SkyFragment"
-        android:label="@string/menu_single_sat"
-        tools:layout="@layout/fragment_sky" />
-
     <fragment
         android:id="@+id/nav_radar"
         android:name="com.rtbishop.lookingsat.ui.RadarFragment"

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

@@ -13,7 +13,6 @@
 
     <string name="menu_sky">Sky at a Glance</string>
     <string name="menu_radar">Radar View</string>
-    <string name="menu_single_sat">Single Sat Passes</string>
     <string name="menu_map">World Map View</string>
     <string name="menu_credits">Credits</string>
     <string name="menu_about">About the App</string>

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

@@ -58,7 +58,7 @@
     <style name="ToolbarButton">
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>
-        <item name="android:src">@drawable/ic_refresh</item>
+        <item name="android:src">@drawable/ic_pass_prefs</item>
         <item name="android:backgroundTint">@color/toolbarButton</item>
     </style>