mirror of
https://github.com/block/buzz.git
synced 2026-10-27 20:41:57 +00:00
## Summary Use native Liquid Glass for the iOS tab bar and expanding + menu, preserving the existing Lucide icons, icon-only layout, badges, accessibility labels, and tab interactions. The + uses black-tinted glass with white controls; the selected tab has a subtle theme accent (6% blended into the existing selection color). Android retains its current styling. ### Related issue No duplicate issue found. Related prior navigation work: #7281 (closed). This change covers the tab bar and quick actions; it does not add page-to-page navigation-bar morphing. ### Testing - `just mobile-check` passed (formatting, analysis, and file-size checks). - `just mobile-test` passed: 2,678 tests passed, 4 skipped; the separate unconfigured-push suite also passed all 3 tests. - Widget coverage verifies native glass parameters, black + tint, original icons, icon-only layout, tab selection, badges, and quick-menu open/close behavior. - Signed Release iOS build installed and launched on a physical iPhone; the final glass and tint styling was reviewed on device. No final-app screenshot was captured. - Full `just ci` was attempted but stopped during desktop compilation as available disk space dropped to 3.5 GiB. The complete repository-wide gate is not locally verified; hosted CI remains pending. Signed-off-by: kenny lopez <klopez4212@gmail.com>
264 lines
8.3 KiB
Dart
264 lines
8.3 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/rendering.dart';
|
|
import 'package:flutter/services.dart';
|
|
import 'package:flutter_hooks/flutter_hooks.dart';
|
|
|
|
import '../theme/theme.dart';
|
|
|
|
enum ConcentricSurfaceCorners { all, bottom }
|
|
|
|
/// An iOS-native surface that adopts the system's concentric corners on iOS 26
|
|
/// and newer. Other platforms keep the normal Flutter shape.
|
|
class ConcentricSheetSurface extends HookWidget {
|
|
const ConcentricSheetSurface({
|
|
required this.child,
|
|
required this.enabled,
|
|
this.color,
|
|
this.backdropColor,
|
|
this.corners = ConcentricSurfaceCorners.all,
|
|
this.padding = const EdgeInsets.only(
|
|
left: Grid.xxs,
|
|
right: Grid.xxs,
|
|
bottom: Grid.xxs,
|
|
),
|
|
this.providesSheetSurface = true,
|
|
this.usesGlass = false,
|
|
this.glassTintColor,
|
|
this.minimumRadius = Radii.dialog,
|
|
this.contentClipRadius,
|
|
super.key,
|
|
});
|
|
|
|
final Widget child;
|
|
final bool enabled;
|
|
final Color? color;
|
|
final Color? backdropColor;
|
|
final ConcentricSurfaceCorners corners;
|
|
final EdgeInsetsGeometry padding;
|
|
final bool providesSheetSurface;
|
|
final bool usesGlass;
|
|
|
|
/// Optional tint applied to the native Liquid Glass material.
|
|
final Color? glassTintColor;
|
|
final double minimumRadius;
|
|
final double? contentClipRadius;
|
|
|
|
static bool providesSurfaceOf(BuildContext context) =>
|
|
context
|
|
.dependOnInheritedWidgetOfExactType<_ConcentricSheetSurfaceScope>()
|
|
?.providesSurface ??
|
|
false;
|
|
|
|
static const _surfaceChannel = MethodChannel('buzz/concentric_sheet_surface');
|
|
static const _nativeContentClipRadius = Radii.dialog * 2;
|
|
|
|
BorderRadius _borderRadius(double radius) => switch (corners) {
|
|
ConcentricSurfaceCorners.all => BorderRadius.circular(radius),
|
|
ConcentricSurfaceCorners.bottom => BorderRadius.vertical(
|
|
bottom: Radius.circular(radius),
|
|
),
|
|
};
|
|
|
|
Future<bool> _checkNativeSurfaceSupport() async {
|
|
try {
|
|
final supported = await _surfaceChannel.invokeMethod<bool>('isSupported');
|
|
return supported == true;
|
|
} on MissingPluginException {
|
|
// The registrar is unavailable, so retain the Flutter surface.
|
|
return false;
|
|
} on PlatformException {
|
|
// The native surface is optional; retain the Flutter surface on failure.
|
|
return false;
|
|
}
|
|
}
|
|
|
|
Future<void> _updateNativeSurfaceColors({
|
|
required MethodChannel channel,
|
|
required Color surfaceColor,
|
|
required Color? backdropColor,
|
|
}) async {
|
|
try {
|
|
await channel.invokeMethod<void>('updateColors', <String, Object?>{
|
|
'color': surfaceColor.toARGB32(),
|
|
'backdropColor': backdropColor?.toARGB32(),
|
|
'glassTintColor': glassTintColor?.toARGB32(),
|
|
});
|
|
} on MissingPluginException {
|
|
// The platform view may have been disposed while its theme was changing.
|
|
} on PlatformException {
|
|
// The native surface is optional; retain its last successfully sent color.
|
|
}
|
|
}
|
|
|
|
Future<void> _updateNativeSurfaceGeometry({
|
|
required MethodChannel channel,
|
|
required double minimumRadius,
|
|
required Brightness brightness,
|
|
}) async {
|
|
try {
|
|
await channel.invokeMethod<void>('updateGeometry', <String, Object>{
|
|
'minimumRadius': minimumRadius,
|
|
'brightness': brightness.name,
|
|
});
|
|
} on MissingPluginException {
|
|
// The platform view may have been disposed while its shape was changing.
|
|
} on PlatformException {
|
|
// The native surface is optional; retain its last successful geometry.
|
|
}
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final shouldCheckNativeSurface =
|
|
enabled && defaultTargetPlatform == TargetPlatform.iOS;
|
|
final supportFuture = useMemoized(
|
|
() => shouldCheckNativeSurface
|
|
? _checkNativeSurfaceSupport()
|
|
: Future<bool>.value(false),
|
|
[shouldCheckNativeSurface],
|
|
);
|
|
final nativeSurfaceSupported = useFuture(supportFuture).data ?? false;
|
|
final surfaceColor = color ?? context.colors.surface;
|
|
final brightness = context.theme.brightness;
|
|
final nativeSurfaceChannel = useState<MethodChannel?>(null);
|
|
useEffect(
|
|
() {
|
|
final channel = nativeSurfaceChannel.value;
|
|
if (!shouldCheckNativeSurface ||
|
|
!nativeSurfaceSupported ||
|
|
channel == null) {
|
|
return null;
|
|
}
|
|
unawaited(
|
|
_updateNativeSurfaceColors(
|
|
channel: channel,
|
|
surfaceColor: surfaceColor,
|
|
backdropColor: backdropColor,
|
|
),
|
|
);
|
|
return null;
|
|
},
|
|
[
|
|
shouldCheckNativeSurface,
|
|
nativeSurfaceSupported,
|
|
nativeSurfaceChannel.value,
|
|
surfaceColor,
|
|
backdropColor,
|
|
glassTintColor,
|
|
],
|
|
);
|
|
useEffect(
|
|
() {
|
|
final channel = nativeSurfaceChannel.value;
|
|
if (!shouldCheckNativeSurface ||
|
|
!nativeSurfaceSupported ||
|
|
channel == null) {
|
|
return null;
|
|
}
|
|
unawaited(
|
|
_updateNativeSurfaceGeometry(
|
|
channel: channel,
|
|
minimumRadius: minimumRadius,
|
|
brightness: brightness,
|
|
),
|
|
);
|
|
return null;
|
|
},
|
|
[
|
|
shouldCheckNativeSurface,
|
|
nativeSurfaceSupported,
|
|
nativeSurfaceChannel.value,
|
|
minimumRadius,
|
|
brightness,
|
|
],
|
|
);
|
|
|
|
if (!shouldCheckNativeSurface) {
|
|
return _ConcentricSheetSurfaceScope(providesSurface: false, child: child);
|
|
}
|
|
|
|
final fallbackBorderRadius = _borderRadius(minimumRadius);
|
|
|
|
return Padding(
|
|
padding: padding,
|
|
child: Stack(
|
|
children: [
|
|
if (nativeSurfaceSupported)
|
|
Positioned.fill(
|
|
child: ExcludeSemantics(
|
|
child: IgnorePointer(
|
|
child: UiKitView(
|
|
viewType: 'buzz/concentric_sheet_surface',
|
|
hitTestBehavior: PlatformViewHitTestBehavior.transparent,
|
|
onPlatformViewCreated: (viewId) {
|
|
nativeSurfaceChannel.value = MethodChannel(
|
|
'buzz/concentric_sheet_surface/$viewId',
|
|
);
|
|
},
|
|
creationParams: <String, Object>{
|
|
'color': surfaceColor.toARGB32(),
|
|
if (backdropColor case final color?)
|
|
'backdropColor': color.toARGB32(),
|
|
'minimumRadius': minimumRadius,
|
|
'corners': corners.name,
|
|
'usesGlass': usesGlass,
|
|
if (glassTintColor case final tint?)
|
|
'glassTintColor': tint.toARGB32(),
|
|
'brightness': brightness.name,
|
|
},
|
|
creationParamsCodec: const StandardMessageCodec(),
|
|
),
|
|
),
|
|
),
|
|
)
|
|
else
|
|
Positioned.fill(
|
|
child: Material(
|
|
color: surfaceColor,
|
|
borderRadius: fallbackBorderRadius,
|
|
clipBehavior: Clip.antiAlias,
|
|
),
|
|
),
|
|
ClipRSuperellipse(
|
|
key: const ValueKey('concentric-sheet-content-clip'),
|
|
// UIKit's container-concentric corner resolves substantially
|
|
// larger than its minimum radius on an edge-inset iOS sheet. Keep
|
|
// the Flutter content inside that continuous outline; a 24pt
|
|
// circular clip still lets scrolling rows show through the native
|
|
// corner cutouts.
|
|
borderRadius: _borderRadius(
|
|
contentClipRadius ??
|
|
(nativeSurfaceSupported
|
|
? _nativeContentClipRadius
|
|
: minimumRadius),
|
|
),
|
|
clipBehavior: Clip.antiAlias,
|
|
child: providesSheetSurface
|
|
? _ConcentricSheetSurfaceScope(
|
|
providesSurface: true,
|
|
child: child,
|
|
)
|
|
: child,
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _ConcentricSheetSurfaceScope extends InheritedWidget {
|
|
const _ConcentricSheetSurfaceScope({
|
|
required this.providesSurface,
|
|
required super.child,
|
|
});
|
|
|
|
final bool providesSurface;
|
|
|
|
@override
|
|
bool updateShouldNotify(_ConcentricSheetSurfaceScope oldWidget) =>
|
|
oldWidget.providesSurface != providesSurface;
|
|
}
|