hw_1

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*.{kt,kts}]
+indent_size = 4
+max_line_length = 120
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8

app/src/main/java/com/example/androidmovie/App.kt

@@ -8,17 +8,19 @@ import com.example.core.dependency.DepsMap
 import com.example.core.dependency.HasDependencies
 import javax.inject.Inject
 
-class App : Application(), HasDependencies {
-
+class App :
+    Application(),
+    HasDependencies {
     @Inject
     override lateinit var depsMap: DepsMap
 
     override fun onCreate() {
         super.onCreate()
-        DaggerAppComponent.builder()
+        DaggerAppComponent
+            .builder()
             .application(this)
             .connectivityManager(getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager)
-            .build().
-            inject(this)
+            .build()
+            .inject(this)
     }
 }

app/src/main/java/com/example/androidmovie/MainActivity.kt

@@ -1,16 +1,16 @@
 package com.example.androidmovie
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.fragment.NavHostFragment
 import com.example.core.navigation.NavigationFlow
 import com.example.core.navigation.Navigator
-import com.example.core.navigation.ToFlowNavigatable
 import com.example.core.navigation.R.navigation.main_nav_graph
+import com.example.core.navigation.ToFlowNavigatable
 
-
-class MainActivity : AppCompatActivity(R.layout.activity_main), ToFlowNavigatable {
-
+class MainActivity :
+    AppCompatActivity(R.layout.activity_main),
+    ToFlowNavigatable {
     private val navigator: Navigator = Navigator()
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/example/androidmovie/di/AppComponent.kt

@@ -22,15 +22,13 @@ annotation class AppScope
     modules = [
         AppModule::class,
         DomainModule::class,
-        FeatureDepsModule::class
-    ]
+        FeatureDepsModule::class,
+    ],
 )
-
 @AppScope
 interface AppComponent :
     PopularMoviesDeps,
     MovieDeps {
-
     @Component.Builder
     interface Builder {
         @BindsInstance
@@ -49,7 +47,5 @@ interface AppComponent :
 class AppModule {
     @AppScope
     @Provides
-    fun provideContext(
-        application: Application
-    ): Context = application.applicationContext
+    fun provideContext(application: Application): Context = application.applicationContext
 }

app/src/main/java/com/example/androidmovie/di/feature_deps/MovieDepsModule.kt → app/src/main/java/com/example/androidmovie/di/featureDeps/MovieDepsModule.kt

@@ -1,4 +1,4 @@
-package com.example.androidmovie.di.feature_deps
+package com.example.androidmovie.di.featureDeps
 
 import com.example.androidmovie.di.AppComponent
 import com.example.core.dagger.DependenciesKey
@@ -14,4 +14,4 @@ interface MovieDepsModule {
     @IntoMap
     @DependenciesKey(MovieDeps::class)
     fun bindMovieDeps(impl: AppComponent): Dependencies
-}
+}

app/src/main/java/com/example/androidmovie/di/feature_deps/PopularMoviesDepsModule.kt → app/src/main/java/com/example/androidmovie/di/featureDeps/PopularMoviesDepsModule.kt

@@ -1,4 +1,4 @@
-package com.example.androidmovie.di.feature_deps
+package com.example.androidmovie.di.featureDeps
 
 import com.example.androidmovie.di.AppComponent
 import com.example.core.dagger.DependenciesKey

app/src/main/java/com/example/androidmovie/di/modules/DataModule.kt

@@ -11,16 +11,14 @@ import dagger.Provides
 @Module(includes = [NetworkModule::class])
 class DataModule {
     @Provides
-    fun providePopularMoviesRepository(
-        api: Api
-    ) : PopularMoviesRepository = PopularMoviesRepositoryImpl(
-        api
-    )
+    fun providePopularMoviesRepository(api: Api): PopularMoviesRepository =
+        PopularMoviesRepositoryImpl(
+            api,
+        )
 
     @Provides
-    fun provideMovieRepository(
-        api: Api
-    ) : MovieRepository = MovieRepositoryImpl(
-        api
-    )
-}
+    fun provideMovieRepository(api: Api): MovieRepository =
+        MovieRepositoryImpl(
+            api,
+        )
+}

app/src/main/java/com/example/androidmovie/di/modules/DomainModule.kt

@@ -12,12 +12,9 @@ import dagger.Provides
 @Module(includes = [DataModule::class])
 class DomainModule {
     @Provides
-    fun providePopularMoviesInteractor(
-        popularMoviesRepository: PopularMoviesRepository
-    ): PopularMoviesInteractor = PopularMoviesInteractorImpl(popularMoviesRepository)
+    fun providePopularMoviesInteractor(popularMoviesRepository: PopularMoviesRepository): PopularMoviesInteractor =
+        PopularMoviesInteractorImpl(popularMoviesRepository)
 
     @Provides
-    fun provideMovieInteractor(
-        movieRepository: MovieRepository
-    ): MovieInteractor = MovieInteractorImpl(movieRepository)
+    fun provideMovieInteractor(movieRepository: MovieRepository): MovieInteractor = MovieInteractorImpl(movieRepository)
 }

app/src/main/java/com/example/androidmovie/di/modules/FeatureDepsModule.kt

@@ -1,13 +1,13 @@
 package com.example.androidmovie.di.modules
 
-import com.example.androidmovie.di.feature_deps.MovieDepsModule
-import com.example.androidmovie.di.feature_deps.PopularMoviesDepsModule
+import com.example.androidmovie.di.featureDeps.MovieDepsModule
+import com.example.androidmovie.di.featureDeps.PopularMoviesDepsModule
 import dagger.Module
 
 @Module(
     includes = [
         PopularMoviesDepsModule::class,
-        MovieDepsModule::class
-    ]
+        MovieDepsModule::class,
+    ],
 )
 interface FeatureDepsModule

