feat: sub screen

Author: =

feature/snapTo-script/src/main/kotlin/com/espressodev/gptmap/feature/snapTo_script/SnapToScriptNavigation.kt

@@ -3,9 +3,7 @@ package com.espressodev.gptmap.feature.snapTo_script
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
-import androidx.navigation.NavType
 import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
 
 const val IMAGE_ID = "imageId"
 const val SnapToScriptRoute = "snapTo_script_route"
@@ -16,10 +14,7 @@ fun NavController.navigateToSnapToScript(imageId: String, navOptions: NavOptions
 }
 
 fun NavGraphBuilder.snapToScriptScreen() {
-    composable(
-        route = SnapToScriptRouteWithArg,
-        arguments = listOf(navArgument(IMAGE_ID) { type = NavType.StringType })
-    ) {
+    composable(route = SnapToScriptRouteWithArg) {
         SnapToScriptRoute()
     }
 }

feature/snapTo-script/src/main/kotlin/com/espressodev/gptmap/feature/snapTo_script/SnapToScriptScreen.kt

@@ -262,7 +262,7 @@ private fun Messages(
         val jumpToBottomEnabled by remember {
             derivedStateOf {
                 scrollState.firstVisibleItemIndex > 1 ||
-                    scrollState.firstVisibleItemScrollOffset > jumpThreshold
+                        scrollState.firstVisibleItemScrollOffset > jumpThreshold
             }
         }
 

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

@@ -3,32 +3,26 @@ 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.CircularProgressIndicator
-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.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-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.BackButton
+import com.espressodev.gptmap.core.designsystem.theme.GptmapTheme
 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.drawable as AppDrawable
-import com.espressodev.gptmap.core.designsystem.R.string as AppText
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun StreetViewRoute(
     popUp: () -> Unit,
@@ -37,22 +31,14 @@ internal fun StreetViewRoute(
     viewModel: StreetViewViewModel = hiltViewModel()
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    Scaffold(
-        topBar = {
-            GmTopAppBar(
-                text = TextType.Res(AppText.street_view),
-                icon = IconType.Bitmap(AppDrawable.street_view),
-                onBackClick = popUp
-            )
-        },
+
+
+    StreetViewScreen(
+        latitude = uiState.latitude,
+        longitude = uiState.longitude,
+        popUp = popUp,
         modifier = modifier
-    ) {
-        StreetViewScreen(
-            latitude = uiState.latitude,
-            longitude = uiState.longitude,
-            modifier = Modifier.padding(it)
-        )
-    }
+    )
 
     SaveScreenshot(
         onClick = viewModel::initializeScreenCaptureBroadcastReceiver,
@@ -70,11 +56,16 @@ internal fun StreetViewRoute(
 
 @OptIn(MapsExperimentalFeature::class)
 @Composable
-private fun StreetViewScreen(latitude: Double, longitude: Double, modifier: Modifier = Modifier) {
+private fun StreetViewScreen(
+    latitude: Double,
+    longitude: Double,
+    popUp: () -> Unit,
+    modifier: Modifier = Modifier
+) {
     val (isStreetViewLoaded, setStreetViewLoaded) = remember { mutableStateOf(value = false) }
 
     LaunchedEffect(key1 = latitude) {
-        delay(1000L)
+        delay(1250L)
         setStreetViewLoaded(true)
     }
 
@@ -93,5 +84,17 @@ private fun StreetViewScreen(latitude: Double, longitude: Double, modifier: Modi
         AnimatedVisibility(!isStreetViewLoaded, modifier = Modifier.align(Alignment.Center)) {
             CircularProgressIndicator()
         }
+
+        if (isStreetViewLoaded) {
+            BackButton { popUp() }
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun StreetViewPreview() {
+    GptmapTheme {
+        StreetViewScreen(latitude = 10.0, longitude = 20.0, {})
     }
 }

feature/sub/.gitignore

@@ -0,0 +1 @@
+/build

feature/sub/build.gradle.kts

@@ -0,0 +1,12 @@
+plugins {
+    alias(libs.plugins.gptmap.android.library.compose)
+    alias(libs.plugins.gptmap.android.feature)
+}
+
+android {
+    namespace = "com.espressodev.gptmap.feature.sub"
+}
+
+dependencies {
+
+}

feature/sub/src/androidTest/java/com/espressodev/gptmap/feature/sub/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.espressodev.gptmap.feature.sub
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.espressodev.gptmap.feature.sub.test", appContext.packageName)
+    }
+}

feature/sub/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

feature/sub/src/main/kotlin/com/espressodev/gptmap/feature/sub/SubNavigation.kt

@@ -0,0 +1,4 @@
+package com.espressodev.gptmap.feature.sub
+
+class SubNavigation {
+}