Matrix/fluffychat
Matrix/fluffychat
1
0
Fork 0
mirror of https://github.com/krille-chan/fluffychat synced 2024-09-19 04:55:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: Revert audioplayer changes

Browse source
This commit is contained in:
Krille 2024-05-10 09:52:55 +02:00
parent a86a2c9749
commit 4dee111c73
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
1 changed files with 68 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

157
lib/pages/chat/events/audio_player.dart
View file

@ -38,8 +38,8 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
StreamSubscription? onPlayerError; StreamSubscription? onPlayerError;
String? statusText; String? statusText;
double currentPosition = 0.0; int currentPosition = 0;
double maxPosition = 1.0; double maxPosition = 0;
MatrixFile? matrixFile; MatrixFile? matrixFile;
File? audioFile; File? audioFile;
@ -113,7 +113,9 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
setState(() { setState(() {
statusText = statusText =
'${state.inMinutes.toString().padLeft(2, '0')}:${(state.inSeconds % 60).toString().padLeft(2, '0')}'; '${state.inMinutes.toString().padLeft(2, '0')}:${(state.inSeconds % 60).toString().padLeft(2, '0')}';
currentPosition = state.inMilliseconds.toDouble(); currentPosition = ((state.inMilliseconds.toDouble() / maxPosition) *
AudioPlayerWidget.wavesCount)
.round();
}); });
if (state.inMilliseconds.toDouble() == maxPosition) { if (state.inMilliseconds.toDouble() == maxPosition) {
audioPlayer.stop(); audioPlayer.stop();
@ -149,14 +151,12 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
return '${duration.inMinutes.toString().padLeft(2, '0')}:${(duration.inSeconds % 60).toString().padLeft(2, '0')}'; return '${duration.inMinutes.toString().padLeft(2, '0')}:${(duration.inSeconds % 60).toString().padLeft(2, '0')}';
} }
List<int>? _getWaveform() { List<int> _getWaveform() {
final eventWaveForm = widget.event.content final eventWaveForm = widget.event.content
.tryGetMap<String, dynamic>('org.matrix.msc1767.audio') .tryGetMap<String, dynamic>('org.matrix.msc1767.audio')
?.tryGetList<int>('waveform'); ?.tryGetList<int>('waveform');
if (eventWaveForm == null || if (eventWaveForm == null || eventWaveForm.isEmpty) {
eventWaveForm.isEmpty || return List<int>.filled(AudioPlayerWidget.wavesCount, 500);
eventWaveForm.length > 100) {
return null;
} }
while (eventWaveForm.length < AudioPlayerWidget.wavesCount) { while (eventWaveForm.length < AudioPlayerWidget.wavesCount) {
for (var i = 0; i < eventWaveForm.length; i = i + 2) { for (var i = 0; i < eventWaveForm.length; i = i + 2) {
@ -172,7 +172,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
return eventWaveForm.map((i) => i > 1024 ? 1024 : i).toList(); return eventWaveForm.map((i) => i > 1024 ? 1024 : i).toList();
} }
late final List<int>? waveform; late final List<int> waveform;
void _toggleSpeed() async { void _toggleSpeed() async {
final audioPlayer = this.audioPlayer; final audioPlayer = this.audioPlayer;
@ -208,9 +208,8 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final statusText = this.statusText ??= _durationString ?? '00:00'; final statusText = this.statusText ??= _durationString ?? '00:00';
final audioPlayer = this.audioPlayer; final audioPlayer = this.audioPlayer;
final waveform = this.waveform;
return Padding( return Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(12.0),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
@ -241,90 +240,70 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
}, },
), ),
), ),
Expanded( const SizedBox(width: 8),
child: Stack( Row(
children: [ mainAxisSize: MainAxisSize.min,
if (waveform != null)
Container(
height: 40,
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Row(
children: [
for (var i = 0; i < waveform.length; i++)
Expanded(
child: Center(
child: Container(
decoration: BoxDecoration(
color: widget.color.withAlpha(64),
borderRadius: BorderRadius.circular(2),
),
height: 56 * (waveform[i] / 1024),
),
),
),
],
),
),
if (audioPlayer != null)
SizedBox(
height: 40,
child: Slider(
activeColor: widget.color,
thumbColor: widget.color,
value: currentPosition,
min: 0,
max: maxPosition,
onChangeStart: (_) => audioPlayer.pause(),
onChangeEnd: (_) => audioPlayer.play(),
onChanged: (pos) => audioPlayer.seek(
Duration(
milliseconds: pos.round(),
),
),
),
),
],
),
),
Container(
alignment: Alignment.centerRight,
width: 42,
child: Text(
statusText,
style: TextStyle(
color: widget.color,
),
),
),
const SizedBox(width: 4),
Stack(
children: [ children: [
SizedBox( for (var i = 0; i < AudioPlayerWidget.wavesCount; i++)
width: buttonSize, GestureDetector(
height: buttonSize, onTapDown: (_) => audioPlayer?.seek(
child: InkWell( Duration(
splashColor: widget.color.withAlpha(128), milliseconds:
borderRadius: BorderRadius.circular(64), (maxPosition / AudioPlayerWidget.wavesCount).round() *
onTap: audioPlayer == null ? null : _toggleSpeed, i,
child: Icon(Icons.mic_none_outlined, color: widget.color), ),
), ),
), child: Container(
if (audioPlayer != null) height: 32,
Positioned( color: widget.color.withAlpha(0),
bottom: 0, alignment: Alignment.center,
left: 0, child: Opacity(
right: 0, opacity: currentPosition > i ? 1 : 0.5,
child: Text( child: Container(
'${audioPlayer.speed.toString()}x', margin: const EdgeInsets.symmetric(horizontal: 1),
textAlign: TextAlign.center, decoration: BoxDecoration(
style: TextStyle( color: widget.color,
fontSize: 9.0, borderRadius: BorderRadius.circular(2),
color: widget.color, ),
width: 2,
height: 32 * (waveform[i] / 1024),
),
), ),
), ),
), ),
], ],
), ),
const SizedBox(width: 8),
SizedBox(
width: 36,
child: Text(
statusText,
style: TextStyle(
color: widget.color,
fontSize: 12,
),
),
),
const SizedBox(width: 8),
Badge(
label: audioPlayer == null
? null
: Text(
'${audioPlayer.speed.toString()}x',
),
backgroundColor: Theme.of(context).colorScheme.secondary,
textColor: Theme.of(context).colorScheme.onSecondary,
child: InkWell(
splashColor: widget.color.withAlpha(128),
borderRadius: BorderRadius.circular(64),
onTap: audioPlayer == null ? null : _toggleSpeed,
child: Icon(
Icons.mic_none_outlined,
color: widget.color,
),
),
),
const SizedBox(width: 8),
], ],
), ),
); );