Skip to content

Commit 5e9f387

Browse files
l5x5ll5x5l
committed
REFACTOR: 제보 상세, 제보 목록, 제보 작성 화면 경로 수정
1 parent b2ce757 commit 5e9f387

38 files changed

Lines changed: 95 additions & 94 deletions

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import com.threegap.bitnagil.presentation.screen.login.LoginScreenContainer
1313
import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingScreenContainer
1414
import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingViewModel
1515
import com.threegap.bitnagil.presentation.screen.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
16+
import com.threegap.bitnagil.presentation.screen.reportwrite.ReportScreenContainer
17+
import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailScreenContainer
18+
import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewModel
19+
import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg
20+
import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer
2121
import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer
2222
import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
2323
import com.threegap.bitnagil.presentation.splash.SplashScreenContainer

‎presentation/src/main/java/com/threegap/bitnagil/presentation/report/model/SubmitState.kt‎

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

‎presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailSideEffect.kt‎

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

‎presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/contract/ReportHistorySideEffect.kt‎

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

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailScreen.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailScreen.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.reportdetail
1+
package com.threegap.bitnagil.presentation.screen.reportdetail
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Arrangement
@@ -28,10 +28,10 @@ import coil3.request.ImageRequest
2828
import com.threegap.bitnagil.designsystem.BitnagilTheme
2929
import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
3030
import com.threegap.bitnagil.presentation.common.extension.displayTitle
31-
import com.threegap.bitnagil.presentation.reportdetail.component.atom.ReportProcessBadge
32-
import com.threegap.bitnagil.presentation.reportdetail.component.block.ReportDetailLabeledContent
33-
import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailState
34-
import com.threegap.bitnagil.presentation.reportdetail.util.toPresentationFormatInReportDetail
31+
import com.threegap.bitnagil.presentation.screen.reportdetail.component.atom.ReportProcessBadge
32+
import com.threegap.bitnagil.presentation.screen.reportdetail.component.block.ReportDetailLabeledContent
33+
import com.threegap.bitnagil.presentation.screen.reportdetail.contract.ReportDetailState
34+
import com.threegap.bitnagil.presentation.screen.reportdetail.util.toPresentationFormatInReportDetail
3535
import org.orbitmvi.orbit.compose.collectAsState
3636

3737
@Composable
@@ -141,7 +141,7 @@ private fun ReportDetailScreen(
141141
private fun ReportDetailScreenPreview() {
142142
BitnagilTheme {
143143
ReportDetailScreen(
144-
state = ReportDetailState.Init.copy(
144+
state = ReportDetailState.Companion.Init.copy(
145145
reportContent = "Lorem ipsum dolor sit amet, " +
146146
"consectetur adipiscing elit," +
147147
" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " +

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailViewModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/ReportDetailViewModel.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.threegap.bitnagil.presentation.reportdetail
1+
package com.threegap.bitnagil.presentation.screen.reportdetail
22

33
import androidx.lifecycle.ViewModel
44
import com.threegap.bitnagil.domain.report.usecase.GetReportUseCase
5-
import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailSideEffect
6-
import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailState
7-
import com.threegap.bitnagil.presentation.reportdetail.model.navarg.ReportDetailScreenArg
5+
import com.threegap.bitnagil.presentation.screen.reportdetail.contract.ReportDetailSideEffect
6+
import com.threegap.bitnagil.presentation.screen.reportdetail.contract.ReportDetailState
7+
import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg
88
import dagger.assisted.Assisted
99
import dagger.assisted.AssistedFactory
1010
import dagger.assisted.AssistedInject
@@ -18,7 +18,7 @@ class ReportDetailViewModel @AssistedInject constructor(
1818
private val getReportDetailUseCase: GetReportUseCase,
1919
@Assisted private val reportDetailArg: ReportDetailScreenArg,
2020
) : ContainerHost<ReportDetailState, ReportDetailSideEffect>, ViewModel() {
21-
override val container: Container<ReportDetailState, ReportDetailSideEffect> = container(initialState = ReportDetailState.Init)
21+
override val container: Container<ReportDetailState, ReportDetailSideEffect> = container(initialState = ReportDetailState.Companion.Init)
2222

2323
@AssistedFactory
2424
interface Factory {

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/atom/ReportProcessBadge.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/atom/ReportProcessBadge.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.reportdetail.component.atom
1+
package com.threegap.bitnagil.presentation.screen.reportdetail.component.atom
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Arrangement

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/block/ReportDetailLabeledContent.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/component/block/ReportDetailLabeledContent.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.reportdetail.component.block
1+
package com.threegap.bitnagil.presentation.screen.reportdetail.component.block
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Column

‎presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailSideEffect.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.threegap.bitnagil.presentation.screen.reportdetail.contract
2+
3+
interface ReportDetailSideEffect

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/contract/ReportDetailState.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/reportdetail/contract/ReportDetailState.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.reportdetail.contract
1+
package com.threegap.bitnagil.presentation.screen.reportdetail.contract
22

33
import com.threegap.bitnagil.domain.report.model.ReportCategory
44
import com.threegap.bitnagil.domain.report.model.ReportStatus

0 commit comments

Comments
 (0)