From 13b2faab390e26136ab01b88e0ee0c70bb8a38da Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sun, 18 Jun 2017 13:58:50 -0400
Subject: [PATCH] Use save button in action bar

---
 .../card_locker/LoyaltyCardViewActivity.java  | 141 ++++++++++--------
 app/src/main/res/drawable-hdpi/save_24dp.png  | Bin 0 -> 519 bytes
 app/src/main/res/drawable-mdpi/save_24dp.png  | Bin 0 -> 406 bytes
 app/src/main/res/drawable-xhdpi/save_24dp.png | Bin 0 -> 651 bytes
 .../main/res/drawable-xxhdpi/save_24dp.png    | Bin 0 -> 853 bytes
 .../main/res/drawable-xxxhdpi/save_24dp.png   | Bin 0 -> 1060 bytes
 .../res/layout/loyalty_card_view_activity.xml |  16 --
 app/src/main/res/menu/card_update_menu.xml    |   8 +-
 .../LoyaltyCardViewActivityTest.java          |  31 ++--
 9 files changed, 93 insertions(+), 103 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/save_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/save_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/save_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/save_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/save_24dp.png

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 47875064e..1f1c235e7 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -34,6 +34,28 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
     private static final int SELECT_BARCODE_REQUEST = 1;
 
+    EditText storeFieldEdit;
+    TextView storeFieldView;
+    EditText noteFieldEdit;
+    TextView noteFieldView;
+    EditText cardIdFieldEdit;
+    TextView cardIdFieldView;
+    EditText barcodeTypeField;
+    ImageView barcodeImage;
+    View barcodeIdLayout;
+    View barcodeTypeLayout;
+    View barcodeImageLayout;
+    View barcodeCaptureLayout;
+
+    Button captureButton;
+    Button enterButton;
+
+    int loyaltyCardId;
+    boolean updateLoyaltyCard;
+    boolean viewLoyaltyCard;
+
+    DBHelper db;
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -47,6 +69,13 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
+
+        final Bundle b = getIntent().getExtras();
+        loyaltyCardId = b != null ? b.getInt("id") : 0;
+        updateLoyaltyCard = b != null && b.getBoolean("update", false);
+        viewLoyaltyCard = b != null && b.getBoolean("view", false);
+
+        db = new DBHelper(this);
     }
 
     @Override
@@ -54,11 +83,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     {
         super.onResume();
 
-        final Bundle b = getIntent().getExtras();
-        final int loyaltyCardId = b != null ? b.getInt("id") : 0;
-        final boolean updateLoyaltyCard = b != null && b.getBoolean("update", false);
-        final boolean viewLoyaltyCard = b != null && b.getBoolean("view", false);
-
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
         if(viewLoyaltyCard)
@@ -75,25 +99,21 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             }
         }
 
-        final EditText storeFieldEdit = (EditText) findViewById(R.id.storeNameEdit);
-        final TextView storeFieldView = (TextView) findViewById(R.id.storeNameView);
-        final EditText noteFieldEdit = (EditText) findViewById(R.id.noteEdit);
-        final TextView noteFieldView = (TextView) findViewById(R.id.noteView);
-        final EditText cardIdFieldEdit = (EditText) findViewById(R.id.cardIdEdit);
-        final TextView cardIdFieldView = (TextView) findViewById(R.id.cardIdView);
-        final EditText barcodeTypeField = (EditText) findViewById(R.id.barcodeType);
-        final ImageView barcodeImage = (ImageView) findViewById(R.id.barcode);
-        final View barcodeIdLayout = findViewById(R.id.barcodeIdLayout);
-        final View barcodeTypeLayout = findViewById(R.id.barcodeTypeLayout);
-        final View barcodeImageLayout = findViewById(R.id.barcodeLayout);
-        final View barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
+        storeFieldEdit = (EditText) findViewById(R.id.storeNameEdit);
+        storeFieldView = (TextView) findViewById(R.id.storeNameView);
+        noteFieldEdit = (EditText) findViewById(R.id.noteEdit);
+        noteFieldView = (TextView) findViewById(R.id.noteView);
+        cardIdFieldEdit = (EditText) findViewById(R.id.cardIdEdit);
+        cardIdFieldView = (TextView) findViewById(R.id.cardIdView);
+        barcodeTypeField = (EditText) findViewById(R.id.barcodeType);
+        barcodeImage = (ImageView) findViewById(R.id.barcode);
+        barcodeIdLayout = findViewById(R.id.barcodeIdLayout);
+        barcodeTypeLayout = findViewById(R.id.barcodeTypeLayout);
+        barcodeImageLayout = findViewById(R.id.barcodeLayout);
+        barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
 
