diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index fd6feea..6362a1e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,15 +1,24 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -20,6 +29,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -30,6 +40,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -41,6 +52,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -51,6 +63,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -61,6 +74,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -71,6 +85,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -81,6 +96,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -92,6 +108,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -103,6 +120,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
diff --git a/app/build.gradle b/app/build.gradle
index 859a8d6..b6d6fd4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,11 +16,11 @@ android {
             storePassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PASSWORD")
         }
     }
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.syousa1982.todo4android"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 2
         versionName "1.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -33,21 +33,15 @@ android {
         debug {
             resValue "string", "app_name", "ToDo 開発"
             minifyEnabled false
-            shrinkResources false
-            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             resValue "string", "app_name", "ToDo"
             minifyEnabled true
-            shrinkResources true
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.config
         }
     }
-    // ビルド環境を設定
-    flavorDimensions "default"
     // ソースディレクトリを指定
     sourceSets {
         // 共通ソース(Javaディレクトリが自動生成されないようにKotlinディレクトリを先に配置)
@@ -103,45 +97,38 @@ configurations {
 
 
 dependencies {
-    // Language
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    // AndroidX
-    implementation "com.google.android.material:material:1.0.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta1"
-    implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.browser:browser:1.0.0"
-    implementation "androidx.annotation:annotation:1.0.2"
-    implementation "androidx.exifinterface:exifinterface:1.0.0"
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    // Coroutines
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines"
+    // Room
+    implementation "androidx.room:room-runtime:$room_version"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-reactivestreams:$lifecycle_version"
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     kapt "androidx.room:room-compiler:$room_version"
-    implementation "androidx.room:room-runtime:$room_version"
-    implementation "androidx.room:room-rxjava2:$room_version"
+    implementation "androidx.room:room-ktx:$room_version"
+    // Serialization
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version"
     implementation "android.arch.navigation:navigation-fragment:$nav_version" // use -ktx for Kotlin
     implementation "android.arch.navigation:navigation-ui:$nav_version" // use -ktx for Kotlin
-    // Converter
-    kapt "se.ansman.kotshi:compiler:$kotshi_version"
-    implementation "se.ansman.kotshi:api:$kotshi_version"
-    implementation "com.squareup.moshi:moshi:$moshi_version"
-    implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
     // DI
+    // Koin AndroidX Scope feature
     implementation "org.koin:koin-androidx-scope:$koin_version"
+    // Koin AndroidX ViewModel feature
     implementation "org.koin:koin-androidx-viewmodel:$koin_version"
+    // Koin AndroidX Fragment Factory (unstable version)
+    implementation "org.koin:koin-androidx-fragment:$koin_version"
+
     // UI
-    kapt "com.github.bumptech.glide:compiler:$glide_version"
-    implementation "com.github.bumptech.glide:glide:$glide_version"
-    implementation "com.xwray:groupie:$groupie_version"
-    implementation "com.xwray:groupie-databinding:$groupie_version"
-    implementation "com.xwray:groupie-kotlin-android-extensions:$groupie_version"
-    // Reactive
-    implementation "io.reactivex.rxjava2:rxjava:2.2.8"
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxkotlin:2.3.0"
+    implementation 'com.xwray:groupie:2.7.2'
+    implementation 'com.xwray:groupie-databinding:2.7.2'
+    implementation 'com.github.bumptech.glide:glide:4.10.0'
+
     // Test
     testImplementation "org.robolectric:robolectric:4.2.1"
     androidTestImplementation "androidx.test:runner:1.1.1"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8017230..90d683b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,35 +4,28 @@
     <!-- カメラ機能が必須かどうかを設定 -->
     <uses-feature
         android:name="android.hardware.camera"
-        android:required="false" /> <!-- インターネットの使用を許可する -->
-    <uses-permission android:name="android.permission.INTERNET" /> <!-- ネットワーク状況の検知を許可する -->
+        android:required="false" />
+    <!-- インターネットの使用を許可する -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- ネットワーク状況の検知を許可する -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:name=".App"
+        android:name=".TodoApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <!-- ライセンス -->
-        <activity android:name=".presentation.license.LicenseActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar"/>
         <!-- メイン画面 -->
         <activity
-            android:name=".presentation.MainActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:name=".MainActivity"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
     </application>
diff --git a/app/src/main/assets/mocks/task.json b/app/src/main/assets/mocks/task.json
new file mode 100644
index 0000000..7236fa0
--- /dev/null
+++ b/app/src/main/assets/mocks/task.json
@@ -0,0 +1,19 @@
+{
+  "tasks" : [
+    {
+      "id" : 1,
+      "name" : "タスク1",
+      "status" : "TODO"
+    },
+    {
+      "id" : 2,
+      "name" : "タスク2",
+      "status" : "DOING"
+    },
+    {
+      "id" : 3,
+      "name" : "タスク3",
+      "status" : "DONE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/App.kt b/app/src/main/kotlin/com/syousa1982/todo4android/App.kt
deleted file mode 100644
index 8663c49..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/App.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.syousa1982.todo4android
-
-import android.app.Application
-import com.syousa1982.todo4android.di.AppModule
-import org.koin.android.ext.android.startKoin
-
-open class App : Application() {
-
-    override fun onCreate() {
-        super.onCreate()
-        startKoin(this, listOf(AppModule.instance))
-    }
-
-    protected open fun isInUnitTests() = false
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/MainActivity.kt b/app/src/main/kotlin/com/syousa1982/todo4android/MainActivity.kt
new file mode 100644
index 0000000..b01aab4
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/MainActivity.kt
@@ -0,0 +1,18 @@
+package com.syousa1982.todo4android
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import com.syousa1982.todo4android.databinding.ActivityMainBinding
+
+class MainActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivityMainBinding
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
+    }
+
+}
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/TodoApp.kt b/app/src/main/kotlin/com/syousa1982/todo4android/TodoApp.kt
new file mode 100644
index 0000000..aa92755
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/TodoApp.kt
@@ -0,0 +1,21 @@
+package com.syousa1982.todo4android
+
+import android.app.Application
+import com.syousa1982.todo4android.di.AppModule
+import com.syousa1982.todo4android.di.DatabaseModule
+import com.syousa1982.todo4android.di.ViewModelModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+
+open class TodoApp : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        startKoin {
+//            androidLogger()
+            androidContext(this@TodoApp)
+            modules(listOf(DatabaseModule.module, AppModule.module, ViewModelModule.module))
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/constant/.gitkeep b/app/src/main/kotlin/com/syousa1982/todo4android/data/constant/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/.gitkeep b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/AppDatabase.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/AppDatabase.kt
index 5b71eb0..60e424c 100644
--- a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/AppDatabase.kt
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/AppDatabase.kt
@@ -2,11 +2,13 @@ package com.syousa1982.todo4android.data.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import com.syousa1982.todo4android.data.db.dao.TaskListDao
-import com.syousa1982.todo4android.data.db.entity.TaskEntity
-import com.syousa1982.todo4android.data.db.entity.TaskListEntity
+import androidx.room.TypeConverters
+import com.syousa1982.todo4android.data.db.dao.TaskDao
+import com.syousa1982.todo4android.data.db.entity.Task
+import com.syousa1982.todo4android.data.db.entity.TaskStatusConverter
 
-@Database(entities = arrayOf(TaskListEntity::class, TaskEntity::class), version = 1)
+@Database(entities = arrayOf(Task::class), version = 1, exportSchema = false)
+@TypeConverters(TaskStatusConverter::class)
 abstract class AppDatabase : RoomDatabase() {
-    abstract fun taskListDao(): TaskListDao
+    abstract fun taskDao(): TaskDao
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/dao/TaskDao.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/dao/TaskDao.kt
new file mode 100644
index 0000000..0f49570
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/dao/TaskDao.kt
@@ -0,0 +1,18 @@
+package com.syousa1982.todo4android.data.db.dao
+
+import androidx.lifecycle.LiveData
+import androidx.room.*
+import com.syousa1982.todo4android.data.db.entity.Task
+
+/**
+ * タスク Dao
+ */
+@Dao
+interface TaskDao {
+
+    @Insert
+    suspend fun insert(task: Task)
+
+    @Query("SELECT * FROM tasks")
+    fun getAll(): LiveData<List<Task>>
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/dao/TaskListDao.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/dao/TaskListDao.kt
deleted file mode 100644
index 0976b58..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/dao/TaskListDao.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.syousa1982.todo4android.data.db.dao
-
-import androidx.room.*
-import com.syousa1982.todo4android.data.db.entity.TaskEntity
-import com.syousa1982.todo4android.data.db.entity.TaskListAndTasks
-import com.syousa1982.todo4android.data.db.entity.TaskListEntity
-import io.reactivex.Single
-
-/**
- * タスクリスト Dao
- */
-@Dao
-interface TaskListDao {
-
-    /**
-     * タスクリストを追加
-     * todo: Singleで取得したい
-     *
-     * @param taskList
-     */
-    @Insert
-    fun insertTaskList(taskList: TaskListEntity): Single<Long>
-
-    /**
-     * タスクを追加
-     *
-     * @param task
-     */
-    @Insert
-    fun insertTask(task: TaskEntity): Single<Long>
-
-    /**
-     * タスクリストを更新
-     *
-     * @param taskList
-     */
-    @Update
-    fun updateTaskList(taskList: TaskListEntity): Single<Int>
-
-    /**
-     * タスクを更新
-     *
-     * @param task
-     */
-    @Update
-    fun updateTask(task: TaskEntity): Single<Int>
-
-    /**
-     * タスクリスト削除
-     *
-     * @param taskLists
-     */
-    @Delete
-    fun deleteTaskList(taskLists: TaskListEntity): Single<Int>
-
-    /**
-     * タスク削除
-     *
-     * @param tasks
-     */
-    @Delete
-    fun deleteTask(tasks: TaskEntity): Single<Int>
-
-    /**
-     * タスクを複数削除
-     *
-     * @param tasks
-     */
-    @Delete
-    fun deleteTasks(tasks: List<TaskEntity>): Single<Int>
-
-    /**
-     * タスクリストとタスクを取得
-     */
-    @Transaction
-    @Query("SELECT * FROM task_list")
-    fun loadTaskListAndTasks(): Single<List<TaskListAndTasks>>
-
-    /**
-     * タスクリストとタスクをID指定で取得
-     *
-     * @param taskListId
-     */
-    @Transaction
-    @Query("SELECT * FROM task_list WHERE id = :taskListId")
-    fun loadTaskListAndTasks(taskListId: String): Single<TaskListAndTasks>
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/Task.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/Task.kt
new file mode 100644
index 0000000..df31bea
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/Task.kt
@@ -0,0 +1,34 @@
+package com.syousa1982.todo4android.data.db.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import androidx.room.TypeConverter
+
+/**
+ * TaskEntity Entity
+ */
+@Entity(tableName = "tasks")
+data class Task(
+    @PrimaryKey(autoGenerate = true)
+    val id: Int = 0,
+    val name: String,
+    val status: String = TaskStatus.TODO.value
+)
+
+enum class TaskStatus(val value: String) {
+    TODO("todo"),
+    DONE("done")
+}
+
+class TaskStatusConverter {
+
+    @TypeConverter
+    fun fromStatus(status: TaskStatus) = status.value
+
+    @TypeConverter
+    fun toStatus(value: String) = when(value) {
+        TaskStatus.TODO.value -> TaskStatus.TODO
+        TaskStatus.DONE.value -> TaskStatus.DONE
+        else -> throw IllegalStateException("存在しないステータス")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskEntity.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskEntity.kt
deleted file mode 100644
index c5daf1c..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskEntity.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.syousa1982.todo4android.data.db.entity
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-
-/**
- * TaskEntity Entity
- */
-@Entity(tableName = "task",
-    foreignKeys = arrayOf(ForeignKey(
-        entity = TaskListEntity::class,
-        parentColumns = arrayOf("id"),
-        childColumns = arrayOf("taskListId"),
-        onDelete = ForeignKey.CASCADE
-    ))
-)
-data class TaskEntity(
-    @PrimaryKey(autoGenerate = true)
-    val id: Int = 0,
-    val taskListId: Int,
-    val name: String,
-    val status: String
-)
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskListAndTasks.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskListAndTasks.kt
deleted file mode 100644
index d0fc169..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskListAndTasks.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.syousa1982.todo4android.data.db.entity
-
-import androidx.room.Embedded
-import androidx.room.Relation
-
-/**
- * TaskとTaskListをリレーションさせるクラス
- */
-class TaskListAndTasks {
-    @Embedded
-    lateinit var taskList: TaskListEntity
-
-    @Relation(parentColumn = "id", entityColumn = "taskListId")
-    lateinit var tasks: List<TaskEntity>
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskListEntity.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskListEntity.kt
deleted file mode 100644
index e6ffc71..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/data/db/entity/TaskListEntity.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.syousa1982.todo4android.data.db.entity
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-/**
- * TaskListEntity
- */
-@Entity(tableName = "task_list")
-data class TaskListEntity(
-    @PrimaryKey(autoGenerate = true)
-    val id: Int = 0,
-    val name: String
-)
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/repository/.gitkeep b/app/src/main/kotlin/com/syousa1982/todo4android/data/repository/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/repository/TaskListRepository.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/repository/TaskListRepository.kt
deleted file mode 100644
index 49fdb2b..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/data/repository/TaskListRepository.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.syousa1982.todo4android.data.repository
-
-import com.syousa1982.todo4android.data.db.dao.TaskListDao
-import com.syousa1982.todo4android.data.db.entity.TaskEntity
-import com.syousa1982.todo4android.data.db.entity.TaskListAndTasks
-import com.syousa1982.todo4android.data.db.entity.TaskListEntity
-import io.reactivex.Single
-
-
-interface ITaskListRepository {
-    // region insert
-    /**
-     * タスクリストを追加
-     *
-     * @param taskList
-     */
-    fun insertTaskListByDB(taskList: TaskListEntity): Single<Long>
-
-    /**
-     * タスクを追加
-     *
-     * @param task
-     */
-    fun insertTaskByDB(task: TaskEntity): Single<Long>
-    // endregion
-
-    // region update
-    /**
-     * タスクリストを追加
-     *
-     * @param taskList
-     */
-    fun updateTaskListByDB(taskList: TaskListEntity): Single<Int>
-
-    /**
-     * タスクを更新
-     *
-     * @param task
-     */
-    fun updateTaskByDB(task: TaskEntity): Single<Int>
-    // endregion
-
-    // region delete
-    /**
-     * タスクリスト削除
-     *
-     * @param taskList
-     */
-    fun deleteTaskListByDB(taskList: TaskListEntity): Single<Int>
-
-    /**
-     * タスク削除
-     *
-     * @param task
-     */
-    fun deleteTaskByDB(task: TaskEntity): Single<Int>
-
-    /**
-     * タスクを複数削除
-     *
-     * @param tasks
-     */
-    fun deleteTasksByDB(tasks: List<TaskEntity>): Single<Int>
-    // endregion
-
-    // region query
-    /**
-     * タスクリストとタスクを取得
-     */
-    fun loadTaskListAndTasksByDB(): Single<List<TaskListAndTasks>>
-
-    /**
-     * タスクリストとタスクをID指定で取得
-     *
-     * @param taskListId
-     */
-    fun loadTaskListAndTasksByDB(taskListId: String): Single<TaskListAndTasks>
-    // endregion
-}
-
-class TaskListRepository(private val dao: TaskListDao) : ITaskListRepository {
-    override fun insertTaskListByDB(taskList: TaskListEntity): Single<Long> {
-        return dao.insertTaskList(taskList)
-    }
-
-    override fun insertTaskByDB(task: TaskEntity): Single<Long> {
-        return dao.insertTask(task)
-    }
-
-    override fun updateTaskListByDB(taskList: TaskListEntity): Single<Int> {
-        return dao.updateTaskList(taskList)
-    }
-
-    override fun updateTaskByDB(task: TaskEntity): Single<Int> {
-        return dao.updateTask(task)
-    }
-
-    override fun deleteTaskByDB(task: TaskEntity): Single<Int> {
-        return dao.deleteTask(task)
-    }
-
-    override fun deleteTaskListByDB(taskList: TaskListEntity): Single<Int> {
-        return dao.deleteTaskList(taskList)
-    }
-
-    override fun deleteTasksByDB(tasks: List<TaskEntity>): Single<Int> {
-        return dao.deleteTasks(tasks)
-    }
-
-    override fun loadTaskListAndTasksByDB(): Single<List<TaskListAndTasks>> {
-        return dao.loadTaskListAndTasks()
-    }
-
-    override fun loadTaskListAndTasksByDB(taskListId: String): Single<TaskListAndTasks> {
-        return dao.loadTaskListAndTasks(taskListId)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/repository/TaskRepository.kt b/app/src/main/kotlin/com/syousa1982/todo4android/data/repository/TaskRepository.kt
new file mode 100644
index 0000000..2706b2e
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/data/repository/TaskRepository.kt
@@ -0,0 +1,20 @@
+package com.syousa1982.todo4android.data.repository
+
+import androidx.annotation.WorkerThread
+import com.syousa1982.todo4android.data.db.dao.TaskDao
+import com.syousa1982.todo4android.data.db.entity.Task
+
+class TaskRepository(private val dao: TaskDao) {
+
+    val tasks = dao.getAll()
+
+    @WorkerThread
+    suspend fun insert(task: Task) {
+        dao.insert(task)
+    }
+
+    @WorkerThread
+    suspend fun add(name: String) {
+        dao.insert(Task(name = name))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/di/AppModule.kt b/app/src/main/kotlin/com/syousa1982/todo4android/di/AppModule.kt
index 0798dc0..5629b93 100644
--- a/app/src/main/kotlin/com/syousa1982/todo4android/di/AppModule.kt
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/di/AppModule.kt
@@ -1,43 +1,10 @@
 package com.syousa1982.todo4android.di
 
-import com.syousa1982.todo4android.data.repository.ITaskListRepository
-import com.syousa1982.todo4android.data.repository.TaskListRepository
-import com.syousa1982.todo4android.domain.usecase.IToDoUseCase
-import com.syousa1982.todo4android.domain.usecase.ToDoUseCase
-import com.syousa1982.todo4android.presentation.task.TaskAddViewModel
-import com.syousa1982.todo4android.presentation.task.TaskViewModel
-import com.syousa1982.todo4android.presentation.tasklist.TaskListAddViewModel
-import com.syousa1982.todo4android.presentation.tasklist.TaskListViewModel
-import com.syousa1982.todo4android.util.rx.AppSchedulerProvider
-import com.syousa1982.todo4android.util.rx.SchedulerProvider
-import org.koin.android.ext.koin.androidContext
-import org.koin.androidx.viewmodel.ext.koin.viewModel
-import org.koin.dsl.module.module
+import com.syousa1982.todo4android.data.repository.TaskRepository
+import org.koin.dsl.module
 
 object AppModule {
-    val instance = module {
-        // region Presentation Layer
-        viewModel { TaskListViewModel(get()) }
-        viewModel { TaskListAddViewModel(get()) }
-        viewModel { TaskViewModel(get()) }
-        viewModel { TaskAddViewModel(get()) }
-        // endregion
-
-        // region Domain Layer
-        factory<IToDoUseCase> { ToDoUseCase(get(), get()) }
-        // endregion
-
-        // region Data Layer Database
-        single { DatabaseModule.getDatabase(androidContext()) }
-        single { DatabaseModule.getTaskListDao(get()) }
-        // endregion
-
-        // region Data Layer Repository
-        single<ITaskListRepository> { TaskListRepository(get()) }
-        // endregion
-
-        // region Rx
-        single<SchedulerProvider> { AppSchedulerProvider() }
-        // endregion
+    val module = module {
+        single { TaskRepository(get()) }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/di/DatabaseModule.kt b/app/src/main/kotlin/com/syousa1982/todo4android/di/DatabaseModule.kt
index f992712..f3cbad9 100644
--- a/app/src/main/kotlin/com/syousa1982/todo4android/di/DatabaseModule.kt
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/di/DatabaseModule.kt
@@ -2,17 +2,46 @@ package com.syousa1982.todo4android.di
 
 import android.content.Context
 import androidx.room.Room
-import com.syousa1982.todo4android.BuildConfig
 import com.syousa1982.todo4android.data.db.AppDatabase
-import com.syousa1982.todo4android.data.db.dao.TaskListDao
+import com.syousa1982.todo4android.utils.Constants.DB_NAME
+import org.koin.android.ext.koin.androidContext
+import org.koin.dsl.module
 
 object DatabaseModule {
-    private const val ROOM_DATABASE_NAME = "Room_Database_${BuildConfig.FLAVOR}"
 
-    fun getDatabase(context: Context): AppDatabase {
-        return Room.databaseBuilder(context, AppDatabase::class.java, ROOM_DATABASE_NAME)
-                .build()
+    val module = module {
+        single { provideDatabese(androidContext()) }
+        single { provideTaskDao(get()) }
     }
 
-    fun getTaskListDao(db: AppDatabase): TaskListDao = db.taskListDao()
-}
\ No newline at end of file
+    fun provideDatabese(context: Context)
+        = Room
+        .databaseBuilder(context, AppDatabase::class.java, DB_NAME)
+        .build()
+
+    fun provideTaskDao(db: AppDatabase) = db.taskDao()
+}
+
+//@Module
+//class DatabaseModule {
+//    @Singleton
+//    @Provides
+//    fun provideDatabaseName() = DB_NAME
+//
+//    @Singleton
+//    @Provides
+//    fun provideDatabaseVersion() = DB_VERSION
+//
+//    @Singleton
+//    @Provides
+//    fun providePrefName() = SHARED_PREF_NAME
+//
+//    @Singleton
+//    @Provides
+//    fun provideAppDatabase(context: Context) =
+//        Room.databaseBuilder(context, AppDatabase::class.java, DB_NAME).build()
+//
+//    @Singleton
+//    @Provides
+//    fun provideTaskDao(appDatabase: AppDatabase) = appDatabase.taskDao()
+//}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/di/ViewModelModule.kt b/app/src/main/kotlin/com/syousa1982/todo4android/di/ViewModelModule.kt
new file mode 100644
index 0000000..6901428
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/di/ViewModelModule.kt
@@ -0,0 +1,11 @@
+package com.syousa1982.todo4android.di
+
+import com.syousa1982.todo4android.presentation.TaskViewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+
+object ViewModelModule {
+    val module = module {
+        viewModel { TaskViewModel(get()) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/domain/.gitkeep b/app/src/main/kotlin/com/syousa1982/todo4android/domain/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/domain/Result.kt b/app/src/main/kotlin/com/syousa1982/todo4android/domain/Result.kt
deleted file mode 100644
index 8b01c17..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/domain/Result.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.syousa1982.todo4android.domain
-
-/**
- * Rxの成功と失敗のモデルを格納
- */
-sealed class Result<T> {
-
-    /**
-     * プログレス
-     *
-     * @param value Boolean
-     */
-    data class Progress<T>(private val value: Boolean = true) : Result<T>()
-
-    /**
-     * 成功
-     *
-     * @param data データ
-     */
-    data class Success<T>(val data: T) : Result<T>()
-
-    /**
-     * 失敗
-     *
-     * @param e エラー
-     */
-    data class Failure<T>(val e: Throwable) : Result<T>()
-
-    companion object {
-
-        /**
-         * プログレス
-         */
-        fun <T> progress(): Result<T> = Progress()
-
-        /**
-         * 成功
-         *
-         * @param data データ
-         * @return Result
-         */
-        fun <T> success(data: T): Result<T> = Success(data)
-
-        /**
-         * 失敗
-         *
-         * @param e エラー
-         * @return Result
-         */
-        fun <T> failure(e: Throwable): Result<T> = Failure(e)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/domain/model/Task.kt b/app/src/main/kotlin/com/syousa1982/todo4android/domain/model/Task.kt
deleted file mode 100644
index 92de0b3..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/domain/model/Task.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.syousa1982.todo4android.domain.model
-
-import java.io.Serializable
-
-/**
- * タスクModel
- *
- * @param id
- * @param name
- * @param status
- */
-data class Task(
-    val id: Int,
-    val name: String,
-    val status: Status
-) : Serializable {
-    enum class Status(val value: String) {
-        TODO("todo"),
-        DONE("done");
-
-        companion object {
-            fun from(value: String): Status = Status.values().first { it.value == value }
-
-            fun changeStatus(status: Status): Status = when (status) {
-                TODO -> DONE
-                DONE -> TODO
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/domain/model/TaskList.kt b/app/src/main/kotlin/com/syousa1982/todo4android/domain/model/TaskList.kt
deleted file mode 100644
index b5a2980..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/domain/model/TaskList.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.syousa1982.todo4android.domain.model
-
-import java.io.Serializable
-
-/**
- * タスクリスト
- *
- * @param id
- * @param name
- * @param tasks
- * @property taskCount
- */
-data class TaskList(
-    val id: Int,
-    val name: String,
-    val tasks: List<Task>
-) : Serializable {
-    /**
-     * タスク件数
-     */
-    val taskCount = tasks.count()
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/domain/translator/.gitkeep b/app/src/main/kotlin/com/syousa1982/todo4android/domain/translator/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/domain/translator/TaskListTranslator.kt b/app/src/main/kotlin/com/syousa1982/todo4android/domain/translator/TaskListTranslator.kt
deleted file mode 100644
index bc907b0..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/domain/translator/TaskListTranslator.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.syousa1982.todo4android.domain.translator
-
-import com.syousa1982.todo4android.data.db.entity.TaskListAndTasks
-import com.syousa1982.todo4android.domain.model.Task
-import com.syousa1982.todo4android.domain.model.TaskList
-
-/**
- * TaskList Translator
- */
-object TaskListTranslator {
-
-    /**
-     * ドメインモデル 生成
-     *
-     * @param entity
-     */
-    fun toTodoList(entity: TaskListAndTasks): TaskList = TaskList(
-            entity.taskList.id,
-            entity.taskList.name,
-            entity.tasks.map {
-                Task(
-                        it.id,
-                        it.name,
-                        Task.Status.valueOf(it.status.toUpperCase())
-                )
-            }
-    )
-
-    /**
-     * ドメインモデルリスト 生成
-     *
-     * @param entities
-     */
-    fun toTodoLists(entities: List<TaskListAndTasks>): List<TaskList> = entities.map {
-        toTodoList(it)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/domain/usecase/ToDoUseCase.kt b/app/src/main/kotlin/com/syousa1982/todo4android/domain/usecase/ToDoUseCase.kt
deleted file mode 100644
index 5a6bc80..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/domain/usecase/ToDoUseCase.kt
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.syousa1982.todo4android.domain.usecase
-
-import com.syousa1982.todo4android.data.db.entity.TaskEntity
-import com.syousa1982.todo4android.data.db.entity.TaskListEntity
-import com.syousa1982.todo4android.data.repository.ITaskListRepository
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.domain.model.Task
-import com.syousa1982.todo4android.domain.model.TaskList
-import com.syousa1982.todo4android.domain.translator.TaskListTranslator
-import com.syousa1982.todo4android.util.extention.toResult
-import com.syousa1982.todo4android.util.rx.SchedulerProvider
-import io.reactivex.Flowable
-import io.reactivex.functions.BiFunction
-
-/**
- * ToDo機能 インタフェース
- */
-interface IToDoUseCase {
-
-    /**
-     * タスクリストのListを取得
-     */
-    fun getTaskLists(): Flowable<Result<List<TaskList>>>
-
-    /**
-     * タスクのListを取得
-     *
-     * @param taskListId
-     */
-    fun getTasks(taskListId: Int): Flowable<Result<List<Task>>>
-
-    /**
-     * タスクリストを追加
-     *
-     * @param name
-     */
-    fun addTaskList(name: String): Flowable<Result<Boolean>>
-
-    /**
-     * タスクを追加
-     *
-     * @param taskListId
-     * @param name
-     */
-    fun addTask(taskListId: Int, name: String): Flowable<Result<Boolean>>
-
-    /**
-     * タスクリストを更新
-     *
-     * @param taskList
-     */
-    fun updateTaskList(taskList: TaskList): Flowable<Result<Boolean>>
-
-    /**
-     * タスクを更新
-     *
-     * @param
-     */
-    fun updateTask(taskListId: Int, task: Task): Flowable<Result<Boolean>>
-
-    /**
-     * タスクリストとタスクを削除
-     */
-    fun removeTaskListAndTasks(taskList: TaskList): Flowable<Result<Boolean>>
-
-    /**
-     * タスクリストを削除
-     * memo:タスクリスト削除時はリレーションしているタスクも削除する
-     *
-     * @param taskList
-     */
-    fun removeTaskList(taskList: TaskList): Flowable<Result<Boolean>>
-
-    /**
-     * タスクを削除
-     *
-     * @param taskListId
-     */
-    fun removeTask(taskListId: Int, task: Task): Flowable<Result<Boolean>>
-
-    /**
-     * タスクを全件削除
-     *
-     * @param taskListId
-     * @param tasks
-     */
-    fun removeTasks(taskListId: Int, tasks: List<Task>): Flowable<Result<Boolean>>
-
-}
-
-/**
- * ToDo機能
- *
- * @param repository
- * @param schedulerProvider
- */
-class ToDoUseCase(private val repository: ITaskListRepository,
-                  private val schedulerProvider: SchedulerProvider) : IToDoUseCase {
-    override fun getTaskLists(): Flowable<Result<List<TaskList>>> {
-        return repository.loadTaskListAndTasksByDB()
-            .map {
-                TaskListTranslator.toTodoLists(it)
-            }
-            .toResult(schedulerProvider)
-    }
-
-    override fun getTasks(taskListId: Int): Flowable<Result<List<Task>>> {
-        return repository.loadTaskListAndTasksByDB(taskListId.toString())
-            .map {
-                TaskListTranslator.toTodoList(it).tasks
-            }
-            .toResult(schedulerProvider)
-    }
-
-    override fun addTaskList(name: String): Flowable<Result<Boolean>> {
-        val entity = TaskListEntity(name = name)
-        return repository.insertTaskListByDB(entity)
-            .map {
-                true
-            }
-            .toResult(schedulerProvider)
-    }
-
-    override fun addTask(taskListId: Int, name: String): Flowable<Result<Boolean>> {
-        val entity = TaskEntity(taskListId = taskListId, name = name, status = Task.Status.TODO.value)
-        return repository.insertTaskByDB(entity)
-            .map {
-                true
-            }
-            .toResult(schedulerProvider)
-    }
-
-    override fun updateTaskList(taskList: TaskList): Flowable<Result<Boolean>> {
-        val entity = TaskListEntity(taskList.id, taskList.name)
-        return repository.updateTaskListByDB(entity)
-            .map { true }
-            .toResult(schedulerProvider)
-    }
-
-    override fun updateTask(taskListId: Int, task: Task): Flowable<Result<Boolean>> {
-        val entity = TaskEntity(task.id, taskListId, task.name, task.status.value)
-        return repository.updateTaskByDB(entity)
-            .map { true }
-            .toResult(schedulerProvider)
-    }
-
-    override fun removeTaskListAndTasks(taskList: TaskList): Flowable<Result<Boolean>> {
-        val taskListResult = removeTaskList(taskList)
-        val tasksResult = removeTasks(taskList.id, taskList.tasks)
-        return Flowable.zip(taskListResult, tasksResult, BiFunction {taskListResult, tasksResult ->
-            when {
-                (taskListResult is Result.Failure) || (tasksResult is Result.Failure) -> {
-                    Result.failure(Throwable())
-                }
-                (taskListResult is Result.Success) && (tasksResult is Result.Success) -> {
-                    Result.success(true)
-                }
-                else -> {
-                    Result.progress()
-                }
-            }
-        })
-    }
-
-    override fun removeTaskList(taskList: TaskList): Flowable<Result<Boolean>> {
-        val entity = TaskListEntity(taskList.id, taskList.name)
-        return repository.deleteTaskListByDB(entity)
-            .map { true }
-            .toResult(schedulerProvider)
-    }
-
-    override fun removeTask(taskListId: Int, task: Task): Flowable<Result<Boolean>> {
-        val entity = TaskEntity(task.id, taskListId, task.name, task.status.value)
-        return repository.deleteTaskByDB(entity)
-            .map { true }
-            .toResult(schedulerProvider)
-    }
-
-    override fun removeTasks(taskListId: Int, tasks: List<Task>): Flowable<Result<Boolean>> {
-        val entities = tasks.map { task ->
-            TaskEntity(task.id, taskListId, task.name, task.status.value)
-        }
-        return repository.deleteTasksByDB(entities)
-            .map { true }
-            .toResult(schedulerProvider)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/BaseViewModel.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/BaseViewModel.kt
deleted file mode 100644
index 0033251..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/BaseViewModel.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.syousa1982.todo4android.presentation
-
-import androidx.annotation.CallSuper
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
-import androidx.lifecycle.ViewModel
-import io.reactivex.disposables.CompositeDisposable
-
-/**
- * ViewModelの抽象クラス
- */
-abstract class BaseViewModel : ViewModel(), LifecycleObserver {
-
-    protected val disposable = CompositeDisposable()
-
-    @CallSuper
-    @OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
-    open fun onCreate() = Unit
-
-    @CallSuper
-    @OnLifecycleEvent(Lifecycle.Event.ON_START)
-    open fun onStart() = Unit
-
-    @CallSuper
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    open fun onResume() = Unit
-
-    @CallSuper
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    open fun onPause() = Unit
-
-    @CallSuper
-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    open fun onStop() = Unit
-
-    @CallSuper
-    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-    open fun onDestroy() = Unit
-
-    @CallSuper
-    override fun onCleared() {
-        super.onCleared()
-        disposable.clear()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/MainActivity.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/MainActivity.kt
deleted file mode 100644
index 9cbc822..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/MainActivity.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.syousa1982.todo4android.presentation
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
-import androidx.databinding.DataBindingUtil
-import androidx.navigation.NavController
-import androidx.navigation.fragment.NavHostFragment.findNavController
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.NavigationUI
-import androidx.navigation.ui.NavigationUI.setupActionBarWithNavController
-import com.syousa1982.todo4android.R
-import com.syousa1982.todo4android.databinding.ActivityMainBinding
-import com.syousa1982.todo4android.presentation.license.LicenseActivity
-import kotlinx.android.synthetic.main.activity_main.*
-
-class MainActivity : AppCompatActivity() {
-
-    private lateinit var binding: ActivityMainBinding
-
-    private val navController: NavController by lazy { findNavController(nav_host_fragment) }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
-        setSupportActionBar(binding.toolbar)
-        findViewById<Toolbar>(R.id.toolbar).also {
-            setSupportActionBar(it)
-            NavigationUI.setupWithNavController(it, navController)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        MenuInflater(this).inflate(R.menu.option_menu, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
-            R.id.license -> startActivity(LicenseActivity.newIntent(this))
-        }
-        return super.onOptionsItemSelected(item)
-    }
-}
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/TaskFragment.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/TaskFragment.kt
new file mode 100644
index 0000000..656a502
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/TaskFragment.kt
@@ -0,0 +1,64 @@
+package com.syousa1982.todo4android.presentation
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.syousa1982.todo4android.data.db.entity.Task
+import com.syousa1982.todo4android.databinding.FragmentTaskBinding
+import com.xwray.groupie.GroupAdapter
+import com.xwray.groupie.GroupieViewHolder
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [TaskFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class TaskFragment : Fragment() {
+
+    lateinit var binding: FragmentTaskBinding
+
+    private val viewModel : TaskViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        binding = FragmentTaskBinding.inflate(inflater, container, false)
+        // Inflate the layout for this fragment
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+//        binding.testButton.setOnClickListener {
+//            viewModel.add("テスト用")
+//        }
+        binding.navAddButton.setOnClickListener {
+
+        }
+        viewModel.tasks.observe(viewLifecycleOwner, Observer {
+            bindRecycler(it)
+        })
+    }
+
+    private fun bindRecycler(tasks: List<Task>) {
+        binding.taskList.adapter = GroupAdapter<GroupieViewHolder>()
+        val linearLayoutManager = LinearLayoutManager(context)
+        binding.taskList.layoutManager = linearLayoutManager
+
+    }
+
+    companion object {
+        fun newInstance() = TaskFragment()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/TaskViewModel.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/TaskViewModel.kt
new file mode 100644
index 0000000..5864e1c
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/TaskViewModel.kt
@@ -0,0 +1,14 @@
+package com.syousa1982.todo4android.presentation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.syousa1982.todo4android.data.repository.TaskRepository
+import kotlinx.coroutines.launch
+
+class TaskViewModel(private val repository: TaskRepository) : ViewModel() {
+    val tasks = repository.tasks
+
+    fun add(name: String) = viewModelScope.launch {
+        repository.add(name)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/item/TaskItem.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/item/TaskItem.kt
new file mode 100644
index 0000000..d4ebfd7
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/item/TaskItem.kt
@@ -0,0 +1,20 @@
+package com.syousa1982.todo4android.presentation.item
+
+import com.bumptech.glide.Glide
+import com.syousa1982.todo4android.R
+import com.syousa1982.todo4android.data.db.entity.Task
+import com.syousa1982.todo4android.data.db.entity.TaskStatus
+import com.syousa1982.todo4android.databinding.ItemTaskBinding
+import com.xwray.groupie.databinding.BindableItem
+
+class TaskItem(private val task: Task) : BindableItem<ItemTaskBinding>() {
+    override fun getLayout(): Int = R.layout.item_task
+
+    override fun bind(viewBinding: ItemTaskBinding, position: Int) {
+        viewBinding.taskName.text = task.name
+        when (task.status) {
+            TaskStatus.TODO.value -> Glide.with(viewBinding.image).load(R.drawable.ic_check_off_24dp).into(viewBinding.image)
+            TaskStatus.DONE.value -> Glide.with(viewBinding.image).load(R.drawable.ic_check_on_24dp).into(viewBinding.image)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/license/LicenseActivity.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/license/LicenseActivity.kt
deleted file mode 100644
index e783d62..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/license/LicenseActivity.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.syousa1982.todo4android.presentation.license
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.databinding.DataBindingUtil
-import com.syousa1982.todo4android.R
-import com.syousa1982.todo4android.databinding.ActivityLicenseBinding
-
-
-class LicenseActivity : AppCompatActivity() {
-
-
-    /**
-     * ライセンス画面 バインディング
-     */
-    private val binding by lazy {
-        DataBindingUtil.setContentView<ActivityLicenseBinding>(this, R.layout.activity_license)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding.toolbar.title = "ライセンス"
-        val webView = binding.webView
-        webView.settings.loadWithOverviewMode = true
-        webView.settings.useWideViewPort = true
-        webView.loadUrl(LICENSE_FILE)
-    }
-
-    companion object {
-
-        /**
-         * ライセンスファイル
-         */
-        private const val LICENSE_FILE = "file:///android_asset/licenses.html"
-
-        fun newIntent(context: Context) = Intent(context, LicenseActivity::class.java)
-    }
-}
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskAddFragment.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskAddFragment.kt
deleted file mode 100644
index 14fce98..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskAddFragment.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.syousa1982.todo4android.presentation.task
-
-
-import android.content.Context.INPUT_METHOD_SERVICE
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import android.view.inputmethod.InputMethodManager.HIDE_NOT_ALWAYS
-import androidx.fragment.app.Fragment
-import androidx.navigation.Navigation
-import com.google.android.material.snackbar.Snackbar
-import com.syousa1982.todo4android.databinding.FragmentTaskAddBinding
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.util.extention.*
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-
-
-/**
- * タスク作成 [Fragment] subclass.
- *
- */
-class TaskAddFragment : Fragment() {
-
-    private val viewModel: TaskAddViewModel by sharedViewModel()
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val binding = FragmentTaskAddBinding.inflate(inflater, container, false)
-        lifecycle.addObserver(viewModel)
-        bindInputViewModel(binding, viewModel)
-        bindOutputViewModel(binding, viewModel)
-        return binding.root
-    }
-
-    override fun onStop() {
-        super.onStop()
-        //ソフトキーボードを非表示
-        if (view != null) {
-            val imm = activity!!.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-            imm.hideSoftInputFromWindow(view!!.windowToken, HIDE_NOT_ALWAYS)
-            view!!.clearFocus()
-        }
-    }
-
-    /**
-     * 入力
-     *
-     * @param binding
-     * @param viewModel
-     */
-    private fun bindInputViewModel(binding: FragmentTaskAddBinding, viewModel: TaskAddViewModel) {
-        binding.inputTaskName.setOnChangedTextListener {
-            viewModel.taskName.value = it
-        }
-        binding.createTaskButton.setOnClickPauseListener {
-            val taskListId = TaskAddFragmentArgs.fromBundle(arguments ?: return@setOnClickPauseListener).taskListId
-            viewModel.create(taskListId)
-        }
-    }
-
-    /**
-     * 出力
-     *
-     * @param binding
-     * @param viewModel
-     */
-    private fun bindOutputViewModel(binding: FragmentTaskAddBinding, viewModel: TaskAddViewModel) {
-        viewModel.buttonEnable.observe(this) {
-            binding.createTaskButton.isEnabled = it
-        }
-        viewModel.isProgress.observe(this) {
-            binding.progressBar.visibleOrInvisible(it)
-        }
-        viewModel.createResult.observe(this) {
-            when (it) {
-                is Result.Progress -> {
-                    Log.d(className(), "タスク作成開始")
-                    viewModel.isProgress.value = true
-                }
-                is Result.Success -> {
-                    Log.d(className(), "タスク作成成功")
-                    viewModel.isProgress.value = false
-                    Navigation.findNavController(binding.root).popBackStack()
-                }
-                is Result.Failure -> {
-                    val actionName = "タスク作成"
-                    Log.d(className(), "$actionName 失敗", it.e)
-                    viewModel.isProgress.value = false
-                    showErrorMessage(actionName)
-                }
-            }
-        }
-    }
-
-    /**
-     * エラーメッセージ表示
-     */
-    private fun showErrorMessage(actionName: String) {
-        view?.let {
-            Snackbar.make(it, "$actionName 失敗しました。", Snackbar.LENGTH_LONG).show()
-        }
-    }
-
-}
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskAddViewModel.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskAddViewModel.kt
deleted file mode 100644
index a1b6991..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskAddViewModel.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.syousa1982.todo4android.presentation.task
-
-import android.util.Log
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.domain.usecase.IToDoUseCase
-import com.syousa1982.todo4android.presentation.BaseViewModel
-import com.syousa1982.todo4android.util.extention.className
-import com.syousa1982.todo4android.util.extention.default
-import com.syousa1982.todo4android.util.extention.isFalse
-import com.syousa1982.todo4android.util.extention.isNotEmpty
-import io.reactivex.rxkotlin.addTo
-import io.reactivex.rxkotlin.subscribeBy
-
-/**
- * タスク追加画面 ViewModel
- */
-class TaskAddViewModel(private val todoUseCase: IToDoUseCase) : BaseViewModel() {
-
-    /**
-     * 作成結果
-     */
-    val createResult = MutableLiveData<Result<Boolean>>()
-
-    /**
-     * プログレスバー表示フラグ
-     */
-    val isProgress = MutableLiveData<Boolean>().default(false)
-
-    /**
-     * タスク名
-     */
-    val taskName = MutableLiveData<String>()
-
-
-    /**
-     * 作成ボタンの有効判定
-     */
-    val buttonEnable = MediatorLiveData<Boolean>().default(false).apply {
-        addSource(isProgress) { value = isButtonEnable() }
-        addSource(taskName) { value = isButtonEnable() }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        createResult.value = null
-    }
-
-    /**
-     * タスク作成
-     *
-     * @param taskListId
-     */
-    fun create(taskListId: Int) {
-        val name = taskName.value ?: return
-        todoUseCase.addTask(taskListId, name).subscribeBy(
-            onNext = { createResult.value = it },
-            onError = { e -> Log.e(className(), "エラー発生", e) }
-        ).addTo(disposable)
-    }
-
-    /**
-     * ボタンの有効判定
-     */
-    private fun isButtonEnable() = isProgress.isFalse() && taskName.isNotEmpty()
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskFragment.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskFragment.kt
deleted file mode 100644
index f3ed7da..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskFragment.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.syousa1982.todo4android.presentation.task
-
-
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.Fragment
-import androidx.navigation.Navigation
-import com.google.android.material.snackbar.Snackbar
-import com.syousa1982.todo4android.databinding.FragmentTaskBinding
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.presentation.MainActivity
-import com.syousa1982.todo4android.presentation.task.item.TaskItem
-import com.syousa1982.todo4android.util.extention.*
-import kotlinx.android.synthetic.main.activity_main.*
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-
-
-/**
- * タスク一覧 [Fragment] subclass.
- *
- */
-class TaskFragment : Fragment() {
-
-    private val viewModel: TaskViewModel by sharedViewModel()
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val binding = FragmentTaskBinding.inflate(inflater, container, false)
-        val taskList = TaskFragmentArgs.fromBundle(arguments ?: return view).taskList
-        lifecycle.addObserver(viewModel)
-        Log.d(className(), "onCreateView#taskListid: ${taskList.id}")
-        viewModel.taskListId.value = taskList.id
-        (requireActivity() as MainActivity).toolbar.title = taskList.name
-        bindInputView(binding, viewModel)
-        bindOutputView(binding, viewModel)
-        bindRecyclerView(binding, viewModel)
-        return binding.root
-    }
-
-    private fun bindInputView(binding: FragmentTaskBinding, viewModel: TaskViewModel) {
-        binding.addButton.setOnClickPauseListener {
-            Log.d(className(), "bindInputView#taskListid: ${viewModel.taskListId.value}")
-            Navigation.findNavController(it).navigate(
-                TaskFragmentDirections.actionTaskFragmentToTaskAddFragment().apply {
-                    taskListId = viewModel.taskListId.value ?: throw IllegalAccessException("タスクリストIDが指定されていません")
-                }
-            )
-        }
-    }
-
-    private fun bindOutputView(binding: FragmentTaskBinding, viewModel: TaskViewModel) {
-        viewModel.updateResult.observe(this) {
-            when (it) {
-                is Result.Progress -> {
-                    Log.d(className(), "タスク更新開始")
-                }
-                is Result.Success -> {
-                    Log.d(className(), "タスク更新完了")
-                    viewModel.getTasks()
-                    viewModel.updateResult.value = null
-                }
-                is Result.Failure -> {
-                    val actionName = "タスク更新"
-                    Log.d(className(), "$actionName 失敗", it.e)
-                    showErrorMessage(actionName)
-                }
-            }
-        }
-    }
-
-    /**
-     * タスク一覧を出力
-     *
-     * @param binding
-     * @param viewModel
-     */
-    private fun bindRecyclerView(binding: FragmentTaskBinding, viewModel: TaskViewModel) {
-        // Input
-        binding.tasks.setGroupieAdapter()
-        binding.tasks.setLinearLayoutManagerWithDivider()
-        binding.tasks.setGroupieOnItemClickListener<TaskItem> { item, view ->
-            val task = item.task ?: return@setGroupieOnItemClickListener
-            viewModel.updateTask(task)
-        }
-        binding.tasks.setGroupieOnItemLongClickListener<TaskItem> { item, view ->
-            showDeleteDialog(item)
-            return@setGroupieOnItemLongClickListener true
-        }
-        // Output
-        viewModel.tasks.observe(this) {
-            when (it) {
-                is Result.Progress -> {
-                    Log.d(className(), "タスク取得開始")
-                }
-                is Result.Success -> {
-                    Log.d(className(), "タスク取得成功")
-                    val items = it.data.map { task ->
-                        TaskItem(task)
-                    }
-                    binding.tasks.getGroupieAdapter().update(items)
-                }
-                is Result.Failure -> {
-                    val actionName = "タスク取得"
-                    Log.d(className(), "$actionName 失敗", it.e)
-                    showErrorMessage(actionName)
-                }
-            }
-        }
-    }
-
-
-    private fun showDeleteDialog(item: TaskItem) {
-        AlertDialog.Builder(requireContext())
-            .setTitle("確認")
-            .setMessage("タスクを削除しますか？")
-            .setPositiveButton("削除する") { _, _ ->
-                item.task?.let { task ->
-                    viewModel.delete(task)
-                }
-            }
-            .setNegativeButton("キャンセル", null)
-            .show()
-    }
-
-    /**
-     * エラーメッセージ表示
-     */
-    private fun showErrorMessage(actionName: String) {
-        view?.let {
-            Snackbar.make(it, "$actionName 失敗しました。", Snackbar.LENGTH_LONG).show()
-        }
-    }
-
-}
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskViewModel.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskViewModel.kt
deleted file mode 100644
index 9f6f31f..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/TaskViewModel.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.syousa1982.todo4android.presentation.task
-
-import android.util.Log
-import androidx.lifecycle.MutableLiveData
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.domain.model.Task
-import com.syousa1982.todo4android.domain.usecase.IToDoUseCase
-import com.syousa1982.todo4android.presentation.BaseViewModel
-import com.syousa1982.todo4android.util.extention.className
-import io.reactivex.rxkotlin.addTo
-import io.reactivex.rxkotlin.subscribeBy
-
-/**
- * タスク一覧 ViewModel
- */
-class TaskViewModel(private val todoUseCase: IToDoUseCase) : BaseViewModel() {
-
-    /**
-     * タスク一覧
-     */
-    val tasks = MutableLiveData<Result<List<Task>>>()
-
-    /**
-     * タスクリストID
-     */
-    val taskListId = MutableLiveData<Int>()
-
-    /**
-     * 更新結果
-     */
-    val updateResult = MutableLiveData<Result<Boolean>>()
-
-    override fun onResume() {
-        super.onResume()
-        Log.d(className(), "onResume#taskListid: ${taskListId.value}")
-        getTasks()
-    }
-
-    /**
-     * タスクを取得
-     */
-    fun getTasks() {
-        val taskListId = taskListId.value ?: throw IllegalAccessException("タスクリストのIDが指定されていません")
-        todoUseCase.getTasks(taskListId).subscribeBy(
-            onNext = { tasks.value = it },
-            onError = { e -> Log.e(className(), "エラー発生", e) }
-        ).addTo(disposable)
-    }
-
-    /**
-     * タスクを更新
-     */
-    fun updateTask(task: Task) {
-        val taskListId = taskListId.value ?: throw IllegalAccessException("タスクリストのIDが指定されていません")
-        val updateTask = Task(
-            task.id,
-            task.name,
-            Task.Status.changeStatus(task.status)
-        )
-        todoUseCase.updateTask(taskListId, updateTask).subscribeBy(
-            onNext = { updateResult.value = it },
-            onError = { e -> Log.e(className(), "エラー発生", e) }
-        ).addTo(disposable)
-    }
-
-    /**
-     * タスクを削除
-     */
-    fun delete(task: Task) {
-        val taskListId = taskListId.value ?: throw IllegalAccessException("タスクリストのIDが指定されていません")
-        todoUseCase.removeTask(taskListId, task).subscribeBy(
-            onNext = { updateResult.value = it },
-            onError = { e -> Log.e(className(), "エラー発生", e) }
-        ).addTo(disposable)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/item/TaskItem.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/item/TaskItem.kt
deleted file mode 100644
index 3815c0d..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/task/item/TaskItem.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.syousa1982.todo4android.presentation.task.item
-
-import com.bumptech.glide.Glide
-import com.syousa1982.todo4android.R
-import com.syousa1982.todo4android.databinding.ItemTaskBinding
-import com.syousa1982.todo4android.domain.model.Task
-import com.xwray.groupie.databinding.BindableItem
-
-/**
- * タスク Item
- */
-data class TaskItem(var task: Task? = null) : BindableItem<ItemTaskBinding>() {
-    override fun getLayout(): Int = R.layout.item_task
-
-    override fun bind(viewBinding: ItemTaskBinding, position: Int) {
-        task?.let {
-            viewBinding.taskName.text = it.name
-            when (it.status) {
-                Task.Status.TODO -> Glide.with(viewBinding.image).load(R.drawable.ic_check_off_24dp).into(viewBinding.image)
-                Task.Status.DONE -> Glide.with(viewBinding.image).load(R.drawable.ic_check_on_24dp).into(viewBinding.image)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListAddFragment.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListAddFragment.kt
deleted file mode 100644
index 303a157..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListAddFragment.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.syousa1982.todo4android.presentation.tasklist
-
-
-import android.content.Context.INPUT_METHOD_SERVICE
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import android.view.inputmethod.InputMethodManager.HIDE_NOT_ALWAYS
-import androidx.fragment.app.Fragment
-import androidx.navigation.Navigation
-import com.google.android.material.snackbar.Snackbar
-import com.syousa1982.todo4android.databinding.FragmentTaskListAddBinding
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.util.extention.*
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-
-
-/**
- * タスクリスト作成 [Fragment] subclass.
- *
- */
-class TaskListAddFragment : Fragment() {
-
-    private val viewModel: TaskListAddViewModel by sharedViewModel()
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val binding = FragmentTaskListAddBinding.inflate(inflater, container, false)
-        lifecycle.addObserver(viewModel)
-        bindInputViewModel(binding, viewModel)
-        bindOutputViewModel(binding, viewModel)
-        return binding.root
-    }
-
-    override fun onStop() {
-        super.onStop()
-        //ソフトキーボードを非表示
-        if (view != null) {
-            val imm = activity!!.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-            imm.hideSoftInputFromWindow(view!!.windowToken, HIDE_NOT_ALWAYS)
-            view!!.clearFocus()
-        }
-    }
-
-    /**
-     * 入力
-     *
-     * @param binding
-     * @param viewModel
-     */
-    private fun bindInputViewModel(binding: FragmentTaskListAddBinding, viewModel: TaskListAddViewModel) {
-        binding.inputTaskListName.setOnChangedTextListener {
-            viewModel.taskListName.value = it
-        }
-        binding.createTaskListButton.setOnClickPauseListener {
-            viewModel.create()
-        }
-    }
-
-    /**
-     * 出力
-     *
-     * @param binding
-     * @param viewModel
-     */
-    private fun bindOutputViewModel(binding: FragmentTaskListAddBinding, viewModel: TaskListAddViewModel) {
-        viewModel.buttonEnable.observe(this) {
-            binding.createTaskListButton.isEnabled = it
-        }
-        viewModel.isProgress.observe(this) {
-            binding.progressBar.visibleOrInvisible(it)
-        }
-        viewModel.createResult.observe(this) {
-            when (it) {
-                is Result.Progress -> {
-                    Log.d(className(), "タスクリスト作成開始")
-                    viewModel.isProgress.value = true
-                }
-                is Result.Success -> {
-                    Log.d(className(), "タスクリスト作成成功")
-                    viewModel.isProgress.value = false
-                    Navigation.findNavController(binding.root).popBackStack()
-                }
-                is Result.Failure -> {
-                    val actionName = "タスクリスト作成"
-                    Log.d(className(), "$actionName 失敗", it.e)
-                    viewModel.isProgress.value = false
-                    showErrorMessage(actionName)
-                }
-            }
-        }
-    }
-
-    /**
-     * エラーメッセージ表示
-     */
-    private fun showErrorMessage(actionName: String) {
-        view?.let {
-            Snackbar.make(it, "$actionName 失敗しました。", Snackbar.LENGTH_LONG).show()
-        }
-    }
-}
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListAddViewModel.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListAddViewModel.kt
deleted file mode 100644
index dc7c7f5..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListAddViewModel.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.syousa1982.todo4android.presentation.tasklist
-
-import android.util.Log
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.domain.usecase.IToDoUseCase
-import com.syousa1982.todo4android.presentation.BaseViewModel
-import com.syousa1982.todo4android.util.extention.className
-import com.syousa1982.todo4android.util.extention.default
-import com.syousa1982.todo4android.util.extention.isFalse
-import com.syousa1982.todo4android.util.extention.isNotEmpty
-import io.reactivex.rxkotlin.addTo
-import io.reactivex.rxkotlin.subscribeBy
-
-
-/**
- * タスクリスト作成画面 ViewModel
- *
- * @param todoUseCase
- */
-class TaskListAddViewModel(private val todoUseCase: IToDoUseCase) : BaseViewModel() {
-
-    /**
-     * 作成結果
-     */
-    val createResult = MutableLiveData<Result<Boolean>>()
-
-    /**
-     * プログレスバー表示フラグ
-     */
-    val isProgress = MutableLiveData<Boolean>().default(false)
-
-    /**
-     * タスクリスト名
-     */
-    val taskListName = MutableLiveData<String>()
-
-    /**
-     * 作成ボタンの有効判定
-     */
-    val buttonEnable = MediatorLiveData<Boolean>().default(false).apply {
-        addSource(isProgress) { value = isButtonEnable() }
-        addSource(taskListName) { value = isButtonEnable() }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        createResult.value = null
-    }
-
-    /**
-     * タスクリスト作成
-     */
-    fun create() {
-        val name = taskListName.value ?: return
-        todoUseCase.addTaskList(name).subscribeBy(
-            onNext = { createResult.value = it },
-            onError = { e -> Log.e(className(), "エラー発生", e) }
-        ).addTo(disposable)
-    }
-
-    /**
-     * ボタンの有効判定
-     */
-    private fun isButtonEnable() = isProgress.isFalse() && taskListName.isNotEmpty()
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListFragment.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListFragment.kt
deleted file mode 100644
index b186fc6..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListFragment.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.syousa1982.todo4android.presentation.tasklist
-
-
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.Fragment
-import androidx.navigation.Navigation
-import com.google.android.material.snackbar.Snackbar
-import com.syousa1982.todo4android.R
-import com.syousa1982.todo4android.databinding.FragmentTaskListBinding
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.presentation.MainActivity
-import com.syousa1982.todo4android.presentation.tasklist.item.TaskListItem
-import com.syousa1982.todo4android.util.extention.*
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-
-/**
- * タスクリスト一覧 [Fragment] subclass.
- *
- */
-class TaskListFragment : Fragment() {
-
-    private val viewModel: TaskListViewModel by sharedViewModel()
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val binding = FragmentTaskListBinding.inflate(inflater, container, false)
-        lifecycle.addObserver(viewModel)
-        bindInput(binding)
-        bindOutput(binding,viewModel)
-        bindRecyclerView(binding, viewModel)
-        return binding.root
-    }
-
-    private fun bindInput(binding: FragmentTaskListBinding) {
-        binding.addButton.setOnClickPauseListener {
-            Navigation.findNavController(it).navigate(R.id.action_tasksFragment_to_taskListAddFragment)
-        }
-    }
-
-    private fun bindOutput(binding: FragmentTaskListBinding, viewModel: TaskListViewModel) {
-        viewModel.updateResult.observe(this) {
-            when (it) {
-                is Result.Progress -> {
-                    Log.d(className(), "タスクリスト更新開始")
-                }
-                is Result.Success -> {
-                    Log.d(className(), "タスクリスト更新完了")
-                    viewModel.fetchTasks()
-                    viewModel.updateResult.value = null
-                }
-                is Result.Failure -> {
-                    val actionName = "タスクリスト更新"
-                    Log.d(className(), "$actionName 失敗", it.e)
-                    showErrorMessage(actionName)
-                }
-            }
-        }
-    }
-
-    /**
-     * タスクリストを出力
-     *
-     * @param binding
-     * @param viewModel
-     */
-    private fun bindRecyclerView(binding: FragmentTaskListBinding, viewModel: TaskListViewModel) {
-        // Input
-        binding.taskList.setGroupieAdapter()
-        binding.taskList.setLinearLayoutManagerWithDivider()
-        binding.taskList.setGroupieOnItemClickListener<TaskListItem> { item, view ->
-            item.taskList?.let {
-                Navigation.findNavController(view).navigate(
-                    TaskListFragmentDirections.actionTasksFragmentToTaskFragment(it)
-                )
-            }
-        }
-        binding.taskList.setGroupieOnItemLongClickListener<TaskListItem> { item, view ->
-            showDeleteDialog(item)
-            return@setGroupieOnItemLongClickListener true
-        }
-        // Output
-        viewModel.taskLists.observe(this) {
-            when (it) {
-                is Result.Progress -> {
-                    Log.d(className(), "タスクリスト取得開始")
-                }
-                is Result.Success -> {
-                    Log.d(className(), "タスクリスト取得成功")
-                    val items = it.data.map { taskList ->
-                        TaskListItem(taskList)
-                    }
-                    binding.taskList.getGroupieAdapter().update(items)
-                }
-                is Result.Failure -> {
-                    val actionName = "タスクリスト取得"
-                    Log.d(className(), "$actionName 失敗", it.e)
-                    showErrorMessage(actionName)
-                }
-            }
-        }
-    }
-
-    private fun showDeleteDialog(item: TaskListItem) {
-        AlertDialog.Builder(requireContext())
-            .setTitle("確認")
-            .setMessage("タスクリストを削除しますか？")
-            .setPositiveButton("削除する") { _, _ ->
-                item.taskList?.let {
-                    viewModel.delete(it)
-                }
-            }
-            .setNegativeButton("キャンセル", null)
-            .show()
-    }
-
-    /**
-     * エラーメッセージ表示
-     */
-    private fun showErrorMessage(actionName: String) {
-        view?.let {
-            Snackbar.make(it, "$actionName 失敗しました。", Snackbar.LENGTH_LONG).show()
-        }
-    }
-}
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListViewModel.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListViewModel.kt
deleted file mode 100644
index 66556f5..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/TaskListViewModel.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.syousa1982.todo4android.presentation.tasklist
-
-import android.util.Log
-import androidx.lifecycle.MutableLiveData
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.domain.model.TaskList
-import com.syousa1982.todo4android.domain.usecase.IToDoUseCase
-import com.syousa1982.todo4android.presentation.BaseViewModel
-import com.syousa1982.todo4android.util.extention.className
-import io.reactivex.rxkotlin.addTo
-import io.reactivex.rxkotlin.subscribeBy
-
-/**
- * タスクリスト一覧 ViewModel
- *
- * @param todoUseCase
- */
-class TaskListViewModel(private val todoUseCase: IToDoUseCase) : BaseViewModel() {
-
-    /**
-     * タスクリスト一覧
-     */
-    val taskLists = MutableLiveData<Result<List<TaskList>>>()
-
-    /**
-     * 更新結果
-     */
-    val updateResult = MutableLiveData<Result<Boolean>>()
-
-    override fun onResume() {
-        super.onResume()
-        fetchTasks()
-    }
-
-    fun fetchTasks() {
-        todoUseCase.getTaskLists().subscribeBy(
-            onNext = { taskLists.value = it },
-            onError = { e -> Log.e(className(), "エラー発生", e) }
-        ).addTo(disposable)
-    }
-
-    fun delete(taskList: TaskList) {
-        todoUseCase.removeTaskListAndTasks(taskList).subscribeBy(
-            onNext = { updateResult.value = it },
-            onError = { e -> Log.e(className(), "エラー発生", e) }
-        ).addTo(disposable)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/item/TaskListItem.kt b/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/item/TaskListItem.kt
deleted file mode 100644
index 7659b52..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/presentation/tasklist/item/TaskListItem.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.syousa1982.todo4android.presentation.tasklist.item
-
-import com.syousa1982.todo4android.R
-import com.syousa1982.todo4android.databinding.ItemTaskListBinding
-import com.syousa1982.todo4android.domain.model.TaskList
-import com.xwray.groupie.databinding.BindableItem
-
-/**
- * タスクリスト Item
- *
- * @param taskList
- */
-data class TaskListItem(var taskList: TaskList? = null) : BindableItem<ItemTaskListBinding>() {
-
-    override fun getLayout(): Int = R.layout.item_task_list
-
-    override fun bind(viewBinding: ItemTaskListBinding, position: Int) {
-        taskList?.let {
-            viewBinding.taskListName.text = it.name
-            viewBinding.taskCount.text = it.taskCount.toString()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/.gitkeep b/app/src/main/kotlin/com/syousa1982/todo4android/util/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/AnyExt.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/AnyExt.kt
deleted file mode 100644
index fac01e6..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/AnyExt.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.syousa1982.todo4android.util.extention
-
-
-/**
- * クラス名を取得
- *
- * @return String
- */
-fun Any.className(): String = javaClass.simpleName
-
-/**
- * クラス名を取得
- *
- * @param any Any
- * @return String
- */
-fun Any.className(any: Any?): String {
-    if (any == null) {
-        return "Null"
-    }
-    return any.javaClass.simpleName
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/EditTextExt.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/EditTextExt.kt
deleted file mode 100644
index fb7d5b6..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/EditTextExt.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.syousa1982.todo4android.util.extention
-
-import android.text.Editable
-import android.text.TextWatcher
-import android.widget.EditText
-
-/**
- * OnChangedTextListenerをインライン関数で設定
- *
- * @param onChangedTextListener Unit
- */
-fun EditText.setOnChangedTextListener(onChangedTextListener: (String) -> Unit) {
-    addTextChangedListener(object : TextWatcher {
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            // do nothing
-        }
-
-        override fun afterTextChanged(s: Editable?) {
-            // do nothing
-        }
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            onChangedTextListener.invoke(s.toString())
-        }
-    })
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/LiveDataExt.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/LiveDataExt.kt
deleted file mode 100644
index e1d1d0f..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/LiveDataExt.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.syousa1982.todo4android.util.extention
-
-import androidx.lifecycle.*
-
-// region 監視(observer)
-
-fun <T> LiveData<T>.observe(owner: LifecycleOwner, observer: (T) -> Unit) = observe(owner, Observer {
-    if (it != null) observer.invoke(it)
-})
-
-// endregion
-
-// region 変換(map)
-
-fun <X, Y> LiveData<X>.map(func: (X) -> Y) = Transformations.map(this, func)!!
-
-fun <X, Y> LiveData<X>.switchMap(func: (X) -> LiveData<Y>) = Transformations.switchMap(this, func)!!
-
-// endregion
-
-// region 初期(default)
-
-fun <T, U : MutableLiveData<T>> U.default(value: T) = apply { setValue(value) }
-
-// endregion
-
-// region 取得(is/get)
-
-fun LiveData<String>?.isNotEmpty(): Boolean = this?.value?.isNotEmpty() ?: false
-
-fun LiveData<String>?.isEmpty(): Boolean = this?.value?.isEmpty() ?: false
-
-fun LiveData<Boolean>?.isTrue(): Boolean = this?.value ?: false
-
-fun LiveData<Boolean>?.isFalse(): Boolean = this?.value?.not() ?: false
-
-fun <T> LiveData<T>?.isNotNull(): Boolean = this?.value != null
-
-// endregion
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/RecyclerViewExt.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/RecyclerViewExt.kt
deleted file mode 100644
index 8137a21..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/RecyclerViewExt.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.syousa1982.todo4android.util.extention
-
-import android.view.View
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.xwray.groupie.Group
-import com.xwray.groupie.GroupAdapter
-import com.xwray.groupie.ViewHolder
-
-fun RecyclerView.getGroupieAdapter(): GroupAdapter<*> {
-    val adapter = adapter
-    if (adapter is GroupAdapter) {
-        return adapter
-    }
-    throw IllegalAccessException("${GroupAdapter::class.java.simpleName}が設定されていません")
-}
-
-fun RecyclerView.setGroupieAdapter() {
-    adapter = GroupAdapter<ViewHolder>()
-}
-
-fun RecyclerView.setLinearLayoutManagerWithDivider() {
-    val linearLayoutManager = LinearLayoutManager(context)
-    layoutManager = linearLayoutManager
-    val dividerItemDecoration = DividerItemDecoration(context, linearLayoutManager.orientation)
-    addItemDecoration(dividerItemDecoration)
-}
-
-inline fun <reified T : Group> RecyclerView.setGroupieOnItemClickListener(crossinline onItemClickListener: (T, View) -> Unit) {
-    val adapter = adapter
-    if (adapter is GroupAdapter) {
-        adapter.setOnItemClickListener { item, view ->
-            view.pauseClickTimer()
-            if (item is T) onItemClickListener(item, view)
-        }
-    }
-}
-
-inline fun <reified T : Group> RecyclerView.setGroupieOnItemLongClickListener(crossinline onItemLongClickListener: (T, View) -> Boolean) {
-    val adapter = adapter
-    if (adapter is GroupAdapter) {
-        adapter.setOnItemLongClickListener { item, view ->
-            view.pauseClickTimer()
-            return@setOnItemLongClickListener if (item is T) onItemLongClickListener(item, view) else false
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ResultRxExt.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ResultRxExt.kt
deleted file mode 100644
index d048fa0..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ResultRxExt.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.syousa1982.todo4android.util.extention
-
-import androidx.annotation.CheckResult
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.util.rx.SchedulerProvider
-import io.reactivex.Completable
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.Single
-
-/**
- * Result型に変換
- *
- * @return Flowable
- */
-@CheckResult
-fun <T> Flowable<T>.toResult(schedulerProvider: SchedulerProvider): Flowable<Result<T>> {
-    return compose { item ->
-        item
-                .map { Result.success(it) }
-                .onErrorReturn { Result.failure(it) }
-                .startWith(Result.progress())
-                .subscribeOn(schedulerProvider.io())
-                .observeOn(schedulerProvider.ui())
-    }
-}
-
-/**
- * Result型に変換
- *
- * @return Observable
- */
-@CheckResult
-fun <T> Single<T>.toResult(schedulerProvider: SchedulerProvider): Flowable<Result<T>> = toFlowable().toResult(schedulerProvider)
-
-/**
- * Result型に変換
- *
- * @return Observable
- */
-@CheckResult
-fun <T> Maybe<T>.toResult(schedulerProvider: SchedulerProvider): Flowable<Result<T>> = toFlowable().toResult(schedulerProvider)
-
-/**
- * Result型に変換
- *
- * @return Observable
- */
-@CheckResult
-fun <T> Completable.toResult(schedulerProvider: SchedulerProvider): Flowable<Result<T>> = toFlowable<T>().toResult(schedulerProvider)
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ToolbarExt.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ToolbarExt.kt
deleted file mode 100644
index dd5893d..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ToolbarExt.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.syousa1982.todo4android.util.extention
-
-import androidx.appcompat.widget.Toolbar
-
-fun Toolbar.clear() {
-    title = null
-    subtitle = null
-    navigationIcon = null
-    setNavigationOnClickListener(null)
-    logo = null
-    menu.clear()
-    setOnMenuItemClickListener(null)
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ViewExt.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ViewExt.kt
deleted file mode 100644
index 9deb328..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/extention/ViewExt.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.syousa1982.todo4android.util.extention
-
-import android.os.Handler
-import android.view.View
-
-/**
- * VisibleとGoneを切り替える
- *
- * @param isVisible Visibleであるかどうか
- */
-fun View.visibleOrGone(isVisible: Boolean) {
-    visibility = if (isVisible) View.VISIBLE else View.GONE
-}
-
-/**
- * VisibleとInvisibleを切り替える
- *
- * @param isVisible Visibleであるかどうか
- */
-fun View.visibleOrInvisible(isVisible: Boolean) {
-    visibility = if (isVisible) View.VISIBLE else View.INVISIBLE
-}
-
-/**
- * GoneとVisibleを切り替える
- *
- * @param isGone Goneであるかどうか
- */
-fun View.goneOrVisible(isGone: Boolean) {
-    visibility = if (isGone) View.GONE else View.VISIBLE
-}
-
-/**
- * InvisibleとVisibleを切り替える
- *
- * @param isInvisible Invisibleであるかどうか
- */
-fun View.invisibleOrVisible(isInvisible: Boolean) {
-    visibility = if (isInvisible) View.INVISIBLE else View.VISIBLE
-}
-
-/**
- * 連打対策のためViewを一定時間クリック無効にするクリックリスナー
- *
- * @param onClickListener Unit
- */
-fun View.setOnClickPauseListener(onClickListener: (View) -> Unit) {
-    if (hasOnClickListeners()) {
-        return
-    }
-    setOnClickListener {
-        pauseClickTimer()
-        onClickListener.invoke(it)
-    }
-}
-
-/**
- * 連打対策のためViewを一定時間クリック無効にする
- *
- * @param delayMillis クリックの無効化時間（ミリ秒）
- */
-fun View.pauseClickTimer(delayMillis: Long = 500) {
-    isClickable = false
-    Handler().postDelayed({ isClickable = true }, delayMillis)
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/rx/AppSchedulerProvider.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/rx/AppSchedulerProvider.kt
deleted file mode 100644
index bcea7a9..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/rx/AppSchedulerProvider.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.syousa1982.todo4android.util.rx
-
-import io.reactivex.Scheduler
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-
-class AppSchedulerProvider : SchedulerProvider {
-    override fun ui(): Scheduler = AndroidSchedulers.mainThread()
-
-    override fun computation(): Scheduler = Schedulers.computation()
-
-    override fun newThread(): Scheduler = Schedulers.newThread()
-
-    override fun io(): Scheduler = Schedulers.io()
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/util/rx/SchedulerProvider.kt b/app/src/main/kotlin/com/syousa1982/todo4android/util/rx/SchedulerProvider.kt
deleted file mode 100644
index 33b4263..0000000
--- a/app/src/main/kotlin/com/syousa1982/todo4android/util/rx/SchedulerProvider.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.syousa1982.todo4android.util.rx
-
-import io.reactivex.Scheduler
-
-interface SchedulerProvider {
-
-    fun ui(): Scheduler
-
-    fun computation(): Scheduler
-
-    fun newThread(): Scheduler
-
-    fun io(): Scheduler
-
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/utils/Constants.kt b/app/src/main/kotlin/com/syousa1982/todo4android/utils/Constants.kt
new file mode 100644
index 0000000..08dcc4d
--- /dev/null
+++ b/app/src/main/kotlin/com/syousa1982/todo4android/utils/Constants.kt
@@ -0,0 +1,7 @@
+package com.syousa1982.todo4android.utils
+
+object Constants {
+    const val DB_NAME = "todo"
+    const val DB_VERSION = 1
+    const val SHARED_PREF_NAME = ""
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/_fragment_task.xml b/app/src/main/res/layout/_fragment_task.xml
new file mode 100644
index 0000000..d3b33f2
--- /dev/null
+++ b/app/src/main/res/layout/_fragment_task.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/tasks"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/add_button"
+        style="@style/Widget.MaterialComponents.FloatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:contentDescription="Add"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@drawable/ic_add_24dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/_fragment_task_list.xml
similarity index 97%
rename from app/src/main/res/layout/fragment_task_list.xml
rename to app/src/main/res/layout/_fragment_task_list.xml
index 1b2b384..61f48d4 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/_fragment_task_list.xml
@@ -4,7 +4,6 @@
     tools:context="com.syousa1982.todo4android.presentation.tasklist.TaskListFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        style="@style/FragmentTheme"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index 957e380..3a3ed51 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -1,40 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.syousa1982.todo4android.presentation.license.LicenseActivity">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+<!--    <com.google.android.material.appbar.AppBarLayout-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content">-->
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                style="@style/BaseToolbar" />
+<!--        <androidx.appcompat.widget.Toolbar-->
+<!--            android:id="@+id/toolbar"-->
+<!--            style="@style/BaseToolbar" />-->
 
-        </com.google.android.material.appbar.AppBarLayout>
+<!--    </com.google.android.material.appbar.AppBarLayout>-->
 
-        <LinearLayout
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="This library uses the following open source software:"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <WebView
+            android:id="@+id/webView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:text="This library uses the following open source software:"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            android:layout_height="wrap_content" />
 
-            <WebView
-                android:id="@+id/webView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-        </LinearLayout>
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-</layout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 69178fd..81adb7d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,38 +2,24 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.syousa1982.todo4android.presentation.MainActivity">
+    tools:context="com.syousa1982.todo4android.MainActivity">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                app:popupTheme="@android:style/Theme.Material"
-                style="@style/BaseToolbar" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <LinearLayout
+        <fragment
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <fragment
-                android:id="@+id/nav_host_fragment"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:defaultNavHost="true"
-                app:navGraph="@navigation/navigation_graph" />
-        </LinearLayout>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+            app:defaultNavHost="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navGraph="@navigation/navigation_graph" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml
index 825581e..8c077ed 100644
--- a/app/src/main/res/layout/fragment_task.xml
+++ b/app/src/main/res/layout/fragment_task.xml
@@ -1,37 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.syousa1982.todo4android.presentation.task.TaskFragment">
+    xmlns:tools="http://schemas.android.com/tools">
     <androidx.constraintlayout.widget.ConstraintLayout
-        style="@style/FragmentTheme"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:context=".presentation.TaskFragment">
+
+        <!-- TODO: Update blank fragment layout -->
+<!--        <TextView-->
+<!--            android:id="@+id/test_text"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="match_parent"-->
+<!--            android:text="@string/hello_blank_fragment"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintStart_toStartOf="parent"-->
+<!--            app:layout_constraintTop_toTopOf="parent" />-->
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/tasks"
+            android:id="@+id/taskList"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:listitem="@layout/item_task" />
+
+<!--        <Button-->
+<!--            android:id="@+id/test_button"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:text="追加テスト"-->
+<!--            app:layout_constraintBottom_toBottomOf="parent"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintStart_toStartOf="parent" />-->
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/add_button"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
+            android:id="@+id/navAddButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:contentDescription="Add"
+            android:clickable="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:srcCompat="@drawable/ic_add_24dp" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </layout>
diff --git a/app/src/main/res/layout/item_task.xml b/app/src/main/res/layout/item_task.xml
index cd61d81..0053ae7 100644
--- a/app/src/main/res/layout/item_task.xml
+++ b/app/src/main/res/layout/item_task.xml
@@ -19,7 +19,7 @@
             app:srcCompat="@drawable/ic_check_off_24dp" />
 
         <TextView
-            android:id="@+id/task_name"
+            android:id="@+id/taskName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="start|center_vertical"
diff --git a/app/src/main/res/navigation/navigation_graph.xml b/app/src/main/res/navigation/navigation_graph.xml
index b381477..101d189 100644
--- a/app/src/main/res/navigation/navigation_graph.xml
+++ b/app/src/main/res/navigation/navigation_graph.xml
@@ -3,54 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/navigation_graph"
-    app:startDestination="@id/tasksFragment">
-
-    <fragment
-        android:id="@+id/tasksFragment"
-        android:name="com.syousa1982.todo4android.presentation.tasklist.TaskListFragment"
-        android:label="タスクリスト一覧"
-        tools:layout="@layout/fragment_task_list">
-        <action
-            android:id="@+id/action_tasksFragment_to_taskListAddFragment"
-            app:destination="@id/taskListAddFragment" />
-        <action
-            android:id="@+id/action_tasksFragment_to_taskFragment"
-            app:destination="@id/taskFragment" />
-        <action
-            android:id="@+id/action_tasksFragment_to_licenseActivity"
-            app:destination="@id/licenseActivity" />
-    </fragment>
-    <fragment
-        android:id="@+id/taskListAddFragment"
-        android:name="com.syousa1982.todo4android.presentation.tasklist.TaskListAddFragment"
-        android:label="タスクリスト追加"
-        tools:layout="@layout/fragment_task_list_add" />
+    app:startDestination="@id/taskFragment">
     <fragment
         android:id="@+id/taskFragment"
-        android:name="com.syousa1982.todo4android.presentation.task.TaskFragment"
-        android:label="タスク一覧"
-        tools:layout="@layout/fragment_task">
-        <argument
-            android:name="taskList"
-            app:argType="com.syousa1982.todo4android.domain.model.TaskList" />
-        <action
-            android:id="@+id/action_taskFragment_to_taskAddFragment"
-            app:destination="@id/taskAddFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/taskAddFragment"
-        android:name="com.syousa1982.todo4android.presentation.task.TaskAddFragment"
-        android:label="タスク追加"
-        tools:layout="@layout/fragment_task_add">
-        <argument
-            android:name="taskListId"
-            android:defaultValue="0"
-            app:argType="integer" />
-    </fragment>
-    <activity
-        android:id="@+id/licenseActivity"
-        android:name="com.syousa1982.todo4android.presentation.license.LicenseActivity"
-        android:label="activity_license"
-        tools:layout="@layout/activity_license" />
-
+        android:name="com.syousa1982.todo4android.presentation.TaskFragment"
+        android:label="fragment_task"
+        tools:layout="@layout/fragment_task" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 61d267d..3f4d554 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="color_primary">#2196F3</color>
-    <color name="color_primary_dark">#303F9F</color>
-    <color name="color_accent">#B40404</color>
+    <color name="color_primary">#6200EE</color>
+    <color name="color_primary_dark">#3700B3</color>
+    <color name="color_accent">#03DAC5</color>
     <!--背景色-->
     <color name="background">#F2F2F2</color>
     <!--共通ボタン-->
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ec1fa08..fae34a1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,4 +3,5 @@
     <dimen name="button_height">56dp</dimen>
     <dimen name="button_radius">30dp</dimen>
     <dimen name="button_stroke">1dp</dimen>
+    <dimen name="text_margin">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 565fbb0..2cbe0ab 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,34 +2,34 @@
 
     <!--アプリ共通テーマ-->
     <style name="AppTheme" parent="Theme.MaterialComponents.Light">
-        <!--<item name="colorPrimary">@color/color_primary</item>-->
-        <!--<item name="colorPrimaryDark">@color/color_primary_dark</item>-->
-        <!--<item name="colorAccent">@color/color_accent</item>-->
+        <item name="colorPrimary">@color/color_primary</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorAccent">@color/color_accent</item>
         <item name="viewInflaterClass">androidx.appcompat.app.AppCompatViewInflater</item>
     </style>
 
-    <!--アプリ共通テーマ アクションバーなし-->
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
+<!--    &lt;!&ndash;アプリ共通テーマ アクションバーなし&ndash;&gt;-->
+<!--    <style name="AppTheme.NoActionBar">-->
+<!--        <item name="windowActionBar">false</item>-->
+<!--        <item name="windowNoTitle">true</item>-->
+<!--    </style>-->
 
-    <!--Fragmentの共通テーマ-->
-    <style name="FragmentTheme">
-        <item name="android:clickable">true</item>
-        <item name="android:background">@color/background</item>
-    </style>
+<!--    &lt;!&ndash;Fragmentの共通テーマ&ndash;&gt;-->
+<!--    <style name="FragmentTheme">-->
+<!--        <item name="android:clickable">true</item>-->
+<!--        <item name="android:background">@color/background</item>-->
+<!--    </style>-->
 
-    <!--Toolbar-->
-    <style name="BaseToolbar" parent="ThemeOverlay.MaterialComponents.ActionBar">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">?attr/actionBarSize</item>
-        <item name="android:theme">@style/ToolbarTheme</item>
-        <item name="windowActionModeOverlay">true</item>
-    </style>
+<!--    &lt;!&ndash;Toolbar&ndash;&gt;-->
+<!--    <style name="BaseToolbar" parent="ThemeOverlay.MaterialComponents.ActionBar">-->
+<!--        <item name="android:layout_width">match_parent</item>-->
+<!--        <item name="android:layout_height">?attr/actionBarSize</item>-->
+<!--        <item name="android:theme">@style/ToolbarTheme</item>-->
+<!--        <item name="windowActionModeOverlay">true</item>-->
+<!--    </style>-->
 
-    <style name="ToolbarTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="android:textColorPrimary">@android:color/white</item>
-        <item name="android:textColorSecondary">@android:color/darker_gray</item>
-    </style>
+<!--    <style name="ToolbarTheme" parent="Theme.MaterialComponents.Light.NoActionBar">-->
+<!--        <item name="android:textColorPrimary">@android:color/white</item>-->
+<!--        <item name="android:textColorSecondary">@android:color/darker_gray</item>-->
+<!--    </style>-->
 </resources>
diff --git a/app/src/test/kotlin/com/syousa1982/todo4android/data/db/TaskListDaoSpec.kt b/app/src/test/kotlin/com/syousa1982/todo4android/data/db/TaskListDaoSpec.kt
deleted file mode 100644
index 89e4990..0000000
--- a/app/src/test/kotlin/com/syousa1982/todo4android/data/db/TaskListDaoSpec.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.syousa1982.todo4android.data.db
-
-import android.content.Context
-import androidx.room.Room
-import com.syousa1982.todo4android.data.db.entity.TaskEntity
-import com.syousa1982.todo4android.data.db.entity.TaskListAndTasks
-import com.syousa1982.todo4android.data.db.entity.TaskListEntity
-import com.syousa1982.todo4android.domain.model.Task
-import io.mockk.mockk
-import org.dbtools.android.room.jdbc.JdbcSQLiteOpenHelperFactory
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
-
-
-class TaskListDaoSpec : Spek({
-    describe("TaskListDao") {
-        val context: Context by lazy {
-            mockk<Context>()
-        }
-
-        val database: AppDatabase by lazy {
-            Room.inMemoryDatabaseBuilder(
-                context,
-                AppDatabase::class.java
-            ).allowMainThreadQueries()
-                .openHelperFactory(JdbcSQLiteOpenHelperFactory())
-                .build()
-        }
-        context("Todoリストにタスク2件追加") {
-            val taskList = TaskListEntity(id = 1, name = "Todoリスト")
-            val tasks = listOf(
-                TaskEntity(1, 1, "hoge", Task.Status.TODO.value),
-                TaskEntity(2, 1, "piyo", Task.Status.TODO.value),
-                TaskEntity(3, 1, "aaaaaa", Task.Status.TODO.value)
-            )
-            it("タスクリスト追加") {
-                database.taskListDao().insertTaskList(taskList).test().await().assertComplete()
-            }
-            it("タスクリストの値とタスクの件数チェック") {
-                val result = database.taskListDao().loadTaskListAndTasks()
-                val taskListAndTasks = TaskListAndTasks()
-                taskListAndTasks.taskList = taskList
-                taskListAndTasks.tasks = listOf()
-                result
-                    .test()
-                    .await()
-                    .assertValue {
-                        it.first().taskList.name == taskListAndTasks.taskList.name
-                            && it.first().tasks.count() == taskListAndTasks.tasks.count()
-                    }
-            }
-            it("タスクリスト更新") {
-                val updatedTaskList = TaskListEntity(id = 1, name = "更新済みTodoリスト")
-                database.taskListDao().updateTaskList(updatedTaskList).test().await().assertComplete()
-                val result = database.taskListDao().loadTaskListAndTasks()
-                val taskListAndTasks = TaskListAndTasks()
-                taskListAndTasks.taskList = updatedTaskList
-                taskListAndTasks.tasks = listOf()
-                result
-                    .test()
-                    .await()
-                    .assertValue {
-                        it.first().taskList.name == taskListAndTasks.taskList.name
-                            && it.first().tasks.count() == taskListAndTasks.tasks.count()
-                    }
-            }
-            it("タスク追加") {
-                tasks.forEach {
-                    database.taskListDao().insertTask(it).test().await().assertComplete()
-                }
-            }
-            it("タスク取得テスト") {
-                val result = database.taskListDao().loadTaskListAndTasks(taskList.id.toString())
-                val taskListAndTasks = TaskListAndTasks()
-                taskListAndTasks.taskList = taskList
-                taskListAndTasks.tasks = tasks
-                result
-                    .test()
-                    .await()
-                    .assertValue {
-                        it.tasks == taskListAndTasks.tasks
-                    }
-            }
-            it("タスク更新") {
-                val updatedTask = TaskEntity(2, 1, "piyo", Task.Status.DONE.value)
-                val updatedTasks = tasks.toMutableList()
-                updatedTasks.replaceAll {
-                    when {
-                        it.id == updatedTask.id -> updatedTask
-                        else -> it
-                    }
-                }
-                database.taskListDao().updateTask(updatedTask).test().await().assertComplete()
-                val result = database.taskListDao().loadTaskListAndTasks(taskList.id.toString())
-                val taskListAndTasks = TaskListAndTasks()
-                taskListAndTasks.tasks = updatedTasks
-
-                result.test().await().assertValue {
-                    it.tasks.filter {
-                        it.status == updatedTask.status
-                    }.count() > 0
-                }
-
-            }
-        }
-    }
-})
\ No newline at end of file
diff --git a/app/src/test/kotlin/com/syousa1982/todo4android/domain/ToDoUseCaseSpec.kt b/app/src/test/kotlin/com/syousa1982/todo4android/domain/ToDoUseCaseSpec.kt
deleted file mode 100644
index 64864a7..0000000
--- a/app/src/test/kotlin/com/syousa1982/todo4android/domain/ToDoUseCaseSpec.kt
+++ /dev/null
@@ -1,219 +0,0 @@
-package com.syousa1982.todo4android.domain
-
-import com.syousa1982.todo4android.data.db.entity.TaskEntity
-import com.syousa1982.todo4android.data.db.entity.TaskListAndTasks
-import com.syousa1982.todo4android.data.db.entity.TaskListEntity
-import com.syousa1982.todo4android.data.repository.ITaskListRepository
-import com.syousa1982.todo4android.domain.model.Task
-import com.syousa1982.todo4android.domain.model.TaskList
-import com.syousa1982.todo4android.domain.usecase.ToDoUseCase
-import com.syousa1982.todo4android.util.rx.TestSchedulerProvider
-import io.mockk.*
-import io.reactivex.Single
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
-
-
-/**
- * ToDoUseCaseのテスト
- */
-class ToDoUseCaseSpec : Spek({
-    describe("ToDoUseCase") {
-        lateinit var taskListRepository: ITaskListRepository
-        lateinit var todoUseCase: ToDoUseCase
-        /**
-         * 正常系テスト
-         */
-        context("Success") {
-            beforeEachTest {
-                taskListRepository = mockk<ITaskListRepository>().also {
-                    every { it.loadTaskListAndTasksByDB() } answers {
-                        val taskListAndTasks = TaskListAndTasks()
-                        taskListAndTasks.taskList = TaskListEntity(1, "todo")
-                        taskListAndTasks.tasks = listOf(
-                            TaskEntity(1, 1, "aaaaa", Task.Status.DONE.value.toLowerCase()),
-                            TaskEntity(2, 1, "aaaaa", Task.Status.TODO.value.toLowerCase()),
-                            TaskEntity(3, 1, "aaaaa", Task.Status.TODO.value.toLowerCase())
-                        )
-                        Single.fromCallable {
-                            listOf(taskListAndTasks)
-                        }
-                    }
-                    every { it.loadTaskListAndTasksByDB("1") } answers {
-                        val taskListAndTasks = TaskListAndTasks()
-                        taskListAndTasks.taskList = TaskListEntity(1, "todo")
-                        taskListAndTasks.tasks = listOf(
-                            TaskEntity(1, 1, "aaaaa", Task.Status.DONE.value.toLowerCase()),
-                            TaskEntity(2, 1, "aaaaa", Task.Status.TODO.value.toLowerCase()),
-                            TaskEntity(3, 1, "aaaaa", Task.Status.TODO.value.toLowerCase())
-                        )
-                        Single.fromCallable {
-                            taskListAndTasks
-                        }
-                    }
-
-                }
-                todoUseCase = ToDoUseCase(taskListRepository, TestSchedulerProvider())
-            }
-
-            it("getTaskLists()") {
-                val expectedValue =
-                    Result.success(listOf(
-                        TaskList(1, "todo", listOf(
-                            Task(1, "aaaaa", Task.Status.DONE),
-                            Task(2, "aaaaa", Task.Status.TODO),
-                            Task(3, "aaaaa", Task.Status.TODO)
-                        ))
-                    ))
-                todoUseCase
-                    .getTaskLists()
-                    .test()
-                    .assertValues(Result.Progress(), expectedValue)
-            }
-
-            it("addTaskList()") {
-                val expect = "hoge"
-                val taskListEntity = TaskListEntity(name = expect)
-
-                every { taskListRepository.insertTaskListByDB(taskListEntity) } answers {
-                    Single.fromCallable {
-                        1L
-                    }
-                }
-                todoUseCase.addTaskList(expect)
-                    .skip(1)
-                    .test()
-                    .assertValue {
-                        it is Result.Success
-                    }
-                verify { taskListRepository.insertTaskListByDB(taskListEntity) }
-                confirmVerified(taskListRepository)
-            }
-
-            it("updateTaskList()") {
-                val updatedValue =
-                    TaskList(1, "UpdatedTodoList", listOf(
-                        Task(1, "aaaaa", Task.Status.DONE),
-                        Task(2, "aaaaa", Task.Status.TODO),
-                        Task(3, "aaaaa", Task.Status.TODO)
-                    ))
-
-                val taskListEntity = TaskListEntity(updatedValue.id, updatedValue.name)
-
-                every { taskListRepository.updateTaskListByDB(taskListEntity) } answers {
-                    Single.fromCallable {
-                        1
-                    }
-                }
-
-                todoUseCase.updateTaskList(updatedValue)
-                    .skip(1)
-                    .test()
-                    .assertValue {
-                        it is Result.Success
-                    }
-                verify { taskListRepository.updateTaskListByDB(taskListEntity) }
-                confirmVerified(taskListRepository)
-            }
-
-            it("getTasks()") {
-                val expectedValue = Result.success(listOf(
-                    Task(1, "aaaaa", Task.Status.DONE),
-                    Task(2, "aaaaa", Task.Status.TODO),
-                    Task(3, "aaaaa", Task.Status.TODO)
-                ))
-                todoUseCase.getTasks(1)
-                    .test()
-                    .assertValues(Result.Progress(), expectedValue)
-            }
-
-            it("addTasks()") {
-                val expect = "fuga"
-                val taskEntity = TaskEntity(name = expect, taskListId = 1, status = Task.Status.TODO.value)
-                every { taskListRepository.insertTaskByDB(taskEntity) } answers {
-                    Single.fromCallable {
-                        1L
-                    }
-                }
-                todoUseCase.addTask(1, expect)
-                    .skip(1)
-                    .test()
-                    .assertValue {
-                        it is Result.Success
-                    }
-                verify { taskListRepository.insertTaskByDB(taskEntity) }
-                confirmVerified(taskListRepository)
-            }
-
-            it("updateTask()") {
-                val updatedValue = Task(2, "UpdatedTask", Task.Status.DONE)
-                val entity = TaskEntity(updatedValue.id, 1, updatedValue.name, updatedValue.status.value)
-
-                every { taskListRepository.updateTaskByDB(entity) } answers {
-                    Single.fromCallable {
-                        1
-                    }
-                }
-
-                todoUseCase.updateTask(1, updatedValue)
-                    .skip(1)
-                    .test()
-                    .assertValue {
-                        it is Result.Success
-                    }
-
-                verify { taskListRepository.updateTaskByDB(entity) }
-                confirmVerified(taskListRepository)
-            }
-
-            afterEachTest {
-                unmockkAll()
-            }
-        }
-
-        /**
-         * 異常系テスト
-         */
-        context("Failure Test") {
-            beforeEachTest {
-                taskListRepository = mockk<ITaskListRepository>().also {
-                    every { it.loadTaskListAndTasksByDB() } answers {
-                        Single.fromCallable {
-                            listOf(TaskListAndTasks())
-                        }
-                    }
-                    every { it.loadTaskListAndTasksByDB("1") } answers {
-                        Single.fromCallable {
-                            TaskListAndTasks()
-                        }
-                    }
-                }
-                todoUseCase = ToDoUseCase(taskListRepository, TestSchedulerProvider())
-            }
-
-            it("getTaskLists()") {
-                todoUseCase.getTaskLists().skip(1).test()
-                    .assertNoErrors()
-                    .assertComplete()
-                    .assertValueCount(1)
-                    .assertValue {
-                        it is Result.Failure
-                    }
-            }
-
-            it("getTasks()") {
-                todoUseCase.getTasks(1).skip(1).test()
-                    .assertNoErrors()
-                    .assertComplete()
-                    .assertValueCount(1)
-                    .assertValue {
-                        it is Result.Failure
-                    }
-            }
-
-            afterEachTest {
-                unmockkAll()
-            }
-        }
-    }
-})
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/syousa1982/todo4android/data/.gitkeep b/app/src/test/kotlin/com/syousa1982/todo4android/presentation/.gitkeep
similarity index 100%
rename from app/src/main/kotlin/com/syousa1982/todo4android/data/.gitkeep
rename to app/src/test/kotlin/com/syousa1982/todo4android/presentation/.gitkeep
diff --git a/app/src/test/kotlin/com/syousa1982/todo4android/presentation/TaskListViewModelSpec.kt b/app/src/test/kotlin/com/syousa1982/todo4android/presentation/TaskListViewModelSpec.kt
deleted file mode 100644
index c61cba6..0000000
--- a/app/src/test/kotlin/com/syousa1982/todo4android/presentation/TaskListViewModelSpec.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.syousa1982.todo4android.presentation
-
-import androidx.lifecycle.Observer
-import com.syousa1982.todo4android.domain.Result
-import com.syousa1982.todo4android.domain.model.Task
-import com.syousa1982.todo4android.domain.model.TaskList
-import com.syousa1982.todo4android.domain.usecase.IToDoUseCase
-import com.syousa1982.todo4android.presentation.tasklist.TaskListViewModel
-import com.syousa1982.todo4android.util.extention.useLiveData
-import io.mockk.Runs
-import io.mockk.every
-import io.mockk.just
-import io.mockk.mockk
-import io.reactivex.Flowable
-import org.junit.Assert.assertEquals
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
-
-class TaskListViewModelSpec : Spek({
-    useLiveData()
-    describe("TaskListViewModel") {
-        lateinit var observer: Observer<Result<List<TaskList>>>
-        lateinit var todoUseCase: IToDoUseCase
-        lateinit var viewModel: TaskListViewModel
-        val expectValue = Result.success(listOf(
-            TaskList(1, "todo", listOf(
-                Task(1, "aaaaa", Task.Status.DONE),
-                Task(2, "aaaaa", Task.Status.TODO),
-                Task(3, "aaaaa", Task.Status.TODO)
-            )),
-            TaskList(2, "家事", listOf(
-                Task(1, "飯作る", Task.Status.DONE),
-                Task(2, "皿洗う", Task.Status.DONE),
-                Task(3, "掃除", Task.Status.TODO)
-            ))
-        ))
-        beforeEachTest {
-            observer = mockk<Observer<Result<List<TaskList>>>>().also {
-                every { it.onChanged(any()) } just Runs
-            }
-            todoUseCase = mockk<IToDoUseCase>().also {
-                every { it.getTaskLists() } answers {
-                    Flowable.fromCallable {
-                        expectValue
-                    }
-                }
-            }
-            viewModel = TaskListViewModel(todoUseCase)
-        }
-        it("fetchTasks") {
-            viewModel.taskLists.observeForever(observer)
-            run {
-                viewModel.fetchTasks()
-            }
-            assertEquals(expectValue, viewModel.taskLists.value)
-        }
-    }
-})
\ No newline at end of file
diff --git a/app/src/test/kotlin/com/syousa1982/todo4android/util/rx/TestSchedulerProvider.kt b/app/src/test/kotlin/com/syousa1982/todo4android/util/rx/TestSchedulerProvider.kt
deleted file mode 100644
index c763a47..0000000
--- a/app/src/test/kotlin/com/syousa1982/todo4android/util/rx/TestSchedulerProvider.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.syousa1982.todo4android.util.rx
-
-import io.reactivex.Scheduler
-import io.reactivex.schedulers.Schedulers
-
-class TestSchedulerProvider : SchedulerProvider {
-    override fun ui(): Scheduler = Schedulers.trampoline()
-
-    override fun computation(): Scheduler = Schedulers.trampoline()
-
-    override fun newThread(): Scheduler = Schedulers.trampoline()
-
-    override fun io(): Scheduler = Schedulers.trampoline()
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4a8de1f..730f4ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,22 +2,13 @@
 
 buildscript {
     // Language
-    ext.kotlin_version = "1.3.30"
+    ext.kotlin_version = "1.4.0"
+    ext.kotlin_coroutines = "1.3.6"
+    ext.room_version = "2.2.5"
+    ext.serialization_version = "0.20.0"
     // Architecture
     ext.lifecycle_version = "2.0.0"
-    ext.room_version = "2.1.0-beta01"
     ext.nav_version = "1.0.0"
-    // NetWork
-    ext.retrofit_version = "2.4.0"
-    ext.ok_http_version = "3.11.0"
-    // Converter
-    ext.kotshi_version = "1.0.5"
-    ext.moshi_version = "1.7.0"
-    // DI
-    ext.koin_version = "1.0.1"
-    // UI
-    ext.glide_version = "4.9.0"
-    ext.groupie_version = "2.3.0"
     // Util
     ext.permissions_dispatcher_version = "4.0.0"
     // Securestorage
@@ -31,21 +22,20 @@ buildscript {
     // DatabaseTest
     ext.dbtoolsRoomVersion = "4.7.0"
 
+    ext.koin_version = "2.1.6"
+
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        // Gradleプラグイン（AndroidStudioのバージョンと合わせる）
-        classpath 'com.android.tools.build:gradle:3.5.0'
-        // Kotlinプラグイン
+        classpath "com.android.tools.build:gradle:4.0.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         // ドキュメント出力プラグイン
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.18"
         // ライブラリのライセンス出力プラグイン
         classpath "com.cookpad.android.licensetools:license-tools-plugin:1.7.0"
-        // GoogleServicesプラグイン
-        classpath "com.google.gms:google-services:4.2.0"
         // junit5
         classpath "de.mannodermaus.gradle.plugins:android-junit5:1.4.0.0"
         // junit-platform
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7268092..79a96e7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 08 00:21:28 JST 2019
+#Fri Aug 07 16:18:14 JST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip