From 798a1b5c33659e06bbb7c48d37dca0599ea15354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malo=20L=C3=A9on?= <malo.leon@wyatt-studio.fr>
Date: Tue, 21 Feb 2023 13:19:11 +0100
Subject: [PATCH] fix(ui_kit): remove null check operator in Loader component

---
 .../wyatt_ui_kit/example/lib/loaders/loaders.dart    |  3 +--
 .../lib/src/components/loader/loader.dart            |  5 ++---
 .../src/components/loader/loader_theme_resolver.dart | 12 ++++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/wyatt_ui_kit/example/lib/loaders/loaders.dart b/packages/wyatt_ui_kit/example/lib/loaders/loaders.dart
index bc5d8945..cc456ae7 100644
--- a/packages/wyatt_ui_kit/example/lib/loaders/loaders.dart
+++ b/packages/wyatt_ui_kit/example/lib/loaders/loaders.dart
@@ -23,7 +23,7 @@ import 'package:wyatt_ui_kit_example/theme/constants.dart';
 
 class Loaders extends DemoPage {
   const Loaders({super.key});
-  
+
   @override
   String get title => 'Loaders';
 
@@ -64,5 +64,4 @@ class Loaders extends DemoPage {
           const Gap(20),
         ],
       );
-      
 }
diff --git a/packages/wyatt_ui_kit/lib/src/components/loader/loader.dart b/packages/wyatt_ui_kit/lib/src/components/loader/loader.dart
index a9379a3f..dd28e602 100644
--- a/packages/wyatt_ui_kit/lib/src/components/loader/loader.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/loader/loader.dart
@@ -59,15 +59,14 @@ class Loader extends LoaderComponent with $LoaderCWMixin {
     final style = _resolve(context);
     final dimension =
         (radius != null) ? radius! * 2 : context.buttonTheme.height;
-
     return SizedBox.square(
       dimension: dimension,
       child: RepaintBoundary(
         child: CustomPaint(
           painter: _LoaderPainter(
-            style.colors!,
+            style.colors ?? const MultiColor([]),
             dimension / 2,
-            style.stroke!,
+            style.stroke ?? 4,
             flip: flip ?? false,
           ),
         )
diff --git a/packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart b/packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart
index 1b45ddaf..a5384e54 100644
--- a/packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart
@@ -24,6 +24,12 @@ class LoaderThemeResolver
     required this.customStyleFn,
   });
 
+  @override
+  final LoaderStyle? Function(
+    BuildContext context, {
+    void extra,
+  }) customStyleFn;
+
   /// Values taken from <https://api.flutter.dev/flutter/material/ElevatedButton/defaultStyleOf.html>
   @override
   LoaderStyle computeDefaultValue(
@@ -39,12 +45,6 @@ class LoaderThemeResolver
         stroke: 4,
       );
 
-  @override
-  final LoaderStyle? Function(
-    BuildContext context, {
-    void extra,
-  }) customStyleFn;
-
   @override
   LoaderStyle? computeExtensionValueFn(
     BuildContext context,