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

Fixed paddings on horizontal mode #1353

Open
wants to merge 3 commits into
base: main-ose
Choose a base branch
from
Open

Fixed paddings on horizontal mode #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
004b5fb
Fixed paddings
ArnyminerZ Mar 20, 2025
5021526
Merge branch 'main-ose' into 1346-ui-elements-partially-obscured-in-l…
ArnyminerZ Mar 26, 2025
36f5848
Added padding to all screens
ArnyminerZ Mar 26, 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
2 changes: 0 additions & 2 deletions app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsDrawerHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
Expand Down Expand Up @@ -82,7 +81,6 @@ abstract class AccountsDrawerHandler {
Column(modifier = Modifier
.fillMaxWidth()
.verticalScroll(rememberScrollState())
.navigationBarsPadding()
) {
BrandingHeader()

Expand Down
13 changes: 11 additions & 2 deletions app/src/main/kotlin/at/bitfire/davdroid/ui/AppTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ import androidx.activity.SystemBarStyle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.displayCutoutPadding
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.SideEffect
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clipToBounds
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
Expand Down Expand Up @@ -44,8 +50,11 @@ fun AppTheme(
M3ColorScheme.lightScheme
else
M3ColorScheme.darkScheme,
content = content
)
) {
Box(Modifier.fillMaxSize().displayCutoutPadding().navigationBarsPadding().clipToBounds()) {
content()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using this approach, it seems the status bar itself is no longer properly colored. Any idea how to fix that?

Copy link
Contributor

@mbiebl mbiebl Apr 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting the surface color to Color.Red better demonstrate the issue.

Before (status bar uses Red as color)

Screenshot_20250403_212314

After (status bar color is not correctly set

Screenshot_20250403_212709?

}
}
}

// Track if the app is in the foreground
Expand Down