Feat/profile sign out

.gitignore

@@ -46,6 +46,7 @@
 .idea/jsLibraryMappings.xml
 .idea/libraries
 .idea/libraries/
+.idea/codeStyles/
 .idea/misc.xml
 .idea/modules.xml
 .idea/mongoSettings.xml

app/src/main/java/com/fightpandemics/ui/MainActivity.kt

@@ -19,6 +19,8 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.ui.setupActionBarWithNavController
 import com.fightpandemics.R
+import com.fightpandemics.core.utils.getBooleanPreference
+import com.fightpandemics.core.utils.removePreference
 import com.fightpandemics.utils.setupWithNavController
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.button.MaterialButton
@@ -53,6 +55,7 @@ class MainActivity : AppCompatActivity(), NavController.OnDestinationChangedList
             setupBottomNavigationBar()
         } // Else, need to wait for onRestoreInstanceState
         setUpBottomNavigationAndFab()
+        checkThatUserSignedInFromProfile()
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle) {
@@ -100,14 +103,19 @@ class MainActivity : AppCompatActivity(), NavController.OnDestinationChangedList
         arguments: Bundle?,
     ) {
         when (destination.id) {
-            R.id.homeFragment, R.id.searchFragment,
-            R.id.inboxFragment, R.id.profileFragment,
+            R.id.homeFragment
             -> {
                 showBottomBar(destination)
                 dot.visibility = View.VISIBLE
                 fab.show()
             }
-            R.id.filterFragment, R.id.createPostFragment, R.id.settingFragment -> hideBottomBar()
+            R.id.searchFragment, R.id.inboxFragment, R.id.profileFragment, R.id.indivProfileSettings, R.id.profileSignedOutFragment
+            -> {
+                showBottomBar(destination)
+                dot.visibility = View.VISIBLE
+                fab.hide()
+            }
+            R.id.filterFragment, R.id.createPostFragment, R.id.settingFragment, R.id.onboardFragment -> hideBottomBar()
         }
     }
 
@@ -248,4 +256,18 @@ class MainActivity : AppCompatActivity(), NavController.OnDestinationChangedList
         }
         dot.layoutParams = layoutParams
     }
+
+    private fun checkThatUserSignedInFromProfile() {
+        val isUserSignedInFromProfile = getBooleanPreference(applicationContext, "isUserSignedInFromProfile", false)
+        val isUserSignedUpFromProfile = getBooleanPreference(applicationContext, "isUserSignedUpFromProfile", false)
+        if (isUserSignedInFromProfile || isUserSignedUpFromProfile) {
+            bottomNavigationView.selectedItemId = R.id.nav_profile
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        removePreference(applicationContext, "isUserSignedInFromProfile")
+        removePreference(applicationContext, "isUserSignedUpFromProfile")
+    }
 }

app/src/main/res/navigation/nav_profile.xml

@@ -32,6 +32,11 @@
             android:id="@+id/action_profileFragment_to_settingFragment"
             app:destination="@id/settingFragment"
             app:launchSingleTop="true"/>
+        <action
+            android:id="@+id/action_profileFragment_to_profileSignedOutFragment"
+            app:popUpTo="@id/profileFragment"
+            app:popUpToInclusive="false"
+            app:destination="@id/profileSignedOutFragment" />
     </fragment>
 
     <include app:graph="@navigation/nav_create_post" />
@@ -151,4 +156,29 @@
     </fragment>
 
     <include app:graph="@navigation/nav_splash_onboard" />
+
+    <fragment
+        android:id="@+id/profileSignedOutFragment"
+        android:name="com.fightpandemics.profile.ui.profile.ProfileSignedOutFragment"
+        app:moduleName="Fight_Pandemics.profile"
+        android:label="Profile"
+        tools:layout="@layout/profile_signed_out_fragment">
+
+        <action
+            android:id="@+id/action_profileSignedOutFragment_to_signInFragment"
+            app:destination="@id/nav_sign_in"/>
+
+        <action
+            android:id="@+id/action_profileSignedOutFragment_to_signUpFragment"
+            app:destination="@id/nav_sign_up"/>
+
+        <action
+            android:id="@+id/action_profileSignedOutFragment_to_indivProfileSettings"
+            app:destination="@id/indivProfileSettings" />
+
+    </fragment>
+
+    <include app:graph="@navigation/nav_sign_in" />
+
+    <include app:graph="@navigation/nav_sign_up" />
 </navigation>

core/build.gradle

