Skip to content

[Mod] 장소 상세 화면 오픈 시간 글자색 수정 #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1971123-seongmin merged 1 commit into from
Oct 2, 2025
Merged

[Mod] 장소 상세 화면 오픈 시간 글자색 수정 #265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...src/main/java/com/acon/acon/feature/spot/screen/spotdetail/composable/SpotDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import coil3.compose.AsyncImage
import com.acon.acon.core.analytics.amplitude.AconAmplitude
import com.acon.acon.core.analytics.constants.EventNames
import com.acon.acon.core.analytics.constants.PropertyKeys
import com.acon.acon.core.common.UrlConstants
import com.acon.acon.core.designsystem.R
import com.acon.acon.core.designsystem.component.button.v2.AconFilledButton
Expand All @@ -53,17 +56,14 @@ import com.acon.acon.core.designsystem.effect.imageGradientLayer
import com.acon.acon.core.designsystem.image.rememberDefaultLoadImageErrorPainter
import com.acon.acon.core.designsystem.noRippleClickable
import com.acon.acon.core.designsystem.theme.AconTheme
import com.acon.acon.feature.spot.screen.component.OperationDot
import com.acon.acon.feature.spot.screen.spotdetail.createBranchDeepLink
import com.acon.acon.feature.spot.screen.spotlist.composable.SpotDetailLoadingView
import com.acon.acon.core.analytics.amplitude.AconAmplitude
import com.acon.acon.core.analytics.constants.EventNames
import com.acon.acon.core.analytics.constants.PropertyKeys
import com.acon.acon.core.ui.compose.LocalDeepLinkHandler
import com.acon.acon.core.ui.compose.LocalOnRetry
import com.acon.acon.core.ui.compose.LocalRequestSignIn
import com.acon.acon.core.ui.compose.LocalSignInStatus
import com.acon.acon.core.ui.compose.getTextSizeDp
import com.acon.acon.feature.spot.screen.component.OperationDot
import com.acon.acon.feature.spot.screen.spotdetail.createBranchDeepLink
import com.acon.acon.feature.spot.screen.spotlist.composable.SpotDetailLoadingView
import dev.chrisbanes.haze.hazeSource
import okhttp3.internal.immutableListOf

Expand Down Expand Up @@ -348,15 +348,15 @@ internal fun SpotDetailScreen(

Text(
text = if (isStoreOpen) state.spotDetail.closingTime else state.spotDetail.nextOpening,
color = AconTheme.color.Gray200,
color = if (isStoreOpen) AconTheme.color.White else AconTheme.color.Gray200,
style = AconTheme.typography.Body1,
fontWeight = FontWeight.SemiBold,
modifier = Modifier.padding(start = 12.dp)
)

Text(
text = stringResource(R.string.store_closed),
color = AconTheme.color.Gray200,
color = if (isStoreOpen) AconTheme.color.White else AconTheme.color.Gray200,
style = AconTheme.typography.Body1,
fontWeight = FontWeight.Normal,
modifier = Modifier.padding(start = 4.dp)
Expand Down