Skip to content
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

Jump to bottom

Modify the design of the icons in the card section #508

Merged
merged 5 commits into from
Aug 15, 2023
Merged

Modify the design of the icons in the card section #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44a7d21
changed icon design
WonJoongLee Aug 14, 2023
4ca81f0
Changed card color
WonJoongLee Aug 14, 2023
d308fe9
Changed text color
WonJoongLee Aug 14, 2023
80e0288
Add trailing comma
WonJoongLee Aug 15, 2023
9db725f
revert card colors
WonJoongLee Aug 15, 2023
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 ...a/io/github/droidkaigi/confsched2023/sessions/component/TimetableItemDetailSummaryCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Category
import androidx.compose.material.icons.filled.Language
import androidx.compose.material.icons.filled.Place
import androidx.compose.material.icons.filled.Schedule
import androidx.compose.material.icons.outlined.Category
import androidx.compose.material.icons.outlined.Language
import androidx.compose.material.icons.outlined.Place
import androidx.compose.material.icons.outlined.Schedule
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -49,22 +49,22 @@ fun TimetableItemDetailSummaryCard(
.padding(horizontal = 16.dp, vertical = 24.dp),
) {
TimetableItemDetailSummaryCardRow(
leadingIcon = Icons.Filled.Schedule,
leadingIcon = Icons.Outlined.Schedule,
label = SessionsStrings.Date.asString(),
content = timetableItem.formattedDateTimeString,
)
TimetableItemDetailSummaryCardRow(
leadingIcon = Icons.Filled.Place,
leadingIcon = Icons.Outlined.Place,
label = SessionsStrings.Place.asString(),
content = timetableItem.room.name.currentLangTitle,
)
TimetableItemDetailSummaryCardRow(
leadingIcon = Icons.Filled.Language,
leadingIcon = Icons.Outlined.Language,
label = SessionsStrings.SupportedLanguages.asString(),
content = timetableItem.getSupportedLangString(isJapaneseLocale),
)
TimetableItemDetailSummaryCardRow(
leadingIcon = Icons.Filled.Category,
leadingIcon = Icons.Outlined.Category,
label = SessionsStrings.Category.asString(),
content = timetableItem.category.title.currentLangTitle,
)
Expand Down
1 change: 1 addition & 0 deletions ...o/github/droidkaigi/confsched2023/sessions/component/TimetableItemDetailSummaryCardRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ fun TimetableItemDetailSummaryCardRow(
text = label,
fontWeight = FontWeight.Bold,
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
Spacer(modifier = Modifier.width(12.dp))
Text(text = content, style = MaterialTheme.typography.bodyMedium)
Expand Down
Loading