From d76cc2e1755a6ef14a3eddb4411a944c7fa73f9f Mon Sep 17 00:00:00 2001 From: Aman Nishad <75328768+javaman97@users.noreply.github.com> Date: Mon, 19 Aug 2024 12:08:12 +0530 Subject: [PATCH 1/3] fix : [Android] Remove "Conference" text from selected tab --- .../droidkaigi/confsched/sessions/component/TimetableGridTab.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt index a7d3cb556..ea77aff66 100644 --- a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt +++ b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt @@ -66,7 +66,7 @@ fun TimetableDayTab( val isSelected = conferenceDay == selectedDay if (isSelected) { FloorText( - text = stringResource(SessionsRes.string.conference), + text = "", isSelected = isSelected, ) Text( From cb40070017d83e38b08ca400ff2c251624d0eca0 Mon Sep 17 00:00:00 2001 From: takahirom Date: Tue, 20 Aug 2024 16:18:04 +0900 Subject: [PATCH 2/3] Adjust tab layout --- .../composeResources/values/strings.xml | 1 - .../sessions/component/TimetableGridTab.kt | 55 +++++++++++-------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/feature/sessions/src/commonMain/composeResources/values/strings.xml b/feature/sessions/src/commonMain/composeResources/values/strings.xml index 5bc44c867..b1c0049b5 100644 --- a/feature/sessions/src/commonMain/composeResources/values/strings.xml +++ b/feature/sessions/src/commonMain/composeResources/values/strings.xml @@ -15,7 +15,6 @@ Workshop Back Select Language - Conference 日本語 English Timetable diff --git a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt index ea77aff66..7bb01b5c2 100644 --- a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt +++ b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt @@ -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 @@ -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( @@ -39,12 +40,15 @@ 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, ) @@ -52,34 +56,26 @@ fun TimetableDayTab( }, 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 = "", - 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, + ) } } }, @@ -105,3 +101,16 @@ private fun FloorText( }, ) } + +@Preview +@Composable +fun PreviewTimetableDayTab() { + KaigiTheme { + Surface { + TimetableDayTab( + selectedDay = DroidKaigi2024Day.ConferenceDay1, + onDaySelected = {}, + ) + } + } +} From 4d9578d2b5dc0b0bd85b0c2bdd8bcfea01f12065 Mon Sep 17 00:00:00 2001 From: takahirom Date: Tue, 20 Aug 2024 16:19:58 +0900 Subject: [PATCH 3/3] Fix format --- .../droidkaigi/confsched/sessions/component/TimetableGridTab.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt index 7bb01b5c2..263fb1743 100644 --- a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt +++ b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt @@ -62,7 +62,7 @@ fun TimetableDayTab( .testTag(TimetableTabTestTag.plus(conferenceDay.ordinal)) .padding( horizontal = 8.dp, - vertical = 16.dp + vertical = 16.dp, ) .height(26.dp), selected = isSelected,