From 64c5e27bab910eb9d0730ecafc7933ed4c6963f6 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 30 Nov 2018 18:15:29 +0000
Subject: [PATCH] replace add account floating action button with a menu item

---
 .../ktnx/mobileledger/NewTransactionActivity.java  | 14 ++++++++++++++
 .../main/res/layout/activity_new_transaction.xml   | 12 ------------
 app/src/main/res/menu/new_transaction.xml          | 11 +++++++++++
 app/src/main/res/values/strings.xml                |  1 +
 4 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/menu/new_transaction.xml

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index 1c1f863a..12e8b69e 100644
--- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
@@ -6,6 +6,8 @@ import android.support.design.widget.Snackbar;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 
 import java.util.Objects;
@@ -30,6 +32,13 @@ public class NewTransactionActivity extends AppCompatActivity {
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
     }
 
+    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);
+
+        return true;
+    }
+
     public void pickTransactionDate(View view) {
         DialogFragment picker = new DatePickerFragment();
         picker.show(getSupportFragmentManager(), "datePicker");
@@ -37,4 +46,9 @@ public class NewTransactionActivity extends AppCompatActivity {
 //                .setAction("Action", null).show();
     }
 
+    public void addTransactionAccountFromMenu(MenuItem item) {
+        Snackbar.make(getCurrentFocus(), "Not implemented yet", Snackbar.LENGTH_LONG)
+                .setAction("Action", null).show();
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_new_transaction.xml b/app/src/main/res/layout/activity_new_transaction.xml
index 69ef23ec..bd73df16 100644
--- a/app/src/main/res/layout/activity_new_transaction.xml
+++ b/app/src/main/res/layout/activity_new_transaction.xml
@@ -31,16 +31,4 @@
         app:backgroundTint="@color/colorPrimary"
         app:srcCompat="@android:drawable/ic_menu_send" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab_add_account"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|end"
-        android:layout_marginBottom="80dp"
-        android:clickable="true"
-        android:focusable="auto"
-        app:layout_anchor="@id/fab"
-        app:layout_anchorGravity="top"
-        app:srcCompat="@drawable/svg_thick_plus_white" />
-
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/new_transaction.xml b/app/src/main/res/menu/new_transaction.xml
new file mode 100644
index 00000000..056bfb2c
--- /dev/null
+++ b/app/src/main/res/menu/new_transaction.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+        <item
+            android:id="@+id/action_add_account"
+            android:icon="@drawable/svg_thick_plus_white"
+            android:onClick="addTransactionAccountFromMenu"
+            android:orderInCategory="100"
+            android:title="@string/menu_add_account"
+            app:showAsAction="never|ifRoom" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 23d2ee12..e284d05d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,4 +58,5 @@
     <string name="new_transaction_account_label">Account</string>
     <string name="new_transaction_date_hint">Transaction date</string>
     <string name="new_transaction_amount_hint">amount</string>
+    <string name="menu_add_account">Add another acount</string>
 </resources>
-- 
2.39.2