Skip to content

Fix layout issues on AccountScreen #702

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
yuni-ju merged 2 commits into from
Oct 29, 2025
Merged

Fix layout issues on AccountScreen #702

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
fb48056
#698 [bug] Add systemBarsPadding to AccountScreen
yuni-ju Oct 28, 2025
5c683b8
#698 [bug] Fix unwanted default background color showing
yuni-ju Oct 28, 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
4 changes: 2 additions & 2 deletions presentation/src/main/java/daily/dayo/presentation/screen/account/AccountScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package daily.dayo.presentation.screen.account

import android.annotation.SuppressLint
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
Expand All @@ -9,6 +8,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.material3.BottomSheetScaffold
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.SheetValue
Expand All @@ -28,7 +28,6 @@ import daily.dayo.presentation.theme.Dark
import daily.dayo.presentation.view.dialog.getBottomSheetDialogState
import kotlinx.coroutines.launch

@SuppressLint("UnusedMaterialScaffoldPaddingParameter")
@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun AccountScreen(
Expand All @@ -44,6 +43,7 @@ internal fun AccountScreen(
val animatedDimAlpha by animateFloatAsState(targetValue = bottomSheetDimAlpha)

BottomSheetScaffold(
modifier = Modifier.systemBarsPadding(),
scaffoldState = bottomSheetState,
sheetDragHandle = null,
sheetContent = {
Expand Down
65 changes: 30 additions & 35 deletions presentation/src/main/java/daily/dayo/presentation/screen/account/SignInEmailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,51 +137,46 @@ fun SignInEmailScreen(
emailState.value.isNotBlank() && passwordState.value.isNotBlank()
}

Surface(
Column(
modifier = Modifier
.background(White_FFFFFF)
.fillMaxSize()
.background(DayoTheme.colorScheme.background),
verticalArrangement = Arrangement.Top
) {
SignInEmailActionbarLayout(onBackClick = onBackClick)
Column(
modifier = Modifier.fillMaxSize(),
modifier = Modifier
.padding(horizontal = 20.dp, vertical = 0.dp)
.fillMaxWidth()
.wrapContentSize(),
verticalArrangement = Arrangement.Top
) {
SignInEmailActionbarLayout(onBackClick = onBackClick)
Column(
Spacer(
modifier = Modifier
.background(White_FFFFFF)
.padding(horizontal = 20.dp, vertical = 0.dp)
.fillMaxWidth()
.wrapContentSize(),
verticalArrangement = Arrangement.Top
) {
Spacer(
modifier = Modifier
.fillMaxWidth()
.height(8.dp)
)
SignInEmailTitle()
Spacer(
modifier = Modifier
.fillMaxWidth()
.height(20.dp)
)
SignInEmailInputLayout(
emailValue = emailState.value,
onEmailChange = { emailState.value = it },
passwordValue = passwordState.value,
onPasswordChange = { passwordState.value = it },
onForgetPasswordClick = onForgetPasswordClick,
onSignInClick = { onSignInClick(emailState.value, passwordState.value) }
)
}
Spacer(modifier = Modifier.weight(1f))
SignInEmailBottomLayout(
onSignUpClick = onSignUpClick,
onSignInClick = { onSignInClick(emailState.value, passwordState.value) },
isSignInButtonEnabled = isSignInButtonEnabled
.height(8.dp)
)
SignInEmailTitle()
Spacer(
modifier = Modifier
.fillMaxWidth()
.height(20.dp)
)
SignInEmailInputLayout(
emailValue = emailState.value,
onEmailChange = { emailState.value = it },
passwordValue = passwordState.value,
onPasswordChange = { passwordState.value = it },
onForgetPasswordClick = onForgetPasswordClick,
onSignInClick = { onSignInClick(emailState.value, passwordState.value) }
)
}
Spacer(modifier = Modifier.weight(1f))
SignInEmailBottomLayout(
onSignUpClick = onSignUpClick,
onSignInClick = { onSignInClick(emailState.value, passwordState.value) },
isSignInButtonEnabled = isSignInButtonEnabled
)
}
}

Expand Down