From fdf21a226f9dcb843b349d8e4ecfffe29b0cf1ba Mon Sep 17 00:00:00 2001 From: swami701 Date: Sun, 12 Mar 2017 23:27:52 +0800 Subject: [PATCH 1/2] GRADLE UPDATE: Update gradle --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 74b2ab0..1ea4bd0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..2d7a1c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Sun Mar 12 23:21:26 SGT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From 8134bb8204fd2ce5e2f68f50802f8e2b1d4aa521 Mon Sep 17 00:00:00 2001 From: swami701 Date: Sun, 12 Mar 2017 23:28:50 +0800 Subject: [PATCH 2/2] BUG FIX: Fix the issue for the blank cell when the cell is being double-clicked --- .../com/acme/tictactoe/viewmodel/TicTacToeViewModel.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/acme/tictactoe/viewmodel/TicTacToeViewModel.java b/app/src/main/java/com/acme/tictactoe/viewmodel/TicTacToeViewModel.java index d37b334..899cd56 100644 --- a/app/src/main/java/com/acme/tictactoe/viewmodel/TicTacToeViewModel.java +++ b/app/src/main/java/com/acme/tictactoe/viewmodel/TicTacToeViewModel.java @@ -44,9 +44,12 @@ public void onResetSelected() { } public void onClickedCellAt(int row, int col) { - Player playerThatMoved = model.mark(row, col); - cells.put("" + row + col, playerThatMoved == null ? null : playerThatMoved.toString()); - winner.set(model.getWinner() == null ? null : model.getWinner().toString()); + String key = "" + row + col; + if (!cells.containsKey(key)) { + Player playerThatMoved = model.mark(row, col); + cells.put(key, playerThatMoved == null ? null : playerThatMoved.toString()); + winner.set(model.getWinner() == null ? null : model.getWinner().toString()); + } } }