Refactor/presentation

app/build.gradle.kts

@@ -117,6 +117,7 @@ dependencies {
     implementation("com.google.firebase:firebase-analytics")
     implementation(platform("com.google.firebase:firebase-bom:33.16.0"))
     implementation("com.google.firebase:firebase-crashlytics-ndk")
+    implementation(libs.firebase.crashlytics.buildtools)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app/src/main/java/com/madrid/movio/app.kt

@@ -1,11 +1,10 @@
 package com.madrid.movio
 
 
-import com.madrid.data.dataSource.local.SearchLocalDataSource
-import com.madrid.data.dataSource.remote.search.SearchRemoteSourceImpl
-import com.madrid.data.repositories.SearchLocalSource
-import com.madrid.data.repositories.SearchRemoteSource
+import com.madrid.data.dataSource.local.MovioDatabase
 import com.madrid.data.repositories.SearchRepositoryImpl
+import com.madrid.data.repositories.local.LocalDataSource
+import com.madrid.data.repositories.local.LocalDataSourceImpl
 import com.madrid.detectImageContent.GetImageBitmap
 import com.madrid.detectImageContent.SensitiveContentDetection
 import com.madrid.domain.repository.SearchRepository
@@ -15,6 +14,7 @@ import com.madrid.domain.usecase.searchUseCase.PreferredMediaUseCase
 import com.madrid.domain.usecase.searchUseCase.RecentSearchUseCase
 import com.madrid.domain.usecase.searchUseCase.TrendingMediaUseCase
 import com.madrid.presentation.screens.searchScreen.viewModel.SearchViewModel
+import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
@@ -23,8 +23,11 @@ val app = module {
 
     // data
     single<SearchRepository> { SearchRepositoryImpl(get(), get()) }
-    single<SearchLocalSource> { SearchLocalDataSource(get()) }
-    single<SearchRemoteSource> { SearchRemoteSourceImpl() }
+    single<LocalDataSource> { LocalDataSourceImpl(get()) }
+
+
+    single { MovioDatabase.getInstance(androidContext()) }
+
 
     // presentation
     viewModel {
@@ -40,7 +43,7 @@ val app = module {
     //domain
     single { ArtistUseCase(get()) }
     single { MediaUseCase(get()) }
-    single{ PreferredMediaUseCase(get()) }
+    single { PreferredMediaUseCase(get()) }
     single { RecentSearchUseCase(get()) }
     single { TrendingMediaUseCase(get()) }
     // detectImageContent

app/src/main/java/com/madrid/movio/data.kt

@@ -0,0 +1,2 @@
+package com.madrid.movio
+

data/src/main/java/com/madrid/data/dataSource/remote/movies/MovieApiImpl.kt → data/src/main/java/com/madrid/data/CustomHttpClient.kt

@@ -1,4 +1,4 @@
-package com.madrid.data.dataSource.remote.movies
+package com.madrid.data
 
 import com.madrid.data.BuildConfig.API_KEY
 import com.madrid.data.BuildConfig.BASE_URL
@@ -10,33 +10,29 @@ import io.ktor.client.plugins.defaultRequest
 import io.ktor.client.request.get
 import io.ktor.client.request.header
 import io.ktor.client.statement.HttpResponse
-import io.ktor.client.statement.bodyAsText
+import io.ktor.http.URLBuilder
 import io.ktor.http.URLProtocol.Companion.HTTPS
-import io.ktor.http.encodedPath
-import kotlinx.serialization.json.Json
 
-class MoviesApiImpl() : MoviesApi {
+class CustomHttpClient {
+    suspend fun buildHttpClient(
+        urlBuilder: URLBuilder.() -> Unit
+    ): HttpResponse {
+        return HttpClient(CIO) {
+            defaultRequest {
+                header("accept", "application/json")
 
-    private val client = HttpClient(CIO) {
-        defaultRequest {
-            header("accept", "application/json")
-        }
-    }
-    val json = Json {
-        ignoreUnknownKeys = true
-    }
-
-    override suspend fun getTopRatedMovies(language: String, page: Int): HttpResponse {
-        val result = client.get {
+            }
+        }.get {
             url {
                 protocol = HTTPS
                 host = BASE_URL
-                encodedPath = "movie/top_rated"
+                parameters.append("language", "en-US")
                 parameters.append(PAGE, "1")
                 parameters.append(KEY, API_KEY)
+                apply(urlBuilder)
             }
         }
-        return json.decodeFromString<HttpResponse>(result.bodyAsText())
+
     }
-}
 
+}

data/src/main/java/com/madrid/data/DiModule.kt

@@ -1,9 +1,24 @@
 package com.madrid.data
 
-import android.app.Application
-import androidx.room.Room
+import com.madrid.data.dataSource.remote.utils.Constants.PAGE
+import com.madrid.data.repositories.remote.RemoteDataSource
+import com.madrid.data.repositories.remote.RemoteDataSourceImpl
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.engine.cio.CIO
+import io.ktor.client.engine.cio.CIOEngineConfig
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.defaultRequest
+import io.ktor.client.request.header
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.json.Json
 import org.koin.dsl.module
 
 val roomModule = module {
-
-} 
+    single<RemoteDataSource> { RemoteDataSourceImpl(get(), get()) }
+    single { Json { ignoreUnknownKeys = true } }
+    single { CustomHttpClient() }
+    single<HttpClientEngine> { CIO.create() }
+    single<HttpClientConfig<CIOEngineConfig>> { HttpClientConfig() }
+}

data/src/main/java/com/madrid/data/dataSource/local/MovioDatabase.kt

@@ -7,18 +7,21 @@ import androidx.room.RoomDatabase
 import com.madrid.data.dataSource.local.dao.ArtistDao
 import com.madrid.data.dataSource.local.dao.CategoryDao
 import com.madrid.data.dataSource.local.dao.MovieDao
+import com.madrid.data.dataSource.local.dao.RecentSearchDao
 import com.madrid.data.dataSource.local.dao.SeriesDao
 import com.madrid.data.dataSource.local.entity.ArtistEntity
 import com.madrid.data.dataSource.local.entity.MovieCategoryEntity
 import com.madrid.data.dataSource.local.entity.MovieEntity
 import com.madrid.data.dataSource.local.entity.SeriesEntity
+import com.madrid.data.dataSource.local.entity.RecentSearchEntity
 
 @Database(
     entities = [
         MovieEntity::class,
         SeriesEntity::class,
         MovieCategoryEntity::class,
-        ArtistEntity::class
+        ArtistEntity::class,
+        RecentSearchEntity::class
     ],
     version = 1
 )
@@ -28,6 +31,7 @@ abstract class MovioDatabase : RoomDatabase() {
     abstract fun seriesDao(): SeriesDao
     abstract fun movieCategoryDao(): CategoryDao
     abstract fun artistDao(): ArtistDao
+    abstract fun recentSearchDao(): RecentSearchDao
 
     companion object {
         const val DATABASE_NAME = "MOVIO_DATABASE"

data/src/main/java/com/madrid/data/dataSource/local/dao/ArtistDao.kt

@@ -5,8 +5,6 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
 import com.madrid.data.dataSource.local.entity.ArtistEntity
-import com.madrid.data.dataSource.local.entity.MovieEntity
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface ArtistDao {
@@ -18,13 +16,13 @@ interface ArtistDao {
     suspend fun deleteArtist(artist: ArtistEntity)
 
     @Query("SELECT * FROM ARTIST_TABLE WHERE id = :id")
-    fun getArtistById(id: Int): Flow<ArtistEntity?>
+    fun getArtistById(id: Int): ArtistEntity?
 
     @Query("SELECT * FROM ARTIST_TABLE WHERE name LIKE :name")
-    fun getArtistByName(name: String): Flow<List<ArtistEntity>>
+    fun getArtistByName(name: String): List<ArtistEntity>
 
     @Query("SELECT * FROM ARTIST_TABLE")
-    fun getAllArtists(): Flow<List<ArtistEntity>>
+    fun getAllArtists(): List<ArtistEntity>
 
     @Query("DELETE FROM ARTIST_TABLE")
     suspend fun deleteAllArtists()

data/src/main/java/com/madrid/data/dataSource/local/dao/CategoryDao.kt

@@ -6,7 +6,6 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.madrid.data.dataSource.local.entity.MovieCategoryEntity
-import kotlinx.coroutines.flow.Flow
 
 
 @Dao
@@ -19,17 +18,17 @@ interface CategoryDao {
     suspend fun deleteCategory(category: MovieCategoryEntity)
 
     @Query("SELECT * FROM CATEGORY_TABLE WHERE id = :id")
-    fun getCategoryById(id: Int): Flow<MovieCategoryEntity?>
+    fun getCategoryById(id: Int): MovieCategoryEntity?
 
     @Query("SELECT * FROM CATEGORY_TABLE WHERE title = :title")
-    fun getCategoryByTitle(title: String): Flow<List<MovieCategoryEntity>>
+    fun getCategoryByTitle(title: String): List<MovieCategoryEntity>
 
     @Query("SELECT * FROM CATEGORY_TABLE")
-    fun getAllCategories(): Flow<List<MovieCategoryEntity>>
+    fun getAllCategories(): List<MovieCategoryEntity>
 
     // descending order by searchCount
     @Query("SELECT * FROM CATEGORY_TABLE ORDER BY searchCount DESC")
-    fun getAllCategoriesBySearchCount(): Flow<List<MovieCategoryEntity>>
+    fun getAllCategoriesBySearchCount(): List<MovieCategoryEntity>
 
     @Query("DELETE FROM CATEGORY_TABLE")
     suspend fun deleteAllCategories()

data/src/main/java/com/madrid/data/dataSource/local/dao/MovieDao.kt

@@ -7,7 +7,6 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.madrid.data.dataSource.local.entity.MovieEntity
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface MovieDao {
@@ -22,16 +21,16 @@ interface MovieDao {
     suspend fun updateMovie(movie: MovieEntity)
 
     @Query("SELECT * FROM MOVIE_TABLE WHERE id = :id")
-    fun getMovieById(id: Int): Flow<MovieEntity?>
+    fun getMovieById(id: Int): MovieEntity?
 
     @Query("SELECT * FROM MOVIE_TABLE WHERE title LIKE :title")
-    fun getMovieByTitle(title: String): Flow<List<MovieEntity>>
+    fun getMovieByTitle(title: String): List<MovieEntity>
 
     @Query("SELECT * FROM MOVIE_TABLE ORDER BY rate DESC")
-    fun getTopRatedMovies(): Flow<List<MovieEntity>>
+    fun getTopRatedMovies(): List<MovieEntity>
 
     @Query("SELECT * FROM MOVIE_TABLE")
-    fun getAllMovies(): Flow<List<MovieEntity>>
+    fun getAllMovies(): List<MovieEntity>
 
     @Query("DELETE FROM MOVIE_TABLE")
     suspend fun deleteAllMovies()

data/src/main/java/com/madrid/data/dataSource/local/dao/RecentSearchDao.kt

@@ -0,0 +1,22 @@
+package com.madrid.data.dataSource.local.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.madrid.data.dataSource.local.entity.RecentSearchEntity
+
+@Dao
+interface RecentSearchDao {
+     @Insert(onConflict = OnConflictStrategy.REPLACE)
+     suspend fun addRecentSearch(query: RecentSearchEntity)
+
+     @Query("SELECT * FROM RECENT_TABLE")
+     fun getRecentSearches(): List<RecentSearchEntity>
+
+     @Query("DELETE FROM RECENT_TABLE WHERE searchQuery = :query")
+     suspend fun removeRecentSearch(query: String)
+
+     @Query("DELETE FROM RECENT_TABLE")
+     suspend fun clearAllRecentSearches()
+}

data/src/main/java/com/madrid/data/dataSource/local/dao/SeriesDao.kt

@@ -5,9 +5,7 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.madrid.data.dataSource.local.entity.MovieEntity
 import com.madrid.data.dataSource.local.entity.SeriesEntity
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface SeriesDao {
@@ -22,10 +20,13 @@ interface SeriesDao {
     fun getSeriesById(id: Int): SeriesEntity?
 
     @Query("SELECT * FROM SERIES_TABLE WHERE title LIKE :title")
-    fun getSeriesByTitle(title: String): Flow<List<SeriesEntity>>
+    fun getSeriesByTitle(title: String): List<SeriesEntity>
+
+    @Query("SELECT * FROM SERIES_TABLE ORDER BY rate DESC")
+    fun getTopRatedSeries(): List<SeriesEntity>
 
     @Query("SELECT * FROM SERIES_TABLE")
-    fun getAllSeries(): Flow<List<SeriesEntity>>
+    fun getAllSeries(): List<SeriesEntity>
 
     @Query("DELETE FROM SERIES_TABLE")
     suspend fun deleteAllSeries()

data/src/main/java/com/madrid/data/dataSource/local/entity/RecentSearchEntity.kt

@@ -0,0 +1,11 @@
+package com.madrid.data.dataSource.local.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+
+@Entity(tableName = "RECENT_TABLE")
+data class RecentSearchEntity(
+    @PrimaryKey(autoGenerate = false) val searchQuery: String,
+    val timestamp: Long = System.currentTimeMillis()
+)