-        final Button captureButton = (Button) findViewById(R.id.captureButton);
-        final Button enterButton = (Button) findViewById(R.id.enterButton);
-        final Button saveButton = (Button) findViewById(R.id.saveButton);
-        final Button cancelButton = (Button) findViewById(R.id.cancelButton);
-
-        final DBHelper db = new DBHelper(this);
+        captureButton = (Button) findViewById(R.id.captureButton);
+        enterButton = (Button) findViewById(R.id.enterButton);
 
         if(updateLoyaltyCard || viewLoyaltyCard)
         {
@@ -134,8 +154,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             {
                 barcodeCaptureLayout.setVisibility(View.GONE);
                 captureButton.setVisibility(View.GONE);
-                saveButton.setVisibility(View.GONE);
-                cancelButton.setVisibility(View.GONE);
                 setTitle(R.string.viewCardTitle);
 
                 storeFieldEdit.setVisibility(View.GONE);
@@ -243,51 +261,38 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         {
             enterButton.setText(R.string.enterCard);
         }
+    }
 
-        saveButton.setOnClickListener(new View.OnClickListener()
+    private void doSave()
+    {
+        String store = storeFieldEdit.getText().toString();
+        String note = noteFieldEdit.getText().toString();
+        String cardId = cardIdFieldEdit.getText().toString();
+        String barcodeType = barcodeTypeField.getText().toString();
+
+        if(store.isEmpty())
         {
-            @Override
-            public void onClick(final View v)
-            {
-                String store = storeFieldEdit.getText().toString();
-                String note = noteFieldEdit.getText().toString();
-                String cardId = cardIdFieldEdit.getText().toString();
-                String barcodeType = barcodeTypeField.getText().toString();
+            Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
+            return;
+        }
 
-                if(store.isEmpty())
-                {
-                    Snackbar.make(v, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
-                    return;
-                }
-
-                if(cardId.isEmpty() || barcodeType.isEmpty())
-                {
-                    Snackbar.make(v, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
-                    return;
-                }
-
-                if(updateLoyaltyCard)
-                {
-                    db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType);
-                    Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
-                }
-                else
-                {
-                    db.insertLoyaltyCard(store, note, cardId, barcodeType);
-                }
-
-                finish();
-            }
-        });
-
-        cancelButton.setOnClickListener(new View.OnClickListener()
+        if(cardId.isEmpty() || barcodeType.isEmpty())
         {
-            @Override
-            public void onClick(View v)
-            {
-                finish();
-            }
-        });
+            Snackbar.make(cardIdFieldEdit, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
+            return;
+        }
+
+        if(updateLoyaltyCard)
+        {
+            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType);
+            Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
+        }
+        else
+        {
+            db.insertLoyaltyCard(store, note, cardId, barcodeType);
+        }
+
+        finish();
     }
 
     @Override
@@ -361,6 +366,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 startActivity(intent);
                 finish();
                 return true;
+
+            case R.id.action_save:
+                doSave();
+                return true;
         }
 
         return super.onOptionsItemSelected(item);
