Merge pull request #168 from mash-up-kr/feature/#167

014967 · web-flow · commit 796b259c2cad · 2025-07-18T13:07:46.000+09:00
[#167] lint
diff --git a/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/CalendarIntent.kt b/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/CalendarIntent.kt
@@ -38,6 +38,7 @@ sealed interface CalendarIntent : Intent {
     data class ClickRecommendTodoTag(val index: Int) : CalendarIntent
 
     data object ClickMonthChooser : CalendarIntent
+    data object ClickDirectInput : CalendarIntent
 
 
 }
diff --git a/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/CalendarSideEffect.kt b/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/CalendarSideEffect.kt
@@ -16,5 +16,7 @@ sealed interface CalendarSideEffect : SideEffect {
 
     data class NavigateToAddTodo(val todo: Todo) : CalendarSideEffect
 
+    data object NavigateToAddTodoWithDirectInput : CalendarSideEffect
+
 
 }
diff --git a/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/CalendarSideEffectHandler.kt b/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/CalendarSideEffectHandler.kt
@@ -24,6 +24,7 @@ fun rememberSideEffectHandler(
     updateNextMonthPage: (page: Int) -> Unit,
     navigateToDetailDate: (date: String) -> Unit,
     navigateToAddTodo: (todo: Todo) -> Unit,
+    navigateToAddTodoWithDirectInput: () -> Unit,
     calendarPagerState: CalendarPagerState = rememberCalendarPagerState(),
     coroutineScope: CoroutineScope = rememberCoroutineScope(),
 ) = remember(calendarPagerState, coroutineScope) {
@@ -39,10 +40,11 @@ fun rememberSideEffectHandler(
         updatePreviousWeekPage = updatePreviousWeekPage,
         navigateToDetailDate = navigateToDetailDate,
         navigateToAddTodo = navigateToAddTodo,
+        navigateToAddTodoWithDirectInput = navigateToAddTodoWithDirectInput,
         calendarPagerState = calendarPagerState,
         coroutineScope = coroutineScope,
 
-    )
+        )
 }
 
 @Stable
@@ -57,6 +59,7 @@ class CalendarSideEffectHandler(
     private val updateNextMonthPage: (page: Int) -> Unit,
     private val navigateToDetailDate: (date: String) -> Unit,
     private val navigateToAddTodo: (todo: Todo) -> Unit,
+    private val navigateToAddTodoWithDirectInput: () -> Unit,
     private val calendarPagerState: CalendarPagerState,
     private val coroutineScope: CoroutineScope,
 ) : SideEffectHandler<CalendarSideEffect> {
@@ -115,6 +118,10 @@ class CalendarSideEffectHandler(
             is CalendarSideEffect.NavigateToAddTodo -> {
                 navigateToAddTodo(sideEffect.todo)
             }
+
+            is CalendarSideEffect.NavigateToAddTodoWithDirectInput -> {
+                navigateToAddTodoWithDirectInput()
+            }
         }
     }
 }
diff --git a/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/CalendarViewModel.kt b/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/CalendarViewModel.kt
@@ -86,6 +86,7 @@ class CalendarViewModel @Inject constructor(
             is CalendarIntent.GetRecommendTodoTagList -> getRecommendTodoTag()
             is CalendarIntent.ClickRecommendTodoTag -> clickRecommendTagTodo(index = intent.index)
             is CalendarIntent.ClickMonthChooser -> clickMonthChooser()
+            is CalendarIntent.ClickDirectInput -> clickDirectInput()
         }
     }
 
@@ -512,6 +513,10 @@ class CalendarViewModel @Inject constructor(
         postSideEffect(CalendarSideEffect.NavigateToAddTodo(todo = todo))
     }
 
+    private fun clickDirectInput() = execute {
+        postSideEffect(CalendarSideEffect.NavigateToAddTodoWithDirectInput)
+    }
+
     private fun <T> Flow<T>.toStateFlow(
         initialValue: T,
     ): StateFlow<T> = this.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000L), initialValue = initialValue)
diff --git a/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/builder/IntentBuilder.kt b/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/mvi/builder/IntentBuilder.kt
@@ -115,4 +115,7 @@ class IntentBuilder(
         build(CalendarIntent.ClickMonthChooser)
     }
 
