More consistant naming and column edge case bugfix for shortcut picker

CatimaLoyalty · Nov 2, 2024 · d7b8cd7 · d7b8cd7
1 parent 61681bd
commit d7b8cd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -13,22 +13,22 @@
 import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import protect.card_locker.databinding.SimpleToolbarListActivityBinding;
+import protect.card_locker.databinding.CardShortcutConfigureActivityBinding;
 import protect.card_locker.preferences.Settings;
 
 /**
  * The configuration screen for creating a shortcut.
  */
 public class CardShortcutConfigure extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
-    private SimpleToolbarListActivityBinding binding;
+    private CardShortcutConfigureActivityBinding binding;
     static final String TAG = "Catima";
     private SQLiteDatabase mDatabase;
     private LoyaltyCardCursorAdapter mAdapter;
 
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        binding = SimpleToolbarListActivityBinding.inflate(getLayoutInflater());
+        binding = CardShortcutConfigureActivityBinding.inflate(getLayoutInflater());
         mDatabase = new DBHelper(this).getReadableDatabase();
 
         // Set the result to CANCELED.  This will cause nothing to happen if the

diff --git a/...s/layout/simple_toolbar_list_activity.xml → ...yout/card_shortcut_configure_activity.xml b/...s/layout/simple_toolbar_list_activity.xml → ...yout/card_shortcut_configure_activity.xml
@@ -27,7 +27,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/list"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="1"
+            app:spanCount="@integer/main_view_card_columns"
             android:layout_height="match_parent"
             android:layout_width="match_parent" />
     </RelativeLayout>