feat: 장부 카테고리 그룹핑 제거

YAPP-Github · Jan 31, 2024 · e759b4c · e759b4c
1 parent d638626
commit e759b4c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 112 deletions.
diff --git a/feature/received/src/main/java/com/susu/feature/received/received/ReceivedScreen.kt b/feature/received/src/main/java/com/susu/feature/received/received/ReceivedScreen.kt
@@ -57,7 +57,6 @@ import com.susu.feature.received.R
 import com.susu.feature.received.navigation.argument.FilterArgument
 import com.susu.feature.received.received.component.LedgerAddCard
 import com.susu.feature.received.received.component.LedgerCard
-import com.susu.feature.received.received.component.LedgerCategoryCard
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.android.awaitFrame
 import kotlinx.coroutines.launch
@@ -236,49 +235,24 @@ fun ReceiveScreen(
                     verticalArrangement = Arrangement.spacedBy(SusuTheme.spacing.spacing_xxs),
                     horizontalArrangement = Arrangement.spacedBy(SusuTheme.spacing.spacing_xxs),
                 ) {
-                    if (uiState.isFiltered) {
-                        uiState.ledgerList.groupBy { it.category }.forEach { (category, ledgerList) ->
-                            item(
-                                span = { GridItemSpan(2) },
-                                contentType = "LedgerCategoryCard",
-                            ) {
-                                LedgerCategoryCard(name = category.name)
-                            }
-
-                            items(
-                                items = ledgerList,
-                                key = { it.id },
-                            ) { ledger ->
-                                LedgerCard(
-                                    ledgerType = ledger.category.name,
-                                    title = ledger.title,
-                                    money = ledger.totalAmounts,
-                                    count = ledger.totalCounts,
-                                    style = ledger.category.style,
-                                    onClick = { onClickLedgerCard(ledger) },
-                                )
-                            }
-                        }
-                    } else {
-                        items(
-                            items = uiState.ledgerList,
-                            key = { it.id },
-                        ) { ledger ->
-                            LedgerCard(
-                                ledgerType = ledger.category.name,
-                                title = ledger.title,
-                                money = ledger.totalAmounts,
-                                count = ledger.totalCounts,
-                                style = ledger.category.style,
-                                onClick = { onClickLedgerCard(ledger) },
-                            )
-                        }
+                    items(
+                        items = uiState.ledgerList,
+                        key = { it.id },
+                    ) { ledger ->
+                        LedgerCard(
+                            ledgerType = ledger.category.name,
+                            title = ledger.title,
+                            money = ledger.totalAmounts,
+                            count = ledger.totalCounts,
+                            style = ledger.category.style,
+                            onClick = { onClickLedgerCard(ledger) },
+                        )
+                    }
 
-                        item {
-                            LedgerAddCard(
-                                onClick = onClickLedgerAddCard,
-                            )
-                        }
+                    item {
+                        LedgerAddCard(
+                            onClick = onClickLedgerAddCard,
+                        )
                     }
                 }
             }

diff --git a/...received/src/main/java/com/susu/feature/received/received/component/LedgerCategoryCard.kt b/...received/src/main/java/com/susu/feature/received/received/component/LedgerCategoryCard.kt