Skip to content

Commit

Permalink
Merge pull request #164 from YAPP-Github/QA/backlog-qa
Browse files Browse the repository at this point in the history
Qa/backlog 백로그 QA 일부 반영
  • Loading branch information
yangsooplus authored Apr 1, 2024
2 parents 83ec21d + 6a794ac commit f9a4acb
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ fun SusuCheckedDialog(
text = it,
onClick = onDismissRequest,
)
Spacer(modifier = Modifier.height(SusuTheme.spacing.spacing_xxs))
Spacer(modifier = Modifier.width(SusuTheme.spacing.spacing_xxs))
}
SusuFilledButton(
modifier = Modifier.weight(1f),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -74,7 +75,7 @@ fun SusuDialog(
text = it,
onClick = onDismissRequest,
)
Spacer(modifier = Modifier.height(SusuTheme.spacing.spacing_xxs))
Spacer(modifier = Modifier.width(SusuTheme.spacing.spacing_xxs))
}
SusuFilledButton(
modifier = Modifier.weight(1f),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ fun SusuPriceTextField(
val moneyUnitString = stringResource(R.string.money_unit)
SusuBasicTextField(
modifier = modifier,
text = text,
text = text.toLongOrNull()?.toString() ?: "",
onTextChange = onTextChange,
placeholder = placeholder,
textColor = textColor,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ExcelRepositoryImpl @Inject constructor(
val request = DownloadManager.Request(url.toUri())
.setMimeType(mimeType)
.setAllowedOverMetered(true)
.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE)
.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
.setTitle(downloaderName)
.addRequestHeader(headerTokenName, token)
.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,10 @@ fun MyPageDefaultScreen(
titleTextStyle = SusuTheme.typography.title_m,
action = {
Row(
modifier = Modifier.susuClickable(onClick = navigateToInfo),
modifier = Modifier.susuClickable(
rippleEnabled = false,
onClick = navigateToInfo,
),
) {
Text(
text = stringResource(com.susu.feature.mypage.R.string.mypage_default_my_info),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ fun LedgerDetailEnvelopeContainerPreview() {
relation = "관계관계관계",
customRelation = null,
description = null,
)
)
),
),
) {
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -152,7 +151,7 @@ fun EnvelopeFilterScreen(
Column(
modifier = Modifier
.background(SusuTheme.colorScheme.background10)
.fillMaxSize()
.fillMaxSize(),
) {
SusuDefaultAppBar(
leftIcon = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.susu.core.designsystem.theme.Gray10
Expand Down Expand Up @@ -57,14 +58,15 @@ fun StatisticsTabItem(
onClick: () -> Unit,
) {
Box(
modifier = modifier.fillMaxSize().background(
color = if (isSelected) {
Gray20
} else {
Gray10
},
shape = RoundedCornerShape(4.dp),
).susuClickable(onClick = onClick),
modifier = modifier.fillMaxSize()
.clip(RoundedCornerShape(4.dp))
.background(
color = if (isSelected) {
Gray20
} else {
Gray10
},
).susuClickable(onClick = onClick),
) {
Text(
modifier = Modifier.align(Alignment.Center),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -115,7 +116,9 @@ fun OptionSlot(
onClick: () -> Unit = {},
) {
Row(
modifier = modifier.background(color = Gray10, shape = RoundedCornerShape(4.dp))
modifier = modifier
.clip(RoundedCornerShape(4.dp))
.background(color = Gray10)
.susuClickable(onClick = onClick)
.padding(
horizontal = SusuTheme.spacing.spacing_xxs,
Expand Down

0 comments on commit f9a4acb

Please sign in to comment.