#46[30m]. Hide goal and color fields. Implement account title edit.

Author: Evgenii Kanivets

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

@@ -100,7 +100,7 @@ private boolean addAccount() {
             double goal = 0;
             int color = 0;
 
-            Account account = new Account(title, initSum, currency, goal, false, color);
+            Account account = new Account(-1, title, initSum, currency, goal, false, color);
             return accountController.create(account) != null;
         } else {
             return false;

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

@@ -2,6 +2,7 @@
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.design.widget.TextInputLayout;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -26,6 +27,8 @@ public class EditAccountActivity extends BaseBackActivity {
 
     private Account account;
 
+    @BindView(R.id.til_title)
+    TextInputLayout tilTitle;
     @BindView(R.id.et_title)
     EditText etTitle;
     @BindView(R.id.et_goal)
@@ -86,7 +89,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @OnClick(R.id.fabDone)
     void done() {
+        String title = etTitle.getText().toString().trim();
 
+        if (title.isEmpty()) {
+            tilTitle.setError(getString(R.string.field_cant_be_empty));
+        } else {
+            Account newAccount = new Account(account.getId(), title, account.getCurSum(),
+                    account.getCurrency(), account.getGoal(), account.isArchived(), account.getColor());
+            boolean updated = accountController.update(newAccount) != null;
+            if (updated) {
+                setResult(RESULT_OK);
+                finish();
+            }
+        }
     }
 
     private void archive() {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Account.java

@@ -32,9 +32,9 @@ public Account(long id, String title, long curSum, String currency, long decimal
         this.color = color;
     }
 
-    public Account(String title, double curSum, String currency, double goal,
+    public Account(long id, String title, double curSum, String currency, double goal,
                    boolean archived, int color) {
-        this.id = -1;
+        this.id = id;
         this.title = title;
         this.currency = currency;
         this.curSum = getLong(curSum);

app/src/main/res/layout/activity_edit_account.xml

@@ -39,15 +39,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/title"
-                android:inputType="numberDecimal"
+                android:inputType="text"
                 android:maxLines="1"
                 android:singleLine="true" />
         </android.support.design.widget.TextInputLayout>
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/til_goal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:visibility="invisible">
 
             <EditText
                 android:id="@+id/et_goal"
@@ -62,7 +63,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="invisible">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -89,12 +91,12 @@
     </LinearLayout>
 
     <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fabDone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/ic_done"
-        app:layout_anchorGravity="bottom|end"
-        android:id="@+id/fabDone"/>
+        app:layout_anchorGravity="bottom|end" />
 
 </android.support.design.widget.CoordinatorLayout>