Skip to content

Commit

Permalink
refactor #605 Move todo's data dependencies and implementations to da…
Browse files Browse the repository at this point in the history
…ta module.
  • Loading branch information
toastkidjp committed Jun 4, 2023
1 parent 7c46f64 commit a3acaa9
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* Copyright (c) 2023 toastkidjp.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompany this distribution.
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html.
*/

package jp.toastkid.todo.data

import android.content.Context

class TodoTaskDataAccessorFactory {

operator fun invoke(context: Context) =
TodoTaskDatabase.find(context).repository()

}
6 changes: 1 addition & 5 deletions todo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import property.LibraryVersion
plugins {
id("com.android.library")
id("kotlin-android")
id("org.jetbrains.kotlin.kapt")
id("jacoco.definition")
}
// TODO apply(from = "../jacoco.gradle.kts")
Expand Down Expand Up @@ -46,6 +45,7 @@ tasks.withType<GenerateBuildConfig> {
}

dependencies {
implementation(project(path = ":data"))
implementation(project(path = ":lib"))
implementation("org.jetbrains.kotlin:kotlin-stdlib:${BuildTool.kotlinVersion}")

Expand All @@ -62,10 +62,6 @@ dependencies {
implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${LibraryVersion.coroutines}")

implementation("androidx.room:room-runtime:${LibraryVersion.room}")
implementation("androidx.room:room-paging:${LibraryVersion.room}")
kapt("androidx.room:room-compiler:${LibraryVersion.room}")

testImplementation("junit:junit:${LibraryVersion.junit}")
testImplementation("io.mockk:mockk:${LibraryVersion.mockk}")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${LibraryVersion.coroutinesTest}")
Expand Down
6 changes: 3 additions & 3 deletions todo/src/main/java/jp/toastkid/todo/view/board/TaskBoardUi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import jp.toastkid.lib.ContentViewModel
import jp.toastkid.lib.preference.PreferenceApplier
import jp.toastkid.todo.R
import jp.toastkid.todo.data.TodoTaskDataAccessor
import jp.toastkid.todo.data.TodoTaskDatabase
import jp.toastkid.todo.data.TodoTaskDataAccessorFactory
import jp.toastkid.todo.model.TodoTask
import jp.toastkid.todo.view.addition.TaskAdditionDialogFragmentViewModel
import jp.toastkid.todo.view.addition.TaskEditorUi
Expand All @@ -80,7 +80,7 @@ fun TaskBoardUi() {
val taskAdditionDialogFragmentViewModel =
remember { TaskAdditionDialogFragmentViewModel() }

val repository = TodoTaskDatabase.find(context).repository()
val repository = TodoTaskDataAccessorFactory().invoke(context)
val preferenceApplier = PreferenceApplier(context)

val menuUseCase = ItemMenuPopupActionUseCase(
Expand Down Expand Up @@ -137,7 +137,7 @@ fun TaskBoardUi() {
@Composable
fun TaskBoard(flow: Flow<PagingData<TodoTask>>?, menuUseCase: ItemMenuPopupActionUseCase) {
val context = LocalContext.current
val repository = TodoTaskDatabase.find(context).repository()
val repository = TodoTaskDataAccessorFactory().invoke(context)
val color = PreferenceApplier(context).color

val tasks = flow?.collectAsLazyPagingItems() ?: return
Expand Down
6 changes: 3 additions & 3 deletions todo/src/main/java/jp/toastkid/todo/view/list/TaskListUi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import androidx.paging.compose.items
import jp.toastkid.lib.ContentViewModel
import jp.toastkid.lib.preference.PreferenceApplier
import jp.toastkid.todo.R
import jp.toastkid.todo.data.TodoTaskDatabase
import jp.toastkid.todo.data.TodoTaskDataAccessorFactory
import jp.toastkid.todo.model.TodoTask
import jp.toastkid.todo.view.addition.TaskAdditionDialogFragmentViewModel
import jp.toastkid.todo.view.addition.TaskEditorUi
Expand Down Expand Up @@ -83,7 +83,7 @@ fun TaskListUi() {
}
}

val repository = TodoTaskDatabase.find(context).repository()
val repository = TodoTaskDataAccessorFactory().invoke(context)

val tasks = remember { mutableStateOf<Flow<PagingData<TodoTask>>?>(null) }

Expand Down Expand Up @@ -160,7 +160,7 @@ private fun TaskListItem(
stringResource(id = R.string.delete)
)

val repository = TodoTaskDatabase.find(LocalContext.current).repository()
val repository = TodoTaskDataAccessorFactory().invoke(LocalContext.current)

Surface(
shadowElevation = 4.dp,
Expand Down

0 comments on commit a3acaa9

Please sign in to comment.