From 8a45222783d9dd7f6aa205994044784a75b23c72 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 12 Dec 2021 19:18:13 +0100
Subject: [PATCH] Simplify card shortcut code

---
 .../card_locker/CardShortcutConfigure.java    | 23 +++---------
 .../layout/simple_toolbar_list_activity.xml   | 35 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  3 +-
 3 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/layout/simple_toolbar_list_activity.xml

diff --git a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
index be9cc84d5..ff39a0680 100644
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -3,17 +3,13 @@ package protect.card_locker;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
 import android.widget.Toast;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 /**
@@ -31,13 +27,9 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         // aback button is pressed.
         setResult(RESULT_CANCELED);
 
-        setContentView(R.layout.main_activity);
+        setContentView(R.layout.simple_toolbar_list_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
-        toolbar.setVisibility(View.GONE);
-
-        // Hide new button because it won't work here anyway
-        FloatingActionButton newFab = findViewById(R.id.fabAdd);
-        newFab.setVisibility(View.GONE);
+        toolbar.setTitle(R.string.shortcutSelectCard);
 
         final DBHelper db = new DBHelper(this);
 
@@ -48,15 +40,10 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         }
 
         final RecyclerView cardList = findViewById(R.id.list);
-
-        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
-        cardList.setLayoutManager(mLayoutManager);
-        cardList.setItemAnimator(new DefaultItemAnimator());
-
-        cardList.setVisibility(View.VISIBLE);
+        GridLayoutManager layoutManager = (GridLayoutManager) cardList.getLayoutManager();
+        layoutManager.setSpanCount(getResources().getInteger(R.integer.main_view_card_columns));
 
         Cursor cardCursor = db.getLoyaltyCardCursor();
-
         final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
         cardList.setAdapter(adapter);
     }
diff --git a/app/src/main/res/layout/simple_toolbar_list_activity.xml b/app/src/main/res/layout/simple_toolbar_list_activity.xml
new file mode 100644
index 000000000..0a29b7c78
--- /dev/null
+++ b/app/src/main/res/layout/simple_toolbar_list_activity.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list"
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="1"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent" />
+    </RelativeLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 307f111d8..d146b3615 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -258,4 +258,5 @@
     <string name="action_show_details">Show details</string>
     <string name="action_hide_details">Hide details</string>
     <string name="translate_platform">on Weblate</string>
-</resources>
\ No newline at end of file
+    <string name="shortcutSelectCard">Select a card</string>
+</resources>