tweaks (#1806)

* opt: nonnull case

* fix: ImageGrid

* opt: distanceSquared

lib/common/widgets/gesture/immediate_tap_gesture_recognizer.dart

@@ -79,7 +79,7 @@ class ImmediateTapGestureRecognizer extends OneSequenceGestureRecognizer {
   }
 
   void _handlePointerMove(PointerMoveEvent event) {
-    if ((event.position - _initialPosition!).distance > 2.0) {
+    if ((event.position - _initialPosition!).distanceSquared > 4.0) {
       resolve(GestureDisposition.rejected);
       stopTrackingPointer(event.pointer);
     }

lib/common/widgets/image/custom_grid_view.dart

@@ -251,7 +251,6 @@ class CustomGridView extends StatelessWidget {
         height: imageHeight * row + space * (row - 1),
         child: ImageGrid(
           space: space,
-          itemCount: length,
           column: column,
           width: imageWidth,
           height: imageHeight,
@@ -318,14 +317,12 @@ class ImageGrid extends MultiChildRenderObjectWidget {
     super.key,
     super.children,
     required this.space,
-    required this.itemCount,
     required this.column,
     required this.width,
     required this.height,
   });
 
   final double space;
-  final int itemCount;
   final int column;
   final double width;
   final double height;
@@ -334,7 +331,6 @@ class ImageGrid extends MultiChildRenderObjectWidget {
   RenderObject createRenderObject(BuildContext context) {
     return RenderImageGrid(
       space: space,
-      itemCount: itemCount,
       column: column,
       width: width,
       height: height,
@@ -345,7 +341,6 @@ class ImageGrid extends MultiChildRenderObjectWidget {
   void updateRenderObject(BuildContext context, RenderImageGrid renderObject) {
     renderObject
       ..space = space
-      ..itemCount = itemCount
       ..column = column
       ..width = width
       ..height = height;
@@ -358,12 +353,10 @@ class RenderImageGrid extends RenderBox
         RenderBoxContainerDefaultsMixin<RenderBox, MultiChildLayoutParentData> {
   RenderImageGrid({
     required double space,
-    required int itemCount,
     required int column,
     required double width,
     required double height,
   }) : _space = space,
-       _itemCount = itemCount,
        _column = column,
        _width = width,
        _height = height;
@@ -373,23 +366,15 @@ class RenderImageGrid extends RenderBox
   set space(double value) {
     if (_space == value) return;
     _space = value;
-    markNeedsPaint();
+    markNeedsLayout();
-  }
-
-  int _itemCount;
-  int get itemCount => _itemCount;
-  set itemCount(int value) {
-    if (_itemCount == value) return;
-    _itemCount = value;
-    markNeedsPaint();
   }
 
   int _column;
   int get column => _column;
   set column(int value) {
-    if (_space == value) return;
+    if (_column == value) return;
     _column = value;
-    markNeedsPaint();
+    markNeedsLayout();
   }
 
   double _width;
@@ -397,7 +382,7 @@ class RenderImageGrid extends RenderBox
   set width(double value) {
     if (_width == value) return;
     _width = value;
-    markNeedsPaint();
+    markNeedsLayout();
   }
 
   double _height;
@@ -405,7 +390,7 @@ class RenderImageGrid extends RenderBox
   set height(double value) {
     if (_height == value) return;
     _height = value;
-    markNeedsPaint();
+    markNeedsLayout();
   }
 
   @override

lib/pages/match_info/view.dart

@@ -67,8 +67,7 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
   }
 
   Widget _buildInfo(ThemeData theme, LoadingState<MatchContest?> infoState) {
-    if (infoState case Success(:final response)) {
+    if (infoState case Success(:final response?)) {
-      if (response != null) {
       try {
         Widget teamInfo(MatchTeam team) {
           return Column(
@@ -128,8 +127,7 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
                           NetworkImgLayer(
                             width: 50,
                             height: 50,
-                              src:
+                            src: 'https://i1.hdslb.com${response.season!.logo}',
-                                  'https://i1.hdslb.com${response.season!.logo}',
                             type: ImageType.emote,
                           ),
                         if (response.contestStatus == 2)
@@ -186,7 +184,6 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
         return const SliverToBoxAdapter();
       }
     }
-    }
     return const SliverToBoxAdapter();
   }
 

lib/pages/space_setting/controller.dart

@@ -29,8 +29,7 @@ class SpaceSettingController
 
   Future<void> onMod() async {
     if (hasMod ?? false) {
-      if (loadingState.value case Success(:final response)) {
+      if (loadingState.value case Success(:final response?)) {
-        if (response != null) {
         final res = await UserHttp.spaceSettingMod(
           {
             for (final e in response.list1) e.key: e.value,
@@ -44,5 +43,4 @@ class SpaceSettingController
       }
     }
   }
-  }
 }

lib/plugin/pl_player/view.dart

@@ -243,7 +243,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             : null,
         onTapUp: _onTapUp,
         onTapCancel: _removeDmAction,
-        allowedButtonsFilter: (buttons) => buttons == kPrimaryButton,
       );
 
       _danmakuListener = plPlayerController.enableShowDanmaku.listen((value) {
@@ -251,10 +250,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         _tapGestureRecognizer.onTapDown = value ? _onTapDown : null;
       });
     } else {
-      _tapGestureRecognizer = ImmediateTapGestureRecognizer(
+      _tapGestureRecognizer = ImmediateTapGestureRecognizer(onTapUp: _onTapUp);
-        onTapUp: _onTapUp,
-        allowedButtonsFilter: (buttons) => buttons == kPrimaryButton,
-      );
     }
 
     _doubleTapGestureRecognizer = DoubleTapGestureRecognizer()
@@ -956,7 +952,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     }
     Offset cumulativeDelta =
         details.localFocalPoint - plPlayerController.initialFocalPoint;
-    if (details.pointerCount > 1 && cumulativeDelta.distance < 1.5) {
+    if (details.pointerCount > 1 && cumulativeDelta.distanceSquared < 2.25) {
       interacting = true;
       _gestureType = null;
       return;
@@ -966,7 +962,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     if (plPlayerController.controlsLock.value) return;
 
     if (_gestureType == null) {
-      if (cumulativeDelta.distance < 1) return;
+      if (cumulativeDelta.distanceSquared < 1) return;
       final dx = cumulativeDelta.dx.abs();
       final dy = cumulativeDelta.dy.abs();
       if (dx > 3 * dy) {
@@ -1292,7 +1288,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     if (plPlayerController.controlsLock.value) return;
     if (_gestureType == null) {
       final pan = event.pan;
-      if (pan.distance < 1) return;
+      if (pan.distanceSquared < 1) return;
       final dx = pan.dx.abs();
       final dy = pan.dy.abs();
       if (dx > 3 * dy) {

lib/utils/request_utils.dart

@@ -281,26 +281,24 @@ abstract final class RequestUtils {
   // }
 
   static Future<void> insertCreatedDyn(dynamic id) async {
-    try {
     if (id != null) {
+      try {
         await Future.delayed(const Duration(milliseconds: 450));
         final res = await DynamicsHttp.dynamicDetail(id: id);
         if (res case final Success<DynamicItemModel> e) {
           final ctr = Get.find<DynamicsTabController>(tag: 'all');
-          if (ctr.loadingState.value case Success(:final response)) {
+          if (ctr.loadingState.value case Success(:final response?)) {
-            if (response != null) {
             response.insert(0, e.response);
             ctr.loadingState.refresh();
             return;
           }
-          }
           ctr.loadingState.value = Success([e.response]);
         }
-      }
       } catch (e) {
         if (kDebugMode) debugPrint('create dyn $e');
       }
     }
+  }
 
   static Future<void> checkCreatedDyn({
     dynamic id,
@@ -531,9 +529,9 @@ abstract final class RequestUtils {
         validate: captchaData.validate,
       );
       if (res case Success(:final response)) {
-        if (response?['is_valid'] == 1) {
+        if (response != null && response['is_valid'] == 1) {
-          final griskId = response?['grisk_id'];
+          final griskId = response['grisk_id'];
-          if (griskId != null) {
+          if (griskId is String) {
             onSuccess(griskId);
           }
         } else {