diff --git a/app/src/main/res/drawable-hdpi/save_24dp.png b/app/src/main/res/drawable-hdpi/save_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..703c4c1543ee9cdda1f49ab3b31dd1189457bbb7
GIT binary patch
literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00006VoOIv0RI60
z0RN!9r;`8x0lY~>K~z|U?UylY6hRn<pEo%p1ak^DVq+D8g@qQ9A`l6}kwV0OA?6RH
zh@iD;?hm9B3yXskDI%5@f;O>9Ix$U15CuUZhP)|m!F95?JKXFh3imX-^L-!lJ<JTl
zE{qtFhQfgD$G|<{v!rF)6Tr)$?7gH_+t-0^MUSVFwrxMj=G_8bNcvT2XS?G+e8^&x
zK20yn%@pK9=CazgTx`Sk#Uh8XV0^REx*isRUXfHNbZQG5WD$5321B8<=8^3i`M`M#
z0bI%t{sp1G7ztI;il{jR?gz2`?73Tz3;9%+P#ZwfG4QsiK+?}axdJYy3QgPIpuY;K
zw1J1ILeRgw&XoV|Q14LBmgTt(Tpg4w6WRrCN%~!<jqN+Y$3gkBE!(SGCgV$4GUgt_
z_6jhcAYout(q>g*ln}54TuTsw{t>86r~}L<$Q%LdF@;e=lD6o73pY;e8EOGj34JW-
zdu>9%JK*l{K4ANqq~}$2u{U+~FH22x#IDdhaAkNGjwJnvDU3bT2EHW-MN=j;WBW}5
zJuj3cL!pD*dz<R7!Bh-<EfabTJOCDe@rGp%fv%*zhWm_YmJ>}wy3XW$ZPx$*002ov
JPDHLkV1oZ5<R$<B

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/save_24dp.png b/app/src/main/res/drawable-mdpi/save_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..875b74a185caa9769f0e8a172c303d1c0231ca5b
GIT binary patch
literal 406
zcmV;H0crk;P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0ZU0lK~zYI)s#O=!$25^pSKmN87eN~B7z|JXK)d57Ig3%I5;?n;3DGe
z<l-i}xmt7-!PU(#;OGaiItblu)t^I>a>gXRD-`sB<L=(O{GPi&0{<OzCz2+Bwwbjg
zO*%_2zz8swlko~fK;6uq3r&)C6>}n~rk_kn+E+falJ=7ErKGBxTXDuKfw#|N3uw5K
zO3CJa*-YBN1OVfM7IYaZsDA-Z&b$M(GPRWVP(fs79bhg~ZzSy(lA;j7j-&<RTllgZ
zA{Yi%1Hwzm6EuMfpdFYs3LFq0uvBnmX2*fy07zN_)_Ms(lg&54qG$HCnH{Ci_7bE#
z0B@dx$D)Noftj6phL=((kaPyjd*<Ak*?HbV*{|ZmGaTYCJ(sdqbQmBg#1$y%w<WFj
znKzU4-M@e<xCJ(V8Zhk{SOw~tS`)bM^MHSlZ#9pHgi=-D&;S4c07*qoM6N<$g0nfV
A(EtDd

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/save_24dp.png b/app/src/main/res/drawable-xhdpi/save_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..10f1eaf17a83d1bf993f07e82de057deea38c314
GIT binary patch
literal 651
zcmV;60(AX}P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x0zgSbK~!jg?U^xa6hRn<pD!k0p+XQ07!a`$lr%PqK_p<IRvP>PVrAn`
zP(%c=5%C9zO)RVwL}Ov0tq2k=v`S%+sHcJ;!kzK8xIJ@TX7A=3Z||~XA2>K>=be4u
zo7r!7Z=j;0qSRR40ZEg<USI@xW@ZgZn}CBkk~e1dJ<}clHb;7RYi3_F-63ELumrp_
zGewTE#{6YTzqQJE*1k>o9BtDtcIns2sW#n0Tl*tPTYGsO37FpnT%ybD42ToJ<6a@w
z1OWCheDf`)=@B9nV7-`cF%8V;g$M;$j~oWBg$|S@0KoB3W0?X3%W|0l1gQcHo6-ju
zb@p!n_j8Wb+P*&lCL+iD;Pmhht^j8C6F42w?|iZ&C$URtXQ3_tNn^kcuP$~5?n$}}
z{PLc_!3^=s?k}+c_5oMDgAanzSE14e@Km8X@S`Xr9gHU{CCvn0`>tf~!vjImgrrv;
z9+pCVW0%k^Gh6AS$F7*!M_?|dZ)|`@x}9XA&gp%WK+-YbT#B{_HQ=I|eesA=Oxyt`
z6Lc}uX#OJ-O-dPkk)VlT1$gNdrOdz?U_UUHpzX#dGkfn9xdUX?Xu+#1iVbxq20+qo
zV3z(bp=Dss%v?{rDc8V5n%6)PYzJ<51Sw0Xo}ejg?35WenSJ_wBl`?I@QPBZ&@yn_
zt1F5PQ-y9yDst_In2PBX3J@}S_P?z3hu{wwT0*aZZ^e2^;(4esxEmws2ymU|F6FRy
lZ0f*M;6iIRv!bG6l|P~^3>Tjg6CD5m002ovPDHLkV1hW>8F&By

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/save_24dp.png b/app/src/main/res/drawable-xxhdpi/save_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..10bd566ce428168c0c3d457c58c6f047bf5e8854
GIT binary patch
literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv0RI60
z0RN!9r;`8x0}4q*K~#90?VG!66j2n1zmtT3h}gswY9i4_d=v?yY2pj)RFo8UD`F=I
zVxuUig__nv1*@n5{{jm^L82g9q=*lQB8n)8s6<gx=<2c972^`-&fYoM*~j@{i`}{B
zH+R3Cd*{yX4mghEIF94ACX%L+sxAZifd%E4UWv%WtnHn^-V{*}MdZz_x~0HS`tHuj
zq=-z-%IpHR{e23&1RjgX?~MDI8&y54szv>uD-~_JG#!PCy4@-3k~m(GIW$L`aaHY!
zdH-zzIR)S(&>j<BM{EYhRkgR;!bCwpA+WuX=mYMnYF{-)AwjF+`%{<n0(Yu8l0t$~
zP2vs4O5k4FBPk@PSy@5pNLn6h*s6k{bR><bYT_tqWkCR2fi+1DT3ryp>ZFY>2s)BB
zx}X3qD1ZwJ;DQ3Upa3o?fC~zcxCW?#8DJzuyC)UTU!<%{;z7pxL`(#U$P92IqHZdt
zu9n0Ov3mZ7(RA8~4I2nu1?R{{%dprX)(?!T>Sf@QVSlpF32X;WS%zkrgZ7snO^u)C
z1Gu07E+~Kt3gChQWI2ny1Fiz!ZMrfqv;%{{uGoNBK_7t)BJv@2$F)RNF9C;QYGa4k
ztwxbkW;C`iR?xTD9p*&zG~knT0ITnVP}MeIAF!VM#7_e^MC7eipqU`x0&v(cFP5XK
zx>iI?E}|_z>0!gHEOY}~timh>O&Vrpp$I&+3bPzy2Z8gzI`aGD)mPx6h&;CnG!rBu
z?|}nWdG&&y<^#B(04^wi<s^-&E~fO?;k+j4FO+VRP^&=8mGm$$#=rYH^5Ukd?h%n+
z7Gah{Y=r#f0PF;IScO>%`e~Szl^<3?mV%B@x>(GcYrtKrFw2GFZB^|CddP2*o)!_)
z56Sc_CL%@PwPj}B_&O+n3kncB#0FILm}yVumnE@<v4RH6kESOy#2W3_ix?8$V@S{=
z!;aJ=MPMSSK}gUU;Imb4>X37xA3%c(y7Fy{r-4ntLZgn=iVk2=#cM_2889j$*K6M;
f$8j9TsTF?!Sl~8kizc&e00000NkvXXu0mjfpNWGk

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/save_24dp.png b/app/src/main/res/drawable-xxxhdpi/save_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..19ed7e10443c33a5983bc0c8659b7f775b8537df
GIT binary patch
literal 1060
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE)4%caKYZ?lNlJ8Z+f~o
zhE&XXd)IqKXsO8YkMCD$M@;!XD<Y9!dsc*kQ;3V8@1o-i8kyO(ObaJ8s|h}IkrEN<
zc%rh&Gh>2+%LEexUR5q50VxeZ*JcF{uDnOSlc&`2`Z?aP{B-~Mn*a54kN@I1f46$=
z|GWE(&(+QO+b|`_OLHlhNL%xoXVNvMe&*GBzb{*-l|9>(xt@96`x}qAjjb;(f3No7
zTi;f%IcA#=*Z#6)Ui16BcRkbc#>Z)8D-T($^SLx<$=ykMtM>2yb*A`qL+1LF=MDdk
zx2*_G`rlB;&gS#Kcgfed(_dHdU4F+D$MS5?EdLdy2hu0K`>qit(opsOow$vZUnlE>
z4tI{F^BdF~R=ek#rN%gE@IE*eILl|_L}v}&1)r~7;)!JF^QtPCF?08tmdgpB52zn*
znZWpCCOe<^uJxyVBpcSVKA5ni^^&9!Lw$C`+oi(k45c<vR*7r@$4_12G;T<cblAY7
z5Wyy(!^|;_k>xZ)Q!2wjBbe}8V;Ql==T_%Fe{HxP&;G5~WY)jB6#<(gt}>i?!~ei`
zd6c{DtDf0^xVWB49^g72^*CXltMGY-d1Y%vy)N+{aMrD=WZMvYY4aqtUsqf`%NgV^
zJ#?QMSfRJ(>4Cb0^-Jc<zTUQF&b|CyXRlOjk7NGx-sk0&_&iotG)JtRyUe&j>uTSo
zCa!SKO12N;AGkIgKT}t}##&58m)VRd|M8CLZzK=M8CRd(crU_mbN2y9&*=^PdtOzo
zW4>3u#`K&W)43|q&pZ#pk4GiHp1=Bu_}*7f!va9wo}B!B(mGbTW#znAckE`UNln|o
zB_qt1!Lyv%y}>&Bd(jq^%*``vV|E92uU~N2=h`9m9dZ@nL0@khZ{bLAZk97$!<M)D
z?h;pq<x*c(BntjmSvFaWagR%L{gIoM3DMow$)WL_vu|#n^o~`IId9$F^9O}K?3`&@
zdD-M9kLl*k2NsI$Rr7t<f#P4W<4w;RWDkfvSa$2LjLt>tvag$F{teq5*?snc?19z1
zzbYa*bC~m3=dHTC=4kkZX>7Jx6+xF?-SUlMx$w{Jx}8h&#_b#l`9P=1%;_p^n7LQ=
zrObw@Cx5!W34YKkb~Z|u`<DCM>>BmBckGC`o~QlLUFGbNmz`hMv6McPJivH7%2;`S
zQ`1zof_1Mnmid4Dq{aK-$pq$^p+`@zesR-a5|0I=jlr9av=fyN<cxoBOnJ1(zhNfl
z4VD`FLkH3hvL<A|Jk;Lj?;iC2=7ifX?@DLz{tVe$uge(Elt1fc`Nd{WNapI@zMpZ?
X(J9U%w{=T_*`C4E)z4*}Q$iB}ws-3c

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/loyalty_card_view_activity.xml b/app/src/main/res/layout/loyalty_card_view_activity.xml
index aeead6893..b3be08796 100644
--- a/app/src/main/res/layout/loyalty_card_view_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_view_activity.xml
@@ -155,22 +155,6 @@
                             android:text="@string/enterCard"
                             android:layout_weight="1.0"/>
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:baselineAligned="true">
-                <Button android:id="@+id/cancelButton"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/cancel"
-                        android:layout_weight="1.0" />
-                <Button android:id="@+id/saveButton"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/save"
-                        android:layout_weight="1.0" />
-            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/menu/card_update_menu.xml b/app/src/main/res/menu/card_update_menu.xml
index 77de03d76..9d9a207e8 100644
--- a/app/src/main/res/menu/card_update_menu.xml
+++ b/app/src/main/res/menu/card_update_menu.xml
@@ -2,9 +2,15 @@
 <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="always"/>
+        app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 286444909..2215852d8 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -105,15 +105,13 @@ public class LoyaltyCardViewActivityTest
         final EditText cardIdField = (EditText) activity.findViewById(R.id.cardIdEdit);
         final EditText barcodeTypeField = (EditText) activity.findViewById(R.id.barcodeType);
 
-        final Button saveButton = (Button) activity.findViewById(R.id.saveButton);
-
         storeField.setText(store);
         noteField.setText(note);
         cardIdField.setText(cardId);
         barcodeTypeField.setText(barcodeType);
 
         assertEquals(false, activity.isFinishing());
-        saveButton.performClick();
+        shadowOf(activity).clickMenuItem(R.id.action_save);
         assertEquals(true, activity.isFinishing());
 
         assertEquals(1, db.getLoyaltyCardCount());
@@ -191,8 +189,6 @@ public class LoyaltyCardViewActivityTest
         checkFieldProperties(activity, R.id.cardIdView, viewVisibility, cardId);
         checkFieldProperties(activity, R.id.barcodeType, View.VISIBLE, barcodeType);
         checkFieldProperties(activity, R.id.captureButton, captureVisibility, null);
-        checkFieldProperties(activity, R.id.saveButton, captureVisibility, null);
-        checkFieldProperties(activity, R.id.cancelButton, captureVisibility, null);
         checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
 
         checkFieldProperties(activity, R.id.barcodeIdLayout, cardIdVisibility, null);
@@ -222,6 +218,7 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         Activity activity = (Activity)activityController.get();
+        ShadowActivity shadowActivity = shadowOf(activity);
         DBHelper db = new DBHelper(activity);
         assertEquals(0, db.getLoyaltyCardCount());
 
@@ -229,26 +226,24 @@ public class LoyaltyCardViewActivityTest
         final EditText noteField = (EditText) activity.findViewById(R.id.noteEdit);
         final EditText cardIdField = (EditText) activity.findViewById(R.id.cardIdEdit);
 
-        final Button saveButton = (Button) activity.findViewById(R.id.saveButton);
-
-        saveButton.performClick();
+        shadowActivity.clickMenuItem(R.id.action_save);
         assertEquals(0, db.getLoyaltyCardCount());
 
         storeField.setText("store");
-        saveButton.performClick();
+        shadowActivity.clickMenuItem(R.id.action_save);
         assertEquals(0, db.getLoyaltyCardCount());
 
         noteField.setText("note");
-        saveButton.performClick();
+        shadowActivity.clickMenuItem(R.id.action_save);
         assertEquals(0, db.getLoyaltyCardCount());
 
         cardIdField.setText("cardId");
-        saveButton.performClick();
+        shadowActivity.clickMenuItem(R.id.action_save);
         assertEquals(0, db.getLoyaltyCardCount());
     }
 
     @Test
-    public void startWithoutParametersCancel()
+    public void startWithoutParametersBack()
     {
         ActivityController activityController = Robolectric.buildActivity(LoyaltyCardViewActivity.class).create();
         activityController.start();
@@ -257,10 +252,8 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
 
-        final Button cancelButton = (Button) activity.findViewById(R.id.cancelButton);
-
         assertEquals(false, activity.isFinishing());
-        cancelButton.performClick();
+        shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
     }
 
@@ -323,9 +316,8 @@ public class LoyaltyCardViewActivityTest
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", BARCODE_DATA, BARCODE_TYPE);
 
         // Cancel the gift card creation
-        final Button cancelButton = (Button) activity.findViewById(R.id.cancelButton);
         assertEquals(false, activity.isFinishing());
-        cancelButton.performClick();
+        shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
     }
 
@@ -422,10 +414,9 @@ public class LoyaltyCardViewActivityTest
 
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
 
-        // Cancel the gift card creation
-        final Button cancelButton = (Button) activity.findViewById(R.id.cancelButton);
+        // Cancel the loyalty card creation
         assertEquals(false, activity.isFinishing());
-        cancelButton.performClick();
+        shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
     }
 }