feat(ui): M3E restyle for settings, auth, and profile screens

This commit is contained in:
edde746
2026-07-02 11:47:43 +02:00
parent 074f92d144
commit 5f49dddb4d
62 changed files with 1415 additions and 874 deletions
+7 -1
View File
@@ -37,12 +37,17 @@ class CardFocusScope extends InheritedWidget {
class CardFocusBorder extends StatelessWidget {
const CardFocusBorder({
super.key,
required this.borderRadius,
this.borderRadius = FocusTheme.defaultBorderRadius,
this.borderRadii,
this.strokeAlign = BorderSide.strokeAlignOutside,
required this.child,
});
final double borderRadius;
/// Per-corner radii; overrides [borderRadius] when set (M3E grouped cards).
final BorderRadius? borderRadii;
final double strokeAlign;
final Widget child;
@@ -58,6 +63,7 @@ class CardFocusBorder extends StatelessWidget {
context,
isFocused: showFocus,
borderRadius: borderRadius,
radii: borderRadii,
borderStrokeAlign: strokeAlign,
),
child: child,
+11 -3
View File
@@ -24,17 +24,20 @@ class FocusTheme {
return Theme.of(context).extension<MonoTokens>()?.fast ?? const Duration(milliseconds: 150);
}
/// [radii] overrides [borderRadius] when per-corner radii are needed
/// (M3E grouped cards: large outer / small inner corners).
static BoxDecoration focusDecoration(
BuildContext context, {
required bool isFocused,
double borderRadius = defaultBorderRadius,
BorderRadius? radii,
double borderStrokeAlign = BorderSide.strokeAlignInside,
Color? color,
}) {
final focusColor = color ?? getFocusBorderColor(context);
return BoxDecoration(
borderRadius: BorderRadius.circular(borderRadius),
borderRadius: radii ?? BorderRadius.circular(borderRadius),
border: Border.all(
color: isFocused ? focusColor : Colors.transparent,
width: focusBorderWidth,
@@ -65,9 +68,14 @@ class FocusTheme {
/// Build focus decoration with background color instead of border.
/// Useful for video controls where it should match the native hover style.
static BoxDecoration focusBackgroundDecoration({required bool isFocused, double borderRadius = defaultBorderRadius}) {
/// [radii] overrides [borderRadius] when per-corner radii are needed.
static BoxDecoration focusBackgroundDecoration({
required bool isFocused,
double borderRadius = defaultBorderRadius,
BorderRadius? radii,
}) {
return BoxDecoration(
borderRadius: BorderRadius.circular(borderRadius),
borderRadius: radii ?? BorderRadius.circular(borderRadius),
color: isFocused ? Colors.white.withValues(alpha: 0.2) : Colors.transparent,
);
}
+11 -1
View File
@@ -68,6 +68,10 @@ class FocusableWrapper extends StatefulWidget {
/// Border radius for the focus indicator.
final double borderRadius;
/// Per-corner radii for the focus indicator; overrides [borderRadius] when
/// set (M3E grouped cards: large outer / small inner corners).
final BorderRadius? borderRadii;
/// Whether to scroll the widget into view when focused.
final bool autoScroll;
@@ -138,6 +142,7 @@ class FocusableWrapper extends StatefulWidget {
this.autofocus = false,
this.focusNode,
this.borderRadius = FocusTheme.defaultBorderRadius,
this.borderRadii,
this.autoScroll = true,
this.scrollAlignment = 0.5,
this.useComfortableZone = false,
@@ -487,11 +492,16 @@ class _FocusableWrapperState extends State<FocusableWrapper> with SingleTickerPr
card = CardFocusScope(showFocus: showFocus, child: widget.child);
} else {
final focusDecoration = widget.useBackgroundFocus
? FocusTheme.focusBackgroundDecoration(isFocused: showFocus, borderRadius: widget.borderRadius)
? FocusTheme.focusBackgroundDecoration(
isFocused: showFocus,
borderRadius: widget.borderRadius,
radii: widget.borderRadii,
)
: FocusTheme.focusDecoration(
context,
isFocused: showFocus,
borderRadius: widget.borderRadius,
radii: widget.borderRadii,
color: widget.focusColor,
);
card = AnimatedContainer(