Skip to content

Commit ec580a5

Browse files
committed
Merge remote-tracking branch 'origin/develop' into BOOK-145-feature/#50
# Conflicts: # feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/SearchPresenter.kt # feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/SearchScreen.kt
2 parents b38af5f + 756f2c1 commit ec580a5

File tree

38 files changed

+157
-133
lines changed

38 files changed

+157
-133
lines changed

build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ internal class AndroidFeatureConventionPlugin : Plugin<Project> {
2424
implementation(project(path = ":core:designsystem"))
2525
implementation(project(path = ":core:model"))
2626
implementation(project(path = ":core:ui"))
27-
implementation(project(path = ":screens"))
27+
implementation(project(path = ":feature:screens"))
2828

2929
implementation(libs.compose.effects)
3030

core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedFullScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.systemBarsPadding
88
import androidx.compose.runtime.Composable
99
import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.graphics.Color
11+
import com.ninecraft.booket.core.designsystem.theme.White
1112

1213
/**
1314
* systemBarsPadding() 이 자동으로 적용되는 전체 화면 컨테이너
@@ -18,7 +19,7 @@ import androidx.compose.ui.graphics.Color
1819
@Composable
1920
fun ReedFullScreen(
2021
modifier: Modifier = Modifier,
21-
backgroundColor: Color = Color.White,
22+
backgroundColor: Color = White,
2223
content: @Composable ColumnScope.() -> Unit,
2324
) {
2425
Column(

feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package com.ninecraft.booket.feature.home
22

33
import androidx.compose.runtime.Composable
44
import androidx.compose.runtime.rememberCoroutineScope
5-
import com.ninecraft.booket.screens.HomeScreen
5+
import com.ninecraft.booket.feature.screens.HomeScreen
6+
import com.ninecraft.booket.feature.screens.SearchScreen
67
import com.slack.circuit.codegen.annotations.CircuitInject
78
import com.slack.circuit.runtime.Navigator
89
import com.slack.circuit.runtime.presenter.Presenter
@@ -20,7 +21,17 @@ class HomePresenter @AssistedInject constructor(
2021
override fun present(): HomeUiState {
2122
val scope = rememberCoroutineScope()
2223

23-
return HomeUiState {}
24+
fun handleEvent(event: HomeUiEvent) {
25+
when (event) {
26+
is HomeUiEvent.OnButtonClick -> {
27+
navigator.goTo(SearchScreen)
28+
}
29+
}
30+
}
31+
32+
return HomeUiState(
33+
eventSink = ::handleEvent,
34+
)
2435
}
2536

2637
@CircuitInject(HomeScreen::class, ActivityRetainedComponent::class)

feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeScreen.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@ package com.ninecraft.booket.feature.home
22

33
import androidx.compose.foundation.layout.Arrangement
44
import androidx.compose.foundation.layout.Column
5+
import androidx.compose.foundation.layout.Spacer
56
import androidx.compose.foundation.layout.fillMaxSize
7+
import androidx.compose.foundation.layout.height
8+
import androidx.compose.material3.Button
69
import androidx.compose.material3.Text
710
import androidx.compose.runtime.Composable
811
import androidx.compose.ui.Alignment
912
import androidx.compose.ui.Modifier
13+
import androidx.compose.ui.unit.dp
1014
import com.ninecraft.booket.core.designsystem.DevicePreview
1115
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
12-
import com.ninecraft.booket.screens.HomeScreen
16+
import com.ninecraft.booket.feature.screens.HomeScreen
1317
import com.slack.circuit.codegen.annotations.CircuitInject
1418
import dagger.hilt.android.components.ActivityRetainedComponent
1519

@@ -38,6 +42,14 @@ internal fun HomeContent(
3842
modifier: Modifier = Modifier,
3943
) {
4044
Text(text = "")
45+
Spacer(modifier = Modifier.height(16.dp))
46+
Button(
47+
onClick = {
48+
state.eventSink(HomeUiEvent.OnButtonClick)
49+
},
50+
) {
51+
Text(text = "Navigate To Search")
52+
}
4153
}
4254

4355
@DevicePreview

feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUiState.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ data class HomeUiState(
77
val eventSink: (HomeUiEvent) -> Unit,
88
) : CircuitUiState
99

10-
sealed interface HomeUiEvent : CircuitUiEvent
10+
sealed interface HomeUiEvent : CircuitUiEvent {
11+
data object OnButtonClick : HomeUiEvent
12+
}

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import androidx.compose.runtime.rememberCoroutineScope
77
import androidx.compose.runtime.setValue
88
import com.ninecraft.booket.core.common.utils.handleException
99
import com.ninecraft.booket.core.data.api.repository.UserRepository
10-
import com.ninecraft.booket.screens.LibraryScreen
11-
import com.ninecraft.booket.screens.LoginScreen
12-
import com.ninecraft.booket.screens.SettingsScreen
10+
import com.ninecraft.booket.feature.screens.LibraryScreen
11+
import com.ninecraft.booket.feature.screens.LoginScreen
12+
import com.ninecraft.booket.feature.screens.SettingsScreen
1313
import com.orhanobut.logger.Logger
1414
import com.skydoves.compose.effects.RememberedEffect
1515
import com.slack.circuit.codegen.annotations.CircuitInject

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import androidx.compose.ui.res.vectorResource
1919
import androidx.compose.ui.unit.dp
2020
import com.ninecraft.booket.core.designsystem.DevicePreview
2121
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
22-
import com.ninecraft.booket.screens.LibraryScreen
22+
import com.ninecraft.booket.feature.screens.LibraryScreen
2323
import com.slack.circuit.codegen.annotations.CircuitInject
2424
import dagger.hilt.android.components.ActivityRetainedComponent
2525

feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import androidx.compose.runtime.mutableStateOf
66
import androidx.compose.runtime.rememberCoroutineScope
77
import androidx.compose.runtime.setValue
88
import com.ninecraft.booket.core.data.api.repository.AuthRepository
9-
import com.ninecraft.booket.screens.LoginScreen
10-
import com.ninecraft.booket.screens.TermsAgreementScreen
9+
import com.ninecraft.booket.feature.screens.LoginScreen
10+
import com.ninecraft.booket.feature.screens.TermsAgreementScreen
1111
import com.orhanobut.logger.Logger
1212
import com.slack.circuit.codegen.annotations.CircuitInject
1313
import com.slack.circuit.retained.rememberRetained

feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorSt
2424
import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
2525
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
2626
import com.ninecraft.booket.core.designsystem.theme.White
27-
import com.ninecraft.booket.screens.LoginScreen
27+
import com.ninecraft.booket.feature.screens.LoginScreen
2828
import com.slack.circuit.codegen.annotations.CircuitInject
2929
import dagger.hilt.android.components.ActivityRetainedComponent
3030

feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementPresenter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import androidx.compose.runtime.getValue
66
import androidx.compose.runtime.mutableStateOf
77
import androidx.compose.runtime.remember
88
import androidx.compose.runtime.setValue
9-
import com.ninecraft.booket.screens.BottomNavigationScreen
10-
import com.ninecraft.booket.screens.TermsAgreementScreen
9+
import com.ninecraft.booket.feature.screens.BottomNavigationScreen
10+
import com.ninecraft.booket.feature.screens.TermsAgreementScreen
1111
import com.slack.circuit.codegen.annotations.CircuitInject
1212
import com.slack.circuit.retained.rememberRetained
1313
import com.slack.circuit.runtime.Navigator

0 commit comments

Comments
 (0)