Skip to content

fix(app): system bar leggibili + errore prenotazione non più dietro al calendario #8

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

Open
fabiodalez-dev wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −3
Open

fix(app): system bar leggibili + errore prenotazione non più dietro al calendario #8

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
8 changes: 5 additions & 3 deletions app/src/main/java/com/pinakes/app/ui/screens/detail/BookDetailViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,15 @@ class BookDetailViewModel(
load()
}
is ApiResult.Failure -> {
// Close the calendar dialog so the error is visible: the snackbar
// lives at the screen Scaffold level, behind the open DatePickerDialog.
when {
res.code == ErrorCodes.CONFLICT ->
_state.update { it.copy(reserveBusy = false, snackbar = null, snackbarRes = R.string.snackbar_request_conflict) }
_state.update { it.copy(reserveBusy = false, showLoanSheet = false, snackbar = null, snackbarRes = R.string.snackbar_request_conflict) }
res.message.isNotBlank() ->
_state.update { it.copy(reserveBusy = false, snackbar = res.message, snackbarRes = null) }
_state.update { it.copy(reserveBusy = false, showLoanSheet = false, snackbar = res.message, snackbarRes = null) }
else ->
_state.update { it.copy(reserveBusy = false, snackbar = null, snackbarRes = R.string.snackbar_request_error) }
_state.update { it.copy(reserveBusy = false, showLoanSheet = false, snackbar = null, snackbarRes = R.string.snackbar_request_error) }
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions app/src/main/java/com/pinakes/app/ui/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package com.pinakes.app.ui.theme

import android.app.Activity
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.SideEffect
import androidx.compose.ui.platform.LocalView
import androidx.core.view.WindowCompat

/** User-selectable theme. Default is [LIGHT] (DESIGN.md: "Light is the default theme"). */
enum class ThemeMode { LIGHT, DARK, SYSTEM }
Expand All @@ -17,6 +21,21 @@ fun PinakesTheme(
ThemeMode.DARK -> true
ThemeMode.SYSTEM -> isSystemInDarkTheme()
}

// With edge-to-edge the status/navigation bars are transparent, so the system
// soft-button + status icons must follow the APP theme, not the system dark
// mode — otherwise a light app under a dark-mode system shows white icons on a
// light background (invisible). Light theme → dark icons; dark theme → light.
val view = LocalView.current
if (!view.isInEditMode) {
SideEffect {
val window = (view.context as Activity).window
val controller = WindowCompat.getInsetsController(window, view)
controller.isAppearanceLightStatusBars = !dark
controller.isAppearanceLightNavigationBars = !dark
}
}

MaterialTheme(
colorScheme = if (dark) DarkColors else LightColors,
typography = PinakesTypography,
Expand Down