Resolved bug with resetting level progress bar without delay. Added animation for level progress bar updates.

Author: powerpuff-luv

src/main/java/com/dinosaur/dinosaurexploder/components/LevelProgressBarComponent.java

@@ -1,25 +1,53 @@
 package com.dinosaur.dinosaurexploder.components;
 
+import com.almasb.fxgl.animation.Interpolators;
+import com.almasb.fxgl.dsl.FXGL;
 import com.almasb.fxgl.entity.component.Component;
 import com.dinosaur.dinosaurexploder.utils.LevelManager;
 import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
 
 /**
  * Summary:
  * This class extends Component and handles filling the level progress bar
  */
 public class LevelProgressBarComponent extends Component {
+    private static final double MAX_WIDTH = 148;
+    private static final Duration UPDATE_DURATION = Duration.seconds(0.3);
+    private static final Duration RESET_DURATION = Duration.seconds(0.5);
+
     private final Rectangle fill;
-    private LevelManager levelManager;
+    private final LevelManager levelManager;
+    private boolean isLocked = false;
 
     public LevelProgressBarComponent(Rectangle fill, LevelManager levelManager) {
         this.fill = fill;
         this.levelManager = levelManager;
     }
 
-    @Override
-    public void onUpdate(double tpf) {
-        float progress = levelManager.getLevelProgress();
-        fill.setWidth(148 * progress);
+    public void updateProgress() {
+        if (isLocked) return;
+
+        float progress = Math.min(levelManager.getLevelProgress(), 1);
+        updateWidth(MAX_WIDTH * progress, UPDATE_DURATION);
+
+        if (progress >= 1) isLocked = true;
+    }
+
+    public void resetProgress() {
+        isLocked = false;
+
+        float progress = Math.min(levelManager.getLevelProgress(), 1);
+        updateWidth(MAX_WIDTH * progress, RESET_DURATION);
+    }
+
+    private void updateWidth(double targetWidth, Duration duration) {
+        FXGL.animationBuilder()
+                .duration(duration)
+                .interpolator(Interpolators.EXPONENTIAL.EASE_OUT())
+                .animate(fill.widthProperty())
+                .from(fill.getWidth())
+                .to(targetWidth)
+                .buildAndPlay();
     }
 }

src/main/java/com/dinosaur/dinosaurexploder/controller/DinosaurController.java

@@ -92,7 +92,7 @@ public void initGame() {
         levelManager = new LevelManager();
         initGameEntities();
         collisionHandler = new CollisionHandler(levelManager);
-        bossSpawner = new BossSpawner(settings,levelManager);
+        bossSpawner = new BossSpawner(settings, levelManager);
         CoinSpawner coinSpawner = new CoinSpawner(10, 1.0);
 
         if (!settings.isMuted()) {
@@ -173,7 +173,7 @@ private void resumeEnemySpawning() {
      */
     private void showLevelMessage() {
         // Hide the progress bar for boss levels
-        if(levelManager.getCurrentLevel() % 5 == 0) {
+        if (levelManager.getCurrentLevel() % 5 == 0) {
             levelProgressBar.setVisible(false);
         }
 
@@ -200,13 +200,17 @@ private void showLevelMessage() {
 
         // Resume gameplay after a delay
         runOnce(() -> {
-            if(levelManager.getCurrentLevel() % 5 != 0) {
+            if (levelManager.getCurrentLevel() % 5 != 0) {
                 levelProgressBar.setVisible(true);
             }
 
             getGameScene().removeUINode(levelText);
             updateLevelDisplay();
 
+            if (levelProgressBar.hasComponent(LevelProgressBarComponent.class)) {
+                levelProgressBar.getComponent(LevelProgressBarComponent.class).resetProgress();
+            }
+
             FXGL.getGameWorld().getEntitiesByType(EntityType.GREEN_DINO).forEach(e -> {
                 if (e.hasComponent(GreenDinoComponent.class)) {
                     e.getComponent(GreenDinoComponent.class).setPaused(false);
@@ -262,7 +266,9 @@ public void initPhysics() {
             }
             projectile.removeFromWorld();
             greenDino.removeFromWorld();
-            if (collisionHandler.isLevelUpAfterHitDino(score.getComponent(ScoreComponent.class))) {
+            if (collisionHandler.isLevelUpAfterHitDino(
+                    score.getComponent(ScoreComponent.class),
+                    levelProgressBar.getComponent(LevelProgressBarComponent.class))) {
                 showLevelMessage();
                 System.out.println("Level up!");
             }

src/main/java/com/dinosaur/dinosaurexploder/model/CollisionHandler.java

@@ -2,6 +2,7 @@
 
 import com.dinosaur.dinosaurexploder.components.BombComponent;
 import com.dinosaur.dinosaurexploder.components.CollectedCoinsComponent;
+import com.dinosaur.dinosaurexploder.components.LevelProgressBarComponent;
 import com.dinosaur.dinosaurexploder.components.LifeComponent;
 import com.dinosaur.dinosaurexploder.components.RedDinoComponent;
 import com.dinosaur.dinosaurexploder.components.ScoreComponent;
@@ -15,9 +16,10 @@ public CollisionHandler(LevelManager levelManager) {
         this.levelManager = levelManager;
     }
 
-    public boolean isLevelUpAfterHitDino(ScoreComponent scoreComponent) {
+    public boolean isLevelUpAfterHitDino(ScoreComponent scoreComponent, LevelProgressBarComponent levelProgressBarComponent) {
         scoreComponent.incrementScore(1);
         levelManager.incrementDefeatedEnemies();
+        levelProgressBarComponent.updateProgress();
 
         return adjustLevel();
     }

src/test/java/com/dinosaur/dinosaurexploder/model/CollisionHandlerTest.java

@@ -3,11 +3,14 @@
 import com.almasb.fxgl.entity.Entity;
 import com.dinosaur.dinosaurexploder.components.BombComponent;
 import com.dinosaur.dinosaurexploder.components.CollectedCoinsComponent;
+import com.dinosaur.dinosaurexploder.components.LevelProgressBarComponent;
 import com.dinosaur.dinosaurexploder.components.LifeComponent;
 import com.dinosaur.dinosaurexploder.components.RedDinoComponent;
 import com.dinosaur.dinosaurexploder.components.ScoreComponent;
 import com.dinosaur.dinosaurexploder.utils.LevelManager;
 import com.dinosaur.dinosaurexploder.utils.MockGameTimer;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -34,17 +37,27 @@ void setUp() {
     @Test
     void projectileHitDino_thenLevelUp() {
         ScoreComponent scoreComponent = new ScoreComponent();
+        Rectangle rect = new Rectangle(0, 8, Color.LIMEGREEN);
+        LevelProgressBarComponent levelProgressBarComponent = new LevelProgressBarComponent(rect, levelManager) {
+            @Override
+            public void updateProgress() {}
+        };
 
-        for (int i = 0; i < LEVEL_UP_COUNT; i++) collisionHandler.isLevelUpAfterHitDino(scoreComponent);
+        for (int i = 0; i < LEVEL_UP_COUNT; i++) collisionHandler.isLevelUpAfterHitDino(scoreComponent, levelProgressBarComponent);
 
         assertEquals(2, levelManager.getCurrentLevel());
     }
 
     @Test
     void projectileHitDino_thenScoreIncrease() {
         ScoreComponent scoreComponent = new ScoreComponent();
+        Rectangle rect = new Rectangle(0, 8, Color.LIMEGREEN);
+        LevelProgressBarComponent levelProgressBarComponent = new LevelProgressBarComponent(rect, levelManager) {
+            @Override
+            public void updateProgress() {}
+        };
 
-        collisionHandler.isLevelUpAfterHitDino(scoreComponent);
+        collisionHandler.isLevelUpAfterHitDino(scoreComponent, levelProgressBarComponent);
 
         assertEquals(1, scoreComponent.getScore());
     }