From 011a5881785e443b187866f5be3a19d55d682ff0 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 3 Dec 2024 05:54:29 +0900 Subject: [PATCH] =?UTF-8?q?[FEAT/#302]=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/terning/feature/calendar/list/CalendarListViewModel.kt | 3 ++- .../terning/feature/calendar/month/CalendarMonthViewModel.kt | 3 ++- .../com/terning/feature/calendar/week/CalendarWeekViewModel.kt | 3 ++- .../com/terning/feature/dialog/cancel/ScrapCancelDialog.kt | 3 ++- .../main/java/com/terning/feature/dialog/detail/ScrapDialog.kt | 3 ++- .../com/terning/feature/dialog/detail/ScrapDialogViewModel.kt | 3 ++- .../feature/filtering/filteringthree/FilteringThreeRoute.kt | 3 ++- .../feature/filtering/startfiltering/StartFilteringRoute.kt | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/feature/calendar/src/main/java/com/terning/feature/calendar/list/CalendarListViewModel.kt b/feature/calendar/src/main/java/com/terning/feature/calendar/list/CalendarListViewModel.kt index 50b4b138..395c0041 100644 --- a/feature/calendar/src/main/java/com/terning/feature/calendar/list/CalendarListViewModel.kt +++ b/feature/calendar/src/main/java/com/terning/feature/calendar/list/CalendarListViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.terning.core.designsystem.state.UiState import com.terning.domain.calendar.entity.CalendarScrapDetail +import com.terning.domain.calendar.repository.CalendarRepository import com.terning.feature.calendar.R import com.terning.feature.calendar.list.model.CalendarListUiState import dagger.hilt.android.lifecycle.HiltViewModel @@ -19,7 +20,7 @@ import javax.inject.Inject @HiltViewModel class CalendarListViewModel @Inject constructor( - private val calendarRepository: com.terning.domain.calendar.repository.CalendarRepository + private val calendarRepository: CalendarRepository ) : ViewModel() { private val _uiState = MutableStateFlow(CalendarListUiState()) val uiState = _uiState.asStateFlow() diff --git a/feature/calendar/src/main/java/com/terning/feature/calendar/month/CalendarMonthViewModel.kt b/feature/calendar/src/main/java/com/terning/feature/calendar/month/CalendarMonthViewModel.kt index 4c07b89f..0fd23b2e 100644 --- a/feature/calendar/src/main/java/com/terning/feature/calendar/month/CalendarMonthViewModel.kt +++ b/feature/calendar/src/main/java/com/terning/feature/calendar/month/CalendarMonthViewModel.kt @@ -3,6 +3,7 @@ package com.terning.feature.calendar.month import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.terning.core.designsystem.state.UiState +import com.terning.domain.calendar.repository.CalendarRepository import com.terning.feature.calendar.R import com.terning.feature.calendar.calendar.model.CalendarModel.Companion.getLocalDateByPage import com.terning.feature.calendar.month.model.CalendarMonthUiState @@ -18,7 +19,7 @@ import javax.inject.Inject @HiltViewModel class CalendarMonthViewModel @Inject constructor( - private val calendarRepository: com.terning.domain.calendar.repository.CalendarRepository + private val calendarRepository: CalendarRepository ): ViewModel() { private val _uiState = MutableStateFlow(CalendarMonthUiState()) val uiState = _uiState.asStateFlow() diff --git a/feature/calendar/src/main/java/com/terning/feature/calendar/week/CalendarWeekViewModel.kt b/feature/calendar/src/main/java/com/terning/feature/calendar/week/CalendarWeekViewModel.kt index f763be53..77e8ffce 100644 --- a/feature/calendar/src/main/java/com/terning/feature/calendar/week/CalendarWeekViewModel.kt +++ b/feature/calendar/src/main/java/com/terning/feature/calendar/week/CalendarWeekViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.terning.core.designsystem.state.UiState import com.terning.domain.calendar.entity.CalendarScrapDetail +import com.terning.domain.calendar.repository.CalendarRepository import com.terning.feature.calendar.R import com.terning.feature.calendar.week.model.CalendarWeekUiState import dagger.hilt.android.lifecycle.HiltViewModel @@ -19,7 +20,7 @@ import javax.inject.Inject @HiltViewModel class CalendarWeekViewModel @Inject constructor( - private val calendarRepository: com.terning.domain.calendar.repository.CalendarRepository + private val calendarRepository: CalendarRepository ) : ViewModel() { private val _uiState = MutableStateFlow(CalendarWeekUiState()) val uiState = _uiState.asStateFlow() diff --git a/feature/dialog/src/main/java/com/terning/feature/dialog/cancel/ScrapCancelDialog.kt b/feature/dialog/src/main/java/com/terning/feature/dialog/cancel/ScrapCancelDialog.kt index dfff003c..b82774b0 100644 --- a/feature/dialog/src/main/java/com/terning/feature/dialog/cancel/ScrapCancelDialog.kt +++ b/feature/dialog/src/main/java/com/terning/feature/dialog/cancel/ScrapCancelDialog.kt @@ -20,6 +20,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.flowWithLifecycle import com.terning.core.analytics.EventType +import com.terning.core.analytics.LocalTracker import com.terning.core.designsystem.component.button.RoundButton import com.terning.core.designsystem.component.dialog.TerningBasicDialog import com.terning.core.designsystem.component.item.TerningLottieAnimation @@ -38,7 +39,7 @@ fun ScrapCancelDialog( ) { val context = LocalContext.current val lifecycleOwner = LocalLifecycleOwner.current - val amplitudeTracker = com.terning.core.analytics.LocalTracker.current + val amplitudeTracker = LocalTracker.current LaunchedEffect(viewModel.sideEffect, lifecycleOwner) { viewModel.sideEffect.flowWithLifecycle(lifecycle = lifecycleOwner.lifecycle) diff --git a/feature/dialog/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt b/feature/dialog/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt index a183b2ed..e02370d3 100644 --- a/feature/dialog/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt +++ b/feature/dialog/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt @@ -37,6 +37,7 @@ import androidx.lifecycle.flowWithLifecycle import coil3.compose.AsyncImage import coil3.request.ImageRequest import com.terning.core.analytics.EventType +import com.terning.core.analytics.LocalTracker import com.terning.core.designsystem.component.button.RoundButton import com.terning.core.designsystem.component.dialog.TerningBasicDialog import com.terning.core.designsystem.extension.getFixHeightByMaxLine @@ -74,7 +75,7 @@ fun ScrapDialog( val context = LocalContext.current val lifecycleOwner = LocalLifecycleOwner.current val uiState by viewModel.uiState.collectAsStateWithLifecycle(lifecycleOwner = lifecycleOwner) - val amplitudeTracker = com.terning.core.analytics.LocalTracker.current + val amplitudeTracker = LocalTracker.current LaunchedEffect(viewModel.sideEffect, lifecycleOwner) { viewModel.sideEffect.flowWithLifecycle(lifecycle = lifecycleOwner.lifecycle) diff --git a/feature/dialog/src/main/java/com/terning/feature/dialog/detail/ScrapDialogViewModel.kt b/feature/dialog/src/main/java/com/terning/feature/dialog/detail/ScrapDialogViewModel.kt index d297d929..71cfb937 100644 --- a/feature/dialog/src/main/java/com/terning/feature/dialog/detail/ScrapDialogViewModel.kt +++ b/feature/dialog/src/main/java/com/terning/feature/dialog/detail/ScrapDialogViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.terning.core.designsystem.type.ColorType import com.terning.domain.scrap.entity.CalendarScrapRequest +import com.terning.domain.scrap.repository.ScrapRepository import com.terning.featrue.dialog.R import com.terning.feature.dialog.detail.state.ScrapDialogUiState import dagger.hilt.android.lifecycle.HiltViewModel @@ -17,7 +18,7 @@ import javax.inject.Inject @HiltViewModel class ScrapDialogViewModel @Inject constructor( - private val scrapRepository: com.terning.domain.scrap.repository.ScrapRepository + private val scrapRepository: ScrapRepository ) : ViewModel() { private var _uiState = MutableStateFlow(ScrapDialogUiState()) val uiState = _uiState.asStateFlow() diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt index 2cec419a..d10a9298 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt @@ -24,6 +24,7 @@ import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import com.terning.core.analytics.EventType +import com.terning.core.analytics.LocalTracker import com.terning.core.designsystem.component.button.RectangleButton import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar import com.terning.core.designsystem.extension.currentMonth @@ -50,7 +51,7 @@ fun FilteringThreeRoute( val context = LocalContext.current val lifecycleOwner = LocalLifecycleOwner.current - val amplitudeTracker = com.terning.core.analytics.LocalTracker.current + val amplitudeTracker = LocalTracker.current LaunchedEffect(key1 = true) { with(viewModel) { diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt index 27e98b31..0b68f45a 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt @@ -29,6 +29,7 @@ import com.airbnb.lottie.compose.LottieCompositionSpec import com.airbnb.lottie.compose.LottieConstants import com.airbnb.lottie.compose.rememberLottieComposition import com.terning.core.analytics.EventType +import com.terning.core.analytics.LocalTracker import com.terning.core.designsystem.component.button.RectangleButton import com.terning.core.designsystem.component.item.TerningLottieAnimation import com.terning.core.designsystem.theme.TerningPointTheme @@ -47,7 +48,7 @@ fun StartFilteringRoute( val configuration = LocalConfiguration.current val screenHeight = 780f / configuration.screenHeightDp - val amplitudeTracker = com.terning.core.analytics.LocalTracker.current + val amplitudeTracker = LocalTracker.current LaunchedEffect(key1 = true) { delay(DELAY)