From 70c9c79d5bab2e8586ae31c5dae7cb3383280451 Mon Sep 17 00:00:00 2001
From: Adam Ward <76879959+AsquaredWsquared@users.noreply.github.com>
Date: Sun, 11 Aug 2024 14:38:34 +0100
Subject: [PATCH] Terms of use (#29)
---
.../soundscape/components/CustomCheckbox.kt | 49 +++++
.../soundscape/screens/navigation/NavGraph.kt | 4 +
.../soundscape/screens/navigation/Screens.kt | 1 +
.../screens/onboarding/AudioBeacons.kt | 2 +-
.../soundscape/screens/onboarding/Terms.kt | 173 ++++++++++++++++++
5 files changed, 228 insertions(+), 1 deletion(-)
create mode 100644 app/src/main/java/org/scottishtecharmy/soundscape/components/CustomCheckbox.kt
create mode 100644 app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/Terms.kt
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/components/CustomCheckbox.kt b/app/src/main/java/org/scottishtecharmy/soundscape/components/CustomCheckbox.kt
new file mode 100644
index 00000000..e1104dc6
--- /dev/null
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/components/CustomCheckbox.kt
@@ -0,0 +1,49 @@
+package org.scottishtecharmy.soundscape.components
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CornerBasedShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.Dp
+
+@Composable
+fun CustomCheckbox(
+ checkedState: MutableState<Boolean>,
+ boxSize: Dp,
+ borderWidth: Dp,
+ boxShape: CornerBasedShape,
+ borderColor: Color,
+ iconSize: Dp,
+ iconColor: Color
+) {
+ Box(
+ modifier = Modifier
+ .semantics { contentDescription = "Check box" }
+ .size(boxSize)
+ .border(
+ width = borderWidth,
+ color = borderColor,
+ shape = boxShape
+ ),
+ contentAlignment = Alignment.Center
+ ) {
+ if (checkedState.value) {
+ Icon(
+ Icons.Default.Check,
+ contentDescription = null,
+ modifier = Modifier.size(iconSize),
+ tint = iconColor
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/navigation/NavGraph.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/navigation/NavGraph.kt
index 164cd645..6a5de2a9 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/navigation/NavGraph.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/navigation/NavGraph.kt
@@ -11,6 +11,7 @@ import org.scottishtecharmy.soundscape.screens.onboarding.Hearing
import org.scottishtecharmy.soundscape.screens.onboarding.Language
import org.scottishtecharmy.soundscape.screens.onboarding.Listening
import org.scottishtecharmy.soundscape.screens.onboarding.Navigating
+import org.scottishtecharmy.soundscape.screens.onboarding.Terms
import org.scottishtecharmy.soundscape.screens.onboarding.Welcome
@Composable
@@ -50,6 +51,9 @@ fun SetUpNavGraph(
composable(Screens.AudioBeacons.route) {
AudioBeacons(navController = navController)
}
+ composable(Screens.Terms.route) {
+ Terms(navController = navController)
+ }
}
composable(Screens.Home.route) {
Home()
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/navigation/Screens.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/navigation/Screens.kt
index cac5619e..4d34e09f 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/navigation/Screens.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/navigation/Screens.kt
@@ -9,4 +9,5 @@ sealed class Screens(val route: String)
data object Hearing : Screens("hearing")
data object Navigating : Screens("navigating")
data object AudioBeacons : Screens("audiobeacons")
+ data object Terms : Screens("terms")
}
\ No newline at end of file
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/AudioBeacons.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/AudioBeacons.kt
index ce8fa133..b1c0dec2 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/AudioBeacons.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/AudioBeacons.kt
@@ -175,7 +175,7 @@ fun AudioBeacons(navController: NavHostController) {
OnboardButton(
text = stringResource(R.string.ui_continue),
onClick = {
- //navController.navigate(Screens.IntroductionTerms.route)
+ //navController.navigate(Screens.Terms.route)
},
modifier = Modifier.fillMaxWidth()
)
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/Terms.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/Terms.kt
new file mode 100644
index 00000000..b23884e5
--- /dev/null
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/Terms.kt
@@ -0,0 +1,173 @@
+package org.scottishtecharmy.soundscape.screens.onboarding
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import org.scottishtecharmy.soundscape.R
+import org.scottishtecharmy.soundscape.components.CustomCheckbox
+import org.scottishtecharmy.soundscape.ui.theme.IntroPrimary
+import org.scottishtecharmy.soundscape.ui.theme.IntroTypography
+import org.scottishtecharmy.soundscape.ui.theme.IntroductionTheme
+import org.scottishtecharmy.soundscape.ui.theme.Primary
+
+data class Terms(
+ val name: String
+)
+
+fun getAllTerms(): List<Terms> {
+ return listOf(
+ Terms(
+ name = "Your use of Soundscape is subject to the terms set out below (together, the \"Terms of Use\")"
+ ),
+ Terms(
+ name="You acknowledge that Soundscape (1) is not designed, intended, or made available as a medical device, and (2) is not designed or intended to be a substitute for professional medical advice, diagnosis, treatment, or judgment and should not be used to replace or as a substitute for professional medical advice, diagnosis, treatment, or judgment.\n\nSafety Notice\n\nSoundscape is a navigation aid and should not be used in lieu of mobility skills, being aware of your surroundings, and good judgement. Use caution when navigating your environment as the mapping data incorporated into the Soundscape programme is captured from a third-party programme, and therefore, there may be limitations with the accuracy of the information presented."
+ )
+ )
+}
+@Composable
+fun Terms(navController: NavHostController) {
+ val terms = getAllTerms()
+ val checkedState = remember { mutableStateOf(false) }
+ IntroductionTheme {
+ MaterialTheme(typography = IntroTypography) {
+ Column(
+ modifier = Modifier
+ .padding(horizontal = 20.dp, vertical = 50.dp)
+ .fillMaxWidth()
+ .fillMaxHeight(),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.Top
+ ) {
+ Text(
+ text = "Terms of Use",
+ style = MaterialTheme.typography.titleLarge,
+ textAlign = TextAlign.Center,
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(bottom = 20.dp)
+ )
+
+ LazyColumn(
+ modifier = Modifier
+ .clip(RoundedCornerShape(5.dp))
+ .fillMaxWidth()
+ .height(400.dp)
+ .background(Color.White)
+ ) {
+ items(terms) { term ->
+ TermsItem(
+ term.name
+ )
+ }
+ }
+
+ Row(
+ modifier = Modifier
+ .padding(top = 40.dp)
+ .fillMaxWidth(),
+ horizontalArrangement = Arrangement.Start,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ CustomCheckbox(
+ checkedState = checkedState,
+ boxSize = 40.dp,
+ borderWidth = 3.dp,
+ boxShape = RoundedCornerShape(5.dp),
+ borderColor = Color.White,
+ iconSize = 30.dp,
+ iconColor = Color.White
+ )
+ Spacer(modifier = Modifier.width(30.dp))
+ Text(
+ modifier = Modifier.clickable { checkedState.value = !checkedState.value },
+ text = "Accept Terms of Use",
+ style = MaterialTheme.typography.bodyMedium
+ )
+ }
+
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(top = 60.dp)
+ ) {
+ Button(
+ onClick = {
+ if (checkedState.value) {
+ //navController.navigate(Screens.Finish.route)
+ }
+ },
+ colors = ButtonDefaults.buttonColors(
+ containerColor =
+ if (checkedState.value) IntroPrimary else Color.White.copy(alpha = 0.3f)
+ ),
+ shape = RoundedCornerShape(3.dp),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Text(
+ text = stringResource(R.string.ui_continue),
+ color = if (checkedState.value) Primary else Color.White,
+ )
+ }
+ }
+
+ }
+ }
+ }
+}
+
+@Composable
+fun TermsItem(text: String) {
+ Row(
+ modifier = Modifier
+ .padding(horizontal = 10.dp, vertical = 17.dp)
+ .fillMaxWidth()
+
+ ) {
+ Spacer(modifier = Modifier.width(20.dp))
+ Text(text = text, style = MaterialTheme.typography.bodyMedium, color = Primary)
+ }
+
+ HorizontalDivider(
+ modifier = Modifier
+ .padding(horizontal = 10.dp, vertical = 2.dp),
+ thickness = 0.8.dp,
+ color = Primary
+ )
+}
+
+
+
+@Preview
+@Composable
+fun TermsPreview() {
+ Terms(navController = rememberNavController())
+}
\ No newline at end of file