Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
Expand All @@ -23,7 +23,7 @@ import com.acon.acon.feature.spot.toPriceString

@Composable
internal fun SignatureMenu(
signatureMenuList: List<com.acon.acon.core.model.model.spot.SignatureMenu>
signatureMenuList: List<SignatureMenu>
) {
Column(
verticalArrangement = Arrangement.spacedBy(4.dp)
Expand All @@ -43,16 +43,22 @@ internal fun SignatureMenuItem(
menuPrice: String
) {
Row(
verticalAlignment = Alignment.CenterVertically
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = menuName,
color = AconTheme.color.White,
style = AconTheme.typography.Body1,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.widthIn(min = 100.dp, max = 160.dp)
)
Box(
modifier = Modifier.width(160.dp)
) {
Text(
text = menuName,
color = AconTheme.color.White,
style = AconTheme.typography.Body1,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier
.fillMaxWidth()
.align(Alignment.CenterStart)
)
}

Spacer(Modifier.width(8.dp))
Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Brush
Expand Down Expand Up @@ -122,6 +123,8 @@ internal fun SpotDetailScreen(
}

is SpotDetailUiState.Success -> {
val rememberedNoStoreText = remember { noStoreText.random() }

BackHandler {
if (state.isAreaVerified) {
deepLinkHandler.clear()
Expand Down Expand Up @@ -232,7 +235,7 @@ internal fun SpotDetailScreen(

Spacer(Modifier.height(12.dp))
Text(
text = noStoreText.random(),
text = rememberedNoStoreText,
color = AconTheme.color.Gray200,
style = AconTheme.typography.Body1,
fontWeight = FontWeight.SemiBold,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private fun StoreDetailButton(
) {
var isLongPressed by remember { mutableStateOf(false) }
var lastClickTime by remember { mutableLongStateOf(0L) }
val throttleTime = 1000L
val throttleTime = 3000L

val density = LocalDensity.current
val blurPx = with(density) { 4.dp.toPx() }
Expand Down