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 @@ -16,7 +16,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
Expand All @@ -34,8 +33,6 @@ fun CompleteReportCard(
images: List<String>,
modifier: Modifier = Modifier,
) {
val context = LocalContext.current

Column(
modifier = modifier
.background(
Expand All @@ -59,6 +56,7 @@ fun CompleteReportCard(
text = title,
color = BitnagilTheme.colors.coolGray10,
style = BitnagilTheme.typography.body1Medium,
textAlign = TextAlign.End,
)
}

Expand All @@ -69,6 +67,7 @@ fun CompleteReportCard(
text = category?.displayTitle ?: "카테고리 없음",
color = BitnagilTheme.colors.coolGray10,
style = BitnagilTheme.typography.body1Medium,
textAlign = TextAlign.End,
)
}

Expand All @@ -79,6 +78,7 @@ fun CompleteReportCard(
text = address ?: "주소 없음",
color = BitnagilTheme.colors.coolGray10,
style = BitnagilTheme.typography.body1Medium,
textAlign = TextAlign.End,
)
}

Expand Down Expand Up @@ -124,7 +124,7 @@ private fun CompleteReportCardItem(
Row(
modifier = modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
verticalAlignment = Alignment.Top,
) {
Text(
text = title,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
Expand Down Expand Up @@ -76,9 +75,7 @@ fun CompleteReportContent(
)

CompleteReportCard(
modifier = Modifier
.offset(y = 115.dp)
.padding(horizontal = 18.dp),
modifier = Modifier.padding(top = 115.dp, start = 18.dp, end = 18.dp),
title = uiState.reportTitle,
category = uiState.selectedCategory,
address = uiState.currentAddress,
Expand Down