v300: Pre-release tasks (#470)

Author: shubham7109

app/build.gradle.kts

@@ -26,7 +26,7 @@ android {
     }
 
     // Optional input to apply the external signing configuration for the sample viewer
-    // Example: ./gradlew assembleRelease -PsigningPropsFilePath=absolute-file-path/signing.properties -D build=200.8.0
+    // Example: ./gradlew assembleRelease -PsigningPropsFilePath=absolute-file-path/signing.properties -D build=300.0.0
     val signingPropsFilePath = project.findProperty("signingPropsFilePath").toString()
     val signingPropsFile = rootProject.file(signingPropsFilePath)
 

app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/ui/screens/about/AboutScreen.kt

@@ -49,8 +49,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -62,6 +62,7 @@ import com.esri.arcgismaps.kotlin.sampleviewer.R
 import com.esri.arcgismaps.kotlin.sampleviewer.ui.components.SampleViewerTopAppBar
 import com.esri.arcgismaps.sample.sampleslib.theme.SampleAppTheme
 import androidx.core.net.toUri
+import java.util.Calendar
 
 /**
  * Showcase information about the application.
@@ -109,7 +110,7 @@ private fun AboutIcon() {
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically
     ) {
-        val size = (LocalConfiguration.current.screenWidthDp * 0.20).dp
+        val size = LocalWindowInfo.current.containerDpSize.width * 0.20f
         Image(
             modifier = Modifier.size(size),
             painter = painterResource(com.esri.arcgismaps.sample.sampleslib.R.drawable.arcgis_maps_sdks_64),
@@ -133,9 +134,10 @@ private fun TitleAndCopyrightSection() {
             fontWeight = FontWeight.Bold,
             style = MaterialTheme.typography.titleMedium
         )
+        val currentYear = Calendar.getInstance().get(Calendar.YEAR)
         Text(
             modifier = Modifier.align(Alignment.CenterHorizontally),
-            text = stringResource(R.string.copyright_text),
+            text = stringResource(R.string.copyright_text, currentYear),
             textAlign = TextAlign.Center,
             style = MaterialTheme.typography.labelMedium
         )

app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/ui/screens/home/HomeCategoryScreen.kt

@@ -52,7 +52,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -75,8 +75,8 @@ fun HomeCategoryScreen(
     onNavigateToSearch: () -> Unit,
     onNavigateToCategory: (SampleCategory) -> Unit,
 ) {
-    val config = LocalConfiguration.current
-    val layoutSpacing by remember { mutableStateOf(0.03f * config.screenWidthDp.dp) }
+    val window = LocalWindowInfo.current
+    val layoutSpacing by remember { mutableStateOf(0.03f * window.containerDpSize.width) }
     val isVisible = rememberSaveable { mutableStateOf(true) }
     val nestedScrollConnection = remember {
         object : NestedScrollConnection {

app/src/main/res/values/strings.xml

@@ -4,7 +4,7 @@
     <string name="about_section">About</string>
     <string name="app_version">App Version</string>
     <string name="SDK_version">SDK Version</string>
-    <string name="copyright_text">Copyright © 2015–2024 Esri.\nAll Rights Reserved.</string>
+    <string name="copyright_text">Copyright © 2015–%1$d Esri.\nAll Rights Reserved.</string>
     <string name="about_title">ArcGIS Maps SDK Sample Viewer</string>
     <string name="powered_by">Powered By</string>
     <string name="ArcGIS_Maps_SDK_Toolkit">ArcGIS Maps SDK Toolkit for Kotlin</string>

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 
 # ArcGIS Maps SDK for Kotlin version
-arcgisMapsKotlinVersion = "300.0.0-4922"
+arcgisMapsKotlinVersion = "300.0.0-4928"
 
 ### Android versions
 androidGradlePlugin = "8.13.2"

samples-lib/src/main/java/com/esri/arcgismaps/sample/sampleslib/components/BottomSheet.kt

@@ -18,6 +18,7 @@ package com.esri.arcgismaps.sample.sampleslib.components
 
 import android.content.res.Configuration
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
@@ -33,13 +34,16 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.FilledTonalIconButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -64,6 +68,7 @@ fun BottomSheet(
     Box(
         modifier = Modifier
             .fillMaxSize()
+            .padding(top = TopAppBarDefaults.TopAppBarExpandedHeight)
             .systemBarsPadding()
     ) {
         AnimatedVisibility(
@@ -75,6 +80,9 @@ fun BottomSheet(
             SampleAppTheme {
                 Surface {
                     Column(
+                        modifier = Modifier
+                            .verticalScroll(rememberScrollState())
+                            .animateContentSize(),
                         verticalArrangement = Arrangement.spacedBy(8.dp),
                         horizontalAlignment = Alignment.CenterHorizontally
                     ) {

samples/add-scene-layer-from-service/README.md

@@ -31,7 +31,7 @@ Pan and zoom to explore the scene.
 
 ## About the data
 
-This sample shows a [Portland, Oregon USA Scene](https://www.arcgis.com/home/item.html?id=2b721b9e7bef45e2b7ff78a398a33acc) hosted on ArcGIS Online.
+This sample shows data from [Esri 3D Buildings](https://www.arcgis.com/home/item.html?id=b8fec5af7dfe4866b1b8ac2d2800f282) in Portland, Oregon.
 
 ## Tags
 

samples/add-scene-layer-from-service/src/main/java/com/esri/arcgismaps/sample/addscenelayerfromservice/components/AddSceneLayerFromServiceViewModel.kt

@@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
 class AddSceneLayerFromServiceViewModel(app: Application) : AndroidViewModel(app) {
     // URL of the Portland buildings scene server
     private val portlandBuildingsSceneLayerUrl =
-        "https://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Portland/SceneServer"
+        "https://basemaps3d.arcgis.com/arcgis/rest/services/Esri3D_Buildings_v1/SceneServer"
 
     // URL of the world elevation tiled elevation source
     private val worldElevationServiceUrl =
@@ -53,9 +53,9 @@ class AddSceneLayerFromServiceViewModel(app: Application) : AndroidViewModel(app
     // Camera location point (Portland, OR)
     private val cameraLocation: Point by lazy {
         Point(
-            x = -122.66949,
-            y = 45.51869,
-            z = 227.0,
+            x = -122.670,
+            y = 45.517,
+            z = 175.0,
             spatialReference = SpatialReference.wgs84()
         )
     }
@@ -64,8 +64,8 @@ class AddSceneLayerFromServiceViewModel(app: Application) : AndroidViewModel(app
     private val camera: Camera by lazy {
         Camera(
             locationPoint = cameraLocation,
-            heading = 219.0,
-            pitch = 82.0,
+            heading = 215.0,
+            pitch = 75.0,
             roll = 0.0
         )
     }