fix: fix code style

Tencent · Feb 17, 2023 · 47ff1dc · 47ff1dc
1 parent 8b63e0d
commit 47ff1dc
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 55 deletions.
diff --git a/example/lib/page/td_switch_page.dart b/example/lib/page/td_switch_page.dart
@@ -25,11 +25,9 @@ class TDSwitchPageState extends State<TDSwitchPage> {
         children: [
           ExampleItem(builder: (_) => _title('基础开关')),
           ExampleItem(
-              builder: (_) => Container(
-                    child: Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [demoRow(context, '基础开关', on: true)],
-                    ),
+              builder: (_) => Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [demoRow(context, '基础开关', on: true)],
                   )),
           ExampleItem(builder: (_) => _title('带描述开关')),
           ExampleItem(
@@ -52,64 +50,54 @@ class TDSwitchPageState extends State<TDSwitchPage> {
       ExampleModule(title: '组件状态', children: [
         ExampleItem(builder: (_) => _title('加载状态')),
         ExampleItem(
-            builder: (_) => Container(
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      demoRow(
-                        context,
-                        '加载状态',
-                        on: true,
-                        enable: false,
-                        type: TDSwitchType.loading,
-                      ),
-                      demoRow(
-                        context,
-                        '加载状态',
-                        on: false,
-                        enable: false,
-                        type: TDSwitchType.loading,
-                      ),
-                    ],
-                  ),
+            builder: (_) => Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    demoRow(
+                      context,
+                      '加载状态',
+                      on: true,
+                      enable: false,
+                      type: TDSwitchType.loading,
+                    ),
+                    demoRow(
+                      context,
+                      '加载状态',
+                      on: false,
+                      enable: false,
+                      type: TDSwitchType.loading,
+                    ),
+                  ],
                 )),
         ExampleItem(builder: (_) => _title('禁用状态')),
         ExampleItem(
-            builder: (_) => Container(
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      demoRow(context, '禁用状态', on: false, enable: false),
-                      demoRow(context, '禁用状态', on: true, enable: false),
-                    ],
-                  ),
+            builder: (_) => Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    demoRow(context, '禁用状态', on: false, enable: false),
+                    demoRow(context, '禁用状态', on: true, enable: false),
+                  ],
                 )),
       ]),
       ExampleModule(title: '组件样式', children: [
         ExampleItem(builder: (_) => _title('开关尺寸')),
         ExampleItem(
-            builder: (_) => Container(
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      demoRow(context, '大尺寸32',
-                          on: true, size: TDSwitchSize.large),
-                      demoRow(context, '中尺寸28',
-                          on: true, size: TDSwitchSize.medium),
-                      demoRow(context, '小尺寸24',
-                          on: true, size: TDSwitchSize.small),
-                    ],
-                  ),
+            builder: (_) => Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    demoRow(context, '大尺寸32',
+                        on: true, size: TDSwitchSize.large),
+                    demoRow(context, '中尺寸28',
+                        on: true, size: TDSwitchSize.medium),
+                    demoRow(context, '小尺寸24',
+                        on: true, size: TDSwitchSize.small),
+                  ],
                 )),
       ]),
     ]);
     return current;
   }
 
-  Widget _divider() {
-    return Container(height: 0.5, color: const Color(0x33999999));
-  }
-
   Widget _title(String title) {
     return Container(
       height: 40,

diff --git a/lib/src/components/switch/td_cupertino_switch.dart b/lib/src/components/switch/td_cupertino_switch.dart
@@ -10,7 +10,6 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 
 // Examples can assume:
 // bool _lights = false;
@@ -380,6 +379,7 @@ class _TDCupertinoSwitchRenderObjectWidget
   /// The widget below this widget in the tree.
   ///
   /// {@macro flutter.widgets.ProxyWidget.child}
+  @override
   final Widget? child;
 
   @override
@@ -475,7 +475,6 @@ class _RenderTDCupertinoSwitch extends RenderConstrainedBox {
   Color _trackColor;
 
   set trackColor(Color value) {
-    assert(value != null);
     if (value == _trackColor) {
       return;
     }
@@ -513,7 +512,6 @@ class _RenderTDCupertinoSwitch extends RenderConstrainedBox {
   TextDirection _textDirection;
 
   set textDirection(TextDirection value) {
-    assert(value != null);
     if (_textDirection == value) {
       return;
     }

diff --git a/lib/src/components/switch/td_switch.dart b/lib/src/components/switch/td_switch.dart
@@ -104,8 +104,9 @@ class TDSwitchState extends State<TDSwitch> {
         return 45;
       case TDSwitchSize.small:
         return 39;
+      default:
+        return 45;
     }
-    return 45;
   }
 
   double _getHeight() {
@@ -116,8 +117,9 @@ class TDSwitchState extends State<TDSwitch> {
         return 28;
       case TDSwitchSize.small:
         return 24;
+      default:
+        return 28;
     }
-    return 28;
   }
 
   Widget? _getThumbView(Color onColor, Color offColor) {
@@ -147,8 +149,8 @@ class TDSwitchState extends State<TDSwitch> {
               size: 16, color: isOn ? onColor : offColor),
         );
       case TDSwitchType.fill:
+      default:
         return null;
     }
-    return null;
   }
 }