Merge pull request #73 from canopas/ui-fixing

Changed URL for policy and some minor UI changes

Author: cp-sneh-s

app/src/main/java/com/canopas/yourspace/ui/component/OtpTextField.kt

@@ -20,7 +20,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -75,7 +74,6 @@ fun OtpInputField(
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun OTPDigit(
     index: Int,

app/src/main/java/com/canopas/yourspace/ui/flow/home/space/create/SpaceInviteCodeScreen.kt

@@ -9,7 +9,9 @@ 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.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -67,6 +69,7 @@ private fun SpaceInviteContent(modifier: Modifier) {
     Column(
         modifier
             .fillMaxSize()
+            .verticalScroll(rememberScrollState())
             .background(AppTheme.colorScheme.surface)
             .padding(horizontal = 16.dp, vertical = 24.dp),
         horizontalAlignment = Alignment.CenterHorizontally
@@ -93,7 +96,9 @@ private fun SpaceInviteContent(modifier: Modifier) {
         Spacer(modifier = Modifier.weight(1f))
 
         PrimaryButton(
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 16.dp),
             label = stringResource(R.string.onboard_share_space_code_btn),
             onClick = { shareInvitationCode(context, viewModel.spaceInviteCode) }
         )

app/src/main/java/com/canopas/yourspace/ui/flow/home/space/join/JoinSpaceScreen.kt

@@ -2,9 +2,12 @@ package com.canopas.yourspace.ui.flow.home.space.join
 
 import androidx.compose.foundation.layout.Column
 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.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -65,7 +68,8 @@ private fun JoinSpaceContent(modifier: Modifier) {
     val state by viewModel.state.collectAsState()
     Column(
         modifier
-            .fillMaxWidth()
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
             .padding(16.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -85,7 +89,9 @@ private fun JoinSpaceContent(modifier: Modifier) {
             text = stringResource(R.string.onboard_space_join_subtitle),
             style = AppTheme.appTypography.subTitle1.copy(color = AppTheme.colorScheme.textDisabled),
             textAlign = TextAlign.Center,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 8.dp)
         )
         Spacer(modifier = Modifier.weight(1f))
         PrimaryButton(

app/src/main/java/com/canopas/yourspace/ui/flow/journey/components/LocationHistory.kt

@@ -14,8 +14,10 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material3.Button
@@ -277,7 +279,9 @@ fun DottedTimeline(isSteadyLocation: Boolean, isLastItem: Boolean) {
 @Composable
 fun EmptyHistory() {
     Column(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState()),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center
     ) {

app/src/main/java/com/canopas/yourspace/ui/flow/settings/SettingsScreen.kt

@@ -114,7 +114,7 @@ private fun SettingsContent(modifier: Modifier) {
             ProfileView(user = it) { viewModel.editProfile() }
             HorizontalDivider(
                 modifier = Modifier
-                    .padding(bottom = 24.dp)
+                    .padding(bottom = 20.dp)
                     .fillMaxWidth(),
                 color = AppTheme.colorScheme.outline
             )
@@ -152,7 +152,7 @@ private fun OtherSettingsContent(viewModel: SettingsViewModel) {
         textAlign = TextAlign.Start,
         modifier = Modifier
             .fillMaxWidth()
-            .padding(start = 16.dp)
+            .padding(start = 16.dp, top = 16.dp)
     )
 
     SettingsItem(
@@ -204,7 +204,7 @@ private fun SpaceSettingsContent(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(bottom = 24.dp)
+            .padding(bottom = 12.dp)
     ) {
         Text(
             text = stringResource(id = R.string.setting_spaces),

data/src/main/java/com/canopas/yourspace/data/utils/Config.kt

@@ -2,7 +2,7 @@ package com.canopas.yourspace.data.utils
 
 object Config {
 
-    const val PRIVACY_POLICY_URL = "https://canopas.github.io/your-space/"
+    const val PRIVACY_POLICY_URL = "https://canopas.github.io/your-space-android/"
 
     const val FIRESTORE_COLLECTION_USERS = "users"
     const val FIRESTORE_COLLECTION_USER_SESSIONS = "user_sessions"