#137[30m]. Fix 'Can't edit date and time of record'.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java

@@ -5,6 +5,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.EditText;
 
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
@@ -34,6 +35,10 @@ public class AddAccountActivity extends BaseBackActivity {
 
     @Bind(R.id.content)
     View contentView;
+    @Bind(R.id.et_title)
+    EditText etTitle;
+    @Bind(R.id.et_init_sum)
+    EditText etInitSum;
     @Bind(R.id.spinner)
     AppCompatSpinner spinner;
 
@@ -88,8 +93,13 @@ private void tryAddAccount() {
 
     @SuppressWarnings("SimplifiableIfStatement")
     private boolean addAccount() {
-        Account account = accountValidator.validate();
-        if (account == null) return false;
-        else return accountController.create(account) != null;
+        if (accountValidator.validate()) {
+            String title = etTitle.getText().toString().trim();
+            double initSum = Double.parseDouble(etInitSum.getText().toString().trim());
+            String currency = (String) spinner.getSelectedItem();
+            return accountController.create(new Account(title, initSum, currency)) != null;
+        } else {
+            return false;
+        }
     }
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java

@@ -5,6 +5,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.EditText;
 
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
@@ -42,6 +43,10 @@ public class TransferActivity extends BaseBackActivity {
     AppCompatSpinner spinnerFrom;
     @Bind(R.id.spinner_to)
     AppCompatSpinner spinnerTo;
+    @Bind(R.id.et_from_amount)
+    EditText etFromAmount;
+    @Bind(R.id.et_to_amount)
+    EditText etToAmount;
 
     @Override
     protected int getContentViewId() {
@@ -65,7 +70,7 @@ protected void initViews() {
             accounts.add(account.getTitle());
         }
 
-        transferValidator = new TransferValidator(TransferActivity.this, contentView, accountList);
+        transferValidator = new TransferValidator(TransferActivity.this, contentView);
 
         if (accounts.size() == 0) {
             accounts.add(getString(R.string.none));
@@ -109,8 +114,16 @@ private void tryTransfer() {
 
     @SuppressWarnings("SimplifiableIfStatement")
     private boolean doTransfer() {
-        Transfer transfer = transferValidator.validate();
-        if (transfer == null) return false;
-        else return transferController.create(transfer) != null;
+        if (transferValidator.validate()) {
+            Account fromAccount = accountList.get(spinnerFrom.getSelectedItemPosition());
+            Account toAccount = accountList.get(spinnerTo.getSelectedItemPosition());
+            double fromAmount = Double.parseDouble(etFromAmount.getText().toString());
+            double toAmount = Double.parseDouble(etToAmount.getText().toString());
+
+            return transferController.create(new Transfer(System.currentTimeMillis(),
+                    fromAccount.getId(), toAccount.getId(), fromAmount, toAmount)) != null;
+        } else {
+            return false;
+        }
     }
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/AddExchangeRateActivity.java

@@ -136,8 +136,16 @@ private void tryAddExchangeRate() {
 
     @SuppressWarnings("SimplifiableIfStatement")
     private boolean addExchangeRate() {
-        ExchangeRatePair pair = exchangeRatePairValidator.validate();
-        if (pair == null) return false;
-        else return exchangeRateController.createExchangeRatePair(pair) != null;
+        if (exchangeRatePairValidator.validate()) {
+            String fromCurrency = (String) spinnerFromCurrency.getSelectedItem();
+            String toCurrency = (String) spinnerToCurrency.getSelectedItem();
+            double amountBuy = Double.parseDouble(etBuy.getText().toString().trim());
+            double amountSell = Double.parseDouble(etSell.getText().toString().trim());
+
+            return exchangeRateController.createExchangeRatePair(
+                    new ExchangeRatePair(fromCurrency, toCurrency, amountBuy, amountSell)) != null;
+        } else {
+            return false;
+        }
     }
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.java

@@ -29,6 +29,7 @@
 import com.blogspot.e_kanivets.moneytracker.controller.data.CategoryController;
 import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
+import com.blogspot.e_kanivets.moneytracker.entity.data.Category;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
 import com.blogspot.e_kanivets.moneytracker.ui.AddRecordUiDecorator;
 import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
@@ -124,9 +125,7 @@ record = getIntent().getParcelableExtra(KEY_RECORD);
     protected void initViews() {
         super.initViews();
 
-        long recordId = record == null ? -1 : record.getId();
-        recordValidator = new RecordValidator(AddRecordActivity.this, contentView, mode,
-                accountList, timestamp, type, recordId);
+        recordValidator = new RecordValidator(AddRecordActivity.this, contentView);
 
         // Add texts to dialog if it's edit dialog
         if (mode == Mode.MODE_EDIT) {
@@ -306,14 +305,32 @@ private void tryRecord() {
 
     @SuppressWarnings("SimplifiableIfStatement")
     private boolean addRecord() {
-        Record newRecord = recordValidator.validate();
-        if (newRecord == null) return false;
-        else {
+        if (recordValidator.validate()) {
+            long now = new Date().getTime();
+            if (timestamp > now) {
+                showToast(R.string.record_in_future);
+                return false;
+            }
+
+            String title = etTitle.getText().toString().trim();
+            String category = etCategory.getText().toString().trim();
+            double price = Double.parseDouble(etPrice.getText().toString());
+            Account account = accountList.get(spinnerAccount.getSelectedItemPosition());
+
+            if (title.isEmpty()) {
+                title = category;
+            }
+
             if (mode == Mode.MODE_ADD) {
-                return recordController.create(newRecord) != null;
+                return recordController.create(new Record(timestamp, type, title,
+                        new Category(category), price, account, account.getCurrency())) != null;
             } else if (mode == Mode.MODE_EDIT) {
-                return recordController.update(newRecord) != null;
+                long recordId = record == null ? -1 : record.getId();
+                return recordController.update(new Record(recordId, timestamp, type, title,
+                        new Category(category), price, account, account.getCurrency())) != null;
             } else return false;
+        } else {
+            return false;
         }
     }
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/AccountValidator.java

@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.widget.AppCompatSpinner;
 import android.view.View;
@@ -43,12 +42,10 @@ public AccountValidator(@NonNull Context context, @NonNull View view) {
         initTextWatchers();
     }
 
-    @Nullable
     @Override
-    public Account validate() {
+    public boolean validate() {
         String title = etTitle.getText().toString().trim();
         double initSum = Double.MAX_VALUE;
-        String currency = (String) spinner.getSelectedItem();
 
         try {
             initSum = Double.parseDouble(etInitSum.getText().toString().trim());
@@ -74,7 +71,7 @@ public Account validate() {
             valid = false;
         }
 
-        return valid ? new Account(title, initSum, currency) : null;
+        return valid;
     }
 
     private void initTextWatchers() {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/ExchangeRatePairValidator.java

@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.widget.AppCompatSpinner;
 import android.view.View;
@@ -47,9 +46,8 @@ public ExchangeRatePairValidator(@NonNull Context context, @NonNull View view) {
         initTextWatchers();
     }
 
-    @Nullable
     @Override
-    public ExchangeRatePair validate() {
+    public boolean validate() {
         boolean valid = true;
 
         String fromCurrency = null;
@@ -107,7 +105,7 @@ public ExchangeRatePair validate() {
             valid = false;
         }
 
-        return valid ? new ExchangeRatePair(fromCurrency, toCurrency, amountBuy, amountSell) : null;
+        return valid;
     }
 
     private void initTextWatchers() {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/IValidator.java

@@ -1,7 +1,5 @@
 package com.blogspot.e_kanivets.moneytracker.util.validator;
 
-import android.support.annotation.Nullable;
-
 /**
  * Interface of validators for data models. It may works with UI elements directly.
  * Created on 06.12.2016.
@@ -13,8 +11,7 @@ public interface IValidator<T> {
     long MAX_ABS_VALUE = Integer.MAX_VALUE * 1024L;
 
     /**
-     * @return instance of class T if validation passed or null otherwise
+     * @return true if validation passed or false otherwise
      */
-    @Nullable
-    T validate();
+    boolean validate();
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/RecordValidator.java

@@ -2,22 +2,15 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.widget.AppCompatSpinner;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
 
 import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.activity.record.AddRecordActivity;
-import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
-import com.blogspot.e_kanivets.moneytracker.entity.data.Category;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
 
-import java.util.Date;
-import java.util.List;
-
 import butterknife.Bind;
 import butterknife.ButterKnife;
 
@@ -33,12 +26,6 @@ public class RecordValidator implements IValidator<Record> {
     @NonNull
     private final Context context;
 
-    private AddRecordActivity.Mode mode;
-    private List<Account> accountList;
-    private long timestamp;
-    private long recordId;
-    private int recordType;
-
     @Bind(R.id.til_title)
     TextInputLayout tilTitle;
     @Bind(R.id.et_title)
@@ -54,32 +41,19 @@ public class RecordValidator implements IValidator<Record> {
     @Bind(R.id.spinner_account)
     AppCompatSpinner spinnerAccount;
 
-    public RecordValidator(@NonNull Context context, @NonNull View view,
-                           @NonNull AddRecordActivity.Mode mode, @NonNull List<Account> accountList,
-                           long timestamp, int recordType, long recordId) {
+    public RecordValidator(@NonNull Context context, @NonNull View view) {
         this.context = context;
-        this.mode = mode;
-        this.accountList = accountList;
-        this.timestamp = timestamp;
-        this.recordType = recordType;
-        this.recordId = recordId;
 
         ButterKnife.bind(this, view);
         initTextWatchers();
     }
 
-    @Nullable
     @Override
-    public Record validate() {
+    public boolean validate() {
         boolean valid = true;
 
-        String title = etTitle.getText().toString().trim();
         String category = etCategory.getText().toString().trim();
 
-        if (title.isEmpty()) {
-            title = category;
-        }
-
         if (category.isEmpty()) {
             tilCategory.setError(context.getString(R.string.field_cant_be_empty));
             valid = false;
@@ -104,32 +78,12 @@ public Record validate() {
             valid = false;
         }
 
-        long now = new Date().getTime();
-        if (timestamp > now) {
-            Toast.makeText(context, R.string.record_in_future, Toast.LENGTH_SHORT).show();
-            valid = false;
-        }
-
-        Account account = null;
-        if (spinnerAccount.isEnabled()) {
-            account = accountList.get(spinnerAccount.getSelectedItemPosition());
-        } else {
+        if (!spinnerAccount.isEnabled()) {
             Toast.makeText(context, R.string.one_account_needed, Toast.LENGTH_SHORT).show();
             valid = false;
         }
 
-        Record record = null;
-        if (account != null) {
-            if (mode == AddRecordActivity.Mode.MODE_ADD) {
-                record = new Record(timestamp, recordType, title, new Category(category),
-                        price, account, account.getCurrency());
-            } else if (mode == AddRecordActivity.Mode.MODE_EDIT) {
-                record = new Record(recordId, timestamp, recordType, title, new Category(category),
-                        price, account, account.getCurrency());
-            }
-        }
-
-        return valid ? record : null;
+        return valid;
     }
 
     private void initTextWatchers() {