From ec9db509cfaa62dce1c04d156aba19e717bf9e77 Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Mon, 23 Mar 2026 03:01:56 +0200 Subject: [PATCH] Prep screens we want user to have --- .../ui/composable/CreateProfileScreen.kt | 8 +-- .../aux/compose/ui/composable/FeedScreen.kt | 57 +++++++++++++++++++ .../compose/ui/composable/LandingScreen.kt | 4 +- .../ui/composable/SocialPreconditionScreen.kt | 52 +++++++++++++++++ .../ui/composable/navigation/AuxNavHost.kt | 2 +- 5 files changed, 116 insertions(+), 7 deletions(-) create mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/FeedScreen.kt create mode 100644 composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SocialPreconditionScreen.kt diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/CreateProfileScreen.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/CreateProfileScreen.kt index faacac4f..0d88b808 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/CreateProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/CreateProfileScreen.kt @@ -97,7 +97,7 @@ fun CreateProfileScreen( modifier = Modifier.fillMaxWidth(), value = createProfileViewModel.createProfileFormState.nameField.text.value, onValueChange = { - + createProfileViewModel.createProfileFormState.nameField.text.value = it }, isError = createProfileViewModel.createProfileFormState.nameField.errorMessage.value != null, supportingText = createProfileViewModel.createProfileFormState.nameField.errorMessage.value?.let { @@ -112,7 +112,7 @@ fun CreateProfileScreen( }, maxLines = 1, keyboardOptions = KeyboardOptions( - keyboardType = KeyboardType.Phone, + keyboardType = KeyboardType.Text, ), label = { Text( @@ -144,7 +144,7 @@ fun CreateProfileScreen( modifier = Modifier.fillMaxWidth(), value = createProfileViewModel.createProfileFormState.biographyField.text.value, onValueChange = { - + createProfileViewModel.createProfileFormState.biographyField.text.value = it }, isError = createProfileViewModel.createProfileFormState.biographyField.errorMessage.value != null, supportingText = createProfileViewModel.createProfileFormState.biographyField.errorMessage.value?.let { @@ -159,7 +159,7 @@ fun CreateProfileScreen( }, maxLines = 1, keyboardOptions = KeyboardOptions( - keyboardType = KeyboardType.Phone, + keyboardType = KeyboardType.Text, ), label = { Text( diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/FeedScreen.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/FeedScreen.kt new file mode 100644 index 00000000..c1ffd679 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/FeedScreen.kt @@ -0,0 +1,57 @@ +package ac.aux.compose.ui.composable + +import ac.aux.compose.ui.theme.AuxTheme +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +@Composable +fun FeedScreen( + text: String +) { + + Scaffold { innerPadding -> + Column( + modifier = Modifier.padding(innerPadding).fillMaxSize() + ) { + // Notes + // Stories/Reels + // Pictures + // Private Messages (deferred to another app) + // Notifications + Column( + modifier = Modifier.padding(20.dp).fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + "\"$text\" functionality coming soon", + + ) + } + } + } +} + +@Preview +@Composable +private fun FeedScreenPreview() { + AuxTheme { + Surface( + modifier = Modifier.padding(20.dp) + ) { + FeedScreen( + "Feed" + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LandingScreen.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LandingScreen.kt index fd97a437..40342203 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LandingScreen.kt +++ b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/LandingScreen.kt @@ -69,7 +69,7 @@ fun LandingScreen( } Text( - text = "Sign in to Torch via nsec, or remote signer", + text = "Sign in to Aux via nsec, or remote signer", modifier = Modifier.padding(10.dp), style = MaterialTheme.typography.labelSmall, textAlign = TextAlign.Center @@ -89,7 +89,7 @@ fun LandingScreen( } Text( - text = "If you are new to Torch or just want to create a fresh profile", + text = "If you are new to Aux or just want to create a fresh profile", modifier = Modifier.padding(10.dp), style = MaterialTheme.typography.labelSmall, textAlign = TextAlign.Center diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SocialPreconditionScreen.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SocialPreconditionScreen.kt new file mode 100644 index 00000000..01cc5244 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/SocialPreconditionScreen.kt @@ -0,0 +1,52 @@ +package ac.aux.compose.ui.composable + +import ac.aux.compose.ui.theme.AuxTheme +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +@Composable +fun SocialPreconditionScreen( + text: String +) { + Scaffold { innerPadding -> + Column( + modifier = Modifier.padding(innerPadding).fillMaxSize() + ) { + // Invite A Friend + // Accept an invite + Column( + modifier = Modifier.padding(20.dp).fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + "\"$text\" functionality coming soon", + ) + } + } + } +} + +@Preview +@Composable +private fun SocialPreconditionScreenPreview() { + AuxTheme { + Surface( + modifier = Modifier.padding(20.dp) + ) { + SocialPreconditionScreen( + "Social Precondition" + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/AuxNavHost.kt b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/AuxNavHost.kt index 8eb8cf38..ab6c6e0e 100644 --- a/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/AuxNavHost.kt +++ b/composeApp/src/commonMain/kotlin/ac/aux/compose/ui/composable/navigation/AuxNavHost.kt @@ -46,7 +46,7 @@ fun AuxNavHost( CreateProfileScreen( onNavigateToChatListRoute = { navController.navigate( - route = ImplementationPendingRoute("Chat List") + route = ImplementationPendingRoute("Feed") ) } )