Merge pull request #189 from YAPP-Github/feat/#188-alarm-list-sorting

[FEAT] 알람 아이템 정렬 기능을 구현합니다.

Author: DongChyeon

core/designsystem/src/main/res/drawable/ic_check_border_lined.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="10dp"
+    android:viewportWidth="14"
+    android:viewportHeight="10">
+  <path
+      android:pathData="M13.145,0.244C13.47,0.57 13.47,1.097 13.145,1.423L5.506,9.061C5.35,9.218 5.138,9.306 4.917,9.306C4.696,9.306 4.484,9.218 4.328,9.061L0.855,5.589C0.53,5.264 0.53,4.736 0.855,4.411C1.181,4.085 1.708,4.085 2.034,4.411L4.917,7.294L11.967,0.244C12.292,-0.081 12.82,-0.081 13.145,0.244Z"
+      android:fillColor="#17191F"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_filter.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="14"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M11.75,0.584C8.546,0.249 5.47,0.249 2.266,0.584C0.656,0.752 -0.455,2.432 0.363,3.956C1.355,5.803 2.759,7.531 4.714,8.86V12.12C4.714,13.232 5.854,13.98 6.874,13.537L8.373,12.886C8.937,12.641 9.303,12.085 9.303,11.469V8.86C11.257,7.531 12.661,5.803 13.653,3.956C14.062,3.193 13.95,2.374 13.564,1.748C13.184,1.131 12.518,0.664 11.75,0.584Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

core/ui/src/main/java/com/yapp/ui/component/checkbox/OrbitCheckBox.kt

