Merge pull request #677 from DroidKaigi/remove-conference-text

Remove conference text
DroidKaigi · Aug 20, 2024 · 27442fd · 27442fd
2 parents eacd730 + 4d9578d
commit 27442fd
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 24 deletions.
diff --git a/feature/sessions/src/commonMain/composeResources/values/strings.xml b/feature/sessions/src/commonMain/composeResources/values/strings.xml
@@ -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>

diff --git a/...c/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/component/TimetableGridTab.kt b/...c/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,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,
+                        )
                     }
                 }
             },
@@ -105,3 +101,16 @@ private fun FloorText(
         },
     )
 }
+
+@Preview
+@Composable
+fun PreviewTimetableDayTab() {
+    KaigiTheme {
+        Surface {
+            TimetableDayTab(
+                selectedDay = DroidKaigi2024Day.ConferenceDay1,
+                onDaySelected = {},
+            )
+        }
+    }
+}