Navigation hub

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 = "../.."
-}
+}

android/settings.gradle.kts

@@ -24,7 +24,7 @@ plugins {
     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")

lib/bluebus_api.dart

@@ -8,28 +8,7 @@ import 'models/bus_stop.dart';
 import 'models/bus.dart';
 import 'models/bus_route_line.dart';
 import 'services/route_color_service.dart';
-import 'package:bluebus/widgets/dialog.dart';
-
-// Function to calculate rotation angle between two geographical points
-// (used for bus stop icon orientation)
-double pointRotation(double lat1, double lon1, double lat2, double lon2) {
-  const double degToRad = 0.017453292519943295; // π / 180
-  const double radToDeg = 57.29577951308232;    // 180 / π
-
-  double dLat = lat2 - lat1;
-  double dLon = lon2 - lon1;
-
-  // Scale longitude by cos(lat) to correct for east-west distance
-  double x = dLon * (Math.cos(lat1 * degToRad));
-  double y = dLat;
-
-  double angle = Math.atan2(x, y) * radToDeg;
-
-  // Normalize to [0, 360)
-  if (angle < 0) angle += 360;
-
-  return angle;
-}
+import 'utils/geometry.dart';
 
 class BlueBusApi {
   static const String baseUrl = BACKEND_URL;
@@ -48,7 +27,7 @@ class BlueBusApi {
       for (final subroute in subroutes) {
         try {
           final points = <LatLng>[];
-          final stops = <BusStop>[];
+          final stops = <(int, BusStop)>[];
 
           // Cast to list to be able to be able to get different elements
           final pointList = subroute['pt'] as List; 
@@ -64,27 +43,25 @@ class BlueBusApi {
             );
             if (point['typ'] == 'S') {
               // get rotation of stop
-              if (isLast){
+              double stopRotation;
+              if (isLast) {
                 // use the previous 2 points to calculate rotation
-                double stopRotation = pointRotation(
+                stopRotation = pointRotation(
                   pointList[i - 2]['lat']?.toDouble() ?? 0,
                   pointList[i - 2]['lon']?.toDouble() ?? 0,
                   pointList[i - 1]['lat']?.toDouble() ?? 0,
                   pointList[i - 1]['lon']?.toDouble() ?? 0,
                 );
-                stops.add(BusStop.fromJson(point, routeId, stopRotation, false));
-
               } else {
                 // use the next 2 points to calculate rotation
-                double stopRotation = pointRotation(
+                stopRotation = pointRotation(
                   pointList[i + 1]['lat']?.toDouble() ?? 0,
                   pointList[i + 1]['lon']?.toDouble() ?? 0,
                   pointList[i + 2]['lat']?.toDouble() ?? 0,
                   pointList[i + 2]['lon']?.toDouble() ?? 0,
                 );
-                stops.add(BusStop.fromJson(point, routeId, stopRotation, false));
               }
-
+              stops.add((i, BusStop.fromJson(point, routeId, stopRotation, false)));
             }
           }
 
@@ -105,7 +82,7 @@ class BlueBusApi {
           // Handle detour points if present
           if (subroute.containsKey('dtrpt')) {
             final detourPoints = <LatLng>[];
-            final detourStops = <BusStop>[];
+            final detourStops = <(int, BusStop)>[];
 
             // Cast to list to be able to be able to get different elements
             final detourPointList = subroute['dtrpt'] as List; 
@@ -122,26 +99,26 @@ class BlueBusApi {
               );
               if (point['typ'] == 'S') {
                 // get rotation of stop
-                if (isLast){
+                double stopRotation;
+                if (isLast) {
                   // use the previous 2 points to calculate rotation
-                  double stopRotation = pointRotation(
+                  stopRotation = pointRotation(
                     detourPointList[i - 2]['lat']?.toDouble() ?? 0,
                     detourPointList[i - 2]['lon']?.toDouble() ?? 0,
                     detourPointList[i - 1]['lat']?.toDouble() ?? 0,
                     detourPointList[i - 1]['lon']?.toDouble() ?? 0,
                   );
-                  detourStops.add(BusStop.fromJson(point, routeId, stopRotation, false));
 
                 } else {
                   // use the next 2 points to calculate rotation
-                  double stopRotation = pointRotation(
+                  stopRotation = pointRotation(
                     detourPointList[i + 1]['lat']?.toDouble() ?? 0,
                     detourPointList[i + 1]['lon']?.toDouble() ?? 0,
                     detourPointList[i + 2]['lat']?.toDouble() ?? 0,
                     detourPointList[i + 2]['lon']?.toDouble() ?? 0,
                   );
-                  detourStops.add(BusStop.fromJson(point, routeId, stopRotation, false));
                 }
+                detourStops.add((i, BusStop.fromJson(point, routeId, stopRotation, false)));
               }
             }
 
@@ -166,7 +143,9 @@ class BlueBusApi {
   // Fetch all buses and their positions
   static Future<List<Bus>> fetchBuses() async {
     try {
-      final response = await http.get(Uri.parse('$baseUrl/getVehiclePositions'));
+      final response = await http.get(
+        Uri.parse('$baseUrl/getVehiclePositions'),
+      );
       if (response.statusCode != 200) throw Exception('Failed to load buses');
       final data = jsonDecode(response.body);
       final buses = <Bus>[];
@@ -191,10 +170,11 @@ class BlueBusApi {
       }
 
       return buses;
-    } catch (e){
-
+    } catch (e) {
       // on error return a blank list
       return [];
     }
   }
 }
+
+// TODO: Make bus routes have better fallback, so if one route fails to be processed it doesn't tank the rest of them