Sync w/ experimental

Readme.md

@@ -28,16 +28,16 @@ Whenever you want to update your repo with the latest upstream changes, you'll n
 git fetch upstream
 ```
 
-Now you are ready to checkout your local `campus-activation-redesign` branch and merge in any changes from the upstream repo's `campus-activation-redesign` branch:
+Now you are ready to checkout your local `experimental` branch and merge in any changes from the upstream repo's `experimental` branch:
 ```shell
 # Checkout your master branch and merge upstream
-git checkout campus-activation-redesign
-git merge upstream/campus-activation-redesign
+git checkout experimental
+git merge upstream/experimental
 ```
 
-Your local `campus-activation-redesign` branch is now up-to-date with any changes upstream.
+Your local `experimental` branch is now up-to-date with any changes upstream.
 
-### Doing Your Work (Campus Activation Redesign)
+### Doing Your Work
 
 ```shell
 # Add 'upstream' repo to list of remotes
@@ -50,16 +50,16 @@ git fetch upstream
 ```
 
 #### Create a Feature Branch
-When you begin working on a new feature or bugfix, it is important that you create a new branch. Not only is it proper git workflow, but it also keeps your changes organized and separated from the `campus-activation-redesign` branch so that you can easily submit and manage multiple pull requests for every task you complete.
+When you begin working on a new feature or bugfix, it is important that you create a new branch. Not only is it proper git workflow, but it also keeps your changes organized and separated from the `experimental` branch so that you can easily submit and manage multiple pull requests for every task you complete.
 
 To create a new branch and start working on it:
 
 ```shell
-# Checkout the campus-activation-redesign branch
-git checkout campus-activation-redesign
+# Checkout the experimental branch
+git checkout experimental
 
 # Create and checkout a branch named newfeature
-git checkout -b campus-activation-redesign
+git checkout -b experimental
 ```
 
 You are now ready to begin developing your new feature. Commit your code often, using present-tense and concise verbiage explaining the work completed.
@@ -86,24 +86,24 @@ git push -u upstream newfeature
 #### Update your feature branch
 From the time you created your new feature branch `newfeature`, to submitting a pull request, it is likely that your branch 
 
-Branch `upstream/campus-activation-redesign` is updated often. Prior to submitting a pull request, update your `newfeature` branch from `upstream/campus-activation-redesign` so that merging it will be a simple process which won't require any conflict resolution work.
+Branch `upstream/experimental` is updated often. Prior to submitting a pull request, update your `newfeature` branch from `upstream/experimental` so that merging it will be a simple process which won't require any conflict resolution work.
 ```shell
-# Fetch upstream campus-activation-redesign and merge with your local campus-activation-redesign branch
+# Fetch upstream experimental and merge with your local experimental branch
 git fetch upstream
-git checkout campus-activation-redesign
-git merge upstream/campus-activation-redesign
+git checkout experimental
+git merge upstream/experimental
 
-# If there were any new commits, merge them to your `newfeature` branch from the `campus-activation-redesign` branch
+# If there were any new commits, merge them to your `newfeature` branch from the `experimental` branch
 git checkout newfeature
-git merge campus-activation-redesign
+git merge experimental
 git push upstream newfeature
 ```
 
 
 #### Submitting
-Once you've committed and pushed your feature branch `newfeature` to GitHub, go to the page for your fork on GitHub, select branch 'newfeature' and click the 'New pull request' button.
+Once you've committed and pushed your feature branch `newfeature` to GitHub, navigate to to your new feature branch on UCSD's Campus Mobile GitHub and click the 'New pull request' button.
 
-If you need to make future updates to your pull request, push the new commit or commits to your feature branch `newfeature` on GitHub. Your pull request will automatically track the changes on your feature branch.
+If you need to make future updates to your pull request, push the new commit or commits to your feature branch `newfeature` on GitHub. Your pull request will automatically track the changes on your feature branch and generate new builds for iOS and Android.
 
 ## Platform
 The goal of this platform is to provide responsive and intuitive mobile interactions for a personalized campus experience.

analysis_options.yaml

@@ -0,0 +1,2 @@
+formatter:
+  page_width: 120

ios/Podfile.lock

@@ -94,9 +94,6 @@ PODS:
   - Flutter (1.0.0)
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - flutter_scandit_plugin (0.0.1):
-    - Flutter
-    - ScanditBarcodeCapture (~> 6.6.3)
   - flutter_secure_storage (3.3.1):
     - Flutter
   - geolocator_apple (1.2.0):
@@ -177,9 +174,6 @@ PODS:
   - PromisesObjC (2.4.0)
   - PromisesSwift (2.4.0):
     - PromisesObjC (= 2.4.0)
-  - ScanditBarcodeCapture (6.6.4):
-    - ScanditCaptureCore (= 6.6.4)
-  - ScanditCaptureCore (6.6.4)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -201,7 +195,6 @@ DEPENDENCIES:
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
-  - flutter_scandit_plugin (from `.symlinks/plugins/flutter_scandit_plugin/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
@@ -234,8 +227,6 @@ SPEC REPOS:
     - nanopb
     - PromisesObjC
     - PromisesSwift
