new transaction: use a fab button for submission

the menu is too far above, and with a proper spacer the overlapping
of the last account row is not a problem

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
index c6649734ffec96dff2bee36147ade60a9d304e6a..82fa12d075aedf5ab6ed81174298c86c3c5e9e6b 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
@@ -20,6 +20,7 @@ package net.ktnx.mobileledger.ui.activity;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.support.design.widget.BaseTransientBottomBar;
+import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
@@ -72,9 +73,9 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
     private static SaveTransactionTask saver;
     private TableLayout table;
     private ProgressBar progress;
+    private FloatingActionButton fab;
     private TextView tvDate;
     private AutoCompleteTextView tvDescription;
-    private MenuItem mSave;
     private static boolean isZero(float f) {
         return (f < 0.005) && (f > -0.005);
     }
@@ -96,6 +97,8 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         hookTextChangeListener(tvDescription);
 
         progress = findViewById(R.id.save_transaction_progress);
+        fab = findViewById(R.id.fab);
+        fab.setOnClickListener(v -> saveTransaction());
 
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
         table = findViewById(R.id.new_transaction_accounts_table);
@@ -133,7 +136,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         if (tvDate.getText().toString().isEmpty()) tvDate.requestFocus();
     }
     public void saveTransaction() {
-        if (mSave != null) mSave.setVisible(false);
+        if (fab != null) fab.setEnabled(false);
         toggleAllEditing(false);
         progress.setVisibility(View.VISIBLE);
         try {
@@ -167,14 +170,14 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
 
             progress.setVisibility(View.GONE);
             toggleAllEditing(true);
-            if (mSave != null) mSave.setVisible(true);
+            if (fab != null) fab.setEnabled(true);
         }
         catch (Exception e) {
             Log.d("new-transaction", "Unknown error", e);
 
             progress.setVisibility(View.GONE);
             toggleAllEditing(true);
-            if (mSave != null) mSave.setVisible(true);
+            if (fab != null) fab.setEnabled(true);
         }
     }
     private void toggleAllEditing(boolean enabled) {
@@ -238,8 +241,6 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.new_transaction, menu);
-        mSave = menu.findItem(R.id.action_submit_transaction);
-        if (mSave == null) throw new AssertionError();
 
         check_transaction_submittable();
 
@@ -403,9 +404,14 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
                 (amounts_with_accounts == amounts) &&
                 (single_empty_amount && single_empty_amount_has_account || isZero(running_total)))
             {
-                if (mSave != null) mSave.setVisible(true);
+                if (fab != null) {
+                    fab.show();
+                    fab.setEnabled(true);
+                }
+            }
+            else {
+                if (fab != null) fab.hide();
             }
-            else if (mSave != null) mSave.setVisible(false);
 
             if (single_empty_amount) {
                 empty_amount.setHint(String.format("%1.2f",
@@ -414,11 +420,11 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
 
         }
         catch (NumberFormatException e) {
-            if (mSave != null) mSave.setVisible(false);
+            if (fab != null) fab.hide();
         }
         catch (Exception e) {
             e.printStackTrace();
-            if (mSave != null) mSave.setVisible(false);
+            if (fab != null) fab.hide();
         }
     }
 

diff --git a/app/src/main/res/layout/activity_new_transaction.xml b/app/src/main/res/layout/activity_new_transaction.xml
index 197865eb4296ae38d7267fe8f0ccb53a97fee7c3..0cea5a59107bc33e0160f66b4a00cd66a8ce5072 100644 (file)
--- a/app/src/main/res/layout/activity_new_transaction.xml
+++ b/app/src/main/res/layout/activity_new_transaction.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright © 2018 Damyan Ivanov.
   ~ This file is part of MoLe.
   ~ MoLe is free software: you can distribute it and/or modify it
@@ -53,6 +52,21 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="@dimen/fab_margin"
+            android:tint="@android:color/white"
+            android:visibility="gone"
+            app:backgroundTint="@color/colorPrimary"
+            app:layout_constraintBottom_toBottomOf="@id/save_transaction_progress"
+            app:layout_constraintEnd_toEndOf="@id/save_transaction_progress"
+            app:layout_constraintStart_toStartOf="@id/save_transaction_progress"
+            app:layout_constraintTop_toTopOf="@id/save_transaction_progress"
+            app:srcCompat="@drawable/ic_save_white_24dp" />
+
     </android.support.constraint.ConstraintLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/content_new_transaction.xml b/app/src/main/res/layout/content_new_transaction.xml
index 2ca1a156b9db5e206860ba2d8d7265c72c1be950..028ddcd3e435ffa728610c2ee63e96bc96a763ad 100644 (file)
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -174,6 +174,13 @@
 
             </TableLayout>
 
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:background="@android:color/transparent">
+
+            </FrameLayout>
+
         </LinearLayout>
     </ScrollView>