Feature/mz 181 ledger filter

core/designsystem/src/main/java/com/susu/core/designsystem/component/button/FilterButton.kt

@@ -0,0 +1,58 @@
+package com.susu.core.designsystem.component.button
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.susu.core.designsystem.R
+import com.susu.core.designsystem.theme.Gray10
+import com.susu.core.designsystem.theme.SusuTheme
+
+@Composable
+fun FilterButton(
+    isFiltered: Boolean = false,
+    onClickFilterButton: () -> Unit,
+) {
+    if (isFiltered) {
+        SusuFilledButton(
+            color = FilledButtonColor.Black,
+            style = SmallButtonStyle.height32,
+            leftIcon = {
+                Icon(
+                    modifier = Modifier.size(16.dp),
+                    painter = painterResource(id = com.susu.core.ui.R.drawable.ic_filter),
+                    contentDescription = stringResource(R.string.content_description_filter_icon),
+                    tint = Gray10,
+                )
+            },
+            onClick = onClickFilterButton,
+        )
+    } else {
+        SusuGhostButton(
+            color = GhostButtonColor.Black,
+            style = SmallButtonStyle.height32,
+            text = stringResource(com.susu.core.ui.R.string.word_filter),
+            leftIcon = {
+                Icon(
+                    modifier = Modifier.size(16.dp),
+                    painter = painterResource(id = com.susu.core.ui.R.drawable.ic_filter),
+                    contentDescription = stringResource(R.string.content_description_filter_icon),
+                )
+            },
+            onClick = onClickFilterButton,
+        )
+    }
+}
+
+@Preview
+@Composable
+fun FilterButtonPreview() {
+    SusuTheme {
+        FilterButton {
+        }
+    }
+}

core/designsystem/src/main/java/com/susu/core/designsystem/component/button/RefreshButton.kt

@@ -34,7 +34,7 @@ fun RefreshButton(
             .susuClickable(onClick = onClick)
             .padding(SusuTheme.spacing.spacing_xs),
         painter = painterResource(id = R.drawable.ic_refresh),
-        contentDescription = stringResource(R.string.content_description_refresh),
+        contentDescription = stringResource(com.susu.core.ui.R.string.content_description_refresh),
     )
 }
 

core/designsystem/src/main/java/com/susu/core/designsystem/component/button/SelectedFilterButton.kt

@@ -0,0 +1,49 @@
+package com.susu.core.designsystem.component.button
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.susu.core.designsystem.theme.Gray10
+import com.susu.core.designsystem.theme.SusuTheme
+import com.susu.core.ui.extension.susuClickable
+
+@Composable
+fun SelectedFilterButton(
+    color: FilledButtonColor = FilledButtonColor.Orange,
+    style: @Composable () -> ButtonStyle = XSmallButtonStyle.height28,
+    name: String = "",
+    onClickCloseIcon: () -> Unit = {},
+) {
+    SusuFilledButton(
+        color = color,
+        style = style,
+        text = name,
+        isClickable = false,
+        rightIcon = {
+            Icon(
+                modifier = Modifier
+                    .clip(CircleShape)
+                    .size(12.dp)
+                    .susuClickable(onClick = onClickCloseIcon),
+                painter = painterResource(id = com.susu.core.ui.R.drawable.ic_close),
+                contentDescription = stringResource(id = com.susu.core.ui.R.string.content_description_close_icon),
+                tint = Gray10,
+            )
+        },
+    )
+}
+
+@Preview
+@Composable
+fun SelectedFilterButtonPreview() {
+    SusuTheme {
+        SelectedFilterButton()
+    }
+}

core/designsystem/src/main/res/values/strings.xml

@@ -10,5 +10,5 @@
     <string name="content_description_back_icon">뒤로가기 아이콘</string>
     <string name="content_description_logo_image">로고 이미지</string>
     <string name="content_description_notification_icon">알림 아이콘</string>
-    <string name="content_description_refresh">새로고침</string>
+    <string name="content_description_filter_icon">필터 아이콘</string>
 </resources>

core/ui/src/main/java/com/susu/core/ui/extension/Flow.kt

