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

Re struct side event mark #1045

Merged
merged 3 commits into from
Sep 1, 2023
Merged

Re struct side event mark #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb46610
Re struct side event mark
takahirom Sep 1, 2023
3466060
Fix import
takahirom Sep 1, 2023
168fe27
Use Square for test
takahirom Sep 1, 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
12 changes: 12 additions & 0 deletions app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/circle.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "circle.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/circle.imageset/circle.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/square.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "square.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/square.imageset/square.pdf
View file
Open in desktop
Binary file not shown.
13 changes: 10 additions & 3 deletions app-ios/Modules/Sources/FloorMap/SideEventRow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,20 @@ struct SideEventRow: View {

private extension SideEvent {
var icon: Image {
switch self.mark {
switch self.markShape {
case .favorite: return Assets.Icons.favorite.swiftUIImage
case .circle: return
Assets.Icons.circle
.swiftUIImage
case .square: return
Assets.Icons.square
.swiftUIImage
default: return Assets.Icons.favorite.swiftUIImage
}
}

var iconColor: Color {
switch self.mark.color {
switch self.markColor {
case .pink: return AssetColors.MarkColor.pink.swiftUIColor
case .blue: return AssetColors.MarkColor.blue.swiftUIColor
case .orange: return AssetColors.MarkColor.orange.swiftUIColor
Expand All @@ -97,7 +103,8 @@ private extension SideEvent {
enTitle: "DAY1-DAY2 10:00-11:00"
),
floorLevel: .basement,
mark: .favorite,
markColor: .pink,
markShape: .favorite,
link: "https://github.com/DroidKaigi/conference-app-2023",
imageLink: "https://2023.droidkaigi.jp/static/12059b53c8c9813a85c1c44f8692a2c0/img_04.jpg"
)
Expand Down
34 changes: 23 additions & 11 deletions core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/SideEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,28 @@ package io.github.droidkaigi.confsched2023.model

import io.github.droidkaigi.confsched2023.model.FloorLevel.Basement
import io.github.droidkaigi.confsched2023.model.FloorLevel.Ground
import io.github.droidkaigi.confsched2023.model.SideEvent.Mark.Favorite
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkColor.Blue
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkColor.Orange
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkColor.Pink
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkShape.Circle
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkShape.Favorite
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkShape.Square
import kotlinx.collections.immutable.persistentListOf

public data class SideEvent(
val title: MultiLangText,
val description: MultiLangText,
val timeText: MultiLangText,
val floorLevel: FloorLevel,
val mark: Mark,
val markColor: MarkColor,
val markShape: MarkShape,
val link: String?,
val imageLink: String?,
) {

enum class Mark(val color: MarkColor) {
Favorite(Pink),
enum class MarkShape {
Favorite,
Circle,
Square,
}

enum class MarkColor {
Expand All @@ -42,7 +48,8 @@ val SideEvents = persistentListOf(
jaTitle = "DAY1-DAY2 10:00-11:00",
enTitle = "DAY1-DAY2 10:00-11:00",
),
mark = Favorite,
markColor = Pink,
markShape = Favorite,
link = "https://github.com/DroidKaigi/conference-app-2023",
imageLink = "https://2023.droidkaigi.jp/static/12059b53c8c9813a85c1c44f8692a2c0/img_04.jpg",
),
Expand All @@ -60,7 +67,8 @@ val SideEvents = persistentListOf(
jaTitle = "DAY1-DAY2 10:00-11:00",
enTitle = "DAY1-DAY2 10:00-11:00",
),
mark = Favorite,
markColor = Blue,
markShape = Square,
link = null,
imageLink = null,
),
Expand All @@ -78,7 +86,8 @@ val SideEvents = persistentListOf(
jaTitle = "DAY1-DAY2 10:00-11:00",
enTitle = "DAY1-DAY2 10:00-11:00",
),
mark = Favorite,
markColor = Orange,
markShape = Circle,
link = "https://github.com/DroidKaigi/conference-app-2023",
imageLink = "https://2023.droidkaigi.jp/static/12059b53c8c9813a85c1c44f8692a2c0/img_04.jpg",
),
Expand All @@ -96,7 +105,8 @@ val SideEvents = persistentListOf(
jaTitle = "DAY1-DAY2 10:00-11:00",
enTitle = "DAY1-DAY2 10:00-11:00",
),
mark = Favorite,
markColor = Pink,
markShape = Favorite,
link = "https://github.com/DroidKaigi/conference-app-2023",
imageLink = "https://2023.droidkaigi.jp/static/12059b53c8c9813a85c1c44f8692a2c0/img_04.jpg",
),
Expand All @@ -114,7 +124,8 @@ val SideEvents = persistentListOf(
jaTitle = "DAY1-DAY2 10:00-11:00",
enTitle = "DAY1-DAY2 10:00-11:00",
),
mark = Favorite,
markColor = Pink,
markShape = Favorite,
link = null,
imageLink = null,
),
Expand All @@ -132,7 +143,8 @@ val SideEvents = persistentListOf(
jaTitle = "DAY1-DAY2 10:00-11:00",
enTitle = "DAY1-DAY2 10:00-11:00",
),
mark = Favorite,
markColor = Pink,
markShape = Favorite,
link = "https://github.com/DroidKaigi/conference-app-2023",
imageLink = "https://2023.droidkaigi.jp/static/12059b53c8c9813a85c1c44f8692a2c0/img_04.jpg",
),
Expand Down
17 changes: 11 additions & 6 deletions .../main/java/io/github/droidkaigi/confsched2023/floormap/component/FloorMapSideEventItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Celebration
import androidx.compose.material.icons.filled.Circle
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.Link
import androidx.compose.material.icons.filled.Schedule
import androidx.compose.material.icons.filled.Square
import androidx.compose.material3.Divider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand All @@ -39,13 +41,14 @@ import io.github.droidkaigi.confsched2023.designsystem.preview.MultiThemePreview
import io.github.droidkaigi.confsched2023.designsystem.theme.KaigiTheme
import io.github.droidkaigi.confsched2023.floormap.FloorMapStrings
import io.github.droidkaigi.confsched2023.model.SideEvent
import io.github.droidkaigi.confsched2023.model.SideEvent.Mark
import io.github.droidkaigi.confsched2023.model.SideEvent.Mark.Favorite
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkColor.Blue
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkColor.Orange
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkColor.Pink
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkColor.Purple
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkColor.Red
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkShape.Circle
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkShape.Favorite
import io.github.droidkaigi.confsched2023.model.SideEvent.MarkShape.Square
import io.github.droidkaigi.confsched2023.model.SideEvents
import io.github.droidkaigi.confsched2023.ui.previewOverride
import io.github.droidkaigi.confsched2023.ui.rememberAsyncImagePainter
Expand All @@ -70,7 +73,7 @@ fun FloorMapSideEventItem(
) {
Column(modifier = Modifier.weight(1f)) {
Row(verticalAlignment = Alignment.CenterVertically) {
val (iconVector, iconColor) = sideEvent.mark.iconResAndColor()
val (iconVector, iconColor) = sideEvent.iconResAndColor()
Icon(
imageVector = iconVector,
contentDescription = FloorMapStrings.FavoriteIcon.asString(),
Expand Down Expand Up @@ -147,11 +150,13 @@ fun FloorMapSideEventItem(
}

@Composable
private fun Mark.iconResAndColor(): Pair<ImageVector, Color> {
val icon = when (this) {
private fun SideEvent.iconResAndColor(): Pair<ImageVector, Color> {
val icon = when (markShape) {
Favorite -> Icons.Filled.Favorite
Circle -> Icons.Filled.Circle
Square -> Icons.Filled.Square
}
val colorLong = when (color) {
val colorLong = when (markColor) {
Pink -> 0xFFDC369A
Orange -> 0xFFDA9000
Blue -> 0xFF0064DA
Expand Down
Loading