From cdee239bec90fe7da94ac3b5d5d0581935e9bfe8 Mon Sep 17 00:00:00 2001 From: Evgenii Kanivets Date: Wed, 24 Aug 2016 16:01:23 +0300 Subject: [PATCH 1/3] Update gradle plugin up to v2.14. --- 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 7e73519..04edadd 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.2' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dc37f22..63a6a25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Apr 19 13:31:21 GMT+02:00 2016 +#Wed Aug 24 14:58:14 GMT+02:00 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 1adfa99136b9019d307d7d040a4f10989d38c8ea Mon Sep 17 00:00:00 2001 From: Evgenii Kanivets Date: Mon, 29 Aug 2016 18:50:23 +0300 Subject: [PATCH 2/3] #119[30m]. Fix an NFE at AddAccountActivity.addAccount. --- app/build.gradle | 2 +- .../activity/account/AddAccountActivity.java | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 170834c..a9de755 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,4 +64,4 @@ dependencies { androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4' androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4' androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4' -} \ No newline at end of file +} diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java index 8fbfaaa..1760cac 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java @@ -65,10 +65,10 @@ public boolean onCreateOptionsMenu(Menu menu) { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.action_done: - addAccount(); - - setResult(RESULT_OK); - finish(); + if (addAccount()) { + setResult(RESULT_OK); + finish(); + } else showToast(R.string.wrong_number_text); return true; default: @@ -76,12 +76,20 @@ public boolean onOptionsItemSelected(MenuItem item) { } } - private void addAccount() { + private boolean addAccount() { String title = etTitle.getText().toString().trim(); - double initSum = Double.parseDouble(etInitSum.getText().toString().trim()); + + double initSum; + try { + initSum = Double.parseDouble(etInitSum.getText().toString().trim()); + } catch (NumberFormatException e) { + e.printStackTrace(); + return false; + } + String currency = (String) spinner.getSelectedItem(); Account account = new Account(title, initSum, currency); - accountController.create(account); + return accountController.create(account) != null; } -} \ No newline at end of file +} From 250be02d1ef0d45d38bf6f8a6f860a5a29f89834 Mon Sep 17 00:00:00 2001 From: Evgenii Kanivets Date: Mon, 29 Aug 2016 18:51:56 +0300 Subject: [PATCH 3/3] VersionCode 16, versionName '1.7.9.'. --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a9de755..deb0fbb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId 'com.blogspot.e_kanivets.moneytracker' minSdkVersion 17 targetSdkVersion 23 - versionCode 15 - versionName '1.7.8' + versionCode 16 + versionName '1.7.9' } signingConfigs { releaseConfig {