Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed flashing app bar during hero in some cases

Browse source
This commit is contained in:
Thibault Deckers 2022-05-25 12:07:44 +09:00
parent 3c90ef312a
commit 56b865af13
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/widgets/common/identity/aves_app_bar.dart
View file

@ -2,6 +2,7 @@ import 'package:aves/model/settings/settings.dart';
import 'package:aves/theme/durations.dart'; import 'package:aves/theme/durations.dart';
import 'package:aves/widgets/aves_app.dart'; import 'package:aves/widgets/aves_app.dart';
import 'package:aves/widgets/common/fx/blurred.dart'; import 'package:aves/widgets/common/fx/blurred.dart';
import 'package:aves/widgets/common/providers/query_provider.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -100,23 +101,26 @@ class AvesAppBar extends StatelessWidget {
final pushing = direction == HeroFlightDirection.push; final pushing = direction == HeroFlightDirection.push;
Widget popBuilder(context, child) => Opacity(opacity: 1 - animation.value, child: child); Widget popBuilder(context, child) => Opacity(opacity: 1 - animation.value, child: child);
Widget pushBuilder(context, child) => Opacity(opacity: animation.value, child: child); Widget pushBuilder(context, child) => Opacity(opacity: animation.value, child: child);
return Material( return QueryProvider(
type: MaterialType.transparency, initialQuery: null,
child: DefaultTextStyle( child: Material(
style: DefaultTextStyle.of(toHero).style, type: MaterialType.transparency,
child: Stack( child: DefaultTextStyle(
children: [ style: DefaultTextStyle.of(toHero).style,
AnimatedBuilder( child: Stack(
animation: animation, children: [
builder: pushing ? popBuilder : pushBuilder, AnimatedBuilder(
child: fromHero.widget, animation: animation,
), builder: pushing ? popBuilder : pushBuilder,
AnimatedBuilder( child: fromHero.widget,
animation: animation, ),
builder: pushing ? pushBuilder : popBuilder, AnimatedBuilder(
child: toHero.widget, animation: animation,
), builder: pushing ? pushBuilder : popBuilder,
], child: toHero.widget,
),
],
),
), ),
), ),
); );