Fix build error

DroidKaigi · Feb 11, 2019 · 6f56320 · 6f56320
1 parent 9baca86
commit 6f56320
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/feature/staff_dfm/build.gradle b/feature/staff_dfm/build.gradle
@@ -29,8 +29,7 @@ android {
 dependencies {
  implementation project(':frontend:android')
 
- implementation project(':frontendcomponent:androidcomponent')
- implementation project(':ext:android-extension')
+ implementation project(':corecomponent:androidcomponent')
  implementation project(":data:repository")
  implementation project(":feature:system")
  implementation project(":model")

diff --git a/..._dfm/src/main/java/io/github/droidkaigi/confsched2019/staff_dfm/ui/StaffSearchFragment.kt b/..._dfm/src/main/java/io/github/droidkaigi/confsched2019/staff_dfm/ui/StaffSearchFragment.kt
@@ -18,8 +18,8 @@ import com.xwray.groupie.GroupAdapter
 import com.xwray.groupie.Item
 import com.xwray.groupie.ViewHolder
 import io.github.droidkaigi.confsched2019.App
-import io.github.droidkaigi.confsched2019.ext.android.changed
-import io.github.droidkaigi.confsched2019.ext.android.requireValue
+import io.github.droidkaigi.confsched2019.ext.changed
+import io.github.droidkaigi.confsched2019.ext.requireValue
 import io.github.droidkaigi.confsched2019.staff_dfm.R
 import io.github.droidkaigi.confsched2019.staff_dfm.databinding.FragmentStaffSearchBinding
 import io.github.droidkaigi.confsched2019.staff_dfm.ui.actioncreator.StaffSearchActionCreator

diff --git a/...io/github/droidkaigi/confsched2019/staff_dfm/ui/actioncreator/StaffSearchActionCreator.kt b/...io/github/droidkaigi/confsched2019/staff_dfm/ui/actioncreator/StaffSearchActionCreator.kt
@@ -5,7 +5,7 @@ import io.github.droidkaigi.confsched2019.action.Action
 import io.github.droidkaigi.confsched2019.data.repository.StaffRepository
 import io.github.droidkaigi.confsched2019.di.PageScope
 import io.github.droidkaigi.confsched2019.dispatcher.Dispatcher
-import io.github.droidkaigi.confsched2019.ext.android.coroutineScope
+import io.github.droidkaigi.confsched2019.ext.coroutineScope
 import io.github.droidkaigi.confsched2019.model.LoadingState
 import io.github.droidkaigi.confsched2019.model.StaffContents
 import io.github.droidkaigi.confsched2019.model.StaffSearchResult

diff --git a/...m/src/main/java/io/github/droidkaigi/confsched2019/staff_dfm/ui/store/StaffSearchStore.kt b/...m/src/main/java/io/github/droidkaigi/confsched2019/staff_dfm/ui/store/StaffSearchStore.kt
@@ -1,31 +1,31 @@
 package io.github.droidkaigi.confsched2019.staff_dfm.ui.store
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
 import io.github.droidkaigi.confsched2019.action.Action
 import io.github.droidkaigi.confsched2019.dispatcher.Dispatcher
-import io.github.droidkaigi.confsched2019.ext.android.toLiveData
+import io.github.droidkaigi.confsched2019.ext.toLiveData
 import io.github.droidkaigi.confsched2019.model.LoadingState
 import io.github.droidkaigi.confsched2019.model.StaffContents
 import io.github.droidkaigi.confsched2019.model.StaffSearchResult
+import io.github.droidkaigi.confsched2019.store.Store
 import kotlinx.coroutines.channels.map
 import javax.inject.Inject
 
 class StaffSearchStore @Inject constructor(
  dispatcher: Dispatcher
-) : ViewModel() {
+) : Store() {
  val query get() = searchResult.value?.query
 
  val loadingState: LiveData<LoadingState> = dispatcher
  .subscribe<Action.StaffSearchLoadingStateChanged>()
  .map { it.loadingState }
- .toLiveData(LoadingState.LOADING)
+ .toLiveData(this, LoadingState.LOADING)
  val searchResult = dispatcher
  .subscribe<Action.StaffSearchResultLoaded>()
  .map { it.searchResult }
- .toLiveData(StaffSearchResult.EMPTY)
+ .toLiveData(this, StaffSearchResult.EMPTY)
  val staffContents = dispatcher
  .subscribe<Action.StaffLoaded>()
  .map { it.staffContents }
- .toLiveData(StaffContents.EMPTY)
+ .toLiveData(this, StaffContents.EMPTY)
 }