From 9b74b7f17d5368edae9f2333a511f53991a096df Mon Sep 17 00:00:00 2001 From: HiroyukiYagihashi Date: Thu, 11 Mar 2021 04:44:48 +0900 Subject: [PATCH] pass CI --- .../io/github/droidkaigi/feeder/data/UserDataStore.kt | 1 - .../feeder/data/DaggerThemeRepositoryImpl.kt | 1 - .../droidkaigi/feeder/repository/ThemeRepository.kt | 2 -- .../io/github/droidkaigi/feeder/feed/FeedScreen.kt | 1 - .../java/io/github/droidkaigi/feeder/DroidKaigiApp.kt | 2 -- .../droidkaigi/feeder/DroidKaigiAppViewModel.kt | 6 ++++-- .../feeder/viewmodel/RealDroidKaigiAppViewModel.kt | 4 +--- .../feeder/viewmodel/RealSettingViewModel.kt | 4 ++-- .../io/github/droidkaigi/feeder/setting/Setting.kt | 11 +++++------ 9 files changed, 12 insertions(+), 20 deletions(-) diff --git a/data/db/src/commonMain/kotlin/io/github/droidkaigi/feeder/data/UserDataStore.kt b/data/db/src/commonMain/kotlin/io/github/droidkaigi/feeder/data/UserDataStore.kt index 874ab4806..433eba71c 100644 --- a/data/db/src/commonMain/kotlin/io/github/droidkaigi/feeder/data/UserDataStore.kt +++ b/data/db/src/commonMain/kotlin/io/github/droidkaigi/feeder/data/UserDataStore.kt @@ -1,6 +1,5 @@ package io.github.droidkaigi.feeder.data -import com.russhwolf.settings.ExperimentalSettingsApi import com.russhwolf.settings.MockSettings import com.russhwolf.settings.coroutines.FlowSettings import com.russhwolf.settings.coroutines.toFlowSettings diff --git a/data/repository/src/main/java/io/github/droidkaigi/feeder/data/DaggerThemeRepositoryImpl.kt b/data/repository/src/main/java/io/github/droidkaigi/feeder/data/DaggerThemeRepositoryImpl.kt index 672a4c9b0..899f0a732 100644 --- a/data/repository/src/main/java/io/github/droidkaigi/feeder/data/DaggerThemeRepositoryImpl.kt +++ b/data/repository/src/main/java/io/github/droidkaigi/feeder/data/DaggerThemeRepositoryImpl.kt @@ -1,6 +1,5 @@ package io.github.droidkaigi.feeder.data -import io.github.droidkaigi.feeder.repository.ThemeRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/model/src/commonMain/kotlin/io/github/droidkaigi/feeder/repository/ThemeRepository.kt b/model/src/commonMain/kotlin/io/github/droidkaigi/feeder/repository/ThemeRepository.kt index c869a2a8c..2c50992b2 100644 --- a/model/src/commonMain/kotlin/io/github/droidkaigi/feeder/repository/ThemeRepository.kt +++ b/model/src/commonMain/kotlin/io/github/droidkaigi/feeder/repository/ThemeRepository.kt @@ -1,7 +1,5 @@ package io.github.droidkaigi.feeder.repository -import io.github.droidkaigi.feeder.FeedContents -import io.github.droidkaigi.feeder.FeedItem import io.github.droidkaigi.feeder.Theme import kotlinx.coroutines.flow.Flow diff --git a/uicomponent-compose/feed/src/main/java/io/github/droidkaigi/feeder/feed/FeedScreen.kt b/uicomponent-compose/feed/src/main/java/io/github/droidkaigi/feeder/feed/FeedScreen.kt index 363387658..13786696d 100644 --- a/uicomponent-compose/feed/src/main/java/io/github/droidkaigi/feeder/feed/FeedScreen.kt +++ b/uicomponent-compose/feed/src/main/java/io/github/droidkaigi/feeder/feed/FeedScreen.kt @@ -40,7 +40,6 @@ import io.github.droidkaigi.feeder.core.ScrollableTabRow import io.github.droidkaigi.feeder.core.TabIndicator import io.github.droidkaigi.feeder.core.TabRowDefaults.tabIndicatorOffset import io.github.droidkaigi.feeder.core.animation.FadeThrough -import io.github.droidkaigi.feeder.Theme import io.github.droidkaigi.feeder.core.getReadableMessage import io.github.droidkaigi.feeder.core.theme.AppThemeWithBackground import io.github.droidkaigi.feeder.core.use diff --git a/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiApp.kt b/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiApp.kt index dfdb6f435..1c45e4c24 100644 --- a/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiApp.kt +++ b/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiApp.kt @@ -11,11 +11,9 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import androidx.lifecycle.viewmodel.compose.viewModel import dev.chrisbanes.accompanist.insets.navigationBarsPadding import io.github.droidkaigi.feeder.core.theme.ConferenceAppFeederTheme import io.github.droidkaigi.feeder.core.use -import io.github.droidkaigi.feeder.viewmodel.RealDroidKaigiAppViewModel @Composable fun DroidKaigiApp(firstSplashScreenState: SplashState = SplashState.Shown) { diff --git a/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiAppViewModel.kt b/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiAppViewModel.kt index 07d958d01..001400209 100644 --- a/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiAppViewModel.kt +++ b/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/DroidKaigiAppViewModel.kt @@ -32,8 +32,10 @@ private val LocalDroidKaigiAppViewModel = compositionLocalOf -Unit) { +fun ProvideDroidKaigiAppViewModel( + viewModel: DroidKaigiAppViewModel, + block: @Composable () -> Unit) +{ CompositionLocalProvider(LocalDroidKaigiAppViewModel provides viewModel, content = block) } diff --git a/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealDroidKaigiAppViewModel.kt b/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealDroidKaigiAppViewModel.kt index 42a8ccb29..b3684c5e4 100644 --- a/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealDroidKaigiAppViewModel.kt +++ b/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealDroidKaigiAppViewModel.kt @@ -33,7 +33,5 @@ class RealDroidKaigiAppViewModel @Inject constructor( initialValue = DroidKaigiAppViewModel.State() ) - override fun event(event: DroidKaigiAppViewModel.Event) { - TODO("Not yet implemented") - } + override fun event(event: DroidKaigiAppViewModel.Event) {} } diff --git a/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealSettingViewModel.kt b/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealSettingViewModel.kt index 59aaf4066..b12af9071 100644 --- a/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealSettingViewModel.kt +++ b/uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealSettingViewModel.kt @@ -2,6 +2,7 @@ package io.github.droidkaigi.feeder.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import app.cash.exhaustive.Exhaustive import dagger.hilt.android.lifecycle.HiltViewModel import io.github.droidkaigi.feeder.setting.SettingViewModel import io.github.droidkaigi.feeder.repository.ThemeRepository @@ -14,7 +15,6 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import javax.annotation.meta.Exhaustive @HiltViewModel class RealSettingViewModel @Inject constructor( @@ -24,7 +24,7 @@ class RealSettingViewModel @Inject constructor( override val effect: Flow = effectChannel.receiveAsFlow() override val state: StateFlow = - repository.theme().map { SettingViewModel.State(theme = it)} + repository.theme().map { SettingViewModel.State(theme = it) } .stateIn( scope = viewModelScope, started = SharingStarted.Eagerly, diff --git a/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/setting/Setting.kt b/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/setting/Setting.kt index 02f001dff..c4141f353 100644 --- a/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/setting/Setting.kt +++ b/uicomponent-compose/other/src/main/java/io/github/droidkaigi/feeder/setting/Setting.kt @@ -54,23 +54,22 @@ fun Settings() { } } - @Composable fun Theme( context: Context, theme: Theme?, onClick: (Theme?) -> Unit ) { - val openDialog = remember { mutableStateOf(false) } + val openDialog = remember { mutableStateOf(false) } Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .clickable { - openDialog.value = true - } + openDialog.value = true + } .fillMaxWidth() .padding(vertical = 24.dp) - ){ + ) { Text( text = "Theme", style = typography.h5, @@ -133,7 +132,7 @@ fun ThemeSelectRadioButton( context: Context ) { val themes: List = Theme.values().toList() - var defaultIndex = 0; + var defaultIndex = 0 themes.forEachIndexed { index, it -> if (it == theme) defaultIndex = index } val (selectedTheme, oThemeSelected) = remember { mutableStateOf(themes[defaultIndex]) } Column(