π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Add onboarding page scaffold and duck illustrations
r4khul79ac15cc08e5
diff --git a/mobile/apps/photos/assets/onboarding_doodle.png b/mobile/apps/photos/assets/onboarding_doodle.pngnew file mode 100644index 0000000000..5039752932Binary files /dev/null and b/mobile/apps/photos/assets/onboarding_doodle.png differdiff --git a/mobile/apps/photos/assets/onboarding_email.riv b/mobile/apps/photos/assets/onboarding_email.rivnew file mode 100644index 0000000000..e16c3dfce8Binary files /dev/null and b/mobile/apps/photos/assets/onboarding_email.riv differdiff --git a/mobile/apps/photos/assets/onboarding_forgot_password.riv b/mobile/apps/photos/assets/onboarding_forgot_password.rivnew file mode 100644index 0000000000..d570d93937Binary files /dev/null and b/mobile/apps/photos/assets/onboarding_forgot_password.riv differdiff --git a/mobile/apps/photos/assets/onboarding_key.riv b/mobile/apps/photos/assets/onboarding_key.rivnew file mode 100644index 0000000000..b732cf4bb0Binary files /dev/null and b/mobile/apps/photos/assets/onboarding_key.riv differdiff --git a/mobile/apps/photos/assets/onboarding_login.riv b/mobile/apps/photos/assets/onboarding_login.rivnew file mode 100644index 0000000000..e2bfc435b8Binary files /dev/null and b/mobile/apps/photos/assets/onboarding_login.riv differdiff --git a/mobile/apps/photos/assets/onboarding_password.riv b/mobile/apps/photos/assets/onboarding_password.rivnew file mode 100644index 0000000000..07b4fc6d8eBinary files /dev/null and b/mobile/apps/photos/assets/onboarding_password.riv differdiff --git a/mobile/apps/photos/assets/onboarding_pricing.riv b/mobile/apps/photos/assets/onboarding_pricing.rivnew file mode 100644index 0000000000..cca68cbf55Binary files /dev/null and b/mobile/apps/photos/assets/onboarding_pricing.riv differdiff --git a/mobile/apps/photos/lib/ui/account/onboarding_page_scaffold.dart b/mobile/apps/photos/lib/ui/account/onboarding_page_scaffold.dartnew file mode 100644index 0000000000..a5be077bd6--- /dev/null+++ b/mobile/apps/photos/lib/ui/account/onboarding_page_scaffold.dart@@ -0,0 +1,606 @@+import "dart:async";+import "dart:math" as math;+import "dart:ui" as ui;++import "package:ente_components/ente_components.dart";+import "package:flutter/material.dart";+import "package:flutter/services.dart";+import "package:hugeicons/hugeicons.dart";+import "package:photos/ui/settings/developer_settings_tap_area.dart";+import "package:rive/rive.dart" as rive;++// Each artboard is 500x509; scale and offsets place the duck where the+// matching Figma frame draws it, relative to the status bar and screen centre.+enum OnboardingIllustration {+ login("assets/onboarding_login.riv", 0.535, -30.8, 3.9),+ signUp("assets/onboarding_login.riv", 0.44, -53.9, 3.6),+ email("assets/onboarding_email.riv", 0.533, -25.8, 13.5),+ password("assets/onboarding_password.riv", 0.5289, -36.2, -2.1),+ forgotPassword("assets/onboarding_forgot_password.riv", 0.5294, -28.5, -6.1),+ key("assets/onboarding_key.riv", 0.5325, -31, 6.7),+ recoveryKey("assets/onboarding_key.riv", 0.4714, -29.4, -4.6),+ pricing("assets/onboarding_pricing.riv", 0.535, -20.8, 7.9);++ const OnboardingIllustration(+ this.asset,+ this.scale,+ this.topOffset,+ this.centerOffset,+ );++ static const double artboardWidth = 500;+ static const double artboardHeight = 509;++ final String asset;+ final double scale;+ final double topOffset;+ final double centerOffset;++ double get width => artboardWidth * scale;+ double get height => artboardHeight * scale;+}++// Where the back button lives: in the card's title row, or as white icons on+// the green header with the card title standing alone.+enum OnboardingTitleBarStyle { card, header }++// Figma: https://www.figma.com/design/BuBNPPytxlVnqfmCUW0mgz/Ente-Visual-Design?node-id=25356-305965&m=dev+class OnboardingPageScaffold extends StatefulWidget {+ const OnboardingPageScaffold({+ super.key,+ required this.title,+ required this.illustration,+ required this.body,+ this.actions = const [],+ this.headerHeight = defaultHeaderHeight,+ this.showBackButton = true,+ this.titleBarStyle = OnboardingTitleBarStyle.card,+ this.headerTrailing,+ this.isBodyCentered = false,+ this.pinActions = false,+ this.showDeveloperSettingsTapArea = false,+ });++ static const double defaultHeaderHeight = 159;+ static const double compactHeaderHeight = 82;+ static const double planHeaderHeight = 148;+ static const double horizontalPadding = Spacing.xxl;++ final String title;+ final OnboardingIllustration illustration;+ final Widget body;+ final List<Widget> actions;+ final double headerHeight;+ final bool showBackButton;+ final OnboardingTitleBarStyle titleBarStyle;+ final Widget? headerTrailing;+ final bool isBodyCentered;++ // Keeps the actions below the scrolling body instead of letting them scroll+ // with it when the card is short. Only for list pages that never show the+ // keyboard, since a fixed footer cannot give space back.+ final bool pinActions;+ final bool showDeveloperSettingsTapArea;++ @override+ State<OnboardingPageScaffold> createState() => OnboardingPageScaffoldState();+}++class OnboardingPageScaffoldState extends State<OnboardingPageScaffold> {+ static const double _cardRadius = Radii.bottomSheet;+ static const double _titleBarHeight = 48;+ static const double _titleBarTopInset = 33;+ static const double _titleBarBottomInset = 17;+ static const double _inlineTitleTopInset = 36;+ static const double _inlineTitleBottomInset = 20;+ static const double _headerBarCenter = 33;+ static const double _headerBarLeftInset = 10;+ static const double _headerBarRightInset = 11;+ static const double _footerSpacing = Spacing.lg;+ static const double _footerInset = Spacing.xxl;++ late final rive.FileLoader _fileLoader;+ rive.ViewModelInstance? _viewModel;+ String? _pendingTrigger;+ Timer? _deferredTrigger;+ DateTime _entryCompletesAt = DateTime.now();+ ModalRoute<dynamic>? _route;+ bool _isIllustrationHidden = false;+ bool _hasBuilt = false;+ bool _hasExited = false;++ // Fires a view-model trigger on the illustration. Triggers wait for the+ // file to load and for the entry animation to finish, since interrupting+ // the entry leaves the state machine frozen mid-pose.+ void trigger(String name) {+ if (_viewModel == null) {+ _pendingTrigger = name;+ return;+ }+ _deferredTrigger?.cancel();+ final remaining = _entryCompletesAt.difference(DateTime.now());+ if (remaining <= Duration.zero) {+ _trigger(name);+ return;+ }+ _deferredTrigger = Timer(remaining, () {+ if (mounted) _trigger(name);+ });+ }++ @override+ void initState() {+ super.initState();+ _fileLoader = rive.FileLoader.fromAsset(+ widget.illustration.asset,+ riveFactory: rive.Factory.flutter,+ );+ }++ @override+ void didChangeDependencies() {+ super.didChangeDependencies();+ final route = ModalRoute.of(context);+ if (route != _route) {+ _route?.animation?.removeStatusListener(_onRouteAnimationStatus);+ _route?.secondaryAnimation?.removeStatusListener(+ _onSecondaryAnimationStatus,+ );+ _route = route;+ route?.animation?.addStatusListener(_onRouteAnimationStatus);+ route?.secondaryAnimation?.addStatusListener(_onSecondaryAnimationStatus);+ }+ }++ @override+ void dispose() {+ _route?.animation?.removeStatusListener(_onRouteAnimationStatus);+ _route?.secondaryAnimation?.removeStatusListener(+ _onSecondaryAnimationStatus,+ );+ _deferredTrigger?.cancel();+ _viewModel = null;+ _fileLoader.dispose();+ super.dispose();+ }++ void _onRouteAnimationStatus(AnimationStatus status) {+ if (status == AnimationStatus.reverse) {+ _triggerExit();+ }+ }++ void _onSecondaryAnimationStatus(AnimationStatus status) {+ if (status == AnimationStatus.forward) {+ _triggerExit();+ } else if (status == AnimationStatus.reverse) {+ _hasExited = false;+ _playEntry();+ }+ }++ void _onLoaded(rive.RiveLoaded state) {+ _viewModel = state.viewModelInstance;+ final artboard = state.controller.artboard;+ for (var i = 0; i < artboard.animationCount(); i++) {+ final animation = artboard.animationAt(i);+ if (animation.name.toLowerCase() == "entry") {+ _entryDuration = Duration(+ milliseconds: (animation.duration * 1000).round(),+ );+ }+ animation.dispose();+ }+ _playEntry();+ final pending = _pendingTrigger;+ _pendingTrigger = null;+ if (pending != null) trigger(pending);+ }++ Duration _entryDuration = const Duration(seconds: 5);++ void _playEntry() {+ _entryCompletesAt = DateTime.now().add(_entryDuration);+ _trigger("entry");+ }++ void _triggerExit() {+ if (_hasExited) return;+ _hasExited = true;+ _trigger("exit");+ }++ void _trigger(String name) {+ _viewModel?.trigger(name)?.trigger();+ }++ void _onHeaderAnimationEnd() {+ if (!mounted) return;+ final isKeyboardOpen = MediaQuery.viewInsetsOf(context).bottom > 0;+ if (_isIllustrationHidden == isKeyboardOpen) return;+ setState(() {+ _isIllustrationHidden = isKeyboardOpen;+ });+ }++ @override+ Widget build(BuildContext context) {+ final colors = context.componentColors;+ final mediaQuery = MediaQuery.of(context);+ final isKeyboardOpen = mediaQuery.viewInsets.bottom > 0;+ final headerHeight =+ mediaQuery.padding.top + (isKeyboardOpen ? 0 : widget.headerHeight);+ if (!isKeyboardOpen) {+ _isIllustrationHidden = false;+ } else if (!_hasBuilt) {+ _isIllustrationHidden = true;+ }+ _hasBuilt = true;++ return Scaffold(+ backgroundColor: colors.green,+ resizeToAvoidBottomInset: true,+ body: LayoutBuilder(+ builder: (context, constraints) {+ return Column(+ children: [+ ConstrainedBox(+ constraints: BoxConstraints(maxHeight: constraints.maxHeight),+ child: AnimatedContainer(+ duration: Motion.slow,+ curve: Curves.easeOutCubic,+ height: headerHeight,+ onEnd: _onHeaderAnimationEnd,+ child: _buildHeader(colors, mediaQuery),+ ),+ ),+ Expanded(child: _buildCard(context, colors, mediaQuery)),+ ],+ );+ },+ ),+ );+ }++ Widget _buildHeader(ColorTokens colors, MediaQueryData mediaQuery) {+ final illustration = widget.illustration;+ final hasHeaderBar = widget.titleBarStyle == OnboardingTitleBarStyle.header;+ final canPop = widget.showBackButton && (_route?.canPop ?? false);+ return Stack(+ clipBehavior: Clip.none,+ children: [+ Positioned.fill(child: _OnboardingBackdrop(color: colors.green)),+ if (hasHeaderBar)+ Positioned(+ top:+ mediaQuery.padding.top + _headerBarCenter - _titleBarHeight / 2,+ left: _headerBarLeftInset,+ right: _headerBarRightInset,+ height: _titleBarHeight,+ child: Row(+ mainAxisAlignment: MainAxisAlignment.spaceBetween,+ children: [+ SizedBox(+ width: _titleBarHeight,+ child: canPop+ ? _backButton(context, colors.specialWhite)+ : null,+ ),+ SizedBox(width: _titleBarHeight, child: widget.headerTrailing),+ ],+ ),+ ),+ Positioned(+ top: mediaQuery.padding.top + illustration.topOffset,+ left: 0,+ right: 0,+ height: illustration.height,+ child: IgnorePointer(+ child: Visibility(+ visible: !_isIllustrationHidden,+ maintainState: true,+ child: Align(+ alignment: Alignment.topCenter,+ child: Transform.translate(+ offset: Offset(illustration.centerOffset, 0),+ child: SizedBox(+ width: illustration.width,+ height: illustration.height,+ child: rive.RiveWidgetBuilder(+ fileLoader: _fileLoader,+ dataBind: rive.DataBind.auto(),+ onLoaded: _onLoaded,+ builder: (BuildContext context, rive.RiveState state) {+ if (state is rive.RiveLoaded) {+ return rive.RiveWidget(+ controller: state.controller,+ fit: rive.Fit.contain,+ );+ }+ return const SizedBox.shrink();+ },+ ),+ ),+ ),+ ),+ ),+ ),+ ),+ ],+ );+ }++ Widget _backButton(BuildContext context, Color color) {+ return IconButtonComponent(+ variant: IconButtonComponentVariant.unfilled,+ size: _titleBarHeight,+ iconSize: IconSizes.medium,+ icon: HugeIcon(icon: HugeIcons.strokeRoundedArrowLeft02, color: color),+ tooltip: MaterialLocalizations.of(context).backButtonTooltip,+ onTap: () => Navigator.of(context).maybePop(),+ );+ }++ Widget _buildCard(+ BuildContext context,+ ColorTokens colors,+ MediaQueryData mediaQuery,+ ) {+ final hasCardTitleBar =+ widget.titleBarStyle == OnboardingTitleBarStyle.card;+ final canPop =+ hasCardTitleBar && widget.showBackButton && (_route?.canPop ?? false);+ final title = Text(+ widget.title,+ textAlign: TextAlign.center,+ maxLines: 2,+ overflow: TextOverflow.ellipsis,+ style: TextStyles.display2.copyWith(color: colors.textBase),+ );+ final titleContent = widget.showDeveloperSettingsTapArea+ ? DeveloperSettingsTapArea(+ behavior: HitTestBehavior.translucent,+ child: title,+ )+ : title;+ final hasPinnedFooter = widget.actions.isNotEmpty && widget.pinActions;+ final hasScrollingFooter = widget.actions.isNotEmpty && !widget.pinActions;++ return Container(+ width: double.infinity,+ clipBehavior: Clip.antiAlias,+ decoration: BoxDecoration(+ color: colors.backgroundBase,+ border: Border.all(color: colors.strokeDark),+ borderRadius: const BorderRadius.vertical(+ top: Radius.circular(_cardRadius),+ ),+ ),+ child: Column(+ children: [+ Expanded(+ child: CustomScrollView(+ slivers: [+ if (hasCardTitleBar)+ SliverPadding(+ padding: const EdgeInsets.fromLTRB(+ OnboardingPageScaffold.horizontalPadding - Spacing.md,+ _titleBarTopInset,+ OnboardingPageScaffold.horizontalPadding - Spacing.md,+ _titleBarBottomInset,+ ),+ sliver: SliverToBoxAdapter(+ child: Row(+ children: [+ SizedBox(+ width: _titleBarHeight,+ height: _titleBarHeight,+ child: canPop+ ? _backButton(context, colors.textBase)+ : null,+ ),+ Expanded(child: titleContent),+ const SizedBox(width: _titleBarHeight),+ ],+ ),+ ),+ )+ else+ SliverPadding(+ padding: const EdgeInsets.fromLTRB(+ OnboardingPageScaffold.horizontalPadding,+ _inlineTitleTopInset,+ OnboardingPageScaffold.horizontalPadding,+ _inlineTitleBottomInset,+ ),+ sliver: SliverToBoxAdapter(child: titleContent),+ ),+ SliverPadding(+ padding: const EdgeInsets.symmetric(+ horizontal: OnboardingPageScaffold.horizontalPadding,+ ),+ sliver: SliverLayoutBuilder(+ builder: (context, constraints) {+ final remaining =+ constraints.viewportMainAxisExtent -+ constraints.precedingScrollExtent;+ return SliverToBoxAdapter(+ child: ConstrainedBox(+ constraints: BoxConstraints(+ minHeight: math.max(0, remaining),+ ),+ child: Column(+ mainAxisAlignment: hasScrollingFooter+ ? MainAxisAlignment.spaceBetween+ : widget.isBodyCentered+ ? MainAxisAlignment.center+ : MainAxisAlignment.start,+ crossAxisAlignment: CrossAxisAlignment.stretch,+ children: [+ if (widget.isBodyCentered)+ const SizedBox.shrink(),+ widget.body,+ if (hasScrollingFooter)+ _buildFooter(mediaQuery, inline: true),+ ],+ ),+ ),+ );+ },+ ),+ ),+ ],+ ),+ ),+ if (hasPinnedFooter) _buildFooter(mediaQuery, inline: false),+ ],+ ),+ );+ }++ Widget _buildFooter(MediaQueryData mediaQuery, {required bool inline}) {+ final horizontalInset = inline ? 0.0 : _footerInset;+ return Padding(+ padding: EdgeInsets.fromLTRB(+ horizontalInset,+ _footerInset,+ horizontalInset,+ _footerInset ++ (mediaQuery.viewInsets.bottom > 0 ? 0 : mediaQuery.padding.bottom),+ ),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.stretch,+ children: [+ for (var i = 0; i < widget.actions.length; i++) ...[+ if (i > 0) const SizedBox(height: _footerSpacing),+ widget.actions[i],+ ],+ ],+ ),+ );+ }+}++// Figma: https://www.figma.com/design/BuBNPPytxlVnqfmCUW0mgz/Ente-Visual-Design?node-id=25356-305710&m=dev+class OnboardingAccountPrompt extends StatelessWidget {+ const OnboardingAccountPrompt({+ super.key,+ required this.question,+ required this.actionLabel,+ required this.onTap,+ });++ final String question;+ final String actionLabel;+ final FutureOr<void> Function() onTap;++ @override+ Widget build(BuildContext context) {+ final colors = context.componentColors;+ return Wrap(+ alignment: WrapAlignment.center,+ crossAxisAlignment: WrapCrossAlignment.center,+ spacing: Spacing.xs,+ children: [+ Text(+ question,+ textAlign: TextAlign.center,+ style: TextStyles.body.copyWith(color: colors.textLight),+ ),+ ButtonComponent(+ label: actionLabel,+ variant: ButtonComponentVariant.link,+ size: ButtonComponentSize.small,+ shouldSurfaceExecutionStates: false,+ onTap: onTap,+ ),+ ],+ );+ }+}++class _OnboardingBackdrop extends StatefulWidget {+ const _OnboardingBackdrop({required this.color});++ final Color color;++ @override+ State<_OnboardingBackdrop> createState() => _OnboardingBackdropState();+}++class _OnboardingBackdropState extends State<_OnboardingBackdrop> {+ static Future<ui.Image?>? _texture;++ ui.Image? _image;++ @override+ void initState() {+ super.initState();+ _texture ??= _loadTexture();+ unawaited(+ _texture!.then((image) {+ if (mounted && image != null) setState(() => _image = image);+ }),+ );+ }++ static Future<ui.Image?> _loadTexture() async {+ try {+ final data = await rootBundle.load("assets/onboarding_doodle.png");+ final codec = await ui.instantiateImageCodec(+ data.buffer.asUint8List(),+ targetWidth: _OnboardingBackdropPainter.textureWidth.toInt(),+ );+ final frame = await codec.getNextFrame();+ codec.dispose();+ return frame.image;+ } catch (e) {+ return null;+ }+ }++ @override+ Widget build(BuildContext context) {+ return RepaintBoundary(+ child: CustomPaint(+ painter: _OnboardingBackdropPainter(+ color: widget.color,+ texture: _image,+ ),+ ),+ );+ }+}++class _OnboardingBackdropPainter extends CustomPainter {+ const _OnboardingBackdropPainter({required this.color, this.texture});++ static const double textureWidth = 670;+ static const double textureHeight = 1006;+ static const double textureLeft = -90;+ static const double textureOpacity = 0.38 * 0.4;++ final Color color;+ final ui.Image? texture;++ @override+ void paint(Canvas canvas, Size size) {+ canvas.drawRect(Offset.zero & size, Paint()..color = color);+ final texture = this.texture;+ if (texture == null) return;+ canvas.drawImageRect(+ texture,+ Rect.fromLTWH(0, 0, texture.width.toDouble(), texture.height.toDouble()),+ const Rect.fromLTWH(textureLeft, 0, textureWidth, textureHeight),+ Paint()+ ..blendMode = BlendMode.softLight+ ..filterQuality = FilterQuality.low+ ..color = Colors.white.withValues(alpha: textureOpacity),+ );+ }++ @override+ bool shouldRepaint(_OnboardingBackdropPainter oldDelegate) {+ return oldDelegate.color != color || oldDelegate.texture != texture;+ }+}