Myzel394/quid_faciam_hodie
1
0
Fork 0
mirror of https://github.com/Myzel394/quid_faciam_hodie.git synced 2025-06-21 00:20:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

improved memory timeline

Browse Source
This commit is contained in:
Myzel394 2022-08-14 22:46:34 +02:00
parent 13ea760cb8
commit 9671e2f578
4 changed files with 94 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/widgets/memory_sheet.dart
View File

@ -7,10 +7,12 @@ import 'package:share_location/widgets/modal_sheet.dart';
class MemorySheet extends StatefulWidget {
final Memory memory;
final VoidCallback onMemoryDeleted;
const MemorySheet({
Key? key,
required this.memory,
required this.onMemoryDeleted,
}) : super(key: key);
@override
@ -18,7 +20,10 @@ class MemorySheet extends StatefulWidget {
}
class _MemorySheetState extends State<MemorySheet> with Loadable {
Future<void> deleteFile() => FileManager.deleteFile(widget.memory.location);
Future<void> deleteFile() async {
await FileManager.deleteFile(widget.memory.location);
widget.onMemoryDeleted();
}
@override
Widget build(BuildContext context) {

9
lib/widgets/memory_slide.dart
View File

@ -84,10 +84,12 @@ class _MemorySlideState extends State<MemorySlide>
@override
Widget build(BuildContext context) {
return Consumer<MemoryPack>(
builder: (context, memoryPack, _) => Status(
return Consumer<TimelineOverlay>(
builder: (_, timelineOverlay, __) => Consumer<MemoryPack>(
builder: (___, memoryPack, ____) => Status(
controller: controller,
disabled: memoryPack.paused,
paused: memoryPack.paused,
hideProgressBar: !timelineOverlay.showOverlay,
child: MemoryView(
creationDate: widget.memory.creationDate,
location: widget.memory.location,
@ -117,6 +119,7 @@ class _MemorySlideState extends State<MemorySlide>
},
),
),
),
);
}
}

10
lib/widgets/status.dart
View File

@ -7,12 +7,14 @@ const BAR_HEIGHT = 4.0;
class Status extends StatefulWidget {
final StatusController? controller;
final Widget child;
final bool disabled;
final bool paused;
final bool hideProgressBar;
const Status({
Key? key,
required this.child,
this.disabled = false,
this.paused = false,
this.hideProgressBar = false,
this.controller,
}) : super(key: key);
@ -32,7 +34,7 @@ class _StatusState extends State<Status> with TickerProviderStateMixin {
initializeAnimation();
}
if (widget.disabled) {
if (widget.paused) {
animationController?.stop();
} else {
animationController?.forward();
@ -86,7 +88,7 @@ class _StatusState extends State<Status> with TickerProviderStateMixin {
child: AnimatedOpacity(
duration: const Duration(milliseconds: 500),
curve: Curves.linearToEaseOut,
opacity: widget.disabled ? 0.0 : 1.0,
opacity: widget.hideProgressBar ? 0.0 : 1.0,
child: (widget.controller == null)
? ClipRRect(
borderRadius: BorderRadius.circular(HUGE_SPACE),

33
lib/widgets/timeline_page.dart
View File

@ -50,6 +50,15 @@ class _TimelinePageState extends State<TimelinePage> {
}
}, ['state']);
timelineOverlayController.addListener(() {
if (!mounted) {
return;
}
// Force update to ensure overlays are up-to-date.
setState(() {});
}, ['showOverlay']);
memoryPack.addListener(() {
if (!mounted) {
return;
@ -102,6 +111,7 @@ class _TimelinePageState extends State<TimelinePage> {
isScrollControlled: true,
builder: (_) => MemorySheet(
memory: memoryPack.currentMemory,
onMemoryDeleted: widget.onMemoryRemoved,
),
);
@ -109,17 +119,16 @@ class _TimelinePageState extends State<TimelinePage> {
return;
}
memoryPack.removeCurrentMemory();
memoryPack.resume();
widget.onMemoryRemoved();
},
onTapDown: (_) {
final memoryPack = context.read<MemoryPack>();
memoryPack.pause();
overlayRemover = Timer(
const Duration(milliseconds: 200),
memoryPack.pause,
const Duration(milliseconds: 600),
timelineOverlayController.hideOverlay,
);
},
onTapUp: (_) {
@ -127,12 +136,14 @@ class _TimelinePageState extends State<TimelinePage> {
overlayRemover?.cancel();
memoryPack.resume();
timelineOverlayController.restoreOverlay();
},
onTapCancel: () {
final memoryPack = context.read<MemoryPack>();
overlayRemover?.cancel();
memoryPack.resume();
timelineOverlayController.restoreOverlay();
},
onHorizontalDragEnd: (details) {
final memoryPack = context.read<MemoryPack>();
@ -155,11 +166,11 @@ class _TimelinePageState extends State<TimelinePage> {
},
child: ChangeNotifierProvider<TimelineOverlay>(
create: (_) => timelineOverlayController,
child: Consumer<MemoryPack>(
builder: (_, memoryPack, __) => Stack(
child: Stack(
fit: StackFit.expand,
children: <Widget>[
PageView.builder(
Consumer<MemoryPack>(
builder: (_, memoryPack, __) => PageView.builder(
controller: pageController,
physics: const NeverScrollableScrollPhysics(),
scrollDirection: Axis.horizontal,
@ -169,6 +180,7 @@ class _TimelinePageState extends State<TimelinePage> {
),
itemCount: memoryPack.memories.length,
),
),
Padding(
padding: const EdgeInsets.only(
top: LARGE_SPACE,
@ -178,7 +190,7 @@ class _TimelinePageState extends State<TimelinePage> {
child: AnimatedOpacity(
duration: const Duration(milliseconds: 500),
curve: Curves.linearToEaseOut,
opacity: memoryPack.paused ? 0.0 : 1.0,
opacity: timelineOverlayController.showOverlay ? 1.0 : 0.0,
child: Text(
DateFormat('dd. MMMM yyyy').format(widget.date),
textAlign: TextAlign.center,
@ -194,7 +206,7 @@ class _TimelinePageState extends State<TimelinePage> {
child: AnimatedOpacity(
duration: const Duration(milliseconds: 500),
curve: Curves.linearToEaseOut,
opacity: memoryPack.paused ? 0.0 : 1.0,
opacity: timelineOverlayController.showOverlay ? 1.0 : 0.0,
child: Consumer<MemoryPack>(
builder: (_, memoryPack, __) => Text(
'${memoryPack.currentMemoryIndex + 1}/${memoryPack.memories.length}',
@ -207,7 +219,6 @@ class _TimelinePageState extends State<TimelinePage> {
],
),
),
),
);
}
}