Merge pull request #715 from Cairo-Squad/fix/contiue-as-a-guest

fix/continue as a guest

Author: Al-Qassim

.github/workflows/cd-firebase.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - develop
       - master
+      - fix/contine-as-a-guest
 
 jobs:
   deploy:

app/src/main/java/com/cairosquad/movio/di/DaggerLocalDataSourceModule.kt

@@ -15,6 +15,7 @@ import com.cairosquad.local.cache.series.SeasonEpisodeCacheDao
 import com.cairosquad.local.cache.series.SeasonEpisodeLocalDataSourceImpl
 import com.cairosquad.local.cache.series.SeriesCacheDao
 import com.cairosquad.local.cache.series.SeriesLocalDataSourceImpl
+import com.cairosquad.local.guest.GuestDataSourceImpl
 import com.cairosquad.local.language.LanguageDataStoreSourceImpl
 import com.cairosquad.local.login.LocalAuthenticationDataSourceImpl
 import com.cairosquad.local.login.dao.LoginDao
@@ -26,6 +27,7 @@ import com.cairosquad.local.utils.MovioDataBase
 import com.cairosquad.local.version.VersionDataSourceImpl
 import com.cairosquad.repository.account.data_source.local.AccountLocalDataSource
 import com.cairosquad.repository.artists.data_source.local.ArtistsLocalDataSource
+import com.cairosquad.repository.guest.data_source.local.GuestDataSource
 import com.cairosquad.repository.language.LanguageDataSource
 import com.cairosquad.repository.login.data_source.local.LocalAuthenticationDataSource
 import com.cairosquad.repository.movie.data_source.local.MoviesLocalDataSource
@@ -153,6 +155,14 @@ object LocalDataSourceModule {
         context = context
     )
 
