Merge pull request #4 from Ayush2006128/dev

feat: add lives

Author: Ayush2006128

lib/src/brick_breaker.dart

@@ -26,6 +26,7 @@ class BrickBreaker extends FlameGame
 
   final ValueNotifier<int> score = ValueNotifier(0);
   final ValueNotifier<int> highScore = ValueNotifier(0);
+  final ValueNotifier<int> lives = ValueNotifier(3);
   bool newHighScoreAchieved = false;
   final rand = math.Random();
   double get width => size.x;
@@ -114,6 +115,7 @@ class BrickBreaker extends FlameGame
 
     playState = PlayState.playing;
     score.value = 0;
+    lives.value = 3;
     newHighScoreAchieved = false;
     FlameAudio.bgm.play("background.mp3", volume: 0.7);
     world.add(
@@ -150,6 +152,26 @@ class BrickBreaker extends FlameGame
     ]);
   }
 
+  void onBallLost() {
+    lives.value--;
+    if (lives.value > 0) {
+      world.add(
+        Ball(
+          difficultyModifier: difficultyModifier,
+          radius: ballRadius,
+          position: size / 2,
+          velocity: Vector2(
+            (rand.nextDouble() - 0.5) * width,
+            height * 0.2,
+          ).normalized()
+            ..scale(height / 4),
+        ),
+      );
+    } else {
+      playState = PlayState.gameOver;
+    }
+  }
+
   @override
   void onTapDown(TapDownEvent event) {
     super.onTapDown(event);

lib/src/components/ball.dart

@@ -54,16 +54,18 @@ class Ball extends CircleComponent
           RemoveEffect(
             delay: 0.35,
             onComplete: () {
-              game.playState = PlayState.gameOver;
+              game.onBallLost();
             },
           ),
         );
-        FlameAudio.bgm.stop();
-        if (game.gameOver != null){
-        game.gameOver!.start();
-        } else {
-          if (await Vibration.hasVibrator()) {
-            Vibration.vibrate(preset: VibrationPreset.zigZagAlert);
+        if (game.lives.value <= 1) {
+          FlameAudio.bgm.stop();
+          if (game.gameOver != null) {
+            game.gameOver!.start();
+          } else {
+            if (await Vibration.hasVibrator()) {
+              Vibration.vibrate(preset: VibrationPreset.zigZagAlert);
+            }
           }
         }
       }

lib/src/widgets/game_app.dart

@@ -50,7 +50,7 @@ class _GameAppState extends State<GameApp> {
                 child: Center(
                   child: Column(
                     children: [
-                      ScoreCard(score: game.score),
+                      ScoreCard(score: game.score, lives: game.lives),
                       Expanded(
                         child: FittedBox(
                           child: SizedBox(

lib/src/widgets/score_card.dart

@@ -1,23 +1,61 @@
 import 'package:flutter/material.dart';
 
 class ScoreCard extends StatelessWidget {
-  const ScoreCard({super.key, required this.score});
+  const ScoreCard({
+    super.key,
+    required this.score,
+    required this.lives,
+  });
 
   final ValueNotifier<int> score;
+  final ValueNotifier<int> lives;
 
   @override
   Widget build(BuildContext context) {
     return ValueListenableBuilder<int>(
       valueListenable: score,
       builder: (context, score, child) {
-        return Padding(
-          padding: const EdgeInsets.fromLTRB(12, 6, 12, 18),
-          child: Text(
-            'Score: $score'.toUpperCase(),
-            style: Theme.of(context).textTheme.titleLarge!,
-          ),
+        return ValueListenableBuilder<int>(
+          valueListenable: lives,
+          builder: (context, lives, child) {
+            return Padding(
+              padding: const EdgeInsets.fromLTRB(12, 6, 12, 18),
+              child: Column(
+                children: [
+                  Text(
+                    'Score: $score'.toUpperCase(),
+                    style: Theme.of(context).textTheme.titleLarge!,
+                  ),
+                  const SizedBox(height: 10),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: List.generate(
+                      3,
+                      (index) => Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 5),
+                        child: Container(
+                          width: 16,
+                          height: 16,
+                          decoration: BoxDecoration(
+                            color: index < lives
+                                ? const Color(0xff1e6091)
+                                : Colors.transparent,
+                            shape: BoxShape.circle,
+                            border: Border.all(
+                              color: const Color(0xff1e6091),
+                              width: 2,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            );
+          },
         );
       },
     );
   }
-}
+}

macos/Runner/Release.entitlements

@@ -4,5 +4,9 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>

pubspec.lock

@@ -388,10 +388,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   ordered_set:
     dependency: transitive
     description:
@@ -545,10 +545,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.6"
+    version: "0.7.7"
   typed_data:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: bricked
 description: "brick"
 publish_to: 'none'
-version: 0.5.7+6
+version: 0.6.1+1
 
 environment:
   sdk: ^3.9.2
@@ -30,6 +30,7 @@ flutter:
   assets:
     - assets/icons/
     - assets/audio/
+    - shorebird.yaml
 
 flutter_native_splash:
   color: "#ffffff"

shorebird.yaml

@@ -0,0 +1,14 @@
+# This file is used to configure the Shorebird updater used by your app.
+# Learn more at https://docs.shorebird.dev
+# This file does not contain any sensitive information and should be checked into version control.
+
+# Your app_id is the unique identifier assigned to your app.
+# It is used to identify your app when requesting patches from Shorebird's servers.
+# It is not a secret and can be shared publicly.
+app_id: adc69db1-d3b8-4cde-acf8-108867bf88d2
+
+# auto_update controls if Shorebird should automatically update in the background on launch.
+# If auto_update: false, you will need to use package:shorebird_code_push to trigger updates.
+# https://pub.dev/packages/shorebird_code_push
+# Uncomment the following line to disable automatic updates.
+# auto_update: false