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

rebuild performance review

Browse source
This commit is contained in:
Thibault Deckers 2021-03-13 11:26:48 +09:00
parent df474a3f66
commit d89907bbc5
6 changed files with 50 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/widgets/collection/collection_page.dart
View file

@ -31,26 +31,26 @@ class _CollectionPageState extends State<CollectionPage> {
@override
Widget build(BuildContext context) {
return MediaQueryDataProvider(
child: ChangeNotifierProvider<CollectionLens>.value(
value: collection,
child: Scaffold(
body: WillPopScope(
onWillPop: () {
if (collection.isSelecting) {
collection.browse();
return SynchronousFuture(false);
}
return SynchronousFuture(true);
},
child: DoubleBackPopScope(
child: GestureAreaProtectorStack(
child: Scaffold(
body: WillPopScope(
onWillPop: () {
if (collection.isSelecting) {
collection.browse();
return SynchronousFuture(false);
}
return SynchronousFuture(true);
},
child: DoubleBackPopScope(
child: GestureAreaProtectorStack(
child: ChangeNotifierProvider<CollectionLens>.value(
value: collection,
child: ThumbnailCollection(),
),
),
),
drawer: AppDrawer(),
resizeToAvoidBottomInset: false,
),
drawer: AppDrawer(),
resizeToAvoidBottomInset: false,
),
);
}

23
lib/widgets/collection/thumbnail_collection.dart
View file

@ -32,21 +32,26 @@ import 'package:flutter/rendering.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:provider/provider.dart';
class ThumbnailCollection extends StatelessWidget {
final ValueNotifier<double> _tileExtentNotifier = ValueNotifier(0);
class ThumbnailCollection extends StatefulWidget {
@override
_ThumbnailCollectionState createState() => _ThumbnailCollectionState();
}
class _ThumbnailCollectionState extends State<ThumbnailCollection> {
TileExtentController _tileExtentController;
@override
Widget build(BuildContext context) {
_tileExtentController ??= TileExtentController(
settingsRouteKey: context.currentRouteName,
columnCountDefault: 4,
extentMin: 46,
spacing: 0,
);
return SafeArea(
bottom: false,
child: TileExtentControllerProvider(
controller: TileExtentController(
settingsRouteKey: context.currentRouteName,
extentNotifier: _tileExtentNotifier,
columnCountDefault: 4,
extentMin: 46,
spacing: 0,
),
controller: _tileExtentController,
child: _ThumbnailCollectionContent(),
),
);

15
lib/widgets/common/providers/tile_extent_controller_provider.dart
View file

@ -15,16 +15,11 @@ class TileExtentControllerProvider extends StatelessWidget {
Widget build(BuildContext context) {
return LayoutBuilder(
builder: (context, constraints) {
return MultiProvider(
providers: [
ProxyProvider0(
update: (_, __) => constraints.biggest,
),
ProxyProvider<Size, TileExtentController>(
update: (_, viewportSize, __) => controller..applyTileExtent(viewportSize: viewportSize),
),
],
child: child,
return LayoutBuilder(
builder: (context, constraints) => ProxyProvider0<TileExtentController>(
update: (_, __) => controller..setViewportSize(constraints.biggest),
child: child,
),
);
},
);

4
lib/widgets/common/scaling.dart
View file

@ -102,9 +102,7 @@ class _GridScaleGestureDetectorState<T> extends State<GridScaleGestureDetector<T
final tileExtentController = context.read<TileExtentController>();
final oldExtent = tileExtentController.extentNotifier.value;
// sanitize and update grid layout if necessary
final newExtent = tileExtentController.applyTileExtent(
userPreferredExtent: _scaledExtentNotifier.value,
);
final newExtent = tileExtentController.setUserPreferredExtent(_scaledExtentNotifier.value);
_scaledExtentNotifier = null;
if (newExtent == oldExtent) {
_applyingScale = false;

24
lib/widgets/common/tile_extent_controller.dart
View file

@ -7,7 +7,7 @@ class TileExtentController {
final String settingsRouteKey;
final int columnCountMin, columnCountDefault;
final double spacing, extentMin, extentMax;
final ValueNotifier<double> extentNotifier;
final ValueNotifier<double> extentNotifier = ValueNotifier(0);
Size _viewportSize;
@ -15,7 +15,6 @@ class TileExtentController {
TileExtentController({
@required this.settingsRouteKey,
@required this.extentNotifier,
this.columnCountMin = 2,
@required this.columnCountDefault,
@required this.extentMin,
@ -23,16 +22,21 @@ class TileExtentController {
@required this.spacing,
});
double applyTileExtent({
Size viewportSize,
double userPreferredExtent = 0,
}) {
if (viewportSize != null) {
// sanitize screen size (useful when reloading while screen is off, reporting a 0,0 size)
final viewportSizeMin = Size.square(extentMin * columnCountMin);
_viewportSize = Size(max(viewportSize.width, viewportSizeMin.width), max(viewportSize.height, viewportSizeMin.height));
void setViewportSize(Size viewportSize) {
// sanitize screen size (useful when reloading while screen is off, reporting a 0,0 size)
final viewportSizeMin = Size.square(extentMin * columnCountMin);
// dimensions are rounded to prevent updates on minor changes
// e.g. available space on S10e is `Size(360.0, 721.0)` when status bar is visible, `Size(360.0, 721.3)` when it is not
final newViewportSize = Size(max(viewportSize.width, viewportSizeMin.width).roundToDouble(), max(viewportSize.height, viewportSizeMin.height).roundToDouble());
if (_viewportSize != newViewportSize) {
_viewportSize = newViewportSize;
_update();
}
}
double setUserPreferredExtent(double userPreferredExtent) => _update(userPreferredExtent: userPreferredExtent);
double _update({double userPreferredExtent = 0}) {
final oldUserPreferredExtent = settings.getTileExtent(settingsRouteKey);
final currentExtent = extentNotifier.value;
final targetExtent = userPreferredExtent > 0

5
lib/widgets/filter_grids/common/filter_grid_page.dart
View file

@ -40,9 +40,7 @@ class FilterGridPage<T extends CollectionFilter> extends StatelessWidget {
final FilterCallback onTap;
final OffsetFilterCallback onLongPress;
final ValueNotifier<double> _tileExtentNotifier = ValueNotifier(0);
FilterGridPage({
const FilterGridPage({
Key key,
@required this.appBar,
@required this.filterSections,
@ -69,7 +67,6 @@ class FilterGridPage<T extends CollectionFilter> extends StatelessWidget {
child: TileExtentControllerProvider(
controller: TileExtentController(
settingsRouteKey: settingsRouteKey ?? context.currentRouteName,
extentNotifier: _tileExtentNotifier,
columnCountDefault: 2,
extentMin: 60,
spacing: 8,