Add ButtonsHint on main screen

Author: Igor Demyanov

backend/pubspec.yaml

@@ -1,5 +1,5 @@
 name: 'dslideshow_backend'
-version: 9.5.1+1
+version: 9.5.2
 description: A sample command-line application
 publish_to: none
 environment:

changelog.md

@@ -1,6 +1,7 @@
-# 
+# 9.5.2
 Fix CurrentTimeWidget background
 Fix ButtonsHint colors
+Add ButtonsHint on main screen
 
 # 9.5.1
 Fix SystemMetricsWidget padding

dslideshow_flutter/lib/features/header/presentation/widgets/buttons_hint/buttons_hint.dart

@@ -7,11 +7,6 @@ import 'package:dslideshow_flutter/features/theme/presentation/theme.dart';
 class ButtonsHintWidget extends StatelessWidget {
   final SlideShowButtons buttons;
 
-  // Цвета HUD
-  static const Color _kHudColor = ThemeColors.buttonsHintColor;
-  static const Color _kHudPressedColor = ThemeColors.buttonsHintPressedColor ;
-  static const Color _kHudBg = ThemeColors.buttonsHintBackgroundColor ;
-
   const ButtonsHintWidget({
     required this.buttons,
     super.key,
@@ -25,8 +20,8 @@ class ButtonsHintWidget extends StatelessWidget {
 
         return Container(
           decoration: BoxDecoration(
-            color: _kHudBg,
-            border: Border.all(color: _kHudColor.withAlpha((255.0 * 0.5).round()), width: 1),
+            color: ThemeColors.buttonsHintBackgroundColor,
+            border: Border.all(color: ThemeColors.buttonsHintColor.withAlpha((255.0 * 0.5).round()), width: 1),
             borderRadius: BorderRadius.circular(4),
           ),
           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
@@ -48,7 +43,7 @@ class ButtonsHintWidget extends StatelessWidget {
   }
 
   Widget _buildHudButton(IconData icon, bool isPressed) {
-    final color = isPressed ? _kHudPressedColor : _kHudColor;
+    final color = isPressed ? ThemeColors.buttonsHintPressedColor : ThemeColors.buttonsHintColor;
 
     return Container(
       padding: const EdgeInsets.all(4),

dslideshow_flutter/lib/features/header/presentation/widgets/buttons_hint/buttons_hint_bloc.dart

@@ -2,6 +2,9 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:dslideshow_backend/command.dart';
+import 'package:dslideshow_backend/config.dart';
+import 'package:dslideshow_flutter/features/slideshow/presentation/bloc/status/slideshow_status_bloc.dart';
+import 'package:dslideshow_flutter/features/theme/presentation/src/theme_colors.dart';
 import 'package:dslideshow_flutter/src/service/frontend.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -12,30 +15,72 @@ part 'buttons_hint_bloc.freezed.dart';
 
 class ButtonsHintBloc extends Bloc<ButtonsHintEvent, ButtonsHintState> {
   final FrontendService frontendService;
+  final SlideshowStatusBloc statusBloc;
+  final AppConfig appConfig;
 
   late StreamSubscription<ButtonEvent> _onButtonEventSubscription;
+  late StreamSubscription _onStatusSubscription;
+  late SlideshowStatusState _currentStatus;
+  late Timer _hideHintTimer;
+  DateTime _lastButtonActive = DateTime.now();
 
-  ButtonsHintBloc({required this.frontendService})
-    : super(
-        ButtonsHintDisplayState(
-          isShow: false,
-          normalColor: Colors.white,
-          pushColor: Colors.blue.shade500,
-          button0Icon: Icons.arrow_back,
-          button0isPush: false,
-          button1Icon: Icons.arrow_circle_down,
-          button1isPush: false,
-          button2Icon: Icons.arrow_circle_up,
-          button2isPush: false,
-          button3Icon: Icons.check_circle_outline_outlined,
-          button3isPush: false,
-        ),
-      ) {
+  ButtonsHintBloc({
+    required this.frontendService,
+    required this.statusBloc,
+    required this.appConfig,
+  }) : super(
+         ButtonsHintDisplayState(
+           isShow: false,
+           normalColor: ThemeColors.buttonsHintColor,
+           pushColor: ThemeColors.buttonsHintPressedColor,
+           button0Icon: Icons.arrow_back,
+           button0isPush: false,
+           button1Icon: Icons.arrow_circle_down,
+           button1isPush: false,
+           button2Icon: Icons.arrow_circle_up,
+           button2isPush: false,
+           button3Icon: Icons.check_circle_outline_outlined,
+           button3isPush: false,
+         ),
+       ) {
     on<ButtonsHintPushButtonEvent>(_onPushButtonEvent);
     on<ButtonsHintShowEvent>(_onShowEvent);
     _onButtonEventSubscription = frontendService.onButtonEvent.listen(
       _onButtonEvent,
     );
+    on<ButtonsHintUpdateButtonsEvent>(_onUpdateButtons);
+    _hideHintTimer = Timer(Duration(seconds: 5), _hideHint);
+    _startAutoHideHint();
+    _currentStatus = statusBloc.state;
+    _onStatusChanged(_currentStatus, true);
+    _onStatusSubscription = statusBloc.stream.listen(_onStatusChanged);
+  }
+
+  void _startAutoHideHint([bool isForce = false]) {
+    if (isForce || !_hideHintTimer.isActive) {
+      _hideHintTimer = Timer(Duration(seconds: 5), _hideHint);
+    }
+  }
+
+  void _hideHint() {
+    if (!_currentStatus.isMenu) {
+      if ((DateTime.now().difference(_lastButtonActive).inSeconds > 5)) {
+        add(ButtonsHintShowEvent(isShow: false));
+      } else {
+        _startAutoHideHint(true);
+      }
+    }
+  }
+
+  FutureOr<void> _onStatusChanged(
+    SlideshowStatusState state, [
+    bool isForceUpdate = false,
+  ]) {
+    if (isForceUpdate || _currentStatus.isMenu != state.isMenu) {
+      _currentStatus = state;
+      add(ButtonsHintUpdateButtonsEvent());
+    }
+    _currentStatus = state;
   }
 
   FutureOr<void> _onPushButtonEvent(
@@ -67,15 +112,19 @@ class ButtonsHintBloc extends Bloc<ButtonsHintEvent, ButtonsHintState> {
   }
 
   void _onButtonEvent(ButtonEvent event) {
+    _lastButtonActive = DateTime.now();
     if (event.event == ButtonEventType.released) {
       add(ButtonsHintPushButtonEvent(button: event.button));
     }
+    if (!_currentStatus.isMenu && !state.isShow){
+      _onStatusChanged(_currentStatus, true);
+    }
   }
 
   @override
   Future<void> close() {
     _onButtonEventSubscription.cancel();
-
+    _onStatusSubscription.cancel();
     return super.close();
   }
 
@@ -85,4 +134,55 @@ class ButtonsHintBloc extends Bloc<ButtonsHintEvent, ButtonsHintState> {
   ) {
     emit(state.copyWith(isShow: event.isShow));
   }
+
+  FutureOr<void> _onUpdateButtons(
+    ButtonsHintUpdateButtonsEvent event,
+    Emitter<ButtonsHintState> emit,
+  ) {
+    if (_currentStatus.isMenu) {
+      emit(
+        state.copyWith(
+          isShow: true,
+          button0Icon: Icons.arrow_back,
+          button1Icon: Icons.arrow_circle_down,
+          button2Icon: Icons.arrow_circle_up,
+          button3Icon: Icons.check_circle_outline_outlined,
+        ),
+      );
+    } else {
+      emit(
+        state.copyWith(
+          isShow: true,
+          button0Icon: getIconDataBySlideshowAction(
+            appConfig.slideshow.buttons.button0.action,
+          ),
+          button1Icon: getIconDataBySlideshowAction(
+            appConfig.slideshow.buttons.button1.action,
+          ),
+          button2Icon: getIconDataBySlideshowAction(
+            appConfig.slideshow.buttons.button2.action,
+          ),
+          button3Icon: getIconDataBySlideshowAction(
+            appConfig.slideshow.buttons.button3.action,
+          ),
+        ),
+      );
+      _startAutoHideHint(true);
+    }
+  }
+
+  IconData getIconDataBySlideshowAction(SlideshowAction action) {
+    switch (action) {
+      case SlideshowAction.none:
+        return Icons.cancel;
+      case SlideshowAction.pause:
+        return Icons.pause;
+      case SlideshowAction.showInfo:
+        return Icons.info;
+      case SlideshowAction.showMenu:
+        return Icons.menu;
+      case SlideshowAction.toggleScreen:
+        return Icons.power_off;
+    }
+  }
 }

dslideshow_flutter/lib/features/header/presentation/widgets/buttons_hint/buttons_hint_bloc.freezed.dart

@@ -9,4 +9,5 @@ class ButtonsHintEvent with _$ButtonsHintEvent {
   const factory ButtonsHintEvent.pushButton({
     required ButtonType button,
   }) = ButtonsHintPushButtonEvent;
+   const factory ButtonsHintEvent.updateButtons() = ButtonsHintUpdateButtonsEvent;
 }