stop animated FAB being triggered at wrong times

lewismcgeary · Mar 3, 2016 · 5fae4e2 · 5fae4e2
1 parent 9185920
commit 5fae4e2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/app/src/main/java/io/github/lewismcgeary/androidgameoflife/GameStateCallback.java b/app/src/main/java/io/github/lewismcgeary/androidgameoflife/GameStateCallback.java
@@ -12,4 +12,6 @@ public interface GameStateCallback {
     void cellDrawingInProgress();
 
     void cellDrawingFinished();
+
+    void gameStarted();
 }
diff --git a/app/src/main/java/io/github/lewismcgeary/androidgameoflife/GridPresenter.java b/app/src/main/java/io/github/lewismcgeary/androidgameoflife/GridPresenter.java
@@ -36,6 +36,7 @@ public void passLiveCellsToModelAndStartGame(){
             worldGrid.setInitialLiveCells(userSelectedCells);
             startConstantUpdate();
             worldGridLayout.setEnabled(false);
+            worldGridLayout.gameStarted();
         } else {
             worldGridLayout.noCellsWereSelected();
         }

diff --git a/app/src/main/java/io/github/lewismcgeary/androidgameoflife/LifeGridFragment.java b/app/src/main/java/io/github/lewismcgeary/androidgameoflife/LifeGridFragment.java
@@ -142,6 +142,11 @@ public void cellDrawingFinished() {
         mListener.cellDrawingFinished();
     }
 
+    @Override
+    public void gameStarted() {
+        mListener.gameStarted();
+    }
+
     public interface OnFragmentInteractionListener {
 
         void gameOver();
@@ -151,5 +156,7 @@ public interface OnFragmentInteractionListener {
         void cellDrawingInProgress();
 
         void cellDrawingFinished();
+
+        void gameStarted();
     }
 }
diff --git a/app/src/main/java/io/github/lewismcgeary/androidgameoflife/LifeGridLayout.java b/app/src/main/java/io/github/lewismcgeary/androidgameoflife/LifeGridLayout.java
@@ -177,6 +177,10 @@ public void noCellsWereSelected(){
     public void cellsDiedGameOver(){
         gameStateCallback.gameOver();
     }
+
+    public void gameStarted() {
+        gameStateCallback.gameStarted();
+    }
     //can disable this as no scrolling needed
     @Override
     public boolean shouldDelayChildPressedState() {

diff --git a/app/src/main/java/io/github/lewismcgeary/androidgameoflife/MainActivity.java b/app/src/main/java/io/github/lewismcgeary/androidgameoflife/MainActivity.java
@@ -57,7 +57,6 @@ protected void onResume() {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        showButtonInStartMode();
         startResetFab.hide();
         appBarLayout.setExpanded(true, true);
         setFixedScreenOrientation(false);
@@ -87,7 +86,6 @@ private void initialiseButton(){
             @Override
             public void onClick(View v) {
                 if (startResetFab.getTag().equals(startButtonText)) {
-                    showButtonInResetMode();
                     lifeGridFragment.worldGridPresenter.passLiveCellsToModelAndStartGame();
                 } else {
                     showButtonInStartMode();
@@ -209,12 +207,17 @@ public void noCellsWereSelected() {
         ViewGroup group = (ViewGroup) snack.getView();
         group.setBackgroundColor(ContextCompat.getColor(this, R.color.colorPrimaryDark));
         snack.show();
-        showButtonInStartMode();
+    }
+
+    @Override
+    public void gameStarted() {
+        showButtonInResetMode();
     }
 
     @Override
     public void letsPlay() {
         setFixedScreenOrientation(true);
+        showButtonInStartMode();
         startTransition();
     }