diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart index 521d575e..b27a6539 100644 --- a/lib/app/view/app.dart +++ b/lib/app/view/app.dart @@ -11,8 +11,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:leaderboard_repository/leaderboard_repository.dart'; +import 'package:pinball/game/game.dart'; import 'package:pinball/l10n/l10n.dart'; -import 'package:pinball/landing/landing.dart'; +import 'package:pinball/theme/theme.dart'; import 'package:pinball_audio/pinball_audio.dart'; class App extends StatelessWidget { @@ -34,20 +35,23 @@ class App extends StatelessWidget { RepositoryProvider.value(value: _leaderboardRepository), RepositoryProvider.value(value: _pinballAudio), ], - child: MaterialApp( - title: 'I/O Pinball', - theme: ThemeData( - appBarTheme: const AppBarTheme(color: Color(0xFF13B9FF)), - colorScheme: ColorScheme.fromSwatch( - accentColor: const Color(0xFF13B9FF), + child: BlocProvider( + create: (context) => ThemeCubit(), + child: MaterialApp( + title: 'I/O Pinball', + theme: ThemeData( + appBarTheme: const AppBarTheme(color: Color(0xFF13B9FF)), + colorScheme: ColorScheme.fromSwatch( + accentColor: const Color(0xFF13B9FF), + ), ), + localizationsDelegates: const [ + AppLocalizations.delegate, + GlobalMaterialLocalizations.delegate, + ], + supportedLocales: AppLocalizations.supportedLocales, + home: const PinballGamePage(), ), - localizationsDelegates: const [ - AppLocalizations.delegate, - GlobalMaterialLocalizations.delegate, - ], - supportedLocales: AppLocalizations.supportedLocales, - home: const LandingPage(), ), ); } diff --git a/test/app/view/app_test.dart b/test/app/view/app_test.dart index 01b5fea6..8beda302 100644 --- a/test/app/view/app_test.dart +++ b/test/app/view/app_test.dart @@ -8,7 +8,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:leaderboard_repository/leaderboard_repository.dart'; import 'package:pinball/app/app.dart'; -import 'package:pinball/landing/landing.dart'; +import 'package:pinball/game/game.dart'; import 'package:pinball_audio/pinball_audio.dart'; import '../../helpers/mocks.dart'; @@ -23,14 +23,14 @@ void main() { pinballAudio = MockPinballAudio(); }); - testWidgets('renders LandingPage', (tester) async { + testWidgets('renders PinballGamePage', (tester) async { await tester.pumpWidget( App( leaderboardRepository: leaderboardRepository, pinballAudio: pinballAudio, ), ); - expect(find.byType(LandingPage), findsOneWidget); + expect(find.byType(PinballGamePage), findsOneWidget); }); }); } diff --git a/test/helpers/mocks.dart b/test/helpers/mocks.dart index 12e6d366..078c96f0 100644 --- a/test/helpers/mocks.dart +++ b/test/helpers/mocks.dart @@ -72,7 +72,10 @@ class MockComponentSet extends Mock implements ComponentSet {} class MockDashNestBumper extends Mock implements DashNestBumper {} -class MockPinballAudio extends Mock implements PinballAudio {} +class MockPinballAudio extends Mock implements PinballAudio { + @override + Future load() async {} +} class MockSparkyTurboChargeSensor extends Mock implements SparkyTurboChargeSensor {}