Update analysis options

Author: lijy91

analysis_options.yaml

@@ -1,4 +1,22 @@
 include: package:flutter_lints/flutter.yaml
 
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+linter:
+  rules:
+    ## Error Rules
+    - always_use_package_imports
+    ## Style rules
+    - directives_ordering
+    - eol_at_end_of_file
+    - file_names
+    - flutter_style_todos
+    - library_names
+    - library_prefixes
+    - prefer_is_empty
+    - prefer_is_not_empty
+    - prefer_is_not_operator
+    - prefer_null_aware_method_calls
+    - prefer_single_quotes
+    - sort_constructors_first
+    - sort_unnamed_constructors_first
+    ## Pub rules
+    - sort_pub_dependencies

example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -36,8 +36,8 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -59,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

example/pubspec.lock

@@ -206,10 +206,10 @@ packages:
     dependency: transitive
     description:
       name: screen_retriever
-      sha256: "9c3839c4eb80807cd8210afa3c84a177ba00aef9f9b7b74ad92d3a0ab1d7e7ed"
+      sha256: "4931f226ca158123ccd765325e9fbf360bfed0af9b460a10f960f9bb13d58323"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.5"
+    version: "0.1.6"
   shortid:
     dependency: transitive
     description:

lib/src/widgets/drag_to_move_area.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
-
-import '../window_manager.dart';
+import 'package:window_manager/src/window_manager.dart';
 
 /// A widget for drag to move window.
 ///