@@ -64,6 +64,9 @@ dependencies {
     // Location
     implementation 'com.google.android.gms:play-services-location:17.1.0'
 
+    // Shared Preference
+    implementation 'androidx.preference:preference:1.1.1'
+
 }
 repositories {
     mavenCentral()

core/src/main/java/com/fightpandemics/core/data/api/FightPandemicsAPI.kt

@@ -95,7 +95,7 @@ interface FightPandemicsAPI {
 
     // Profile API calls
     @GET("api/users/current")
-    suspend fun getCurrentUser(): IndividualProfileResponse
+    suspend fun getCurrentUser(): Response<IndividualProfileResponse>
 
     @PATCH("api/users/current")
     suspend fun updateCurrentUserProfile(

core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSource.kt

@@ -8,7 +8,7 @@ import retrofit2.Response
 
 interface ProfileRemoteDataSource {
 
-    suspend fun fetchCurrentUser(): IndividualProfileResponse
+    suspend fun fetchCurrentUser(): Response<IndividualProfileResponse>
 
     suspend fun updateCurrentUser(patchIndividualProfileRequest: PatchIndividualProfileRequest):
         Response<PatchIndividualProfileResponse>

core/src/main/java/com/fightpandemics/core/data/remote/profile/ProfileRemoteDataSourceImpl.kt

@@ -12,9 +12,8 @@ class ProfileRemoteDataSourceImpl @Inject constructor(
     private val fightPandemicsAPI: FightPandemicsAPI,
 ) : ProfileRemoteDataSource {
 
-    override suspend fun fetchCurrentUser(): IndividualProfileResponse {
-        return fightPandemicsAPI.getCurrentUser()
-    }
+    override suspend fun fetchCurrentUser(): Response<IndividualProfileResponse> =
+        fightPandemicsAPI.getCurrentUser()
 
     override suspend fun updateCurrentUser(patchIndividualProfileRequest: PatchIndividualProfileRequest):
         Response<PatchIndividualProfileResponse> =

core/src/main/java/com/fightpandemics/core/data/repository/ProfileRepositoryImpl.kt

@@ -1,7 +1,6 @@
 package com.fightpandemics.core.data.repository
 
 import com.fightpandemics.core.data.model.login.ErrorResponse
-import com.fightpandemics.core.data.model.profile.IndividualProfileResponse
 import com.fightpandemics.core.data.model.profile.PatchIndividualAccountRequest
 import com.fightpandemics.core.data.model.profile.PatchIndividualProfileRequest
 import com.fightpandemics.core.data.prefs.PreferenceStorage
@@ -15,7 +14,6 @@ import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.flow
 import java.net.HttpURLConnection
 import javax.inject.Inject
 
@@ -27,10 +25,24 @@ class ProfileRepositoryImpl @Inject constructor(
     private val profileRemoteDataSource: ProfileRemoteDataSource,
 ) : ProfileRepository {
 
-    override fun getIndividualUser(): Flow<Result<IndividualProfileResponse>> {
-        return flow {
-            val individualUser = profileRemoteDataSource.fetchCurrentUser()
-            emit(Result.Success(individualUser))
+    override fun getIndividualUser(): Flow<Result<*>> {
+        return channelFlow {
+            val response = profileRemoteDataSource.fetchCurrentUser()
+            when {
+                response.isSuccessful && response.code() == HttpURLConnection.HTTP_OK -> {
+                    val profileResponse = response.body()
+                    channel.offer(Result.Success(profileResponse))
+                }
+                response.code() == HttpURLConnection.HTTP_BAD_REQUEST -> {
+                    val myError = response.parseErrorJsonResponse<ErrorResponse>(moshi)
+                    channel.offer(Result.Error(Exception(myError?.message)))
+                }
+                else -> {
+                    val myError = response.parseErrorJsonResponse<ErrorResponse>(moshi)
+                    channel.offer(Result.Error(Exception(myError?.message)))
+                }
+            }
+            awaitClose { }
         }
     }
 

core/src/main/java/com/fightpandemics/core/domain/repository/ProfileRepository.kt

@@ -1,14 +1,13 @@
 package com.fightpandemics.core.domain.repository
 
-import com.fightpandemics.core.data.model.profile.IndividualProfileResponse
 import com.fightpandemics.core.data.model.profile.PatchIndividualAccountRequest
 import com.fightpandemics.core.data.model.profile.PatchIndividualProfileRequest
 import com.fightpandemics.core.result.Result
 import kotlinx.coroutines.flow.Flow
 
 interface ProfileRepository {
 
-    fun getIndividualUser(): Flow<Result<IndividualProfileResponse>>
+    fun getIndividualUser(): Flow<Result<*>>
 
     fun updateIndividualUserProfile(profileRequest: PatchIndividualProfileRequest): Flow<Result<*>>