From 5a3f7c17edb218aa656b35947b0bc2e0a220a1ae Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Fri, 26 Dec 2025 12:02:19 +0100
Subject: [PATCH] Apply column count setting in group edit activity

---
 .../main/java/protect/card_locker/MainActivity.kt    |  1 +
 .../java/protect/card_locker/ManageGroupActivity.kt  | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/protect/card_locker/MainActivity.kt b/app/src/main/java/protect/card_locker/MainActivity.kt
index 05aef1cf1..23471b964 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.kt
+++ b/app/src/main/java/protect/card_locker/MainActivity.kt
@@ -390,6 +390,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
         }
         binding.fabAdd.bringToFront()
 
+        // Apply column count setting to card list
         val layoutManager = contentMainBinding.list.layoutManager as GridLayoutManager?
         if (layoutManager != null) {
             val settings = Settings(this)
diff --git a/app/src/main/java/protect/card_locker/ManageGroupActivity.kt b/app/src/main/java/protect/card_locker/ManageGroupActivity.kt
index 3d2ad3bcf..9c5c35426 100644
--- a/app/src/main/java/protect/card_locker/ManageGroupActivity.kt
+++ b/app/src/main/java/protect/card_locker/ManageGroupActivity.kt
@@ -12,10 +12,12 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.core.widget.doAfterTextChanged
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
 import protect.card_locker.databinding.ActivityManageGroupBinding
+import protect.card_locker.preferences.Settings
 
 class ManageGroupActivity : CatimaAppCompatActivity(), CardAdapterListener {
     private lateinit var binding: ActivityManageGroupBinding
@@ -132,7 +134,15 @@ class ManageGroupActivity : CatimaAppCompatActivity(), CardAdapterListener {
                 override fun handleOnBackPressed() {
                     leaveWithoutSaving()
                 }
-            })
+            }
+        )
+
+        // Apply column count setting to card list
+        val layoutManager = mCardList.layoutManager as GridLayoutManager?
+        if (layoutManager != null) {
+            val settings = Settings(this)
+            layoutManager.setSpanCount(settings.getPreferredColumnCount())
+        }
     }
 
     private fun adapterStateToBundle(adapterState: HashMap<Int, Boolean>): Bundle {