From cf45824ccfa4c133521f401d12eaba46d337b0be Mon Sep 17 00:00:00 2001
From: Spud <sogden3@alaska.edu>
Date: Wed, 10 Aug 2022 23:23:27 -0700
Subject: [PATCH 01/14] Added a privacy policy for data collection

---
 privacy_policy.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 privacy_policy.md

diff --git a/privacy_policy.md b/privacy_policy.md
new file mode 100644
index 0000000..328414a
--- /dev/null
+++ b/privacy_policy.md
@@ -0,0 +1,3 @@
+# Privacy Policy
+
+Your data is not collected. The only requests made to a server are for fetching bus [schedules](https://github.com/yeSpud/MACSTransitApp/blob/Production/app/src/main/java/fnsb/macstransit/activities/loadingactivity/loadingscreenrunnables/DownloadMasterSchedule.kt#L25) and [locations](https://github.com/yeSpud/MACSTransitApp/blob/Production/app/src/main/java/fnsb/macstransit/activities/mapsactivity/UpdateCoroutine.kt#L51).

From 24bef620cc38b670ef183e11ab588a756a5162e1 Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:39:42 -0800
Subject: [PATCH 02/14] Added floating action buttons to map activity

---
 app/build.gradle                          |  1 +
 app/src/main/res/layout/activity_maps.xml | 52 +++++++++++++++++++----
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 43a900f..3f18b2c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,6 +69,7 @@ dependencies {
     implementation 'androidx.annotation:annotation-jvm:1.9.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'com.orhanobut:dialogplus:1.11@aar'
+    implementation 'com.google.android.material:material:1.13.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.json:json:20250517'
     androidTestImplementation 'androidx.test.ext:junit:1.3.0'
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index c7bb128..f8a188a 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -1,19 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
         <variable
             name="viewmodel"
             type="fnsb.macstransit.activities.mapsactivity.MapsViewModel" />
-
     </data>
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/map"
-        android:name="com.google.android.gms.maps.SupportMapFragment"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".activities.mapsactivity.MapsActivity" />
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_margin="10dp"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true">
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/manage_routes"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="top|end"
+                app:fabSize="normal" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/view_fares"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                app:fabSize="mini"
+                android:layout_alignParentEnd="true" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/settings"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                app:fabSize="mini" />
+
+        </LinearLayout>
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/map"
+            android:name="com.google.android.gms.maps.SupportMapFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:context=".activities.mapsactivity.MapsActivity" />
+
+    </RelativeLayout>
+
 </layout>
\ No newline at end of file

From 84cf406216684ef00cb0a5b9efa480d3dc3fc69e Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 22 Oct 2025 18:40:57 -0800
Subject: [PATCH 03/14] Added buttons for settings, fares, and future route
 menu

---
 .../activities/mapsactivity/MapsActivity.kt   | 21 ++++++-----
 app/src/main/res/layout/activity_maps.xml     | 36 ++++++++++++-------
 app/src/main/res/values/styles.xml            |  4 +--
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
index 2d285cc..a7161eb 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
@@ -39,7 +39,7 @@ class MapsActivity: FragmentActivity() {
 	/**
 	 * Create a variable to store our fare popup window instance.
 	 */
-	private lateinit var farePopupWindow: FarePopupWindow
+	lateinit var farePopupWindow: FarePopupWindow
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		Log.v("onCreate", "onCreate has been called!")
@@ -52,6 +52,7 @@ class MapsActivity: FragmentActivity() {
 		val binding: ActivityMapsBinding = ActivityMapsBinding.inflate(layoutInflater)
 		binding.viewmodel = viewModel
 		binding.lifecycleOwner = this
+		binding.activity = this
 
 		// Set the activity view to the map activity layout.
 		setContentView(binding.root)
@@ -217,14 +218,7 @@ class MapsActivity: FragmentActivity() {
 					}
 
 					// Check if the item that was selected was the settings button.
-					R.id.settings -> {
-
-						// Create the intent to launch the settings activity.
-						val settingsIntent = android.content.Intent(this, SettingsActivity::class.java)
-
-						// Start the settings activity.
-						startActivity(settingsIntent)
-					}
+					R.id.settings -> launchSettingsActivity()
 
 					// Check if the item that was selected was the fares button.
 					R.id.fares -> farePopupWindow.showFarePopupWindow()
@@ -305,6 +299,15 @@ class MapsActivity: FragmentActivity() {
 		}
 	}
 
+	fun launchSettingsActivity() {
+
+		// Create the intent to launch the settings activity.
+		val settingsIntent = android.content.Intent(this, SettingsActivity::class.java)
+
+		// Start the settings activity.
+		startActivity(settingsIntent)
+	}
+
 	companion object {
 
 		/**
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index f8a188a..454f593 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -7,25 +7,37 @@
         <variable
             name="viewmodel"
             type="fnsb.macstransit.activities.mapsactivity.MapsViewModel" />
+
+        <variable
+            name="activity"
+            type="fnsb.macstransit.activities.mapsactivity.MapsActivity" />
     </data>
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/map"
+            android:name="com.google.android.gms.maps.SupportMapFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:context=".activities.mapsactivity.MapsActivity" />
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_margin="10dp"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true">
+            android:layout_gravity="top|end">
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/manage_routes"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_gravity="top|end"
+                android:backgroundTint="@color/colorPrimary"
+                android:src="@drawable/amu_bubble_mask"
                 app:fabSize="normal" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -33,23 +45,21 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 app:fabSize="mini"
-                android:layout_alignParentEnd="true" />
+                android:backgroundTint="@color/colorPrimary"
+                android:src="@drawable/ic_launcher_foreground"
+                android:onClick="@{() -> activity.farePopupWindow.showFarePopupWindow()}"/>
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/settings"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                app:fabSize="mini" />
+                app:fabSize="mini"
+                android:backgroundTint="@color/colorPrimary"
+                android:src="@drawable/settings"
+                android:onClick="@{() -> activity.launchSettingsActivity()}"/>
 
         </LinearLayout>
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/map"
-            android:name="com.google.android.gms.maps.SupportMapFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:context=".activities.mapsactivity.MapsActivity" />
-
-    </RelativeLayout>
+    </FrameLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a649c31..80342a7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,14 +1,14 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="ThemeOverlay.AppCompat.ActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="android:windowBackground">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppThemeNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppThemeNoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="android:background">@color/colorPrimaryDark</item>

From e4ae767e15e8e61e66efff082cd8e4ca84b2b1ee Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 22 Oct 2025 18:41:03 -0800
Subject: [PATCH 04/14] Added settings icon

---
 app/src/main/res/drawable/settings.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 app/src/main/res/drawable/settings.xml

diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml
new file mode 100644
index 0000000..c7ca159
--- /dev/null
+++ b/app/src/main/res/drawable/settings.xml
@@ -0,0 +1,10 @@
+<!--Settings icon by Icons8 -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="50dp"
+    android:height="50dp"
+    android:viewportWidth="50"
+    android:viewportHeight="50">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M47.16,21.221l-5.91,-0.966c-0.346,-1.186 -0.819,-2.326 -1.411,-3.405l3.45,-4.917c0.279,-0.397 0.231,-0.938 -0.112,-1.282l-3.889,-3.887c-0.347,-0.346 -0.893,-0.391 -1.291,-0.104l-4.843,3.481c-1.089,-0.602 -2.239,-1.08 -3.432,-1.427l-1.031,-5.886C28.607,2.35 28.192,2 27.706,2h-5.5c-0.49,0 -0.908,0.355 -0.987,0.839l-0.956,5.854c-1.2,0.345 -2.352,0.818 -3.437,1.412l-4.83,-3.45c-0.399,-0.285 -0.942,-0.239 -1.289,0.106L6.82,10.648c-0.343,0.343 -0.391,0.883 -0.112,1.28l3.399,4.863c-0.605,1.095 -1.087,2.254 -1.438,3.46l-5.831,0.971c-0.482,0.08 -0.836,0.498 -0.836,0.986v5.5c0,0.485 0.348,0.9 0.825,0.985l5.831,1.034c0.349,1.203 0.831,2.362 1.438,3.46l-3.441,4.813c-0.284,0.397 -0.239,0.942 0.106,1.289l3.888,3.891c0.343,0.343 0.884,0.391 1.281,0.112l4.87,-3.411c1.093,0.601 2.248,1.078 3.445,1.424l0.976,5.861C21.3,47.647 21.717,48 22.206,48h5.5c0.485,0 0.9,-0.348 0.984,-0.825l1.045,-5.89c1.199,-0.353 2.348,-0.833 3.43,-1.435l4.905,3.441c0.398,0.281 0.938,0.232 1.282,-0.111l3.888,-3.891c0.346,-0.347 0.391,-0.894 0.104,-1.292l-3.498,-4.857c0.593,-1.08 1.064,-2.222 1.407,-3.408l5.918,-1.039c0.479,-0.084 0.827,-0.5 0.827,-0.985v-5.5C47.999,21.718 47.644,21.3 47.16,21.221zM25,32c-3.866,0 -7,-3.134 -7,-7c0,-3.866 3.134,-7 7,-7s7,3.134 7,7C32,28.866 28.866,32 25,32z"/>
+</vector>

From afd9c6785ca96831069b9e5a745d0e52e69ea4c7 Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 29 Oct 2025 18:21:42 -0800
Subject: [PATCH 05/14] Created a custom view for selectable routes in the
 custom menu

---
 app/src/main/res/layout/activity_maps.xml    |  2 +
 app/src/main/res/layout/selectable_route.xml | 42 ++++++++++++++++++++
 app/src/main/res/values/strings.xml          |  2 +
 3 files changed, 46 insertions(+)
 create mode 100644 app/src/main/res/layout/selectable_route.xml

diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 454f593..7239d44 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -27,6 +27,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="end"
             android:orientation="vertical"
             android:layout_margin="10dp"
             android:layout_gravity="top|end">
@@ -45,6 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 app:fabSize="mini"
+                android:layout_marginTop="10dp"
                 android:backgroundTint="@color/colorPrimary"
                 android:src="@drawable/ic_launcher_foreground"
                 android:onClick="@{() -> activity.farePopupWindow.showFarePopupWindow()}"/>
diff --git a/app/src/main/res/layout/selectable_route.xml b/app/src/main/res/layout/selectable_route.xml
new file mode 100644
index 0000000..59a5f70
--- /dev/null
+++ b/app/src/main/res/layout/selectable_route.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <CheckBox
+        android:id="@+id/selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal|start"
+        android:layout_gravity="center_horizontal|start"/>
+
+    <ImageView
+        android:id="@+id/broadcasting"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/not_broadcasting"/>
+
+    <TextView
+        android:id="@+id/route_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"
+        android:textSize="25sp"
+        android:layout_marginStart="20dp"
+        android:background="@drawable/rounded_corner" />
+
+    <!--<TextView
+        android:id="@+id/route_frequency"
+        android:layout_width="wrap_content"
+        android:textSize="25sp"
+        android:layout_height="wrap_content"/>-->
+
+    <CheckBox
+        android:id="@+id/favorite_route"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal|start"
+        android:layout_gravity="center_horizontal|end"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b3eaac..1216c89 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,6 +29,8 @@
     <!-- Menu -->
     <string name="settings">Settings</string>
     <string name="enable_night_mode">Enable dark theme</string>
+    <string name="not_broadcasting">This route does not have any routes broadcasting their location</string>
+    <string name="broadcasting">This route is broadcasting their location</string>
 
     <!-- Bus fares -->
     <string name="view_fares">View bus fares</string>

From f565475fa953cfbfb8a38c3feead5555e344073a Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Mon, 3 Nov 2025 18:27:24 -0900
Subject: [PATCH 06/14] Added MVP route menu

---
 .../activities/mapsactivity/MapsActivity.kt   | 15 ++++++
 .../mapsactivity/mappopups/RouteMenu.kt       | 47 +++++++++++++++++++
 .../mapsactivity/mappopups/SelectableRoute.kt | 37 +++++++++++++++
 .../mapsactivity/mappopups/StopDialog.kt      |  4 --
 app/src/main/res/layout/activity_maps.xml     |  5 +-
 app/src/main/res/layout/route_menu.xml        | 24 ++++++++++
 app/src/main/res/layout/selectable_route.xml  |  2 +-
 7 files changed, 127 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
 create mode 100644 app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/SelectableRoute.kt
 create mode 100644 app/src/main/res/layout/route_menu.xml

diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
index a7161eb..c95493d 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
@@ -5,6 +5,7 @@ import fnsb.macstransit.routematch.Route
 import fnsb.macstransit.settings.V2
 import fnsb.macstransit.R
 import android.util.Log
+import android.view.Gravity
 import android.view.Menu
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -15,9 +16,11 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.gms.maps.SupportMapFragment
+import com.orhanobut.dialogplus.DialogPlus
 import fnsb.macstransit.activities.LoadedRoutes
 import fnsb.macstransit.activities.SettingsActivity
 import fnsb.macstransit.activities.mapsactivity.mappopups.FarePopupWindow
+import fnsb.macstransit.activities.mapsactivity.mappopups.RouteMenu
 import fnsb.macstransit.databinding.ActivityMapsBinding
 import fnsb.macstransit.routematch.Bus
 import fnsb.macstransit.routematch.SharedStop
@@ -41,6 +44,8 @@ class MapsActivity: FragmentActivity() {
 	 */
 	lateinit var farePopupWindow: FarePopupWindow
 
+	lateinit var routeMenu: DialogPlus
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		Log.v("onCreate", "onCreate has been called!")
 		super.onCreate(savedInstanceState)
@@ -99,6 +104,16 @@ class MapsActivity: FragmentActivity() {
 
 			WindowInsetsCompat.CONSUMED
 		}
+
+		routeMenu = DialogPlus.newDialog(this)
+			.setAdapter(RouteMenu(this))
+			.setContentBackgroundResource(R.color.colorPrimaryDark)
+			.setExpanded(true)
+			.setGravity(Gravity.CENTER)
+			.create()
+
+		// val closeButton = routeMenu.findViewById(R.id.close)
+		// closeButton.setOnClickListener { routeMenu.dismiss() }
 	}
 
 	override fun onDestroy() {
diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
new file mode 100644
index 0000000..443e86d
--- /dev/null
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
@@ -0,0 +1,47 @@
+package fnsb.macstransit.activities.mapsactivity.mappopups
+
+import android.content.res.ColorStateList
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.LinearLayout
+import fnsb.macstransit.R
+import fnsb.macstransit.activities.LoadedRoutes
+import fnsb.macstransit.activities.mapsactivity.MapsActivity
+
+class RouteMenu(private val context: MapsActivity): BaseAdapter() {
+
+	override fun getCount(): Int {
+		return 1
+	}
+
+	override fun getItem(position: Int): Any {
+		return position // Todo properly implement me?
+	}
+
+	override fun getItemId(position: Int): Long {
+		return position.toLong() // Todo properly implement me?
+	}
+
+	override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View? {
+		val layoutInflater: LayoutInflater = LayoutInflater.from(context)
+		val view = convertView ?: layoutInflater.inflate(R.layout.route_menu, parent,
+			false)
+		val routesContainer: LinearLayout = view.findViewById(R.id.routes)
+
+		for ((name, route) in LoadedRoutes.routes) {
+			val selectableRoute = SelectableRoute(context)
+			selectableRoute.routeName.text = name
+			selectableRoute.routeName.backgroundTintList = ColorStateList.valueOf(route.color)
+			selectableRoute.selected.isChecked = route.enabled
+
+			routesContainer.addView(selectableRoute)
+		}
+
+		// view.set
+
+		return view
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/SelectableRoute.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/SelectableRoute.kt
new file mode 100644
index 0000000..aa32532
--- /dev/null
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/SelectableRoute.kt
@@ -0,0 +1,37 @@
+package fnsb.macstransit.activities.mapsactivity.mappopups
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.CheckBox
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import fnsb.macstransit.R
+
+class SelectableRoute : LinearLayout {
+
+	val selected: CheckBox
+
+	val broadcastingIcon: ImageView
+
+	val routeName: TextView
+
+	// val routeFrequency: TextView
+
+	val favoriteRoute: CheckBox
+
+
+	constructor(context: Context): this(context, null)
+	constructor(context: Context, attributeSet: AttributeSet?): this(context, attributeSet, 0)
+	constructor(context: Context, attributeSet: AttributeSet?, defStyleAttr: Int) : super(context,
+		attributeSet, defStyleAttr) {
+		inflate(context, R.layout.selectable_route, this)
+
+		selected = findViewById(R.id.selected)
+		broadcastingIcon = findViewById(R.id.broadcasting_icon)
+		routeName = findViewById(R.id.route_name)
+		// routeFrequency = findViewById(R.id.route_frequency)
+		favoriteRoute = findViewById(R.id.favorite_route)
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/StopDialog.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/StopDialog.kt
index 37abcdb..89a03cc 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/StopDialog.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/StopDialog.kt
@@ -9,7 +9,6 @@ import android.widget.BaseAdapter
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.TextView
-import androidx.lifecycle.lifecycleScope
 import com.android.volley.VolleyError
 import fnsb.macstransit.R
 import fnsb.macstransit.activities.mapsactivity.MapsActivity
@@ -17,9 +16,6 @@ import fnsb.macstransit.activities.mapsactivity.MapsViewModel.Companion.formatTi
 import fnsb.macstransit.activities.mapsactivity.MapsViewModel.Companion.getTime
 import fnsb.macstransit.routematch.Route
 import fnsb.macstransit.routematch.RouteMatch
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 7239d44..34be9cc 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -39,7 +39,8 @@
                 android:layout_gravity="top|end"
                 android:backgroundTint="@color/colorPrimary"
                 android:src="@drawable/amu_bubble_mask"
-                app:fabSize="normal" />
+                app:fabSize="normal"
+                android:onClick="@{() -> activity.routeMenu.show()}"/>
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/view_fares"
@@ -58,7 +59,7 @@
                 app:fabSize="mini"
                 android:backgroundTint="@color/colorPrimary"
                 android:src="@drawable/settings"
-                android:onClick="@{() -> activity.launchSettingsActivity()}"/>
+                android:onClick="@{() -> activity.routeMenu.show()}"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/route_menu.xml b/app/src/main/res/layout/route_menu.xml
new file mode 100644
index 0000000..8f9c42a
--- /dev/null
+++ b/app/src/main/res/layout/route_menu.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimaryDark"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/routes"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:divider="@drawable/divider"
+        android:showDividers="middle">
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/close"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/selectable_route.xml b/app/src/main/res/layout/selectable_route.xml
index 59a5f70..30fcfd3 100644
--- a/app/src/main/res/layout/selectable_route.xml
+++ b/app/src/main/res/layout/selectable_route.xml
@@ -12,7 +12,7 @@
         android:layout_gravity="center_horizontal|start"/>
 
     <ImageView
-        android:id="@+id/broadcasting"
+        android:id="@+id/broadcasting_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/not_broadcasting"/>

From b3751df5901adcbe78d712846f51bdb95d68c815 Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 5 Nov 2025 18:37:48 -0900
Subject: [PATCH 07/14] Added close button to menu

---
 .../activities/mapsactivity/MapsActivity.kt   | 12 +++-
 .../mapsactivity/mappopups/RouteMenu.kt       | 55 +++++++++++++++++--
 app/src/main/res/layout/route_menu.xml        | 16 +++++-
 app/src/main/res/layout/selectable_route.xml  |  3 +-
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
index c95493d..1959617 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
@@ -7,6 +7,7 @@ import fnsb.macstransit.R
 import android.util.Log
 import android.view.Gravity
 import android.view.Menu
+import android.view.ViewGroup
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
@@ -37,7 +38,7 @@ class MapsActivity: FragmentActivity() {
 	 * The view model for the maps activity.
 	 * This is usually where all the large functions and additional properties are.
 	 */
-	private lateinit var viewModel: MapsViewModel
+	lateinit var viewModel: MapsViewModel
 
 	/**
 	 * Create a variable to store our fare popup window instance.
@@ -108,8 +109,10 @@ class MapsActivity: FragmentActivity() {
 		routeMenu = DialogPlus.newDialog(this)
 			.setAdapter(RouteMenu(this))
 			.setContentBackgroundResource(R.color.colorPrimaryDark)
-			.setExpanded(true)
+			.setExpanded(false)
 			.setGravity(Gravity.CENTER)
+			.setContentWidth(ViewGroup.LayoutParams.MATCH_PARENT)
+			.setContentHeight(ViewGroup.LayoutParams.WRAP_CONTENT)
 			.create()
 
 		// val closeButton = routeMenu.findViewById(R.id.close)
@@ -165,6 +168,7 @@ class MapsActivity: FragmentActivity() {
 		Log.v("onDestroy", "Finished onDestroy")
 	}
 
+	/*
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		Log.v("onCreateOptionsMenu", "onCreateOptionsMenu has been called!")
 
@@ -180,8 +184,9 @@ class MapsActivity: FragmentActivity() {
 
 		// Return what ever the default behaviour would be when calling this method if it were not overridden.
 		return super.onCreateOptionsMenu(menu)
-	}
+	}*/
 
+	/*
 	override fun onPrepareOptionsMenu(menu: Menu): Boolean {
 		Log.v("onPrepareOptionsMenu", "onPrepareOptionsMenu has been called!")
 
@@ -202,6 +207,7 @@ class MapsActivity: FragmentActivity() {
 		// Return what ever the default behaviour would be when calling this method if it were not overridden.
 		return super.onPrepareOptionsMenu(menu)
 	}
+	 */
 
 	override fun onOptionsItemSelected(item: android.view.MenuItem): Boolean {
 		Log.v("onOptionsItemSelected", "onOptionsItemSelected has been called!")
diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
index 443e86d..0cd7410 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
@@ -1,16 +1,24 @@
 package fnsb.macstransit.activities.mapsactivity.mappopups
 
 import android.content.res.ColorStateList
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
+import android.widget.Button
 import android.widget.LinearLayout
 import fnsb.macstransit.R
 import fnsb.macstransit.activities.LoadedRoutes
 import fnsb.macstransit.activities.mapsactivity.MapsActivity
+import fnsb.macstransit.settings.CurrentSettings
+import fnsb.macstransit.settings.V2
 
-class RouteMenu(private val context: MapsActivity): BaseAdapter() {
+class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
+
+	private var setup = false
+
+	private val settings = CurrentSettings.settingsImplementation as V2
 
 	override fun getCount(): Int {
 		return 1
@@ -25,21 +33,60 @@ class RouteMenu(private val context: MapsActivity): BaseAdapter() {
 	}
 
 	override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View? {
-		val layoutInflater: LayoutInflater = LayoutInflater.from(context)
+		val layoutInflater: LayoutInflater = LayoutInflater.from(mapsActivity)
 		val view = convertView ?: layoutInflater.inflate(R.layout.route_menu, parent,
 			false)
 		val routesContainer: LinearLayout = view.findViewById(R.id.routes)
+		val closeButton: Button = view.findViewById(R.id.close)
+
+		if (setup) {
+			return view
+		}
+		Log.d("RouteMenu", "Setting up menu for first time")
 
 		for ((name, route) in LoadedRoutes.routes) {
-			val selectableRoute = SelectableRoute(context)
+			val selectableRoute = SelectableRoute(mapsActivity)
 			selectableRoute.routeName.text = name
 			selectableRoute.routeName.backgroundTintList = ColorStateList.valueOf(route.color)
+
 			selectableRoute.selected.isChecked = route.enabled
+			selectableRoute.selected.setOnCheckedChangeListener { _, isChecked ->
+				LoadedRoutes.routes[name]!!.enabled = isChecked
+
+				// todo: Only redraw on menu close
+
+				// Try to (re)draw the buses onto the map.
+				// Because we are iterating a static variable that is modified on a different thread
+				// there is a possibility of a concurrent modification.
+				try {
+					mapsActivity.viewModel.drawBuses()
+				} catch (e: ConcurrentModificationException) {
+					Log.e("onOptionsItemSelected",
+						"Unable to redraw all buses due to concurrent modification", e)
+				}
+
+				// (Re) draw the stops onto the map.
+				mapsActivity.viewModel.drawStops()
+
+				// (Re) draw the routes onto the map (if enabled).
+				if (settings.polylines) {
+					mapsActivity.viewModel.drawRoutes()
+				}
+			}
+
+			selectableRoute.favoriteRoute.isChecked = settings.favoriteRouteNames.contains(name)
+			selectableRoute.favoriteRoute.setOnCheckedChangeListener { _, isChecked ->
+				// TODO
+			}
 
 			routesContainer.addView(selectableRoute)
 		}
 
-		// view.set
+		closeButton.setOnClickListener {
+			mapsActivity.routeMenu.dismiss()
+		}
+
+		setup = true
 
 		return view
 	}
diff --git a/app/src/main/res/layout/route_menu.xml b/app/src/main/res/layout/route_menu.xml
index 8f9c42a..b1d49d9 100644
--- a/app/src/main/res/layout/route_menu.xml
+++ b/app/src/main/res/layout/route_menu.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/colorPrimaryDark"
     android:orientation="vertical">
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"
+        android:text="@string/route_menu_header"
+        android:textSize="35sp"
+        android:layout_marginTop="10dp"
+        android:textAlignment="center"
+        android:layout_gravity="center_horizontal"/>
+
     <LinearLayout
         android:id="@+id/routes"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:divider="@drawable/divider"
@@ -19,6 +29,8 @@
         android:id="@+id/close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_gravity="center_horizontal"
         android:text="@string/close"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/selectable_route.xml b/app/src/main/res/layout/selectable_route.xml
index 30fcfd3..d118f55 100644
--- a/app/src/main/res/layout/selectable_route.xml
+++ b/app/src/main/res/layout/selectable_route.xml
@@ -37,6 +37,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal|start"
-        android:layout_gravity="center_horizontal|end"/>
+        android:layout_gravity="center_horizontal|end"
+        style="?android:attr/starStyle"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1216c89..1be9be9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
     <string name="enable_night_mode">Enable dark theme</string>
     <string name="not_broadcasting">This route does not have any routes broadcasting their location</string>
     <string name="broadcasting">This route is broadcasting their location</string>
+    <string name="route_menu_header">Select routes to show</string>
 
     <!-- Bus fares -->
     <string name="view_fares">View bus fares</string>

From b02e7b88754704f2f7b6437d7d47059789863950 Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 26 Nov 2025 08:34:08 -0800
Subject: [PATCH 08/14] Save favorite routes on close

---
 app/build.gradle                              |  4 +-
 .../activities/mapsactivity/MapsActivity.kt   |  7 ++-
 .../mapsactivity/mappopups/RouteMenu.kt       | 46 +++++++++++++++++--
 app/src/main/res/layout/activity_maps.xml     |  2 +-
 build.gradle                                  |  2 +-
 5 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3f18b2c..8afe48a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,10 +62,10 @@ dependencies {
     implementation 'com.android.volley:volley:1.2.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0'
     implementation 'com.google.maps.android:maps-ktx:5.2.1'
     implementation 'com.google.maps.android:maps-utils-ktx:5.2.1'
-    implementation 'com.google.maps.android:android-maps-utils:3.19.0'
+    implementation 'com.google.maps.android:android-maps-utils:3.19.1'
     implementation 'androidx.annotation:annotation-jvm:1.9.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'com.orhanobut:dialogplus:1.11@aar'
diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
index 1959617..ad1d85f 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
@@ -113,10 +113,8 @@ class MapsActivity: FragmentActivity() {
 			.setGravity(Gravity.CENTER)
 			.setContentWidth(ViewGroup.LayoutParams.MATCH_PARENT)
 			.setContentHeight(ViewGroup.LayoutParams.WRAP_CONTENT)
+			.setOnDismissListener { dialog -> RouteMenu.onDismissListener(this, dialog) }
 			.create()
-
-		// val closeButton = routeMenu.findViewById(R.id.close)
-		// closeButton.setOnClickListener { routeMenu.dismiss() }
 	}
 
 	override fun onDestroy() {
@@ -209,6 +207,7 @@ class MapsActivity: FragmentActivity() {
 	}
 	 */
 
+	/*
 	override fun onOptionsItemSelected(item: android.view.MenuItem): Boolean {
 		Log.v("onOptionsItemSelected", "onOptionsItemSelected has been called!")
 
@@ -295,7 +294,7 @@ class MapsActivity: FragmentActivity() {
 
 		// Return what ever the default behaviour would be when calling this method if it were not overridden.
 		return super.onOptionsItemSelected(item)
-	}
+	}*/
 
 	override fun onResume() {
 		Log.v("onResume", "onResume has been called!")
diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
index 0cd7410..9e557bb 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
@@ -1,5 +1,6 @@
 package fnsb.macstransit.activities.mapsactivity.mappopups
 
+import android.content.Context
 import android.content.res.ColorStateList
 import android.util.Log
 import android.view.LayoutInflater
@@ -8,18 +9,20 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.Button
 import android.widget.LinearLayout
+import androidx.core.view.children
+import com.orhanobut.dialogplus.DialogPlus
 import fnsb.macstransit.R
 import fnsb.macstransit.activities.LoadedRoutes
 import fnsb.macstransit.activities.mapsactivity.MapsActivity
+import fnsb.macstransit.routematch.Route
 import fnsb.macstransit.settings.CurrentSettings
 import fnsb.macstransit.settings.V2
+import org.json.JSONException
 
 class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 
 	private var setup = false
 
-	private val settings = CurrentSettings.settingsImplementation as V2
-
 	override fun getCount(): Int {
 		return 1
 	}
@@ -44,6 +47,7 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 		}
 		Log.d("RouteMenu", "Setting up menu for first time")
 
+		val settings = CurrentSettings.settingsImplementation as V2
 		for ((name, route) in LoadedRoutes.routes) {
 			val selectableRoute = SelectableRoute(mapsActivity)
 			selectableRoute.routeName.text = name
@@ -75,9 +79,10 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 			}
 
 			selectableRoute.favoriteRoute.isChecked = settings.favoriteRouteNames.contains(name)
+			/*
 			selectableRoute.favoriteRoute.setOnCheckedChangeListener { _, isChecked ->
 				// TODO
-			}
+			}*/
 
 			routesContainer.addView(selectableRoute)
 		}
@@ -91,4 +96,39 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 		return view
 	}
 
+	companion object {
+		fun onDismissListener(context: Context, dialog: DialogPlus) {
+			val favoritedRoutes: MutableList<Route> = mutableListOf()
+
+			val routesContainer: LinearLayout = dialog.findViewById(R.id.routes) as LinearLayout
+
+			for (selectableRoute in routesContainer.children) {
+				if (selectableRoute !is SelectableRoute) {
+					Log.w("onDismissListener", "Entry in routes container isn't selectable route")
+				}
+
+				if ((selectableRoute as SelectableRoute).favoriteRoute.isChecked) {
+					val route = LoadedRoutes.routes[selectableRoute.routeName.text]
+					favoritedRoutes.add(route!!)
+				}
+			}
+
+			val settings = CurrentSettings.settingsImplementation as V2
+			val settingsJson = try {
+				settings.formatSettingsToJsonString(
+					settings.traffic,
+					settings.darktheme, settings.polylines,
+					settings.streetView, settings.maptype,
+					*favoritedRoutes.toTypedArray()
+				)
+			} catch (e: JSONException) {
+				Log.e("RouteMenu", "Json error when writing settings", e)
+				return
+			}
+			settings.writeSettingsToFile(settingsJson.toString(), context)
+
+			// Reload the settings
+			settings.parseSettings(settingsJson)
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 34be9cc..7c96a8d 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -59,7 +59,7 @@
                 app:fabSize="mini"
                 android:backgroundTint="@color/colorPrimary"
                 android:src="@drawable/settings"
-                android:onClick="@{() -> activity.routeMenu.show()}"/>
+                android:onClick="@{() -> activity.launchSettingsActivity()}"/>
 
         </LinearLayout>
 
diff --git a/build.gradle b/build.gradle
index ecd1c23..bd2e68b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.0'
+        classpath 'com.android.tools.build:gradle:8.13.1'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20'
         classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
 

From 1b2a1d54700300bced6c162e4ab22b8fdae7c12f Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 26 Nov 2025 08:52:18 -0800
Subject: [PATCH 09/14] Only redraw routes on close

---
 .../mapsactivity/mappopups/RouteMenu.kt       | 37 ++++++++++++++++---
 app/src/main/res/layout/selectable_route.xml  |  6 +++
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
index 9e557bb..bb83eb7 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
@@ -54,6 +54,7 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 			selectableRoute.routeName.backgroundTintList = ColorStateList.valueOf(route.color)
 
 			selectableRoute.selected.isChecked = route.enabled
+			/*
 			selectableRoute.selected.setOnCheckedChangeListener { _, isChecked ->
 				LoadedRoutes.routes[name]!!.enabled = isChecked
 
@@ -76,7 +77,7 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 				if (settings.polylines) {
 					mapsActivity.viewModel.drawRoutes()
 				}
-			}
+			}*/
 
 			selectableRoute.favoriteRoute.isChecked = settings.favoriteRouteNames.contains(name)
 			/*
@@ -97,23 +98,29 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 	}
 
 	companion object {
-		fun onDismissListener(context: Context, dialog: DialogPlus) {
-			val favoritedRoutes: MutableList<Route> = mutableListOf()
 
+
+
+		fun onDismissListener(mapsActivity: MapsActivity, dialog: DialogPlus) {
 			val routesContainer: LinearLayout = dialog.findViewById(R.id.routes) as LinearLayout
 
+			val settings = CurrentSettings.settingsImplementation as V2
+
+			val favoritedRoutes: MutableList<Route> = mutableListOf()
 			for (selectableRoute in routesContainer.children) {
 				if (selectableRoute !is SelectableRoute) {
 					Log.w("onDismissListener", "Entry in routes container isn't selectable route")
+					return
 				}
 
-				if ((selectableRoute as SelectableRoute).favoriteRoute.isChecked) {
+				LoadedRoutes.routes[selectableRoute.routeName.text]?.enabled = selectableRoute.selected.isChecked
+
+				if (selectableRoute.favoriteRoute.isChecked) {
 					val route = LoadedRoutes.routes[selectableRoute.routeName.text]
 					favoritedRoutes.add(route!!)
 				}
 			}
 
-			val settings = CurrentSettings.settingsImplementation as V2
 			val settingsJson = try {
 				settings.formatSettingsToJsonString(
 					settings.traffic,
@@ -125,10 +132,28 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 				Log.e("RouteMenu", "Json error when writing settings", e)
 				return
 			}
-			settings.writeSettingsToFile(settingsJson.toString(), context)
+			settings.writeSettingsToFile(settingsJson.toString(), mapsActivity)
 
 			// Reload the settings
 			settings.parseSettings(settingsJson)
+
+			// Try to (re)draw the buses onto the map.
+			// Because we are iterating a static variable that is modified on a different thread
+			// there is a possibility of a concurrent modification.
+			try {
+				mapsActivity.viewModel.drawBuses()
+			} catch (e: ConcurrentModificationException) {
+				Log.e("onOptionsItemSelected",
+					"Unable to redraw all buses due to concurrent modification", e)
+			}
+
+			// (Re) draw the stops onto the map.
+			mapsActivity.viewModel.drawStops()
+
+			// (Re) draw the routes onto the map (if enabled).
+			if (settings.polylines) {
+				mapsActivity.viewModel.drawRoutes()
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/selectable_route.xml b/app/src/main/res/layout/selectable_route.xml
index d118f55..bf6527d 100644
--- a/app/src/main/res/layout/selectable_route.xml
+++ b/app/src/main/res/layout/selectable_route.xml
@@ -9,6 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal|start"
+        android:textColor="@color/white"
         android:layout_gravity="center_horizontal|start"/>
 
     <ImageView
@@ -32,6 +33,11 @@
         android:textSize="25sp"
         android:layout_height="wrap_content"/>-->
 
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+
     <CheckBox
         android:id="@+id/favorite_route"
         android:layout_width="wrap_content"

From 132fae0702d892e6b61cb5185fd845629a92166f Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 26 Nov 2025 09:16:43 -0800
Subject: [PATCH 10/14] Clicking the route name checks the box

---
 .../activities/mapsactivity/MapsActivity.kt   | 157 ++----------------
 .../mapsactivity/mappopups/RouteMenu.kt       |  33 +---
 app/src/main/res/layout/activity_maps.xml     |   2 +-
 3 files changed, 22 insertions(+), 170 deletions(-)

diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
index ad1d85f..afd22ab 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt
@@ -105,16 +105,6 @@ class MapsActivity: FragmentActivity() {
 
 			WindowInsetsCompat.CONSUMED
 		}
-
-		routeMenu = DialogPlus.newDialog(this)
-			.setAdapter(RouteMenu(this))
-			.setContentBackgroundResource(R.color.colorPrimaryDark)
-			.setExpanded(false)
-			.setGravity(Gravity.CENTER)
-			.setContentWidth(ViewGroup.LayoutParams.MATCH_PARENT)
-			.setContentHeight(ViewGroup.LayoutParams.WRAP_CONTENT)
-			.setOnDismissListener { dialog -> RouteMenu.onDismissListener(this, dialog) }
-			.create()
 	}
 
 	override fun onDestroy() {
@@ -166,136 +156,6 @@ class MapsActivity: FragmentActivity() {
 		Log.v("onDestroy", "Finished onDestroy")
 	}
 
-	/*
-	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		Log.v("onCreateOptionsMenu", "onCreateOptionsMenu has been called!")
-
-		// Setup the inflater.
-		menuInflater.inflate(R.menu.menu, menu)
-
-		// Create the menu item that corresponds to the route object.
-		for (name in LoadedRoutes.routes.keys) {
-
-			// Make sure the item is checkable.
-			menu.add(R.id.routes, name.hashCode(), Menu.NONE, name).isCheckable = true
-		}
-
-		// Return what ever the default behaviour would be when calling this method if it were not overridden.
-		return super.onCreateOptionsMenu(menu)
-	}*/
-
-	/*
-	override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-		Log.v("onPrepareOptionsMenu", "onPrepareOptionsMenu has been called!")
-
-		// Iterate through all the routes that can be tracked (if allRoutes isn't null).
-		for ((name, route) in LoadedRoutes.routes) {
-
-			// Determine whether or not the menu item should be checked before hand.
-			val checked: Boolean = route.enabled
-
-			// Set the menu item to be checked if the route it corresponds to is enabled.
-			Log.d("onPrepareOptionsMenu", "Setting $name to be enabled: $checked")
-			menu.findItem(name.hashCode()).isChecked = checked
-		}
-
-		// Check if night mode should be enabled by default, and set the checkbox to that value.
-		menu.findItem(R.id.night_mode).isChecked = (CurrentSettings.settingsImplementation as V2).darktheme
-
-		// Return what ever the default behaviour would be when calling this method if it were not overridden.
-		return super.onPrepareOptionsMenu(menu)
-	}
-	 */
-
-	/*
-	override fun onOptionsItemSelected(item: android.view.MenuItem): Boolean {
-		Log.v("onOptionsItemSelected", "onOptionsItemSelected has been called!")
-
-		// Identify which method to call based on the item ID.
-		// Check if the item that was selected belongs to the other group
-		when (item.groupId) {
-			R.id.other -> {
-
-				// Identify what action to execute based on the item ID.
-				when (item.itemId) {
-
-					// Check if the item that was selected was the night mode toggle.
-					R.id.night_mode -> {
-						if (viewModel.map == null) {
-							return false
-						}
-
-						Log.d("onOptionsItemSelected", "Toggling night mode...")
-
-						// Create a boolean to store the resulting value of the menu item.
-						val enabled = !item.isChecked
-
-						// Toggle night mode
-						MapsViewModel.toggleNightMode(viewModel.map!!, this, enabled)
-
-						// Set the menu item's checked value to that of the enabled value.
-						item.isChecked = enabled
-					}
-
-					// Check if the item that was selected was the settings button.
-					R.id.settings -> launchSettingsActivity()
-
-					// Check if the item that was selected was the fares button.
-					R.id.fares -> farePopupWindow.showFarePopupWindow()
-
-					// Since the item's ID was not part of anything accounted for (uh oh), log it as a warning!
-					else -> Log.w("onOptionsItemSelected", "Unaccounted menu item in the other group was checked!")
-				}
-			}
-
-			// Check if the item that was selected belongs to the routes group.
-			R.id.routes -> {
-
-				// Create a boolean to store the resulting value of the menu item.
-				val enabled = !item.isChecked
-
-				// Get the route that was selected.
-				val route: Route = LoadedRoutes.routes[item.title] ?: return super.onOptionsItemSelected(item)
-
-				// Set the route to enabled.
-				route.enabled = enabled
-				Log.d("onOptionsItemSelected", "Selected route ${route.name}")
-
-				// If the map is null at this point just return early (skip redrawing).
-				if (viewModel.map == null) {
-					return super.onOptionsItemSelected(item)
-				}
-
-				// Try to (re)draw the buses onto the map.
-				// Because we are iterating a static variable that is modified on a different thread
-				// there is a possibility of a concurrent modification.
-				try {
-					viewModel.drawBuses()
-				} catch (e: ConcurrentModificationException) {
-					Log.e("onOptionsItemSelected",
-					      "Unable to redraw all buses due to concurrent modification", e)
-				}
-
-				// (Re) draw the stops onto the map.
-				viewModel.drawStops()
-
-				// (Re) draw the routes onto the map (if enabled).
-				if ((CurrentSettings.settingsImplementation as V2).polylines) {
-					viewModel.drawRoutes()
-				}
-
-				// Set the menu item's checked value to that of the enabled value
-				item.isChecked = enabled
-			}
-
-			// Since the item's ID and group was not part of anything accounted for (uh oh), log it as a warning!
-			else -> Log.w("onOptionsItemSelected", "Unaccounted menu item was checked!")
-		}
-
-		// Return what ever the default behaviour would be when calling this method if it were not overridden.
-		return super.onOptionsItemSelected(item)
-	}*/
-
 	override fun onResume() {
 		Log.v("onResume", "onResume has been called!")
 		super.onResume()
@@ -319,6 +179,23 @@ class MapsActivity: FragmentActivity() {
 		}
 	}
 
+	fun showRoutesMenu() {
+
+		// Constantly recreating the dialog window is wasteful,
+		// but it fixes a bug where after the menu was dismissed its height would be crushed back down to minimums
+		routeMenu = DialogPlus.newDialog(this)
+			.setAdapter(RouteMenu(this))
+			.setContentBackgroundResource(R.color.colorPrimaryDark)
+			.setExpanded(false)
+			.setGravity(Gravity.CENTER)
+			.setContentWidth(ViewGroup.LayoutParams.MATCH_PARENT)
+			.setContentHeight(ViewGroup.LayoutParams.WRAP_CONTENT)
+			.setOnDismissListener { dialog -> RouteMenu.onDismissListener(this, dialog) }
+			.create()
+
+		routeMenu.show()
+	}
+
 	fun launchSettingsActivity() {
 
 		// Create the intent to launch the settings activity.
diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
index bb83eb7..27c0500 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
@@ -54,36 +54,13 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 			selectableRoute.routeName.backgroundTintList = ColorStateList.valueOf(route.color)
 
 			selectableRoute.selected.isChecked = route.enabled
-			/*
-			selectableRoute.selected.setOnCheckedChangeListener { _, isChecked ->
-				LoadedRoutes.routes[name]!!.enabled = isChecked
-
-				// todo: Only redraw on menu close
-
-				// Try to (re)draw the buses onto the map.
-				// Because we are iterating a static variable that is modified on a different thread
-				// there is a possibility of a concurrent modification.
-				try {
-					mapsActivity.viewModel.drawBuses()
-				} catch (e: ConcurrentModificationException) {
-					Log.e("onOptionsItemSelected",
-						"Unable to redraw all buses due to concurrent modification", e)
-				}
-
-				// (Re) draw the stops onto the map.
-				mapsActivity.viewModel.drawStops()
 
-				// (Re) draw the routes onto the map (if enabled).
-				if (settings.polylines) {
-					mapsActivity.viewModel.drawRoutes()
-				}
-			}*/
+			// Clicking the route name also checks the box
+			selectableRoute.routeName.setOnClickListener {
+				selectableRoute.selected.isChecked = !selectableRoute.selected.isChecked
+			}
 
 			selectableRoute.favoriteRoute.isChecked = settings.favoriteRouteNames.contains(name)
-			/*
-			selectableRoute.favoriteRoute.setOnCheckedChangeListener { _, isChecked ->
-				// TODO
-			}*/
 
 			routesContainer.addView(selectableRoute)
 		}
@@ -99,8 +76,6 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 
 	companion object {
 
-
-
 		fun onDismissListener(mapsActivity: MapsActivity, dialog: DialogPlus) {
 			val routesContainer: LinearLayout = dialog.findViewById(R.id.routes) as LinearLayout
 
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 7c96a8d..00c8f73 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -40,7 +40,7 @@
                 android:backgroundTint="@color/colorPrimary"
                 android:src="@drawable/amu_bubble_mask"
                 app:fabSize="normal"
-                android:onClick="@{() -> activity.routeMenu.show()}"/>
+                android:onClick="@{() -> activity.showRoutesMenu()}"/>
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/view_fares"

From 82a0c68b49f9f953b42c2b6f23d18bf70e8f3345 Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 26 Nov 2025 09:47:22 -0800
Subject: [PATCH 11/14] Added icons for broadcasting buses

---
 .../mapsactivity/mappopups/RouteMenu.kt        | 18 ++++++++++++++++++
 .../main/res/drawable/invisible_divider.xml    |  5 +++++
 app/src/main/res/drawable/not_broadcasting.xml | 18 ++++++++++++++++++
 app/src/main/res/drawable/wifi_icon.xml        | 18 ++++++++++++++++++
 app/src/main/res/layout/route_menu.xml         |  6 ++++--
 app/src/main/res/layout/selectable_route.xml   | 14 +++++++-------
 6 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/invisible_divider.xml
 create mode 100644 app/src/main/res/drawable/not_broadcasting.xml
 create mode 100644 app/src/main/res/drawable/wifi_icon.xml

diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
index 27c0500..66a0dc2 100644
--- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
+++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/mappopups/RouteMenu.kt
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.Button
 import android.widget.LinearLayout
+import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.children
 import com.orhanobut.dialogplus.DialogPlus
 import fnsb.macstransit.R
@@ -18,6 +19,7 @@ import fnsb.macstransit.routematch.Route
 import fnsb.macstransit.settings.CurrentSettings
 import fnsb.macstransit.settings.V2
 import org.json.JSONException
+import kotlin.math.PI
 
 class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 
@@ -48,8 +50,24 @@ class RouteMenu(private val mapsActivity: MapsActivity): BaseAdapter() {
 		Log.d("RouteMenu", "Setting up menu for first time")
 
 		val settings = CurrentSettings.settingsImplementation as V2
+
+		val routesWithBuses = mutableListOf<String>()
+		for (bus in mapsActivity.viewModel.buses) {
+			if (!routesWithBuses.contains(bus.route.name)) {
+				routesWithBuses.add(bus.route.name)
+			}
+		}
+
 		for ((name, route) in LoadedRoutes.routes) {
 			val selectableRoute = SelectableRoute(mapsActivity)
+
+			// If the route has buses broadcasting then set the icon appropriately
+			if (routesWithBuses.contains(name)) {
+				selectableRoute.broadcastingIcon.setImageResource(R.drawable.wifi_icon)
+			} else {
+				selectableRoute.broadcastingIcon.setImageResource(R.drawable.not_broadcasting)
+			}
+
 			selectableRoute.routeName.text = name
 			selectableRoute.routeName.backgroundTintList = ColorStateList.valueOf(route.color)
 
diff --git a/app/src/main/res/drawable/invisible_divider.xml b/app/src/main/res/drawable/invisible_divider.xml
new file mode 100644
index 0000000..c572471
--- /dev/null
+++ b/app/src/main/res/drawable/invisible_divider.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <size android:height="10dp"/>
+    <solid android:color="#00646464"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/not_broadcasting.xml b/app/src/main/res/drawable/not_broadcasting.xml
new file mode 100644
index 0000000..93af1a1
--- /dev/null
+++ b/app/src/main/res/drawable/not_broadcasting.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="360"
+    android:viewportHeight="360">
+    <path
+        android:fillColor="#5F6368"
+        android:pathData="M180,265.7m-58.3,0a58.3,58.3 0,1 1,116.59 0a58.3,58.3 0,1 1,-116.59 0"/>
+    <path
+        android:fillColor="#5F6368"
+        android:pathData="m95.26,195.66c25.33,-17.62 55.49,-26.12 84.74,-26.12 31.18,0 60.6,9.14 84.77,26.06l10.61,-18.39c-27.42,-18.73 -60.47,-28.86 -95.39,-28.86 -34.93,0 -67.97,10.14 -95.39,28.86l10.66,18.45z"/>
+    <path
+        android:fillColor="#5F6368"
+        android:pathData="m67.26,147.16c33.89,-22.82 73.92,-33.79 112.74,-33.79 38.83,0 78.85,10.98 112.74,33.79l10.63,-18.42c-35.61,-23.77 -78.31,-36.57 -123.37,-36.57 -45.06,0 -87.76,12.81 -123.37,36.57l10.63,18.42z"/>
+    <path
+        android:fillColor="#5F6368"
+        android:pathData="m39.29,98.72c42.45,-28.02 92.31,-41.53 140.71,-41.53 48.4,0 98.26,13.5 140.71,41.53l10.61,-18.38c-43.8,-28.82 -96.12,-44.34 -151.32,-44.34 -55.2,0 -107.53,15.52 -151.32,44.34l10.61,18.38z"/>
+</vector>
diff --git a/app/src/main/res/drawable/wifi_icon.xml b/app/src/main/res/drawable/wifi_icon.xml
new file mode 100644
index 0000000..f098339
--- /dev/null
+++ b/app/src/main/res/drawable/wifi_icon.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="360"
+    android:viewportHeight="360">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M180,265.7m-58.3,0a58.3,58.3 0,1 1,116.59 0a58.3,58.3 0,1 1,-116.59 0"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m95.26,195.66c25.33,-17.62 55.49,-26.12 84.74,-26.12 31.18,0 60.6,9.14 84.77,26.06l10.61,-18.39c-27.42,-18.73 -60.47,-28.86 -95.39,-28.86 -34.93,0 -67.97,10.14 -95.39,28.86l10.66,18.45z"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m67.26,147.16c33.89,-22.82 73.92,-33.79 112.74,-33.79 38.83,0 78.85,10.98 112.74,33.79l10.63,-18.42c-35.61,-23.77 -78.31,-36.57 -123.37,-36.57 -45.06,0 -87.76,12.81 -123.37,36.57l10.63,18.42z"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m39.29,98.72c42.45,-28.02 92.31,-41.53 140.71,-41.53 48.4,0 98.26,13.5 140.71,41.53l10.61,-18.38c-43.8,-28.82 -96.12,-44.34 -151.32,-44.34 -55.2,0 -107.53,15.52 -151.32,44.34l10.61,18.38z"/>
+</vector>
diff --git a/app/src/main/res/layout/route_menu.xml b/app/src/main/res/layout/route_menu.xml
index b1d49d9..b385e89 100644
--- a/app/src/main/res/layout/route_menu.xml
+++ b/app/src/main/res/layout/route_menu.xml
@@ -13,14 +13,15 @@
         android:textSize="35sp"
         android:layout_marginTop="10dp"
         android:textAlignment="center"
-        android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="10dp"/>
 
     <LinearLayout
         android:id="@+id/routes"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:divider="@drawable/divider"
+        android:divider="@drawable/invisible_divider"
         android:showDividers="middle">
 
     </LinearLayout>
@@ -31,6 +32,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp"
         android:text="@string/close"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/selectable_route.xml b/app/src/main/res/layout/selectable_route.xml
index bf6527d..9ac3886 100644
--- a/app/src/main/res/layout/selectable_route.xml
+++ b/app/src/main/res/layout/selectable_route.xml
@@ -6,16 +6,16 @@
 
     <CheckBox
         android:id="@+id/selected"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
         android:gravity="center_horizontal|start"
         android:textColor="@color/white"
         android:layout_gravity="center_horizontal|start"/>
 
     <ImageView
         android:id="@+id/broadcasting_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
         android:contentDescription="@string/not_broadcasting"/>
 
     <TextView
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/white"
         android:textSize="25sp"
-        android:layout_marginStart="20dp"
+        android:layout_marginStart="10dp"
         android:background="@drawable/rounded_corner" />
 
     <!--<TextView
@@ -40,8 +40,8 @@
 
     <CheckBox
         android:id="@+id/favorite_route"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
         android:gravity="center_horizontal|start"
         android:layout_gravity="center_horizontal|end"
         style="?android:attr/starStyle"/>

From fc25b42055066ef95da94c869fe02db24e9c971d Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 26 Nov 2025 09:58:00 -0800
Subject: [PATCH 12/14] Added routes and fares icons

---
 app/src/main/res/drawable/fares.xml       | 15 ++++++++++++++
 app/src/main/res/drawable/routes_icon.xml | 24 +++++++++++++++++++++++
 app/src/main/res/layout/activity_maps.xml |  4 ++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/fares.xml
 create mode 100644 app/src/main/res/drawable/routes_icon.xml

diff --git a/app/src/main/res/drawable/fares.xml b/app/src/main/res/drawable/fares.xml
new file mode 100644
index 0000000..d6896de
--- /dev/null
+++ b/app/src/main/res/drawable/fares.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m31.19,0c-17.283,0.438 -31.19,14.612 -31.19,32 0,17.664 14.336,32 32,32 17.664,0 32,-14.336 32,-32 0,-17.664 -14.336,-32 -32,-32 -0.276,0 -0.538,-0.007 -0.813,0m-0.031,5.5c0.284,-0.009 0.558,0 0.844,0 14.628,0 26.5,11.872 26.5,26.5 0,14.628 -11.872,26.5 -26.5,26.5 -14.628,0 -26.5,-11.872 -26.5,-26.5 0,-14.342 11.423,-26.05 25.656,-26.5"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m25.645,38.743c2.061,2.882 8.35,3.09 10.51,1.868 0.793,-0.449 0.991,-1.747 0.991,-2.627 0,-0.604 -0.159,-1.079 -0.477,-1.424 -0.336,-0.345 -1.189,-1.221 -2.178,-1.48 -5.02,-1.294 -8.492,-2.911 -9.852,-4.085 -1.696,-1.467 -1.969,-2.425 -1.969,-4.979 0,-2.554 0.734,-4.695 2.395,-6.231 1.66,-1.536 4.071,-2.304 7.233,-2.304 3.02,0 7.268,0.797 9.339,3.256l-3.453,3.756c-1.947,-1.635 -3.396,-1.783 -5.78,-1.783 -1.501,0 -2.283,0.216 -2.919,0.647 -0.636,0.414 -0.954,0.958 -0.954,1.631 0,0.604 0.291,1.105 0.874,1.501 0.583,0.414 2.106,1.036 5.144,1.864 3.409,0.932 5.723,2.062 6.942,3.391 1.201,1.329 1.802,3.098 1.802,5.307 0,2.658 -0.936,4.85 -2.808,6.575 -1.855,1.726 -4.138,3.067 -7.423,3.067 -4.229,0 -9.874,-1.494 -11.431,-4.255"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m30.375,12.875v6.844h3.25v-6.844h-3.25m0,32.09v6.156h3.25v-6.156h-3.25"/>
+</vector>
diff --git a/app/src/main/res/drawable/routes_icon.xml b/app/src/main/res/drawable/routes_icon.xml
new file mode 100644
index 0000000..d1ad171
--- /dev/null
+++ b/app/src/main/res/drawable/routes_icon.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+    <path
+        android:pathData="M8,7.298C8,6.856 8.358,6.498 8.8,6.498H25.2C25.642,6.498 26,6.856 26,7.298V7.698C26,8.14 25.642,8.498 25.2,8.498H8.8C8.358,8.498 8,8.14 8,7.698V7.298Z"
+        android:fillColor="#FF0000"/>
+    <path
+        android:pathData="M8,21.298C8,20.856 8.358,20.498 8.8,20.498H25.2C25.642,20.498 26,20.856 26,21.298V21.698C26,22.14 25.642,22.498 25.2,22.498H8.8C8.358,22.498 8,22.14 8,21.698V21.298Z"
+        android:fillColor="#0000FF"/>
+    <path
+        android:pathData="M8,14.298C8,13.856 8.358,13.498 8.8,13.498H25.2C25.642,13.498 26,13.856 26,14.298V14.698C26,15.14 25.642,15.498 25.2,15.498H8.8C8.358,15.498 8,15.14 8,14.698V14.298Z"
+        android:fillColor="#00FF00"/>
+    <path
+        android:pathData="M5,7.5C5,8.328 4.328,9 3.5,9C2.672,9 2,8.328 2,7.5C2,6.672 2.672,6 3.5,6C4.328,6 5,6.672 5,7.5Z"
+        android:fillColor="#FFFFFF"/>
+    <path
+        android:pathData="M5,21.498C5,22.326 4.328,22.998 3.5,22.998C2.672,22.998 2,22.326 2,21.498C2,20.67 2.672,19.998 3.5,19.998C4.328,19.998 5,20.67 5,21.498Z"
+        android:fillColor="#FFFFFF"/>
+    <path
+        android:pathData="M5,14.498C5,15.326 4.328,15.998 3.5,15.998C2.672,15.998 2,15.326 2,14.498C2,13.67 2.672,12.998 3.5,12.998C4.328,12.998 5,13.67 5,14.498Z"
+        android:fillColor="#FFFFFF"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 00c8f73..69d25db 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -38,7 +38,7 @@
                 android:layout_width="wrap_content"
                 android:layout_gravity="top|end"
                 android:backgroundTint="@color/colorPrimary"
-                android:src="@drawable/amu_bubble_mask"
+                android:src="@drawable/routes_icon"
                 app:fabSize="normal"
                 android:onClick="@{() -> activity.showRoutesMenu()}"/>
 
@@ -49,7 +49,7 @@
                 app:fabSize="mini"
                 android:layout_marginTop="10dp"
                 android:backgroundTint="@color/colorPrimary"
-                android:src="@drawable/ic_launcher_foreground"
+                android:src="@drawable/fares"
                 android:onClick="@{() -> activity.farePopupWindow.showFarePopupWindow()}"/>
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton

From 83aa1f3599a1b098c03ef32e64eab50232766e4e Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 26 Nov 2025 10:00:55 -0800
Subject: [PATCH 13/14] Added content descriptions for FABs

---
 app/src/main/res/layout/activity_maps.xml | 3 +++
 app/src/main/res/values/strings.xml       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 69d25db..b9b788a 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -38,6 +38,7 @@
                 android:layout_width="wrap_content"
                 android:layout_gravity="top|end"
                 android:backgroundTint="@color/colorPrimary"
+                android:contentDescription="@string/select_to_open_routes_menu"
                 android:src="@drawable/routes_icon"
                 app:fabSize="normal"
                 android:onClick="@{() -> activity.showRoutesMenu()}"/>
@@ -46,6 +47,7 @@
                 android:id="@+id/view_fares"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:contentDescription="@string/select_to_view_fares"
                 app:fabSize="mini"
                 android:layout_marginTop="10dp"
                 android:backgroundTint="@color/colorPrimary"
@@ -56,6 +58,7 @@
                 android:id="@+id/settings"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:contentDescription="@string/select_to_launch_app_settings"
                 app:fabSize="mini"
                 android:backgroundTint="@color/colorPrimary"
                 android:src="@drawable/settings"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1be9be9..df882b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,6 +32,9 @@
     <string name="not_broadcasting">This route does not have any routes broadcasting their location</string>
     <string name="broadcasting">This route is broadcasting their location</string>
     <string name="route_menu_header">Select routes to show</string>
+    <string name="select_to_open_routes_menu">Select to open routes menu</string>
+    <string name="select_to_view_fares">Select to view bus fares</string>
+    <string name="select_to_launch_app_settings">Select to launch app settings</string>
 
     <!-- Bus fares -->
     <string name="view_fares">View bus fares</string>

From e9b65a1e0f408ecef7612346f18c757bf206e380 Mon Sep 17 00:00:00 2001
From: Spud <10385195+yeSpud@users.noreply.github.com>
Date: Wed, 26 Nov 2025 10:05:21 -0800
Subject: [PATCH 14/14] Updated build information for beta release

---
 app/build.gradle                    | 4 ++--
 app/src/main/res/values/strings.xml | 2 +-
 whatsnew/whatsnew-en-US             | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8afe48a..dcd072c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "fnsb.macstransit"
         minSdk 27
         targetSdk 36
-        versionCode 33
-        versionName 'Release 1.4.2'
+        versionCode 34
+        versionName 'Release 1.5'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index df882b3..525fdd7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,7 +53,7 @@
     <string name="twentydollars">$20.00</string>
     <string name="half_month_pass">Half Month Pass</string>
     <string name="covid19_notice">EFFECTIVE MARCH 2020\nAll MACS Transit and van tran fares for all riders are suspended</string>
-    <string name="disclaimer">Last updated October 20th, 2025. Prices may be inaccurate. Please refer to the official MACS website for more details on pricing.</string>
+    <string name="disclaimer">Last updated November 26th, 2025. Prices may be inaccurate. Please refer to the official MACS website for more details on pricing.</string>
     <string name="macs_website">MACS Website</string>
     <string name="close">Close</string>
 
diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
index 851d977..88d5b90 100644
--- a/whatsnew/whatsnew-en-US
+++ b/whatsnew/whatsnew-en-US
@@ -1,3 +1 @@
-+ Added support for android API 36
-* Fixed an issue with edge to edge displays putting elements out of reach
-- Dropped support for Android versions < 8.1
\ No newline at end of file
++ Created a completely new menu for selecting routes
\ No newline at end of file