hud10837/add-privacy-info

microapps/ArTabletopApp/README.md

@@ -8,4 +8,4 @@ This micro-app demonstrates the use of the `TableTopSceneView` toolkit component
 
 Launch the app and follow on-screen instructions to point the camera towards a surface while moving the device slightly. When a surface is detected it will appear as a grid of white lines in the camera feed. Tap on the grid to choose an anchor location to place the 3D buildings. Shortly after tapping on the screen, the buildings will appear as shown in the screenshot above. 
 
-For more information on the `TableTopSceneView` component and how it works, see its [Readme](../../toolkit/ar/README.md).
+For more information on the `TableTopSceneView` component and how it works, see the AR package [Readme](../../toolkit/ar/README.md).

microapps/ArTabletopApp/app/src/main/java/com/arcgismaps/toolkit/artabletopapp/MainActivity.kt

@@ -29,7 +29,6 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -94,7 +93,7 @@ class MainActivity : ComponentActivity() {
 @Composable
 fun ArTabletopApp() {
     Scaffold(
-        topBar = { TopAppBar(title = { Text("ArTabletopApp") }) }
+        topBar = { TopAppBar(title = { Text(stringResource(R.string.top_bar_title)) }) }
     ) {
         Box(Modifier.padding(it)) {
             MainScreen()

microapps/ArTabletopApp/app/src/main/java/com/arcgismaps/toolkit/artabletopapp/screens/MainScreen.kt

@@ -18,24 +18,41 @@
 
 package com.arcgismaps.toolkit.artabletopapp.screens
 
+import android.content.Context
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.arcgismaps.LoadStatus
 import com.arcgismaps.data.ArcGISFeature
@@ -52,6 +69,8 @@ import com.arcgismaps.toolkit.ar.rememberTableTopSceneViewStatus
 import com.arcgismaps.toolkit.artabletopapp.R
 import kotlinx.coroutines.launch
 
+private const val KEY_PREF_ACCEPTED_PRIVACY_INFO = "ACCEPTED_PRIVACY_INFO"
+
 @Composable
 fun MainScreen() {
     val arcGISSceneLayer = remember {
@@ -80,81 +99,110 @@ fun MainScreen() {
     val coroutineScope = rememberCoroutineScope()
 
     Box(modifier = Modifier.fillMaxSize()) {
-        TableTopSceneView(
-            arcGISScene = arcGISScene,
-            arcGISSceneAnchor = arcGISSceneAnchor,
-            translationFactor = 400.0,
-            modifier = Modifier.fillMaxSize(),
-            clippingDistance = 400.0,
-            tableTopSceneViewProxy = tableTopSceneViewProxy,
-            onInitializationStatusChanged = {
-                initializationStatus = it
-            },
-            onSingleTapConfirmed = { tap ->
-                arcGISSceneLayer.clearSelection()
-                coroutineScope.launch {
-                    identifiedBuilding = arcGISSceneLayer.identifyBuilding(
-                        tap.screenCoordinate,
-                        tableTopSceneViewProxy
-                    )
-                    identifiedBuilding?.let { identifiedBuilding ->
-                        arcGISSceneLayer.selectFeature(identifiedBuilding.feature)
-                    }
+        val sharedPreferences = LocalContext.current.getSharedPreferences("", Context.MODE_PRIVATE)
+        var acceptedPrivacyInfo by rememberSaveable { mutableStateOf(sharedPreferences.getBoolean(
+            KEY_PREF_ACCEPTED_PRIVACY_INFO, false)) }
+        var showPrivacyInfo by rememberSaveable { mutableStateOf(!acceptedPrivacyInfo) }
+        if (showPrivacyInfo) {
+            PrivacyInfoDialog(
+                acceptedPrivacyInfo,
+                onUserResponse = { accepted ->
+                    acceptedPrivacyInfo = accepted
+                    sharedPreferences.edit().putBoolean(KEY_PREF_ACCEPTED_PRIVACY_INFO, accepted).apply()
+                    showPrivacyInfo = false
+                }
+            )
+        }
+        if (!acceptedPrivacyInfo) {
+            Column(
+                modifier = Modifier.fillMaxSize(),
+                verticalArrangement = Arrangement.Center,
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Text(stringResource(R.string.privacy_info_not_accepted))
+                Button(
+                    onClick = { showPrivacyInfo = true }
+                ) {
+                    Text(stringResource(R.string.show_privacy_info))
                 }
             }
-        ) {
-            identifiedBuilding?.let {
-                Callout(it.location) {
-                    Text("Building ID: ${it.feature.attributes["OBJECTID"]}")
+        } else {
+            TableTopSceneView(
+                arcGISScene = arcGISScene,
+                arcGISSceneAnchor = arcGISSceneAnchor,
+                translationFactor = 400.0,
+                modifier = Modifier.fillMaxSize(),
+                clippingDistance = 400.0,
+                tableTopSceneViewProxy = tableTopSceneViewProxy,
+                onInitializationStatusChanged = {
+                    initializationStatus = it
+                },
+                onSingleTapConfirmed = { tap ->
+                    arcGISSceneLayer.clearSelection()
+                    coroutineScope.launch {
+                        identifiedBuilding = arcGISSceneLayer.identifyBuilding(
+                            tap.screenCoordinate,
+                            tableTopSceneViewProxy
+                        )
+                        identifiedBuilding?.let { identifiedBuilding ->
+                            arcGISSceneLayer.selectFeature(identifiedBuilding.feature)
+                        }
+                    }
+                }
+            ) {
+                identifiedBuilding?.let {
+                    Callout(it.location) {
+                        Text("Building ID: ${it.feature.attributes["OBJECTID"]}")
+                    }
                 }
             }
-        }
-    }
 
-    // Show an overlay with instructions or progress indicator based on the initialization status
-    when (val status = initializationStatus) {
-        is TableTopSceneViewStatus.Initializing -> TextWithScrim(text = stringResource(R.string.initializing_overlay))
-        is TableTopSceneViewStatus.DetectingPlanes -> TextWithScrim(text = stringResource(R.string.detect_planes_overlay))
-        is TableTopSceneViewStatus.Initialized -> {
-            val sceneLoadStatus = arcGISScene.loadStatus.collectAsStateWithLifecycle().value
-            when (sceneLoadStatus) {
-                is LoadStatus.NotLoaded -> {
-                    // Tell the user to tap the screen if the scene has not started loading
-                    TextWithScrim(text = stringResource(R.string.tap_scene_overlay))
-                }
+            // Show an overlay with instructions or progress indicator based on the initialization status
+            when (val status = initializationStatus) {
+                is TableTopSceneViewStatus.Initializing -> TextWithScrim(text = stringResource(R.string.initializing_overlay))
+                is TableTopSceneViewStatus.DetectingPlanes -> TextWithScrim(text = stringResource(R.string.detect_planes_overlay))
+                is TableTopSceneViewStatus.Initialized -> {
+                    val sceneLoadStatus = arcGISScene.loadStatus.collectAsStateWithLifecycle().value
+                    when (sceneLoadStatus) {
+                        is LoadStatus.NotLoaded -> {
+                            // Tell the user to tap the screen if the scene has not started loading
+                            TextWithScrim(text = stringResource(R.string.tap_scene_overlay))
+                        }
 
-                is LoadStatus.Loading -> {
-                    // The scene may take a while to load, so show a progress indicator
-                    Column(
-                        modifier = Modifier.fillMaxSize(),
-                        verticalArrangement = Arrangement.Center,
-                        horizontalAlignment = Alignment.CenterHorizontally
-                    ) {
-                        CircularProgressIndicator()
+                        is LoadStatus.Loading -> {
+                            // The scene may take a while to load, so show a progress indicator
+                            Column(
+                                modifier = Modifier.fillMaxSize(),
+                                verticalArrangement = Arrangement.Center,
+                                horizontalAlignment = Alignment.CenterHorizontally
+                            ) {
+                                CircularProgressIndicator()
+                            }
+                        }
+
+                        is LoadStatus.FailedToLoad -> {
+                            TextWithScrim(
+                                text = stringResource(
+                                    R.string.failed_to_load_scene,
+                                    sceneLoadStatus.error
+                                )
+                            )
+                        }
+
+                        LoadStatus.Loaded -> {} // Do nothing
                     }
                 }
 
-                is LoadStatus.FailedToLoad -> {
+                is TableTopSceneViewStatus.FailedToInitialize -> {
                     TextWithScrim(
                         text = stringResource(
-                            R.string.failed_to_load_scene,
-                            sceneLoadStatus.error
+                            R.string.failed_to_initialize_overlay,
+                            status.error.message ?: status.error
                         )
                     )
                 }
-
-                LoadStatus.Loaded -> {} // Do nothing
             }
         }
-
-        is TableTopSceneViewStatus.FailedToInitialize -> {
-            TextWithScrim(
-                text = stringResource(
-                    R.string.failed_to_initialize_overlay,
-                    status.error.message ?: status.error
-                )
-            )
-        }
     }
 }
 
@@ -202,3 +250,81 @@ private suspend fun ArcGISSceneLayer.identifyBuilding(
  * @since 200.6.0
  */
 private data class IdentifiedBuilding(val feature: ArcGISFeature, val location: Point)
+
+/**
+ * An alert dialog that asks the user to accept or deny [ARCore's privacy requirements](https://developers.google.com/ar/develop/privacy-requirements).
+ *
+ * @since 200.7.0
+ */
+@Composable
+private fun PrivacyInfoDialog(
+    hasCurrentlyAccepted: Boolean,
+    onUserResponse: (accepted: Boolean) -> Unit
+) {
+    Dialog(
+        onDismissRequest = {
+            onUserResponse(hasCurrentlyAccepted)
+        }
+    ) {
+        Card {
+            Column(
+                modifier = Modifier.padding(16.dp)
+            ) {
+                LegalTextArCore()
+                Spacer(Modifier.height(16.dp))
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween
+                ) {
+                    TextButton(
+                        onClick = {
+                            onUserResponse(false)
+                        }) {
+                        Text(stringResource(R.string.decline))
+                    }
+
+                    TextButton(
+                        onClick = {
+                            onUserResponse(true)
+                        }
+                    ) {
+                        Text(stringResource(R.string.accept))
+                    }
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Displays the required privacy information for use of ARCore
+ *
+ * @since 200.7.0
+ */
+@Composable
+private fun LegalTextArCore() {
+    val textLinkStyle =
+        TextLinkStyles(style = SpanStyle(color = Color.Blue))
+    Text(
+        text = buildAnnotatedString {
+            append("This application runs on ")
+            withLink(
+                LinkAnnotation.Url(
+                    "https://play.google.com/store/apps/details?id=com.google.ar.core",
+                    textLinkStyle
+                )
+            ) {
+                append("Google Play Services for AR")
+            }
+            append("  (ARCore), which is provided by Google and governed by the ")
+            withLink(
+                LinkAnnotation.Url(
+                    "https://policies.google.com/privacy",
+                    textLinkStyle
+                )
+            ) {
+                append("Google Privacy Policy.")
+            }
+        }
+    )
+}

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

@@ -26,4 +26,9 @@
     <string name="initializing_overlay">Setting up AR...</string>
     <string name="failed_to_initialize_overlay">Failed to initialize: %1$s</string>
     <string name="failed_to_load_scene">Failed to load scene: %1$s</string>
+    <string name="decline">Decline</string>
+    <string name="accept">Accept</string>
+    <string name="privacy_info_not_accepted">Privacy Info not accepted</string>
+    <string name="show_privacy_info">Show Privacy Info</string>
+    <string name="top_bar_title">AR Table Top</string>
 </resources>