mbusdev · gusrod-coder · Mar 19, 2026 · Mar 19, 2026 · Mar 20, 2026 · Mar 20, 2026
diff --git a/.claude/settings.json b/.claude/settings.json
@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(dart analyze *)"
+    ]
+  }
+}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,59 @@
+name: CI
+on:
+  pull_request:
+    branches: [navigation-hub, maizebus2, maizebus-2.1, maizebus3, main]
+  push:
+    branches: []
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.41.8'
+      - run: echo "GOOGLE_MAPS_API_KEY=fake-key-for-ci-build-only" >> android/local.properties
+      - name: Write dummy firebase_options.dart for CI build
+        run: |
+          cat > lib/firebase_options.dart << 'EOF'
+          import 'package:firebase_core/firebase_core.dart';
+          class DefaultFirebaseOptions {
+            static FirebaseOptions get currentPlatform => const FirebaseOptions(
+              apiKey: 'fake-key-for-ci',
+              appId: 'fake-app-id',
+              messagingSenderId: 'fake-sender-id',
+              projectId: 'fake-project-id',
+            );
+          }
+          EOF
+      - name: Write dummy google-services.json for CI build
+        run: |
+          cat > android/app/google-services.json << 'EOF'
+          {
+            "project_info": {
+              "project_number": "000000000000",
+              "project_id": "fake-project-id",
+              "storage_bucket": "fake-project-id.appspot.com"
+            },
+            "client": [
+              {
+                "client_info": {
+                  "mobilesdk_app_id": "1:000000000000:android:0000000000000000000000",
+                  "android_client_info": {
+                    "package_name": "com.ishankumar.maizebus"
+                  }
+                },
+                "oauth_client": [],
+                "api_key": [{ "current_key": "fake-api-key" }],
+                "services": { "appinvite_service": { "other_platform_oauth_client": [] } }
+              }
+            ],
+            "configuration_version": "1"
+          }
+          EOF
+      - name: Install Flutter dependencies
+        run: flutter pub get
+      - name: Build app
+        run: flutter build apk --debug --no-pub
+        env:
+          GRADLE_OPTS: -Dorg.gradle.daemon=false
diff --git a/.gitignore b/.gitignore
@@ -133,3 +133,8 @@ app.*.symbols
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 local.properties
+
+# floorplan jsons
+assets/floorplans/*.json
+android/app/src/main/kotlin/com/ishankumar/bluebus/MainActivity.kt
+.metadata
diff --git a/.metadata b/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "fcf2c11572af6f390246c056bc905eca609533a0"
+  revision: "6655482ec06e547f90abf8ae7590466f4415978d"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: fcf2c11572af6f390246c056bc905eca609533a0
-      base_revision: fcf2c11572af6f390246c056bc905eca609533a0
-    - platform: ios
-      create_revision: fcf2c11572af6f390246c056bc905eca609533a0
-      base_revision: fcf2c11572af6f390246c056bc905eca609533a0
+      create_revision: 6655482ec06e547f90abf8ae7590466f4415978d
+      base_revision: 6655482ec06e547f90abf8ae7590466f4415978d
+    - platform: android
+      create_revision: 6655482ec06e547f90abf8ae7590466f4415978d
+      base_revision: 6655482ec06e547f90abf8ae7590466f4415978d
 
   # User provided section
 

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1 +1,10 @@
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
 include: package:flutter_lints/flutter.yaml
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -29,7 +29,7 @@ require(flutter.compileSdkVersion >= 35);
 android {
     namespace = "com.ishankumar.maizebus"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = "28.1.13356709"
+    ndkVersion = "28.2.13676358"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
@@ -38,9 +38,7 @@ android {
         isCoreLibraryDesugaringEnabled = true
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
+    // REMOVED compilerOptions from here because it was causing "Unresolved reference"
 
     defaultConfig {
         applicationId = "com.ishankumar.maizebus"
@@ -73,15 +71,18 @@ android {
     }
 }
 
+// BULLETPROOF FIX: Configure Kotlin compiler tasks directly at the bottom of the file
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+    }
+}
+
 dependencies {
-    // the following two might be needed if issues happen
-    // https://pub.dev/packages/flutter_local_notifications#-android-setup
-    // implementation("androidx.window:window:1.0.0")
-    // implementation("androidx.window:window-java:1.0.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
     implementation(platform("com.google.firebase:firebase-bom:34.6.0"))
 }
 
 flutter {
     source = "../.."
-}
+}
diff --git a/android/bluebus_android.iml b/android/bluebus_android.iml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+cla<?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android" name="Android">

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,3 +1,8 @@
-org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G
 android.useAndroidX=true
 android.enableJetifier=true
+android.builtInKotlin=true
+org.gradle.caching=true
+org.gradle.parallel=true
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
@@ -18,13 +18,13 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.9.1" apply false
+    id("com.android.application") version "8.11.1" apply false
 
     // START: FlutterFire Configuration
     id("com.google.gms.google-services") version("4.3.15") apply false
     // END: FlutterFire Configuration
 
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.10" apply false
 }
 
 include(":app")
diff --git a/assets/destination.png b/assets/destination.png
diff --git a/assets/floorplans/demoPolygons.csv b/assets/floorplans/demoPolygons.csv
@@ -0,0 +1,8 @@
+WKT,name,description
+"POLYGON ((-83.7179505 42.2907676, -83.7178368 42.2907672, -83.717837 42.290684, -83.7174296 42.2906819, -83.7174316 42.2907679, -83.7173204 42.2907682, -83.7173181 42.2910521, -83.7172437 42.2910519, -83.7172444 42.2911439, -83.7172591 42.2911441, -83.7172585 42.2911897, -83.7171968 42.2911894, -83.7171959 42.2911361, -83.716998 42.2911366, -83.7170016 42.2915319, -83.7171089 42.2915331, -83.7171096 42.2915611, -83.7174528 42.2915593, -83.7174524 42.2915692, -83.7175505 42.2915527, -83.7175374 42.2915149, -83.7175687 42.2915097, -83.7175581 42.2914755, -83.7175668 42.291477, -83.717568 42.2912842, -83.7177161 42.291285, -83.7177176 42.2911558, -83.717842 42.291156, -83.7178427 42.2910645, -83.7179475 42.2910649, -83.7179505 42.2907676))",pierpont,
+"POLYGON ((-83.7147542 42.2918063, -83.7132155 42.2918073, -83.7132157 42.2919972, -83.7132989 42.2919976, -83.7132999 42.2920885, -83.7133423 42.2920887, -83.7133413 42.2919983, -83.71389 42.2920001, -83.7138905 42.2920138, -83.7139065 42.2920251, -83.7139528 42.2919992, -83.7139974 42.2919994, -83.7139974 42.2919894, -83.7140467 42.2919897, -83.7140469 42.2919411, -83.7145945 42.2919397, -83.7145955 42.2920263, -83.7147542 42.2920251, -83.7147542 42.2918063))",automotive,
+"POLYGON ((-83.714808 42.2918341, -83.7147568 42.2918341, -83.7147542 42.2920873, -83.7145899 42.2920885, -83.7145895 42.2922035, -83.7145333 42.2922035, -83.7145331 42.2921393, -83.71428 42.2921384, -83.7142803 42.2922043, -83.7135359 42.2921989, -83.7135276 42.2921671, -83.7129846 42.2921609, -83.7129831 42.2924532, -83.7129563 42.2924528, -83.7129564 42.2925063, -83.7136995 42.2925108, -83.7137001 42.2925576, -83.7137698 42.2925592, -83.7137699 42.292673, -83.7140233 42.2926753, -83.7140247 42.2927248, -83.7142782 42.2927249, -83.7142789 42.2927756, -83.7145256 42.2927738, -83.714525 42.2929738, -83.7147366 42.2929734, -83.714734 42.2925703, -83.7148829 42.2925699, -83.7148821 42.2924971, -83.7148098 42.2924978, -83.714808 42.2918341))",EECS,
+"POLYGON ((-83.7150477 42.2933338, -83.7150459 42.2931093, -83.7147693 42.29311, -83.7147675 42.2931668, -83.714735 42.2931676, -83.7147366 42.292959, -83.7140091 42.292958, -83.7140093 42.2928236, -83.7137687 42.2928232, -83.7137708 42.2929555, -83.7129022 42.292957, -83.7129027 42.2937633, -83.7132097 42.2937616, -83.7132211 42.2933339, -83.7141449 42.2933314, -83.7141449 42.2933946, -83.714101 42.2933941, -83.7140548 42.2936234, -83.7147719 42.2936235, -83.7147709 42.2933329, -83.7150477 42.2933338))",ggbrown,
+"POLYGON ((-83.7157614 42.2927035, -83.7156747 42.2927043, -83.7156758 42.2926751, -83.7155593 42.2926761, -83.7155613 42.2926912, -83.7152971 42.2926907, -83.7152974 42.292679, -83.7151823 42.2926796, -83.7151821 42.292707, -83.7150989 42.2927075, -83.7150992 42.2927847, -83.7150483 42.2927853, -83.7150443 42.2929149, -83.7150934 42.2929152, -83.7150965 42.2932096, -83.715028 42.2932096, -83.7150287 42.2933242, -83.7150785 42.2933241, -83.7150802 42.2933521, -83.7157629 42.2933472, -83.7157622 42.2932974, -83.7158133 42.2932979, -83.7158111 42.2931715, -83.7157641 42.2931726, -83.7157623 42.2929206, -83.7158125 42.2929201, -83.7158126 42.2928041, -83.715759 42.2928046, -83.7157614 42.2927035))",dow,
+"POLYGON ((-83.7165555 42.2929131, -83.7165555 42.2928408, -83.7165469 42.2928408, -83.7165476 42.2926725, -83.7163208 42.2926712, -83.7163191 42.2927209, -83.7162154 42.2927196, -83.716215 42.2926711, -83.7160936 42.2926714, -83.7160914 42.2927951, -83.7158982 42.2927916, -83.7158982 42.2926736, -83.7157616 42.2926728, -83.715759 42.2928046, -83.7158126 42.2928041, -83.7158125 42.2929201, -83.7161157 42.2929163, -83.7161117 42.2931352, -83.7160937 42.2931354, -83.7160937 42.2931213, -83.716031 42.2931213, -83.7160278 42.2932999, -83.7160873 42.2933009, -83.71609 42.2932888, -83.7161094 42.2932888, -83.7161093 42.2933581, -83.71617 42.2933575, -83.716174 42.2931805, -83.7163856 42.2931823, -83.7163827 42.2933417, -83.7165336 42.2933441, -83.7165356 42.2931835, -83.7165561 42.2931837, -83.7165561 42.2931107, -83.7165205 42.2931094, -83.716523 42.2929144, -83.7165555 42.2929131))",bbb,
+"POLYGON ((-83.7167709 42.2930397, -83.7167754 42.2932264, -83.7174562 42.2932244, -83.7174512 42.2930225, -83.7176489 42.2930222, -83.7176476 42.292981, -83.7177653 42.2928964, -83.7177838 42.2928951, -83.7177827 42.2928594, -83.7178137 42.2928595, -83.7178135 42.2927044, -83.7167602 42.2926916, -83.7167617 42.2927275, -83.716678 42.2927284, -83.7166789 42.2927906, -83.7165739 42.2927939, -83.7165735 42.2929955, -83.7166894 42.2929957, -83.7166911 42.2930385, -83.7167709 42.2930397))",lwbr,
diff --git a/assets/floorplans/icons/bathroomF.png b/assets/floorplans/icons/bathroomF.png
diff --git a/assets/floorplans/icons/bathroomM.png b/assets/floorplans/icons/bathroomM.png
diff --git a/assets/floorplans/icons/bathroomN.png b/assets/floorplans/icons/bathroomN.png
diff --git a/assets/floorplans/icons/elevator.png b/assets/floorplans/icons/elevator.png
diff --git a/assets/floorplans/icons/escalator.png b/assets/floorplans/icons/escalator.png
diff --git a/assets/floorplans/icons/food.png b/assets/floorplans/icons/food.png
diff --git a/assets/floorplans/icons/info.png b/assets/floorplans/icons/info.png
diff --git a/assets/floorplans/icons/stairs.png b/assets/floorplans/icons/stairs.png
diff --git a/assets/start.png b/assets/start.png
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 		A8EEDB4981E5AA63E4E4C07B /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94DE6146E472E140247FE59F /* Pods_RunnerTests.framework */; };
 		BC0BD3FB94B8CB1046A5467C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94659E00AEE75CC5EC4BA816 /* Pods_Runner.framework */; };
 		F744833D8FEFED288923CBE2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = AF4F5C49CB3C179F84A2420E /* GoogleService-Info.plist */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -68,13 +69,15 @@
 		C60037B3B3142A630549E808 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		CA7A894FFC34F078300536C6 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		F4AE1E38C01F7F4541B7025A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		97C146EB1CF9000F007C117D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				BC0BD3FB94B8CB1046A5467C /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -123,6 +126,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -192,6 +196,9 @@
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
@@ -218,6 +225,9 @@
 
 /* Begin PBXProject section */
 		97C146E61CF9000F007C117D /* Project object */ = {
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+			);
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
@@ -782,6 +792,18 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }