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

fixed tile extent clamping

Browse source
This commit is contained in:
Thibault Deckers 2020-04-10 08:35:20 +09:00
parent 75143cf56b
commit 0755c632d6
2 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/widgets/album/collection_scaling.dart
View file

@ -9,7 +9,6 @@ import 'package:aves/widgets/common/data_providers/media_query_data_provider.dar
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:flutter_sticky_header/flutter_sticky_header.dart'; import 'package:flutter_sticky_header/flutter_sticky_header.dart';
import 'package:tuple/tuple.dart';
class GridScaleGestureDetector extends StatefulWidget { class GridScaleGestureDetector extends StatefulWidget {
final GlobalKey scrollableKey; final GlobalKey scrollableKey;
@ -31,8 +30,7 @@ class GridScaleGestureDetector extends StatefulWidget {
} }
class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> { class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
Tuple2<double, double> _extentMinMax; double _startExtent, _extentMin, _extentMax;
double _startExtent;
ValueNotifier<double> _scaledExtentNotifier; ValueNotifier<double> _scaledExtentNotifier;
OverlayEntry _overlayEntry; OverlayEntry _overlayEntry;
ThumbnailMetadata _metadata; ThumbnailMetadata _metadata;
@ -41,12 +39,6 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
ValueNotifier<double> get tileExtentNotifier => widget.extentNotifier; ValueNotifier<double> get tileExtentNotifier => widget.extentNotifier;
@override
void initState() {
super.initState();
_extentMinMax = TileExtentManager.extentBoundsForSize(widget.mqSize);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
@ -69,6 +61,8 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
// not the same as `MediaQuery.size.width`, because of screen insets/padding // not the same as `MediaQuery.size.width`, because of screen insets/padding
final gridWidth = scrollableBox.size.width; final gridWidth = scrollableBox.size.width;
_extentMin = gridWidth / (gridWidth / TileExtentManager.tileExtentMin).round();
_extentMax = gridWidth / (gridWidth / TileExtentManager.extentMaxForSize(widget.mqSize)).round();
final halfExtent = _startExtent / 2; final halfExtent = _startExtent / 2;
final thumbnailCenter = renderMetaData.localToGlobal(Offset(halfExtent, halfExtent)); final thumbnailCenter = renderMetaData.localToGlobal(Offset(halfExtent, halfExtent));
_overlayEntry = OverlayEntry( _overlayEntry = OverlayEntry(
@ -86,7 +80,7 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
onScaleUpdate: (details) { onScaleUpdate: (details) {
if (_scaledExtentNotifier == null) return; if (_scaledExtentNotifier == null) return;
final s = details.scale; final s = details.scale;
_scaledExtentNotifier.value = (_startExtent * s).clamp(_extentMinMax.item1, _extentMinMax.item2); _scaledExtentNotifier.value = (_startExtent * s).clamp(_extentMin, _extentMax);
}, },
onScaleEnd: (details) { onScaleEnd: (details) {
if (_overlayEntry != null) { if (_overlayEntry != null) {

20
lib/widgets/album/tile_extent_manager.dart
View file

@ -1,11 +1,12 @@
import 'dart:math';
import 'package:aves/model/settings.dart'; import 'package:aves/model/settings.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:tuple/tuple.dart';
class TileExtentManager { class TileExtentManager {
static const columnCountMin = 2; static const int columnCountMin = 2;
static const columnCountDefault = 4; static const int columnCountDefault = 4;
static const columnCountMax = 8; static const double tileExtentMin = 46.0;
static double applyTileExtent(Size mqSize, EdgeInsets mqPadding, ValueNotifier<double> extentNotifier, {double newExtent}) { static double applyTileExtent(Size mqSize, EdgeInsets mqPadding, ValueNotifier<double> extentNotifier, {double newExtent}) {
final availableWidth = mqSize.width - mqPadding.horizontal; final availableWidth = mqSize.width - mqPadding.horizontal;
@ -19,9 +20,8 @@ class TileExtentManager {
if ((newExtent ?? 0) == 0) { if ((newExtent ?? 0) == 0) {
numColumns = columnCountDefault; numColumns = columnCountDefault;
} else { } else {
final minMax = extentBoundsForSize(mqSize); newExtent = newExtent.clamp(tileExtentMin, extentMaxForSize(mqSize));
newExtent = newExtent.clamp(minMax.item1, minMax.item2); numColumns = max(columnCountMin, (availableWidth / newExtent).round());
numColumns = (availableWidth / newExtent).round().clamp(columnCountMin, columnCountMax);
} }
newExtent = availableWidth / numColumns; newExtent = availableWidth / numColumns;
if (extentNotifier.value != newExtent) { if (extentNotifier.value != newExtent) {
@ -31,9 +31,7 @@ class TileExtentManager {
return newExtent; return newExtent;
} }
static Tuple2<double, double> extentBoundsForSize(Size mqSize) { static double extentMaxForSize(Size mqSize) {
final min = mqSize.shortestSide / columnCountMax; return mqSize.shortestSide / columnCountMin;
final max = mqSize.shortestSide / columnCountMin;
return Tuple2(min, max);
} }
} }