Merge pull request #1850 from UCSD/fix-android-m1-build

Deprecate wayfinding
UCSD · Oct 6, 2022 · a580eea · a580eea
2 parents e1575e8 + 885ee78
commit a580eea
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 1,977 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
 
     <application
         android:name="${applicationName}"

diff --git a/ios/Podfile b/ios/Podfile
@@ -82,7 +82,7 @@ post_install do |installer|
         'PERMISSION_SENSORS=0',
 
         ## dart: PermissionGroup.bluetooth
-        'PERMISSION_BLUETOOTH=1',
+        'PERMISSION_BLUETOOTH=0',
 
         ## dart: PermissionGroup.appTrackingTransparency
         'PERMISSION_APP_TRACKING_TRANSPARENCY=1'

diff --git a/lib/app_constants.dart b/lib/app_constants.dart
@@ -11,11 +11,6 @@ class RoutePaths {
   static const String Notifications = 'notifications';
   static const String Profile = 'profile';
   static const String CardsView = 'profile/cards_view';
-  static const String BeaconView = 'profile/beacon_view';
-  static const String AutomaticBluetoothLoggerView =
-      'profile/automatic_bluetooth_logger_view';
-  static const String BluetoothPermissionsView =
-      'profile/bluetooth_permissions_view';
   static const String NotificationsSettingsView =
       'notifications/notifications_settings';
 

diff --git a/lib/app_provider.dart b/lib/app_provider.dart
@@ -3,6 +3,7 @@ import 'package:campus_mobile_experimental/core/providers/availability.dart';
 import 'package:campus_mobile_experimental/core/providers/bottom_nav.dart';
 import 'package:campus_mobile_experimental/core/providers/cards.dart';
 import 'package:campus_mobile_experimental/core/providers/classes.dart';
+import 'package:campus_mobile_experimental/core/providers/connectivity.dart';
 import 'package:campus_mobile_experimental/core/providers/dining.dart';
 import 'package:campus_mobile_experimental/core/providers/employee_id.dart';
 import 'package:campus_mobile_experimental/core/providers/events.dart';
@@ -20,9 +21,7 @@ import 'package:campus_mobile_experimental/core/providers/shuttle.dart';
 import 'package:campus_mobile_experimental/core/providers/speed_test.dart';
 import 'package:campus_mobile_experimental/core/providers/student_id.dart';
 import 'package:campus_mobile_experimental/core/providers/user.dart';
-import 'package:campus_mobile_experimental/core/providers/wayfinding.dart';
 import 'package:campus_mobile_experimental/core/providers/weather.dart';
-import 'package:campus_mobile_experimental/core/providers/connectivity.dart';
 import 'package:campus_mobile_experimental/ui/navigator/top.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_analytics/observer.dart';
@@ -185,16 +184,6 @@ List<SingleChildWidget> dependentServices = [
     }
     return classScheduleDataProvider;
   }),
-  ChangeNotifierProxyProvider2<Coordinates, UserDataProvider,
-      WayfindingProvider>(create: (_) {
-    var proximityAwarenessSingleton = WayfindingProvider();
-    return proximityAwarenessSingleton;
-  }, update: (_, coordinates, userDataProvider, proximityAwarenessSingleton) {
-    proximityAwarenessSingleton!
-        .coordinateAndLocation(coordinates, locationProvider!);
-    proximityAwarenessSingleton.userProvider = userDataProvider;
-    return proximityAwarenessSingleton;
-  }),
   ChangeNotifierProxyProvider<UserDataProvider, StudentIdDataProvider>(
       create: (_) {
     var studentIdDataProvider = StudentIdDataProvider();

diff --git a/lib/app_router.dart b/lib/app_router.dart
@@ -4,8 +4,8 @@ import 'package:campus_mobile_experimental/core/models/dining.dart';
 import 'package:campus_mobile_experimental/core/models/dining_menu.dart';
 import 'package:campus_mobile_experimental/core/models/events.dart';
 import 'package:campus_mobile_experimental/core/models/news.dart';
-import 'package:campus_mobile_experimental/ui/availability/manage_availability_view.dart';
 import 'package:campus_mobile_experimental/ui/availability/availability_detail_view.dart';
+import 'package:campus_mobile_experimental/ui/availability/manage_availability_view.dart';
 import 'package:campus_mobile_experimental/ui/classes/classes_list.dart';
 import 'package:campus_mobile_experimental/ui/dining/dining_detail_view.dart';
 import 'package:campus_mobile_experimental/ui/dining/dining_list.dart';
@@ -37,9 +37,6 @@ import 'package:campus_mobile_experimental/ui/profile/profile.dart';
 import 'package:campus_mobile_experimental/ui/scanner/native_scanner_view.dart';
 import 'package:campus_mobile_experimental/ui/shuttle/add_shuttle_stops_view.dart';
 import 'package:campus_mobile_experimental/ui/shuttle/manage_shuttle_view.dart';
-import 'package:campus_mobile_experimental/ui/wayfinding/beacon_view.dart';
-import 'package:campus_mobile_experimental/ui/wayfinding/bluetooth_logger.dart';
-import 'package:campus_mobile_experimental/ui/wayfinding/wayfinding_permissions.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -160,16 +157,6 @@ class Router {
           Provider.of<CustomAppBar>(_).changeTitle(settings.name);
           return NotificationsSettingsView();
         });
-      case RoutePaths.BluetoothPermissionsView:
-        return MaterialPageRoute(builder: (_) {
-          Provider.of<CustomAppBar>(_).changeTitle(settings.name);
-          return AdvancedWayfindingPermission();
-        });
-      case RoutePaths.AutomaticBluetoothLoggerView:
-        return MaterialPageRoute(builder: (_) {
-          Provider.of<CustomAppBar>(_).changeTitle(settings.name);
-          return AutomaticBluetoothLoggerView();
-        });
       case RoutePaths.ClassScheduleViewAll:
         return MaterialPageRoute(builder: (_) {
           Provider.of<CustomAppBar>(_).changeTitle(settings.name);
@@ -206,8 +193,6 @@ class Router {
           Provider.of<CustomAppBar>(_).changeTitle(settings.name);
           return SpotTypesView();
         });
-      case RoutePaths.BeaconView:
-        return MaterialPageRoute(builder: (_) => BeaconView());
       case RoutePaths.ScanditScanner:
         return MaterialPageRoute(builder: (_) => ScanditScanner());
       default:

diff --git a/lib/core/models/wayfinding.dart b/lib/core/models/wayfinding.dart
diff --git a/lib/core/models/wayfinding_constants.dart b/lib/core/models/wayfinding_constants.dart
diff --git a/lib/core/providers/bluetooth.dart b/lib/core/providers/bluetooth.dart