Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-01-22 16:56:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor: extract common widgets

Browse source
This commit is contained in:
Ming Ming 2023-12-16 16:32:36 +08:00
parent f75b64812a
commit 6ea872f2fb
3 changed files with 102 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
app/lib/widget/collection_browser.dart
View file

@ -50,6 +50,7 @@ import 'package:nc_photos/widget/draggable_item_list.dart';
import 'package:nc_photos/widget/export_collection_dialog.dart';
import 'package:nc_photos/widget/fancy_option_picker.dart';
import 'package:nc_photos/widget/file_sharer_dialog.dart';
import 'package:nc_photos/widget/finger_listener.dart';
import 'package:nc_photos/widget/network_thumbnail.dart';
import 'package:nc_photos/widget/page_visibility_mixin.dart';
import 'package:nc_photos/widget/photo_list_item.dart';
@ -59,11 +60,11 @@ import 'package:nc_photos/widget/selection_app_bar.dart';
import 'package:nc_photos/widget/share_collection_dialog.dart';
import 'package:nc_photos/widget/shared_album_info_dialog.dart';
import 'package:nc_photos/widget/simple_input_dialog.dart';
import 'package:nc_photos/widget/sliver_visualized_scale.dart';
import 'package:nc_photos/widget/viewer.dart';
import 'package:np_codegen/np_codegen.dart';
import 'package:np_common/or_null.dart';
import 'package:np_ui/np_ui.dart';
import 'package:sliver_tools/sliver_tools.dart';
import 'package:to_string/to_string.dart';
part 'collection_browser.g.dart';
@ -240,21 +241,11 @@ class _WrappedCollectionBrowserState extends State<_WrappedCollectionBrowser>
child: Stack(
fit: StackFit.expand,
children: [
Listener(
FingerListener(
onPointerMove: (event) => _onPointerMove(context, event),
onPointerDown: (_) {
onFingerChanged: (finger) {
setState(() {
++_finger;
});
},
onPointerUp: (_) {
setState(() {
--_finger;
});
},
onPointerCancel: (_) {
setState(() {
--_finger;
_finger = finger;
});
},
child: GestureDetector(
@ -303,21 +294,10 @@ class _WrappedCollectionBrowserState extends State<_WrappedCollectionBrowser>
previous.scale != current.scale,
builder: (context, state) {
if (!state.isEditMode) {
return SliverStack(
children: [
SliverOpacity(
opacity: state.scale == null
? 1
: _scaleToCurrentOpacity(state.scale!),
sliver: const _ContentList(),
),
if (state.scale != null)
SliverOpacity(
opacity: 1 -
_scaleToCurrentOpacity(state.scale!),
sliver: const _ScalingList(),
),
],
return SliverTransitionedScale(
scale: state.scale,
baseSliver: const _ContentList(),
overlaySliver: const _ScalingList(),
);
} else {
if (context
@ -411,22 +391,6 @@ class _WrappedCollectionBrowserState extends State<_WrappedCollectionBrowser>
}
}
static double _scaleToCurrentOpacity(double scale) {
if (scale < 1) {
if (scale <= .3) {
return 0;
} else {
return ((scale - .3) / .7).clamp(0, 1);
}
} else {
if (scale >= 1.9) {
return 0;
} else {
return (1 - (scale - 1) / .9).clamp(0, 1);
}
}
}
late final _bloc = context.read<_Bloc>();
final _scrollController = ScrollController();
bool? _isDragScrollingDown;

42
app/lib/widget/finger_listener.dart Normal file
View file

@ -0,0 +1,42 @@
import 'package:flutter/material.dart';
class FingerListener extends StatefulWidget {
const FingerListener({
super.key,
required this.child,
this.onFingerChanged,
this.onPointerMove,
});
@override
State<StatefulWidget> createState() => _FingerListenerState();
final Widget? child;
final void Function(int finger)? onFingerChanged;
final PointerMoveEventListener? onPointerMove;
}
class _FingerListenerState extends State<FingerListener> {
@override
Widget build(BuildContext context) {
return Listener(
onPointerDown: (_) {
++_finger;
widget.onFingerChanged?.call(_finger);
},
onPointerUp: (_) {
--_finger;
widget.onFingerChanged?.call(_finger);
},
onPointerCancel: (_) {
--_finger;
widget.onFingerChanged?.call(_finger);
},
onPointerMove: widget.onPointerMove,
child: widget.child,
);
}
var _finger = 0;
}

51
app/lib/widget/sliver_visualized_scale.dart Normal file
View file

@ -0,0 +1,51 @@
import 'package:flutter/material.dart';
import 'package:np_common/object_util.dart';
import 'package:sliver_tools/sliver_tools.dart';
/// Transitioned scaling between two slivers
class SliverTransitionedScale extends StatelessWidget {
const SliverTransitionedScale({
super.key,
required this.scale,
required this.baseSliver,
required this.overlaySliver,
});
@override
Widget build(BuildContext context) {
return SliverStack(
children: [
SliverOpacity(
opacity: scale?.let(_scaleToCurrentOpacity) ?? 1,
sliver: baseSliver,
),
if (scale != null)
SliverOpacity(
opacity: 1 - _scaleToCurrentOpacity(scale!),
sliver: overlaySliver,
),
],
);
}
/// Current scaling factor [0, 1], or null if not scaling
final double? scale;
final Widget baseSliver;
final Widget overlaySliver;
}
double _scaleToCurrentOpacity(double scale) {
if (scale < 1) {
if (scale <= .3) {
return 0;
} else {
return ((scale - .3) / .7).clamp(0, 1);
}
} else {
if (scale >= 1.9) {
return 0;
} else {
return (1 - (scale - 1) / .9).clamp(0, 1);
}
}
}