Skip to content

Commit 80fe7d6

Browse files
committed
REFACTOR: Presentation 레이어 내 유틸 및 확장 함수 파일 경로 수정, 일부 미사용 파일 제거
1 parent 0b5b8dc commit 80fe7d6

45 files changed

Lines changed: 62 additions & 84 deletions

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/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: 1 addition & 1 deletion
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
3231
import com.threegap.bitnagil.presentation.screen.home.HomeScreenContainer
3332
import com.threegap.bitnagil.presentation.screen.mypage.MyPageScreenContainer
3433
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

presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendLevelEtx.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/model/routine/RecommendLevelEtx.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 com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel
44

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import androidx.compose.runtime.remember
99
import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.unit.dp
1111
import androidx.hilt.navigation.compose.hiltViewModel
12-
import com.threegap.bitnagil.presentation.common.dimension.pxToDp
13-
import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
1412
import com.threegap.bitnagil.presentation.screen.emotion.component.template.EmotionRecommendRoutineScreen
1513
import com.threegap.bitnagil.presentation.screen.emotion.component.template.SimpleEmotionSelectionScreen
1614
import com.threegap.bitnagil.presentation.screen.emotion.component.template.SwipeEmotionSelectionScreen
1715
import com.threegap.bitnagil.presentation.screen.emotion.contract.EmotionSideEffect
1816
import com.threegap.bitnagil.presentation.screen.emotion.model.EmotionScreenStep
17+
import com.threegap.bitnagil.presentation.util.dimension.pxToDp
18+
import com.threegap.bitnagil.presentation.util.toast.GlobalBitnagilToast
1919
import org.orbitmvi.orbit.compose.collectAsState
2020
import org.orbitmvi.orbit.compose.collectSideEffect
2121

0 commit comments

Comments
 (0)