* Refactor notification service and update related components to use IAppNotificationService

* Fix temporary exit state problem

Author: oldrev

client/lib/app.dart

@@ -1,5 +1,5 @@
-import 'package:borneo_app/services/default_notification_service.dart';
-import 'package:borneo_app/services/inotification_service.dart';
+import 'package:borneo_app/services/default_app_notification_service.dart';
+import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:borneo_app/views/main_screen.dart';
 import 'package:borneo_kernel_abstractions/ikernel.dart';
 import 'package:event_bus/event_bus.dart';
@@ -57,7 +57,7 @@ class BorneoApp extends StatelessWidget {
           final gt = GettextLocalizations.of(context);
           return MultiProvider(
             providers: [
-              Provider<INotificationService>(create: (context) => DefaultNotificationService()),
+              Provider<IAppNotificationService>(create: (context) => DefaultAppNotificationService()),
               // Here >>> register all providers that need to access the gettext interface <<<
               // SceneManager
               Provider<SceneManager>(

client/lib/devices/borneo/lyfi/manifest.dart

@@ -2,7 +2,7 @@ import 'package:borneo_app/devices/borneo/lyfi/view_models/lyfi_view_model.dart'
 import 'package:borneo_app/devices/borneo/lyfi/views/lyfi_view.dart';
 import 'package:borneo_app/models/devices/device_module_metadata.dart';
 import 'package:borneo_app/services/device_manager.dart';
-import 'package:borneo_app/services/inotification_service.dart';
+import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
@@ -23,7 +23,7 @@ class LyfiDeviceModuleMetadata extends DeviceModuleMetadata {
               deviceID: deviceID,
               deviceManager: context.read<DeviceManager>(),
               globalEventBus: context.read<EventBus>(),
-              notification: context.read<INotificationService>(),
+              notification: context.read<IAppNotificationService>(),
               logger: context.read<Logger>(),
             ),
         deviceIconBuilder: (BuildContext context) => Icon(Icons.lightbulb_outline),

client/lib/devices/borneo/lyfi/view_models/lyfi_view_model.dart

@@ -2,7 +2,7 @@ import 'package:borneo_app/devices/borneo/lyfi/view_models/constants.dart';
 import 'package:borneo_app/devices/borneo/lyfi/view_models/settings_view_model.dart';
 import 'package:borneo_app/devices/borneo/lyfi/view_models/editor/sun_editor_view_model.dart';
 import 'package:borneo_app/devices/borneo/view_models/base_borneo_device_view_model.dart';
-import 'package:borneo_app/services/inotification_service.dart';
+import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
 import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
@@ -20,7 +20,7 @@ class LyfiViewModel extends BaseBorneoDeviceViewModel {
 
   static final DateFormat deviceDateFormat = DateFormat('yyyy-MM-dd HH:mm');
 
-  final INotificationService notification;
+  final IAppNotificationService notification;
 
   ILyfiDeviceApi get _deviceApi => super.borneoDeviceApi as ILyfiDeviceApi;
 

client/lib/devices/borneo/lyfi/view_models/settings_view_model.dart

@@ -1,6 +1,6 @@
 import 'package:borneo_app/devices/borneo/lyfi/view_models/base_lyfi_device_view_model.dart';
 import 'package:borneo_app/infrastructure/timezone.dart';
-import 'package:borneo_app/services/inotification_service.dart';
+import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:borneo_common/exceptions.dart' as bo_ex;
 import 'package:geolocator/geolocator.dart';
 
@@ -9,7 +9,7 @@ import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
 import 'package:latlong2/latlong.dart';
 
 class SettingsViewModel extends BaseLyfiDeviceViewModel {
-  final INotificationService notification;
+  final IAppNotificationService notification;
   final Uri address;
   final GeneralBorneoDeviceStatus borneoStatus;
   final GeneralBorneoDeviceInfo borneoInfo;
@@ -57,6 +57,7 @@ class SettingsViewModel extends BaseLyfiDeviceViewModel {
   @override
   Future<void> onInitialize() async {
     _correctionMethod = await api.getCorrectionMethod(boundDevice!.device);
+    _temporaryDuration = await api.getTemporaryDuration(boundDevice!.device);
   }
 
   Future<void> updateGeoLocation(LatLng location) async {

client/lib/devices/borneo/lyfi/views/lyfi_view.dart

@@ -1,6 +1,6 @@
 import 'package:borneo_app/devices/borneo/lyfi/views/editor/sun_editor_view.dart';
 import 'package:borneo_app/models/devices/device_entity.dart';
-import 'package:borneo_app/services/inotification_service.dart';
+import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:borneo_common/io/net/rssi.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
 import 'package:event_bus/event_bus.dart';
@@ -329,7 +329,7 @@ class LyfiView extends StatelessWidget {
             deviceID: device.id,
             deviceManager: cb.read<DeviceManager>(),
             globalEventBus: cb.read<EventBus>(),
-            notification: cb.read<INotificationService>(),
+            notification: cb.read<IAppNotificationService>(),
             logger: cb.read<Logger>(),
           ),
       builder: (context, child) {

…rvices/default_notification_service.dart …es/default_app_notification_service.dartclient/lib/services/default_notification_service.dart renamed to client/lib/services/default_app_notification_service.dart client/lib/services/default_notification_service.dart renamed to client/lib/services/default_app_notification_service.dart

@@ -1,8 +1,8 @@
-import 'package:borneo_app/services/inotification_service.dart';
+import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:flutter/material.dart';
 import 'package:toastification/toastification.dart';
 
-class DefaultNotificationService implements INotificationService {
+class DefaultAppNotificationService implements IAppNotificationService {
   @override
   void showError(String title, {String? body}) {
     toastification.show(
@@ -36,6 +36,9 @@ class DefaultNotificationService implements INotificationService {
       type: ToastificationType.success,
       title: Text(title),
       description: body != null ? Text(body) : null,
+      autoCloseDuration: Duration(seconds: 5),
+      closeOnClick: true,
+      dragToClose: true,
     );
   }
 

…/lib/services/inotification_service.dart …services/i_app_notification_service.dartclient/lib/services/inotification_service.dart renamed to client/lib/services/i_app_notification_service.dart client/lib/services/inotification_service.dart renamed to client/lib/services/i_app_notification_service.dart

@@ -1,4 +1,4 @@
-abstract class INotificationService {
+abstract class IAppNotificationService {
   void showSuccess(String title, {String? body});
   void showError(String title, {String? body});
   void showWarning(String title, {String? body});

fw/lyfi/main/src/coap-resources/lyfi-core.c

@@ -472,7 +472,7 @@ static void coap_hnd_temporary_duration_get(coap_resource_t* resource, coap_sess
     size_t encoded_size = 0;
     const struct led_user_settings* settings = led_get_settings();
 
-    uint8_t buf[128];
+    uint8_t buf[32];
 
     cbor_encoder_init(&encoder, buf, sizeof(buf), 0);
     BO_COAP_TRY_ENCODE_CBOR(cbor_encode_uint(&encoder, settings->temporary_duration));
@@ -497,11 +497,11 @@ static void coap_hnd_temporary_duration_put(coap_resource_t* resource, coap_sess
     int duration;
     BO_COAP_VERIFY(cbor_value_get_int_checked(&value, &duration));
 
-    if (duration <= 0 || duration > 0xFFFF) {
+    if (duration <= 0 || duration > INT32_MAX - 1) {
         coap_pdu_set_code(response, BO_COAP_CODE_400_BAD_REQUEST);
         return;
     }
-    BO_COAP_TRY(led_set_temporary_duration((uint16_t)duration), COAP_RESPONSE_CODE_INTERNAL_ERROR);
+    BO_COAP_TRY(led_set_temporary_duration((uint32_t)duration), COAP_RESPONSE_CODE_INTERNAL_ERROR);
     coap_pdu_set_code(response, BO_COAP_CODE_204_CHANGED);
 }
 

fw/lyfi/main/src/led/led.c

@@ -35,9 +35,9 @@ static void led_events_handler(void* handler_args, esp_event_base_t base, int32_
 
 static void led_render_task();
 
-void led_temporary_state_entry();
-void led_temporary_state_run();
-void led_temporary_state_exit();
+static void led_temporary_state_entry();
+static void led_temporary_state_run();
+static void led_temporary_state_exit();
 
 static void normal_state_entry();
 static void normal_state_run();
@@ -57,6 +57,8 @@ static void dimming_state_exit();
 #define LED_MAX_DUTY ((1 << LEDC_TIMER_12_BIT) - 1)
 #define LED_DUTY_RES LEDC_TIMER_10_BIT
 
+#define TEMPORARY_FADE_PERIOD_MS 5000
+
 static inline led_duty_t channel_brightness_to_duty(led_brightness_t power);
 static inline void color_to_duties(const led_color_t color, led_duty_t* duties);
 static int led_set_channel_duty(uint8_t ch, led_duty_t duty);
@@ -836,3 +838,64 @@ static void preview_state_exit()
     led_update_color(_led.color_to_resume);
     ESP_LOGI(TAG, "Preview state ended.");
 }
+
+int led_set_temporary_duration(uint32_t duration)
+{
+    _led.settings.temporary_duration = duration;
+    BO_TRY(led_save_user_settings());
+    return 0;
+}
+
+int32_t led_get_temporary_remaining()
+{
+    if (led_get_state() == LED_STATE_TEMPORARY) {
+        int64_t now = (esp_timer_get_time() + 500LL) / 1000LL;
+        return (int32_t)((_led.temporary_off_time - now + 500LL) / 1000LL);
+    }
+    else {
+        return -1;
+    }
+}
+
+void led_temporary_state_entry()
+{
+    if (!bo_power_is_on()) {
+        return;
+    }
+
+    if (_led.settings.mode != LED_MODE_SUN && _led.settings.mode != LED_MODE_SCHEDULED) {
+        return;
+    }
+
+    int64_t now = (esp_timer_get_time() + 500LL) / 1000LL;
+
+    _led.temporary_off_time = now + (_led.settings.temporary_duration * 60 * 1000) + TEMPORARY_FADE_PERIOD_MS;
+
+    BO_MUST(led_fade_to_color(_led.settings.manual_color, TEMPORARY_FADE_PERIOD_MS));
+}
+
+void led_temporary_state_exit()
+{
+    assert(led_get_state() == LED_STATE_TEMPORARY);
+
+    _led.temporary_off_time = 0;
+}
+
+void led_temporary_state_run()
+{
+    assert(led_get_state() == LED_STATE_TEMPORARY);
+
+    int64_t now = (esp_timer_get_time() + 500LL) / 1000LL;
+
+    if (now >= _led.temporary_off_time) {
+        smf_set_state(SMF_CTX(&_led), &LED_STATE_TABLE[LED_STATE_NORMAL]);
+    }
+    else {
+        if (!led_is_fading()) {
+            led_update_color(_led.settings.manual_color);
+        }
+        else {
+            led_fade_drive();
+        }
+    }
+}

fw/lyfi/main/src/led/led.h

@@ -84,7 +84,7 @@ struct led_acclimation_settings {
 struct led_user_settings {
     uint8_t mode; ///< Running mode, see `enum led_running_modes`
 
-    uint16_t temporary_duration; ///< Night lighting state duration (in seconds)
+    uint32_t temporary_duration; ///< Night lighting state duration (in seconds)
     struct led_scheduler scheduler; ///< Scheduling scheduler for scheduled state
     led_color_t manual_color; ///< Manual dimming color settings.
     led_color_t sun_color; ///< Sun simulation color settings.
@@ -161,7 +161,7 @@ int led_switch_mode(uint8_t mode);
 
 bool led_is_blank();
 
-int led_set_temporary_duration(uint16_t duration);
+int led_set_temporary_duration(uint32_t duration);
 int32_t led_get_temporary_remaining();
 
 int led_set_correction_method(uint8_t correction_method);