@@ -42,7 +42,7 @@ fun OrbitCheckBox(
         contentAlignment = Alignment.Center,
     ) {
         Icon(
-            painter = painterResource(core.designsystem.R.drawable.ic_check),
+            painter = painterResource(core.designsystem.R.drawable.ic_check_border_lined),
             contentDescription = "IC_CHECK",
             tint = OrbitTheme.colors.gray_700,
         )

feature/home/src/main/java/com/yapp/alarm/component/AlarmListItem.kt

@@ -116,12 +116,13 @@ internal fun AlarmListItem(
     ) {
         SwipeToDismissBox(
             state = dismissState,
+            modifier = modifier,
             enableDismissFromStartToEnd = false,
             enableDismissFromEndToStart = swipeable,
             gesturesEnabled = swipeable,
             backgroundContent = {
                 Box(
-                    modifier = modifier
+                    modifier = Modifier
                         .fillMaxSize()
                         .background(OrbitTheme.colors.gray_500)
                         .onGloballyPositioned {
@@ -152,7 +153,7 @@ internal fun AlarmListItem(
             },
         ) {
             Row(
-                modifier = modifier
+                modifier = Modifier
                     .fillMaxWidth()
                     .background(
                         if (selected) OrbitTheme.colors.gray_800 else OrbitTheme.colors.gray_900,

feature/home/src/main/java/com/yapp/home/HomeContract.kt

@@ -12,6 +12,7 @@ sealed class HomeContract {
         val alarms: List<Alarm> = emptyList(),
         val lastAddedAlarmIndex: Int? = null,
         val dropdownMenuExpanded: Boolean = false,
+        val sortDropDownMenuExpanded: Boolean = false,
         val selectedAlarmIds: Set<Long> = emptySet(),
         val isSelectionMode: Boolean = false,
         val isDeleteDialogVisible: Boolean = false,
@@ -25,17 +26,27 @@ sealed class HomeContract {
         val name: String = "",
         val activeItemMenu: Long? = null,
         val activeItemMenuPosition: Pair<Float, Float>? = null,
+        val sortOrder: AlarmSortOrder = AlarmSortOrder.DEFAULT,
     ) : UiState {
         val isAllSelected: Boolean
             get() = alarms.isNotEmpty() && selectedAlarmIds.size == alarms.size
+
         val hasActivatedAlarm: Boolean
             get() = alarms.any { it.isAlarmActive }
+
+        val sortedAlarms: List<Alarm>
+            get() = when (sortOrder) {
+                AlarmSortOrder.DEFAULT -> alarms
+                AlarmSortOrder.ACTIVATION -> alarms.sortedByDescending { it.isAlarmActive }
+            }
     }
 
     sealed class Action {
         data object NavigateToAlarmCreation : Action()
         data object ToggleMultiSelectionMode : Action()
-        data object ToggleDropdownMenuVisibility : Action()
+        data object ShowDropDownMenu : Action()
+        data object ShowSortDropDownMenu : Action()
+        data object HideDropDownMenu : Action()
         data class ToggleAlarmSelection(val alarmId: Long) : Action()
         data class ToggleAlarmActivation(val alarmId: Long) : Action()
         data class SwipeToDeleteAlarm(val id: Long) : Action()
@@ -57,6 +68,7 @@ sealed class HomeContract {
         data object NavigateToSetting : Action()
         data class ShowItemMenu(val alarmId: Long, val x: Float, val y: Float) : Action()
         data object HideItemMenu : Action()
+        data class SetSortOrder(val sortOrder: AlarmSortOrder) : Action()
     }
 
     sealed class SideEffect : com.yapp.ui.base.SideEffect {
@@ -76,4 +88,9 @@ sealed class HomeContract {
             val onAction: () -> Unit,
         ) : SideEffect()
     }
+
+    enum class AlarmSortOrder {
+        DEFAULT,
+        ACTIVATION,
+    }
 }

feature/home/src/main/java/com/yapp/home/HomeScreen.kt

@@ -306,8 +306,10 @@ private fun HomeContent(
             },
         ) {
             AlarmListBottomSheet(
-                alarms = state.alarms,
+                alarms = state.sortedAlarms,
                 menuExpanded = state.dropdownMenuExpanded,
+                sortDropDownMenuExpanded = state.sortDropDownMenuExpanded,
+                sortOrder = state.sortOrder,
                 isAllSelected = state.isAllSelected,
                 isSelectionMode = state.isSelectionMode,
                 selectedAlarmIds = state.selectedAlarmIds,
@@ -323,7 +325,11 @@ private fun HomeContent(
                     eventDispatcher(HomeContract.Action.NavigateToAlarmCreation)
                 },
                 onClickMore = {
-                    eventDispatcher(HomeContract.Action.ToggleDropdownMenuVisibility)
+                    if (state.dropdownMenuExpanded || state.sortDropDownMenuExpanded) {
+                        eventDispatcher(HomeContract.Action.HideDropDownMenu)
+                    } else {
+                        eventDispatcher(HomeContract.Action.ShowDropDownMenu)
+                    }
                 },
                 onClickCheckAll = {
                     eventDispatcher(HomeContract.Action.ToggleAllAlarmSelection)
@@ -334,8 +340,14 @@ private fun HomeContent(
                 onClickEdit = {
                     eventDispatcher(HomeContract.Action.ToggleMultiSelectionMode)
                 },
+                onClickSort = {
+                    eventDispatcher(HomeContract.Action.ShowSortDropDownMenu)
+                },
+                onSetSortOrder = { sortOrder ->
+                    eventDispatcher(HomeContract.Action.SetSortOrder(sortOrder))
+                },
                 onDismissRequest = {
-                    eventDispatcher(HomeContract.Action.ToggleDropdownMenuVisibility)
+                    eventDispatcher(HomeContract.Action.HideDropDownMenu)
                 },
                 onToggleSelect = { alarmId ->
                     eventDispatcher(HomeContract.Action.ToggleAlarmSelection(alarmId))
@@ -906,13 +918,15 @@ fun HomeScreenPreview() {
     OrbitTheme {
         HomeScreen(
             stateProvider = {
-                HomeContract.State().copy(
-                    initialLoading = false,
-                    alarms = listOf(
-                        Alarm(),
-                    ),
-                    activeItemMenu = 1,
-                )
+                HomeContract.State()
+                    .copy(
+                        initialLoading = false,
+                        alarms = listOf(
+                            Alarm(),
+                        ),
+                        activeItemMenu = 0L,
+                        activeItemMenuPosition = Pair(0f, 0f),
+                    )
             },
             eventDispatcher = {},
         )

feature/home/src/main/java/com/yapp/home/HomeViewModel.kt

@@ -43,7 +43,9 @@ class HomeViewModel @Inject constructor(
         when (action) {
             HomeContract.Action.NavigateToAlarmCreation -> navigateToAlarmCreation()
             HomeContract.Action.ToggleMultiSelectionMode -> toggleMultiSelectionMode()
-            HomeContract.Action.ToggleDropdownMenuVisibility -> toggleDropdownMenuVisibility()
+            HomeContract.Action.ShowDropDownMenu -> showDropDownMenu()
+            HomeContract.Action.ShowSortDropDownMenu -> showSortDropDownMenu()
+            HomeContract.Action.HideDropDownMenu -> hideDropDownMenu()
             is HomeContract.Action.ToggleAlarmSelection -> toggleAlarmSelection(action.alarmId)
             HomeContract.Action.ToggleAllAlarmSelection -> toggleAllAlarmSelection()
             is HomeContract.Action.ToggleAlarmActivation -> toggleAlarmActivation(action.alarmId)
@@ -65,6 +67,7 @@ class HomeViewModel @Inject constructor(
             HomeContract.Action.NavigateToSetting -> navigateToSetting()
             is HomeContract.Action.ShowItemMenu -> showItemMenu(action.alarmId, action.x, action.y)
             HomeContract.Action.HideItemMenu -> hideItemMenu()
+            is HomeContract.Action.SetSortOrder -> setSortOrder(action.sortOrder)
         }
     }
 
@@ -113,8 +116,26 @@ class HomeViewModel @Inject constructor(
         }
     }
 
-    private fun toggleDropdownMenuVisibility() {
-        updateState { copy(dropdownMenuExpanded = !currentState.dropdownMenuExpanded) }
+    private fun showDropDownMenu() {
+        updateState { copy(dropdownMenuExpanded = true) }
+    }
+
+    private fun showSortDropDownMenu() {
+        updateState {
+            copy(
+                dropdownMenuExpanded = false,
+                sortDropDownMenuExpanded = true,
+            )
+        }
+    }
+
+    private fun hideDropDownMenu() {
+        updateState {
+            copy(
+                dropdownMenuExpanded = false,
+                sortDropDownMenuExpanded = false,
+            )
+        }
     }
 
     private fun toggleAlarmSelection(alarmId: Long) {
@@ -177,6 +198,12 @@ class HomeViewModel @Inject constructor(
 
     private fun confirmDeletion() {
         deleteAlarms(currentState.selectedAlarmIds)
+        updateState {
+            copy(
+                selectedAlarmIds = emptySet(),
+                isDeleteDialogVisible = false,
+            )
+        }
     }
 
     private fun showNoActivatedAlarmDialog() {
@@ -454,4 +481,9 @@ class HomeViewModel @Inject constructor(
             )
         }
     }
+
+    private fun setSortOrder(sortOrder: HomeContract.AlarmSortOrder) {
+        updateState { copy(sortOrder = sortOrder) }
+        hideDropDownMenu()
+    }
 }

feature/home/src/main/java/com/yapp/home/component/AlarmListDropDownMenu.kt

@@ -46,6 +46,7 @@ internal fun AlarmListDropDownMenu(
     expanded: Boolean,
     onDismissRequest: () -> Unit,
     onClickEdit: () -> Unit,
+    onClickSort: () -> Unit,
 ) {
     DropdownMenu(
         modifier = modifier.padding(horizontal = 8.dp),
@@ -61,6 +62,12 @@ internal fun AlarmListDropDownMenu(
         ) {
             onClickEdit()
         }
+        AlarmListDropDownMenuItem(
+            text = stringResource(id = R.string.alarm_list_bottom_sheet_menu_sort),
+            iconRes = core.designsystem.R.drawable.ic_filter,
+        ) {
+            onClickSort()
+        }
     }
 }
 
@@ -143,6 +150,9 @@ private fun AlarmListDropDownMenuPreview() {
                     onClickEdit = {
                         Log.d("AlarmListDropDownMenu", "Edit Clicked")
                     },
+                    onClickSort = {
+                        Log.d("AlarmListDropDownMenu", "Sort Clicked")
+                    },
                 )
             }
         }