diff --git a/README.md b/README.md index 2ebbce9..012e2ce 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,13 @@ > NOW SOPT 34th 합동 세미나 앱 4조 Android팀
24.05.11 - 24.05.24 +![KREAM](https://github.com/NOW-SOPT-APP4-KREAM/KREAM-Android/assets/103172971/d3d9b1c3-81ef-47ef-8a73-bcbbc48b13e9) ## 🍨 *****Contributors***** | 배지현
[@jihyunniiii](https://github.com/jihyunniiii) | 박효빈
[@Hyobeen-Park](https://github.com/Hyobeen-Park) | 신민석
[@t1nm1ksun](https://github.com/t1nm1ksun) | |:---:|:-----------------------------------------------------------------------------:|:-----------------------------------------------------------------------------:| | | | | +| `View3 (검색 페이지)`,`View4 (상품 상세 페이지)` |`View1 (발매정보 페이지)`|`View2 (추천 페이지)`| ## 📗 *****Convention***** @@ -14,4 +16,45 @@
[📘 Android Coding Convention](https://jihyunniiii.notion.site/Android-Coding-Convention-027eef4f49d8434da8e4783b5ff7ce10?pvs=4)
-[📒 Package Convention](https://jihyunniiii.notion.site/Package-Convention-9f1c20d264b840e6850c48a618dc8b42?pvs=4) \ No newline at end of file +[📒 Package Convention](https://jihyunniiii.notion.site/Package-Convention-9f1c20d264b840e6850c48a618dc8b42?pvs=4) + +## 📷 *****ScreenShot***** + +https://github.com/NOW-SOPT-APP4-KREAM/KREAM-Android/assets/103172971/34d07a0b-2b58-48d2-98ad-c31c63b310a3 + + +## 📁 *****Foldering***** + +``` +📂 org.sopt.kream +┣ 📂 data +┃ ┣ 📂 datasource +┃ ┣ 📂 datasourceimpl +┃ ┣ 📂 mapper +┃ ┣ 📂 model +┃ ┃ ┣ 📂 request +┃ ┃ ┣ 📂 response +┃ ┣ 📂 repository +┃ ┣ 📂 service +┣ 📂 domain +┃ ┣ 📂 model +┃ ┣ 📂 repository +┣ 📂 presentation +┃ ┣ 📂 common +┃ ┣ 📂 model +┃ ┣ 📂 type +┃ ┣ 📂 ui +┃ ┃ ┣ 📂 main +┃ ┃ ┣ 📂 productdetail +┃ ┃ ┣ 📂 search +┣ 📂 theme +┣ 📂 util +┃ ┣ 📂 base +┃ ┣ 📂 component +┃ ┣ 📂 context +┃ ┣ 📂 fragment +┃ ┣ 📂 int +┃ ┣ 📂 intent +┃ ┣ 📂 modifier +┃ ┣ 📂 modifier +``` diff --git a/app/src/main/java/org/sopt/kream/data/ApiFactory.kt b/app/src/main/java/org/sopt/kream/data/ApiFactory.kt index 9d46566..7654188 100644 --- a/app/src/main/java/org/sopt/kream/data/ApiFactory.kt +++ b/app/src/main/java/org/sopt/kream/data/ApiFactory.kt @@ -6,7 +6,6 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import org.sopt.kream.BuildConfig -import org.sopt.kream.data.service.DummyService import org.sopt.kream.data.service.ProductService import retrofit2.Retrofit @@ -30,6 +29,5 @@ object ApiFactory { } object ServicePool { - val dummyService = ApiFactory.create() val productService = ApiFactory.create() } diff --git a/app/src/main/java/org/sopt/kream/data/datasource/DummyRemoteDataSource.kt b/app/src/main/java/org/sopt/kream/data/datasource/DummyRemoteDataSource.kt deleted file mode 100644 index 5b42f36..0000000 --- a/app/src/main/java/org/sopt/kream/data/datasource/DummyRemoteDataSource.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.sopt.kream.data.datasource - -import org.sopt.kream.data.model.response.ResponseGetDummyUserListDto - -interface DummyRemoteDataSource { - suspend fun getDummyUserList(page: Int): ResponseGetDummyUserListDto -} diff --git a/app/src/main/java/org/sopt/kream/data/datasourceimpl/DummyRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/kream/data/datasourceimpl/DummyRemoteDataSourceImpl.kt deleted file mode 100644 index e7d9c42..0000000 --- a/app/src/main/java/org/sopt/kream/data/datasourceimpl/DummyRemoteDataSourceImpl.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.sopt.kream.data.datasourceimpl - -import org.sopt.kream.data.ServicePool -import org.sopt.kream.data.datasource.DummyRemoteDataSource -import org.sopt.kream.data.model.response.ResponseGetDummyUserListDto - -class DummyRemoteDataSourceImpl : DummyRemoteDataSource { - private val dummyService = ServicePool.dummyService - - override suspend fun getDummyUserList(page: Int): ResponseGetDummyUserListDto = dummyService.getDummyListUserList(page = page) -} diff --git a/app/src/main/java/org/sopt/kream/data/model/request/RequestDummyDto.kt b/app/src/main/java/org/sopt/kream/data/model/request/RequestDummyDto.kt deleted file mode 100644 index 2259a51..0000000 --- a/app/src/main/java/org/sopt/kream/data/model/request/RequestDummyDto.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.sopt.kream.data.model.request - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class RequestDummyDto( - @SerialName("id") - val id: String, -) diff --git a/app/src/main/java/org/sopt/kream/data/model/response/ResponseGetDummyUserListDto.kt b/app/src/main/java/org/sopt/kream/data/model/response/ResponseGetDummyUserListDto.kt deleted file mode 100644 index b1f9be3..0000000 --- a/app/src/main/java/org/sopt/kream/data/model/response/ResponseGetDummyUserListDto.kt +++ /dev/null @@ -1,49 +0,0 @@ -package org.sopt.kream.data.model.response - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable -import org.sopt.kream.domain.model.DummyEntity - -@Serializable -class ResponseGetDummyUserListDto( - @SerialName("page") - val page: Int, - @SerialName("per_page") - val perPage: Int, - @SerialName("total") - val total: Int, - @SerialName("total_pages") - val totalPages: Int, - @SerialName("data") - val data: List, - @SerialName("support") - val support: Support, -) { - @Serializable - data class User( - @SerialName("id") - val id: Int, - @SerialName("email") - val email: String, - @SerialName("first_name") - val firstName: String, - @SerialName("last_name") - val lastName: String, - @SerialName("avatar") - val avatar: String, - ) { - fun toDummyEntity() = - DummyEntity( - id = this.id, - firstName = this.firstName, - ) - } - - @Serializable - data class Support( - @SerialName("url") - val url: String, - @SerialName("text") - val text: String, - ) -} diff --git a/app/src/main/java/org/sopt/kream/data/repository/DummyRepositoryImpl.kt b/app/src/main/java/org/sopt/kream/data/repository/DummyRepositoryImpl.kt deleted file mode 100644 index 90818b7..0000000 --- a/app/src/main/java/org/sopt/kream/data/repository/DummyRepositoryImpl.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.sopt.kream.data.repository - -import org.sopt.kream.data.datasource.DummyRemoteDataSource -import org.sopt.kream.data.model.response.ResponseGetDummyUserListDto -import org.sopt.kream.domain.model.DummyEntity -import org.sopt.kream.domain.repository.DummyRepository - -class DummyRepositoryImpl( - private val dummyRemoteDataSource: DummyRemoteDataSource, -) : DummyRepository { - override suspend fun getDummyUserList(page: Int): Result> = - runCatching { - dummyRemoteDataSource.getDummyUserList(page = page).data.map { user: ResponseGetDummyUserListDto.User -> user.toDummyEntity() } - } -} diff --git a/app/src/main/java/org/sopt/kream/data/service/DummyService.kt b/app/src/main/java/org/sopt/kream/data/service/DummyService.kt deleted file mode 100644 index d3a75b5..0000000 --- a/app/src/main/java/org/sopt/kream/data/service/DummyService.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.sopt.kream.data.service - -import org.sopt.kream.data.model.response.ResponseGetDummyUserListDto -import retrofit2.http.GET -import retrofit2.http.Query - -interface DummyService { - @GET("api/users") - suspend fun getDummyListUserList( - @Query("page") page: Int, - ): ResponseGetDummyUserListDto -} diff --git a/app/src/main/java/org/sopt/kream/domain/model/DummyEntity.kt b/app/src/main/java/org/sopt/kream/domain/model/DummyEntity.kt deleted file mode 100644 index 684b89a..0000000 --- a/app/src/main/java/org/sopt/kream/domain/model/DummyEntity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.sopt.kream.domain.model - -data class DummyEntity( - val id: Int, - val firstName: String, -) diff --git a/app/src/main/java/org/sopt/kream/domain/repository/DummyRepository.kt b/app/src/main/java/org/sopt/kream/domain/repository/DummyRepository.kt deleted file mode 100644 index f13c897..0000000 --- a/app/src/main/java/org/sopt/kream/domain/repository/DummyRepository.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.sopt.kream.domain.repository - -import org.sopt.kream.domain.model.DummyEntity - -interface DummyRepository { - suspend fun getDummyUserList(page: Int): Result> -} diff --git a/app/src/main/java/org/sopt/kream/presentation/common/ViewModelFactory.kt b/app/src/main/java/org/sopt/kream/presentation/common/ViewModelFactory.kt index 3ff05e2..255576b 100644 --- a/app/src/main/java/org/sopt/kream/presentation/common/ViewModelFactory.kt +++ b/app/src/main/java/org/sopt/kream/presentation/common/ViewModelFactory.kt @@ -2,11 +2,8 @@ package org.sopt.kream.presentation.common import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import org.sopt.kream.data.datasourceimpl.DummyRemoteDataSourceImpl import org.sopt.kream.data.datasourceimpl.ProductRemoteDataSourceImpl -import org.sopt.kream.data.repository.DummyRepositoryImpl import org.sopt.kream.data.repository.ProductRepositoryImpl -import org.sopt.kream.presentation.ui.dummy.DummyViewModel import org.sopt.kream.presentation.ui.main.home.recommend.RecommendViewModel import org.sopt.kream.presentation.ui.main.home.release.ReleaseProductViewModel import org.sopt.kream.presentation.ui.productdetail.ProductDetailViewModel @@ -14,9 +11,7 @@ import org.sopt.kream.presentation.ui.search.SearchViewModel class ViewModelFactory : ViewModelProvider.Factory { override fun create(modelClass: Class): T { - if (modelClass.isAssignableFrom(DummyViewModel::class.java)) { - return DummyViewModel(DummyRepositoryImpl(DummyRemoteDataSourceImpl())) as T - } else if (modelClass.isAssignableFrom(SearchViewModel::class.java)) { + if (modelClass.isAssignableFrom(SearchViewModel::class.java)) { return SearchViewModel(ProductRepositoryImpl(ProductRemoteDataSourceImpl())) as T } else if (modelClass.isAssignableFrom(ReleaseProductViewModel::class.java)) { return ReleaseProductViewModel(ProductRepositoryImpl(ProductRemoteDataSourceImpl())) as T diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/model/Advertisement.kt b/app/src/main/java/org/sopt/kream/presentation/model/Advertisement.kt similarity index 61% rename from app/src/main/java/org/sopt/kream/presentation/ui/model/Advertisement.kt rename to app/src/main/java/org/sopt/kream/presentation/model/Advertisement.kt index d48e880..dd7be4a 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/model/Advertisement.kt +++ b/app/src/main/java/org/sopt/kream/presentation/model/Advertisement.kt @@ -1,4 +1,4 @@ -package org.sopt.kream.presentation.ui.model +package org.sopt.kream.presentation.model data class Advertisement( val id: Int, diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/model/ProductDetailInfo.kt b/app/src/main/java/org/sopt/kream/presentation/model/ProductDetailInfo.kt similarity index 58% rename from app/src/main/java/org/sopt/kream/presentation/ui/model/ProductDetailInfo.kt rename to app/src/main/java/org/sopt/kream/presentation/model/ProductDetailInfo.kt index 3739099..061cf47 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/model/ProductDetailInfo.kt +++ b/app/src/main/java/org/sopt/kream/presentation/model/ProductDetailInfo.kt @@ -1,6 +1,6 @@ -package org.sopt.kream.presentation.ui.model +package org.sopt.kream.presentation.model -import org.sopt.kream.presentation.ui.type.ProductDetailInfoType +import org.sopt.kream.presentation.type.ProductDetailInfoType data class ProductDetailInfo( val productDetailInfoType: ProductDetailInfoType, diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/type/AdvertisementType.kt b/app/src/main/java/org/sopt/kream/presentation/type/AdvertisementType.kt similarity index 84% rename from app/src/main/java/org/sopt/kream/presentation/ui/type/AdvertisementType.kt rename to app/src/main/java/org/sopt/kream/presentation/type/AdvertisementType.kt index 0c6a327..ad1d2da 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/type/AdvertisementType.kt +++ b/app/src/main/java/org/sopt/kream/presentation/type/AdvertisementType.kt @@ -1,4 +1,4 @@ -package org.sopt.kream.presentation.ui.type +package org.sopt.kream.presentation.type import org.sopt.kream.R diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/type/HomeTabBarType.kt b/app/src/main/java/org/sopt/kream/presentation/type/HomeTabBarType.kt similarity index 96% rename from app/src/main/java/org/sopt/kream/presentation/ui/type/HomeTabBarType.kt rename to app/src/main/java/org/sopt/kream/presentation/type/HomeTabBarType.kt index 7deb86b..79bd9fa 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/type/HomeTabBarType.kt +++ b/app/src/main/java/org/sopt/kream/presentation/type/HomeTabBarType.kt @@ -1,4 +1,4 @@ -package org.sopt.kream.presentation.ui.type +package org.sopt.kream.presentation.type import androidx.annotation.StringRes import org.sopt.kream.R diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/type/ProductDetailButtonType.kt b/app/src/main/java/org/sopt/kream/presentation/type/ProductDetailButtonType.kt similarity index 95% rename from app/src/main/java/org/sopt/kream/presentation/ui/type/ProductDetailButtonType.kt rename to app/src/main/java/org/sopt/kream/presentation/type/ProductDetailButtonType.kt index 1e7b14b..2a6dd16 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/type/ProductDetailButtonType.kt +++ b/app/src/main/java/org/sopt/kream/presentation/type/ProductDetailButtonType.kt @@ -1,4 +1,4 @@ -package org.sopt.kream.presentation.ui.type +package org.sopt.kream.presentation.type import androidx.annotation.ColorRes import androidx.annotation.StringRes diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/type/ProductDetailInfoType.kt b/app/src/main/java/org/sopt/kream/presentation/type/ProductDetailInfoType.kt similarity index 93% rename from app/src/main/java/org/sopt/kream/presentation/ui/type/ProductDetailInfoType.kt rename to app/src/main/java/org/sopt/kream/presentation/type/ProductDetailInfoType.kt index 7655315..a59aa66 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/type/ProductDetailInfoType.kt +++ b/app/src/main/java/org/sopt/kream/presentation/type/ProductDetailInfoType.kt @@ -1,4 +1,4 @@ -package org.sopt.kream.presentation.ui.type +package org.sopt.kream.presentation.type import androidx.annotation.StringRes import org.sopt.kream.R diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/type/RecommendAdvertisementType.kt b/app/src/main/java/org/sopt/kream/presentation/type/RecommendAdvertisementType.kt similarity index 88% rename from app/src/main/java/org/sopt/kream/presentation/ui/type/RecommendAdvertisementType.kt rename to app/src/main/java/org/sopt/kream/presentation/type/RecommendAdvertisementType.kt index bb33efb..2f29c68 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/type/RecommendAdvertisementType.kt +++ b/app/src/main/java/org/sopt/kream/presentation/type/RecommendAdvertisementType.kt @@ -1,4 +1,4 @@ -package org.sopt.kream.presentation.ui.type +package org.sopt.kream.presentation.type import org.sopt.kream.R diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/type/RecommendCircleMenuType.kt b/app/src/main/java/org/sopt/kream/presentation/type/RecommendCircleMenuType.kt similarity index 63% rename from app/src/main/java/org/sopt/kream/presentation/ui/type/RecommendCircleMenuType.kt rename to app/src/main/java/org/sopt/kream/presentation/type/RecommendCircleMenuType.kt index 1c5323e..3b0b861 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/type/RecommendCircleMenuType.kt +++ b/app/src/main/java/org/sopt/kream/presentation/type/RecommendCircleMenuType.kt @@ -1,4 +1,4 @@ -package org.sopt.kream.presentation.ui.type +package org.sopt.kream.presentation.type import androidx.annotation.DrawableRes import org.sopt.kream.R @@ -8,43 +8,43 @@ enum class RecommendCircleMenuType( val menu: Int, ) { KREAM_CARD( - image = R.drawable.view2_img_cricle_01, + image = R.drawable.img_view2_cricle_01, menu = R.string.type_circle_menu_kream_card, ), CREAM_DRAW( - image = R.drawable.view2_img_cricle_02, + image = R.drawable.img_view2_cricle_02, menu = R.string.type_circle_menu_kream_draw, ), MAN_RECOMMEND( - image = R.drawable.view2_img_cricle_03, + image = R.drawable.img_view2_cricle_03, menu = R.string.type_circle_menu_man_recommend, ), WOMAN_RECOMMEND( - image = R.drawable.view2_img_cricle_04, + image = R.drawable.img_view2_cricle_04, menu = R.string.type_circle_menu_woman_recommend, ), NEW_RECOMMEND( - image = R.drawable.view2_img_cricle_05, + image = R.drawable.img_view2_cricle_05, menu = R.string.type_circle_menu_new_recommend, ), UNDER_PRICE( - image = R.drawable.view2_img_cricle_06, + image = R.drawable.img_view2_cricle_06, menu = R.string.type_circle_menu_under_price, ), SPRING_SALE( - image = R.drawable.view2_img_cricle_07, + image = R.drawable.img_view2_cricle_07, menu = R.string.type_circle_menu_spring_sale, ), CHANEL( - image = R.drawable.view2_img_cricle_08, + image = R.drawable.img_view2_cricle_08, menu = R.string.type_circle_menu_chanel, ), MAY( - image = R.drawable.view2_img_cricle_09, + image = R.drawable.img_view2_cricle_09, menu = R.string.type_circle_menu_may, ), SONY_SUPREME( - image = R.drawable.view2_img_cricle_10, + image = R.drawable.img_view2_cricle_10, menu = R.string.type_circle_menu_sony_supreme, ), } diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/type/SearchTabBarType.kt b/app/src/main/java/org/sopt/kream/presentation/type/SearchTabBarType.kt similarity index 91% rename from app/src/main/java/org/sopt/kream/presentation/ui/type/SearchTabBarType.kt rename to app/src/main/java/org/sopt/kream/presentation/type/SearchTabBarType.kt index 6c5a6fd..ef0ed47 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/type/SearchTabBarType.kt +++ b/app/src/main/java/org/sopt/kream/presentation/type/SearchTabBarType.kt @@ -1,4 +1,4 @@ -package org.sopt.kream.presentation.ui.type +package org.sopt.kream.presentation.type import androidx.annotation.StringRes import org.sopt.kream.R diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/dummy/DummyActivity.kt b/app/src/main/java/org/sopt/kream/presentation/ui/dummy/DummyActivity.kt deleted file mode 100644 index dafd29a..0000000 --- a/app/src/main/java/org/sopt/kream/presentation/ui/dummy/DummyActivity.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.sopt.kream.presentation.ui.dummy - -import android.os.Bundle -import androidx.activity.viewModels -import org.sopt.kream.databinding.ActivityDummyBinding -import org.sopt.kream.presentation.common.ViewModelFactory -import org.sopt.kream.util.base.BindingActivity - -class DummyActivity : BindingActivity({ ActivityDummyBinding.inflate(it) }) { - private val dummyViewModel: DummyViewModel by viewModels { ViewModelFactory() } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - } -} diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/dummy/DummyViewModel.kt b/app/src/main/java/org/sopt/kream/presentation/ui/dummy/DummyViewModel.kt deleted file mode 100644 index fd3f628..0000000 --- a/app/src/main/java/org/sopt/kream/presentation/ui/dummy/DummyViewModel.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.sopt.kream.presentation.ui.dummy - -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import kotlinx.coroutines.launch -import org.sopt.kream.domain.repository.DummyRepository - -class DummyViewModel( - private val dummyRepository: DummyRepository, -) : ViewModel() { - fun getDummyUserList(page: Int = 2) { - viewModelScope.launch { - dummyRepository.getDummyUserList(page = page) - } - } -} diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/HomeFragment.kt b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/HomeFragment.kt index 05d283d..9cf40b9 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/HomeFragment.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/HomeFragment.kt @@ -23,9 +23,9 @@ import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import org.sopt.kream.R import org.sopt.kream.databinding.FragmentHomeBinding +import org.sopt.kream.presentation.type.HomeTabBarType import org.sopt.kream.presentation.ui.main.home.recommend.RecommendFragment import org.sopt.kream.presentation.ui.main.home.release.ReleaseFragment -import org.sopt.kream.presentation.ui.type.HomeTabBarType import org.sopt.kream.theme.PinkColor import org.sopt.kream.util.base.BindingFragment import org.sopt.kream.util.component.KreamTab diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendCircleMenuAdapter.kt b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendCircleMenuAdapter.kt index 749d6c2..4822896 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendCircleMenuAdapter.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendCircleMenuAdapter.kt @@ -4,7 +4,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter import org.sopt.kream.databinding.ItemRecommendCircleMenuBinding -import org.sopt.kream.presentation.ui.type.RecommendCircleMenuType +import org.sopt.kream.presentation.type.RecommendCircleMenuType import org.sopt.kream.util.view.ItemDiffCallback class RecommendCircleMenuAdapter() : ListAdapter( diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendCircleMenuViewHolder.kt b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendCircleMenuViewHolder.kt index 45c3e32..4d773bd 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendCircleMenuViewHolder.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendCircleMenuViewHolder.kt @@ -2,7 +2,7 @@ package org.sopt.kream.presentation.ui.main.home.recommend import androidx.recyclerview.widget.RecyclerView import org.sopt.kream.databinding.ItemRecommendCircleMenuBinding -import org.sopt.kream.presentation.ui.type.RecommendCircleMenuType +import org.sopt.kream.presentation.type.RecommendCircleMenuType class RecommendCircleMenuViewHolder( private val binding: ItemRecommendCircleMenuBinding, diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendFragment.kt b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendFragment.kt index f1abf23..27089e8 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendFragment.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/recommend/RecommendFragment.kt @@ -16,8 +16,8 @@ import kotlinx.coroutines.flow.onEach import org.sopt.kream.R import org.sopt.kream.databinding.FragmentRecommendBinding import org.sopt.kream.presentation.common.ViewModelFactory -import org.sopt.kream.presentation.ui.type.RecommendAdvertisementType -import org.sopt.kream.presentation.ui.type.RecommendCircleMenuType +import org.sopt.kream.presentation.type.RecommendAdvertisementType +import org.sopt.kream.presentation.type.RecommendCircleMenuType import org.sopt.kream.util.base.BindingFragment import org.sopt.kream.util.chunkList import org.sopt.kream.util.view.UiState diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseAdvertisementViewPager.kt b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseAdvertisementViewPager.kt index 480fe98..f10ed34 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseAdvertisementViewPager.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseAdvertisementViewPager.kt @@ -34,7 +34,7 @@ import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.rememberPagerState import kotlinx.coroutines.delay import org.sopt.kream.R -import org.sopt.kream.presentation.ui.model.Advertisement +import org.sopt.kream.presentation.model.Advertisement import org.sopt.kream.theme.robotoBold import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseFragment.kt b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseFragment.kt index d96920e..dae994c 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseFragment.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseFragment.kt @@ -48,8 +48,8 @@ import org.sopt.kream.R import org.sopt.kream.data.model.response.ResponseReleaseProductDto import org.sopt.kream.databinding.FragmentReleaseBinding import org.sopt.kream.presentation.common.ViewModelFactory +import org.sopt.kream.presentation.model.Advertisement import org.sopt.kream.presentation.ui.main.home.recommend.RecommendFragment -import org.sopt.kream.presentation.ui.model.Advertisement import org.sopt.kream.theme.body4Bold import org.sopt.kream.theme.body5Regular import org.sopt.kream.theme.body6Regular diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseProductViewModel.kt b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseProductViewModel.kt index e1b08de..cd16be5 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseProductViewModel.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseProductViewModel.kt @@ -11,8 +11,8 @@ import org.sopt.kream.data.ServicePool import org.sopt.kream.data.model.response.ResponseReleaseProductDto import org.sopt.kream.data.service.ProductService.Companion.MEMBER_ID import org.sopt.kream.domain.repository.ProductRepository -import org.sopt.kream.presentation.ui.model.Advertisement -import org.sopt.kream.presentation.ui.type.AdvertisementType +import org.sopt.kream.presentation.model.Advertisement +import org.sopt.kream.presentation.type.AdvertisementType import org.sopt.kream.util.view.UiState class ReleaseProductViewModel( diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailFragment.kt b/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailFragment.kt index 02ea677..1a26a78 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailFragment.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailFragment.kt @@ -12,10 +12,10 @@ import kotlinx.coroutines.flow.onEach import org.sopt.kream.R import org.sopt.kream.databinding.FragmentProductDetailBinding import org.sopt.kream.presentation.common.ViewModelFactory -import org.sopt.kream.presentation.ui.model.ProductDetailInfo +import org.sopt.kream.presentation.model.ProductDetailInfo +import org.sopt.kream.presentation.type.ProductDetailButtonType +import org.sopt.kream.presentation.type.ProductDetailInfoType import org.sopt.kream.presentation.ui.search.SearchFragment.Companion.PRODUCT_ID -import org.sopt.kream.presentation.ui.type.ProductDetailButtonType -import org.sopt.kream.presentation.ui.type.ProductDetailInfoType import org.sopt.kream.util.base.BindingFragment import org.sopt.kream.util.component.KreamProductDetailStyleImageView import org.sopt.kream.util.view.UiState diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailInfoAdapter.kt b/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailInfoAdapter.kt index 17d5293..4ca0785 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailInfoAdapter.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailInfoAdapter.kt @@ -4,7 +4,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter import org.sopt.kream.databinding.ItemProductDetailInfoBinding -import org.sopt.kream.presentation.ui.model.ProductDetailInfo +import org.sopt.kream.presentation.model.ProductDetailInfo import org.sopt.kream.util.view.ItemDiffCallback class ProductDetailInfoAdapter() : ListAdapter( diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailInfoViewHolder.kt b/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailInfoViewHolder.kt index 465216b..37572a3 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailInfoViewHolder.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/productdetail/ProductDetailInfoViewHolder.kt @@ -5,7 +5,7 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import org.sopt.kream.databinding.ItemProductDetailInfoBinding -import org.sopt.kream.presentation.ui.model.ProductDetailInfo +import org.sopt.kream.presentation.model.ProductDetailInfo import org.sopt.kream.util.context.stringOf import org.sopt.kream.util.int.toPx diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/search/SearchFragment.kt b/app/src/main/java/org/sopt/kream/presentation/ui/search/SearchFragment.kt index de033ea..3bfd253 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/search/SearchFragment.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/search/SearchFragment.kt @@ -28,8 +28,8 @@ import kotlinx.coroutines.flow.onEach import org.sopt.kream.R import org.sopt.kream.databinding.FragmentSearchBinding import org.sopt.kream.presentation.common.ViewModelFactory +import org.sopt.kream.presentation.type.SearchTabBarType import org.sopt.kream.presentation.ui.main.home.HomeFragment.Companion.SEARCH_WORD -import org.sopt.kream.presentation.ui.type.SearchTabBarType import org.sopt.kream.util.base.BindingFragment import org.sopt.kream.util.component.KreamTab import org.sopt.kream.util.component.KreamTabBar diff --git a/app/src/main/java/org/sopt/kream/util/component/KreamProductDetailButton.kt b/app/src/main/java/org/sopt/kream/util/component/KreamProductDetailButton.kt index 86bf146..a17fcb3 100644 --- a/app/src/main/java/org/sopt/kream/util/component/KreamProductDetailButton.kt +++ b/app/src/main/java/org/sopt/kream/util/component/KreamProductDetailButton.kt @@ -6,7 +6,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import org.sopt.kream.databinding.ButtonDetailProductKreamBinding -import org.sopt.kream.presentation.ui.type.ProductDetailButtonType +import org.sopt.kream.presentation.type.ProductDetailButtonType import org.sopt.kream.util.view.colorOf import org.sopt.kream.util.view.setBackgroundTint import org.sopt.kream.util.view.stringOf diff --git a/app/src/main/res/drawable/view2_img_cricle_01.png b/app/src/main/res/drawable/img_view2_cricle_01.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_01.png rename to app/src/main/res/drawable/img_view2_cricle_01.png diff --git a/app/src/main/res/drawable/view2_img_cricle_02.png b/app/src/main/res/drawable/img_view2_cricle_02.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_02.png rename to app/src/main/res/drawable/img_view2_cricle_02.png diff --git a/app/src/main/res/drawable/view2_img_cricle_03.png b/app/src/main/res/drawable/img_view2_cricle_03.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_03.png rename to app/src/main/res/drawable/img_view2_cricle_03.png diff --git a/app/src/main/res/drawable/view2_img_cricle_04.png b/app/src/main/res/drawable/img_view2_cricle_04.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_04.png rename to app/src/main/res/drawable/img_view2_cricle_04.png diff --git a/app/src/main/res/drawable/view2_img_cricle_05.png b/app/src/main/res/drawable/img_view2_cricle_05.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_05.png rename to app/src/main/res/drawable/img_view2_cricle_05.png diff --git a/app/src/main/res/drawable/view2_img_cricle_06.png b/app/src/main/res/drawable/img_view2_cricle_06.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_06.png rename to app/src/main/res/drawable/img_view2_cricle_06.png diff --git a/app/src/main/res/drawable/view2_img_cricle_07.png b/app/src/main/res/drawable/img_view2_cricle_07.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_07.png rename to app/src/main/res/drawable/img_view2_cricle_07.png diff --git a/app/src/main/res/drawable/view2_img_cricle_08.png b/app/src/main/res/drawable/img_view2_cricle_08.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_08.png rename to app/src/main/res/drawable/img_view2_cricle_08.png diff --git a/app/src/main/res/drawable/view2_img_cricle_09.png b/app/src/main/res/drawable/img_view2_cricle_09.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_09.png rename to app/src/main/res/drawable/img_view2_cricle_09.png diff --git a/app/src/main/res/drawable/view2_img_cricle_10.png b/app/src/main/res/drawable/img_view2_cricle_10.png similarity index 100% rename from app/src/main/res/drawable/view2_img_cricle_10.png rename to app/src/main/res/drawable/img_view2_cricle_10.png