aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into logout-analytics-stream-fix

Browse Source
pull/1428/head
ggurdin 1 year ago committed by GitHub
parent 23b6dd08b5 a22e267fe4
commit a5adde628d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 77 additions and 81 deletions
Show Stats Download Patch File Download Diff File

150
lib/pangea/choreographer/widgets/choice_array.dart
Unescape Escape View File

@ -1,4 +1,5 @@
import 'dart:developer';
import 'dart:math';
import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart';
@ -212,99 +213,98 @@ class ChoiceAnimationWidgetState extends State<ChoiceAnimationWidget>
with SingleTickerProviderStateMixin {
late final AnimationController _controller;
late final Animation<double> _animation;
// AnimationState animationState = AnimationState.ready;
AnimationState animationState = AnimationState.ready;
@override
void initState() {
super.initState();
// _controller = AnimationController(
// duration: const Duration(milliseconds: 300),
// vsync: this,
// );
_controller = AnimationController(
duration: const Duration(milliseconds: 300),
vsync: this,
);
// _animation = widget.isGold
// ? Tween<double>(begin: 1.0, end: 1.2).animate(_controller)
// : TweenSequence<double>([
// TweenSequenceItem<double>(
// tween: Tween<double>(begin: 0, end: -8 * pi / 180),
// weight: 1.0,
// ),
// TweenSequenceItem<double>(
// tween: Tween<double>(begin: -8 * pi / 180, end: 16 * pi / 180),
// weight: 2.0,
// ),
// TweenSequenceItem<double>(
// tween: Tween<double>(begin: 16 * pi / 180, end: 0),
// weight: 1.0,
// ),
// ]).animate(_controller);
_animation = widget.isGold
? Tween<double>(begin: 1.0, end: 1.2).animate(_controller)
: TweenSequence<double>([
TweenSequenceItem<double>(
tween: Tween<double>(begin: 0, end: -8 * pi / 180),
weight: 1.0,
),
TweenSequenceItem<double>(
tween: Tween<double>(begin: -8 * pi / 180, end: 16 * pi / 180),
weight: 2.0,
),
TweenSequenceItem<double>(
tween: Tween<double>(begin: 16 * pi / 180, end: 0),
weight: 1.0,
),
]).animate(_controller);
widget.enableInteraction();
// if (widget.selected && animationState == AnimationState.ready) {
// widget.disableInteraction();
// _controller.forward();
// setState(() {
// animationState = AnimationState.forward;
// });
// }
// _controller.addStatusListener((status) {
// if (status == AnimationStatus.completed &&
// animationState == AnimationState.forward) {
// _controller.reverse();
// setState(() {
// animationState = AnimationState.reverse;
// });
// }
// if (status == AnimationStatus.dismissed &&
// animationState == AnimationState.reverse) {
// widget.enableInteraction();
// setState(() {
// animationState = AnimationState.finished;
// });
// }
// });
if (widget.selected && animationState == AnimationState.ready) {
widget.disableInteraction();
_controller.forward();
setState(() {
animationState = AnimationState.forward;
});
}
_controller.addStatusListener((status) {
if (status == AnimationStatus.completed &&
animationState == AnimationState.forward) {
_controller.reverse();
setState(() {
animationState = AnimationState.reverse;
});
}
if (status == AnimationStatus.dismissed &&
animationState == AnimationState.reverse) {
widget.enableInteraction();
setState(() {
animationState = AnimationState.finished;
});
}
});
}
@override
void didUpdateWidget(ChoiceAnimationWidget oldWidget) {
super.didUpdateWidget(oldWidget);
// if (widget.selected && animationState == AnimationState.ready) {
// widget.disableInteraction();
// _controller.forward();
// setState(() {
// animationState = AnimationState.forward;
// });
// }
if (widget.selected && animationState == AnimationState.ready) {
widget.disableInteraction();
_controller.forward();
setState(() {
animationState = AnimationState.forward;
});
}
}
@override
Widget build(BuildContext context) {
return widget.child;
// widget.isGold
// ? AnimatedBuilder(
// key: UniqueKey(),
// animation: _animation,
// builder: (context, child) {
// return Transform.scale(
// scale: _animation.value,
// child: child,
// );
// },
// child: widget.child,
// )
// : AnimatedBuilder(
// key: UniqueKey(),
// animation: _animation,
// builder: (context, child) {
// return Transform.rotate(
// angle: _animation.value,
// child: child,
// );
// },
// child: widget.child,
// );
return widget.isGold
? AnimatedBuilder(
key: UniqueKey(),
animation: _animation,
builder: (context, child) {
return Transform.scale(
scale: _animation.value,
child: child,
);
},
child: widget.child,
)
: AnimatedBuilder(
key: UniqueKey(),
animation: _animation,
builder: (context, child) {
return Transform.rotate(
angle: _animation.value,
child: child,
);
},
child: widget.child,
);
}
@override

8
lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart
Unescape Escape View File

@ -99,7 +99,7 @@ extension AnalyticsRoomExtension on Room {
await analyticsRoom.requestParticipants();
}
final List<User> participants = await analyticsRoom.requestParticipants();
final List<User> participants = analyticsRoom.getParticipants();
final List<User> uninvitedTeachers = teachersLocal
.where((teacher) => !participants.contains(teacher))
.toList();
@ -110,12 +110,8 @@ extension AnalyticsRoomExtension on Room {
(teacher) => analyticsRoom.invite(teacher.id).catchError((err, s) {
ErrorHandler.logError(
e: err,
m: "Failed to invite teacher to analytics room",
m: "Failed to invite teacher ${teacher.id} to analytics room ${analyticsRoom.id}",
s: s,
data: {
"teacherId": teacher.id,
"analyticsRoomId": analyticsRoom.id,
},
);
}),
),

Write Preview
Loading…
Cancel
Save