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

Remove conference text #677

Merged
merged 4 commits into from
Aug 20, 2024
+32 −24
Merged

Remove conference text #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d76cc2e
fix : [Android] Remove "Conference" text from selected tab
javaman97 Aug 19, 2024
08f1ded
Merge branch 'DroidKaigi:main' into main
javaman97 Aug 19, 2024
cb40070
Adjust tab layout
takahirom Aug 20, 2024
4d9578d
Fix format
takahirom Aug 20, 2024
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
1 change: 0 additions & 1 deletion feature/sessions/src/commonMain/composeResources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<string name="workshop">Workshop</string>
<string name="back">Back</string>
<string name="select_language">Select Language</string>
<string name="conference">Conference</string>
<string name="japanese">日本語</string>
<string name="english">English</string>
<string name="timetable">Timetable</string>
Expand Down
55 changes: 32 additions & 23 deletions ...c/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.material3.Surface
import androidx.compose.material3.Tab
import androidx.compose.material3.TabRow
import androidx.compose.material3.TabRowDefaults
Expand All @@ -19,11 +21,10 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import conference_app_2024.feature.sessions.generated.resources.conference
import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
import io.github.droidkaigi.confsched.model.DroidKaigi2024Day
import io.github.droidkaigi.confsched.sessions.SessionsRes
import io.github.droidkaigi.confsched.sessions.section.TimetableTabTestTag
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview

@Composable
fun TimetableDayTab(
Expand All @@ -39,47 +40,42 @@ fun TimetableDayTab(
horizontalAlignment = Alignment.Start,
) {
TabRow(
modifier = Modifier.width(350.dp),
modifier = Modifier
.padding(horizontal = 20.dp)
.width(106.dp),
selectedTabIndex = selectedTabIndex,
indicator = @Composable { tabPositions ->
if (selectedTabIndex < tabPositions.size) {
TabRowDefaults.SecondaryIndicator(
modifier = Modifier
.wrapContentWidth()
.tabIndicatorOffset(tabPositions[selectedTabIndex]),
color = selectedColor,
)
}
},
tabs = {
DroidKaigi2024Day.visibleDays().forEach { conferenceDay ->
val isSelected = conferenceDay == selectedDay
Tab(
modifier = Modifier
.testTag(TimetableTabTestTag.plus(conferenceDay.ordinal))
.height(64.dp),
selected = conferenceDay == selectedDay,
.padding(
horizontal = 8.dp,
vertical = 16.dp,
)
.height(26.dp),
selected = isSelected,
onClick = {
onDaySelected(conferenceDay)
},
selectedContentColor = selectedColor,
unselectedContentColor = Color.White,
) {
val isSelected = conferenceDay == selectedDay
if (isSelected) {
FloorText(
text = stringResource(SessionsRes.string.conference),
isSelected = isSelected,
)
Text(
text = " (${conferenceDay.monthAndDay()})",
fontSize = 11.sp,
color = Color(0xFF4AFF82),
)
} else {
FloorText(
text = conferenceDay.monthAndDay(),
isSelected = isSelected,
)
}
FloorText(
text = conferenceDay.monthAndDay(),
isSelected = isSelected,
)
}
}
},
Expand All @@ -105,3 +101,16 @@ private fun FloorText(
},
)
}

@Preview
@Composable
fun PreviewTimetableDayTab() {
KaigiTheme {
Surface {
TimetableDayTab(
selectedDay = DroidKaigi2024Day.ConferenceDay1,
onDaySelected = {},
)
}
}
}
Loading