Also add FAB to edit screen

This commit is contained in:
Sylvia van Os
2020-01-05 00:04:50 +01:00
parent 490281bff9
commit 27d718b461
3 changed files with 22 additions and 15 deletions

View File

@@ -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);

View File

@@ -5,6 +5,15 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:src="@drawable/save_24dp"
android:contentDescription="@string/save"
android:layout_margin="16dp" />
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@@ -2,15 +2,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_save"
android:icon="@drawable/save_24dp"
android:title="@string/save"
app:showAsAction="always"/>
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_white_24dp"
android:title="@string/delete"
app:showAsAction="never"/>
app:showAsAction="always"/>
</menu>