Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds Realm Email Verification #28

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Adds Realm Email Verification #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbb4971
Implements email verification toasts
griffinht Feb 13, 2024
693c4e4
mongo error
Brendon-Hablutzel Feb 20, 2024
39f00af
Revert dependency changes
IAmThe2ndHuman Feb 21, 2024
86d261b
Merge remote-tracking branch 'origin/23-email-verification' into 23-e…
IAmThe2ndHuman Feb 21, 2024
4b43c48
Revert dependency changes (again)
IAmThe2ndHuman Feb 21, 2024
55f4a1d
add sign in with google page
Brendon-Hablutzel Apr 18, 2024
17e54c9
add google logo as resource
Brendon-Hablutzel Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 17 additions & 197 deletions app/src/main/java/com/ncsuadc/marigold_android/ui/home/SignInScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,30 @@
package com.ncsuadc.marigold_android.ui.home

//import android.content.Intent
import android.content.Intent
import android.content.res.Configuration
import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.clickable
import androidx.compose.foundation.Image
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.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.ClickableText
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowForward
import androidx.compose.material3.Icon
import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.unit.sp
import com.ncsuadc.marigold_android.ui.home.shared.GradientButton
import com.ncsuadc.marigold_android.ui.home.shared.SIGN_UP_TITLE_STYLE
import androidx.compose.ui.res.painterResource
import com.ncsuadc.marigold_android.ui.home.shared.TitleText
import com.ncsuadc.marigold_android.ui.theme.MarigoldTheme
//import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextAlign
import com.ncsuadc.marigold_android.ui.home.shared.InvalidBanner
import com.ncsuadc.marigold_android.ui.home.shared.OnboardingTextField
import com.ncsuadc.marigold_android.R

class SignInScreen : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down Expand Up @@ -90,8 +61,18 @@ private fun SignInColumnPreview() {
}
}



@Composable
private fun GoogleSignInButton(modifier: Modifier = Modifier) {
Button(
modifier = Modifier.fillMaxWidth(),
onClick = { /*TODO*/ }) {
Image(
painter = painterResource(id = R.drawable.ic_google_logo),
contentDescription = ""
)
Text(text = "Sign in with Google", modifier = Modifier.padding(6.dp))
}
}


@Composable
Expand All @@ -102,170 +83,9 @@ private fun SignInColumn(modifier: Modifier = Modifier) {
.padding(all = 22.dp)
.then(modifier)
) {

TitleText()
Spacer(modifier = Modifier.padding(17.dp))
SignInText()
Spacer(modifier = Modifier.padding(12.dp))
SignInForm()


}
}


@Composable
private fun SignInText(modifier: Modifier = Modifier) {
val context = LocalContext.current
val greeting = buildAnnotatedString {
withStyle(SIGN_UP_TITLE_STYLE.toSpanStyle()) {
append("Welcome Back!\n")
}
append("Don't have an account? ")
pushStringAnnotation(tag = "sign-up", annotation = "sign-up")
withStyle(
SpanStyle(
color = Color(0xffffb320),
textDecoration = TextDecoration.Underline
)
) {
append("Sign Up ")
}
pop()

}
//Clickable text that only responds to clicks on the 37th character (start of "Sign Up" button
ClickableText(
onClick = { offset ->
if(offset in 37..44){
context.startActivity(Intent(context, SignUpActivity::class.java))
}
},
text= greeting,
style = TextStyle(fontSize = 15.sp, fontWeight = FontWeight.Bold),
modifier = modifier
)

}




@Composable
private fun SignInForm(modifier: Modifier = Modifier) {

// val context = LocalContext.current

var validationFailed by remember { mutableStateOf(false) }

var email by remember { mutableStateOf("") }
var emailValid by remember { mutableStateOf(EmailValidationState.VALID) }
val emailValidation = {
emailValid = if (email.isBlank()) {
EmailValidationState.EMPTY
} else if (!email.endsWith("@ncsu.edu") || email.startsWith("@ncsu.edu")) {
EmailValidationState.NOT_NC_STATE
} else {
EmailValidationState.VALID
}

emailValid == EmailValidationState.VALID
GoogleSignInButton()
}

var password by remember { mutableStateOf("") }
var passwordValid by remember { mutableStateOf(PasswordValidationState.VALID) }
val passwordValidation = {
passwordValid = if (password.isBlank()) {
PasswordValidationState.EMPTY
} else {
PasswordValidationState.VALID
}

passwordValid == PasswordValidationState.VALID
}


val allValid = {
val emailValidated = emailValidation()
val passwordValidated = passwordValidation()

emailValidated && passwordValidated
}

Column(modifier = modifier) {
if (emailValid != EmailValidationState.VALID) InvalidBanner(emailValid.description)
OnboardingTextField(
label = "E-Mail",
value = email,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email, imeAction = ImeAction.Next),
onValueChange = {
email = it
if (validationFailed) emailValidation()
},
isError = emailValid != EmailValidationState.VALID
)
if (passwordValid != PasswordValidationState.VALID) InvalidBanner(passwordValid.description)
else Spacer(modifier = Modifier.padding(8.dp))
OnboardingTextField(
label = "Password",
password = true, value = password,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Next),
onValueChange = {
password = it
if (validationFailed) passwordValidation()
},
isError = passwordValid != PasswordValidationState.VALID
)

Spacer(modifier = Modifier.padding(4.dp))

//Text with flow to forgot password screen
Row {
Text(
"Forgot Password?",
textAlign = TextAlign.Right,
modifier = Modifier.fillMaxWidth(),
style = TextStyle(
color = Color(0xffffb320),
textDecoration = TextDecoration.Underline,
fontWeight = FontWeight.Bold
)
)
}

Spacer(modifier = Modifier.padding(14.dp)) //Bigger space for aesthetics, change? TODO
GradientButton(
gradient = Brush.horizontalGradient(
colors = listOf(Color(0xffffe501), Color(0xffffb320))
),
modifier = Modifier
.fillMaxWidth(),
onClick = {
if (allValid()) {
// go to other screen
// context.startActivity(Intent(context, VerifyEmailSignUpActivity::class.java))
} else if (!validationFailed) {
validationFailed = true
}
}

) {
Text("Sign In", style = TextStyle(fontSize = 16.sp, fontWeight = FontWeight.Bold))
Spacer(modifier = Modifier.weight(1f))
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowForward,
contentDescription = "Sign In",
modifier = Modifier.width(24.dp))
}


}

}







Loading