feat: optimize some code

example/lib/trimmer_view.dart

@@ -58,11 +58,7 @@ class _TrimmerViewState extends State<TrimmerView> {
   Widget build(BuildContext context) {
     return WillPopScope(
       onWillPop: () async {
-        if (Navigator.of(context).userGestureInProgress) {
-          return false;
-        } else {
-          return true;
-        }
+        return !Navigator.of(context).userGestureInProgress;
       },
       child: Scaffold(
         backgroundColor: Colors.black,

lib/src/trim_viewer/trim_viewer.dart

@@ -1,3 +1,6 @@
+import 'dart:async';
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:video_trimmer/video_trimmer.dart';
 
@@ -192,11 +195,16 @@ class TrimViewer extends StatefulWidget {
 
 class _TrimViewerState extends State<TrimViewer> with TickerProviderStateMixin {
   bool? _isScrollableAllowed;
+  late StreamSubscription<TrimmerEvent> _eventSubscription;
 
   @override
   void initState() {
     super.initState();
-    widget.trimmer.eventStream.listen((event) {
+    _init();
+  }
+
+  void _init() {
+    _eventSubscription = widget.trimmer.eventStream.listen((event) {
       if (event == TrimmerEvent.initialized) {
         final totalDuration =
             widget.trimmer.videoPlayerController!.value.duration;
@@ -218,9 +226,37 @@ class _TrimViewerState extends State<TrimViewer> with TickerProviderStateMixin {
     });
   }
 
+  @override
+  void didUpdateWidget(covariant TrimViewer oldWidget) {
+    if (oldWidget.trimmer != widget.trimmer) {
+      _eventSubscription.cancel();
+      _init();
+    }
+    super.didUpdateWidget(oldWidget);
+    log("TrimViewer didUpdateWidget");
+  }
+
+  @override
+  void dispose() {
+    _eventSubscription.cancel();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
-    final scrollableViewer = ScrollableTrimViewer(
+    if (_isScrollableAllowed == null) {
+      return const SizedBox();
+    }
+
+    if (widget.type == ViewerType.scrollable || _isScrollableAllowed == true) {
+      return _buildScrollableTrimViewer();
+    }
+
+    return _buildFixedTrimViewer();
+  }
+
+  Widget _buildFixedTrimViewer() {
+    return FixedTrimViewer(
       trimmer: widget.trimmer,
       maxVideoLength: widget.maxVideoLength,
       viewerWidth: widget.viewerWidth,
@@ -231,17 +267,22 @@ class _TrimViewerState extends State<TrimViewer> with TickerProviderStateMixin {
       onChangeStart: widget.onChangeStart,
       onChangeEnd: widget.onChangeEnd,
       onChangePlaybackState: widget.onChangePlaybackState,
-      paddingFraction: widget.paddingFraction,
       editorProperties: widget.editorProperties,
-      areaProperties: widget.areaProperties,
+      areaProperties: FixedTrimAreaProperties(
+        thumbnailFit: widget.areaProperties.thumbnailFit,
+        thumbnailQuality: widget.areaProperties.thumbnailQuality,
+        borderRadius: widget.areaProperties.borderRadius,
+      ),
       onThumbnailLoadingComplete: () {
         if (widget.onThumbnailLoadingComplete != null) {
           widget.onThumbnailLoadingComplete!();
         }
       },
     );
+  }
 
-    final fixedTrimViewer = FixedTrimViewer(
+  Widget _buildScrollableTrimViewer() {
+    return ScrollableTrimViewer(
       trimmer: widget.trimmer,
       maxVideoLength: widget.maxVideoLength,
       viewerWidth: widget.viewerWidth,
@@ -252,27 +293,14 @@ class _TrimViewerState extends State<TrimViewer> with TickerProviderStateMixin {
       onChangeStart: widget.onChangeStart,
       onChangeEnd: widget.onChangeEnd,
       onChangePlaybackState: widget.onChangePlaybackState,
+      paddingFraction: widget.paddingFraction,
       editorProperties: widget.editorProperties,
-      areaProperties: FixedTrimAreaProperties(
-        thumbnailFit: widget.areaProperties.thumbnailFit,
-        thumbnailQuality: widget.areaProperties.thumbnailQuality,
-        borderRadius: widget.areaProperties.borderRadius,
-      ),
+      areaProperties: widget.areaProperties,
       onThumbnailLoadingComplete: () {
         if (widget.onThumbnailLoadingComplete != null) {
           widget.onThumbnailLoadingComplete!();
         }
       },
     );
-
-    return _isScrollableAllowed == null
-        ? const SizedBox()
-        : widget.type == ViewerType.fixed
-            ? fixedTrimViewer
-            : widget.type == ViewerType.scrollable
-                ? scrollableViewer
-                : _isScrollableAllowed == true
-                    ? scrollableViewer
-                    : fixedTrimViewer;
   }
 }