-    - ScanditBarcodeCapture
-    - ScanditCaptureCore
 
 EXTERNAL SOURCES:
   connectivity_plus:
@@ -254,8 +245,6 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
-  flutter_scandit_plugin:
-    :path: ".symlinks/plugins/flutter_scandit_plugin/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   geolocator_apple:
@@ -298,7 +287,6 @@ SPEC CHECKSUMS:
   FirebaseSessions: 655ff17f3cc1a635cbdc2d69b953878001f9e25b
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
-  flutter_scandit_plugin: a2a6a2f124c184cff00dbdf40c34ea0033b1e707
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
   geolocator_apple: 9bcea1918ff7f0062d98345d238ae12718acfbc1
   Google-Maps-iOS-Utils: 66d6de12be1ce6d3742a54661e7a79cb317a9321
@@ -313,8 +301,6 @@ SPEC CHECKSUMS:
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
-  ScanditBarcodeCapture: 8de10f1d79cb4c669b75c61ddaed60c7c7daa7f4
-  ScanditCaptureCore: 7118e29ef970e70ca1ea6512fa8414e5a3761497
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   uni_links2: fbc37081577fc19c6e0f7e6cdbd3baa150023635
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe

ios/Runner.xcodeproj/project.pbxproj

@@ -284,12 +284,9 @@
 				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
 				"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
 				"${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework",
-				"${PODS_ROOT}/ScanditBarcodeCapture/ScanditBarcodeCapture.framework",
-				"${PODS_ROOT}/ScanditCaptureCore/ScanditCaptureCore.framework",
 				"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_scandit_plugin/flutter_scandit_plugin.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework",
 				"${BUILT_PRODUCTS_DIR}/geolocator_apple/geolocator_apple.framework",
 				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
@@ -315,12 +312,9 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ScanditBarcodeCapture.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ScanditCaptureCore.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_scandit_plugin.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geolocator_apple.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",

lib/app_constants.dart

