[Android] Search filters

core/data/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/data/sessions/DataSessionsRepository.kt

@@ -3,6 +3,7 @@ package io.github.droidkaigi.confsched2022.data.sessions
 import io.github.droidkaigi.confsched2022.data.SettingsDatastore
 import io.github.droidkaigi.confsched2022.model.DroidKaigiSchedule
 import io.github.droidkaigi.confsched2022.model.SessionsRepository
+import io.github.droidkaigi.confsched2022.model.TimetableCategory
 import io.github.droidkaigi.confsched2022.model.TimetableItemId
 import kotlinx.collections.immutable.toPersistentSet
 import kotlinx.coroutines.flow.Flow
@@ -30,6 +31,10 @@ public class DataSessionsRepository(
             }
     }
 
+    override suspend fun getCategories(): List<TimetableCategory> {
+        return sessionsDao.selectAllCategories()
+    }
+
     override suspend fun refresh() {
         val timetable = sessionsApi.timetable()
         sessionsDao.deleteAll()

core/data/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/data/sessions/FakeSessionsRepository.kt

@@ -3,6 +3,7 @@ package io.github.droidkaigi.confsched2022.data.sessions
 import io.github.droidkaigi.confsched2022.model.DroidKaigiSchedule
 import io.github.droidkaigi.confsched2022.model.SessionsRepository
 import io.github.droidkaigi.confsched2022.model.Timetable
+import io.github.droidkaigi.confsched2022.model.TimetableCategory
 import io.github.droidkaigi.confsched2022.model.TimetableItemId
 import io.github.droidkaigi.confsched2022.model.fake
 import kotlinx.collections.immutable.PersistentSet
@@ -27,6 +28,10 @@ public class FakeSessionsRepository : SessionsRepository {
     override suspend fun refresh() {
     }
 
+    override suspend fun getCategories(): List<TimetableCategory> {
+        return emptyList()
+    }
+
     override suspend fun setFavorite(sessionId: TimetableItemId, favorite: Boolean) {
         if (favorite) {
             favorites.value = favorites.value.add(sessionId)

core/data/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/data/sessions/SessionsDao.kt

@@ -104,6 +104,18 @@ public class SessionsDao(
         timetableItemSessionSpeakersQueries.deleteAll()
     }
 
+    public fun selectAllCategories(): List<TimetableCategory> {
+        return timetableItemSessionQueries.selectAllCategories { id, titleJa, titleEn ->
+            TimetableCategory(
+                id = id,
+                title = MultiLangText(
+                    jaTitle = titleJa,
+                    enTitle = titleEn
+                )
+            )
+        }.executeAsList()
+    }
+
     private fun TimetableItem.Session.toModel(): TimetableItemSession {
         return TimetableItemSession(
             id = id.value,

core/data/src/commonMain/sqldelight/io/github/droidkaigi/confsched2022/data/TimetableItemSession.sq

@@ -54,4 +54,8 @@ INSERT INTO timetableItemSession (
 ) VALUES ?;
 
 deleteAll:
-DELETE FROM timetableItemSession;
+DELETE FROM timetableItemSession;
+
+selectAllCategories:
+SELECT DISTINCT categoryId, categoryTitleJa, categoryTitleEn
+FROM timetableItemSession;

core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/Filters.kt

@@ -1,6 +1,8 @@
 package io.github.droidkaigi.confsched2022.model
 
 public data class Filters(
+    val day: DroidKaigi2022Day? = null,
+    val categories: List<TimetableCategory> = emptyList(),
     val filterFavorite: Boolean = false,
     val filterSession: Boolean = false,
     val searchWord: String = ""

core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/SessionsRepository.kt

@@ -13,6 +13,8 @@ public interface SessionsRepository {
             .map { it.findTimetableItem(timetableItemId) }
     }
 
+    public suspend fun getCategories(): List<TimetableCategory>
+
     public suspend fun refresh()
     public suspend fun setFavorite(sessionId: TimetableItemId, favorite: Boolean)
 }

core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/Timetable.kt

@@ -42,6 +42,16 @@ public data class Timetable(
 
     public fun filtered(filters: Filters): Timetable {
         var timetableItems = timetableItems.toList()
+        if (filters.day != null) {
+            timetableItems = timetableItems.filter { timetableItem ->
+                timetableItem.day == filters.day
+            }
+        }
+        if (filters.categories.isNotEmpty()) {
+            timetableItems = timetableItems.filter { timetableItem ->
+                filters.categories.contains(timetableItem.category)
+            }
+        }
         if (filters.filterFavorite) {
             timetableItems = timetableItems.filter { timetableItem ->
                 favorites.contains(timetableItem.id)

core/model/src/commonMain/resources/MR/base/strings.xml

@@ -26,6 +26,11 @@
     <!-- Contributors -->
     <string name="contributors_top_app_bar_title">コントリビューター</string>
 
+    <!-- Search -->
+    <string name="search_filter_select_day">開催日</string>
+    <string name="search_filter_select_category">カテゴリ</string>
+    <string name="search_filter_favorites">お気に入り済み</string>
+
     <!-- Map -->
 
     <!-- Sessions -->

core/model/src/commonMain/resources/MR/en/strings.xml

@@ -26,6 +26,11 @@
     <!-- Contributors -->
     <string name="contributors_top_app_bar_title">Contributors</string>
 
+    <!-- Search -->
+    <string name="search_filter_select_day">Day</string>
+    <string name="search_filter_select_category">Category</string>
+    <string name="search_filter_favorites">Favorites</string>
+
     <!-- Map -->
 
     <!-- Sessions -->

core/model/src/commonMain/resources/MR/zh/strings.xml

@@ -26,6 +26,11 @@
     <!-- Contributors -->
     <string name="contributors_top_app_bar_title">贡献者</string>
 
+    <!-- Search -->
+    <string name="search_filter_select_day">Day</string>
+    <string name="search_filter_select_category">Category</string>
+    <string name="search_filter_favorites">Favorites</string>
+
     <!-- Map -->
 
     <!-- Sessions -->

feature/sessions/build.gradle.kts

@@ -19,6 +19,7 @@ dependencies {
     implementation(libs.androidxCoreKtx)
     implementation(libs.composeUi)
     implementation(libs.accompanistFlowlayout)
+    implementation(libs.composeMaterial)
     implementation(libs.composeMaterial3)
     implementation(libs.composeUiToolingPreview)
     implementation(libs.androidxLifecycleLifecycleRuntimeKtx)

feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/FilterButton.kt

@@ -0,0 +1,108 @@
+package io.github.droidkaigi.confsched2022.feature.sessions
+
+import androidx.compose.animation.animateColor
+import androidx.compose.animation.core.animateDp
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.OutlinedButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+
+private const val TransitionAnimationDuration = 300
+
+@Composable
+fun FilterButton(
+    isSelected: Boolean,
+    isDropDown: Boolean,
+    text: String,
+    modifier: Modifier = Modifier,
+    onClicked: () -> Unit
+) {
+    val transition = updateTransition(targetState = isSelected)
+
+    val backgroundColor by transition.animateColor(
+        label = "backgroundColor",
+        transitionSpec = { tween(durationMillis = TransitionAnimationDuration) }
+    ) {
+        if (it)
+            MaterialTheme.colorScheme.secondaryContainer
+        else MaterialTheme.colorScheme.surface
+    }
+
+    val strokeColor by transition.animateColor(
+        label = "strokeColor",
+        transitionSpec = { tween(durationMillis = TransitionAnimationDuration) }
+    ) {
+        if (it)
+            MaterialTheme.colorScheme.secondaryContainer
+        else MaterialTheme.colorScheme.outline
+    }
+
+    val contentColor by transition.animateColor(
+        label = "textColor",
+        transitionSpec = { tween(durationMillis = TransitionAnimationDuration) }
+    ) {
+        if (it)
+            MaterialTheme.colorScheme.onSecondaryContainer
+        else MaterialTheme.colorScheme.onSurface
+    }
+
+    val checkIconWidth by transition.animateDp(
+        label = "checkIconWidth",
+        transitionSpec = { tween(durationMillis = TransitionAnimationDuration) }
+    ) { if (it) 16.dp else 0.dp }
+
+    OutlinedButton(
+        modifier = modifier,
+        onClick = onClicked,
+        colors = ButtonDefaults.outlinedButtonColors(
+            backgroundColor = backgroundColor
+        ),
+        contentPadding = PaddingValues(
+            horizontal = 16.dp,
+            vertical = 6.dp
+        ),
+        border = BorderStroke(
+            width = 1.dp,
+            color = strokeColor
+        ),
+        shape = MaterialTheme.shapes.small
+    ) {
+        if (isSelected) {
+            Icon(
+                modifier = Modifier.width(width = checkIconWidth),
+                painter = painterResource(id = R.drawable.ic_filter_selected),
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.onSecondaryContainer
+            )
+            Spacer(modifier = Modifier.width(8.dp))
+        }
+
+        Text(
+            text = text,
+            style = MaterialTheme.typography.labelLarge,
+            color = contentColor
+        )
+
+        if (isDropDown) {
+            Spacer(modifier = Modifier.width(8.dp))
+
+            Icon(
+                painter = painterResource(id = R.drawable.ic_filter_dropdown),
+                contentDescription = null,
+                tint = contentColor
+            )
+        }
+    }
+}