+    fun clickDirectInput(){
+        build(CalendarIntent.ClickDirectInput)
+    }
 }
diff --git a/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/navigation/CalendarNavigation.kt b/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/navigation/CalendarNavigation.kt
@@ -9,11 +9,13 @@ import team.noweekend.feature.calendar.screen.CalendarRoute
 fun NavGraphBuilder.calendarNavGraph(
     navigateToDetailDate: (String) -> Unit,
     navigateToAddTodo: (Todo) -> Unit,
+    navigateToAddTodoWithDirectInput: () -> Unit,
 ) {
     composable<Calendar> {
         CalendarRoute(
             navigateToDetailDate = navigateToDetailDate,
             navigateToAddTodo = navigateToAddTodo,
+            navigateToAddTodoWithDirectInput = navigateToAddTodoWithDirectInput,
         )
     }
 }
diff --git a/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/screen/CalendarRoute.kt b/feature/calendar/src/main/kotlin/team/noweekend/feature/calendar/screen/CalendarRoute.kt
@@ -32,6 +32,7 @@ import team.noweekend.feature.calendar.mvi.rememberSideEffectHandler
 internal fun CalendarRoute(
     navigateToDetailDate: (String) -> Unit,
     navigateToAddTodo: (Todo) -> Unit,
+    navigateToAddTodoWithDirectInput: () -> Unit,
     modifier: Modifier = Modifier,
     calendarViewModel: CalendarViewModel = hiltViewModel(),
 ) {
@@ -55,6 +56,7 @@ internal fun CalendarRoute(
         updatePreviousWeekPage = intentBuilder::updatePreviousWeekPage,
         navigateToDetailDate = navigateToDetailDate,
         navigateToAddTodo = navigateToAddTodo,
+        navigateToAddTodoWithDirectInput = navigateToAddTodoWithDirectInput,
     )
 
 
@@ -95,7 +97,7 @@ internal fun CalendarRoute(
             modifier = Modifier
                 .align(Alignment.BottomEnd)
                 .padding(bottom = 20.dp, end = 20.dp),
-            onClickDirectInput = {},
+            onClickDirectInput = intentBuilder::clickDirectInput,
             onClickDim = { isExpanded = isExpanded.not() },
         )
 
@@ -131,6 +133,7 @@ private fun CalendarRoutePreview() {
             modifier = Modifier.fillMaxSize(),
             navigateToDetailDate = {},
             navigateToAddTodo = {},
+            navigateToAddTodoWithDirectInput = {}
         )
     }
 }
diff --git a/feature/main/src/main/kotlin/team/noweekend/feature/main/MainActivity.kt b/feature/main/src/main/kotlin/team/noweekend/feature/main/MainActivity.kt
@@ -46,6 +46,9 @@ class MainActivity : ComponentActivity() {
                         /* Todo use CalendarNavigationDelgate
                           ex) calendarNavigationDelegate.navigateToAddTask()
                          */
+                    },
+                    navigateToAddTodoWithDirectInput = {
+
                     }
                 )
             }
diff --git a/feature/main/src/main/kotlin/team/noweekend/feature/main/MainNavHost.kt b/feature/main/src/main/kotlin/team/noweekend/feature/main/MainNavHost.kt
@@ -20,6 +20,7 @@ internal fun MainNavHost(
     navigateToCreateVacation: ((Intent.() -> Intent)?, ActivityResultLauncher<Intent>?) -> Unit,
     navigateToDetailDate: ((Intent.() -> Intent)?) -> Unit,
     navigateToAddTodo: ((Intent.() -> Intent)?) -> Unit,
+    navigateToAddTodoWithDirectInput: ((Intent.() -> Intent)?) -> Unit,
     navigator: MainNavigator,
     modifier: Modifier = Modifier,
 ) {
@@ -51,6 +52,11 @@ internal fun MainNavHost(
                     },
                 )
             },
