Merge branch 'treeViewInterface' of https://github.com/tom-anders/lic…

…hess-mobile
lichess-org · Oct 21, 2024 · 85a756e · 85a756e
2 parents 0c7800c + d9eb9a4
commit 85a756e
Show file tree

Hide file tree

Showing 7 changed files with 1,182 additions and 1,104 deletions.
diff --git a/lib/src/model/analysis/analysis_controller.dart b/lib/src/model/analysis/analysis_controller.dart
@@ -20,6 +20,7 @@ import 'package:lichess_mobile/src/model/engine/work.dart';
 import 'package:lichess_mobile/src/model/game/player.dart';
 import 'package:lichess_mobile/src/utils/rate_limit.dart';
 import 'package:lichess_mobile/src/view/engine/engine_gauge.dart';
+import 'package:lichess_mobile/src/view/pgn/pgn_tree_view.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'analysis_controller.freezed.dart';
@@ -60,7 +61,8 @@ class AnalysisOptions with _$AnalysisOptions {
 }
 
 @riverpod
-class AnalysisController extends _$AnalysisController {
+class AnalysisController extends _$AnalysisController
+    implements PgnTreeNotifier {
   late Root _root;
 
   final _engineEvalDebounce = Debouncer(const Duration(milliseconds: 150));
@@ -261,10 +263,12 @@ class AnalysisController extends _$AnalysisController {
     _setPath(state.currentPath.penultimate, replaying: true);
   }
 
+  @override
   void userJump(UciPath path) {
     _setPath(path);
   }
 
+  @override
   void expandVariations(UciPath path) {
     final node = _root.nodeAt(path);
     for (final child in node.children) {
@@ -276,8 +280,9 @@ class AnalysisController extends _$AnalysisController {
     state = state.copyWith(root: _root.view);
   }
 
+  @override
   void collapseVariations(UciPath path) {
-    final node = _root.parentAt(path);
+    final node = _root.nodeAt(path);
 
     for (final child in node.children) {
       child.isHidden = true;
@@ -286,6 +291,7 @@ class AnalysisController extends _$AnalysisController {
     state = state.copyWith(root: _root.view);
   }
 
+  @override
   void promoteVariation(UciPath path, bool toMainline) {
     _root.promoteAt(path, toMainline: toMainline);
     state = state.copyWith(
@@ -294,6 +300,7 @@ class AnalysisController extends _$AnalysisController {
     );
   }
 
+  @override
   void deleteFromHere(UciPath path) {
     _root.deleteAt(path);
     _setPath(path.penultimate, shouldRecomputeRootView: true);

diff --git a/lib/src/view/analysis/analysis_board.dart b/lib/src/view/analysis/analysis_board.dart
@@ -15,7 +15,7 @@ import 'package:lichess_mobile/src/model/common/chess.dart';
 import 'package:lichess_mobile/src/model/common/eval.dart';
 import 'package:lichess_mobile/src/model/engine/evaluation_service.dart';
 import 'package:lichess_mobile/src/model/settings/board_preferences.dart';
-import 'package:lichess_mobile/src/view/analysis/annotations.dart';
+import 'package:lichess_mobile/src/view/pgn/annotations.dart';
 
 class AnalysisBoard extends ConsumerStatefulWidget {
   const AnalysisBoard(