From 5ae6105f951627a15e76cece7b4ed52e92faee2a Mon Sep 17 00:00:00 2001 From: Greg Meiste Date: Sun, 13 Nov 2016 10:55:35 -0600 Subject: [PATCH 1/2] Update to Gradle 2.14.1 and Gradle plugin 2.2.2 The latest version of Android Studio strongly recommends to update to these versions. Signed-off-by: Greg Meiste --- .idea/gradle.xml | 9 ++------- .idea/vcs.xml | 6 ++++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 58992cc..0e23f8e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,19 +5,14 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index aff4f41..c20bca1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.2.2' // 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 0e0576b..77bd474 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 26 20:47:15 JST 2016 +#Sun Nov 13 09:56:04 CST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip From 80772b7af504305a681ff94815533c8eaf1a098b Mon Sep 17 00:00:00 2001 From: Greg Meiste Date: Sun, 13 Nov 2016 10:57:23 -0600 Subject: [PATCH 2/2] Fix typo in mTmpPoint variable name Signed-off-by: Greg Meiste --- .../java/jp/narr/tensorflowmnist/MainActivity.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/jp/narr/tensorflowmnist/MainActivity.java b/app/src/main/java/jp/narr/tensorflowmnist/MainActivity.java index aebe4ad..b9598ff 100644 --- a/app/src/main/java/jp/narr/tensorflowmnist/MainActivity.java +++ b/app/src/main/java/jp/narr/tensorflowmnist/MainActivity.java @@ -37,7 +37,7 @@ public class MainActivity extends AppCompatActivity implements View.OnTouchListe private DrawModel mModel; private DrawView mDrawView; - private PointF mTmpPiont = new PointF(); + private PointF mTmpPoint = new PointF(); private DigitDetector mDetector = new DigitDetector(); @@ -113,9 +113,9 @@ public boolean onTouch(View v, MotionEvent event) { private void processTouchDown(MotionEvent event) { mLastX = event.getX(); mLastY = event.getY(); - mDrawView.calcPos(mLastX, mLastY, mTmpPiont); - float lastConvX = mTmpPiont.x; - float lastConvY = mTmpPiont.y; + mDrawView.calcPos(mLastX, mLastY, mTmpPoint); + float lastConvX = mTmpPoint.x; + float lastConvY = mTmpPoint.y; mModel.startLine(lastConvX, lastConvY); } @@ -123,9 +123,9 @@ private void processTouchMove(MotionEvent event) { float x = event.getX(); float y = event.getY(); - mDrawView.calcPos(x, y, mTmpPiont); - float newConvX = mTmpPiont.x; - float newConvY = mTmpPiont.y; + mDrawView.calcPos(x, y, mTmpPoint); + float newConvX = mTmpPoint.x; + float newConvY = mTmpPoint.y; mModel.addLineElem(newConvX, newConvY); mLastX = x;