From 8880e35a7a07158dbf6ee62bd08717caabb4d3bb Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 25 Oct 2020 18:14:35 +0100
Subject: [PATCH] Fix some merge issues

---
 app/src/main/res/menu/card_view_menu.xml                   | 5 -----
 .../protect/card_locker/LoyaltyCardViewActivityTest.java   | 7 +++----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/menu/card_view_menu.xml b/app/src/main/res/menu/card_view_menu.xml
index 197a427a2..8ec7cea6c 100644
--- a/app/src/main/res/menu/card_view_menu.xml
+++ b/app/src/main/res/menu/card_view_menu.xml
@@ -12,11 +12,6 @@
         android:icon="@drawable/ic_share_white"
         android:title="@string/share"
         app:showAsAction="always"/>
-    <item
-        android:id="@+id/action_edit"
-        android:icon="@drawable/ic_mode_edit_white_24dp"
-        android:title="@string/edit"
-        app:showAsAction="always"/>
     <item
         android:id="@+id/action_star_unstar"
         android:icon="@drawable/ic_unstarred_white"
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 05041685f..f03252df2 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -489,11 +489,10 @@ public class LoyaltyCardViewActivityTest
         assertTrue(menu != null);
 
         // The share, settings, add and star button should be present
-        assertEquals(menu.size(), 4);
+        assertEquals(menu.size(), 3);
 
         assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
         assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
-        assertEquals("Edit", menu.findItem(R.id.action_edit).getTitle().toString());
         assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
     }
 
@@ -708,8 +707,8 @@ public class LoyaltyCardViewActivityTest
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The share, settings, add and star button should be present
-        assertEquals(menu.size(), 4);
+        // The share, settings and star button should be present
+        assertEquals(menu.size(), 3);
 
         assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());