Skip to content

Some bugs fixed #3

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

Merged
steve1rm merged 2 commits into from
Jun 8, 2025
Merged

Some bugs fixed #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04497f4
Some bugs fixed
rainxchzed Jun 8, 2025
b450412
Some bugs fixed
rainxchzed Jun 8, 2025
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
16 changes: 9 additions & 7 deletions ...tlin/me/androidbox/core/presentation/designsystem/textfields/NoteMarkPasswordTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,14 @@ fun NoteMarkPasswordTextField(
) {
var isFocused by remember { mutableStateOf(false) }

val errorSupportColor = if (errorText == null) MaterialTheme.colorScheme.primary
else MaterialTheme.colorScheme.error

val inputBorder = if (isFocused || errorText != null && !isFocused) {
val inputBorder = if (!isFocused && errorText != null) {
Modifier.border(
1.dp, MaterialTheme.colorScheme.error,
RoundedCornerShape(12.dp)
)
} else if (isFocused) {
Modifier.border(
1.dp, errorSupportColor,
1.dp, MaterialTheme.colorScheme.primary,
RoundedCornerShape(12.dp)
)
} else Modifier
Expand Down Expand Up @@ -130,15 +132,15 @@ fun NoteMarkPasswordTextField(
}
)

if (isFocused && supportText != null && errorText == null) {
if (isFocused && supportText != null) {
Text(
text = supportText,
fontSize = 15.sp,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}

if (errorText != null) {
if (!isFocused && errorText != null) {
Text(
text = errorText,
fontSize = 15.sp,
Expand Down
16 changes: 9 additions & 7 deletions ...nMain/kotlin/me/androidbox/core/presentation/designsystem/textfields/NoteMarkTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ fun NoteMarkTextField(
errorText: String? = null,
) {
var isFocused by remember { mutableStateOf(false) }
val errorSupportColor = if (errorText == null) MaterialTheme.colorScheme.primary
else MaterialTheme.colorScheme.error

val inputBorder = if (isFocused || errorText != null && !isFocused) {
val inputBorder = if (!isFocused && errorText != null) {
Modifier.border(
1.dp, errorSupportColor,
1.dp, MaterialTheme.colorScheme.error,
RoundedCornerShape(12.dp)
)
} else if (isFocused) {
Modifier.border(
1.dp, MaterialTheme.colorScheme.primary,
RoundedCornerShape(12.dp)
)
} else Modifier
Expand Down Expand Up @@ -78,7 +81,6 @@ fun NoteMarkTextField(
.onFocusChanged { focusState ->
isFocused = focusState.isFocused
},
cursorBrush = SolidColor(errorSupportColor),
singleLine = true,
textStyle = TextStyle(
color = MaterialTheme.colorScheme.onSurface,
Expand All @@ -98,15 +100,15 @@ fun NoteMarkTextField(
}
)

if (isFocused && supportText != null && errorText == null) {
if (isFocused && supportText != null) {
Text(
text = supportText,
fontSize = 15.sp,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}

if (errorText != null) {
if (!isFocused && errorText != null) {
Text(
text = errorText,
fontSize = 15.sp,
Expand Down
12 changes: 11 additions & 1 deletion ...oseApp/src/commonMain/kotlin/me/androidbox/startup/presentation/LandingLandscapeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,23 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.calculateEndPadding
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import me.androidbox.core.presentation.designsystem.theming.NoteMarkTheme
import me.androidbox.startup.presentation.components.LandingContent
Expand All @@ -27,10 +35,11 @@ fun LandingLandscapeScreen(
onGettingStartedClick: () -> Unit,
onLoginClick: () -> Unit,
) {

Box(
modifier = modifier
.fillMaxSize()
.background(color = Color(0xffE0EAFF)),
.background(color = Color(0xffE0EAFF))
) {
Row(
modifier = Modifier
Expand All @@ -48,6 +57,7 @@ fun LandingLandscapeScreen(
LandingContent(
modifier = Modifier
.weight(1f)
.padding(WindowInsets.safeDrawing.asPaddingValues())
.background(
color = MaterialTheme.colorScheme.surfaceContainerLowest,
shape = RoundedCornerShape(topStart = 20.dp, bottomStart = 20.dp)
Expand Down