From e343cfdc5d19133cda22e58cd4d06000c111c41b Mon Sep 17 00:00:00 2001 From: chanu Date: Sun, 24 Nov 2024 22:24:55 +0900 Subject: [PATCH] #115 [move] : move NewsInfoModel to model module --- .../src/main/java/com/teamwable/model/news}/NewsInfoModel.kt | 2 +- .../news/src/main/java/com/teamwable/news/NewsDetailFragment.kt | 2 +- feature/news/src/main/java/com/teamwable/news/NewsViewModel.kt | 2 +- .../src/main/java/com/teamwable/news/news/NewsNewsFragment.kt | 2 +- .../news/src/main/java/com/teamwable/news/news/NewsNewsRoute.kt | 2 +- .../java/com/teamwable/news/news/component/NewsComponent.kt | 2 +- .../main/java/com/teamwable/news/notice/NewsNoticeFragment.kt | 2 +- .../src/main/java/com/teamwable/news/notice/NewsNoticeItem.kt | 2 +- .../src/main/java/com/teamwable/news/notice/NewsNoticeRoute.kt | 2 +- feature/news/src/main/res/navigation/graph_news.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename {feature/news/src/main/java/com/teamwable/news/model => core/model/src/main/java/com/teamwable/model/news}/NewsInfoModel.kt (88%) diff --git a/feature/news/src/main/java/com/teamwable/news/model/NewsInfoModel.kt b/core/model/src/main/java/com/teamwable/model/news/NewsInfoModel.kt similarity index 88% rename from feature/news/src/main/java/com/teamwable/news/model/NewsInfoModel.kt rename to core/model/src/main/java/com/teamwable/model/news/NewsInfoModel.kt index e80e659d..bfba30b3 100644 --- a/feature/news/src/main/java/com/teamwable/news/model/NewsInfoModel.kt +++ b/core/model/src/main/java/com/teamwable/model/news/NewsInfoModel.kt @@ -1,4 +1,4 @@ -package com.teamwable.news.model +package com.teamwable.model.news import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/feature/news/src/main/java/com/teamwable/news/NewsDetailFragment.kt b/feature/news/src/main/java/com/teamwable/news/NewsDetailFragment.kt index 21d7b9c8..f16fc213 100644 --- a/feature/news/src/main/java/com/teamwable/news/NewsDetailFragment.kt +++ b/feature/news/src/main/java/com/teamwable/news/NewsDetailFragment.kt @@ -1,8 +1,8 @@ package com.teamwable.news import androidx.navigation.fragment.navArgs +import com.teamwable.model.news.NewsInfoModel import com.teamwable.news.databinding.FragmentNewsDetailBinding -import com.teamwable.news.model.NewsInfoModel import com.teamwable.ui.base.BindingFragment class NewsDetailFragment : BindingFragment(FragmentNewsDetailBinding::inflate) { diff --git a/feature/news/src/main/java/com/teamwable/news/NewsViewModel.kt b/feature/news/src/main/java/com/teamwable/news/NewsViewModel.kt index 15906290..69496021 100644 --- a/feature/news/src/main/java/com/teamwable/news/NewsViewModel.kt +++ b/feature/news/src/main/java/com/teamwable/news/NewsViewModel.kt @@ -4,9 +4,9 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.teamwable.common.uistate.UiState import com.teamwable.data.repository.NewsRepository +import com.teamwable.model.news.NewsInfoModel import com.teamwable.model.news.NewsMatchModel import com.teamwable.model.news.NewsRankModel -import com.teamwable.news.model.NewsInfoModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/feature/news/src/main/java/com/teamwable/news/news/NewsNewsFragment.kt b/feature/news/src/main/java/com/teamwable/news/news/NewsNewsFragment.kt index 71cf116d..561cde27 100644 --- a/feature/news/src/main/java/com/teamwable/news/news/NewsNewsFragment.kt +++ b/feature/news/src/main/java/com/teamwable/news/news/NewsNewsFragment.kt @@ -3,9 +3,9 @@ package com.teamwable.news.news import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.fragment.findNavController import com.teamwable.designsystem.theme.WableTheme +import com.teamwable.model.news.NewsInfoModel import com.teamwable.news.NewsFragmentDirections import com.teamwable.news.databinding.FragmentNewsNewsBinding -import com.teamwable.news.model.NewsInfoModel import com.teamwable.ui.base.BindingFragment import dagger.hilt.android.AndroidEntryPoint diff --git a/feature/news/src/main/java/com/teamwable/news/news/NewsNewsRoute.kt b/feature/news/src/main/java/com/teamwable/news/news/NewsNewsRoute.kt index ef7e4283..b8ad516a 100644 --- a/feature/news/src/main/java/com/teamwable/news/news/NewsNewsRoute.kt +++ b/feature/news/src/main/java/com/teamwable/news/news/NewsNewsRoute.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.teamwable.designsystem.theme.WableTheme -import com.teamwable.news.model.NewsInfoModel +import com.teamwable.model.news.NewsInfoModel import com.teamwable.news.news.component.WableNewsItems import com.teamwable.news.news.component.WableNewsTopBanner diff --git a/feature/news/src/main/java/com/teamwable/news/news/component/NewsComponent.kt b/feature/news/src/main/java/com/teamwable/news/news/component/NewsComponent.kt index c7038c67..87ebb790 100644 --- a/feature/news/src/main/java/com/teamwable/news/news/component/NewsComponent.kt +++ b/feature/news/src/main/java/com/teamwable/news/news/component/NewsComponent.kt @@ -26,7 +26,7 @@ import com.skydoves.landscapist.ImageOptions import com.skydoves.landscapist.glide.GlideImage import com.teamwable.designsystem.extension.composable.toImageVector import com.teamwable.designsystem.theme.WableTheme -import com.teamwable.news.model.NewsInfoModel +import com.teamwable.model.news.NewsInfoModel @Composable fun WableNewsTopBanner( diff --git a/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeFragment.kt b/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeFragment.kt index e1ab6b24..4cb97ac7 100644 --- a/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeFragment.kt +++ b/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeFragment.kt @@ -5,9 +5,9 @@ import androidx.annotation.RequiresApi import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.fragment.findNavController import com.teamwable.designsystem.theme.WableTheme +import com.teamwable.model.news.NewsInfoModel import com.teamwable.news.NewsFragmentDirections import com.teamwable.news.databinding.FragmentNewsNoticeBinding -import com.teamwable.news.model.NewsInfoModel import com.teamwable.ui.base.BindingFragment import dagger.hilt.android.AndroidEntryPoint diff --git a/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeItem.kt b/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeItem.kt index 97229f4a..da91ef91 100644 --- a/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeItem.kt +++ b/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeItem.kt @@ -17,7 +17,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.teamwable.designsystem.theme.WableTheme -import com.teamwable.news.model.NewsInfoModel +import com.teamwable.model.news.NewsInfoModel import com.teamwable.ui.util.CalculateTime @RequiresApi(Build.VERSION_CODES.O) diff --git a/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeRoute.kt b/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeRoute.kt index 15c31127..a77b46dd 100644 --- a/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeRoute.kt +++ b/feature/news/src/main/java/com/teamwable/news/notice/NewsNoticeRoute.kt @@ -17,9 +17,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.teamwable.designsystem.theme.WableTheme +import com.teamwable.model.news.NewsInfoModel import com.teamwable.news.NewsViewModel import com.teamwable.news.R -import com.teamwable.news.model.NewsInfoModel @RequiresApi(Build.VERSION_CODES.O) @Composable diff --git a/feature/news/src/main/res/navigation/graph_news.xml b/feature/news/src/main/res/navigation/graph_news.xml index c1463cc6..78dc0ce0 100644 --- a/feature/news/src/main/res/navigation/graph_news.xml +++ b/feature/news/src/main/res/navigation/graph_news.xml @@ -22,6 +22,6 @@ tools:layout="@layout/fragment_news_detail"> + app:argType="com.teamwable.model.news.NewsInfoModel" />