Merge pull request #25 from harutiro/features/6

アーキテクチャを適用

Author: harutiro

README.md

@@ -13,7 +13,7 @@
 ### 環境
 
 - IDE：Android Studio Ladybug | 2024.2.1 Patch 3
-- Kotlin： 2.0.0
+- Kotlin： 2.0.21
 - Java：17
 - Gradle：8.9
 - minSdk：23

app/build.gradle

@@ -5,6 +5,7 @@ plugins {
     id 'kotlin-parcelize'
     id 'androidx.navigation.safeargs.kotlin'
     id("org.jlleitschuh.gradle.ktlint") version "12.1.2"
+    id 'com.google.dagger.hilt.android'
 }
 
 android {
@@ -28,11 +29,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '1.8'
     }
     buildFeatures {
         viewBinding true
@@ -63,10 +64,16 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    implementation "com.google.dagger:hilt-android:2.55"
+    kapt "com.google.dagger:hilt-compiler:2.55"
 
     // Retrofit
     implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
     implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.squareup.moshi:moshi-kotlin:1.14.0")
 }
+
+kapt {
+    correctErrorTypes true
+}

app/src/main/AndroidManifest.xml

@@ -11,7 +11,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AndroidEngineerCodeCheck"
-        android:fullBackupContent="@xml/backup_descriptor">
+        android:fullBackupContent="@xml/backup_descriptor"
+        android:name=".CodeCheckApplication">
         <activity
             android:name="jp.co.yumemi.android.code_check.TopActivity"
             android:exported="true">

app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckApplication.kt

@@ -0,0 +1,7 @@
+package jp.co.yumemi.android.code_check
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class CodeCheckApplication : Application()

app/src/main/kotlin/jp/co/yumemi/android/code_check/CodeCheckModule.kt

@@ -0,0 +1,38 @@
+package jp.co.yumemi.android.code_check
+
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApi
+import jp.co.yumemi.android.code_check.features.github.api.GitHubServiceApiImpl
+import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepository
+import jp.co.yumemi.android.code_check.features.github.reposiotory.GitHubServiceRepositoryImpl
+import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecase
+import jp.co.yumemi.android.code_check.features.github.usecase.GitHubServiceUsecaseImpl
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class GitHubUsecaseModule {
+    @Singleton
+    @Binds
+    abstract fun provideGitHubServiceUsecase(impl: GitHubServiceUsecaseImpl): GitHubServiceUsecase
+}
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class GitHubRepositoryModule {
+    @Singleton
+    @Binds
+    abstract fun provideGitHubServiceRepository(impl: GitHubServiceRepositoryImpl): GitHubServiceRepository
+
+    companion object {
+        @Provides
+        @Singleton
+        fun provideGitHubServiceApi(): GitHubServiceApi {
+            return GitHubServiceApiImpl()
+        }
+    }
+}

app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositorySearchViewModel.kt

@@ -4,5 +4,7 @@
 package jp.co.yumemi.android.code_check
 
 import androidx.appcompat.app.AppCompatActivity
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class TopActivity : AppCompatActivity(R.layout.activity_top)

app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt

@@ -0,0 +1,22 @@
+package jp.co.yumemi.android.code_check.core.api
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NetworkConnectivityService
+    @Inject
+    constructor(
+        @ApplicationContext private val context: Context,
+    ) {
+        fun isNetworkAvailable(): Boolean {
+            val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val network = connectivityManager.activeNetwork ?: return false
+            val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
+            return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+        }
+    }

app/src/main/kotlin/jp/co/yumemi/android/code_check/core/api/NetworkConnectivityService.kt

@@ -1,4 +1,4 @@
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.core.entity
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize

…emi/android/code_check/RepositoryItem.kt …code_check/core/entity/RepositoryItem.ktapp/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt renamed to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt app/src/main/kotlin/jp/co/yumemi/android/code_check/RepositoryItem.kt renamed to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt

@@ -1,15 +1,19 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.core.presenter.detail
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
 import coil.load
+import dagger.hilt.android.AndroidEntryPoint
+import jp.co.yumemi.android.code_check.R
+import jp.co.yumemi.android.code_check.core.entity.RepositoryItem
 import jp.co.yumemi.android.code_check.databinding.FragmentRepositoryDetailBinding
 
+@AndroidEntryPoint
 class RepositoryDetailFragment : Fragment(R.layout.fragment_repository_detail) {
     private val args: RepositoryDetailFragmentArgs by navArgs()