@@ -25,8 +25,6 @@ class RoutePaths {
   static const String DiningViewAll = 'dining/dining_list_view';
   static const String DiningDetailView = 'dining/dining_detail_view';
   static const String DiningNutritionView = 'dining/dining_nutrition_view';
-  static const String ScannerView = 'scanner/scanner_view';
-  static const String ScanditScanner = 'scanner/scandit_scanner';
   static const String Parking = "parking/parking_view";
   static const String SpotTypesView = "parking/spot_types_view";
   static const String ParkingStructureView = "parking/parking_structure_view";
@@ -68,13 +66,9 @@ class RouteTitles {
 
 class ParkingDefaults {
   static const defaultLots = [
+    "Athena",
     "Gilman",
-    "406",
-    "784",
-    "P782",
-    "P386 (Gliderport)",
-    "P704",
-    "P705"
+    "Hopkins",
   ];
   static const defaultSpots = ["S", "B", "A"];
 }
@@ -100,27 +94,6 @@ class ErrorConstants {
   static const locationFailed = "Location was not available";
 }
 
-enum ScannerError implements Exception {
-  duplicateRecord(
-      'Submission failed due to barcode already scanned. Please discard this test tube and get another one.\nCode #1035'),
-  duplicateRecordBloodScreen(
-      'Submission failed because this barcode has already been scanned. Please discard this kit.\nCode #1035'),
-  invalidMedia(
-      'Barcode is not valid. Please scan another barcode.\nCode #1036'),
-  barcodeError('An error occurred. Please try again.\nCode #1037'),
-  invalidToken('An error occurred. Please try again.\nCode #1038'),
-  loggedOut('An error occurred. Please try again.\nCode #1039'),
-  unknownError('An error occurred. Please try again.\nCode #1040'),
-  notAcceptable(
-      'Do not test within 30 days after receiving a positive test for COVID-19. Place all materials in the recycle and trash receptacles.\nCode #1041'),
-  scannerReauthFailure(
-      'Your session has expired. Please login to submit a scan.'),
-  noRecentScan('No scan submitted');
-
-  final String msg;
-  const ScannerError(this.msg);
-}
-
 class LoginConstants {
   static const silentLoginFailedTitle = 'Oops! You\'re not logged in.';
   static const silentLoginFailedDesc =
@@ -143,6 +116,15 @@ class ParkingConstants {
       'You have reached the maximum number of lots (10) that can be selected. Please deselect some lots before adding more.';
 }
 
+class WifiConstants {
+  // Initial State
+  static const wifiIssueFailedTitle = 'Could not report issue';
+  static const wifiIssueFailedDesc = 'Please run speed test to report issue.';
+  // Finished State
+  static const wifiIssueSuccessTitle = 'Issue Reported';
+  static const wifiIssueSuccessDesc = 'Thank you for helping improve UCSD wireless. Your test results have been sent to IT Services.';
+}
+
 class Plugins {
   static const FrontCamera = 'FRONT CAMERA';
 }
@@ -183,7 +165,6 @@ class DataPersistence {
 /// Maps Card IDs to Card titles
 class CardTitleConstants {
   static const titleMap = {
-    'NativeScanner': 'SCANNER',
     'MyStudentChart': 'MyStudentChart',
     'MyUCSDChart': 'MyUCSDChart',
     'student_id': 'STUDENT ID',

lib/app_provider.dart

@@ -15,8 +15,6 @@ import 'package:campus_mobile_experimental/core/providers/notices.dart';
 import 'package:campus_mobile_experimental/core/providers/notifications.dart';
 import 'package:campus_mobile_experimental/core/providers/notifications_freefood.dart';
 import 'package:campus_mobile_experimental/core/providers/parking.dart';
-import 'package:campus_mobile_experimental/core/providers/scanner.dart';
-import 'package:campus_mobile_experimental/core/providers/scanner_message.dart';
 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';
@@ -33,7 +31,8 @@ List<SingleChildWidget> providers = [
 ];
 
 final FirebaseAnalytics analytics = FirebaseAnalytics.instance;
-final FirebaseAnalyticsObserver observer = FirebaseAnalyticsObserver(analytics: analytics);
+final FirebaseAnalyticsObserver observer =
+    FirebaseAnalyticsObserver(analytics: analytics);
 
 List<SingleChildWidget> independentServices = [
   Provider.value(value: observer),
@@ -123,7 +122,8 @@ List<SingleChildWidget> dependentServices = [
       },
       lazy: false,
       update: (_, pushNotificationDataProvider, _userDataProvider) {
-        _userDataProvider!.pushNotificationDataProvider = pushNotificationDataProvider;
+        _userDataProvider!.pushNotificationDataProvider =
+            pushNotificationDataProvider;
         return _userDataProvider;
       }),
   ChangeNotifierProxyProvider<UserDataProvider, CardsDataProvider>(
@@ -196,18 +196,6 @@ List<SingleChildWidget> dependentServices = [
     }
     return employeeIdDataProvider;
   }),
-  ChangeNotifierProxyProvider<UserDataProvider, ScannerMessageDataProvider>(
-      create: (_) {
-    var scannerMessageDataProvider = ScannerMessageDataProvider();
-    return scannerMessageDataProvider;
-  }, update: (_, userDataProvider, scannerMessageDataProvider) {
-    scannerMessageDataProvider!.userDataProvider = userDataProvider;
-    //Verify that the user is logged in
-    if (userDataProvider.isLoggedIn && !scannerMessageDataProvider.isLoading) {
-      scannerMessageDataProvider.fetchData();
-    }
-    return scannerMessageDataProvider;
-  }),
   ChangeNotifierProxyProvider<UserDataProvider, AvailabilityDataProvider>(
       create: (_) {
     var availabilityDataProvider = AvailabilityDataProvider();
@@ -271,18 +259,5 @@ List<SingleChildWidget> dependentServices = [
       return freefoodDataProvider;
     },
   ),
-  ChangeNotifierProxyProvider<UserDataProvider, ScannerDataProvider>(
-    create: (_) {
-      var _scannerDataProvider = ScannerDataProvider();
-      return _scannerDataProvider;
-    },
-    update: (_, _userDataProvider, scannerDataProvider) {
-      scannerDataProvider!.userDataProvider = _userDataProvider;
-      scannerDataProvider.initState();
-      scannerDataProvider.resetDefaultStates();
-      return scannerDataProvider;
-    },
-    lazy: false,
-  ),
 ];
 List<SingleChildWidget> uiConsumableProviders = [];

lib/app_router.dart

@@ -27,12 +27,10 @@ import 'package:campus_mobile_experimental/ui/onboarding/onboarding_login.dart';
 import 'package:campus_mobile_experimental/ui/parking/manage_parking_view.dart';
 import 'package:campus_mobile_experimental/ui/parking/neighborhood_lot_view.dart';
 import 'package:campus_mobile_experimental/ui/parking/neighborhoods_view.dart';
-import 'package:campus_mobile_experimental/ui/parking/parking_lot_view.dart';
 import 'package:campus_mobile_experimental/ui/parking/parking_structure_view.dart';
 import 'package:campus_mobile_experimental/ui/parking/spot_types_view.dart';
 import 'package:campus_mobile_experimental/ui/profile/cards.dart';
 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:flutter/material.dart';
@@ -156,11 +154,6 @@ class Router {
           Provider.of<CustomAppBar>(_).changeTitle(settings.name);
           return ClassList();
         });
-      case RoutePaths.ParkingLotsView:
-        return MaterialPageRoute(builder: (_) {
-          Provider.of<CustomAppBar>(_).changeTitle(settings.name, done: true);
-          return ParkingLotsView();
-        });
       case RoutePaths.ParkingStructureView:
         return MaterialPageRoute(builder: (_) {
           Provider.of<CustomAppBar>(_).changeTitle(settings.name, done: true);
@@ -177,8 +170,6 @@ class Router {
           Provider.of<CustomAppBar>(_).changeTitle(settings.name, done: true);
           return NeighborhoodLotsView(data);
         });
-      case RoutePaths.ScanditScanner:
-        return MaterialPageRoute(builder: (_) => ScanditScanner());
       default:
         return MaterialPageRoute(builder: (_) => Home());
     }