18 error counter should be reset after a successful attempt (#19)

* gain a heart every 5 successful attempts

* simple timer

* fixes

* fix countdown

* formatting

Author: hathibelagal-dev

.idea/deploymentTargetSelector.xml

@@ -10,8 +10,8 @@ android {
         applicationId = "io.github.hathibelagal.eidetic"
         minSdk = 26
         targetSdk = 35
-        versionCode = 10
-        versionName = "1.4.2"
+        versionCode = 11
+        versionName = "1.4.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/build.gradle.kts

@@ -23,6 +23,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.media.ToneGenerator;
 import android.os.Bundle;
+import android.os.CountDownTimer;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -37,6 +38,8 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.android.material.progressindicator.LinearProgressIndicator;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -62,6 +65,7 @@ public class MainActivity extends AppCompatActivity implements View.OnTouchListe
     private int expectedNumber = 1;
     private GridLayout grid;
     private View gridContainer;
+    private LinearProgressIndicator progressBar;
 
     private long startTime = 0;
 
@@ -71,6 +75,8 @@ public class MainActivity extends AppCompatActivity implements View.OnTouchListe
 
     private String additionalSpeech;
 
+    private CountDownTimer timer;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -81,12 +87,32 @@ protected void onCreate(Bundle savedInstanceState) {
         data = new SavedData(this);
         grid = findViewById(R.id.grid);
         gridContainer = findViewById(R.id.grid_container);
+        progressBar = findViewById(R.id.progress_bar);
 
         speaker = new Speaker(this, data);
 
         resetGrid();
     }
 
+    private void startProgressTimer() {
+        timer = new CountDownTimer(60000, 1000) {
+            @Override
+            public void onTick(long millisUntilFinished) {
+                long progress = millisUntilFinished / 1000;
+                progressBar.setProgress((int) progress);
+                if (progress <= 0) {
+                    showRestart(LOSE);
+                    cancel();
+                }
+            }
+
+            @Override
+            public void onFinish() {
+                showRestart(LOSE);
+            }
+        }.start();
+    }
+
     private void resetGrid() {
         invalidateOptionsMenu();
         gridContainer.setBackgroundResource(R.drawable.game_background);
@@ -98,12 +124,24 @@ private void resetGrid() {
         expectedNumber = 1;
         gameStarted = false;
         additionalSpeech = "";
+        progressBar.setProgress(60);
+        startProgressTimer();
     }
 
     private void generateSequence() {
         Collections.shuffle(sequence);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     private void createButtons() {
         int k = 0;
@@ -153,8 +191,15 @@ private CharSequence getMappedString(int i) {
 
 
     private void showRestart(int status) {
-        gridContainer.setBackgroundResource(status == WIN ?
-                R.drawable.win_background : R.drawable.lose_background);
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+        if (status == LOSE) {
+            data.resetStreak();
+            data.resetStars();
+        }
+        gridContainer.setBackgroundResource(status == WIN ? R.drawable.win_background : R.drawable.lose_background);
         int timeTaken = (int) TimeUnit.MILLISECONDS.toSeconds(new Date().getTime() - startTime);
         boolean createdRecord = false;
         int previousRecord = data.getFastestTime();
@@ -182,13 +227,8 @@ private void showRestart(int status) {
 
         data.updateStats(status == WIN);
 
-        titleView.setText(status == WIN ?
-                String.format(Locale.ENGLISH, "🤩 You win!\n🙌 Streak: %d", data.getStreak()) :
-                "😖 Game over!");
-        messageView.setText(status == WIN ?
-                String.format(Locale.ENGLISH, getString(createdRecord ? R.string.success_message_record :
-                        R.string.success_message), timeTaken, previousRecord) :
-                getString(R.string.game_over_message));
+        titleView.setText(status == WIN ? String.format(Locale.ENGLISH, "🤩 You win!\n🙌 Streak: %d", data.getStreak()) : "😖 Game over!");
+        messageView.setText(status == WIN ? String.format(Locale.ENGLISH, getString(createdRecord ? R.string.success_message_record : R.string.success_message), timeTaken, previousRecord) : getString(R.string.game_over_message));
 
         AlertDialog dialog = builder.create();
         Objects.requireNonNull(dialog.getWindow()).setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -206,9 +246,7 @@ private void showRestart(int status) {
             if (!data.areSoundsOn()) {
                 neutralButton.setEnabled(false);
             }
-            neutralButton.setOnClickListener(v ->
-                    speaker.say(String.format(Locale.ENGLISH, getString(R.string.tts_time_taken), timeTaken) +
-                            ". " + additionalSpeech));
+            neutralButton.setOnClickListener(v -> speaker.say(String.format(Locale.ENGLISH, getString(R.string.tts_time_taken), timeTaken) + ". " + additionalSpeech));
         }
 
         dialog.show();
@@ -326,9 +364,7 @@ private void showStatsDialog() {
             return;
         }
         Float winRate = (float) (100.0 * nWins / nGames);
-        String statsText = String.format(Locale.ENGLISH,
-                "Total games played: %d\nNumber of wins: %d\nWin rate: %.2f %%",
-                nGames, nWins, winRate);
+        String statsText = String.format(Locale.ENGLISH, "Total games played: %d\nNumber of wins: %d\nWin rate: %.2f %%", nGames, nWins, winRate);
         messageView.setText(statsText);
 
         AlertDialog dialog = builder.create();
@@ -350,6 +386,9 @@ protected void onDestroy() {
         if (speaker != null) {
             speaker.releaseResources();
         }
+        if (timer != null) {
+            timer.cancel();
+        }
         super.onDestroy();
     }
 
@@ -391,11 +430,10 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
                 data.decrementStarsAvailable();
                 invalidateOptionsMenu();
             } else {
-                data.resetStreak();
-                data.resetStars();
                 MainActivity.this.showRestart(LOSE);
             }
         }
         return true;
     }
+
 }

app/src/main/java/io/github/hathibelagal/eidetic/MainActivity.java

@@ -35,6 +35,9 @@ public class SavedData {
     void incrementStreak() {
         int currentStreak = prefs.getInt("STREAK", 0) + 1;
         prefs.edit().putInt("STREAK", currentStreak).apply();
+        if(currentStreak >= 5 && currentStreak % 5 == 0) {
+            incrementStarsAvailable();
+        }
     }
 
     boolean areSoundsOn() {
@@ -118,4 +121,11 @@ void resetStars() {
     void decrementStarsAvailable() {
         prefs.edit().putInt("STARS", getStarsAvailable() - 1).commit();
     }
+    @SuppressLint("ApplySharedPref")
+    void incrementStarsAvailable() {
+        if (getStarsAvailable() >= MAX_STARS) {
+            return;
+        }
+        prefs.edit().putInt("STARS", getStarsAvailable() + 1).commit();
+    }
 }

app/src/main/java/io/github/hathibelagal/eidetic/SavedData.java

@@ -3,12 +3,23 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".MainActivity"
     android:orientation="vertical"
     android:background="@drawable/game_background"
     android:id="@+id/grid_container"
-    android:fitsSystemWindows="true"
-    >
+    android:fitsSystemWindows="true">
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/progress_bar"
+        android:max="60"
+        android:min="0"
+        android:progress="10"
+        android:layout_marginBottom="2dp"
+        app:indicatorColor="#5AA1E6"
+        />
 
     <GridLayout
         android:layout_width="match_parent"

app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,2 @@
+- Heart regeneration. You now regain a lost heart every time you complete 5 attempts successfully.
+- There's now a maximum time limit of 1 minute.