Merge branch 'main' into fix/refactor-file-names

.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

.idea/runConfigurations/development.xml

@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="development" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="buildFlavor" value="development" />
-    <option name="filePath" value="$PROJECT_DIR$/lib/main_development.dart" />
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/main.xml

@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="main" type="FlutterRunConfigurationType" factoryName="Flutter">
+    <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
+    <method v="2" />
+  </configuration>
+</component>

.idea/runConfigurations/production.xml

@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="production" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="buildFlavor" value="production" />
-    <option name="filePath" value="$PROJECT_DIR$/lib/main_production.dart" />
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/staging.xml

@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="staging" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="buildFlavor" value="staging" />
-    <option name="filePath" value="$PROJECT_DIR$/lib/main_staging.dart" />
-    <method v="2" />
-  </configuration>
-</component>

.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",
+      "program": "lib/main.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"]
     },
     {
       "name": "Launch component sandbox",

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
+## Getting Started 🚀
-- staging
-- production
 
-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 -d chrome
-$ 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
 ```
 
-_\*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
-    ...
-
-    <key>CFBundleLocalizations</key>
-	<array>
-		<string>en</string>
-		<string>es</string>
-	</array>
-
-    ...
-```
-
 ### 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
+[build_status_badge]: https://github.com/flutter/pinball/actions/workflows/main.yaml/badge.svg
-
-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
-```
-
 [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

lib/game/bloc/game_bloc.dart

@@ -12,7 +12,6 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     on<Scored>(_onScored);
     on<MultiplierIncreased>(_onIncreasedMultiplier);
     on<BonusActivated>(_onBonusActivated);
-    on<SparkyTurboChargeActivated>(_onSparkyTurboChargeActivated);
     on<GameOver>(_onGameOver);
     on<GameStarted>(_onGameStarted);
   }
@@ -65,18 +64,4 @@ class GameBloc extends Bloc<GameEvent, GameState> {
       ),
     );
   }
-
-  Future<void> _onSparkyTurboChargeActivated(
-    SparkyTurboChargeActivated event,
-    Emitter emit,
-  ) async {
-    emit(
-      state.copyWith(
-        bonusHistory: [
-          ...state.bonusHistory,
-          GameBonus.sparkyTurboCharge,
-        ],
-      ),
-    );
-  }
 }

lib/game/bloc/game_event.dart

@@ -40,13 +40,6 @@ class BonusActivated extends GameEvent {
   List<Object?> get props => [bonus];
 }
 
-class SparkyTurboChargeActivated extends GameEvent {
-  const SparkyTurboChargeActivated();
-
-  @override
-  List<Object?> get props => [];
-}
-
 /// {@template multiplier_increased_game_event}
 /// Added when a multiplier is gained.
 /// {@endtemplate}

lib/main_production.dart

@@ -1,26 +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';
-
-void main() {
-  bootstrap((firestore, firebaseAuth) async {
-    final leaderboardRepository = LeaderboardRepository(firestore);
-    final authenticationRepository = AuthenticationRepository(firebaseAuth);
-    final pinballAudioPlayer = PinballAudioPlayer();
-    unawaited(
-      Firebase.initializeApp().then(
-        (_) => authenticationRepository.authenticateAnonymously(),
-      ),
-    );
-    return App(
-      authenticationRepository: authenticationRepository,
-      leaderboardRepository: leaderboardRepository,
-      pinballAudioPlayer: pinballAudioPlayer,
-    );
-  });
-}

lib/main_staging.dart

@@ -1,26 +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';
-
-void main() {
-  bootstrap((firestore, firebaseAuth) async {
-    final leaderboardRepository = LeaderboardRepository(firestore);
-    final authenticationRepository = AuthenticationRepository(firebaseAuth);
-    final pinballAudioPlayer = PinballAudioPlayer();
-    unawaited(
-      Firebase.initializeApp().then(
-        (_) => authenticationRepository.authenticateAnonymously(),
-      ),
-    );
-    return App(
-      authenticationRepository: authenticationRepository,
-      leaderboardRepository: leaderboardRepository,
-      pinballAudioPlayer: pinballAudioPlayer,
-    );
-  });
-}

test/game/bloc/game_bloc_test.dart

@@ -279,21 +279,5 @@ void main() {
         );
       },
     );
-
-    group('SparkyTurboChargeActivated', () {
-      blocTest<GameBloc, GameState>(
-        'adds game bonus',
-        build: GameBloc.new,
-        act: (bloc) => bloc..add(const SparkyTurboChargeActivated()),
-        expect: () => [
-          isA<GameState>()
-            ..having(
-              (state) => state.bonusHistory,
-              'bonusHistory',
-              [GameBonus.sparkyTurboCharge],
-            ),
-        ],
-      );
-    });
   });
 }

test/game/bloc/game_event_test.dart

@@ -97,17 +97,4 @@ void main() {
       );
     });
   });
-
-  group('SparkyTurboChargeActivated', () {
-    test('can be instantiated', () {
-      expect(const SparkyTurboChargeActivated(), isNotNull);
-    });
-
-    test('supports value equality', () {
-      expect(
-        SparkyTurboChargeActivated(),
-        equals(SparkyTurboChargeActivated()),
-      );
-    });
-  });
 }