Remake

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"

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>

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"
+    }
+  ]
+}

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)
+    }
+
+}

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))
+        }
+    }
+
+}

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
 }

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>>
+}