From c5f0d03a1cae7336f5904460559b5ed2863aa1ca Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Thu, 18 Nov 2021 16:20:00 +0100
Subject: [PATCH] Add button to toggle showing details on main screen

---
 .../card_locker/LoyaltyCardCursorAdapter.java    | 16 +++++++++++++---
 .../java/protect/card_locker/MainActivity.java   | 16 ++++++++++++++++
 .../res/drawable/ic_baseline_unfold_less_24.xml  |  5 +++++
 .../res/drawable/ic_baseline_unfold_more_24.xml  |  5 +++++
 app/src/main/res/menu/main_menu.xml              |  5 +++++
 app/src/main/res/values/strings.xml              |  2 ++
 .../protect/card_locker/MainActivityTest.java    |  3 ++-
 7 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_unfold_less_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_unfold_more_24.xml

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
index 5dc4673c6..c5a05ff6d 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -38,6 +38,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     protected SparseBooleanArray mSelectedItems;
     protected SparseBooleanArray mAnimationItemsIndex;
     private boolean mReverseAllAnimations = false;
+    private boolean mShowDetails = true;
 
     public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
         super(inputCursor);
@@ -59,6 +60,15 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         mCursor = inputCursor;
     }
 
+    public void showDetails(boolean show) {
+        mShowDetails = show;
+        notifyDataSetChanged();
+    }
+
+    public boolean showingDetails() {
+        return mShowDetails;
+    }
+
     @Override
     public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType) {
         View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.loyalty_card_layout, inputParent, false);
@@ -83,7 +93,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
         inputHolder.mStoreField.setText(loyaltyCard.store);
         inputHolder.mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
-        if (!loyaltyCard.note.isEmpty()) {
+        if (mShowDetails && !loyaltyCard.note.isEmpty()) {
             inputHolder.mNoteField.setVisibility(View.VISIBLE);
             inputHolder.mNoteField.setText(loyaltyCard.note);
             inputHolder.mNoteField.setTextSize(size);
@@ -91,7 +101,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             inputHolder.mNoteField.setVisibility(View.GONE);
         }
 
-        if (!loyaltyCard.balance.equals(new BigDecimal("0"))) {
+        if (mShowDetails && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
             int drawableSize = dpToPx((size * 24) / 14, mContext);
             inputHolder.mDivider.setVisibility(View.VISIBLE);
             inputHolder.mBalanceField.setVisibility(View.VISIBLE);
@@ -107,7 +117,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             inputHolder.mBalanceField.setVisibility(View.GONE);
         }
 
-        if (loyaltyCard.expiry != null) {
+        if (mShowDetails && loyaltyCard.expiry != null) {
             int drawableSize = dpToPx((size * 24) / 14, mContext);
             inputHolder.mDivider.setVisibility(View.VISIBLE);
             inputHolder.mExpiryField.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index b4830c0ac..a080699d4 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -485,6 +485,22 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     public boolean onOptionsItemSelected(MenuItem inputItem) {
         int id = inputItem.getItemId();
 
+        if (id == R.id.action_unfold) {
+            boolean shouldShow = !mAdapter.showingDetails();
+
+            if (shouldShow) {
+                inputItem.setIcon(R.drawable.ic_baseline_unfold_less_24);
+                inputItem.setTitle(R.string.action_hide_details);
+            } else {
+                inputItem.setIcon(R.drawable.ic_baseline_unfold_more_24);
+                inputItem.setTitle(R.string.action_show_details);
+            }
+
+            mAdapter.showDetails(shouldShow);
+
+            return true;
+        }
+
         if (id == R.id.action_sort) {
             TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
             AtomicInteger currentIndex = new AtomicInteger();
diff --git a/app/src/main/res/drawable/ic_baseline_unfold_less_24.xml b/app/src/main/res/drawable/ic_baseline_unfold_less_24.xml
new file mode 100644
index 000000000..621f087b7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_unfold_less_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.41,18.59L8.83,20 12,16.83 15.17,20l1.41,-1.41L12,14l-4.59,4.59zM16.59,5.41L15.17,4 12,7.17 8.83,4 7.41,5.41 12,10l4.59,-4.59z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_unfold_more_24.xml b/app/src/main/res/drawable/ic_baseline_unfold_more_24.xml
new file mode 100644
index 000000000..249979c04
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_unfold_more_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,5.83L15.17,9l1.41,-1.41L12,3 7.41,7.59 8.83,9 12,5.83zM12,18.17L8.83,15l-1.41,1.41L12,21l4.59,-4.59L15.17,15 12,18.17z"/>
+</vector>
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index 1706c1a53..d7efa11ba 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -8,6 +8,11 @@
         android:icon="@drawable/ic_search_white"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always|collapseActionView"/>
+    <item
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_sort"
         android:title="@string/sort"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fccad0b0e..2bb4d51c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -253,4 +253,6 @@
     <string name="rate_this_app">Rate this app</string>
     <string name="on_google_play">on Google Play</string>
     <string name="report_error">Report Error</string>
+    <string name="action_show_details">Show details</string>
+    <string name="action_hide_details">Hide details</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/protect/card_locker/MainActivityTest.java b/app/src/test/java/protect/card_locker/MainActivityTest.java
index e05b863d7..b1c539153 100644
--- a/app/src/test/java/protect/card_locker/MainActivityTest.java
+++ b/app/src/test/java/protect/card_locker/MainActivityTest.java
@@ -58,9 +58,10 @@ public class MainActivityTest {
         assertNotNull(menu);
 
         // The settings, import/export, groups, search and add button should be present
-        assertEquals(menu.size(), 6);
+        assertEquals(menu.size(), 7);
         assertEquals("Search", menu.findItem(R.id.action_search).getTitle().toString());
         assertEquals("Sort", menu.findItem(R.id.action_sort).getTitle().toString());
+        assertEquals("Hide details", menu.findItem(R.id.action_unfold).getTitle().toString());
         assertEquals("Groups", menu.findItem(R.id.action_manage_groups).getTitle().toString());
         assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
         assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());