@@ -4,23 +4,20 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.flowWithLifecycle
-import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.collect
 
 @Composable
 inline fun <reified T> Flow<T>.collectWithLifecycle(
-    lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current,
     minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
     noinline action: suspend (T) -> Unit,
 ) {
-    LaunchedEffect(key1 = Unit) {
-        lifecycleOwner.lifecycleScope.launch {
-            flowWithLifecycle(lifecycleOwner.lifecycle, minActiveState).collect {
-                action(it)
-            }
+    val lifecycleOwner = LocalLifecycleOwner.current
+
+    LaunchedEffect(this, lifecycleOwner) {
+        lifecycleOwner.lifecycle.repeatOnLifecycle(minActiveState) {
+            [email protected] { action(it) }
         }
     }
 }

core/ui/src/main/java/com/susu/core/ui/extension/LazyGridState.kt

@@ -14,6 +14,7 @@ fun LazyGridState.OnBottomReached(
     // tells how many items before we reach the bottom of the list
     // to call onLoadMore function
     buffer: Int = 0,
+    minItemsCount: Int = 0,
     onLoadMore: () -> Unit,
 ) {
     // Buffer must be positive.
@@ -23,6 +24,7 @@ fun LazyGridState.OnBottomReached(
     val shouldLoadMore = remember {
         derivedStateOf {
             val lastVisibleItem = layoutInfo.visibleItemsInfo.lastOrNull() ?: return@derivedStateOf false
+            if (lastVisibleItem.index < minItemsCount) return@derivedStateOf false
 
             lastVisibleItem.index >= layoutInfo.totalItemsCount - 1 - buffer
         }

core/ui/src/main/res/values/strings.xml

@@ -30,6 +30,7 @@
     <string name="word_next">다음</string>
     <string name="word_done">완료</string>
     <string name="word_apply_filter">필터 적용하기</string>
+    <string name="content_description_refresh">새로고침</string>
     <string name="word_input_placeholder">입력해주세요</string>
     <string name="sns_kakao">카카오톡</string>
     <string name="sns_naver">네이버</string>

data/src/main/java/com/susu/data/data/repository/LedgerRepositoryImpl.kt

@@ -14,14 +14,14 @@ class LedgerRepositoryImpl @Inject constructor(
 ) : LedgerRepository {
     override suspend fun getLedgerList(
         title: String?,
-        categoryId: Long?,
+        categoryIdList: List<Int>?,
         fromStartAt: LocalDateTime,
         toEndAt: LocalDateTime,
         page: Int?,
         sort: String?,
     ): List<Ledger> = ledgerService.getLedgerList(
         title = title,
-        categoryId = categoryId,
+        categoryIdList = categoryIdList,
         fromStartAt = fromStartAt.toKotlinLocalDateTime(),
         toEndAt = toEndAt.toKotlinLocalDateTime(),
         page = page,

data/src/main/java/com/susu/data/remote/api/LedgerService.kt

@@ -17,7 +17,7 @@ interface LedgerService {
     @GET("ledgers")
     suspend fun getLedgerList(
         @Query("title") title: String?,
-        @Query("categoryId") categoryId: Long?,
+        @Query("categoryIds") categoryIdList: List<Int>?,
         @Query("fromStartAt") fromStartAt: LocalDateTime,
         @Query("toEndAt") toEndAt: LocalDateTime,
         @Query("page") page: Int?,

domain/src/main/java/com/susu/domain/repository/LedgerRepository.kt

@@ -6,7 +6,7 @@ import java.time.LocalDateTime
 interface LedgerRepository {
     suspend fun getLedgerList(
         title: String?,
-        categoryId: Long?,
+        categoryIdList: List<Int>?,
         fromStartAt: LocalDateTime,
         toEndAt: LocalDateTime,
         page: Int?,

domain/src/main/java/com/susu/domain/usecase/ledger/GetLedgerListUseCase.kt

@@ -12,9 +12,9 @@ class GetLedgerListUseCase @Inject constructor(
         with(param) {
             ledgerRepository.getLedgerList(
                 title = title,
-                categoryId = categoryId,
-                fromStartAt = fromStartAt,
-                toEndAt = toEndAt,
+                categoryIdList = categoryIdList,
+                fromStartAt = fromStartAt ?: LocalDateTime.now().minusYears(10),
+                toEndAt = toEndAt ?: LocalDateTime.now().plusYears(10),
                 page = page,
                 sort = sort,
             )
@@ -23,9 +23,9 @@ class GetLedgerListUseCase @Inject constructor(
 
     data class Param(
         val title: String? = null,
-        val categoryId: Long? = null,
-        val fromStartAt: LocalDateTime = LocalDateTime.now().minusYears(10),
-        val toEndAt: LocalDateTime = LocalDateTime.now(),
+        val categoryIdList: List<Int>? = null,
+        val fromStartAt: LocalDateTime? = null,
+        val toEndAt: LocalDateTime? = null,
         val page: Int? = null,
         val sort: String? = null,
     )

feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt

@@ -16,6 +16,7 @@ import com.susu.feature.mypage.navigation.navigateMyPage
 import com.susu.feature.mypage.navigation.navigateMyPageInfo
 import com.susu.feature.mypage.navigation.navigateMyPageSocial
 import com.susu.feature.received.navigation.ReceivedRoute
+import com.susu.feature.received.navigation.argument.FilterArgument
 import com.susu.feature.received.navigation.navigateLedgerAdd
 import com.susu.feature.received.navigation.navigateLedgerDetail
 import com.susu.feature.received.navigation.navigateLedgerEdit
@@ -51,7 +52,7 @@ internal class MainNavigator(
         get() = when (currentDestination?.route) {
             in listOf(
                 ReceivedRoute.ledgerSearchRoute,
-                ReceivedRoute.ledgerFilterRoute,
+                ReceivedRoute.ledgerFilterRoute("{${ReceivedRoute.FILTER_ARGUMENT_NAME}}"),
                 ReceivedRoute.envelopeDetailRoute,
                 ReceivedRoute.envelopeEditRoute,
                 SentRoute.sentEnvelopeRoute,
@@ -133,8 +134,8 @@ internal class MainNavigator(
         navController.navigateLedgerEdit(ledger)
     }
 
-    fun navigateLedgerFilter() {
-        navController.navigateLedgerFilter()
+    fun navigateLedgerFilter(filter: FilterArgument) {
+        navController.navigateLedgerFilter(filter)
     }
 
     fun navigateLedgerAdd() {