setup clean architecture

Author: dosukoi-android

.idea/gradle.xml

@@ -59,15 +59,18 @@ dependencies {
     implementation(project(":ui:view"))
     implementation(project(":ui:viewModel"))
     implementation(project(":data:api"))
-    implementation(project(":data:entity"))
     implementation(project(":data:repository"))
-    implementation(project(":data:usecase"))
+    implementation(project(":domain:usecase"))
+    implementation(project(":domain:entity"))
+    implementation(project(":domain:repository"))
+
 
     implementation("androidx.core:core-ktx:1.7.0")
     implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("com.google.android.material:material:1.5.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.3")
 
+    implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0")
     // Compose
     val composeVersion = "1.1.1"
     implementation("androidx.compose.ui:ui:$composeVersion")

app/build.gradle.kts

@@ -2,6 +2,7 @@ package jp.dosukoi.githubclientforjetpackcompose
 
 import android.content.Context
 import androidx.room.Room
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -10,14 +11,14 @@ import dagger.hilt.components.SingletonComponent
 import jp.dosukoi.data.api.common.AccessTokenProvider
 import jp.dosukoi.data.api.common.IApiType
 import jp.dosukoi.data.api.common.IAuthApiType
-import jp.dosukoi.data.entity.auth.AuthDao
-import jp.dosukoi.data.entity.common.JsonConverter
 import jp.dosukoi.data.repository.common.AppDatabase
+import jp.dosukoi.githubclient.domain.entity.auth.AuthDao
 import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 import javax.inject.Named
 import javax.inject.Singleton
 
@@ -32,10 +33,12 @@ object AppModule {
     fun provideRetrofit(
         okHttpClient: OkHttpClient
     ): Retrofit {
+        val contentType = "application/json".toMediaType()
+        val format = Json { ignoreUnknownKeys = true }
         return Retrofit.Builder()
             .baseUrl("https://api.github.com")
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create(JsonConverter.gson))
+            .addConverterFactory(format.asConverterFactory(contentType))
             .build()
     }
 
@@ -46,10 +49,12 @@ object AppModule {
     fun provideAuthRetrofit(
         okHttpClient: OkHttpClient
     ): Retrofit {
+        val contentType = "application/json".toMediaType()
+        val format = Json { ignoreUnknownKeys = true }
         return Retrofit.Builder()
             .baseUrl("https://github.com")
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create(JsonConverter.gson))
+            .addConverterFactory(format.asConverterFactory(contentType))
             .build()
     }
 

app/src/main/java/jp/dosukoi/githubclientforjetpackcompose/AppModule.kt

@@ -0,0 +1,44 @@
+package jp.dosukoi.githubclientforjetpackcompose
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import jp.dosukoi.data.api.common.IApiType
+import jp.dosukoi.data.api.common.IAuthApiType
+import jp.dosukoi.data.repository.auth.AuthRepositoryImpl
+import jp.dosukoi.data.repository.myPage.ReposRepositoryImpl
+import jp.dosukoi.data.repository.myPage.UserRepositoryImpl
+import jp.dosukoi.data.repository.search.SearchRepositoryImpl
+import jp.dosukoi.githubclient.domain.entity.auth.AuthDao
+import jp.dosukoi.githubclient.domain.repository.auth.AuthRepository
+import jp.dosukoi.githubclient.domain.repository.myPage.ReposRepository
+import jp.dosukoi.githubclient.domain.repository.myPage.UserRepository
+import jp.dosukoi.githubclient.domain.repository.search.SearchRepository
+import javax.inject.Named
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+object RepositoryModule {
+    @Singleton
+    @Provides
+    fun provideAuthRepository(
+        @Named("clientId") clientId: String,
+        @Named("clientSecret") clientSecret: String,
+        api: IAuthApiType,
+        authDao: AuthDao
+    ): AuthRepository = AuthRepositoryImpl(clientId, clientSecret, api, authDao)
+
+    @Singleton
+    @Provides
+    fun provideReposRepository(api: IApiType): ReposRepository = ReposRepositoryImpl(api)
+
+    @Singleton
+    @Provides
+    fun provideUserRepository(api: IApiType): UserRepository = UserRepositoryImpl(api)
+
+    @Singleton
+    @Provides
+    fun provideSearchRepository(api: IApiType): SearchRepository = SearchRepositoryImpl(api)
+}

app/src/main/java/jp/dosukoi/githubclientforjetpackcompose/RepositoryModule.kt

@@ -12,7 +12,7 @@ android {
 
 dependencies {
 
-    api(project(":data:entity"))
+    api(project(":domain:entity"))
 
     // Hilt
     val hiltVersion = "2.41"
@@ -42,4 +42,4 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
 
     testImplementation("com.google.truth:truth:1.1.3")
-}
+}

data/api/build.gradle.kts

@@ -1,6 +1,6 @@
 package jp.dosukoi.data.api.common
 
-import jp.dosukoi.data.entity.auth.AuthDao
+import jp.dosukoi.githubclient.domain.entity.auth.AuthDao
 import javax.inject.Inject
 import javax.inject.Singleton
 

data/api/src/main/java/jp/dosukoi/data/api/common/AccessTokenProvider.kt

@@ -1,8 +1,8 @@
 package jp.dosukoi.data.api.common
 
-import jp.dosukoi.data.entity.myPage.Repository
-import jp.dosukoi.data.entity.myPage.User
-import jp.dosukoi.data.entity.search.Search
+import jp.dosukoi.githubclient.domain.entity.myPage.Repository
+import jp.dosukoi.githubclient.domain.entity.myPage.User
+import jp.dosukoi.githubclient.domain.entity.search.Search
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Query

data/api/src/main/java/jp/dosukoi/data/api/common/IApiType.kt

@@ -1,6 +1,6 @@
 package jp.dosukoi.data.api.common
 
-import jp.dosukoi.data.entity.auth.Auth
+import jp.dosukoi.githubclient.domain.entity.auth.Auth
 import retrofit2.Response
 import retrofit2.http.POST
 import retrofit2.http.Query