+    @Provides
+    @Singleton
+    fun provideGuestDataSource(
+        @ApplicationContext context: Context
+    ): GuestDataSource = GuestDataSourceImpl(
+        context = context
+    )
+
     @Provides
     @Singleton
     fun provideAccountLocalDataSource(

app/src/main/java/com/cairosquad/movio/di/DaggerRepositoryModule.kt

@@ -2,6 +2,7 @@ package com.cairosquad.movio.di
 
 import com.cairosquad.domain.repository.AccountRepository
 import com.cairosquad.domain.repository.ArtistsRepository
+import com.cairosquad.domain.repository.GuestRepository
 import com.cairosquad.domain.repository.LanguageRepository
 import com.cairosquad.domain.repository.LoginRepository
 import com.cairosquad.domain.repository.MoviesRepository
@@ -13,6 +14,7 @@ import com.cairosquad.domain.repository.ThemeRepository
 import com.cairosquad.domain.repository.VersionRepository
 import com.cairosquad.repository.account.AccountRepositoryImpl
 import com.cairosquad.repository.artists.ArtistsRepositoryImpl
+import com.cairosquad.repository.guest.GuestRepositoryImpl
 import com.cairosquad.repository.language.LanguageRepositoryImpl
 import com.cairosquad.repository.login.LoginRepositoryImpl
 import com.cairosquad.repository.movie.MovieRepositoryImpl
@@ -74,6 +76,12 @@ abstract class RepositoryModule {
         impl: OnboardingRepositoryImpl
     ): OnboardingRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindGuestRepository(
+        impl: GuestRepositoryImpl
+    ): GuestRepository
+
     @Binds
     @Singleton
     abstract fun bindAccountRepository(

domain/src/main/java/com/cairosquad/domain/repository/GuestRepository.kt

@@ -0,0 +1,6 @@
+package com.cairosquad.domain.repository
+
+interface GuestRepository {
+    suspend fun setGuestState(enteredAsGuest: Boolean)
+    suspend fun getGuestState(): Boolean
+}

domain/src/main/java/com/cairosquad/domain/usecase/GuestUseCase.kt

@@ -0,0 +1,15 @@
+package com.cairosquad.domain.usecase
+
+import com.cairosquad.domain.repository.GuestRepository
+import javax.inject.Inject
+
+class ManageGuestUseCase @Inject constructor(
+    private val guestRepository: GuestRepository
+) {
+    suspend fun setGuestState(enteredAsGuest: Boolean) {
+        guestRepository.setGuestState(enteredAsGuest)
+    }
+    suspend fun getGuestState(): Boolean {
+        return guestRepository.getGuestState()
+    }
+}

local/src/main/java/com/cairosquad/local/data_store/DataStoreConstants.kt

@@ -1,5 +1,6 @@
 package com.cairosquad.local.data_store
 
 object DataStoreConstants {
-    const val ONBOARDING_STATE = "onboarding_state"
+    const val ONBOARDING_STATE = "ONBOARDING_STATE"
+    const val GUEST_STATE = "GUEST_STATE"
 }

local/src/main/java/com/cairosquad/local/guest/GuestDataSourceImpl.kt

@@ -0,0 +1,28 @@
+package com.cairosquad.local.guest
+
+import android.content.Context
+import com.cairosquad.local.data_store.DataStoreConstants
+import com.cairosquad.local.data_store.MovioDataStore
+import com.cairosquad.repository.guest.data_source.local.GuestDataSource
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class GuestDataSourceImpl @Inject constructor(
+    @ApplicationContext private val context: Context
+) : GuestDataSource {
+    override suspend fun setGuestState(enteredAsGuest: Boolean) {
+        MovioDataStore.setPrefValue(
+            context = context,
+            key = DataStoreConstants.GUEST_STATE,
+            value = enteredAsGuest
+        )
+    }
+
+    override suspend fun getGuestState(): Boolean {
+        return MovioDataStore.getPrefValue(
+            context = context,
+            key = DataStoreConstants.GUEST_STATE,
+            defaultValue = false
+        ) as Boolean
+    }
+}

repository/src/main/java/com/cairosquad/repository/guest/GuestRepositoryImpl.kt

@@ -0,0 +1,17 @@
+package com.cairosquad.repository.guest
+
+import com.cairosquad.domain.repository.GuestRepository
+import com.cairosquad.repository.guest.data_source.local.GuestDataSource
+import javax.inject.Inject
+
+class GuestRepositoryImpl @Inject constructor(
+    private val dataSource: GuestDataSource
+) : GuestRepository {
+    override suspend fun setGuestState(enteredAsGuest: Boolean) {
+        dataSource.setGuestState(enteredAsGuest)
+    }
+
+    override suspend fun getGuestState(): Boolean {
+        return dataSource.getGuestState()
+    }
+}

repository/src/main/java/com/cairosquad/repository/guest/data_source/local/OnboardingDataSource.kt

@@ -0,0 +1,6 @@
+package com.cairosquad.repository.guest.data_source.local
+
+interface GuestDataSource {
+    suspend fun setGuestState(enteredAsGuest: Boolean)
+    suspend fun getGuestState(): Boolean
+}

ui/src/main/java/com/cairosquad/ui/AppScreen.kt

@@ -17,11 +17,10 @@ import com.cairosquad.ui.home.HomeScreen
 import com.cairosquad.ui.library.LibraryScreen
 import com.cairosquad.ui.more.MoreScreen
 import com.cairosquad.ui.navigation.LocalNavController
-import com.cairosquad.ui.navigation.LoginRoute
 import com.cairosquad.ui.search.SearchScreen
 
 @Composable
-fun AppScreen(isUserLoggedIn: Boolean) {
+fun AppScreen() {
     val navigationItems = remember {
         listOf(
             BottomNavItem(
@@ -71,23 +70,11 @@ fun AppScreen(isUserLoggedIn: Boolean) {
         isNavBarVisible = isNavBarVisible,
         content = {
             when (selectedScreenIndex) {
-                0 -> HomeScreen(navigateToProfile = {
-                    if (isUserLoggedIn) {
-                        selectedScreenIndex = 3
-                    } else {
-                        navController.navigate(LoginRoute)
-                    }
-                })
+                0 -> HomeScreen(navigateToProfile = { selectedScreenIndex = 3 })
                 1 -> SearchScreen()
                 2 -> LibraryScreen()
                 3 -> MoreScreen(setNavBarVisibility = { isNavBarVisible = it })
-                else -> HomeScreen(navigateToProfile = {
-                    if (isUserLoggedIn) {
-                        selectedScreenIndex = 3
-                    } else {
-                        navController.navigate(LoginRoute)
-                    }
-                })
+                else -> HomeScreen(navigateToProfile = { selectedScreenIndex = 3 })
             }
         })
 }