Merge branch 'feature/calendar_scroll' into develop

Halill-DSM · Apr 1, 2022 · b72e34f · b72e34f
2 parents b63d40a + 71fecad
commit b72e34f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         applicationId "com.halill.halill2"
         minSdk 26
         targetSdk 31
-        versionCode 8
+        versionCode 9
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/src/main/java/com/halill/halill2/features/list/ListPage.kt b/app/src/main/java/com/halill/halill2/features/list/ListPage.kt
@@ -30,9 +30,6 @@ import com.halill.domain.features.todo.entity.TodoEntity
 import com.halill.halill2.R
 import com.halill.halill2.base.EventFlow
 import com.halill.halill2.base.observeWithLifecycle
-import com.halill.halill2.ui.theme.Purple400
-import com.halill.halill2.ui.theme.Purple500
-import com.halill.halill2.ui.theme.Teal500
 import com.halill.halill2.ui.theme.Teal700
 import com.halill.halill2.util.toShowDeadlineText
 import java.time.LocalDateTime
@@ -46,18 +43,13 @@ fun ListPage(navController: NavController, viewModel: ListViewModel = hiltViewMo
         viewModel.loadTodoList()
     }
 
-    Column(horizontalAlignment = Alignment.End) {
-        SwitchContentDoneOrTodoText(mainState = state) {
-            viewModel.switchTodoOrDone()
-        }
-
-        MainPager(
-            state = state,
-            onItemClick = { id -> viewModel.startDetailTodo(id) },
-            onDoneClick = { id -> viewModel.doneTodo(id) },
-            onDeleteClick = { id -> viewModel.deleteTodo(id) }
-        )
-    }
+    ListPageContent(
+        state = state,
+        onSwitchContentClick = { viewModel.switchTodoOrDone() },
+        onItemClick = { id -> viewModel.startDetailTodo(id) },
+        onDoneClick = { id -> viewModel.doneTodo(id) },
+        onDeleteClick = { id -> viewModel.deleteTodo(id) }
+    )
 
     handleViewEffect(navController = navController, uiEvent = viewModel.listViewEffect)
 }
@@ -83,6 +75,29 @@ private fun handleViewEffect(
     }
 }
 
+@OptIn(ExperimentalPagerApi::class)
+@Composable
+fun ListPageContent(
+    state: ListState,
+    onSwitchContentClick: () -> Unit,
+    onItemClick: (Long) -> Unit,
+    onDoneClick: (Long) -> Unit,
+    onDeleteClick: (Long) -> Unit
+) {
+    Column(horizontalAlignment = Alignment.End) {
+        SwitchContentDoneOrTodoText(mainState = state) {
+            onSwitchContentClick()
+        }
+
+        MainPager(
+            state = state,
+            onItemClick = onItemClick,
+            onDoneClick = onDoneClick,
+            onDeleteClick = onDeleteClick
+        )
+    }
+}
+
 @Composable
 fun SwitchContentDoneOrTodoText(mainState: ListState, doOnClick: () -> Unit) {
     val text = if (mainState.showDoneList) "완료한 할일" else "할일"