From ca37e2aa84ee187f19c85158ea6cb2076574bfd4 Mon Sep 17 00:00:00 2001
From: waffshappen <44290023+waffshappen@users.noreply.github.com>
Date: Wed, 25 Aug 2021 20:57:22 +0000
Subject: [PATCH] Introduce a fallback text when a group is empty (#347)

---
 .../java/protect/card_locker/MainActivity.java   | 16 ++++++++++++++--
 app/src/main/res/layout/content_main.xml         |  9 +++++++++
 app/src/main/res/values-de/strings.xml           |  3 ++-
 app/src/main/res/values/strings.xml              |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index eecf007da..1ca019384 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -49,6 +49,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private RecyclerView mCardList;
     private View mHelpText;
     private View mNoMatchingCardsText;
+    private View mNoGroupCardsText;
 
     private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
     {
@@ -222,6 +223,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         mHelpText = findViewById(R.id.helpText);
         mNoMatchingCardsText = findViewById(R.id.noMatchingCardsText);
+        mNoGroupCardsText = findViewById(R.id.noGroupCardsText);
         mCardList = findViewById(R.id.list);
 
         mHelpText.setOnTouchListener(gestureTouchListener);
@@ -406,13 +408,22 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             // the keyboard
             mCardList.setVisibility(View.VISIBLE);
             mHelpText.setVisibility(View.GONE);
+            mNoGroupCardsText.setVisibility(View.GONE);
             if(mAdapter.getItemCount() > 0)
             {
                 mNoMatchingCardsText.setVisibility(View.GONE);
             }
             else
             {
-                mNoMatchingCardsText.setVisibility(View.VISIBLE);
+                if(!filterText.isEmpty()) {
+                    // Actual Empty Search Result
+                    mNoMatchingCardsText.setVisibility(View.VISIBLE);
+                    mNoGroupCardsText.setVisibility(View.GONE);
+                } else {
+                    // Group Tab with no Group Cards
+                    mNoMatchingCardsText.setVisibility(View.GONE);
+                    mNoGroupCardsText.setVisibility(View.VISIBLE);
+                }
             }
         }
         else
@@ -420,6 +431,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             mCardList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
             mNoMatchingCardsText.setVisibility(View.GONE);
+            mNoGroupCardsText.setVisibility(View.GONE);
         }
 
         if (mCurrentActionMode != null) {
@@ -703,4 +715,4 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             startActivityForResult(i, Utils.MAIN_REQUEST);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 0384a349a..e580804bc 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -26,6 +26,15 @@
         android:gravity="center"
         android:text="@string/noMatchingGiftCards"
         android:visibility="gone"/>
+    
+    <TextView
+        style="@style/AppTheme.TextView.NoData"
+        android:id="@+id/noGroupCardsText"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/noGroupCards"
+        android:visibility="gone"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0f3911fa0..5cc7b0c16 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -77,6 +77,7 @@
     <string name="deleteConfirmationGroup">Gruppe löschen\?</string>
     <string name="all">Alle</string>
     <string name="noGroups">Klicken Sie auf das Pluszeichen +, um zunächst Gruppen zur Kategorisierung hinzuzufügen.</string>
+    <string name="noGroupCards">Diese Gruppe hat noch keine Karten</string>
     <string name="groups">Gruppen</string>
     <string name="enter_group_name">Geben Sie den Gruppennamen ein</string>
     <string name="leaveWithoutSaveConfirmation">Beenden ohne zu speichern\?</string>
@@ -187,4 +188,4 @@
     <string name="settings_pink_theme">Rosa</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_theme_color">Designfarbe</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcfa001e2..dae6f959e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -138,6 +138,7 @@
     <string name="enter_group_name">Enter group name</string>
     <string name="groups">Groups</string>
     <string name="noGroups">Click the + plus button to add groups for categorization first.</string>
+    <string name="noGroupCards">This group does not contain any cards</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> card</item>
         <item quantity="other"><xliff:g>%d</xliff:g> cards</item>