From acf90293944cddc70cb1367ecfea1501338b4775 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 4 Sep 2022 17:14:25 +0200
Subject: [PATCH] Put archive link below card list

---
 .../protect/card_locker/MainActivity.java     | 37 ++++----
 app/src/main/res/layout/content_main.xml      | 95 +++++++++++--------
 app/src/main/res/menu/main_menu.xml           |  4 -
 app/src/main/res/values/strings.xml           |  4 +
 4 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index f5ad96f0f..79064ad1f 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -17,6 +17,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CheckBox;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -67,6 +68,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private View mHelpText;
     private View mNoMatchingCardsText;
     private View mNoGroupCardsText;
+    private TextView mOpenArchiveText;
 
     private boolean mArchiveMode;
     public static final String BUNDLE_ARCHIVE_MODE = "archiveMode";
@@ -285,6 +287,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         mHelpText = findViewById(R.id.helpText);
         mNoMatchingCardsText = findViewById(R.id.noMatchingCardsText);
         mNoGroupCardsText = findViewById(R.id.noGroupCardsText);
+        mOpenArchiveText = findViewById(R.id.openArchiveLinkText);
         mCardList = findViewById(R.id.list);
 
         mHelpText.setOnTouchListener(gestureTouchListener);
@@ -292,6 +295,15 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         mCardList.setOnTouchListener(gestureTouchListener);
         mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
 
+        // Open archive on archive text click
+        mOpenArchiveText.setOnClickListener(view -> {
+            Intent i = new Intent(getApplicationContext(), MainActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putBoolean("archiveMode", true);
+            i.putExtras(bundle);
+            startActivity(i);
+        });
+
         mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
@@ -464,7 +476,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             mHelpText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
 
-            if (mAdapter.getItemCount() > 0) {
+            int archiveCount =
+                    mArchiveMode ? 0 :
+                            group != null ? DBHelper.getArchivedCardsCount(mDatabase, group._id) : DBHelper.getArchivedCardsCount(mDatabase);
+
+            if (mAdapter.getItemCount() + archiveCount > 0) {
                 mCardList.setVisibility(View.VISIBLE);
                 mNoMatchingCardsText.setVisibility(View.GONE);
             } else {
@@ -479,6 +495,9 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     mNoGroupCardsText.setVisibility(View.VISIBLE);
                 }
             }
+
+            mOpenArchiveText.setText(getResources().getQuantityString(R.plurals.viewArchivedCardsWithCount, archiveCount, archiveCount));
+            mOpenArchiveText.setVisibility(archiveCount > 0 ? View.VISIBLE : View.GONE);
         } else {
             mCardList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
@@ -566,13 +585,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
             });
         }
-        if(!mArchiveMode) {
-            if (DBHelper.getArchivedCardsCount(mDatabase) == 0) {
-                inputMenu.findItem(R.id.action_archived).setVisible(false);
-            } else {
-                inputMenu.findItem(R.id.action_archived).setVisible(true);
-            }
-        }
 
         return super.onCreateOptionsMenu(inputMenu);
     }
@@ -658,15 +670,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             return true;
         }
 
-        if(id == R.id.action_archived){
-            Intent i = new Intent(getApplicationContext(), MainActivity.class);
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("archiveMode", true);
-            i.putExtras(bundle);
-            startActivity(i);
-            return true;
-        }
-
 
         return super.onOptionsItemSelected(inputItem);
     }
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 76975f0d5..21bd50ceb 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,50 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="protect.card_locker.MainActivity"
     tools:showIn="@layout/main_activity">
 
-    <TextView
-        style="@style/AppTheme.TextView.NoData"
-        android:id="@+id/helpText"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/noGiftCards"
-        android:visibility="gone"/>
-
-    <TextView
-        style="@style/AppTheme.TextView.NoData"
-        android:id="@+id/noMatchingCardsText"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        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"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="@integer/main_view_card_columns"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="80dp"
-        android:clipToPadding="false"
-        android:scrollbars="vertical"
-        android:visibility="gone"/>
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-</RelativeLayout>
+        <TextView
+            style="@style/AppTheme.TextView.NoData"
+            android:id="@+id/helpText"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/noGiftCards"
+            android:visibility="gone"/>
+
+        <TextView
+            style="@style/AppTheme.TextView.NoData"
+            android:id="@+id/noMatchingCardsText"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/noMatchingGiftCards"
+            android:visibility="gone"/>
+
+        <TextView
+            style="@style/AppTheme.TextView.NoData"
+            android:id="@+id/noGroupCardsText"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/noGroupCards"
+            android:visibility="gone"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list"
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="@integer/main_view_card_columns"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:visibility="gone"/>
+
+        <TextView
+            style="@style/AppTheme.TextView.NoData"
+            android:id="@+id/openArchiveLinkText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:visibility="gone"/>
+
+            <View
+                android:id="@+id/bottomPadding"
+                android:layout_width="match_parent"
+                android:layout_height="80dp" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index a1f1c882e..b0e238a8a 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -26,10 +26,6 @@
         android:icon="@drawable/ic_folder_white"
         android:title="@string/groups"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/action_archived"
-        android:title="@string/archiveList"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3bf587b62..010c80c18 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -293,4 +293,8 @@
     <string name="previousCard">Previous</string>
     <string name="nextCard">Next</string>
     <string name="failedToOpenUrl">Install a web browser first</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">View archive (<xliff:g>%1$d</xliff:g> card)</item>
+        <item quantity="other">View archive (<xliff:g>%1$d</xliff:g> cards)</item>
+    </plurals>
 </resources>