From 20ef16d30f034aa54b72391af0d432511582e163 Mon Sep 17 00:00:00 2001 From: Alondra Sanchez <89600410+alondras1@users.noreply.github.com> Date: Wed, 23 Mar 2022 12:24:33 -0700 Subject: [PATCH 01/15] test for signup connection --- .idea/.name | 1 + .idea/codeStyles/Project.xml | 123 ++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/deploymentTargetDropDown.xml | 10 +- .../com/ottogo/weekly/api/WeeklyApiService.kt | 2 + .../ottogo/weekly/ui/components/Message.kt | 2 +- .../com/ottogo/weekly/ui/login/LandingPage.kt | 58 ++++-- .../weekly/ui/login/SignupBirthdayPage.kt | 11 +- .../com/ottogo/weekly/ui/login/SignupPage.kt | 175 +++++++++++++++++- 9 files changed, 358 insertions(+), 29 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..5ebbc93 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Weekly \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index c5fefdb..2fdf5a4 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,17 +1,17 @@ - + - + - + - - + + \ No newline at end of file diff --git a/app/src/main/java/com/ottogo/weekly/api/WeeklyApiService.kt b/app/src/main/java/com/ottogo/weekly/api/WeeklyApiService.kt index 4258dd6..c41f46d 100644 --- a/app/src/main/java/com/ottogo/weekly/api/WeeklyApiService.kt +++ b/app/src/main/java/com/ottogo/weekly/api/WeeklyApiService.kt @@ -27,6 +27,8 @@ private val retrofit = Retrofit.Builder() interface WeeklyApiService { @POST("api/account/login/") suspend fun login(@Body body: Map) + @POST("api/account/create/") + suspend fun signup(@Body body: Map) : Map } diff --git a/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt b/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt index 8d7b876..1b7fedc 100644 --- a/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt +++ b/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt @@ -19,7 +19,7 @@ import androidx.navigation.NavController @Composable -fun Message(navController: NavController, message: String) { +fun Message(message: String) { diff --git a/app/src/main/java/com/ottogo/weekly/ui/login/LandingPage.kt b/app/src/main/java/com/ottogo/weekly/ui/login/LandingPage.kt index 076077c..c15e81d 100644 --- a/app/src/main/java/com/ottogo/weekly/ui/login/LandingPage.kt +++ b/app/src/main/java/com/ottogo/weekly/ui/login/LandingPage.kt @@ -1,43 +1,75 @@ package com.ottogo.weekly.ui.login +import android.graphics.Color import android.os.Bundle import android.util.Log +import android.widget.TextView import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.background +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.* import androidx.compose.material.MaterialTheme import androidx.compose.material.Surface import androidx.compose.material.Text import androidx.compose.runtime.* import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.focusModifier +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.navigation.NavController import com.ottogo.weekly.api.WeeklyApi import com.ottogo.weekly.ui.components.CustomButton +import com.ottogo.weekly.ui.theme.nunitoFamily import kotlinx.coroutines.runBlocking +import java.time.format.TextStyle @Composable fun LandingPage(navController: NavController) { + Column(modifier = Modifier.padding(24.dp)){ - Column(){ + displayTitle("Weekly") + displayGreeting("Make your best memories") - CustomButton(buttonText = "Sign up"){ - runBlocking { - navController.navigate("signupBirthdayPage") + + Spacer(modifier = Modifier.padding(187.dp)) + CustomButton(buttonText = "Sign up") { + runBlocking { + navController.navigate("signupBirthdayPage") + } + Modifier.height(48.dp) } - } - CustomButton(buttonText = "Login"){ - runBlocking { - navController.navigate("loginPage") + Spacer(modifier = Modifier.height(15.dp)) + CustomButton(buttonText = "Login") { + runBlocking { + navController.navigate("loginPage") + } } } - } -} \ No newline at end of file +} + +@Composable +fun displayTitle(appName: String) { + Spacer(modifier = Modifier.height(65.dp)) + Text(text = appName, + fontSize = 48.sp, + fontWeight = FontWeight(700), + fontFamily = nunitoFamily + ) +} +@Composable +fun displayGreeting(greeting: String) { + Spacer(modifier = Modifier.height(17.dp)) + Text(text = greeting, + fontSize = 24.sp, + fontWeight = FontWeight(700), + fontFamily = nunitoFamily) +} diff --git a/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt b/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt index 11ac590..2d05d07 100644 --- a/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt +++ b/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt @@ -7,6 +7,7 @@ import androidx.activity.compose.setContent import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width import androidx.compose.material.MaterialTheme import androidx.compose.material.Surface import androidx.compose.material.Text @@ -16,6 +17,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.navigation.NavController +import com.ottogo.weekly.ui.components.CustomButton +import kotlinx.coroutines.runBlocking /* * @@ -33,7 +36,13 @@ fun SignupBirthdayPage(navController: NavController) { Column(){ - + Text(text ="birthday page") + CustomButton(buttonText = "Sign up") { + runBlocking { + navController.navigate("signupPage/{dob}") + } + Modifier.width(27.dp) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt b/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt index c8d7a8e..d4cce94 100644 --- a/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt +++ b/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt @@ -1,21 +1,37 @@ package com.ottogo.weekly.ui.login +import android.graphics.Paint import android.os.Bundle import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import androidx.compose.animation.expandHorizontally +import androidx.compose.animation.expandVertically +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement.Absolute.Center +import androidx.compose.foundation.layout.Arrangement.Absolute.aligned +import androidx.compose.material.* +import androidx.compose.material.icons.materialIcon import androidx.compose.runtime.* import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.focusModifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.navigation.NavController +import com.ottogo.weekly.api.WeeklyApi +import com.ottogo.weekly.ui.components.CustomButton +import com.ottogo.weekly.ui.components.CustomTextField +import com.ottogo.weekly.ui.login.ui.components.Message +import com.ottogo.weekly.ui.theme.nunitoFamily +import kotlinx.coroutines.runBlocking +import retrofit2.HttpException +import java.io.IOException /* * @@ -30,13 +46,154 @@ import androidx.navigation.NavController * Try your best! Please don't hesitate to ask any questions * * */ + + +// todo : implement Shriya's custom text fields +// question : is alignment and padding correct? +// question : Are we using Scaffold/ floating action button ? +// what am I recieving from birthday? +// getting string value +// todo: add response errors + @Composable -fun SignupPage(navController: NavController, dob: String) { +fun SignupPage(navController: NavController, dob: String = "2001-07-10") { + val phoneNumber = remember { mutableStateOf("") } + val username = remember { mutableStateOf("") } + val password = remember { mutableStateOf("") } + var error: String? by remember {mutableStateOf(value = null)} + + Column(horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 24.dp) + ){ + Box( + modifier = Modifier.fillMaxWidth() + ){ + //todo : add navigation back button + Spacer(modifier = Modifier.height(64.dp)) + displaySignupTitle(title = "Sign Up") + } + if (error != null){ + Spacer(modifier = Modifier.height(32.dp)) + Message(error.toString()) + } + // phone text field + Spacer(modifier = Modifier.height(32.dp)) + CustomTextField( + helper = "Phone", + hint = "9517596842", + input = phoneNumber.value, + onChange = { phoneNumber.value = it }) + // username text field + Spacer(modifier = Modifier.height(24.dp)) + CustomTextField( + helper = "Username", + hint = "Username", + input = username.value, + onChange = { username.value = it }) - Column(){ + // Password text field + Spacer(modifier = Modifier.height(24.dp)) + CustomTextField( + helper = "Password", + hint = "Password", + input = password.value, + onChange = { password.value = it }) + // todo : navigate to verify page and pass token to verify page + Spacer(modifier = Modifier.height(25.dp)) + CustomButton(buttonText = "Sign Up") { + runBlocking { + navController.navigate("signupVerifyPage/{token}") + try{ + WeeklyApi.retrofitService.signup(mapOf( + "phone" to phoneNumber.toString(), + "username" to username.toString(), + "password" to password.toString(), + "dob" to dob)) + } catch(e:Exception){ + when(e){ + is HttpException -> { + val statuscode = e.code() + if(statuscode == 400){ + error = "400 error" + } + if(statuscode == 500){ + error = "500 error" + } + } + is IOException -> { + error = "Check your connection" + } + } + } + + } + } + + Spacer(modifier = Modifier.height(32.dp)) + Text( + //modifier = Modifier.size(250.dp), + text = "By tapping \"Sign Up\", I agree to", + fontSize = 14.sp, + fontFamily = nunitoFamily, + color = Color.Gray + ) + // todo : policy and eula in row + Row() { + Text( + text = "Privacy Policy" , + fontFamily = nunitoFamily, + fontSize = 14.sp, + color = Color.Gray + ) + Spacer(modifier = Modifier.width(16.dp)) + Text( + text = "EULA", + fontFamily = nunitoFamily, + fontSize = 14.sp, + color = Color.Gray + ) + } + + } } -} \ No newline at end of file + +@Composable +fun displaySignupTitle(title: String) { + Spacer(modifier = Modifier.height(44.dp)) + Text(text = title, + fontSize = 42.sp, + fontWeight = FontWeight(700), + fontFamily = nunitoFamily + ) +} + +@Composable +fun displayTextFieldTitle(title: String){ + Text(text = title, + textAlign = TextAlign.Left, + fontSize = 16.sp, + fontWeight = FontWeight(700), + fontFamily = nunitoFamily + ) +} + +// todo: make red box +@Composable +fun ErrorMessage500(){ + Text(text = "We are experiencing issues please try again later", + fontFamily = nunitoFamily, + color = Color.Red) +} +@Composable +fun ErrorMessage400(){ + Text(text = "an unexpected error occurred", + fontFamily = nunitoFamily, + color = Color.Red) +} + From e56534baad40f3d190ecbae69a6392881009916b Mon Sep 17 00:00:00 2001 From: Alondra Sanchez <89600410+alondras1@users.noreply.github.com> Date: Wed, 23 Mar 2022 12:32:08 -0700 Subject: [PATCH 02/15] test for signup connection --- .../com/ottogo/weekly/ui/login/SignupPage.kt | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt b/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt index d4cce94..4b45f3c 100644 --- a/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt +++ b/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt @@ -109,20 +109,23 @@ fun SignupPage(navController: NavController, dob: String = "2001-07-10") { runBlocking { navController.navigate("signupVerifyPage/{token}") - try{ - WeeklyApi.retrofitService.signup(mapOf( - "phone" to phoneNumber.toString(), - "username" to username.toString(), - "password" to password.toString(), - "dob" to dob)) - } catch(e:Exception){ - when(e){ + try { + WeeklyApi.retrofitService.signup( + mapOf( + "phone" to phoneNumber.toString(), + "username" to username.toString(), + "password" to password.toString(), + "dob" to dob + ) + ) + } catch (e: Exception) { + when (e) { is HttpException -> { val statuscode = e.code() - if(statuscode == 400){ + if (statuscode == 400) { error = "400 error" } - if(statuscode == 500){ + if (statuscode == 500) { error = "500 error" } } From f06f88d369740fd4ea47d521b57de98140b8a0de Mon Sep 17 00:00:00 2001 From: Alondra Sanchez <89600410+alondras1@users.noreply.github.com> Date: Wed, 23 Mar 2022 12:34:14 -0700 Subject: [PATCH 03/15] test for signup connection --- app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt b/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt index 4b45f3c..2f4bf66 100644 --- a/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt +++ b/app/src/main/java/com/ottogo/weekly/ui/login/SignupPage.kt @@ -138,6 +138,7 @@ fun SignupPage(navController: NavController, dob: String = "2001-07-10") { } } + //test Spacer(modifier = Modifier.height(32.dp)) Text( //modifier = Modifier.size(250.dp), From 253bc57a5173172469bc3087c20055fff7d92c93 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 07:55:27 -0800 Subject: [PATCH 04/15] delete signup birthday page --- .../weekly/ui/login/SignupBirthdayPage.kt | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt diff --git a/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt b/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt deleted file mode 100644 index 2d05d07..0000000 --- a/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt +++ /dev/null @@ -1,48 +0,0 @@ -package com.ottogo.weekly.ui.login - -import android.os.Bundle -import android.util.Log -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text -import androidx.compose.runtime.* -import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.navigation.NavController -import com.ottogo.weekly.ui.components.CustomButton -import kotlinx.coroutines.runBlocking - -/* -* -* Built by: Linda -* -* Follow the guides of the figma file -* use a date picker dialog to pick the date, verify the age is over 13 -* otherwise show a message that the user is too young -* pass the date to the signup view as a string that follows the format YYYY-MM-DD -* -* */ -@Composable -fun SignupBirthdayPage(navController: NavController) { - - - - Column(){ - Text(text ="birthday page") - CustomButton(buttonText = "Sign up") { - runBlocking { - navController.navigate("signupPage/{dob}") - } - Modifier.width(27.dp) - } - - } -} \ No newline at end of file From ffee72227eba229bb7fa71791155a32263f2ce42 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 07:55:51 -0800 Subject: [PATCH 05/15] delete messages.kt --- .../ottogo/weekly/ui/components/Message.kt | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 app/src/main/java/com/ottogo/weekly/ui/components/Message.kt diff --git a/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt b/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt deleted file mode 100644 index 1b7fedc..0000000 --- a/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.ottogo.weekly.ui.login.ui.components - -import android.os.Bundle -import android.util.Log -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text -import androidx.compose.runtime.* -import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.navigation.NavController - - -@Composable -fun Message(message: String) { - - - - Text(message) -} \ No newline at end of file From 73c1a19932119cb6acbfdeb7f00ecf00178b6708 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:02:13 -0800 Subject: [PATCH 06/15] ignore --- .idea/.name | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 5ebbc93..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Weekly \ No newline at end of file From b2a94197beae143943d203b629e5bb158b8c74be Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:02:28 -0800 Subject: [PATCH 07/15] ignore --- .idea/codeStyles/Project.xml | 123 ----------------------------------- 1 file changed, 123 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 7643783..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - \ No newline at end of file From e637f309d8ee695808e6c2a85df7cbb8a0260a64 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:02:39 -0800 Subject: [PATCH 08/15] ignore --- .idea/codeStyles/codeStyleConfig.xml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file From a0582748ddad7bbff8460284c08b0e8404c2b4c6 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:02:49 -0800 Subject: [PATCH 09/15] ignore --- .idea/deploymentTargetDropDown.xml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 2fdf5a4..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file From 7ee5d8a026b1ccd75c05684c36b6ca6752ebac7b Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:25:23 -0800 Subject: [PATCH 10/15] Revert "ignore" This reverts commit a0582748ddad7bbff8460284c08b0e8404c2b4c6. --- .idea/deploymentTargetDropDown.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..2fdf5a4 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file From afa2dabb6de41bd98ed4c3d1fdb792b64ec983a9 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:25:31 -0800 Subject: [PATCH 11/15] Revert "ignore" This reverts commit e637f309d8ee695808e6c2a85df7cbb8a0260a64. --- .idea/codeStyles/codeStyleConfig.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file From 2654647e5ee423e6e97c7b557b527c48f4099210 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:25:37 -0800 Subject: [PATCH 12/15] Revert "ignore" This reverts commit b2a94197beae143943d203b629e5bb158b8c74be. --- .idea/codeStyles/Project.xml | 123 +++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file From 35063b2946d6bb16a7e9fe6fc375212bf8751524 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:25:41 -0800 Subject: [PATCH 13/15] Revert "ignore" This reverts commit 73c1a19932119cb6acbfdeb7f00ecf00178b6708. --- .idea/.name | 1 + 1 file changed, 1 insertion(+) create mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..5ebbc93 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Weekly \ No newline at end of file From 0d754c6c2345a118af9a05fe38918f03a7a4c407 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:25:44 -0800 Subject: [PATCH 14/15] Revert "delete messages.kt" This reverts commit ffee72227eba229bb7fa71791155a32263f2ce42. --- .../ottogo/weekly/ui/components/Message.kt | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 app/src/main/java/com/ottogo/weekly/ui/components/Message.kt diff --git a/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt b/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt new file mode 100644 index 0000000..1b7fedc --- /dev/null +++ b/app/src/main/java/com/ottogo/weekly/ui/components/Message.kt @@ -0,0 +1,27 @@ +package com.ottogo.weekly.ui.login.ui.components + +import android.os.Bundle +import android.util.Log +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.* +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController + + +@Composable +fun Message(message: String) { + + + + Text(message) +} \ No newline at end of file From 52f54fed3f24eabdf74594bdc9f8e4de64f2ee58 Mon Sep 17 00:00:00 2001 From: jonathanmw200 <70730100+jonathanmw200@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:25:48 -0800 Subject: [PATCH 15/15] Revert "delete signup birthday page" This reverts commit 253bc57a5173172469bc3087c20055fff7d92c93. --- .../weekly/ui/login/SignupBirthdayPage.kt | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt diff --git a/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt b/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt new file mode 100644 index 0000000..2d05d07 --- /dev/null +++ b/app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt @@ -0,0 +1,48 @@ +package com.ottogo.weekly.ui.login + +import android.os.Bundle +import android.util.Log +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.* +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import com.ottogo.weekly.ui.components.CustomButton +import kotlinx.coroutines.runBlocking + +/* +* +* Built by: Linda +* +* Follow the guides of the figma file +* use a date picker dialog to pick the date, verify the age is over 13 +* otherwise show a message that the user is too young +* pass the date to the signup view as a string that follows the format YYYY-MM-DD +* +* */ +@Composable +fun SignupBirthdayPage(navController: NavController) { + + + + Column(){ + Text(text ="birthday page") + CustomButton(buttonText = "Sign up") { + runBlocking { + navController.navigate("signupPage/{dob}") + } + Modifier.width(27.dp) + } + + } +} \ No newline at end of file