refactor

Author: f-arslan

app/build.gradle.kts

@@ -46,6 +46,7 @@ dependencies {
     implementation(projects.feature.favourite)
     implementation(projects.feature.screenshot)
     implementation(projects.feature.screenshotGallery)
+    implementation(projects.feature.profile)
 
     implementation(projects.core.designsystem)
     implementation(projects.core.common)

app/src/main/kotlin/com/espressodev/gptmap/GmAppState.kt

@@ -27,8 +27,4 @@ class GmAppState(
             }
         }
     }
-
-    fun popUp() {
-        navController.popBackStack()
-    }
 }

app/src/main/kotlin/com/espressodev/gptmap/GmNavHost.kt

@@ -12,9 +12,10 @@ import com.espressodev.gptmap.feature.forgot_password.navigateToForgotPassword
 import com.espressodev.gptmap.feature.login.LOGIN_ROUTE
 import com.espressodev.gptmap.feature.login.loginScreen
 import com.espressodev.gptmap.feature.login.navigateToLogin
-import com.espressodev.gptmap.feature.map.MAP_ROUTE
 import com.espressodev.gptmap.feature.map.mapScreen
 import com.espressodev.gptmap.feature.map.navigateToMap
+import com.espressodev.gptmap.feature.profile.navigateToProfile
+import com.espressodev.gptmap.feature.profile.profileScreen
 import com.espressodev.gptmap.feature.register.navigateToRegister
 import com.espressodev.gptmap.feature.register.registerScreen
 import com.espressodev.gptmap.feature.screenshot.navigateToScreenshot
@@ -44,7 +45,7 @@ fun GmNavHost(
             navigateToFavourite = navController::navigateToFavourite,
             navigateToScreenshot = navController::navigateToScreenshot,
             navigateToScreenshotGallery = navController::navigateToScreenshotGallery,
-            navigateToAccount = {}
+            navigateToProfile = navController::navigateToProfile
         )
         loginScreen(
             navigateToMap = navController::navigateToMap,
@@ -57,9 +58,10 @@ fun GmNavHost(
         )
         forgotPasswordScreen(navigateToLogin = navController::navigateToLogin)
         streetViewScreen()
-        favouriteScreen(popUp = appState::popUp, navigateToMap = navController::navigateToMap)
-        screenshotScreen(popUp = appState::popUp, navigateToMap = navController::navigateToMap)
-        screenshotGalleryScreen(popUp = appState::popUp)
+        favouriteScreen(popUp = navController::popBackStack, navigateToMap = navController::navigateToMap)
+        screenshotScreen(popUp = navController::popBackStack, navigateToMap = navController::navigateToMap)
+        screenshotGalleryScreen(popUp = navController::popBackStack)
+        profileScreen(popUp = navController::popBackStack, navigateToLogin = navController::navigateToLogin)
     }
 }
 

core/model/src/main/kotlin/com/espressodev/gptmap/core/model/User.kt

@@ -23,5 +23,5 @@ data class User(
 }
 
 enum class Provider {
-    DEFAULT, GOOGLE, FACEBOOK, X
+    DEFAULT, GOOGLE
 }