Skip to content

ui: Adjust background color to match AOSP SettingsLib #315

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
chenxiaolong merged 1 commit into from
Jul 3, 2026
Merged

ui: Adjust background color to match AOSP SettingsLib #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 app/src/main/java/com/chiller3/rsaf/ui/Preferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ object PreferenceDefaults {
val ListPadding = PaddingValues(horizontal = HorizontalPadding)

val containerColor: Color
@Composable get() = MaterialTheme.colorScheme.surfaceContainerHigh
@Composable get() = MaterialTheme.colorScheme.surfaceContainer
val scrolledContainerColor: Color
@Composable get() = MaterialTheme.colorScheme.surfaceContainerLow
@Composable get() = MaterialTheme.colorScheme.surfaceContainerHighest

@Composable
fun appBarColors() = TopAppBarDefaults.topAppBarColors(
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/chiller3/rsaf/ui/Screen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.IconButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.ScaffoldDefaults
import androidx.compose.material3.SnackbarHost
Expand Down Expand Up @@ -56,7 +55,7 @@ fun AppScreen(
IconButton(
onClick = onClick,
colors = IconButtonDefaults.filledIconButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
containerColor = PreferenceDefaults.scrolledContainerColor,
),
) {
if (backIsExit) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
the same app.
This must be set statically. Keep this in sync with PreferenceDefaults.containerColor.
-->
<item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
<item name="android:colorBackground">?attr/colorSurfaceContainer</item>

<!--
This prevents an ugly bar from showing up in the recents screen when another app is
Expand Down