Merge pull request #74 from CodandoTV/feature/20-mecanismo-de-favoritar

rodrigoliveirac · web-flow · commit 51ffa842d48e · 2023-09-13T21:44:05.000-03:00
[ISSUE - 20] feat - Mecanismo de favoritar
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -6,11 +6,13 @@ plugins {
 
 dependencies {
 
+    implementation(projects.featureFavorites)
     implementation(projects.featureListStreams)
     implementation(projects.coreShared)
     implementation(projects.coreSharedUi)
     implementation(projects.coreNavigation)
     implementation(projects.coreNetworking)
+    implementation(projects.coreLocalStorage)
 
     implementation(platform(libs.compose.bom))
     androidTestImplementation(platform(libs.compose.bom))
diff --git a/app/src/main/java/com/codandotv/streamplayerapp/di/AppModule.kt b/app/src/main/java/com/codandotv/streamplayerapp/di/AppModule.kt
@@ -1,17 +1,17 @@
 package com.codandotv.streamplayerapp.di
 
 import android.content.res.Resources
+import com.codandotv.streamplayerapp.core_local_storage.di.LocalStorageModule
 import com.codandotv.streamplayerapp.core_networking.di.NetworkModule
 import com.codandotv.streamplayerapp.core_shared.qualifier.QualifierDispatcherIO
 import kotlinx.coroutines.Dispatchers
 import org.koin.android.ext.koin.androidContext
-import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 object AppModule {
     private val module = module {
         single<Resources> { androidContext().resources }
         single(QualifierDispatcherIO) { Dispatchers.IO }
     }
-    val list  = module + NetworkModule.module
+    val list  = module + NetworkModule.module + LocalStorageModule.module
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.ksp) apply false
 }
 
 tasks.register("clean", Delete::class) {
diff --git a/core-local-storage/.gitignore b/core-local-storage/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/core-local-storage/build.gradle.kts b/core-local-storage/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    id("com.streamplayer.android-library")
+    id("com.google.devtools.ksp")
+}
+
+dependencies {
+
+    ksp(libs.roomCompiler)
+    implementation(libs.bundles.room)
+    implementation(libs.bundles.kotlin)
+    implementation(libs.bundles.koin)
+    testImplementation(libs.bundles.test)
+}
diff --git a/core-local-storage/consumer-rules.pro b/core-local-storage/consumer-rules.pro
diff --git a/core-local-storage/proguard-rules.pro b/core-local-storage/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
diff --git a/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt b/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt
@@ -0,0 +1,20 @@
+package com.codandotv.streamplayerapp.core_local_storage.data.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.codandotv.streamplayerapp.core_local_storage.domain.model.MovieEntity
+
+@Dao
+interface FavoriteDao {
+
+    @Query("SELECT * FROM movie")
+    suspend fun fetchAll(): List<MovieEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(favoriteMovie: MovieEntity)
+
+    @Query("""DELETE FROM movie WHERE id = :favoriteMovie""")
+    suspend fun delete(favoriteMovie: String)
+}
diff --git a/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/data/database/StreamPlayerAppDatabase.kt b/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/data/database/StreamPlayerAppDatabase.kt
@@ -0,0 +1,34 @@
+package com.codandotv.streamplayerapp.core_local_storage.data.database
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import com.codandotv.streamplayerapp.core_local_storage.data.dao.FavoriteDao
+import com.codandotv.streamplayerapp.core_local_storage.domain.model.MovieEntity
+
+@Database(entities = [MovieEntity::class], version = 1)
+abstract class StreamPlayerAppDatabase : RoomDatabase() {
+
+    abstract fun favoriteDao(): FavoriteDao
+
+    companion object {
+
+        private var instance: StreamPlayerAppDatabase? = null
+
+        fun getInstance(context: Context): StreamPlayerAppDatabase {
+            if (instance == null) {
+                synchronized(this) {
+                    instance = Room.databaseBuilder(
+                        context.applicationContext,
+                        StreamPlayerAppDatabase::class.java,
+                        DATABASE_NAME
+                    ).build()
+                }
+            }
+            return instance!!
+        }
+
+        const val DATABASE_NAME = "app-database.db"
+    }
+}
diff --git a/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt b/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt
@@ -0,0 +1,15 @@
+package com.codandotv.streamplayerapp.core_local_storage.di
+
+import androidx.room.Room
+import com.codandotv.streamplayerapp.core_local_storage.data.database.StreamPlayerAppDatabase
+import com.codandotv.streamplayerapp.core_local_storage.data.database.StreamPlayerAppDatabase.Companion.DATABASE_NAME
+import org.koin.android.ext.koin.androidContext
+import org.koin.dsl.module
+
+object LocalStorageModule {
+    val module = module {
+        single { Room.databaseBuilder(androidContext(), StreamPlayerAppDatabase::class.java, DATABASE_NAME).build() }
+        single { StreamPlayerAppDatabase.getInstance(get()) }
+        single { get<StreamPlayerAppDatabase>().favoriteDao() }
+    }
+}
diff --git a/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt b/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt
@@ -0,0 +1,15 @@
+package com.codandotv.streamplayerapp.core_local_storage.domain.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "movie")
+data class MovieEntity(
+    @PrimaryKey val id: String,
+    @ColumnInfo("title") val title: String,
+    @ColumnInfo("overview") val overview: String,
+    @ColumnInfo("tagline") val tagline: String,
+    @ColumnInfo("url") val url: String,
+    @ColumnInfo("release_year")val releaseYear: String
+)
diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt b/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt
@@ -1,5 +1,6 @@
 package com.codandotv.streamplayerapp.core_shared_ui.widget
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -17,16 +18,17 @@ import androidx.compose.ui.unit.sp
 
 @Composable
 fun IconWithText(
+    onClick: () -> Unit,
     imageVector: ImageVector,
     imageColor: Color,
     text: String,
     textColor: Color,
     modifier: Modifier = Modifier
 ) {
+
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier
-    ) {
+        modifier = modifier.clickable { onClick() } ) {
         Icon(
             imageVector = imageVector,
             contentDescription = null,
diff --git a/feature-favorites/.gitignore b/feature-favorites/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/feature-favorites/build.gradle.kts b/feature-favorites/build.gradle.kts
@@ -0,0 +1,19 @@
+@file:Suppress("UnstableApiUsage")
+plugins {
+    id("com.streamplayer.android-library")
+    id("com.streamplayer.compose")
+}
+
+dependencies {
+    implementation(projects.coreNetworking)
+    implementation(projects.coreNavigation)
+    implementation(projects.coreShared)
+    implementation(projects.coreSharedUi)
+
+    implementation(libs.bundles.koin)
+    implementation(libs.bundles.networking)
+    implementation(libs.bundles.androidSupport)
+    implementation(libs.coil)
+
+    testImplementation(libs.bundles.test)
+}
diff --git a/feature-favorites/consumer-rules.pro b/feature-favorites/consumer-rules.pro
diff --git a/feature-favorites/proguard-rules.pro b/feature-favorites/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
diff --git a/feature-list-streams/build.gradle.kts b/feature-list-streams/build.gradle.kts
@@ -10,9 +10,11 @@ dependencies {
     implementation(projects.coreNavigation)
     implementation(projects.coreShared)
     implementation(projects.coreSharedUi)
+    implementation(projects.coreLocalStorage)
 
     implementation(libs.bundles.koin)
     implementation(libs.bundles.networking)
+    implementation(libs.roomRuntime)
     implementation(libs.bundles.androidSupport)
     implementation(libs.coil)
 
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/data/DetailStreamRepository.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/data/DetailStreamRepository.kt
@@ -1,9 +1,11 @@
 package com.codandotv.streamplayerapp.feature_list_streams.detail.data
 
+import com.codandotv.streamplayerapp.core_local_storage.data.dao.FavoriteDao
 import com.codandotv.streamplayerapp.core_networking.handleError.toFlow
 import com.codandotv.streamplayerapp.feature_list_streams.detail.domain.DetailStream
 import com.codandotv.streamplayerapp.feature_list_streams.detail.domain.VideoStream
 import com.codandotv.streamplayerapp.feature_list_streams.detail.domain.toDetailStream
+import com.codandotv.streamplayerapp.feature_list_streams.detail.domain.toDetailStreamLocal
 import com.codandotv.streamplayerapp.feature_list_streams.detail.domain.toVideoStreams
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -12,22 +14,33 @@ import kotlinx.coroutines.flow.map
 
 interface DetailStreamRepository {
     suspend fun getMovie(): Flow<DetailStream>
-
+    suspend fun deleteFromMyList(movie: String)
+    suspend fun insertToMyList(movie: DetailStream)
+    suspend fun isFavorite(movieId:String) : Boolean
     suspend fun getVideoStreams(): Flow<List<VideoStream>>
 }
 
 class DetailStreamRepositoryImpl(
     private val movieId: String,
+    private val service: DetailStreamService,
+    private val favoriteDao: FavoriteDao
     private val service: DetailStreamService
 ) : DetailStreamRepository {
 
     override suspend fun getMovie(): Flow<DetailStream> =
         service.getMovie(movieId)
             .toFlow()
             .map {
-                it.toDetailStream()
+                it.toDetailStream(isFavorite(movieId))
             }
 
+
+    override suspend fun deleteFromMyList(movie: String) = favoriteDao.delete(movie)
+
+    override suspend fun insertToMyList(movie: DetailStream) = favoriteDao.insert(movie.toDetailStreamLocal())
+
+    override suspend fun isFavorite(movieId: String) : Boolean = favoriteDao.fetchAll().any { movie -> movie.id == movieId }
+    
     override suspend fun getVideoStreams(): Flow<List<VideoStream>> =
         service.getVideoStreams(movieId)
             .toFlow()
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/di/DetailStreamModule.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/di/DetailStreamModule.kt
@@ -41,6 +41,7 @@ object DetailStreamModule {
         }
         factory<DetailStreamRepository> { (id: String) ->
             DetailStreamRepositoryImpl(
+                favoriteDao = get(),
                 service = get(),
                 movieId = id,
             )
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/DetailStream.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/DetailStream.kt
@@ -6,5 +6,6 @@ data class DetailStream(
     val overview : String,
     val tagline : String,
     val url : String,
-    val releaseYear : String
+    val releaseYear : String,
+    val isFavorite: Boolean
 )
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/DetailStreamMapper.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/DetailStreamMapper.kt
@@ -1,17 +1,29 @@
 package com.codandotv.streamplayerapp.feature_list_streams.detail.domain
 
+import com.codandotv.streamplayerapp.core_local_storage.domain.model.MovieEntity
 import com.codandotv.streamplayerapp.core_networking.Url.IMAGE_URL_SIZE_500
 import com.codandotv.streamplayerapp.feature_list_streams.detail.data.model.DetailStreamResponse
 import com.codandotv.streamplayerapp.feature_list_streams.detail.data.model.VideoStreamsResponse
 
-fun DetailStreamResponse.toDetailStream(): DetailStream =
+fun DetailStreamResponse.toDetailStream(isFavorite: Boolean = false): DetailStream =
     DetailStream(
         id = this.id,
         title = this.title,
         overview = this.overview,
         tagline = this.tagline,
         url = "$IMAGE_URL_SIZE_500${this.backdrop_path}",
-        releaseYear = this.release_date.substring(0, 4)
+        releaseYear = this.release_date.substring(0, 4),
+        isFavorite = isFavorite
+    )
+
+fun DetailStream.toDetailStreamLocal(): MovieEntity =
+    MovieEntity(
+        id = this.id,
+        title = this.title,
+        overview = this.overview,
+        tagline = this.tagline,
+        url = this.url,
+        releaseYear = this.releaseYear,
     )
 
 fun VideoStreamsResponse.toVideoStreams(): List<VideoStream> =
@@ -20,4 +32,4 @@ fun VideoStreamsResponse.toVideoStreams(): List<VideoStream> =
             videoId = it.key,
             movieId = this.id
         )
-    }
+    }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/DetailStreamUseCase.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/DetailStreamUseCase.kt
@@ -5,6 +5,8 @@ import kotlinx.coroutines.flow.Flow
 
 interface DetailStreamUseCase {
     suspend fun getMovie(): Flow<DetailStream>
+
+    suspend fun toggleItemInFavorites(movie: DetailStream)
 }
 
 class DetailStreamUseCaseImpl(
@@ -13,4 +15,12 @@ class DetailStreamUseCaseImpl(
 
     override suspend fun getMovie(): Flow<DetailStream> =
         detailStreamRepository.getMovie()
+
+    override suspend fun toggleItemInFavorites(movie: DetailStream) {
+        if (detailStreamRepository.isFavorite(movie.id)) {
+            detailStreamRepository.deleteFromMyList(movie.id)
+        } else {
+            detailStreamRepository.insertToMyList(movie)
+        }
+    }
 }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamViewModel.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamViewModel.kt
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamsScreen.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamsScreen.kt
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/widget/DetailStreamActionOption.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/widget/DetailStreamActionOption.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ plugins {`
`5`	`5`	`alias(libs.plugins.android.application) apply false`
`6`	`6`	`alias(libs.plugins.android.library) apply false`
`7`	`7`	`alias(libs.plugins.kotlin.android) apply false`
	`8`	`+ alias(libs.plugins.ksp) apply false`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`tasks.register("clean", Delete::class) {`