admin/rider-pro-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
AllenTom
2024-10-12 10:07:32 +08:00
parent c0956b3b94 a58f2da98c
commit dee954ef5e
5 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt
View File

@@ -126,7 +126,7 @@ fun ChangePasswordScreen() {
modifier = Modifier modifier = Modifier
.width(345.dp) .width(345.dp)
.height(48.dp), .height(48.dp),
text = "LET'S RIDE".uppercase(), text = "Let's Ride",
backgroundImage = R.mipmap.rider_pro_signup_red_bg backgroundImage = R.mipmap.rider_pro_signup_red_bg
) { ) {
if (validate()) { if (validate()) {

5
app/src/main/java/com/aiosman/riderpro/ui/composables/TextInputField.kt
View File

@@ -38,6 +38,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextIndent
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import com.aiosman.riderpro.R import com.aiosman.riderpro.R
@@ -92,7 +93,7 @@ fun TextInputField(
), ),
visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(), visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
singleLine = true, singleLine = true,
enabled = enabled enabled = enabled,
) )
if (password) { if (password) {
Image( Image(
@@ -110,7 +111,7 @@ fun TextInputField(
if (text.isEmpty()) { if (text.isEmpty()) {
hint?.let { hint?.let {
Text(it, color = Color(0xffdadada), fontWeight = FontWeight.W600) Text(it, modifier = Modifier.padding(start = 5.dp), color = Color(0xffdadada), fontWeight = FontWeight.W600)
} }
} }
} }

8
app/src/main/java/com/aiosman/riderpro/ui/login/emailsignup.kt
View File

@@ -197,7 +197,7 @@ fun EmailSignupScreen() {
hint = stringResource(R.string.text_hint_email), hint = stringResource(R.string.text_hint_email),
error = emailError error = emailError
) )
Spacer(modifier = Modifier.padding(8.dp)) Spacer(modifier = Modifier.padding(4.dp))
TextInputField( TextInputField(
modifier = Modifier modifier = Modifier
.fillMaxWidth(), .fillMaxWidth(),
@@ -209,7 +209,7 @@ fun EmailSignupScreen() {
hint = stringResource(R.string.text_hint_password), hint = stringResource(R.string.text_hint_password),
error = passwordError error = passwordError
) )
Spacer(modifier = Modifier.padding(8.dp)) Spacer(modifier = Modifier.padding(4.dp))
TextInputField( TextInputField(
modifier = Modifier modifier = Modifier
.fillMaxWidth(), .fillMaxWidth(),
@@ -221,7 +221,7 @@ fun EmailSignupScreen() {
hint = stringResource(R.string.text_hint_confirm_password), hint = stringResource(R.string.text_hint_confirm_password),
error = confirmPasswordError error = confirmPasswordError
) )
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(8.dp))
Column( Column(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.Start, horizontalAlignment = Alignment.Start,
@@ -253,7 +253,7 @@ fun EmailSignupScreen() {
} }
} }
Spacer(modifier = Modifier.height(64.dp)) Spacer(modifier = Modifier.height(32.dp))
Box( Box(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center

12
app/src/main/java/com/aiosman/riderpro/ui/login/userauth.kt
View File

@@ -27,6 +27,8 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import com.aiosman.riderpro.AppState import com.aiosman.riderpro.AppState
@@ -258,7 +260,10 @@ fun UserAuthScreen() {
Text( Text(
stringResource(R.string.remember_me), stringResource(R.string.remember_me),
modifier = Modifier.padding(start = 8.dp), modifier = Modifier.padding(start = 8.dp),
fontSize = 12.sp fontSize = 12.sp,
style = TextStyle(
fontWeight = FontWeight.W500
)
) )
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
Text( Text(
@@ -266,7 +271,10 @@ fun UserAuthScreen() {
fontSize = 12.sp, fontSize = 12.sp,
modifier = Modifier.noRippleClickable { modifier = Modifier.noRippleClickable {
navController.navigate(NavigationRoute.ResetPassword.route) navController.navigate(NavigationRoute.ResetPassword.route)
} },
style = TextStyle(
fontWeight = FontWeight.W500
)
) )
} }

2
app/src/main/res/values/strings.xml
View File

@@ -18,7 +18,7 @@
<string name="post_comment_hint">Say something...</string> <string name="post_comment_hint">Say something...</string>
<string name="follow_upper">FOLLOW</string> <string name="follow_upper">FOLLOW</string>
<string name="login_upper">Log in</string> <string name="login_upper">Log in</string>
<string name="lets_ride_upper">LET\'S RIDE</string> <string name="lets_ride_upper">Let\'s Ride</string>
<string name="or_login_with">or login with</string> <string name="or_login_with">or login with</string>
<string name="remember_me">Remember me.</string> <string name="remember_me">Remember me.</string>
<string name="forgot_password">Forgot password?</string> <string name="forgot_password">Forgot password?</string>