diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 82d8fae0..f260a028 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -21,7 +21,7 @@ jobs:
- name: Build Flutter App
run: |
flutter packages get
- flutter build web --target lib/main_development.dart --web-renderer canvaskit --release
+ flutter build web --target lib/main.dart --web-renderer canvaskit --release
- name: Deploy to Firebase
uses: FirebaseExtended/action-hosting-deploy@v0
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 5bef442d..48ad112c 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -14,3 +14,4 @@ jobs:
flutter_version: 2.10.5
coverage_excludes: "lib/gen/*.dart"
test_optimization: false
+
diff --git a/.github/workflows/spell_check.yaml b/.github/workflows/spell_check.yaml
new file mode 100644
index 00000000..bfef58f8
--- /dev/null
+++ b/.github/workflows/spell_check.yaml
@@ -0,0 +1,21 @@
+name: spell_check
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+on: [pull_request]
+
+jobs:
+ build:
+ name: Spell Check
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - name: Check spelling
+ uses: zwaldowski/cspell-action@v1
+ with:
+ paths: '**/*.{dart,arb,md}'
+ config: .vscode/cspell.json
\ No newline at end of file
diff --git a/.idea/runConfigurations/development.xml b/.idea/runConfigurations/development.xml
deleted file mode 100644
index 37d45fe3..00000000
--- a/.idea/runConfigurations/development.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations/main.xml b/.idea/runConfigurations/main.xml
new file mode 100644
index 00000000..b5c260ef
--- /dev/null
+++ b/.idea/runConfigurations/main.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/production.xml b/.idea/runConfigurations/production.xml
deleted file mode 100644
index e55961d8..00000000
--- a/.idea/runConfigurations/production.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations/staging.xml b/.idea/runConfigurations/staging.xml
deleted file mode 100644
index 3f7d6219..00000000
--- a/.idea/runConfigurations/staging.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.vscode/cspell.json b/.vscode/cspell.json
new file mode 100644
index 00000000..71c54903
--- /dev/null
+++ b/.vscode/cspell.json
@@ -0,0 +1,50 @@
+{
+ "version": "0.2",
+ "enabled": true,
+ "language": "en",
+ "words": [
+ "animatronic",
+ "argb",
+ "audioplayers",
+ "backbox",
+ "bezier",
+ "contador",
+ "cupertino",
+ "dashbook",
+ "deserialization",
+ "dpad",
+ "endtemplate",
+ "firestore",
+ "gapless",
+ "genhtml",
+ "goldens",
+ "lcov",
+ "leaderboard",
+ "loadables",
+ "localizable",
+ "mixins",
+ "mocktail",
+ "mostrado",
+ "multiball",
+ "multiballs",
+ "occluder",
+ "pรกgina",
+ "pixelated",
+ "pixeloid",
+ "rects",
+ "rrect",
+ "serializable",
+ "sparky's",
+ "tappable",
+ "tappables",
+ "texto",
+ "theming",
+ "unawaited",
+ "unfocus",
+ "unlayered",
+ "vsync"
+ ],
+ "ignorePaths": [
+ ".github/workflows/**"
+ ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1b855b10..e2ea6cee 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,30 +5,10 @@
"version": "0.2.0",
"configurations": [
{
- "name": "Launch development",
+ "name": "Launch pinball",
"request": "launch",
"type": "dart",
- "program": "lib/main_development.dart",
- "args": [
- "--flavor",
- "development",
- "--target",
- "lib/main_development.dart"
- ]
- },
- {
- "name": "Launch staging",
- "request": "launch",
- "type": "dart",
- "program": "lib/main_staging.dart",
- "args": ["--flavor", "staging", "--target", "lib/main_staging.dart"]
- },
- {
- "name": "Launch production",
- "request": "launch",
- "type": "dart",
- "program": "lib/main_production.dart",
- "args": ["--flavor", "production", "--target", "lib/main_production.dart"]
+ "program": "lib/main.dart"
},
{
"name": "Launch component sandbox",
diff --git a/README.md b/README.md
index b91a1c98..957cb05b 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,31 @@
-# Pinball
+# I/O Pinball
+[![Pinball Header][logo]][pinball_link]
+
+[![io_pinball][build_status_badge]][workflow_link]
![coverage][coverage_badge]
[![style: very good analysis][very_good_analysis_badge]][very_good_analysis_link]
[![License: MIT][license_badge]][license_link]
-Generated by the [Very Good CLI][very_good_cli_link] ๐ค
+A Pinball game built with [Flutter][flutter_link] and [Firebase][firebase_link] for [Google I/O 2022][google_io_link].
-Google I/O 2022 Pinball game built with Flutter and Firebase
+[Try it now][pinball_link] and [learn about how it's made][blog_link].
----
+_Built by [Very Good Ventures][very_good_ventures_link] in partnership with Google_
-## Getting Started ๐
+_Created using [Very Good CLI][very_good_cli_link] ๐ค_
-This project contains 3 flavors:
+---
-- development
-- staging
-- production
+## Getting Started ๐
-To run the desired flavor either use the launch configuration in VSCode/Android Studio or use the following commands:
+To run the desired project either use the launch configuration in VSCode/Android Studio or use the following commands:
```sh
-# Development
-$ flutter run --flavor development --target lib/main_development.dart
-
-# Staging
-$ flutter run --flavor staging --target lib/main_staging.dart
-
-# Production
-$ flutter run --flavor production --target lib/main_production.dart
+$ flutter run -d chrome
```
-_\*Pinball works on iOS, Android, Web, and Windows._
+_\*I/O Pinball works on Web for desktop and mobile._
---
@@ -48,7 +42,6 @@ To view the generated coverage report you can use [lcov](https://github.com/linu
```sh
# Generate Coverage Report
$ genhtml coverage/lcov.info -o coverage/
-
# Open Coverage Report
$ open coverage/index.html
```
@@ -101,22 +94,6 @@ Widget build(BuildContext context) {
}
```
-### Adding Supported Locales
-
-Update the `CFBundleLocalizations` array in the `Info.plist` at `ios/Runner/Info.plist` to include the new locale.
-
-```xml
- ...
-
- CFBundleLocalizations
-
- en
- es
-
-
- ...
-```
-
### Adding Translations
1. For each supported locale, add a new ARB file in `lib/l10n/arb`.
@@ -154,38 +131,20 @@ Update the `CFBundleLocalizations` array in the `Info.plist` at `ios/Runner/Info
}
```
-### Deploy application to Firebase hosting
-
-Follow the following steps to deploy the application.
-
-## Firebase CLI
-
-Install and authenticate with [Firebase CLI tools](https://firebase.google.com/docs/cli)
-
-## Build the project using the desired environment
-
-```bash
-# Development
-$ flutter build web --release --target lib/main_development.dart
-
-# Staging
-$ flutter build web --release --target lib/main_staging.dart
-
-# Production
-$ flutter build web --release --target lib/main_production.dart
-```
-
-## Deploy
-
-```bash
-$ firebase deploy
-```
-
+[build_status_badge]: https://github.com/flutter/pinball/actions/workflows/main.yaml/badge.svg
[coverage_badge]: coverage_badge.svg
+[firebase_link]: https://firebase.google.com/
+[flutter_link]: https://flutter.dev
[flutter_localizations_link]: https://api.flutter.dev/flutter/flutter_localizations/flutter_localizations-library.html
+[google_io_link]: https://events.google.com/io/
+[blog_link]: https://medium.com/flutter/i-o-pinball-powered-by-flutter-and-firebase-d22423f3f5d
[internationalization_link]: https://flutter.dev/docs/development/accessibility-and-localization/internationalization
[license_badge]: https://img.shields.io/badge/license-MIT-blue.svg
[license_link]: https://opensource.org/licenses/MIT
+[logo]: art/readme_header.png
+[pinball_link]: https://pinball.flutter.dev
[very_good_analysis_badge]: https://img.shields.io/badge/style-very_good_analysis-B22C89.svg
[very_good_analysis_link]: https://pub.dev/packages/very_good_analysis
[very_good_cli_link]: https://github.com/VeryGoodOpenSource/very_good_cli
+[very_good_ventures_link]: https://verygood.ventures/
+[workflow_link]: https://github.com/flutter/pinball/actions/workflows/main.yaml
diff --git a/art/readme_header.png b/art/readme_header.png
new file mode 100644
index 00000000..43e7fb53
Binary files /dev/null and b/art/readme_header.png differ
diff --git a/assets/images/loading_game/io_pinball.png b/assets/images/loading_game/io_pinball.png
new file mode 100644
index 00000000..c8d9fadc
Binary files /dev/null and b/assets/images/loading_game/io_pinball.png differ
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
index e5e3c200..f621f1e2 100644
--- a/lib/app/view/app.dart
+++ b/lib/app/view/app.dart
@@ -17,17 +17,17 @@ class App extends StatelessWidget {
required AuthenticationRepository authenticationRepository,
required LeaderboardRepository leaderboardRepository,
required ShareRepository shareRepository,
- required PinballPlayer pinballPlayer,
+ required PinballAudioPlayer pinballAudioPlayer,
}) : _authenticationRepository = authenticationRepository,
_leaderboardRepository = leaderboardRepository,
_shareRepository = shareRepository,
- _pinballPlayer = pinballPlayer,
+ _pinballAudioPlayer = pinballAudioPlayer,
super(key: key);
final AuthenticationRepository _authenticationRepository;
final LeaderboardRepository _leaderboardRepository;
final ShareRepository _shareRepository;
- final PinballPlayer _pinballPlayer;
+ final PinballAudioPlayer _pinballAudioPlayer;
@override
Widget build(BuildContext context) {
@@ -36,7 +36,7 @@ class App extends StatelessWidget {
RepositoryProvider.value(value: _authenticationRepository),
RepositoryProvider.value(value: _leaderboardRepository),
RepositoryProvider.value(value: _shareRepository),
- RepositoryProvider.value(value: _pinballPlayer),
+ RepositoryProvider.value(value: _pinballAudioPlayer),
],
child: MultiBlocProvider(
providers: [
diff --git a/lib/assets_manager/cubit/assets_manager_cubit.dart b/lib/assets_manager/cubit/assets_manager_cubit.dart
index b97483d4..65b780c2 100644
--- a/lib/assets_manager/cubit/assets_manager_cubit.dart
+++ b/lib/assets_manager/cubit/assets_manager_cubit.dart
@@ -1,27 +1,39 @@
import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
+import 'package:pinball/game/game.dart';
+import 'package:pinball/select_character/select_character.dart';
+import 'package:pinball_audio/pinball_audio.dart';
part 'assets_manager_state.dart';
-/// {@template assets_manager_cubit}
-/// Cubit responsable for pre loading any game assets
-/// {@endtemplate}
class AssetsManagerCubit extends Cubit {
- /// {@macro assets_manager_cubit}
- AssetsManagerCubit(List loadables)
- : super(
- AssetsManagerState.initial(
- loadables: loadables,
- ),
- );
+ AssetsManagerCubit(this._game, this._audioPlayer)
+ : super(const AssetsManagerState.initial());
+
+ final PinballGame _game;
+ final PinballAudioPlayer _audioPlayer;
- /// Loads the assets
Future load() async {
+ /// Assigning loadables is a very expensive operation. With this purposeful
+ /// delay here, which is a bit random in duration but enough to let the UI
+ /// do its job without adding too much delay for the user, we are letting
+ /// the UI paint first, and then we start loading the assets.
+ await Future.delayed(const Duration(milliseconds: 300));
+ emit(
+ state.copyWith(
+ loadables: [
+ _game.preFetchLeaderboard(),
+ ..._game.preLoadAssets(),
+ ..._audioPlayer.load(),
+ ...BonusAnimation.loadAssets(),
+ ...SelectedCharacter.loadAssets(),
+ ],
+ ),
+ );
final all = state.loadables.map((loadable) async {
await loadable;
emit(state.copyWith(loaded: [...state.loaded, loadable]));
}).toList();
-
await Future.wait(all);
}
}
diff --git a/lib/assets_manager/cubit/assets_manager_state.dart b/lib/assets_manager/cubit/assets_manager_state.dart
index 8ef1e874..4847adc6 100644
--- a/lib/assets_manager/cubit/assets_manager_state.dart
+++ b/lib/assets_manager/cubit/assets_manager_state.dart
@@ -11,9 +11,8 @@ class AssetsManagerState extends Equatable {
});
/// {@macro assets_manager_state}
- const AssetsManagerState.initial({
- required List loadables,
- }) : this(loadables: loadables, loaded: const []);
+ const AssetsManagerState.initial()
+ : this(loadables: const [], loaded: const []);
/// List of futures to load
final List loadables;
@@ -22,7 +21,11 @@ class AssetsManagerState extends Equatable {
final List loaded;
/// Returns a value between 0 and 1 to indicate the loading progress
- double get progress => loaded.length / loadables.length;
+ double get progress =>
+ loadables.isEmpty ? 0 : loaded.length / loadables.length;
+
+ /// Only returns false if all the assets have been loaded
+ bool get isLoading => progress != 1;
/// Returns a copy of this instance with the given parameters
/// updated
diff --git a/lib/assets_manager/views/assets_loading_page.dart b/lib/assets_manager/views/assets_loading_page.dart
index ddb76803..4e75a3a5 100644
--- a/lib/assets_manager/views/assets_loading_page.dart
+++ b/lib/assets_manager/views/assets_loading_page.dart
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:pinball/assets_manager/assets_manager.dart';
+import 'package:pinball/gen/gen.dart';
import 'package:pinball/l10n/l10n.dart';
import 'package:pinball_ui/pinball_ui.dart';
@@ -20,10 +21,9 @@ class AssetsLoadingPage extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
- Text(
- l10n.ioPinball,
- style: headline1!.copyWith(fontSize: 80),
- textAlign: TextAlign.center,
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 20),
+ child: Assets.images.loadingGame.ioPinball.image(),
),
const SizedBox(height: 40),
AnimatedEllipsisText(
diff --git a/lib/game/behaviors/behaviors.dart b/lib/game/behaviors/behaviors.dart
index 301bc61e..5900f2b3 100644
--- a/lib/game/behaviors/behaviors.dart
+++ b/lib/game/behaviors/behaviors.dart
@@ -1,5 +1,6 @@
export 'ball_spawning_behavior.dart';
export 'ball_theming_behavior.dart';
+export 'bonus_ball_spawning_behavior.dart';
export 'bonus_noise_behavior.dart';
export 'bumper_noise_behavior.dart';
export 'camera_focusing_behavior.dart';
diff --git a/lib/game/behaviors/bonus_ball_spawning_behavior.dart b/lib/game/behaviors/bonus_ball_spawning_behavior.dart
new file mode 100644
index 00000000..26fe423d
--- /dev/null
+++ b/lib/game/behaviors/bonus_ball_spawning_behavior.dart
@@ -0,0 +1,30 @@
+import 'package:flame/components.dart';
+import 'package:pinball/select_character/select_character.dart';
+import 'package:pinball_components/pinball_components.dart';
+import 'package:pinball_flame/pinball_flame.dart';
+
+/// {@template bonus_ball_spawning_behavior}
+/// After a duration, spawns a bonus ball from the [DinoWalls] and boosts it
+/// into the middle of the board.
+/// {@endtemplate}
+class BonusBallSpawningBehavior extends TimerComponent with HasGameRef {
+ /// {@macro bonus_ball_spawning_behavior}
+ BonusBallSpawningBehavior()
+ : super(
+ period: 5,
+ removeOnFinish: true,
+ );
+
+ @override
+ void onTick() {
+ final characterTheme = readBloc()
+ .state
+ .characterTheme;
+ gameRef.descendants().whereType().single.add(
+ Ball(assetPath: characterTheme.ball.keyName)
+ ..add(BallImpulsingBehavior(impulse: Vector2(-40, 0)))
+ ..initialPosition = Vector2(29.2, -24.5)
+ ..zIndex = ZIndexes.ballOnBoard,
+ );
+ }
+}
diff --git a/lib/game/behaviors/bonus_noise_behavior.dart b/lib/game/behaviors/bonus_noise_behavior.dart
index 70c8ad3e..b330dc9f 100644
--- a/lib/game/behaviors/bonus_noise_behavior.dart
+++ b/lib/game/behaviors/bonus_noise_behavior.dart
@@ -15,7 +15,7 @@ class BonusNoiseBehavior extends Component {
},
onNewState: (state) {
final bonus = state.bonusHistory.last;
- final audioPlayer = readProvider();
+ final audioPlayer = readProvider();
switch (bonus) {
case GameBonus.googleWord:
@@ -25,10 +25,13 @@ class BonusNoiseBehavior extends Component {
audioPlayer.play(PinballAudio.sparky);
break;
case GameBonus.dinoChomp:
+ audioPlayer.play(PinballAudio.dino);
break;
case GameBonus.androidSpaceship:
+ audioPlayer.play(PinballAudio.android);
break;
case GameBonus.dashNest:
+ audioPlayer.play(PinballAudio.dash);
break;
}
},
diff --git a/lib/game/behaviors/bumper_noise_behavior.dart b/lib/game/behaviors/bumper_noise_behavior.dart
index 926fff96..4144241a 100644
--- a/lib/game/behaviors/bumper_noise_behavior.dart
+++ b/lib/game/behaviors/bumper_noise_behavior.dart
@@ -6,6 +6,6 @@ class BumperNoiseBehavior extends ContactBehavior {
@override
void beginContact(Object other, Contact contact) {
super.beginContact(other, contact);
- readProvider().play(PinballAudio.bumper);
+ readProvider().play(PinballAudio.bumper);
}
}
diff --git a/lib/game/behaviors/scoring_behavior.dart b/lib/game/behaviors/scoring_behavior.dart
index 8b403d1e..4d6d8b42 100644
--- a/lib/game/behaviors/scoring_behavior.dart
+++ b/lib/game/behaviors/scoring_behavior.dart
@@ -15,7 +15,7 @@ import 'package:pinball_flame/pinball_flame.dart';
/// {@endtemplate}
class ScoringBehavior extends Component
with HasGameRef, FlameBlocReader {
- /// {@macto scoring_behavior}
+ /// {@macro scoring_behavior}
ScoringBehavior({
required Points points,
required Vector2 position,
diff --git a/lib/game/bloc/game_bloc.dart b/lib/game/bloc/game_bloc.dart
index d00e5da1..795d04e2 100644
--- a/lib/game/bloc/game_bloc.dart
+++ b/lib/game/bloc/game_bloc.dart
@@ -12,7 +12,6 @@ class GameBloc extends Bloc {
on(_onScored);
on(_onIncreasedMultiplier);
on(_onBonusActivated);
- on(_onSparkyTurboChargeActivated);
on(_onGameOver);
on(_onGameStarted);
}
@@ -65,18 +64,4 @@ class GameBloc extends Bloc {
),
);
}
-
- Future _onSparkyTurboChargeActivated(
- SparkyTurboChargeActivated event,
- Emitter emit,
- ) async {
- emit(
- state.copyWith(
- bonusHistory: [
- ...state.bonusHistory,
- GameBonus.sparkyTurboCharge,
- ],
- ),
- );
- }
}
diff --git a/lib/game/bloc/game_event.dart b/lib/game/bloc/game_event.dart
index a8e8593b..126ba299 100644
--- a/lib/game/bloc/game_event.dart
+++ b/lib/game/bloc/game_event.dart
@@ -40,13 +40,6 @@ class BonusActivated extends GameEvent {
List get props => [bonus];
}
-class SparkyTurboChargeActivated extends GameEvent {
- const SparkyTurboChargeActivated();
-
- @override
- List get props => [];
-}
-
/// {@template multiplier_increased_game_event}
/// Added when a multiplier is gained.
/// {@endtemplate}
diff --git a/lib/game/bloc/game_state.dart b/lib/game/bloc/game_state.dart
index c45da958..8fcab789 100644
--- a/lib/game/bloc/game_state.dart
+++ b/lib/game/bloc/game_state.dart
@@ -5,7 +5,7 @@ enum GameBonus {
/// Bonus achieved when the ball activates all Google letters.
googleWord,
- /// Bonus achieved when the user activates all dash nest bumpers.
+ /// Bonus achieved when the user activates all dash bumpers.
dashNest,
/// Bonus achieved when a ball enters Sparky's computer.
diff --git a/lib/game/components/android_acres/android_acres.dart b/lib/game/components/android_acres/android_acres.dart
index 7f9fff13..902eb11c 100644
--- a/lib/game/components/android_acres/android_acres.dart
+++ b/lib/game/components/android_acres/android_acres.dart
@@ -1,6 +1,7 @@
// ignore_for_file: avoid_renaming_method_parameters
import 'package:flame/components.dart';
+import 'package:flame_bloc/flame_bloc.dart';
import 'package:flutter/material.dart';
import 'package:pinball/game/behaviors/behaviors.dart';
import 'package:pinball/game/components/android_acres/behaviors/behaviors.dart';
@@ -15,42 +16,43 @@ class AndroidAcres extends Component {
AndroidAcres()
: super(
children: [
- SpaceshipRamp(
+ FlameBlocProvider(
+ create: AndroidSpaceshipCubit.new,
children: [
- RampShotBehavior(
- points: Points.fiveThousand,
- ),
- RampBonusBehavior(
- points: Points.oneMillion,
+ SpaceshipRamp(
+ children: [
+ RampShotBehavior(points: Points.fiveThousand),
+ RampBonusBehavior(points: Points.oneMillion),
+ ],
),
+ SpaceshipRail(),
+ AndroidSpaceship(position: Vector2(-26.5, -28.5)),
+ AndroidAnimatronic(
+ children: [
+ ScoringContactBehavior(points: Points.twoHundredThousand),
+ ],
+ )..initialPosition = Vector2(-26, -28.25),
+ AndroidBumper.a(
+ children: [
+ ScoringContactBehavior(points: Points.twentyThousand),
+ BumperNoiseBehavior(),
+ ],
+ )..initialPosition = Vector2(-25.2, 1.5),
+ AndroidBumper.b(
+ children: [
+ ScoringContactBehavior(points: Points.twentyThousand),
+ BumperNoiseBehavior(),
+ ],
+ )..initialPosition = Vector2(-32.9, -9.3),
+ AndroidBumper.cow(
+ children: [
+ ScoringContactBehavior(points: Points.twentyThousand),
+ BumperNoiseBehavior(),
+ ],
+ )..initialPosition = Vector2(-20.7, -13),
+ AndroidSpaceshipBonusBehavior(),
],
),
- SpaceshipRail(),
- AndroidSpaceship(position: Vector2(-26.5, -28.5)),
- AndroidAnimatronic(
- children: [
- ScoringContactBehavior(points: Points.twoHundredThousand),
- ],
- )..initialPosition = Vector2(-26, -28.25),
- AndroidBumper.a(
- children: [
- ScoringContactBehavior(points: Points.twentyThousand),
- BumperNoiseBehavior(),
- ],
- )..initialPosition = Vector2(-25.2, 1.5),
- AndroidBumper.b(
- children: [
- ScoringContactBehavior(points: Points.twentyThousand),
- BumperNoiseBehavior(),
- ],
- )..initialPosition = Vector2(-32.9, -9.3),
- AndroidBumper.cow(
- children: [
- ScoringContactBehavior(points: Points.twentyThousand),
- BumperNoiseBehavior(),
- ],
- )..initialPosition = Vector2(-20.7, -13),
- AndroidSpaceshipBonusBehavior(),
],
);
diff --git a/lib/game/components/android_acres/behaviors/android_spaceship_bonus_behavior.dart b/lib/game/components/android_acres/behaviors/android_spaceship_bonus_behavior.dart
index cbb6e516..3b6f59ec 100644
--- a/lib/game/components/android_acres/behaviors/android_spaceship_bonus_behavior.dart
+++ b/lib/game/components/android_acres/behaviors/android_spaceship_bonus_behavior.dart
@@ -5,18 +5,21 @@ import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
/// Adds a [GameBonus.androidSpaceship] when [AndroidSpaceship] has a bonus.
-class AndroidSpaceshipBonusBehavior extends Component
- with ParentIsA, FlameBlocReader {
+class AndroidSpaceshipBonusBehavior extends Component {
@override
- void onMount() {
- super.onMount();
- final androidSpaceship = parent.firstChild()!;
- androidSpaceship.bloc.stream.listen((state) {
- final listenWhen = state == AndroidSpaceshipState.withBonus;
- if (!listenWhen) return;
-
- bloc.add(const BonusActivated(GameBonus.androidSpaceship));
- androidSpaceship.bloc.onBonusAwarded();
- });
+ Future onLoad() async {
+ await super.onLoad();
+ await add(
+ FlameBlocListener(
+ listenWhen: (_, state) => state == AndroidSpaceshipState.withBonus,
+ onNewState: (state) {
+ readBloc().add(
+ const BonusActivated(GameBonus.androidSpaceship),
+ );
+ readBloc()
+ .onBonusAwarded();
+ },
+ ),
+ );
}
}
diff --git a/lib/game/components/backbox/backbox.dart b/lib/game/components/backbox/backbox.dart
index 887294d8..946eda93 100644
--- a/lib/game/components/backbox/backbox.dart
+++ b/lib/game/components/backbox/backbox.dart
@@ -5,34 +5,44 @@ import 'package:flutter/material.dart';
import 'package:leaderboard_repository/leaderboard_repository.dart';
import 'package:pinball/game/components/backbox/bloc/backbox_bloc.dart';
import 'package:pinball/game/components/backbox/displays/displays.dart';
+import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
import 'package:pinball_theme/pinball_theme.dart' hide Assets;
import 'package:pinball_ui/pinball_ui.dart';
+import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart';
/// {@template backbox}
/// The [Backbox] of the pinball machine.
/// {@endtemplate}
-class Backbox extends PositionComponent with ZIndex {
+class Backbox extends PositionComponent with ZIndex, HasGameRef {
/// {@macro backbox}
Backbox({
required LeaderboardRepository leaderboardRepository,
required ShareRepository shareRepository,
- }) : _shareRepository = shareRepository,
- _bloc = BackboxBloc(leaderboardRepository: leaderboardRepository);
+ required List? entries,
+ }) : _bloc = BackboxBloc(
+ leaderboardRepository: leaderboardRepository,
+ initialEntries: entries,
+ ),
+ _shareRepository = shareRepository,
+ _platformHelper = PlatformHelper();
/// {@macro backbox}
@visibleForTesting
Backbox.test({
required BackboxBloc bloc,
required ShareRepository shareRepository,
+ required PlatformHelper platformHelper,
}) : _bloc = bloc,
- _shareRepository = shareRepository;
+ _shareRepository = shareRepository,
+ _platformHelper = platformHelper;
final ShareRepository _shareRepository;
late final Component _display;
final BackboxBloc _bloc;
+ final PlatformHelper _platformHelper;
late StreamSubscription _subscription;
@override
@@ -41,8 +51,6 @@ class Backbox extends PositionComponent with ZIndex {
anchor = Anchor.bottomCenter;
zIndex = ZIndexes.backbox;
- _bloc.add(LeaderboardRequested());
-
await add(_BackboxSpriteComponent());
await add(_display = Component());
_build(_bloc.state);
@@ -64,7 +72,12 @@ class Backbox extends PositionComponent with ZIndex {
_display.add(LoadingDisplay());
} else if (state is LeaderboardSuccessState) {
_display.add(LeaderboardDisplay(entries: state.entries));
+ } else if (state is LeaderboardFailureState) {
+ _display.add(LeaderboardFailureDisplay());
} else if (state is InitialsFormState) {
+ if (_platformHelper.isMobile) {
+ gameRef.overlays.add(PinballGame.mobileControlsOverlay);
+ }
_display.add(
InitialsInputDisplay(
score: state.score,
@@ -81,7 +94,13 @@ class Backbox extends PositionComponent with ZIndex {
),
);
} else if (state is InitialsSuccessState) {
- _display.add(InitialsSubmissionSuccessDisplay());
+ _display.add(
+ GameOverInfoDisplay(
+ onShare: () {
+ _bloc.add(ShareScoreRequested(score: state.score));
+ },
+ ),
+ );
} else if (state is ShareState) {
_display.add(
ShareDisplay(
@@ -95,7 +114,18 @@ class Backbox extends PositionComponent with ZIndex {
),
);
} else if (state is InitialsFailureState) {
- _display.add(InitialsSubmissionFailureDisplay());
+ _display.add(
+ InitialsSubmissionFailureDisplay(
+ onDismissed: () {
+ _bloc.add(
+ PlayerInitialsRequested(
+ score: state.score,
+ character: state.character,
+ ),
+ );
+ },
+ ),
+ );
}
}
diff --git a/lib/game/components/backbox/bloc/backbox_bloc.dart b/lib/game/components/backbox/bloc/backbox_bloc.dart
index 5f6c7d9a..cfac4c6f 100644
--- a/lib/game/components/backbox/bloc/backbox_bloc.dart
+++ b/lib/game/components/backbox/bloc/backbox_bloc.dart
@@ -14,8 +14,13 @@ class BackboxBloc extends Bloc {
/// {@macro backbox_bloc}
BackboxBloc({
required LeaderboardRepository leaderboardRepository,
+ required List? initialEntries,
}) : _leaderboardRepository = leaderboardRepository,
- super(LoadingState()) {
+ super(
+ initialEntries != null
+ ? LeaderboardSuccessState(entries: initialEntries)
+ : LeaderboardFailureState(),
+ ) {
on(_onPlayerInitialsRequested);
on(_onPlayerInitialsSubmitted);
on(_onScoreShareRequested);
@@ -49,10 +54,19 @@ class BackboxBloc extends Bloc {
character: event.character.toType,
),
);
- emit(InitialsSuccessState());
+ emit(
+ InitialsSuccessState(
+ score: event.score,
+ ),
+ );
} catch (error, stackTrace) {
addError(error, stackTrace);
- emit(InitialsFailureState());
+ emit(
+ InitialsFailureState(
+ score: event.score,
+ character: event.character,
+ ),
+ );
}
}
@@ -61,11 +75,7 @@ class BackboxBloc extends Bloc {
Emitter emit,
) async {
emit(
- ShareState(
- initials: event.initials,
- score: event.score,
- character: event.character,
- ),
+ ShareState(score: event.score),
);
}
diff --git a/lib/game/components/backbox/bloc/backbox_event.dart b/lib/game/components/backbox/bloc/backbox_event.dart
index 2851d75f..a842d191 100644
--- a/lib/game/components/backbox/bloc/backbox_event.dart
+++ b/lib/game/components/backbox/bloc/backbox_event.dart
@@ -53,27 +53,19 @@ class PlayerInitialsSubmitted extends BackboxEvent {
}
/// {@template share_score_requested}
-/// Event that request the user to share score and initials.
+/// Event when user requests to share their score.
/// {@endtemplate}
class ShareScoreRequested extends BackboxEvent {
/// {@macro share_score_requested}
const ShareScoreRequested({
required this.score,
- required this.initials,
- required this.character,
});
/// Player's score.
final int score;
- /// Player's initials.
- final String initials;
-
- /// Player's character.
- final CharacterTheme character;
-
@override
- List get props => [score, initials, character];
+ List get props => [score];
}
/// Event that triggers the fetching of the leaderboard
diff --git a/lib/game/components/backbox/bloc/backbox_state.dart b/lib/game/components/backbox/bloc/backbox_state.dart
index 2475b1ee..d1025a09 100644
--- a/lib/game/components/backbox/bloc/backbox_state.dart
+++ b/lib/game/components/backbox/bloc/backbox_state.dart
@@ -54,16 +54,37 @@ class InitialsFormState extends BackboxState {
List get props => [score, character];
}
-/// State when the leaderboard was successfully loaded.
+/// {@template initials_success_state}
+/// State when the score and initials were successfully submitted.
+/// {@endtemplate}
class InitialsSuccessState extends BackboxState {
+ /// {@macro initials_success_state}
+ const InitialsSuccessState({
+ required this.score,
+ }) : super();
+
+ /// Player's score.
+ final int score;
+
@override
- List get props => [];
+ List get props => [score];
}
/// State when the initials submission failed.
class InitialsFailureState extends BackboxState {
+ const InitialsFailureState({
+ required this.score,
+ required this.character,
+ });
+
+ /// Player's score.
+ final int score;
+
+ /// Player's character.
+ final CharacterTheme character;
+
@override
- List get props => [];
+ List get props => [score, character];
}
/// {@template share_state}
@@ -73,19 +94,11 @@ class ShareState extends BackboxState {
/// {@macro share_state}
const ShareState({
required this.score,
- required this.initials,
- required this.character,
}) : super();
/// Player's score.
final int score;
- /// Player's initials.
- final String initials;
-
- /// Player's character.
- final CharacterTheme character;
-
@override
- List get props => [score, initials, character];
+ List get props => [score];
}
diff --git a/lib/game/components/backbox/displays/displays.dart b/lib/game/components/backbox/displays/displays.dart
index fd6c4abe..f80c0b54 100644
--- a/lib/game/components/backbox/displays/displays.dart
+++ b/lib/game/components/backbox/displays/displays.dart
@@ -1,6 +1,8 @@
+export 'game_over_info_display.dart';
export 'initials_input_display.dart';
export 'initials_submission_failure_display.dart';
export 'initials_submission_success_display.dart';
export 'leaderboard_display.dart';
+export 'leaderboard_failure_display.dart';
export 'loading_display.dart';
export 'share_display.dart';
diff --git a/lib/game/components/backbox/displays/game_over_info_display.dart b/lib/game/components/backbox/displays/game_over_info_display.dart
new file mode 100644
index 00000000..c7708bde
--- /dev/null
+++ b/lib/game/components/backbox/displays/game_over_info_display.dart
@@ -0,0 +1,311 @@
+import 'dart:async';
+
+import 'package:flame/components.dart';
+import 'package:flame/input.dart';
+import 'package:flutter/material.dart';
+import 'package:pinball/game/game.dart';
+import 'package:pinball/l10n/l10n.dart';
+import 'package:pinball_components/pinball_components.dart';
+import 'package:pinball_flame/pinball_flame.dart';
+import 'package:pinball_ui/pinball_ui.dart';
+import 'package:share_repository/share_repository.dart';
+
+/// Signature for the callback called when the user tries to share their score
+/// from the [GameOverInfoDisplay].
+typedef OnShareTap = void Function();
+
+final _titleTextPaint = TextPaint(
+ style: const TextStyle(
+ fontSize: 1.6,
+ color: PinballColors.white,
+ fontFamily: PinballFonts.pixeloidSans,
+ ),
+);
+
+final _titleBoldTextPaint = TextPaint(
+ style: const TextStyle(
+ fontSize: 1.4,
+ color: PinballColors.white,
+ fontFamily: PinballFonts.pixeloidSans,
+ fontWeight: FontWeight.bold,
+ ),
+);
+
+final _linkTextPaint = TextPaint(
+ style: const TextStyle(
+ fontSize: 1.7,
+ color: PinballColors.orange,
+ fontFamily: PinballFonts.pixeloidSans,
+ fontWeight: FontWeight.bold,
+ ),
+);
+
+final _descriptionTextPaint = TextPaint(
+ style: const TextStyle(
+ fontSize: 1.6,
+ color: PinballColors.white,
+ fontFamily: PinballFonts.pixeloidSans,
+ ),
+);
+
+/// {@template game_over_info_display}
+/// Display with links to share your score or go to the IO webpage.
+/// {@endtemplate}
+class GameOverInfoDisplay extends Component with HasGameRef {
+ /// {@macro game_over_info_display}
+ GameOverInfoDisplay({
+ OnShareTap? onShare,
+ }) : super(
+ children: [
+ _InstructionsComponent(
+ onShare: onShare,
+ ),
+ ],
+ );
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ gameRef.overlays.add(PinballGame.playButtonOverlay);
+ }
+}
+
+class _InstructionsComponent extends PositionComponent with HasGameRef {
+ _InstructionsComponent({
+ OnShareTap? onShare,
+ }) : super(
+ anchor: Anchor.center,
+ position: Vector2(0, -25),
+ children: [
+ _TitleComponent(),
+ _LinksComponent(
+ onShare: onShare,
+ ),
+ _DescriptionComponent(),
+ ],
+ );
+}
+
+class _TitleComponent extends PositionComponent with HasGameRef {
+ _TitleComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2(0, 3),
+ children: [
+ _TitleBackgroundSpriteComponent(),
+ _ShareScoreTextComponent(),
+ _ChallengeFriendsTextComponent(),
+ ],
+ );
+}
+
+class _ShareScoreTextComponent extends TextComponent with HasGameRef {
+ _ShareScoreTextComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2(0, -1.5),
+ textRenderer: _titleTextPaint,
+ );
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ text = readProvider().shareYourScore;
+ }
+}
+
+class _ChallengeFriendsTextComponent extends TextComponent with HasGameRef {
+ _ChallengeFriendsTextComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2(0, 1.5),
+ textRenderer: _titleBoldTextPaint,
+ );
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ text = readProvider().andChallengeYourFriends;
+ }
+}
+
+class _TitleBackgroundSpriteComponent extends SpriteComponent with HasGameRef {
+ _TitleBackgroundSpriteComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2.zero(),
+ );
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ final sprite = Sprite(
+ gameRef.images
+ .fromCache(Assets.images.backbox.displayTitleDecoration.keyName),
+ );
+ this.sprite = sprite;
+ size = sprite.originalSize / 22;
+ }
+}
+
+class _LinksComponent extends PositionComponent with HasGameRef {
+ _LinksComponent({
+ OnShareTap? onShare,
+ }) : super(
+ anchor: Anchor.center,
+ position: Vector2(0, 9.2),
+ children: [
+ ShareLinkComponent(onTap: onShare),
+ GoogleIOLinkComponent(),
+ ],
+ );
+}
+
+/// {@template share_link_component}
+/// Link button to navigate to sharing score display.
+/// {@endtemplate}
+class ShareLinkComponent extends TextComponent with HasGameRef, Tappable {
+ /// {@macro share_link_component}
+ ShareLinkComponent({
+ OnShareTap? onTap,
+ }) : _onTap = onTap,
+ super(
+ anchor: Anchor.center,
+ position: Vector2(-7, 0),
+ textRenderer: _linkTextPaint,
+ );
+
+ final OnShareTap? _onTap;
+
+ @override
+ bool onTapDown(TapDownInfo info) {
+ _onTap?.call();
+ return true;
+ }
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ await add(
+ RectangleComponent(
+ size: Vector2(6.4, 0.2),
+ paint: Paint()..color = PinballColors.orange,
+ anchor: Anchor.center,
+ position: Vector2(3.2, 2.3),
+ ),
+ );
+
+ text = readProvider().share;
+ }
+}
+
+/// {@template google_io_link_component}
+/// Link button to navigate to Google I/O site.
+/// {@endtemplate}
+class GoogleIOLinkComponent extends TextComponent with HasGameRef, Tappable {
+ /// {@macro google_io_link_component}
+ GoogleIOLinkComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2(6, 0),
+ textRenderer: _linkTextPaint,
+ );
+
+ @override
+ bool onTapDown(TapDownInfo info) {
+ openLink(ShareRepository.googleIOEvent);
+ return true;
+ }
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ await add(
+ RectangleComponent(
+ size: Vector2(10.2, 0.2),
+ paint: Paint()..color = PinballColors.orange,
+ anchor: Anchor.center,
+ position: Vector2(5.1, 2.3),
+ ),
+ );
+
+ text = readProvider().gotoIO;
+ }
+}
+
+class _DescriptionComponent extends PositionComponent with HasGameRef {
+ _DescriptionComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2(0, 13),
+ children: [
+ _LearnMoreTextComponent(),
+ _FirebaseTextComponent(),
+ OpenSourceTextComponent(),
+ ],
+ );
+}
+
+class _LearnMoreTextComponent extends TextComponent with HasGameRef {
+ _LearnMoreTextComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2.zero(),
+ textRenderer: _descriptionTextPaint,
+ );
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ text = readProvider().learnMore;
+ }
+}
+
+class _FirebaseTextComponent extends TextComponent with HasGameRef {
+ _FirebaseTextComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2(-8.5, 2.5),
+ textRenderer: _descriptionTextPaint,
+ );
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ text = readProvider().firebaseOr;
+ }
+}
+
+/// {@template open_source_link_component}
+/// Link text to navigate to Open Source site.
+/// {@endtemplate}
+@visibleForTesting
+class OpenSourceTextComponent extends TextComponent with HasGameRef, Tappable {
+ /// {@macro open_source_link_component}
+ OpenSourceTextComponent()
+ : super(
+ anchor: Anchor.center,
+ position: Vector2(13.5, 2.5),
+ textRenderer: _descriptionTextPaint,
+ );
+
+ @override
+ bool onTapDown(TapDownInfo info) {
+ openLink(ShareRepository.openSourceCode);
+ return true;
+ }
+
+ @override
+ Future onLoad() async {
+ await super.onLoad();
+ await add(
+ RectangleComponent(
+ size: Vector2(16, 0.2),
+ paint: Paint()..color = PinballColors.white,
+ anchor: Anchor.center,
+ position: Vector2(8, 2.3),
+ ),
+ );
+ text = readProvider().openSourceCode;
+ }
+}
diff --git a/lib/game/components/backbox/displays/initials_input_display.dart b/lib/game/components/backbox/displays/initials_input_display.dart
index 68c58f43..54780c2d 100644
--- a/lib/game/components/backbox/displays/initials_input_display.dart
+++ b/lib/game/components/backbox/displays/initials_input_display.dart
@@ -77,7 +77,7 @@ class InitialsInputDisplay extends Component with HasGameRef {
);
}
- /// Returns the current inputed initials
+ /// Returns the current entered initials
String get initials => children
.whereType()
.map((prompt) => prompt.char)
diff --git a/lib/game/components/backbox/displays/initials_submission_failure_display.dart b/lib/game/components/backbox/displays/initials_submission_failure_display.dart
index 4cc5a9f5..a9bd84c5 100644
--- a/lib/game/components/backbox/displays/initials_submission_failure_display.dart
+++ b/lib/game/components/backbox/displays/initials_submission_failure_display.dart
@@ -1,27 +1,47 @@
import 'package:flame/components.dart';
import 'package:flutter/material.dart';
import 'package:pinball/game/game.dart';
+import 'package:pinball/l10n/l10n.dart';
import 'package:pinball_components/pinball_components.dart';
+import 'package:pinball_flame/pinball_flame.dart';
import 'package:pinball_ui/pinball_ui.dart';
final _bodyTextPaint = TextPaint(
style: const TextStyle(
- fontSize: 3,
+ fontSize: 1.8,
color: PinballColors.white,
fontFamily: PinballFonts.pixeloidSans,
+ fontWeight: FontWeight.w400,
),
);
/// {@template initials_submission_failure_display}
/// [Backbox] display for when a failure occurs during initials submission.
/// {@endtemplate}
-class InitialsSubmissionFailureDisplay extends TextComponent {
+class InitialsSubmissionFailureDisplay extends Component {
+ /// {@macro initials_submission_failure_display}
+ InitialsSubmissionFailureDisplay({
+ required this.onDismissed,
+ });
+
+ final VoidCallback onDismissed;
+
@override
Future onLoad() async {
- await super.onLoad();
- position = Vector2(0, -10);
- anchor = Anchor.center;
- text = 'Failure!';
- textRenderer = _bodyTextPaint;
+ final l10n = readProvider();
+
+ await addAll([
+ ErrorComponent.bold(
+ label: l10n.initialsErrorTitle,
+ position: Vector2(0, -20),
+ ),
+ TextComponent(
+ text: l10n.initialsErrorMessage,
+ anchor: Anchor.center,
+ position: Vector2(0, -12),
+ textRenderer: _bodyTextPaint,
+ ),
+ TimerComponent(period: 4, onTick: onDismissed),
+ ]);
}
}
diff --git a/lib/game/components/backbox/displays/leaderboard_failure_display.dart b/lib/game/components/backbox/displays/leaderboard_failure_display.dart
new file mode 100644
index 00000000..a519f9e2
--- /dev/null
+++ b/lib/game/components/backbox/displays/leaderboard_failure_display.dart
@@ -0,0 +1,23 @@
+import 'package:flame/components.dart';
+import 'package:pinball/l10n/l10n.dart';
+import 'package:pinball_components/pinball_components.dart';
+import 'package:pinball_flame/pinball_flame.dart';
+
+/// {@template leaderboard_failure_display}
+/// Display showing an error message when the leaderboard couldn't be loaded
+/// {@endtemplate}
+class LeaderboardFailureDisplay extends Component {
+ /// {@macro leaderboard_failure_display}
+ LeaderboardFailureDisplay();
+
+ @override
+ Future onLoad() async {
+ final l10n = readProvider();
+ await add(
+ ErrorComponent(
+ label: l10n.leaderboardErrorMessage,
+ position: Vector2(0, -18),
+ ),
+ );
+ }
+}
diff --git a/lib/game/components/bottom_group.dart b/lib/game/components/bottom_group.dart
index 4c6b2822..bc644f96 100644
--- a/lib/game/components/bottom_group.dart
+++ b/lib/game/components/bottom_group.dart
@@ -1,6 +1,5 @@
import 'package:flame/components.dart';
import 'package:pinball/game/behaviors/behaviors.dart';
-import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
@@ -40,7 +39,7 @@ class _BottomGroupSide extends Component {
final direction = _side.direction;
final centerXAdjustment = _side.isLeft ? -0.45 : -6.8;
- final flipper = ControlledFlipper(
+ final flipper = Flipper(
side: _side,
)..initialPosition = Vector2((11.6 * direction) + centerXAdjustment, 43.6);
final baseboard = Baseboard(side: _side)
diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart
index 08dc5cb0..324f379a 100644
--- a/lib/game/components/components.dart
+++ b/lib/game/components/components.dart
@@ -1,7 +1,6 @@
export 'android_acres/android_acres.dart';
export 'backbox/backbox.dart';
export 'bottom_group.dart';
-export 'controlled_flipper.dart';
export 'controlled_plunger.dart';
export 'dino_desert/dino_desert.dart';
export 'drain/drain.dart';
diff --git a/lib/game/components/controlled_plunger.dart b/lib/game/components/controlled_plunger.dart
index c8cb90fb..f709de66 100644
--- a/lib/game/components/controlled_plunger.dart
+++ b/lib/game/components/controlled_plunger.dart
@@ -30,7 +30,7 @@ class PlungerNoiseBehavior extends Component {
@override
Future onLoad() async {
await super.onLoad();
- readProvider().play(PinballAudio.launcher);
+ readProvider().play(PinballAudio.launcher);
}
@override
diff --git a/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart b/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart
index f37299c7..3c4ef02a 100644
--- a/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart
+++ b/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart
@@ -1,15 +1,15 @@
import 'package:flame/components.dart';
import 'package:flame_bloc/flame_bloc.dart';
+import 'package:pinball/game/behaviors/behaviors.dart';
import 'package:pinball/game/game.dart';
-import 'package:pinball/select_character/select_character.dart';
import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
/// Bonus obtained at the [FlutterForest].
///
-/// When all [DashNestBumper]s are hit at least once three times, the [Signpost]
+/// When all [DashBumper]s are hit at least once three times, the [Signpost]
/// progresses. When the [Signpost] fully progresses, the [GameBonus.dashNest]
-/// is awarded, and the [DashNestBumper.main] releases a new [Ball].
+/// is awarded, and the [DashBumper.main] releases a new [Ball].
class FlutterForestBonusBehavior extends Component
with
ParentIsA,
@@ -19,15 +19,14 @@ class FlutterForestBonusBehavior extends Component
void onMount() {
super.onMount();
- final bumpers = parent.children.whereType();
+ final bumpers = parent.children.whereType();
final signpost = parent.firstChild()!;
final animatronic = parent.firstChild()!;
- final canvas = gameRef.descendants().whereType().single;
for (final bumper in bumpers) {
bumper.bloc.stream.listen((state) {
final activatedAllBumpers = bumpers.every(
- (bumper) => bumper.bloc.state == DashNestBumperState.active,
+ (bumper) => bumper.bloc.state == DashBumperState.active,
);
if (activatedAllBumpers) {
@@ -38,15 +37,7 @@ class FlutterForestBonusBehavior extends Component
if (signpost.bloc.isFullyProgressed()) {
bloc.add(const BonusActivated(GameBonus.dashNest));
- final characterTheme =
- readBloc()
- .state
- .characterTheme;
- canvas.add(
- Ball(assetPath: characterTheme.ball.keyName)
- ..initialPosition = Vector2(29.2, -24.5)
- ..zIndex = ZIndexes.ballOnBoard,
- );
+ add(BonusBallSpawningBehavior());
animatronic.playing = true;
signpost.bloc.onProgressed();
}
diff --git a/lib/game/components/flutter_forest/flutter_forest.dart b/lib/game/components/flutter_forest/flutter_forest.dart
index 1cc055ae..39783bb1 100644
--- a/lib/game/components/flutter_forest/flutter_forest.dart
+++ b/lib/game/components/flutter_forest/flutter_forest.dart
@@ -9,7 +9,7 @@ import 'package:pinball_flame/pinball_flame.dart';
/// {@template flutter_forest}
/// Area positioned at the top right of the board where the [Ball] can bounce
-/// off [DashNestBumper]s.
+/// off [DashBumper]s.
/// {@endtemplate}
class FlutterForest extends Component with ZIndex {
/// {@macro flutter_forest}
@@ -22,19 +22,19 @@ class FlutterForest extends Component with ZIndex {
BumperNoiseBehavior(),
],
)..initialPosition = Vector2(7.95, -58.35),
- DashNestBumper.main(
+ DashBumper.main(
children: [
ScoringContactBehavior(points: Points.twoHundredThousand),
BumperNoiseBehavior(),
],
)..initialPosition = Vector2(18.55, -59.35),
- DashNestBumper.a(
+ DashBumper.a(
children: [
ScoringContactBehavior(points: Points.twentyThousand),
BumperNoiseBehavior(),
],
)..initialPosition = Vector2(8.95, -51.95),
- DashNestBumper.b(
+ DashBumper.b(
children: [
ScoringContactBehavior(points: Points.twentyThousand),
BumperNoiseBehavior(),
diff --git a/lib/game/components/game_bloc_status_listener.dart b/lib/game/components/game_bloc_status_listener.dart
index 81da96d5..1a5a06df 100644
--- a/lib/game/components/game_bloc_status_listener.dart
+++ b/lib/game/components/game_bloc_status_listener.dart
@@ -3,6 +3,7 @@ import 'package:flame_bloc/flame_bloc.dart';
import 'package:pinball/game/game.dart';
import 'package:pinball/select_character/select_character.dart';
import 'package:pinball_audio/pinball_audio.dart';
+import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
/// Listens to the [GameBloc] and updates the game accordingly.
@@ -19,18 +20,39 @@ class GameBlocStatusListener extends Component
case GameStatus.waiting:
break;
case GameStatus.playing:
- readProvider().play(PinballAudio.backgroundMusic);
+ readProvider().play(PinballAudio.backgroundMusic);
+ gameRef
+ .descendants()
+ .whereType()
+ .forEach(_addFlipperKeyControls);
+
gameRef.overlays.remove(PinballGame.playButtonOverlay);
break;
case GameStatus.gameOver:
- readProvider().play(PinballAudio.gameOverVoiceOver);
+ readProvider().play(PinballAudio.gameOverVoiceOver);
gameRef.descendants().whereType().first.requestInitials(
score: state.displayScore,
character: readBloc()
.state
.characterTheme,
);
+
+ gameRef
+ .descendants()
+ .whereType()
+ .forEach(_removeFlipperKeyControls);
break;
}
}
+
+ void _addFlipperKeyControls(Flipper flipper) {
+ flipper
+ ..add(FlipperKeyControllingBehavior())
+ ..moveDown();
+ }
+
+ void _removeFlipperKeyControls(Flipper flipper) => flipper
+ .descendants()
+ .whereType()
+ .forEach(flipper.remove);
}
diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart
index 537cc6e2..93898552 100644
--- a/lib/game/game_assets.dart
+++ b/lib/game/game_assets.dart
@@ -1,3 +1,4 @@
+import 'package:flame/extensions.dart';
import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart' as components;
import 'package:pinball_theme/pinball_theme.dart' hide Assets;
@@ -5,7 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart' hide Assets;
/// Add methods to help loading and caching game assets.
extension PinballGameAssetsX on PinballGame {
/// Returns a list of assets to be loaded
- List preLoadAssets() {
+ List> preLoadAssets() {
const dashTheme = DashTheme();
const sparkyTheme = SparkyTheme();
const androidTheme = AndroidTheme();
@@ -102,6 +103,9 @@ extension PinballGameAssetsX on PinballGame {
images.load(components.Assets.images.backbox.displayDivider.keyName),
images.load(components.Assets.images.backbox.button.facebook.keyName),
images.load(components.Assets.images.backbox.button.twitter.keyName),
+ images.load(
+ components.Assets.images.backbox.displayTitleDecoration.keyName,
+ ),
images.load(components.Assets.images.googleWord.letter1.lit.keyName),
images.load(components.Assets.images.googleWord.letter1.dimmed.keyName),
images.load(components.Assets.images.googleWord.letter2.lit.keyName),
diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart
index 35e13fbd..ece60c06 100644
--- a/lib/game/pinball_game.dart
+++ b/lib/game/pinball_game.dart
@@ -24,10 +24,10 @@ class PinballGame extends PinballForge2DGame
required this.shareRepository,
required GameBloc gameBloc,
required AppLocalizations l10n,
- required PinballPlayer player,
+ required PinballAudioPlayer audioPlayer,
}) : focusNode = FocusNode(),
_gameBloc = gameBloc,
- _player = player,
+ _audioPlayer = audioPlayer,
_characterThemeBloc = characterThemeBloc,
_l10n = l10n,
super(
@@ -39,6 +39,9 @@ class PinballGame extends PinballForge2DGame
/// Identifier of the play button overlay
static const playButtonOverlay = 'play_button';
+ /// Identifier of the mobile controls overlay
+ static const mobileControlsOverlay = 'mobile_controls';
+
@override
Color backgroundColor() => Colors.transparent;
@@ -46,7 +49,7 @@ class PinballGame extends PinballForge2DGame
final CharacterThemeCubit _characterThemeBloc;
- final PinballPlayer _player;
+ final PinballAudioPlayer _audioPlayer;
final LeaderboardRepository leaderboardRepository;
@@ -56,6 +59,18 @@ class PinballGame extends PinballForge2DGame
final GameBloc _gameBloc;
+ List? _entries;
+
+ Future preFetchLeaderboard() async {
+ try {
+ _entries = await leaderboardRepository.fetchTop10Leaderboard();
+ } catch (_) {
+ // An initial null leaderboard means that we couldn't fetch
+ // the entries for the [Backbox] and it will show the relevant display.
+ _entries = null;
+ }
+ }
+
@override
Future onLoad() async {
await add(
@@ -71,7 +86,7 @@ class PinballGame extends PinballForge2DGame
children: [
MultiFlameProvider(
providers: [
- FlameProvider.value(_player),
+ FlameProvider.value(_audioPlayer),
FlameProvider.value(leaderboardRepository),
FlameProvider.value(shareRepository),
FlameProvider.value(_l10n),
@@ -96,6 +111,7 @@ class PinballGame extends PinballForge2DGame
Backbox(
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
+ entries: _entries,
),
GoogleWord(position: Vector2(-4.45, 1.8)),
Multipliers(),
@@ -133,7 +149,7 @@ class PinballGame extends PinballForge2DGame
final rocket = descendants().whereType().first;
final bounds = rocket.topLeftPosition & rocket.size;
- // NOTE(wolfen): As long as Flame does not have https://github.com/flame-engine/flame/issues/1586 we need to check it at the highest level manually.
+ // NOTE: As long as Flame does not have https://github.com/flame-engine/flame/issues/1586 we need to check it at the highest level manually.
if (bounds.contains(info.eventPosition.game.toOffset())) {
descendants().whereType().single.pullFor(2);
} else {
@@ -179,11 +195,11 @@ class DebugPinballGame extends PinballGame with FPSCounter, PanDetector {
required LeaderboardRepository leaderboardRepository,
required ShareRepository shareRepository,
required AppLocalizations l10n,
- required PinballPlayer player,
+ required PinballAudioPlayer audioPlayer,
required GameBloc gameBloc,
}) : super(
characterThemeBloc: characterThemeBloc,
- player: player,
+ audioPlayer: audioPlayer,
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
l10n: l10n,
diff --git a/lib/game/view/pinball_game_page.dart b/lib/game/view/pinball_game_page.dart
index a1366309..0bfd8646 100644
--- a/lib/game/view/pinball_game_page.dart
+++ b/lib/game/view/pinball_game_page.dart
@@ -22,23 +22,17 @@ class PinballGamePage extends StatelessWidget {
final bool isDebugMode;
- static Route route({bool isDebugMode = kDebugMode}) {
- return MaterialPageRoute(
- builder: (_) => PinballGamePage(isDebugMode: isDebugMode),
- );
- }
-
@override
Widget build(BuildContext context) {
final characterThemeBloc = context.read();
- final player = context.read();
+ final audioPlayer = context.read();
final leaderboardRepository = context.read();
final shareRepository = context.read();
final gameBloc = context.read();
final game = isDebugMode
? DebugPinballGame(
characterThemeBloc: characterThemeBloc,
- player: player,
+ audioPlayer: audioPlayer,
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
l10n: context.l10n,
@@ -46,58 +40,46 @@ class PinballGamePage extends StatelessWidget {
)
: PinballGame(
characterThemeBloc: characterThemeBloc,
- player: player,
+ audioPlayer: audioPlayer,
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
l10n: context.l10n,
gameBloc: gameBloc,
);
- final loadables = [
- ...game.preLoadAssets(),
- ...player.load(),
- ...BonusAnimation.loadAssets(),
- ...SelectedCharacter.loadAssets(),
- ];
-
- return BlocProvider(
- create: (_) => AssetsManagerCubit(loadables)..load(),
- child: PinballGameView(game: game),
+ return Container(
+ decoration: const CrtBackground(),
+ child: Scaffold(
+ backgroundColor: PinballColors.transparent,
+ body: BlocProvider(
+ create: (_) => AssetsManagerCubit(game, audioPlayer)..load(),
+ child: PinballGameView(game),
+ ),
+ ),
);
}
}
class PinballGameView extends StatelessWidget {
- const PinballGameView({
- Key? key,
- required this.game,
- }) : super(key: key);
+ const PinballGameView(this.game, {Key? key}) : super(key: key);
final PinballGame game;
@override
Widget build(BuildContext context) {
- final isLoading = context.select(
- (AssetsManagerCubit bloc) => bloc.state.progress != 1,
- );
- return Container(
- decoration: const CrtBackground(),
- child: Scaffold(
- backgroundColor: PinballColors.transparent,
- body: isLoading
+ return BlocBuilder(
+ builder: (context, state) {
+ return state.isLoading
? const AssetsLoadingPage()
- : PinballGameLoadedView(game: game),
- ),
+ : PinballGameLoadedView(game);
+ },
);
}
}
@visibleForTesting
class PinballGameLoadedView extends StatelessWidget {
- const PinballGameLoadedView({
- Key? key,
- required this.game,
- }) : super(key: key);
+ const PinballGameLoadedView(this.game, {Key? key}) : super(key: key);
final PinballGame game;
@@ -126,6 +108,14 @@ class PinballGameLoadedView extends StatelessWidget {
child: PlayButtonOverlay(),
);
},
+ PinballGame.mobileControlsOverlay: (context, game) {
+ return Positioned(
+ bottom: 0,
+ left: 0,
+ right: 0,
+ child: MobileControls(game: game),
+ );
+ },
},
),
),
diff --git a/lib/game/view/widgets/mobile_controls.dart b/lib/game/view/widgets/mobile_controls.dart
new file mode 100644
index 00000000..c5761eb6
--- /dev/null
+++ b/lib/game/view/widgets/mobile_controls.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:pinball/game/game.dart';
+import 'package:pinball/l10n/l10n.dart';
+import 'package:pinball_flame/pinball_flame.dart';
+import 'package:pinball_ui/pinball_ui.dart';
+
+/// {@template mobile_controls}
+/// Widget with the controls used to enable the user initials input on mobile.
+/// {@endtemplate}
+class MobileControls extends StatelessWidget {
+ /// {@macro mobile_controls}
+ const MobileControls({
+ Key? key,
+ required this.game,
+ }) : super(key: key);
+
+ /// Game instance
+ final PinballGame game;
+
+ @override
+ Widget build(BuildContext context) {
+ final l10n = AppLocalizations.of(context);
+ return Row(
+ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+ children: [
+ MobileDpad(
+ onTapUp: () => game.triggerVirtualKeyUp(LogicalKeyboardKey.arrowUp),
+ onTapDown: () => game.triggerVirtualKeyUp(
+ LogicalKeyboardKey.arrowDown,
+ ),
+ onTapLeft: () => game.triggerVirtualKeyUp(
+ LogicalKeyboardKey.arrowLeft,
+ ),
+ onTapRight: () => game.triggerVirtualKeyUp(
+ LogicalKeyboardKey.arrowRight,
+ ),
+ ),
+ PinballButton(
+ text: l10n.enter,
+ onTap: () => game.triggerVirtualKeyUp(LogicalKeyboardKey.enter),
+ ),
+ ],
+ );
+ }
+}
diff --git a/lib/game/view/widgets/mobile_dpad.dart b/lib/game/view/widgets/mobile_dpad.dart
new file mode 100644
index 00000000..abad496b
--- /dev/null
+++ b/lib/game/view/widgets/mobile_dpad.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+import 'package:pinball_ui/pinball_ui.dart';
+
+/// {@template mobile_dpad}
+/// Widget rendering 4 directional input arrows.
+/// {@endtemplate}
+class MobileDpad extends StatelessWidget {
+ /// {@template mobile_dpad}
+ const MobileDpad({
+ Key? key,
+ required this.onTapUp,
+ required this.onTapDown,
+ required this.onTapLeft,
+ required this.onTapRight,
+ }) : super(key: key);
+
+ static const _size = 180.0;
+
+ /// Called when dpad up is pressed
+ final VoidCallback onTapUp;
+
+ /// Called when dpad down is pressed
+ final VoidCallback onTapDown;
+
+ /// Called when dpad left is pressed
+ final VoidCallback onTapLeft;
+
+ /// Called when dpad right is pressed
+ final VoidCallback onTapRight;
+
+ @override
+ Widget build(BuildContext context) {
+ return SizedBox(
+ width: _size,
+ height: _size,
+ child: Column(
+ children: [
+ Row(
+ children: [
+ const Spacer(),
+ PinballDpadButton(
+ direction: PinballDpadDirection.up,
+ onTap: onTapUp,
+ ),
+ const Spacer(),
+ ],
+ ),
+ Row(
+ children: [
+ PinballDpadButton(
+ direction: PinballDpadDirection.left,
+ onTap: onTapLeft,
+ ),
+ const Spacer(),
+ PinballDpadButton(
+ direction: PinballDpadDirection.right,
+ onTap: onTapRight,
+ ),
+ ],
+ ),
+ Row(
+ children: [
+ const Spacer(),
+ PinballDpadButton(
+ direction: PinballDpadDirection.down,
+ onTap: onTapDown,
+ ),
+ const Spacer(),
+ ],
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/game/view/widgets/replay_button_overlay.dart b/lib/game/view/widgets/replay_button_overlay.dart
new file mode 100644
index 00000000..c0b2a67d
--- /dev/null
+++ b/lib/game/view/widgets/replay_button_overlay.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:pinball/l10n/l10n.dart';
+import 'package:pinball/start_game/start_game.dart';
+import 'package:pinball_ui/pinball_ui.dart';
+
+/// {@template replay_button_overlay}
+/// [Widget] that renders the button responsible for restarting the game.
+/// {@endtemplate}
+class ReplayButtonOverlay extends StatelessWidget {
+ /// {@macro replay_button_overlay}
+ const ReplayButtonOverlay({Key? key}) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ final l10n = context.l10n;
+
+ return PinballButton(
+ text: l10n.replay,
+ onTap: () {
+ context.read().add(const ReplayTapped());
+ },
+ );
+ }
+}
diff --git a/lib/game/view/widgets/widgets.dart b/lib/game/view/widgets/widgets.dart
index 5d1fccf8..0093cad2 100644
--- a/lib/game/view/widgets/widgets.dart
+++ b/lib/game/view/widgets/widgets.dart
@@ -1,5 +1,8 @@
export 'bonus_animation.dart';
export 'game_hud.dart';
+export 'mobile_controls.dart';
+export 'mobile_dpad.dart';
export 'play_button_overlay.dart';
+export 'replay_button_overlay.dart';
export 'round_count_display.dart';
export 'score_view.dart';
diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart
index 33d2bbd1..f0b6fdeb 100644
--- a/lib/gen/assets.gen.dart
+++ b/lib/gen/assets.gen.dart
@@ -15,6 +15,8 @@ class $AssetsImagesGen {
$AssetsImagesComponentsGen get components =>
const $AssetsImagesComponentsGen();
$AssetsImagesLinkBoxGen get linkBox => const $AssetsImagesLinkBoxGen();
+ $AssetsImagesLoadingGameGen get loadingGame =>
+ const $AssetsImagesLoadingGameGen();
$AssetsImagesScoreGen get score => const $AssetsImagesScoreGen();
}
@@ -62,6 +64,14 @@ class $AssetsImagesLinkBoxGen {
const AssetGenImage('assets/images/link_box/info_icon.png');
}
+class $AssetsImagesLoadingGameGen {
+ const $AssetsImagesLoadingGameGen();
+
+ /// File path: assets/images/loading_game/io_pinball.png
+ AssetGenImage get ioPinball =>
+ const AssetGenImage('assets/images/loading_game/io_pinball.png');
+}
+
class $AssetsImagesScoreGen {
const $AssetsImagesScoreGen();
diff --git a/lib/how_to_play/widgets/how_to_play_dialog.dart b/lib/how_to_play/widgets/how_to_play_dialog.dart
index 0113319e..8a709605 100644
--- a/lib/how_to_play/widgets/how_to_play_dialog.dart
+++ b/lib/how_to_play/widgets/how_to_play_dialog.dart
@@ -91,7 +91,9 @@ class _HowToPlayDialogState extends State {
return WillPopScope(
onWillPop: () {
widget.onDismissCallback.call();
- context.read().play(PinballAudio.ioPinballVoiceOver);
+ context
+ .read()
+ .play(PinballAudio.ioPinballVoiceOver);
return Future.value(true);
},
child: PinballDialog(
@@ -240,7 +242,7 @@ class _DesktopFlipperControls extends StatelessWidget {
children: [
Text(
l10n.flipperControls,
- style: Theme.of(context).textTheme.subtitle2,
+ style: Theme.of(context).textTheme.headline4,
),
const SizedBox(height: 10),
Column(
diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb
index e4e12788..9deabcb8 100644
--- a/lib/l10n/arb/app_en.arb
+++ b/lib/l10n/arb/app_en.arb
@@ -148,9 +148,57 @@
"@loading": {
"description": "Text shown to indicate loading times"
},
+ "replay": "Replay",
+ "@replay": {
+ "description": "Text displayed on the share page for replay button"
+ },
"ioPinball": "I/O Pinball",
"@ioPinball": {
"description": "I/O Pinball - Name of the game"
+ },
+ "shareYourScore": "Share your score",
+ "@shareYourScore": {
+ "description": "Text shown on title of info screen"
+ },
+ "andChallengeYourFriends": "AND CHALLENGE YOUR FRIENDS",
+ "@challengeYourFriends": {
+ "description": "Text shown on title of info screen"
+ },
+ "share": "SHARE",
+ "@share": {
+ "description": "Text for share link on info screen."
+ },
+ "gotoIO": "GO TO I/O",
+ "@gotoIO": {
+ "description": "Text for going to I/O site link on info screen."
+ },
+ "learnMore": "Learn more about building games in Flutter with",
+ "@learnMore": {
+ "description": "Text shown on description of info screen"
+ },
+ "firebaseOr": "Firebase or dive right into the",
+ "@firebaseOr": {
+ "description": "Text shown on description of info screen"
+ },
+ "openSourceCode": "open source code.",
+ "@openSourceCode": {
+ "description": "Text shown on description of info screen"
+ },
+ "enter": "Enter",
+ "@enter": {
+ "description": "Text shown on the mobile controls enter button"
+ },
+ "initialsErrorTitle": "Uh-oh... well, that didnโt work",
+ "@enter": {
+ "description": "Title shown when the initials submission fails"
+ },
+ "initialsErrorMessage": "Please try a different combination of letters",
+ "@initialsErrorMessage": {
+ "description": "Message on shown when the initials submission fails"
+ },
+ "leaderboardErrorMessage": "No connection. Leaderboard and sharing functionality is unavailable.",
+ "@leaderboardErrorMessage": {
+ "description": "Text shown when the leaderboard had an error while loading"
}
,
"letEveryone": "Let everyone know about I/O Pinball",
diff --git a/lib/main_development.dart b/lib/main.dart
similarity index 91%
rename from lib/main_development.dart
rename to lib/main.dart
index 6c35ec02..0ef302fc 100644
--- a/lib/main_development.dart
+++ b/lib/main.dart
@@ -14,7 +14,7 @@ void main() {
const shareRepository =
ShareRepository(appUrl: ShareRepository.googleIOEvent);
final authenticationRepository = AuthenticationRepository(firebaseAuth);
- final pinballPlayer = PinballPlayer();
+ final pinballAudioPlayer = PinballAudioPlayer();
unawaited(
Firebase.initializeApp().then(
(_) => authenticationRepository.authenticateAnonymously(),
@@ -24,7 +24,7 @@ void main() {
authenticationRepository: authenticationRepository,
leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository,
- pinballPlayer: pinballPlayer,
+ pinballAudioPlayer: pinballAudioPlayer,
);
});
}
diff --git a/lib/main_production.dart b/lib/main_production.dart
deleted file mode 100644
index 6c35ec02..00000000
--- a/lib/main_production.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import 'dart:async';
-
-import 'package:authentication_repository/authentication_repository.dart';
-import 'package:firebase_core/firebase_core.dart';
-import 'package:leaderboard_repository/leaderboard_repository.dart';
-import 'package:pinball/app/app.dart';
-import 'package:pinball/bootstrap.dart';
-import 'package:pinball_audio/pinball_audio.dart';
-import 'package:share_repository/share_repository.dart';
-
-void main() {
- bootstrap((firestore, firebaseAuth) async {
- final leaderboardRepository = LeaderboardRepository(firestore);
- const shareRepository =
- ShareRepository(appUrl: ShareRepository.googleIOEvent);
- final authenticationRepository = AuthenticationRepository(firebaseAuth);
- final pinballPlayer = PinballPlayer();
- unawaited(
- Firebase.initializeApp().then(
- (_) => authenticationRepository.authenticateAnonymously(),
- ),
- );
- return App(
- authenticationRepository: authenticationRepository,
- leaderboardRepository: leaderboardRepository,
- shareRepository: shareRepository,
- pinballPlayer: pinballPlayer,
- );
- });
-}
diff --git a/lib/main_staging.dart b/lib/main_staging.dart
deleted file mode 100644
index 6c35ec02..00000000
--- a/lib/main_staging.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import 'dart:async';
-
-import 'package:authentication_repository/authentication_repository.dart';
-import 'package:firebase_core/firebase_core.dart';
-import 'package:leaderboard_repository/leaderboard_repository.dart';
-import 'package:pinball/app/app.dart';
-import 'package:pinball/bootstrap.dart';
-import 'package:pinball_audio/pinball_audio.dart';
-import 'package:share_repository/share_repository.dart';
-
-void main() {
- bootstrap((firestore, firebaseAuth) async {
- final leaderboardRepository = LeaderboardRepository(firestore);
- const shareRepository =
- ShareRepository(appUrl: ShareRepository.googleIOEvent);
- final authenticationRepository = AuthenticationRepository(firebaseAuth);
- final pinballPlayer = PinballPlayer();
- unawaited(
- Firebase.initializeApp().then(
- (_) => authenticationRepository.authenticateAnonymously(),
- ),
- );
- return App(
- authenticationRepository: authenticationRepository,
- leaderboardRepository: leaderboardRepository,
- shareRepository: shareRepository,
- pinballPlayer: pinballPlayer,
- );
- });
-}
diff --git a/lib/more_information/more_information_dialog.dart b/lib/more_information/more_information_dialog.dart
index 179c06f5..b9a9ddbb 100644
--- a/lib/more_information/more_information_dialog.dart
+++ b/lib/more_information/more_information_dialog.dart
@@ -55,8 +55,6 @@ class _LinkBoxHeader extends StatelessWidget {
@override
Widget build(BuildContext context) {
final l10n = context.l10n;
- final indent = MediaQuery.of(context).size.width / 5;
-
return Column(
children: [
Text(
@@ -68,11 +66,9 @@ class _LinkBoxHeader extends StatelessWidget {
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 12),
- Divider(
- color: PinballColors.white,
- endIndent: indent,
- indent: indent,
- thickness: 2,
+ const SizedBox(
+ width: 200,
+ child: Divider(color: PinballColors.white, thickness: 2),
),
],
);
diff --git a/lib/start_game/bloc/start_game_bloc.dart b/lib/start_game/bloc/start_game_bloc.dart
index 3a96b57b..5892cd80 100644
--- a/lib/start_game/bloc/start_game_bloc.dart
+++ b/lib/start_game/bloc/start_game_bloc.dart
@@ -11,6 +11,7 @@ class StartGameBloc extends Bloc {
/// {@macro start_game_bloc}
StartGameBloc() : super(const StartGameState.initial()) {
on(_onPlayTapped);
+ on(_onReplayTapped);
on(_onCharacterSelected);
on(_onHowToPlayFinished);
}
@@ -26,6 +27,17 @@ class StartGameBloc extends Bloc {
);
}
+ void _onReplayTapped(
+ ReplayTapped event,
+ Emitter emit,
+ ) {
+ emit(
+ state.copyWith(
+ status: StartGameStatus.selectCharacter,
+ ),
+ );
+ }
+
void _onCharacterSelected(
CharacterSelected event,
Emitter emit,
diff --git a/lib/start_game/bloc/start_game_event.dart b/lib/start_game/bloc/start_game_event.dart
index ce164e97..ae216c32 100644
--- a/lib/start_game/bloc/start_game_event.dart
+++ b/lib/start_game/bloc/start_game_event.dart
@@ -19,6 +19,17 @@ class PlayTapped extends StartGameEvent {
List