Presentation fixes: - Mirror the in-progress pen/highlighter stroke to the audience window live (new 'inkLive' channel) so highlights appear as they are drawn, not only after the pen lifts. - Cover the macOS menu bar on the beamer: raise the audience window above .mainMenu level so the Apple/Wi-Fi strip no longer shows during a presentation. Styling no longer lives in the file: - generateDeck no longer embeds the ThemeProfile; a saved .md holds only content. The profile is inlined only for the transient audience-window payload (inlineStyleProfile: true), never to disk. - On open, the app applies the active style profile (FileService.openDeck / activeProfileFor, DeckNotifier.loadDeck); applyMarkdown preserves the current profile. Quality pass / tests green: - Complete the consent-screen translations (English plus 7 missing strings per other language). - Pass the consent gate in widget/ui-scale tests by seeding the consent key, so the app shell renders. - Update markdown round-trip tests for the new default and add coverage for live stroke streaming and styling-free saves. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
170 lines
5.4 KiB
Dart
170 lines
5.4 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:ocideck/models/annotation.dart';
|
|
import 'package:ocideck/models/slide.dart';
|
|
import 'package:ocideck/services/annotation_codec.dart';
|
|
import 'package:ocideck/widgets/presentation/annotation_overlay.dart';
|
|
|
|
void main() {
|
|
group('InkStroke JSON', () {
|
|
test('round-trips tool, color, width and points', () {
|
|
const stroke = InkStroke(
|
|
tool: InkTool.highlighter,
|
|
color: 0xFF22C55E,
|
|
width: 0.022,
|
|
points: [Offset(0.1, 0.2), Offset(0.3, 0.45)],
|
|
);
|
|
final back = InkStroke.fromJson(stroke.toJson());
|
|
expect(back.tool, InkTool.highlighter);
|
|
expect(back.color, 0xFF22C55E);
|
|
expect(back.width, closeTo(0.022, 1e-9));
|
|
expect(back.points.length, 2);
|
|
expect(back.points[1].dx, closeTo(0.3, 1e-4));
|
|
expect(back.points[1].dy, closeTo(0.45, 1e-4));
|
|
});
|
|
});
|
|
|
|
group('AnnotationCodec', () {
|
|
InkStroke stroke() => const InkStroke(
|
|
tool: InkTool.pen,
|
|
color: 0xFFEF4444,
|
|
width: 0.004,
|
|
points: [Offset(0.1, 0.1), Offset(0.2, 0.2)],
|
|
);
|
|
|
|
test('encodes nothing when there are no strokes', () {
|
|
final slides = [Slide.create(SlideType.bullets)];
|
|
expect(AnnotationCodec.encode(slides, {}), isNull);
|
|
});
|
|
|
|
test('round-trips strokes for the same deck', () {
|
|
final slides = [
|
|
Slide.create(SlideType.bullets).copyWith(title: 'A'),
|
|
Slide.create(SlideType.bullets).copyWith(title: 'B'),
|
|
];
|
|
final ann = {
|
|
slides[1].id: [stroke()],
|
|
};
|
|
final json = AnnotationCodec.encode(slides, ann)!;
|
|
final back = AnnotationCodec.decode(json, slides);
|
|
expect(back.keys, [slides[1].id]);
|
|
expect(back[slides[1].id]!.single.points.length, 2);
|
|
});
|
|
|
|
test('re-anchors strokes to the matching slide after reordering', () {
|
|
final a = Slide.create(SlideType.bullets).copyWith(title: 'A');
|
|
final b = Slide.create(SlideType.bullets).copyWith(title: 'B');
|
|
final json = AnnotationCodec.encode(
|
|
[a, b],
|
|
{
|
|
a.id: [stroke()],
|
|
},
|
|
)!;
|
|
|
|
// Reload parses fresh slides with NEW ids but identical content, in a
|
|
// different order.
|
|
final a2 = Slide.create(SlideType.bullets).copyWith(title: 'A');
|
|
final b2 = Slide.create(SlideType.bullets).copyWith(title: 'B');
|
|
final back = AnnotationCodec.decode(json, [b2, a2]);
|
|
expect(back.containsKey(a2.id), isTrue);
|
|
expect(back.containsKey(b2.id), isFalse);
|
|
});
|
|
|
|
test('drops strokes when the slide content changed', () {
|
|
final a = Slide.create(SlideType.bullets).copyWith(title: 'A');
|
|
final json = AnnotationCodec.encode(
|
|
[a],
|
|
{
|
|
a.id: [stroke()],
|
|
},
|
|
)!;
|
|
final edited = Slide.create(
|
|
SlideType.bullets,
|
|
).copyWith(title: 'A (changed)');
|
|
final back = AnnotationCodec.decode(json, [edited]);
|
|
expect(back, isEmpty);
|
|
});
|
|
});
|
|
|
|
group('AnnotationLayer live stroke', () {
|
|
testWidgets('streams the in-progress stroke and clears it on commit', (
|
|
tester,
|
|
) async {
|
|
final active = <InkStroke?>[];
|
|
final committed = <List<InkStroke>>[];
|
|
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: SizedBox(
|
|
width: 400,
|
|
height: 225,
|
|
child: AnnotationLayer(
|
|
strokes: const [],
|
|
tool: InkTool.pen,
|
|
interactive: true,
|
|
onStrokesChanged: committed.add,
|
|
onActiveStrokeChanged: active.add,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
|
|
final center = tester.getCenter(find.byType(AnnotationLayer));
|
|
final gesture = await tester.startGesture(center);
|
|
await gesture.moveBy(const Offset(20, 0));
|
|
await gesture.moveBy(const Offset(20, 10));
|
|
await tester.pump();
|
|
|
|
// While drawing, the partial stroke is reported with growing points.
|
|
final partials = active.whereType<InkStroke>().toList();
|
|
expect(partials, isNotEmpty);
|
|
expect(partials.last.tool, InkTool.pen);
|
|
expect(partials.last.points.length, greaterThan(1));
|
|
|
|
await gesture.up();
|
|
await tester.pump();
|
|
|
|
// Committing clears the live preview (null) and emits the final stroke.
|
|
expect(active.last, isNull);
|
|
expect(committed.single.single.points.length, greaterThan(1));
|
|
});
|
|
|
|
testWidgets('reports null when a tap is too short to commit', (
|
|
tester,
|
|
) async {
|
|
final active = <InkStroke?>[];
|
|
final committed = <List<InkStroke>>[];
|
|
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: SizedBox(
|
|
width: 400,
|
|
height: 225,
|
|
child: AnnotationLayer(
|
|
strokes: const [],
|
|
tool: InkTool.pen,
|
|
interactive: true,
|
|
onStrokesChanged: committed.add,
|
|
onActiveStrokeChanged: active.add,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
|
|
await tester.tap(find.byType(AnnotationLayer));
|
|
await tester.pump();
|
|
|
|
// A single down/up makes no stroke, but the preview must still be cleared.
|
|
expect(active.last, isNull);
|
|
expect(committed, isEmpty);
|
|
});
|
|
});
|
|
}
|