Merge branch 'julien4215-broadcast-blink'

lichess-org · Jan 12, 2025 · 91275de · 91275de
2 parents fcc09d4 + be7ddf0
commit 91275de
Show file tree

Hide file tree

Showing 5 changed files with 238 additions and 253 deletions.
diff --git a/.../broadcast/broadcast_game_controller.dart → ...adcast/broadcast_analysis_controller.dart b/.../broadcast/broadcast_game_controller.dart → ...adcast/broadcast_analysis_controller.dart
@@ -25,11 +25,11 @@ import 'package:lichess_mobile/src/view/engine/engine_gauge.dart';
 import 'package:lichess_mobile/src/widgets/pgn.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-part 'broadcast_game_controller.freezed.dart';
-part 'broadcast_game_controller.g.dart';
+part 'broadcast_analysis_controller.freezed.dart';
+part 'broadcast_analysis_controller.g.dart';
 
 @riverpod
-class BroadcastGameController extends _$BroadcastGameController implements PgnTreeNotifier {
+class BroadcastAnalysisController extends _$BroadcastAnalysisController implements PgnTreeNotifier {
   static Uri broadcastSocketUri(BroadcastRoundId broadcastRoundId) =>
       Uri(path: 'study/$broadcastRoundId/socket/v6');
 
@@ -48,10 +48,10 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
   Object? _key = Object();
 
   @override
-  Future<BroadcastGameState> build(BroadcastRoundId roundId, BroadcastGameId gameId) async {
+  Future<BroadcastAnalysisState> build(BroadcastRoundId roundId, BroadcastGameId gameId) async {
     _socketClient = ref
         .watch(socketPoolProvider)
-        .open(BroadcastGameController.broadcastSocketUri(roundId));
+        .open(BroadcastAnalysisController.broadcastSocketUri(roundId));
 
     _subscription = _socketClient.stream.listen(_handleSocketEvent);
 
@@ -104,7 +104,7 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
     // don't use ref.watch here: we don't want to invalidate state when the
     // analysis preferences change
     final prefs = ref.read(analysisPreferencesProvider);
-    final broadcastState = BroadcastGameState(
+    final broadcastState = BroadcastAnalysisState(
       id: gameId,
       currentPath: currentPath,
       broadcastPath: currentPath,
@@ -560,10 +560,10 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
 }
 
 @freezed
-class BroadcastGameState with _$BroadcastGameState {
-  const BroadcastGameState._();
+class BroadcastAnalysisState with _$BroadcastAnalysisState {
+  const BroadcastAnalysisState._();
 
-  const factory BroadcastGameState({
+  const factory BroadcastAnalysisState({
     /// Broadcast game ID
     required StringId id,
 

diff --git a/lib/src/view/broadcast/broadcast_game_bottom_bar.dart b/lib/src/view/broadcast/broadcast_game_bottom_bar.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:lichess_mobile/src/model/broadcast/broadcast_game_controller.dart';
+import 'package:lichess_mobile/src/model/broadcast/broadcast_analysis_controller.dart';
 import 'package:lichess_mobile/src/model/broadcast/broadcast_repository.dart';
 import 'package:lichess_mobile/src/model/common/id.dart';
 import 'package:lichess_mobile/src/model/game/game_share_service.dart';
@@ -29,8 +29,8 @@ class BroadcastGameBottomBar extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final ctrlProvider = broadcastGameControllerProvider(roundId, gameId);
-    final broadcastGameState = ref.watch(ctrlProvider).requireValue;
+    final ctrlProvider = broadcastAnalysisControllerProvider(roundId, gameId);
+    final broadcastAnalysisState = ref.watch(ctrlProvider).requireValue;
 
     return BottomBar(
       children: [
@@ -107,22 +107,22 @@ class BroadcastGameBottomBar extends ConsumerWidget {
           icon: CupertinoIcons.arrow_2_squarepath,
         ),
         RepeatButton(
-          onLongPress: broadcastGameState.canGoBack ? () => _moveBackward(ref) : null,
+          onLongPress: broadcastAnalysisState.canGoBack ? () => _moveBackward(ref) : null,
           child: BottomBarButton(
             key: const ValueKey('goto-previous'),
-            onTap: broadcastGameState.canGoBack ? () => _moveBackward(ref) : null,
+            onTap: broadcastAnalysisState.canGoBack ? () => _moveBackward(ref) : null,
             label: 'Previous',
             icon: CupertinoIcons.chevron_back,
             showTooltip: false,
           ),
         ),
         RepeatButton(
-          onLongPress: broadcastGameState.canGoNext ? () => _moveForward(ref) : null,
+          onLongPress: broadcastAnalysisState.canGoNext ? () => _moveForward(ref) : null,
           child: BottomBarButton(
             key: const ValueKey('goto-next'),
             icon: CupertinoIcons.chevron_forward,
             label: context.l10n.next,
-            onTap: broadcastGameState.canGoNext ? () => _moveForward(ref) : null,
+            onTap: broadcastAnalysisState.canGoNext ? () => _moveForward(ref) : null,
             showTooltip: false,
           ),
         ),
@@ -131,7 +131,7 @@ class BroadcastGameBottomBar extends ConsumerWidget {
   }
 
   void _moveForward(WidgetRef ref) =>
-      ref.read(broadcastGameControllerProvider(roundId, gameId).notifier).userNext();
+      ref.read(broadcastAnalysisControllerProvider(roundId, gameId).notifier).userNext();
   void _moveBackward(WidgetRef ref) =>
-      ref.read(broadcastGameControllerProvider(roundId, gameId).notifier).userPrevious();
+      ref.read(broadcastAnalysisControllerProvider(roundId, gameId).notifier).userPrevious();
 }