Skip to content

Commit dc20169

Browse files
l5x5ll5x5l
authored
Merge pull request #187 from YAPP-Github/refactor/#186-presentation_module_class
[Refactor/#186] Presentation 레이어 내 패키지 정리
2 parents 5fcc901 + 377d7f7 commit dc20169

201 files changed

Lines changed: 618 additions & 641 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/java/com/threegap/bitnagil/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
1717
import androidx.compose.ui.unit.dp
1818
import com.threegap.bitnagil.designsystem.component.atom.BitnagilToastContainer
1919
import com.threegap.bitnagil.designsystem.component.atom.rememberBitnagilToast
20-
import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
20+
import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast
2121
import dagger.hilt.android.AndroidEntryPoint
2222

2323
@AndroidEntryPoint

‎app/src/main/java/com/threegap/bitnagil/MainNavHost.kt‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ import androidx.navigation.compose.NavHost
77
import androidx.navigation.compose.composable
88
import androidx.navigation.toRoute
99
import com.threegap.bitnagil.navigation.home.HomeNavHost
10-
import com.threegap.bitnagil.presentation.emotion.EmotionScreenContainer
11-
import com.threegap.bitnagil.presentation.guide.GuideScreenContainer
12-
import com.threegap.bitnagil.presentation.login.LoginScreenContainer
13-
import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer
14-
import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel
15-
import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg
16-
import com.threegap.bitnagil.presentation.report.ReportScreenContainer
17-
import com.threegap.bitnagil.presentation.reportdetail.ReportDetailScreenContainer
18-
import com.threegap.bitnagil.presentation.reportdetail.ReportDetailViewModel
19-
import com.threegap.bitnagil.presentation.reportdetail.model.navarg.ReportDetailScreenArg
20-
import com.threegap.bitnagil.presentation.reporthistory.ReportHistoryScreenContainer
21-
import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer
22-
import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
23-
import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
24-
import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer
25-
import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen
26-
import com.threegap.bitnagil.presentation.withdrawal.WithdrawalScreenContainer
27-
import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineScreenContainer
28-
import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineViewModel
29-
import com.threegap.bitnagil.presentation.writeroutine.model.navarg.WriteRoutineScreenArg
10+
import com.threegap.bitnagil.presentation.screen.emotion.EmotionScreenContainer
11+
import com.threegap.bitnagil.presentation.screen.guide.GuideScreenContainer
12+
import com.threegap.bitnagil.presentation.screen.login.LoginScreenContainer
13+
import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingScreenContainer
14+
import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingViewModel
15+
import com.threegap.bitnagil.presentation.screen.onboarding.model.navarg.OnBoardingScreenArg
16+
import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailScreenContainer
17+
import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewModel
18+
import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg
19+
import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer
20+
import com.threegap.bitnagil.presentation.screen.reportwrite.ReportWriteScreenContainer
21+
import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer
22+
import com.threegap.bitnagil.presentation.screen.routinewrite.RoutineWriteScreenContainer
23+
import com.threegap.bitnagil.presentation.screen.routinewrite.RoutineWriteViewModel
24+
import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.RoutineWriteScreenArg
25+
import com.threegap.bitnagil.presentation.screen.setting.SettingScreenContainer
26+
import com.threegap.bitnagil.presentation.screen.splash.SplashScreenContainer
27+
import com.threegap.bitnagil.presentation.screen.terms.TermsAgreementScreenContainer
28+
import com.threegap.bitnagil.presentation.screen.webview.BitnagilWebViewScreen
29+
import com.threegap.bitnagil.presentation.screen.withdrawal.WithdrawalScreenContainer
3030

3131
@Composable
3232
fun MainNavHost(
@@ -127,7 +127,7 @@ fun MainNavHost(
127127
}
128128
},
129129
navigateToRegisterRoutine = { routineId ->
130-
navigator.navController.navigate(Route.WriteRoutine(routineId = routineId))
130+
navigator.navController.navigate(Route.RoutineWrite(routineId = routineId))
131131
},
132132
navigateToEmotion = {
133133
navigator.navController.navigate(Route.Emotion)
@@ -140,7 +140,7 @@ fun MainNavHost(
140140
}
141141
},
142142
navigateToReport = {
143-
navigator.navController.navigate(Route.Report) {
143+
navigator.navController.navigate(Route.ReportWrite) {
144144
launchSingleTop = true
145145
}
146146
},
@@ -224,19 +224,19 @@ fun MainNavHost(
224224
)
225225
}
226226

227-
composable<Route.WriteRoutine> { navBackStackEntry ->
228-
val arg = navBackStackEntry.toRoute<Route.WriteRoutine>()
227+
composable<Route.RoutineWrite> { navBackStackEntry ->
228+
val arg = navBackStackEntry.toRoute<Route.RoutineWrite>()
229229
val writeScreenNavArg = if (arg.isRegister) {
230-
WriteRoutineScreenArg.Add(baseRoutineId = arg.routineId)
230+
RoutineWriteScreenArg.Add(baseRoutineId = arg.routineId)
231231
} else {
232-
WriteRoutineScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate)
232+
RoutineWriteScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate)
233233
}
234234

235-
val viewModel = hiltViewModel<WriteRoutineViewModel, WriteRoutineViewModel.Factory> { factory ->
235+
val viewModel = hiltViewModel<RoutineWriteViewModel, RoutineWriteViewModel.Factory> { factory ->
236236
factory.create(writeScreenNavArg)
237237
}
238238

239-
WriteRoutineScreenContainer(
239+
RoutineWriteScreenContainer(
240240
viewModel = viewModel,
241241
navigateToBack = {
242242
if (navigator.navController.previousBackStackEntry != null) {
@@ -281,11 +281,11 @@ fun MainNavHost(
281281
}
282282
},
283283
navigateToAddRoutine = {
284-
navigator.navController.navigate(Route.WriteRoutine())
284+
navigator.navController.navigate(Route.RoutineWrite())
285285
},
286286
navigateToEditRoutine = { routineId, updateRoutineFromNowDate ->
287287
navigator.navController.navigate(
288-
Route.WriteRoutine(
288+
Route.RoutineWrite(
289289
routineId = routineId,
290290
isRegister = false,
291291
isUpdateRoutineFromNowDate = updateRoutineFromNowDate,
@@ -305,8 +305,8 @@ fun MainNavHost(
305305
)
306306
}
307307

308-
composable<Route.Report> {
309-
ReportScreenContainer(
308+
composable<Route.ReportWrite> {
309+
ReportWriteScreenContainer(
310310
navigateToBack = {
311311
if (navigator.navController.previousBackStackEntry != null) {
312312
navigator.navController.popBackStack()

‎app/src/main/java/com/threegap/bitnagil/Route.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ sealed interface Route {
3131
) : Route
3232

3333
@Serializable
34-
data class WriteRoutine(
34+
data class RoutineWrite(
3535
val routineId: String? = null,
3636
val isRegister: Boolean = true,
3737
val isUpdateRoutineFromNowDate: Boolean = true,
@@ -50,7 +50,7 @@ sealed interface Route {
5050
data object Guide : Route
5151

5252
@Serializable
53-
data object Report : Route
53+
data object ReportWrite : Route
5454

5555
@Serializable
5656
data object ReportHistory : Route

‎app/src/main/java/com/threegap/bitnagil/di/presentation/VersionNameProviderModule.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.threegap.bitnagil.di.presentation
22

3-
import com.threegap.bitnagil.presentation.common.version.AndroidApplicationVersionNameProvider
4-
import com.threegap.bitnagil.presentation.common.version.VersionNameProvider
3+
import com.threegap.bitnagil.presentation.util.version.AndroidApplicationVersionNameProvider
4+
import com.threegap.bitnagil.presentation.util.version.VersionNameProvider
55
import dagger.Binds
66
import dagger.Module
77
import dagger.hilt.InstallIn

‎app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import com.threegap.bitnagil.designsystem.R
2828
import com.threegap.bitnagil.designsystem.component.atom.BitnagilFloatingActionMenu
2929
import com.threegap.bitnagil.designsystem.component.atom.FloatingActionItem
3030
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
31-
import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
32-
import com.threegap.bitnagil.presentation.home.HomeScreenContainer
33-
import com.threegap.bitnagil.presentation.mypage.MyPageScreenContainer
34-
import com.threegap.bitnagil.presentation.recommendroutine.RecommendRoutineScreenContainer
31+
import com.threegap.bitnagil.presentation.screen.home.HomeScreenContainer
32+
import com.threegap.bitnagil.presentation.screen.mypage.MyPageScreenContainer
33+
import com.threegap.bitnagil.presentation.screen.recommendroutine.RecommendRoutineScreenContainer
34+
import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast
3535
import com.threegap.bitnagil.util.setStatusBarContentColor
3636

3737
@Composable

‎presentation/src/main/java/com/threegap/bitnagil/presentation/common/flow/CollectAsEffect.kt‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/DayOfWeekEtx.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/model/date/DayOfWeekEtx.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.common.extension
1+
package com.threegap.bitnagil.presentation.model.date
22

33
import com.threegap.bitnagil.domain.routine.model.DayOfWeek
44

presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportCategoryEtx.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/model/report/ReportCategoryEtx.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.common.extension
1+
package com.threegap.bitnagil.presentation.model.report
22

33
import androidx.annotation.DrawableRes
44
import com.threegap.bitnagil.designsystem.R

presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportStatusEtx.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/model/report/ReportStatusEtx.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.common.extension
1+
package com.threegap.bitnagil.presentation.model.report
22

33
import androidx.compose.runtime.Composable
44
import androidx.compose.ui.graphics.Color

presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendCategoryEtx.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/model/routine/RecommendCategoryEtx.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.common.extension
1+
package com.threegap.bitnagil.presentation.model.routine
22

33
import androidx.annotation.DrawableRes
44
import androidx.compose.runtime.Composable

0 commit comments

Comments
 (0)