diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 54f9079a3..c46504b48 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; @@ -324,6 +326,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity cardIdTableRow.setVisibility(View.GONE); enterButton.setText(R.string.enterCard); } + + FloatingActionButton saveButton = findViewById(R.id.fabSave); + saveButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + doSave(); + } + }); } class ColorSelectListener implements View.OnClickListener @@ -465,10 +475,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/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 7a704ad91..89e878482 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -29,6 +29,7 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.zxing.BarcodeFormat; import protect.card_locker.preferences.Settings; @@ -274,6 +275,20 @@ public class LoyaltyCardViewActivity extends AppCompatActivity { findViewById(R.id.barcode).setVisibility(View.GONE); } + + FloatingActionButton editButton = findViewById(R.id.fabEdit); + editButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class); + Bundle bundle = new Bundle(); + bundle.putInt("id", loyaltyCardId); + bundle.putBoolean("update", true); + intent.putExtras(bundle); + startActivity(intent); + finish(); + } + }); } @Override @@ -303,7 +318,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity } menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons)); - menu.findItem(R.id.action_edit).setIcon(getIcon(R.drawable.ic_mode_edit_white_24dp, backgroundNeedsDarkIcons)); return super.onCreateOptionsMenu(menu); } @@ -323,16 +337,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity importURIHelper.startShareIntent(loyaltyCard); return true; - case R.id.action_edit: - Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class); - Bundle bundle = new Bundle(); - bundle.putInt("id", loyaltyCardId); - bundle.putBoolean("update", true); - intent.putExtras(bundle); - startActivity(intent); - finish(); - return true; - case R.id.action_lock_unlock: if(rotationEnabled) { diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java index b24190996..5931b0053 100644 --- a/app/src/main/java/protect/card_locker/MainActivity.java +++ b/app/src/main/java/protect/card_locker/MainActivity.java @@ -29,6 +29,7 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.common.collect.ImmutableMap; import java.util.Calendar; @@ -69,6 +70,15 @@ public class MainActivity extends AppCompatActivity } updateLoyaltyCardList(filter); + + FloatingActionButton addButton = findViewById(R.id.fabAdd); + addButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class); + startActivityForResult(i, MAIN_REQUEST_CODE); + } + }); } @Override @@ -252,13 +262,6 @@ public class MainActivity extends AppCompatActivity { int id = item.getItemId(); - if (id == R.id.action_add) - { - Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class); - startActivityForResult(i, MAIN_REQUEST_CODE); - return true; - } - if(id == R.id.action_import_export) { Intent i = new Intent(getApplicationContext(), ImportExportActivity.class); 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 76e260824..3093f189c 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"> + + + + + + - - \ No newline at end of file diff --git a/app/src/main/res/menu/card_update_menu.xml b/app/src/main/res/menu/card_update_menu.xml index 9d9a207e8..f23773c64 100644 --- a/app/src/main/res/menu/card_update_menu.xml +++ b/app/src/main/res/menu/card_update_menu.xml @@ -1,16 +1,9 @@ - - - + app:showAsAction="always"/> \ No newline at end of file diff --git a/app/src/main/res/menu/card_view_menu.xml b/app/src/main/res/menu/card_view_menu.xml index 3910d3faa..3052eb2ae 100644 --- a/app/src/main/res/menu/card_view_menu.xml +++ b/app/src/main/res/menu/card_view_menu.xml @@ -12,9 +12,4 @@ android:icon="@drawable/ic_share_white" android:title="@string/share" app:showAsAction="always"/> - \ No newline at end of file diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index cf244f423..79514673d 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -8,11 +8,6 @@ android:icon="@drawable/ic_search_white" app:actionViewClass="androidx.appcompat.widget.SearchView" app:showAsAction="always|collapseActionView"/> - Search Add - You don\'t have any cards at the moment. Click the "+" (plus) button up top to get started.\n\nCatima lets you carry your loyalty cards on your phone, so they are always within reach. + You don\'t have any cards at the moment. Click the "+" (plus) button to get started.\n\nCatima lets you carry your cards on your phone, so they are always within reach. No cards match the search filter. Please try some different terms. Store