colors added to devices and services icons

lib/blocs/app_bloc.dart

@@ -1,16 +1,17 @@
 part of carp_study_app;
 
+/// The state of the [StudyAppBLoC].
 enum StudyAppState {
-  /// The BLOC is created (initial state)
+  /// The BLoC is created (initial state)
   created,
 
-  /// The BLOC is initialized via the [initialized] method.
+  /// The BLoC is initialized via the [initialized] method.
   initialized,
 
-  /// The BLOC is in the process of being configured.
+  /// The BLoC is in the process of being configured.
   configuring,
 
-  /// The BLOC is configured and ready to use.
+  /// The BLoC is configured and ready to use.
   configured,
 }
 
@@ -19,11 +20,9 @@ class StudyAppBLoC {
   final CarpBackend _backend = CarpBackend();
   final CarpStudyAppViewModel _appViewModel = CarpStudyAppViewModel();
   StudyDeploymentStatus? _status;
-  final StreamController<StudiesAppState> _stateStreamController =
+  final StreamController<StudyAppState> _stateStreamController =
       StreamController.broadcast();
 
-  // Stream<StudiesAppState> get stateStream => _stateStreamController.stream;
-
   List<ActiveParticipationInvitation> invitations = [];
 
   List<Message> _messages = [];
@@ -35,7 +34,16 @@ class StudyAppBLoC {
   /// The data send on the stream is the number of available messages.
   Stream<int> get messageStream => _messageStreamController.stream;
 
+  /// The state of this BloC.
   StudyAppState get state => _state;
+  set state(StudyAppState state) {
+    _state = state;
+    _stateStreamController.add(state);
+  }
+
+  /// A stream of state changes of this BloC.
+  Stream<StudyAppState> get stateStream => _stateStreamController.stream;
+
   bool get isInitialized => _state.index >= 1;
   bool get isConfiguring => _state.index >= 2;
   bool get isConfigured => _state.index >= 3;
@@ -116,7 +124,7 @@ class StudyAppBLoC {
 
     await backend.initialize();
 
-    _stateStreamController.add(StudiesAppState.initialized);
+    state = StudyAppState.initialized;
     info('$runtimeType initialized.');
   }
 
@@ -149,7 +157,7 @@ class StudyAppBLoC {
     // early out if already configured
     if (isConfiguring) return;
 
-    _stateStreamController.add(StudiesAppState.configuring);
+    state = StudyAppState.configuring;
 
     // set up and initialize sensing
     await Sensing().initialize();

lib/blocs/common.dart

@@ -1,17 +1,20 @@
 part of carp_study_app;
 
-/// Enumeration of different types of deployments on the CARP Web Service (CAWS).
+/// How to deploy a study.
 enum DeploymentMode {
-  /// Use the CARP production server to get the study deployment and store data.
+  /// Use a local study protocol & deployment and store data locally on the phone.
+  local,
+
+  /// Use the CAWS production server to get the study deployment and store data.
   production,
 
-  /// Use the CARP staging server to get the study deployment and store data.
+  /// Use the CAWS staging server to get the study deployment and store data.
   staging,
 
-  /// Use the CARP testing server to get the study deployment and store data.
+  /// Use the CAWS test server to get the study deployment and store data.
   test,
 
-  /// Use the CARP development server to get the study deployment and store data.
+  /// Use the CAWS development server to get the study deployment and store data.
   dev,
 }
 
@@ -49,10 +52,10 @@ enum StudiesAppState {
   initialized,
   authenticating,
   accessTokenRetrieved,
-  configuring,
-  loading,
-  loaded,
-  error,
+  // configuring,
+  // loading,
+  // loaded,
+  // error,
 }
 
 extension StringExtension on String {

lib/data/carp_backend.dart

@@ -100,19 +100,19 @@ class CarpBackend {
   }
 
   Future<CarpUser> authenticate() async {
-    bloc._stateStreamController.add(StudiesAppState.authenticating);
+    // bloc._stateStreamController.add(StudiesAppState.authenticating);
     user = await CarpService().authenticate();
 
-    bloc._stateStreamController.add(StudiesAppState.accessTokenRetrieved);
+    // bloc._stateStreamController.add(StudiesAppState.accessTokenRetrieved);
 
     return user as CarpUser;
   }
 
   Future<CarpUser> refresh() async {
-    bloc._stateStreamController.add(StudiesAppState.authenticating);
+    // bloc._stateStreamController.add(StudiesAppState.authenticating);
     user = await CarpService().refresh();
 
-    bloc._stateStreamController.add(StudiesAppState.accessTokenRetrieved);
+    // bloc._stateStreamController.add(StudiesAppState.accessTokenRetrieved);
 
     return user as CarpUser;
   }

lib/main.dart

@@ -47,7 +47,7 @@ part 'blocs/common.dart';
 part 'data/local_settings.dart';
 part 'data/carp_backend.dart';
 part 'data/localization_loader.dart';
-part 'sensing/sensing.dart';
+part 'blocs/sensing.dart';
 
 part 'view_models/view_model.dart';
 part 'view_models/tasklist_page_model.dart';

lib/ui/colors.dart

@@ -1,7 +1,7 @@
 part of carp_study_app;
 
 class CACHET {
-  static const Color CACHET_BLUE = Color.fromRGBO(97, 195, 217, 1.0);
+  static const Color BLUE = Color.fromRGBO(97, 195, 217, 1.0);
   static const Color RED = Color.fromRGBO(213, 11, 51, 1.0);
   static const Color WHITE = Color.fromRGBO(255, 255, 255, 1.0);
   static const Color BLACK = Color.fromRGBO(1, 1, 1, 1.0);

lib/ui/pages/task_list_page.dart

@@ -255,7 +255,7 @@ class TaskListPageState extends State<TaskListPage> {
     ),
     BackgroundSensingUserTask.SENSING_TYPE: const Icon(
       Icons.settings_input_antenna,
-      color: CACHET.CACHET_BLUE,
+      color: CACHET.BLUE,
     ),
     BackgroundSensingUserTask.ONE_TIME_SENSING_TYPE: const Icon(
       Icons.settings_input_component,

lib/view_models/devices_page_model.dart

@@ -88,13 +88,38 @@ class DeviceModel {
       };
 
   static Map<String, Icon> get deviceTypeIcon => {
-        Smartphone.DEVICE_TYPE: const Icon(Icons.phone_android, size: 30),
-        WeatherService.DEVICE_TYPE: const Icon(Icons.wb_cloudy),
-        AirQualityService.DEVICE_TYPE: const Icon(Icons.air),
-        LocationService.DEVICE_TYPE: const Icon(Icons.location_on),
-        ESenseDevice.DEVICE_TYPE: const Icon(Icons.headphones, size: 30),
-        PolarDevice.DEVICE_TYPE: const Icon(Icons.monitor_heart, size: 30),
-        HealthService.DEVICE_TYPE: const Icon(Icons.favorite_rounded, size: 30),
+        Smartphone.DEVICE_TYPE: const Icon(
+          Icons.phone_android,
+          size: 30,
+          color: CACHET.DARK_BLUE,
+        ),
+        WeatherService.DEVICE_TYPE: const Icon(
+          Icons.wb_cloudy,
+          color: CACHET.WHITE,
+        ),
+        AirQualityService.DEVICE_TYPE: const Icon(
+          Icons.air,
+          color: CACHET.GREY_1,
+        ),
+        LocationService.DEVICE_TYPE: const Icon(
+          Icons.location_on,
+          color: CACHET.GREEN,
+        ),
+        ESenseDevice.DEVICE_TYPE: const Icon(
+          Icons.headphones,
+          size: 30,
+          color: CACHET.BLACK,
+        ),
+        PolarDevice.DEVICE_TYPE: const Icon(
+          Icons.monitor_heart,
+          size: 30,
+          color: CACHET.LIGHT_BLUE_2,
+        ),
+        HealthService.DEVICE_TYPE: const Icon(
+          Icons.favorite_rounded,
+          size: 30,
+          color: CACHET.RED_1,
+        ),
       };
 
   static Map<DeviceStatus, dynamic> get deviceStatusIcon => {