@@ -21,13 +20,13 @@ import '../window_manager.dart';
 /// ```
 /// {@end-tool}
 class DragToMoveArea extends StatelessWidget {
-  final Widget child;
-
   const DragToMoveArea({
     Key? key,
     required this.child,
   }) : super(key: key);
 
+  final Widget child;
+
   @override
   Widget build(BuildContext context) {
     return GestureDetector(

lib/src/widgets/drag_to_resize_area.dart

@@ -1,9 +1,8 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-
-import '../resize_edge.dart';
-import '../window_manager.dart';
+import 'package:window_manager/src/resize_edge.dart';
+import 'package:window_manager/src/window_manager.dart';
 
 /// A widget for drag to resize window.
 ///
@@ -26,12 +25,6 @@ import '../window_manager.dart';
 /// ```
 /// {@end-tool}
 class DragToResizeArea extends StatelessWidget {
-  final Widget child;
-  final double resizeEdgeSize;
-  final Color resizeEdgeColor;
-  final EdgeInsets resizeEdgeMargin;
-  final List<ResizeEdge>? enableResizeEdges;
-
   const DragToResizeArea({
     Key? key,
     required this.child,
@@ -41,6 +34,12 @@ class DragToResizeArea extends StatelessWidget {
     this.enableResizeEdges,
   }) : super(key: key);
 
+  final Widget child;
+  final double resizeEdgeSize;
+  final Color resizeEdgeColor;
+  final EdgeInsets resizeEdgeMargin;
+  final List<ResizeEdge>? enableResizeEdges;
+
   Widget _buildDragToResizeEdge(
     ResizeEdge resizeEdge, {
     MouseCursor cursor = SystemMouseCursors.basic,

lib/src/widgets/virtual_window_frame.dart

@@ -2,26 +2,25 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-
-import './drag_to_resize_area.dart';
-import '../resize_edge.dart';
-import '../window_listener.dart';
-import '../window_manager.dart';
+import 'package:window_manager/src/resize_edge.dart';
+import 'package:window_manager/src/widgets/drag_to_resize_area.dart';
+import 'package:window_manager/src/window_listener.dart';
+import 'package:window_manager/src/window_manager.dart';
 
 final _kIsLinux = !kIsWeb && Platform.isLinux;
 final _kIsWindows = !kIsWeb && Platform.isWindows;
 
 double get kVirtualWindowFrameMargin => (_kIsLinux) ? 20.0 : 0;
 
 class VirtualWindowFrame extends StatefulWidget {
-  /// The [child] contained by the VirtualWindowFrame.
-  final Widget child;
-
   const VirtualWindowFrame({
     Key? key,
     required this.child,
   }) : super(key: key);
 
+  /// The [child] contained by the VirtualWindowFrame.
+  final Widget child;
+
   @override
   State<StatefulWidget> createState() => _VirtualWindowFrameState();
 }

lib/src/widgets/window_caption.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 
-import 'drag_to_move_area.dart';
-import 'window_caption_button.dart';
-import '../window_listener.dart';
-import '../window_manager.dart';
+import 'package:window_manager/src/widgets/drag_to_move_area.dart';
+import 'package:window_manager/src/widgets/window_caption_button.dart';
+import 'package:window_manager/src/window_listener.dart';
+import 'package:window_manager/src/window_manager.dart';
 
 const double kWindowCaptionHeight = 32;
 
@@ -24,17 +24,17 @@ const double kWindowCaptionHeight = 32;
 /// ```
 /// {@end-tool}
 class WindowCaption extends StatefulWidget {
-  final Widget? title;
-  final Color? backgroundColor;
-  final Brightness? brightness;
-
   const WindowCaption({
     Key? key,
     this.title,
     this.backgroundColor,
     this.brightness,
   }) : super(key: key);
 
+  final Widget? title;
+  final Color? backgroundColor;
+  final Brightness? brightness;
+
   @override
   State<WindowCaption> createState() => _WindowCaptionState();
 }

lib/src/widgets/window_caption_button.dart

@@ -3,17 +3,17 @@
 import 'package:flutter/material.dart';
 
 class WindowCaptionButtonIcon extends StatelessWidget {
-  final String name;
-  final Color? color;
-  final String package;
-
   const WindowCaptionButtonIcon({
     Key? key,
     required this.name,
     this.color,
     this.package = 'window_manager',
   }) : super(key: key);
 
+  final String name;
+  final Color? color;
+  final String package;
+
   @override
   Widget build(BuildContext context) {
     return Image.asset(
@@ -28,66 +28,13 @@ class WindowCaptionButtonIcon extends StatelessWidget {
 
 // ignore: must_be_immutable
 class WindowCaptionButton extends StatefulWidget {
-  final Brightness? brightness;
-  final Widget? icon;
-  final String? iconName;
-  final VoidCallback? onPressed;
-
-  _ButtonBgColorScheme _lightButtonBgColorScheme = _ButtonBgColorScheme(
-    normal: Colors.transparent,
-    hovered: Colors.black.withOpacity(0.0373),
-    pressed: Colors.black.withOpacity(0.0241),
-  );
-  _ButtonIconColorScheme _lightButtonIconColorScheme = _ButtonIconColorScheme(
-    normal: Colors.black.withOpacity(0.8956),
-    hovered: Colors.black.withOpacity(0.8956),
-    pressed: Colors.black.withOpacity(0.6063),
-    disabled: Colors.black.withOpacity(0.3614),
-  );
-  _ButtonBgColorScheme _darkButtonBgColorScheme = _ButtonBgColorScheme(
-    normal: Colors.transparent,
-    hovered: Colors.white.withOpacity(0.0605),
-    pressed: Colors.white.withOpacity(0.0419),
-  );
-  _ButtonIconColorScheme _darkButtonIconColorScheme = _ButtonIconColorScheme(
-    normal: Colors.white,
-    hovered: Colors.white,
-    pressed: Colors.white.withOpacity(0.786),
-    disabled: Colors.black.withOpacity(0.3628),
-  );
-
   WindowCaptionButton({
     Key? key,
     this.brightness,
     this.icon,
     this.iconName,
     required this.onPressed,
   }) : super(key: key);
-
-  WindowCaptionButton.minimize({
-    Key? key,
-    this.brightness,
-    this.icon,
-    this.onPressed,
-  })  : iconName = 'images/ic_chrome_minimize.png',
-        super(key: key);
-
-  WindowCaptionButton.maximize({
-    Key? key,
-    this.brightness,
-    this.icon,
-    this.onPressed,
-  })  : iconName = 'images/ic_chrome_maximize.png',
-        super(key: key);
-
-  WindowCaptionButton.unmaximize({
-    Key? key,
-    this.brightness,
-    this.icon,
-    this.onPressed,
-  })  : iconName = 'images/ic_chrome_unmaximize.png',
-        super(key: key);
-
   WindowCaptionButton.close({
     Key? key,
     this.brightness,
@@ -118,6 +65,58 @@ class WindowCaptionButton extends StatefulWidget {
         ),
         super(key: key);
 
+  WindowCaptionButton.unmaximize({
+    Key? key,
+    this.brightness,
+    this.icon,
+    this.onPressed,
+  })  : iconName = 'images/ic_chrome_unmaximize.png',
+        super(key: key);
+
+  WindowCaptionButton.maximize({
+    Key? key,
+    this.brightness,
+    this.icon,
+    this.onPressed,
+  })  : iconName = 'images/ic_chrome_maximize.png',
+        super(key: key);
+
+  WindowCaptionButton.minimize({
+    Key? key,
+    this.brightness,
+    this.icon,
+    this.onPressed,
+  })  : iconName = 'images/ic_chrome_minimize.png',
+        super(key: key);
+
+  final Brightness? brightness;
+  final Widget? icon;
+  final String? iconName;
+  final VoidCallback? onPressed;
+
+  _ButtonBgColorScheme _lightButtonBgColorScheme = _ButtonBgColorScheme(
+    normal: Colors.transparent,
+    hovered: Colors.black.withOpacity(0.0373),
+    pressed: Colors.black.withOpacity(0.0241),
+  );
+  _ButtonIconColorScheme _lightButtonIconColorScheme = _ButtonIconColorScheme(
+    normal: Colors.black.withOpacity(0.8956),
+    hovered: Colors.black.withOpacity(0.8956),
+    pressed: Colors.black.withOpacity(0.6063),
+    disabled: Colors.black.withOpacity(0.3614),
+  );
+  _ButtonBgColorScheme _darkButtonBgColorScheme = _ButtonBgColorScheme(
+    normal: Colors.transparent,
+    hovered: Colors.white.withOpacity(0.0605),
+    pressed: Colors.white.withOpacity(0.0419),
+  );
+  _ButtonIconColorScheme _darkButtonIconColorScheme = _ButtonIconColorScheme(
+    normal: Colors.white,
+    hovered: Colors.white,
+    pressed: Colors.white.withOpacity(0.786),
+    disabled: Colors.black.withOpacity(0.3628),
+  );
+
   _ButtonBgColorScheme get buttonBgColorScheme => brightness != Brightness.dark
       ? _lightButtonBgColorScheme
       : _darkButtonBgColorScheme;
@@ -184,27 +183,25 @@ class _WindowCaptionButtonState extends State<WindowCaptionButton> {
 }
 
 class _ButtonBgColorScheme {
-  final Color normal;
-  final Color hovered;
-  final Color pressed;
-
   _ButtonBgColorScheme({
     required this.normal,
     required this.hovered,
     required this.pressed,
   });
-}
-
-class _ButtonIconColorScheme {
   final Color normal;
   final Color hovered;
   final Color pressed;
-  final Color disabled;
+}
 
+class _ButtonIconColorScheme {
   _ButtonIconColorScheme({
     required this.normal,
     required this.hovered,
     required this.pressed,
     required this.disabled,
   });
+  final Color normal;
+  final Color hovered;
+  final Color pressed;
+  final Color disabled;
 }