app/src/main/java/com/example/androidmovie/di/modules/NetworkModule.kt

@@ -1,7 +1,7 @@
 package com.example.androidmovie.di.modules
 
 import android.net.ConnectivityManager
-import com.example.data.movies_api_provider.ApiProvider
+import com.example.data.moviesApiProvider.ApiProvider
 import com.example.network.network.ApiConst
 import com.example.network.network.api.Api
 import com.example.network.network.provider.NetworkProvider
@@ -11,17 +11,12 @@ import dagger.Provides
 @Module
 class NetworkModule {
     @Provides
-    fun provideNetworkProvider(
-        connectivityManager: ConnectivityManager
-    ): NetworkProvider = NetworkProvider(connectivityManager)
+    fun provideNetworkProvider(connectivityManager: ConnectivityManager): NetworkProvider =
+        NetworkProvider(connectivityManager)
 
     @Provides
-    fun provideApiProvider(
-        networkProvider: NetworkProvider
-    ): ApiProvider = ApiProvider(networkProvider)
+    fun provideApiProvider(networkProvider: NetworkProvider): ApiProvider = ApiProvider(networkProvider)
 
     @Provides
-    fun provideApi(
-        provider: ApiProvider
-    ) : Api = provider.provideNetwork(baseUrl = ApiConst.HOST_API)
+    fun provideApi(provider: ApiProvider): Api = provider.provideNetwork(baseUrl = ApiConst.HOST_API)
 }

build.gradle

@@ -1,7 +1,51 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
+    id 'com.android.application' version '8.8.0' apply false
+    id 'com.android.library' version '8.8.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
     id 'androidx.navigation.safeargs.kotlin' version '2.5.0' apply false
+    id 'io.gitlab.arturbosch.detekt' version '1.23.8' apply false
+}
+
+apply from: "ktlint.gradle"
+
+subprojects {
+    apply plugin: "io.gitlab.arturbosch.detekt"
+
+    detekt {
+        toolVersion = "1.23.8"
+        config.setFrom(file("$rootDir/config/detekt/detekt.yml"))
+        buildUponDefaultConfig = true
+        reports {
+            html.enabled = true
+            xml.enabled = false
+            txt.enabled = false
+        }
+    }
+}
+
+tasks.register("detektAll") {
+    group = "verification"
+    description = "Run detekt for all modules and generate a single report."
+
+    dependsOn subprojects.collect { it.tasks.findByName("detekt") }
+
+    doLast {
+        def outputDir = file("$buildDir/reports/detekt")
+        outputDir.mkdirs()
+
+        def mergedReport = new File(outputDir, "detekt-all-report.html")
+        mergedReport.write("") // Очищаем файл перед записью
+
+        subprojects.each { project ->
+            def reportFile = project.file("${project.buildDir}/reports/detekt/detekt.html")
+            if (reportFile.exists()) {
+                mergedReport.append("<!-- Report from ${project.name} -->\n")
+                mergedReport.append(reportFile.text)
+                mergedReport.append("\n")
+            } else {
+                println "Report not found for module: ${project.name}"
+            }
+        }
+    }
 }

common/src/main/java/com/example/common/Entity.kt

@@ -1,16 +1,20 @@
 package com.example.common
 
-sealed class Entity<out T : Any>{
-    data class Success<out T : Any>(val data: T?, val code: Int? = null) : Entity<T>() {
-        override fun <K : Any> map(mapper: (oldValue: T?) -> K?): Success<K> {
-            return Success(mapper.invoke(data), code)
-        }
+sealed class Entity<out T : Any> {
+    data class Success<out T : Any>(
+        val data: T?,
+        val code: Int? = null,
+    ) : Entity<T>() {
+        override fun <K : Any> map(mapper: (oldValue: T?) -> K?): Success<K> = Success(mapper.invoke(data), code)
     }
-    data class Error<out T : Any>(val exceptionMessage: String, val localData: T? = null) :
-        Entity<T>() {
-        override fun <K : Any> map(mapper: (oldValue: T?) -> K?): Error<K> {
-            return Error(exceptionMessage, mapper.invoke(localData))
-        }
+
+    data class Error<out T : Any>(
+        val exceptionMessage: String,
+        val localData: T? = null,
+    ) : Entity<T>() {
+        override fun <K : Any> map(mapper: (oldValue: T?) -> K?): Error<K> =
+            Error(exceptionMessage, mapper.invoke(localData))
     }
+
     abstract fun <K : Any> map(mapper: (oldValue: T?) -> K?): Entity<K>
 }