mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-21 05:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Introduce a fallback text when a group is empty (#347)

Browse Source
This commit is contained in:
waffshappen
2021-08-25 20:57:22 +00:00
committed by GitHub
parent e6bf60d457
commit ca37e2aa84
4 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/protect/card_locker/MainActivity.java
View File

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

9
app/src/main/res/layout/content_main.xml
View File

@@ -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"

3
app/src/main/res/values-de/strings.xml
View File

@@ -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>
</resources>

1
app/src/main/res/values/strings.xml
View File

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