diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 706a0cf53..0b7198a9f 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -8,6 +8,8 @@ import android.graphics.Color; import android.net.Uri; import android.os.Build; import android.os.Bundle; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; @@ -38,6 +40,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity private static final int SELECT_BARCODE_REQUEST = 1; + FloatingActionButton fabSave; EditText storeFieldEdit; EditText noteFieldEdit; ImageView headingColorSample; @@ -96,6 +99,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity db = new DBHelper(this); importUriHelper = new ImportURIHelper(this); + fabSave = findViewById(R.id.fabSave); storeFieldEdit = findViewById(R.id.storeNameEdit); noteFieldEdit = findViewById(R.id.noteEdit); headingColorSample = findViewById(R.id.headingColorSample); @@ -136,6 +140,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity Log.i(TAG, "To view card: " + loyaltyCardId); + fabSave.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View view) { + doSave(); + } + }); + if(updateLoyaltyCard) { final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId); @@ -406,10 +418,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity { getMenuInflater().inflate(R.menu.card_update_menu, menu); } - else - { - getMenuInflater().inflate(R.menu.card_add_menu, menu); - } return super.onCreateOptionsMenu(menu); } @@ -457,10 +465,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity dialog.show(); return true; - - case R.id.action_save: - doSave(); - return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml index 198a867b0..0aba1ff41 100644 --- a/app/src/main/res/layout/loyalty_card_edit_activity.xml +++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml @@ -5,6 +5,15 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> + + - - + app:showAsAction="always"/> \ No newline at end of file