feat: draggable button added

Author: f-arslan

feature/street-view/build.gradle.kts

@@ -9,6 +9,9 @@ android {
 }
 
 dependencies {
-    implementation(libs.maps.compose)
+    implementation(projects.core.saveScreenshot)
+
     implementation(projects.feature.screenshot)
-}
+
+    implementation(libs.maps.compose)
+}

feature/street-view/src/main/kotlin/com/espressodev/gptmap/feature/street_view/StreetViewNavigation.kt

@@ -15,7 +15,7 @@ fun NavController.navigateToStreetView(latitude: Float, longitude: Float) {
     navigate("$streetViewRoute/$latitude/$longitude")
 }
 
-fun NavGraphBuilder.streetViewScreen() {
+fun NavGraphBuilder.streetViewScreen(popUp: () -> Unit, navigateToScreenshot: () -> Unit) {
     composable(
         route = "$streetViewRoute/{$LATITUDE_ID}/{$LONGITUDE_ID}",
         arguments = listOf(
@@ -27,8 +27,11 @@ fun NavGraphBuilder.streetViewScreen() {
             backStackEntry.arguments?.getFloat(LATITUDE_ID)?.toDouble() ?: return@composable
         val longitude =
             backStackEntry.arguments?.getFloat(LONGITUDE_ID)?.toDouble() ?: return@composable
-        StreetViewRoute(latitude, longitude)
+        StreetViewRoute(
+            latitude = latitude,
+            longitude = longitude,
+            popUp = popUp,
+            navigateToScreenshot = navigateToScreenshot
+        )
     }
 }
-
-

feature/street-view/src/main/kotlin/com/espressodev/gptmap/feature/street_view/StreetViewScreen.kt

@@ -1,31 +1,40 @@
 package com.espressodev.gptmap.feature.street_view
 
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.zIndex
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.espressodev.gptmap.core.designsystem.GmIcons
-import com.espressodev.gptmap.core.designsystem.component.GmDraggableButton
+import com.espressodev.gptmap.core.designsystem.IconType
+import com.espressodev.gptmap.core.designsystem.TextType
+import com.espressodev.gptmap.core.designsystem.component.GmTopAppBar
 import com.espressodev.gptmap.core.designsystem.component.LottieAnimationView
+import com.espressodev.gptmap.core.save_screenshot.composable.SaveScreenshot
 import com.google.android.gms.maps.StreetViewPanoramaOptions
 import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.compose.streetview.StreetView
 import com.google.maps.android.ktx.MapsExperimentalFeature
 import kotlinx.coroutines.delay
 import com.espressodev.gptmap.core.designsystem.R.raw as AppRaw
+import com.espressodev.gptmap.core.designsystem.R.drawable as AppDrawable
+import com.espressodev.gptmap.core.designsystem.R.string as AppText
+
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun StreetViewRoute(
     latitude: Double,
     longitude: Double,
+    popUp: () -> Unit,
+    navigateToScreenshot: () -> Unit,
     viewModel: StreetViewViewModel = hiltViewModel()
 ) {
     LaunchedEffect(key1 = latitude, key2 = longitude) {
@@ -34,20 +43,27 @@ fun StreetViewRoute(
     val uiState by viewModel.uiState.collectAsStateWithLifecycle(
         initialValue = StreetViewUiState(LatLng(latitude, longitude))
     )
-    StreetViewScreen(uiState, onCameraButtonClick = viewModel::onCameraButtonClick)
-}
+    Scaffold(
+        topBar = {
+            GmTopAppBar(
+                text = TextType.Res(AppText.street_view),
+                icon = IconType.Bitmap(AppDrawable.street_view),
+                onBackClick = popUp
+            )
+        }
+    ) {
+        StreetViewScreen(modifier = Modifier.padding(it), uiState)
+    }
 
+    SaveScreenshot(onSuccess = navigateToScreenshot)
+}
 
 @OptIn(MapsExperimentalFeature::class)
 @Composable
-fun StreetViewScreen(uiState: StreetViewUiState, onCameraButtonClick: (Boolean) -> Unit) {
+fun StreetViewScreen(modifier: Modifier, uiState: StreetViewUiState) {
     var isStreetViewLoaded by remember { mutableStateOf(value = false) }
 
-    Box(modifier = Modifier.fillMaxSize()) {
-
-        AnimatedVisibility(visible = uiState.cameraButtonState, modifier = Modifier.zIndex(4f)) {
-            GmDraggableButton(icon = GmIcons.CameraFilled, onClick = { onCameraButtonClick(true) })
-        }
+    Box(modifier = modifier.fillMaxSize()) {
 
         StreetView(
             streetViewPanoramaOptionsFactory = {
@@ -64,4 +80,4 @@ fun StreetViewScreen(uiState: StreetViewUiState, onCameraButtonClick: (Boolean)
             isStreetViewLoaded = true
         }
     }
-}
+}

feature/street-view/src/main/kotlin/com/espressodev/gptmap/feature/street_view/StreetViewViewModel.kt

@@ -9,7 +9,6 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import javax.inject.Inject
 
-
 @HiltViewModel
 class StreetViewViewModel @Inject constructor(logService: LogService): GmViewModel(logService) {
 
@@ -19,8 +18,4 @@ class StreetViewViewModel @Inject constructor(logService: LogService): GmViewMod
     fun getStreetView(latitude: Double, longitude: Double) {
         _uiState.update { it.copy(latLng = LatLng(latitude, longitude)) }
     }
-
-    fun onCameraButtonClick(state: Boolean) {
-        _uiState.update { it.copy(screenshotState = state, cameraButtonState = false) }
-    }
-}
+}