pass CI

DroidKaigi · Mar 10, 2021 · e54d515 · e54d515
1 parent 96fb03a
commit e54d515
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 28 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -32,8 +32,10 @@ private val LocalDroidKaigiAppViewModel = compositionLocalOf<DroidKaigiAppViewMo
 }
 
 @Composable
-fun ProvideDroidKaigiAppViewModel(viewModel: DroidKaigiAppViewModel, block: @Composable () ->
-Unit) {
+fun ProvideDroidKaigiAppViewModel(
+    viewModel: DroidKaigiAppViewModel,
+    block: @Composable () -> Unit
+) {
     CompositionLocalProvider(LocalDroidKaigiAppViewModel provides viewModel, content = block)
 }
 

diff --git a/...compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/ProvideRealViewModels.kt b/...compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/ProvideRealViewModels.kt
@@ -2,9 +2,9 @@ package io.github.droidkaigi.feeder.viewmodel
 
 import androidx.compose.runtime.Composable
 import androidx.lifecycle.viewmodel.compose.viewModel
+import io.github.droidkaigi.feeder.ProvideDroidKaigiAppViewModel
 import io.github.droidkaigi.feeder.contributor.ProvideContributorViewModel
 import io.github.droidkaigi.feeder.contributor.fakeContributorViewModel
-import io.github.droidkaigi.feeder.ProvideDroidKaigiAppViewModel
 import io.github.droidkaigi.feeder.feed.ProvideFeedViewModel
 import io.github.droidkaigi.feeder.setting.ProvideSettingViewModel
 import io.github.droidkaigi.feeder.staff.ProvideStaffViewModel

diff --git a/...se/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealDroidKaigiAppViewModel.kt b/...se/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealDroidKaigiAppViewModel.kt
@@ -5,18 +5,14 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.github.droidkaigi.feeder.DroidKaigiAppViewModel
 import io.github.droidkaigi.feeder.repository.ThemeRepository
-import io.github.droidkaigi.feeder.setting.SettingViewModel
-import io.github.droidkaigi.feeder.staff.StaffViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-import javax.annotation.meta.Exhaustive
-import javax.inject.Inject
 
 @HiltViewModel
 class RealDroidKaigiAppViewModel @Inject constructor(
@@ -26,14 +22,12 @@ class RealDroidKaigiAppViewModel @Inject constructor(
     override val effect: Flow<DroidKaigiAppViewModel.Effect> = effectChannel.receiveAsFlow()
 
     override val state: StateFlow<DroidKaigiAppViewModel.State> =
-        repository.theme().map { DroidKaigiAppViewModel.State(theme = it)}
+        repository.theme().map { DroidKaigiAppViewModel.State(theme = it) }
             .stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.Eagerly,
                 initialValue = DroidKaigiAppViewModel.State()
             )
 
-    override fun event(event: DroidKaigiAppViewModel.Event) {
-        TODO("Not yet implemented")
-    }
+    override fun event(event: DroidKaigiAppViewModel.Event) {}
 }
diff --git a/...-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealSettingViewModel.kt b/...-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/RealSettingViewModel.kt
@@ -2,9 +2,10 @@ 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
+import io.github.droidkaigi.feeder.setting.SettingViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
@@ -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<SettingViewModel.Effect> = effectChannel.receiveAsFlow()
 
     override val state: StateFlow<SettingViewModel.State> =
-        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
@@ -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> = 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(