Issues #287 fix: 실행되는 형태로 수정

boostcampwm-2022 · Feb 7, 2023 · 81dda87 · 81dda87
1 parent df971ae
commit 81dda87
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 23 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
     implementation(projects.model)
     implementation(projects.common)
     implementation(projects.commonAndroid)
+    implementation(projects.commonLocation)
     implementation(projects.domain)
     implementation(projects.presentation)
     implementation(projects.data)

diff --git a/app/src/main/java/com/lighthouse/di/ProviderModule.kt b/app/src/main/java/com/lighthouse/di/ProviderModule.kt
@@ -1,7 +1,7 @@
 package com.lighthouse.di
 
 import android.content.Context
-import com.lighthouse.datasource.location.SharedLocationManager
+import com.lighthouse.common.utils.location.SharedLocationManager
 import com.lighthouse.presentation.background.NotificationHelper
 import dagger.Module
 import dagger.Provides

diff --git a/commons/common-android/build.gradle.kts b/commons/common-android/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace = "com.lighthouse.beep.common"
+    namespace = "com.lighthouse.beep.common.android"
 }
 
 dependencies {

diff --git a/commons/common-location/build.gradle.kts b/commons/common-location/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace = "com.lighthouse.beep.common"
+    namespace = "com.lighthouse.beep.common.location"
 }
 
 dependencies {

diff --git a/commons/common-recognizer/build.gradle.kts b/commons/common-recognizer/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace = "com.lighthouse.beep.common"
+    namespace = "com.lighthouse.beep.common.recognizer"
 }
 
 dependencies {

diff --git a/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSourceImpl.kt b/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSourceImpl.kt
@@ -6,7 +6,7 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
 import android.webkit.MimeTypeMap
-import com.lighthouse.domain.model.GalleryImage
+import com.lighthouse.beep.model.gallery.GalleryImage
 import java.util.Date
 import javax.inject.Inject
 

diff --git a/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImagePagingSource.kt b/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImagePagingSource.kt
@@ -2,7 +2,7 @@ package com.lighthouse.datasource.gallery
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.lighthouse.domain.model.GalleryImage
+import com.lighthouse.beep.model.gallery.GalleryImage
 
 class GalleryImagePagingSource(
     private val localSource: GalleryImageLocalSource,

diff --git a/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSource.kt b/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSource.kt
@@ -1,11 +1,11 @@
 package com.lighthouse.datasource.gifticon
 
+import com.lighthouse.beep.model.brand.Brand
+import com.lighthouse.beep.model.etc.SortBy
+import com.lighthouse.beep.model.gifticon.Gifticon
+import com.lighthouse.beep.model.user.UsageHistory
 import com.lighthouse.database.entity.GifticonEntity
 import com.lighthouse.database.entity.GifticonWithCrop
-import com.lighthouse.domain.model.Brand
-import com.lighthouse.domain.model.Gifticon
-import com.lighthouse.domain.model.SortBy
-import com.lighthouse.domain.model.UsageHistory
 import kotlinx.coroutines.flow.Flow
 
 interface GifticonLocalDataSource {

diff --git a/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSourceImpl.kt b/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSourceImpl.kt
@@ -1,16 +1,16 @@
 package com.lighthouse.datasource.gifticon
 
+import com.lighthouse.beep.model.brand.Brand
+import com.lighthouse.beep.model.etc.SortBy
+import com.lighthouse.beep.model.gifticon.Gifticon
+import com.lighthouse.beep.model.user.UsageHistory
 import com.lighthouse.core.exts.isExpired
 import com.lighthouse.core.exts.today
 import com.lighthouse.database.dao.GifticonDao
 import com.lighthouse.database.entity.GifticonEntity
 import com.lighthouse.database.entity.GifticonWithCrop
 import com.lighthouse.database.mapper.toUsageHistory
 import com.lighthouse.database.mapper.toUsageHistoryEntity
-import com.lighthouse.domain.model.Brand
-import com.lighthouse.domain.model.Gifticon
-import com.lighthouse.domain.model.SortBy
-import com.lighthouse.domain.model.UsageHistory
 import com.lighthouse.mapper.toDomain
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map

diff --git a/data/src/main/java/com/lighthouse/mapper/BrandPlaceInfoDataContainerMapper.kt b/data/src/main/java/com/lighthouse/mapper/BrandPlaceInfoDataContainerMapper.kt
@@ -1,6 +1,6 @@
 package com.lighthouse.mapper
 
-import com.lighthouse.domain.model.BrandPlaceInfo
+import com.lighthouse.beep.model.brand.BrandPlaceInfo
 import com.lighthouse.model.BrandPlaceInfoDataContainer
 
 internal fun List<BrandPlaceInfoDataContainer.BrandPlaceInfoData>.toDomain(brandName: String): List<BrandPlaceInfo> {

diff --git a/.../src/main/java/com/lighthouse/presentation/ui/detailgifticon/dialog/LargeBarcodeDialog.kt b/.../src/main/java/com/lighthouse/presentation/ui/detailgifticon/dialog/LargeBarcodeDialog.kt
@@ -15,7 +15,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class LargeBarcodeDialog : DialogFragment(R.layout.dialog_large_barcode) {
@@ -26,8 +25,8 @@ class LargeBarcodeDialog : DialogFragment(R.layout.dialog_large_barcode) {
             ""
         }
 
-    @Inject
-    lateinit var barcodeUtil: BarcodeUtil
+    // Hilt를 이용하여 주입
+    private val barcodeUtil = BarcodeUtil()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)

diff --git a/...n/src/main/java/com/lighthouse/presentation/ui/detailgifticon/dialog/UseGifticonDialog.kt b/...n/src/main/java/com/lighthouse/presentation/ui/detailgifticon/dialog/UseGifticonDialog.kt
@@ -20,16 +20,14 @@ import com.lighthouse.presentation.ui.detailgifticon.GifticonDetailViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class UseGifticonDialog : BottomSheetDialogFragment(R.layout.dialog_use_gifticon) {
     private val binding: DialogUseGifticonBinding by viewBindings()
     private val viewModel: GifticonDetailViewModel by activityViewModels()
     private var amountToUse = mutableStateOf(0)
 
-    @Inject
-    lateinit var barcodeUtil: BarcodeUtil
+    private val barcodeUtil = BarcodeUtil()
 
     override fun getTheme(): Int {
         return R.style.Theme_BEEP_BottomSheetDialog

diff --git a/presentation/src/main/java/com/lighthouse/presentation/ui/setting/UsedGifticonViewModel.kt b/presentation/src/main/java/com/lighthouse/presentation/ui/setting/UsedGifticonViewModel.kt
@@ -2,7 +2,7 @@ package com.lighthouse.presentation.ui.setting
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.lighthouse.domain.model.DbResult
+import com.lighthouse.beep.model.result.DbResult
 import com.lighthouse.domain.usecase.GetGifticonsUseCase
 import com.lighthouse.presentation.mapper.toPresentation
 import dagger.hilt.android.lifecycle.HiltViewModel

diff --git a/presentation/src/main/res/layout/fragment_setting_main.xml b/presentation/src/main/res/layout/fragment_setting_main.xml
@@ -5,7 +5,7 @@
 
     <data>
 
-        <import type="com.lighthouse.domain.model.UserPreferenceOption" />
+        <import type="com.lighthouse.beep.model.user.UserPreferenceOption" />
 
         <variable
             name="vm"