Domain - Module

src/app/build.gradle.kts

@@ -17,6 +17,7 @@ dependencies {
 
     implementation(projects.data)
     implementation(projects.core)
+    implementation(projects.domain)
     implementation(projects.featureWishlist)
     implementation(projects.featureMovies)
     implementation(projects.featureDetails)

src/app/src/main/java/com/gabrielbmoro/moviedb/MovieDBApp.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import com.gabrielbmoro.moviedb.core.di.coreModule
 import com.gabrielbmoro.moviedb.details.di.featureDetailsModule
 import com.gabrielbmoro.moviedb.di.appModule
+import com.gabrielbmoro.moviedb.domain.di.domainModule
 import com.gabrielbmoro.moviedb.movies.di.featureMoviesModule
 import com.gabrielbmoro.moviedb.repository.di.dataModule
 import com.gabrielbmoro.moviedb.search.di.featureSearchMovieModule
@@ -33,6 +34,7 @@ class MovieDBApp : Application() {
             modules(
                 appModule,
                 coreModule,
+                domainModule,
                 dataModule,
                 featureDetailsModule,
                 featureMoviesModule,

src/app/src/main/java/com/gabrielbmoro/moviedb/navigation/MovieDBNavHost.kt

@@ -8,8 +8,8 @@ import androidx.navigation.navArgument
 import com.gabrielbmoro.moviedb.core.ui.parcelableOf
 import com.gabrielbmoro.moviedb.details.ui.screens.details.DetailsScreen
 import com.gabrielbmoro.moviedb.details.ui.screens.details.DetailsScreenViewModel
+import com.gabrielbmoro.moviedb.domain.entities.Movie
 import com.gabrielbmoro.moviedb.movies.ui.screens.movies.MovieScreen
-import com.gabrielbmoro.moviedb.repository.model.Movie
 import com.gabrielbmoro.moviedb.search.ui.screens.search.SearchScreen
 import com.gabrielbmoro.moviedb.wishlist.ui.screens.wishlist.WishlistScreen
 import org.koin.androidx.compose.koinViewModel

src/app/src/main/java/com/gabrielbmoro/moviedb/navigation/NavMovieType.kt

@@ -3,7 +3,7 @@ package com.gabrielbmoro.moviedb.navigation
 import android.os.Bundle
 import androidx.navigation.NavType
 import com.gabrielbmoro.moviedb.core.ui.parcelableOf
-import com.gabrielbmoro.moviedb.repository.model.Movie
+import com.gabrielbmoro.moviedb.domain.entities.Movie
 import com.google.gson.Gson
 
 class NavMovieType : NavType<Movie>(false) {

src/app/src/main/java/com/gabrielbmoro/moviedb/navigation/NavigationItem.kt

@@ -3,7 +3,7 @@ package com.gabrielbmoro.moviedb.navigation
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.gabrielbmoro.moviedb.R
-import com.gabrielbmoro.moviedb.repository.model.Movie
+import com.gabrielbmoro.moviedb.domain.entities.Movie
 
 sealed class NavigationItem(
     open val route: String

src/app/src/main/java/com/gabrielbmoro/moviedb/navigation/ScreenRoutesBuilder.kt

@@ -1,7 +1,7 @@
 package com.gabrielbmoro.moviedb.navigation
 
 import android.net.Uri
-import com.gabrielbmoro.moviedb.repository.model.Movie
+import com.gabrielbmoro.moviedb.domain.entities.Movie
 import com.google.gson.Gson
 
 object ScreenRoutesBuilder {

src/data/build.gradle.kts

@@ -10,6 +10,9 @@ android {
 }
 
 dependencies {
+
+    implementation(projects.domain)
+
     implementation(libs.preferences.ktx)
     implementation(libs.timber)
     implementation(libs.bundles.retrofit)

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/MoviesRepositoryImpl.kt

@@ -3,7 +3,11 @@ package com.gabrielbmoro.moviedb.repository
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
-import com.gabrielbmoro.moviedb.domain.model.DataOrException
+import com.gabrielbmoro.moviedb.domain.MoviesRepository
+import com.gabrielbmoro.moviedb.domain.entities.DataOrException
+import com.gabrielbmoro.moviedb.domain.entities.Movie
+import com.gabrielbmoro.moviedb.domain.entities.MovieDetail
+import com.gabrielbmoro.moviedb.domain.entities.VideoStream
 import com.gabrielbmoro.moviedb.repository.datasources.paging.MoviesDataSource
 import com.gabrielbmoro.moviedb.repository.datasources.retrofit.ApiRepository
 import com.gabrielbmoro.moviedb.repository.datasources.room.FavoriteMoviesDAO
@@ -12,9 +16,6 @@ import com.gabrielbmoro.moviedb.repository.mappers.MovieMapper
 import com.gabrielbmoro.moviedb.repository.mappers.PageMapper
 import com.gabrielbmoro.moviedb.repository.mappers.VideoDetailsMapper
 import com.gabrielbmoro.moviedb.repository.mappers.VideoStreamMapper
-import com.gabrielbmoro.moviedb.repository.model.Movie
-import com.gabrielbmoro.moviedb.repository.model.MovieDetail
-import com.gabrielbmoro.moviedb.repository.model.VideoStream
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/di/DataModule.kt

@@ -1,7 +1,7 @@
 package com.gabrielbmoro.moviedb.repository.di
 
 import androidx.room.Room
-import com.gabrielbmoro.moviedb.repository.MoviesRepository
+import com.gabrielbmoro.moviedb.domain.MoviesRepository
 import com.gabrielbmoro.moviedb.repository.MoviesRepositoryImpl
 import com.gabrielbmoro.moviedb.repository.datasources.retrofit.ApiRepository
 import com.gabrielbmoro.moviedb.repository.datasources.retrofit.interceptors.AuthenticationInterceptor

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/mappers/FavoriteMovieMapper.kt

@@ -1,7 +1,7 @@
 package com.gabrielbmoro.moviedb.repository.mappers
 
+import com.gabrielbmoro.moviedb.domain.entities.Movie
 import com.gabrielbmoro.moviedb.repository.datasources.room.dto.FavoriteMovieDTO
-import com.gabrielbmoro.moviedb.repository.model.Movie
 
 class FavoriteMovieMapper {
 

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/mappers/MovieMapper.kt

@@ -1,8 +1,8 @@
 package com.gabrielbmoro.moviedb.repository.mappers
 
+import com.gabrielbmoro.moviedb.domain.entities.Movie
 import com.gabrielbmoro.moviedb.repository.datasources.retrofit.responses.MovieResponse
 import com.gabrielbmoro.moviedb.repository.datasources.room.dto.FavoriteMovieDTO
-import com.gabrielbmoro.moviedb.repository.model.Movie
 
 class MovieMapper {
 

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/mappers/VideoDetailsMapper.kt

@@ -1,7 +1,7 @@
 package com.gabrielbmoro.moviedb.repository.mappers
 
+import com.gabrielbmoro.moviedb.domain.entities.MovieDetail
 import com.gabrielbmoro.moviedb.repository.datasources.retrofit.responses.MovieDetailResponse
-import com.gabrielbmoro.moviedb.repository.model.MovieDetail
 
 class VideoDetailsMapper {
 

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/mappers/VideoStreamMapper.kt

@@ -1,7 +1,7 @@
 package com.gabrielbmoro.moviedb.repository.mappers
 
+import com.gabrielbmoro.moviedb.domain.entities.VideoStream
 import com.gabrielbmoro.moviedb.repository.datasources.retrofit.responses.VideoStreamsResponse
-import com.gabrielbmoro.moviedb.repository.model.VideoStream
 
 class VideoStreamMapper {
 

src/data/src/test/java/com/gabrielbmoro/moviedb/repository/mappers/FavoriteMovieMapperTest.kt

@@ -1,6 +1,6 @@
 package com.gabrielbmoro.moviedb.repository.mappers
 
-import com.gabrielbmoro.moviedb.repository.model.Movie
+import com.gabrielbmoro.moviedb.domain.entities.Movie
 import com.google.common.truth.Truth
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.junit.Test

src/domain/.gitignore

@@ -0,0 +1 @@
+/build

src/domain/build.gradle.kts

@@ -0,0 +1,21 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    id("android-library-plugin")
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.kover)
+}
+
+android {
+    namespace = "com.gabrielbmoro.moviedb.domain"
+}
+
+dependencies {
+    implementation(libs.paging.compose)
+
+    // Test
+    testImplementation(libs.bundles.test)
+
+    // Koin
+    implementation(platform(libs.koin.bom))
+    implementation(libs.bundles.koin.impl)
+}

src/domain/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

src/domain/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/MoviesRepository.kt → src/domain/src/main/java/com/gabrielbmoro/moviedb/domain/MoviesRepository.kt

@@ -1,10 +1,10 @@
-package com.gabrielbmoro.moviedb.repository
+package com.gabrielbmoro.moviedb.domain
 
 import androidx.paging.PagingData
-import com.gabrielbmoro.moviedb.domain.model.DataOrException
-import com.gabrielbmoro.moviedb.repository.model.Movie
-import com.gabrielbmoro.moviedb.repository.model.MovieDetail
-import com.gabrielbmoro.moviedb.repository.model.VideoStream
+import com.gabrielbmoro.moviedb.domain.entities.DataOrException
+import com.gabrielbmoro.moviedb.domain.entities.Movie
+import com.gabrielbmoro.moviedb.domain.entities.MovieDetail
+import com.gabrielbmoro.moviedb.domain.entities.VideoStream
 import kotlinx.coroutines.flow.Flow
 
 interface MoviesRepository {

src/domain/src/main/java/com/gabrielbmoro/moviedb/domain/di/DomainModule.kt

@@ -0,0 +1,86 @@
+package com.gabrielbmoro.moviedb.domain.di
+
+import com.gabrielbmoro.moviedb.domain.usecases.FavoriteMovieUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.FavoriteMovieUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.GetFavoriteMoviesUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.GetFavoriteMoviesUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.GetMovieDetailsUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.GetMovieDetailsUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.GetNowPlayingMoviesUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.GetNowPlayingMoviesUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.GetPopularMoviesUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.GetPopularMoviesUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.GetTopRatedMoviesUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.GetTopRatedMoviesUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.GetTrailersUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.GetTrailersUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.GetUpcomingMoviesUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.GetUpcomingMoviesUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.IsFavoriteMovieUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.IsFavoriteMovieUseCaseImpl
+import com.gabrielbmoro.moviedb.domain.usecases.SearchMovieUseCase
+import com.gabrielbmoro.moviedb.domain.usecases.SearchMovieUseCaseImpl
+import org.koin.dsl.module
+
+val domainModule = module {
+    factory<FavoriteMovieUseCase> {
+        FavoriteMovieUseCaseImpl(
+            repository = get()
+        )
+    }
+
+    factory<GetFavoriteMoviesUseCase> {
+        GetFavoriteMoviesUseCaseImpl(
+            repository = get()
+        )
+    }
+
+    factory<GetMovieDetailsUseCase> {
+        GetMovieDetailsUseCaseImpl(
+            repository = get(),
+            getTrailersUseCase = get()
+        )
+    }
+
+    factory<GetNowPlayingMoviesUseCase> {
+        GetNowPlayingMoviesUseCaseImpl(
+            repository = get()
+        )
+    }
+
+    factory<GetPopularMoviesUseCase> {
+        GetPopularMoviesUseCaseImpl(
+            repository = get()
+        )
+    }
+
+    factory<GetTopRatedMoviesUseCase> {
+        GetTopRatedMoviesUseCaseImpl(
+            repository = get()
+        )
+    }
+
+    factory<GetTrailersUseCase> {
+        GetTrailersUseCaseImpl(
+            repository = get()
+        )
+    }
+
+    factory<GetUpcomingMoviesUseCase> {
+        GetUpcomingMoviesUseCaseImpl(
+            repository = get()
+        )
+    }
+
+    factory<IsFavoriteMovieUseCase> {
+        IsFavoriteMovieUseCaseImpl(
+            repository = get()
+        )
+    }
+
+    factory<SearchMovieUseCase> {
+        SearchMovieUseCaseImpl(
+            repository = get()
+        )
+    }
+}

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/model/DataOrException.kt → src/domain/src/main/java/com/gabrielbmoro/moviedb/domain/entities/DataOrException.kt

@@ -1,6 +1,6 @@
-package com.gabrielbmoro.moviedb.domain.model
+package com.gabrielbmoro.moviedb.domain.entities
 
 data class DataOrException<T, E : Exception>(
     val data: T? = null,
     val exception: E? = null
-)
+)

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/model/Movie.kt → src/domain/src/main/java/com/gabrielbmoro/moviedb/domain/entities/Movie.kt

@@ -1,4 +1,4 @@
-package com.gabrielbmoro.moviedb.repository.model
+package com.gabrielbmoro.moviedb.domain.entities
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -57,4 +57,4 @@ data class Movie(
             popularity = 1f
         )
     }
-}
+}

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/model/MovieDetail.kt → src/domain/src/main/java/com/gabrielbmoro/moviedb/domain/entities/MovieDetail.kt

@@ -1,4 +1,4 @@
-package com.gabrielbmoro.moviedb.repository.model
+package com.gabrielbmoro.moviedb.domain.entities
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -14,4 +14,4 @@ data class MovieDetail(
     val tagline: String,
     val productionCompanies: List<String>,
     var videoId: String? = null
-) : Parcelable
+) : Parcelable

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/model/MoviesListType.kt → src/domain/src/main/java/com/gabrielbmoro/moviedb/domain/entities/MovieListType.kt

@@ -1,4 +1,4 @@
-package com.gabrielbmoro.moviedb.repository.model
+package com.gabrielbmoro.moviedb.domain.entities
 
 enum class MovieListType(val value: Int) {
     TOP_RATED(TOP_RATED_MOVIES_VALUE),
@@ -13,5 +13,5 @@ const val POPULAR_MOVIES_VALUE = 3
 const val UPCOMING_MOVIES_VALUE = 4
 
 fun Int.convertToMovieListType(): MovieListType? {
-    return MovieListType.values().firstOrNull { it.value == this }
+    return MovieListType.entries.firstOrNull { it.value == this }
 }

src/data/src/main/java/com/gabrielbmoro/moviedb/repository/model/VideoStream.kt → src/domain/src/main/java/com/gabrielbmoro/moviedb/domain/entities/VideoStream.kt

@@ -1,4 +1,4 @@
-package com.gabrielbmoro.moviedb.repository.model
+package com.gabrielbmoro.moviedb.domain.entities
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -45,4 +45,4 @@ data class VideoStream(
             size = 1024
         )
     }
-}
+}