🐛 Fixed last wave flickering and minor docs update

Signed-off-by: vatsal tanna <vatsal.t@simformsolutions.com>
SimformSolutionsPvtLtd · Aug 16, 2023 · d1f8972 · d1f8972
1 parent 9e724c9
commit d1f8972
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/lib/src/audio_file_waveforms.dart b/lib/src/audio_file_waveforms.dart
@@ -197,8 +197,8 @@ class _AudioFileWaveformsState extends State<AudioFileWaveforms>
         onHorizontalDragEnd:
             widget.enableSeekGesture ? (_) => _handleOnDragEnd() : null,
         child: ClipPath(
-          // TODO: Remove static clipper when duration labels are added
-          clipper: WaveClipper(0),
+          // TODO: Update extraClipperHeight when duration labels are added
+          clipper: WaveClipper(extraClipperHeight: 0),
           child: RepaintBoundary(
             child: ValueListenableBuilder<int>(
               builder: (_, __, ___) {

diff --git a/lib/src/audio_waveforms.dart b/lib/src/audio_waveforms.dart
@@ -68,12 +68,11 @@ class _AudioWaveformsState extends State<AudioWaveforms> {
         onHorizontalDragStart:
             widget.enableGesture ? _handleHorizontalDragStart : null,
         child: ClipPath(
-          clipper: WaveClipper(!widget.waveStyle.showDurationLabel
-              ? 0.0
-              : widget.waveStyle.extraClipperHeight ??
-                  (widget.waveStyle.durationLinesHeight +
-                      (widget.waveStyle.durationStyle.fontSize ??
-                          widget.waveStyle.durationLinesHeight))),
+          clipper: WaveClipper(
+            extraClipperHeight: _getExtraClipperHeight(),
+            waveWidth:
+                widget.waveStyle.waveThickness + widget.waveStyle.spacing,
+          ),
           child: RepaintBoundary(
             child: CustomPaint(
               size: widget.size,
@@ -122,6 +121,19 @@ class _AudioWaveformsState extends State<AudioWaveforms> {
     );
   }
 
+  double _getExtraClipperHeight() {
+    if (widget.waveStyle.showDurationLabel) {
+      if (widget.waveStyle.extraClipperHeight != null) {
+        return widget.waveStyle.extraClipperHeight!;
+      }
+      return widget.waveStyle.durationLinesHeight +
+          (widget.waveStyle.durationStyle.fontSize ??
+              widget.waveStyle.durationLinesHeight);
+    } else {
+      return 0;
+    }
+  }
+
   ///This handles scrolling of the wave
   void _handleHorizontalDragUpdate(DragUpdateDetails details) {
     var direction = details.globalPosition.dx - _initialOffsetPosition;

diff --git a/lib/src/base/utils.dart b/lib/src/base/utils.dart
@@ -20,7 +20,7 @@ enum RecorderState { initialized, recording, paused, stopped }
 /// Android and IOS are have been separated to better support
 /// platform wise encoder and output formats.
 ///
-/// Check https://developer.android.com/reference/android/media/MediaRecorder.AudioEncoder
+/// Check [MediaRecorder.AudioEncoder](https://developer.android.com/reference/android/media/MediaRecorder.AudioEncoder)
 /// for more info.
 enum AndroidEncoder {
   /// Default
@@ -44,7 +44,7 @@ enum AndroidEncoder {
 /// Android and IOS are have been separated to better support
 /// platform wise encoder and output formats.
 ///
-/// Check https://developer.android.com/reference/android/media/MediaRecorder.OutputFormat
+/// Check [MediaRecorder.OutputFormat](https://developer.android.com/reference/android/media/MediaRecorder.OutputFormat)
 /// for more info.
 enum AndroidOutputFormat {
   /// Default
@@ -72,7 +72,7 @@ enum AndroidOutputFormat {
 /// Android and IOS are have been separated to better support
 /// platform wise encoder and output formats.
 ///
-/// Check https://developer.apple.com/documentation/coreaudiotypes/1572096-audio_format_identifiers
+/// Check [Audio Format Identifiers](https://developer.apple.com/documentation/coreaudiotypes/1572096-audio_format_identifiers)
 /// for more info.
 enum IosEncoder {
   /// Default

diff --git a/lib/src/base/wave_clipper.dart b/lib/src/base/wave_clipper.dart
@@ -7,15 +7,19 @@ import 'package:flutter/material.dart';
 /// visible.
 class WaveClipper extends CustomClipper<Path> {
   final double extraClipperHeight;
+  final double waveWidth;
 
-  WaveClipper(this.extraClipperHeight);
+  WaveClipper({
+    required this.extraClipperHeight,
+    this.waveWidth = 0,
+  });
 
   @override
   getClip(Size size) {
     final path = Path()
       ..lineTo(0, size.height + extraClipperHeight)
-      ..lineTo(size.width, size.height + extraClipperHeight)
-      ..lineTo(size.width, 0);
+      ..lineTo(size.width - waveWidth, size.height + extraClipperHeight)
+      ..lineTo(size.width - waveWidth, 0);
     return path;
   }