+            navigateToAddTodoWithDirectInput = {
+                navigateToAddTodoWithDirectInput(
+                    { this },
+                )
+            },
         )
         profileNavGraph(
             navigateToExternalWebBrowser = navigateToExternalWebBrowser,
diff --git a/feature/main/src/main/kotlin/team/noweekend/feature/main/screen/MainRoute.kt b/feature/main/src/main/kotlin/team/noweekend/feature/main/screen/MainRoute.kt
@@ -13,6 +13,7 @@ internal fun MainRoute(
     navigateToDetailDate: ((Intent.() -> Intent)?) -> Unit,
     navigateToExternalWebBrowser: (String) -> Unit,
     navigateToAddTodo : ((Intent.() -> Intent)?) -> Unit,
+    navigateToAddTodoWithDirectInput: ((Intent.() -> Intent)?) -> Unit,
     modifier: Modifier = Modifier,
     navigator: MainNavigator = rememberMainNavigator(),
 ) {
@@ -21,6 +22,7 @@ internal fun MainRoute(
         navigateToDetailDate = navigateToDetailDate,
         navigateToExternalWebBrowser = navigateToExternalWebBrowser,
         navigateToAddTodo = navigateToAddTodo,
+        navigateToAddTodoWithDirectInput = navigateToAddTodoWithDirectInput,
         onTabSelected = { navigator.navigate(it) },
         modifier = modifier,
         navigator = navigator,
diff --git a/feature/main/src/main/kotlin/team/noweekend/feature/main/screen/MainScreen.kt b/feature/main/src/main/kotlin/team/noweekend/feature/main/screen/MainScreen.kt
@@ -20,7 +20,8 @@ internal fun MainScreen(
     navigateToExternalWebBrowser: (String) -> Unit,
     navigateToCreateVacation: ((Intent.() -> Intent)?, ActivityResultLauncher<Intent>?) -> Unit,
     navigateToDetailDate: ((Intent.() -> Intent)?) -> Unit,
-    navigateToAddTodo :  ((Intent.() -> Intent)?) -> Unit,
+    navigateToAddTodo: ((Intent.() -> Intent)?) -> Unit,
+    navigateToAddTodoWithDirectInput: ((Intent.() -> Intent)?) -> Unit,
     onTabSelected: (MainTab) -> Unit,
     modifier: Modifier = Modifier,
     navigator: MainNavigator = rememberMainNavigator(),
@@ -36,7 +37,8 @@ internal fun MainScreen(
                 navigateToCreateVacation = navigateToCreateVacation,
                 navigateToDetailDate = navigateToDetailDate,
                 navigateToExternalWebBrowser = navigateToExternalWebBrowser,
-                navigateToAddTodo = navigateToAddTodo
+                navigateToAddTodo = navigateToAddTodo,
+                navigateToAddTodoWithDirectInput = navigateToAddTodoWithDirectInput,
             )
         },
         bottomBar = {
@@ -58,7 +60,8 @@ private fun MainScreenPreview() {
             navigateToDetailDate = {},
             navigateToExternalWebBrowser = {},
             onTabSelected = {},
-            navigateToAddTodo = {}
+            navigateToAddTodo = {},
+            navigateToAddTodoWithDirectInput = {}
         )
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ sealed interface CalendarIntent : Intent {`
`38`	`38`	`data class ClickRecommendTodoTag(val index: Int) : CalendarIntent`
`39`	`39`
`40`	`40`	`data object ClickMonthChooser : CalendarIntent`
	`41`	`+ data object ClickDirectInput : CalendarIntent`
`41`	`42`
`42`	`43`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,7 @@ sealed interface CalendarSideEffect : SideEffect {`
`16`	`16`
`17`	`17`	`data class NavigateToAddTodo(val todo: Todo) : CalendarSideEffect`
`18`	`18`
	`19`	`+ data object NavigateToAddTodoWithDirectInput : CalendarSideEffect`
	`20`	`+`
`19`	`21`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ class CalendarViewModel @Inject constructor(`
`86`	`86`	`is CalendarIntent.GetRecommendTodoTagList -> getRecommendTodoTag()`
`87`	`87`	`is CalendarIntent.ClickRecommendTodoTag -> clickRecommendTagTodo(index = intent.index)`
`88`	`88`	`is CalendarIntent.ClickMonthChooser -> clickMonthChooser()`
	`89`	`+ is CalendarIntent.ClickDirectInput -> clickDirectInput()`
`89`	`90`	`}`
`90`	`91`	`}`
`91`	`92`
`@@ -512,6 +513,10 @@ class CalendarViewModel @Inject constructor(`
`512`	`513`	`postSideEffect(CalendarSideEffect.NavigateToAddTodo(todo = todo))`
`513`	`514`	`}`
`514`	`515`
	`516`	`+ private fun clickDirectInput() = execute {`
	`517`	`+ postSideEffect(CalendarSideEffect.NavigateToAddTodoWithDirectInput)`
	`518`	`+ }`
	`519`	`+`
`515`	`520`	`private fun <T> Flow<T>.toStateFlow(`
`516`	`521`	`initialValue: T,`
`517`	`522`	`): StateFlow<T> = this.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000L), initialValue = initialValue)`
Original file line number	Diff line number	Diff line change
`@@ -115,4 +115,7 @@ class IntentBuilder(`
`115`	`115`	`build(CalendarIntent.ClickMonthChooser)`
`116`	`116`	`}`
`117`	`117`
	`118`	`+ fun clickDirectInput(){`
	`119`	`+ build(CalendarIntent.ClickDirectInput)`
	`120`	`+ }`
`118`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,13 @@ import team.noweekend.feature.calendar.screen.CalendarRoute`
`9`	`9`	`fun NavGraphBuilder.calendarNavGraph(`
`10`	`10`	`navigateToDetailDate: (String) -> Unit,`
`11`	`11`	`navigateToAddTodo: (Todo) -> Unit,`
	`12`	`+ navigateToAddTodoWithDirectInput: () -> Unit,`
`12`	`13`	`) {`
`13`	`14`	`composable<Calendar> {`
`14`	`15`	`CalendarRoute(`
`15`	`16`	`navigateToDetailDate = navigateToDetailDate,`
`16`	`17`	`navigateToAddTodo = navigateToAddTodo,`
	`18`	`+ navigateToAddTodoWithDirectInput = navigateToAddTodoWithDirectInput,`
`17`	`19`	`)`
`18`	`20`	`}`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ import team.noweekend.feature.calendar.mvi.rememberSideEffectHandler`
`32`	`32`	`internal fun CalendarRoute(`
`33`	`33`	`navigateToDetailDate: (String) -> Unit,`
`34`	`34`	`navigateToAddTodo: (Todo) -> Unit,`
	`35`	`+ navigateToAddTodoWithDirectInput: () -> Unit,`
`35`	`36`	`modifier: Modifier = Modifier,`
`36`	`37`	`calendarViewModel: CalendarViewModel = hiltViewModel(),`
`37`	`38`	`) {`
`@@ -55,6 +56,7 @@ internal fun CalendarRoute(`
`55`	`56`	`updatePreviousWeekPage = intentBuilder::updatePreviousWeekPage,`
`56`	`57`	`navigateToDetailDate = navigateToDetailDate,`
`57`	`58`	`navigateToAddTodo = navigateToAddTodo,`
	`59`	`+ navigateToAddTodoWithDirectInput = navigateToAddTodoWithDirectInput,`
`58`	`60`	`)`
`59`	`61`
`60`	`62`
`@@ -95,7 +97,7 @@ internal fun CalendarRoute(`
`95`	`97`	`modifier = Modifier`
`96`	`98`	`.align(Alignment.BottomEnd)`
`97`	`99`	`.padding(bottom = 20.dp, end = 20.dp),`
`98`		`- onClickDirectInput = {},`
	`100`	`+ onClickDirectInput = intentBuilder::clickDirectInput,`
`99`	`101`	`onClickDim = { isExpanded = isExpanded.not() },`
`100`	`102`	`)`
`101`	`103`
`@@ -131,6 +133,7 @@ private fun CalendarRoutePreview() {`
`131`	`133`	`modifier = Modifier.fillMaxSize(),`
`132`	`134`	`navigateToDetailDate = {},`
`133`	`135`	`navigateToAddTodo = {},`
	`136`	`+ navigateToAddTodoWithDirectInput = {}`
`134`	`137`	`)`
`135`	`138`	`}`
`136`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ class MainActivity : ComponentActivity() {`
`46`	`46`	`/* Todo use CalendarNavigationDelgate`
`47`	`47`	`ex) calendarNavigationDelegate.navigateToAddTask()`
`48`	`48`	`*/`
	`49`	`+ },`
	`50`	`+ navigateToAddTodoWithDirectInput = {`
	`51`	`+`
`49`	`52`	`}`
`50`	`53`	`)`
`51`	`54`	`}`