Skip to content

Commit f52e603

Browse files
committed
REFACTOR: 경로 수정 과정에서 추가된 불필요 Companion 접근부분 제거
1 parent 6a8f37a commit f52e603

20 files changed

Lines changed: 23 additions & 23 deletions

File tree

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class EmotionViewModel @Inject constructor(
2626
savedStateHandle: SavedStateHandle,
2727
) : ContainerHost<EmotionState, EmotionSideEffect>, ViewModel() {
2828

29-
override val container: Container<EmotionState, EmotionSideEffect> = container(initialState = EmotionState.Companion.Init, savedStateHandle = savedStateHandle)
29+
override val container: Container<EmotionState, EmotionSideEffect> = container(initialState = EmotionState.Init, savedStateHandle = savedStateHandle)
3030

3131
init {
3232
loadEmotions()

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionLoadingView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ private fun getRecommendRoutineText(emotion: EmotionUiModel): String {
184184
private fun EmotionLoadingViewPreview() {
185185
BitnagilTheme {
186186
EmotionLoadingView(
187-
emotion = EmotionUiModel.Companion.Default,
187+
emotion = EmotionUiModel.Default,
188188
)
189189
}
190190
}

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fun SwipeEmotionSelectionScreen(
8080
val fadeInTransition = remember { fadeIn(animationSpec = tween(150)) }
8181
val fadeOutTransition = remember { fadeOut(animationSpec = tween(50)) }
8282

83-
val emotions = remember(state.emotionTypeUiModels) { state.emotionTypeUiModels + EmotionUiModel.Companion.Default }
83+
val emotions = remember(state.emotionTypeUiModels) { state.emotionTypeUiModels + EmotionUiModel.Default }
8484
val actualItemCount = emotions.size
8585

8686
val pagerState = rememberPagerState(

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ private fun HomeScreen(
195195
@Composable
196196
private fun HomeScreenPreview() {
197197
HomeScreen(
198-
uiState = HomeState.Companion.INIT.copy(
198+
uiState = HomeState.INIT.copy(
199199
userNickname = "홍길동",
200-
dailyEmotion = DailyEmotionUiModel.Companion.INIT.copy(
200+
dailyEmotion = DailyEmotionUiModel.INIT.copy(
201201
homeMessage = "님, 오셨군요!\n오늘 기분은 어떤가요?",
202202
),
203203
),

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/HomeViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class HomeViewModel @Inject constructor(
4646
private val toggleRoutineUseCase: ToggleRoutineUseCase,
4747
) : ContainerHost<HomeState, HomeSideEffect>, ViewModel() {
4848

49-
override val container: Container<HomeState, HomeSideEffect> = container(initialState = HomeState.Companion.INIT)
49+
override val container: Container<HomeState, HomeSideEffect> = container(initialState = HomeState.INIT)
5050

5151
private val pendingChangesByDate = mutableMapOf<String, MutableMap<String, RoutineCompletionInfo>>()
5252
private val routineSyncTrigger = MutableSharedFlow<String>(extraBufferCapacity = 64)

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private fun CollapsibleHeaderPreview() {
7171
CollapsibleHeader(
7272
modifier = Modifier.fillMaxWidth(),
7373
welcomeMessage = "대현님 오셨군요!\n오늘 기분은 어떤가요?!",
74-
dailyEmotion = DailyEmotionUiModel.Companion.INIT,
74+
dailyEmotion = DailyEmotionUiModel.INIT,
7575
onRegisterEmotionClick = {},
7676
)
7777
}

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/WeeklyDatePicker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ private fun WeeklyDatePickerPreview() {
197197
WeeklyDatePicker(
198198
selectedDate = selectedDate,
199199
weeklyDates = selectedDate.getCurrentWeekDays(),
200-
routines = RoutineScheduleUiModel.Companion.INIT,
200+
routines = RoutineScheduleUiModel.INIT,
201201
onDateSelect = { selectedDate = it },
202202
onPreviousWeekClick = { selectedDate = selectedDate.minusWeeks(1) },
203203
onNextWeekClick = { selectedDate = selectedDate.plusWeeks(1) },

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/contract/HomeState.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ data class HomeState(
2424
val INIT = HomeState(
2525
loadingCount = 0,
2626
userNickname = "",
27-
dailyEmotion = DailyEmotionUiModel.Companion.INIT,
27+
dailyEmotion = DailyEmotionUiModel.INIT,
2828
selectedDate = LocalDate.now(),
2929
currentWeeks = LocalDate.now().getCurrentWeekDays(),
30-
routineSchedule = RoutineScheduleUiModel.Companion.INIT,
30+
routineSchedule = RoutineScheduleUiModel.INIT,
3131
)
3232
}
3333
}

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class LoginViewModel @Inject constructor(
1818
private val loginUseCase: LoginUseCase,
1919
) : ContainerHost<LoginState, LoginSideEffect>, ViewModel() {
2020

21-
override val container: Container<LoginState, LoginSideEffect> = container(initialState = LoginState.Companion.INIT)
21+
override val container: Container<LoginState, LoginSideEffect> = container(initialState = LoginState.INIT)
2222

2323
fun kakaoLogin(token: OAuthToken?, error: Throwable?) {
2424
intent {

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/mypage/MyPageViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import javax.inject.Inject
1414
class MyPageViewModel @Inject constructor(
1515
private val fetchUserProfileUseCase: FetchUserProfileUseCase,
1616
) : ContainerHost<MyPageState, MyPageSideEffect>, ViewModel() {
17-
override val container: Container<MyPageState, MyPageSideEffect> = container(initialState = MyPageState.Companion.INIT)
17+
override val container: Container<MyPageState, MyPageSideEffect> = container(initialState = MyPageState.INIT)
1818

1919
init {
2020
loadMyPageInfo()

0 commit comments

Comments
 (0)