Merge pull request #186 from Securrency-OSS/dv/code-formatting

fix: Code refactoring

packages/mirai/lib/src/parsers/mirai_check_box_widget/mirai_check_box_widget.dart

@@ -7,7 +7,7 @@ part 'mirai_check_box_widget.g.dart';
 @freezed
 class MiraiCheckBoxWidget with _$MiraiCheckBoxWidget {
   const factory MiraiCheckBoxWidget({
-    required String id,
+    String? id,
     bool? value,
     String? activeColor,
     MiraiMaterialColor? fillColor,

packages/mirai/lib/src/parsers/mirai_check_box_widget/mirai_check_box_widget.freezed.dart

@@ -20,7 +20,7 @@ MiraiCheckBoxWidget _$MiraiCheckBoxWidgetFromJson(Map<String, dynamic> json) {
 
 /// @nodoc
 mixin _$MiraiCheckBoxWidget {
-  String get id => throw _privateConstructorUsedError;
+  String? get id => throw _privateConstructorUsedError;
   bool? get value => throw _privateConstructorUsedError;
   String? get activeColor => throw _privateConstructorUsedError;
   MiraiMaterialColor? get fillColor => throw _privateConstructorUsedError;
@@ -46,7 +46,7 @@ abstract class $MiraiCheckBoxWidgetCopyWith<$Res> {
       _$MiraiCheckBoxWidgetCopyWithImpl<$Res, MiraiCheckBoxWidget>;
   @useResult
   $Res call(
-      {String id,
+      {String? id,
       bool? value,
       String? activeColor,
       MiraiMaterialColor? fillColor,
@@ -76,7 +76,7 @@ class _$MiraiCheckBoxWidgetCopyWithImpl<$Res, $Val extends MiraiCheckBoxWidget>
   @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? id = null,
+    Object? id = freezed,
     Object? value = freezed,
     Object? activeColor = freezed,
     Object? fillColor = freezed,
@@ -90,10 +90,10 @@ class _$MiraiCheckBoxWidgetCopyWithImpl<$Res, $Val extends MiraiCheckBoxWidget>
     Object? isError = null,
   }) {
     return _then(_value.copyWith(
-      id: null == id
+      id: freezed == id
           ? _value.id
           : id // ignore: cast_nullable_to_non_nullable
-              as String,
+              as String?,
       value: freezed == value
           ? _value.value
           : value // ignore: cast_nullable_to_non_nullable
@@ -175,7 +175,7 @@ abstract class _$$_MiraiCheckBoxWidgetCopyWith<$Res>
   @override
   @useResult
   $Res call(
-      {String id,
+      {String? id,
       bool? value,
       String? activeColor,
       MiraiMaterialColor? fillColor,
@@ -205,7 +205,7 @@ class __$$_MiraiCheckBoxWidgetCopyWithImpl<$Res>
   @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? id = null,
+    Object? id = freezed,
     Object? value = freezed,
     Object? activeColor = freezed,
     Object? fillColor = freezed,
@@ -219,10 +219,10 @@ class __$$_MiraiCheckBoxWidgetCopyWithImpl<$Res>
     Object? isError = null,
   }) {
     return _then(_$_MiraiCheckBoxWidget(
-      id: null == id
+      id: freezed == id
           ? _value.id
           : id // ignore: cast_nullable_to_non_nullable
-              as String,
+              as String?,
       value: freezed == value
           ? _value.value
           : value // ignore: cast_nullable_to_non_nullable
@@ -275,7 +275,7 @@ class __$$_MiraiCheckBoxWidgetCopyWithImpl<$Res>
 @JsonSerializable()
 class _$_MiraiCheckBoxWidget implements _MiraiCheckBoxWidget {
   const _$_MiraiCheckBoxWidget(
-      {required this.id,
+      {this.id,
       this.value,
       this.activeColor,
       this.fillColor,
@@ -292,7 +292,7 @@ class _$_MiraiCheckBoxWidget implements _MiraiCheckBoxWidget {
       _$$_MiraiCheckBoxWidgetFromJson(json);
 
   @override
-  final String id;
+  final String? id;
   @override
   final bool? value;
   @override
@@ -386,7 +386,7 @@ class _$_MiraiCheckBoxWidget implements _MiraiCheckBoxWidget {
 
 abstract class _MiraiCheckBoxWidget implements MiraiCheckBoxWidget {
   const factory _MiraiCheckBoxWidget(
-      {required final String id,
+      {final String? id,
       final bool? value,
       final String? activeColor,
       final MiraiMaterialColor? fillColor,
@@ -403,7 +403,7 @@ abstract class _MiraiCheckBoxWidget implements MiraiCheckBoxWidget {
       _$_MiraiCheckBoxWidget.fromJson;
 
   @override
-  String get id;
+  String? get id;
   @override
   bool? get value;
   @override

packages/mirai/lib/src/parsers/mirai_check_box_widget/mirai_check_box_widget_parser.dart

@@ -5,7 +5,6 @@ import 'package:mirai/src/parsers/mirai_check_box_widget/mirai_check_box_widget.
 import 'package:mirai/src/parsers/mirai_form/cubit/mirai_form_cubit.dart';
 import 'package:mirai/src/parsers/mirai_material_color/mirai_material_color.dart';
 import 'package:mirai/src/utils/color_utils.dart';
-import 'package:mirai/src/utils/log.dart';
 import 'package:mirai/src/utils/widget_type.dart';
 
 class MiraiCheckBoxWidgetParser extends MiraiParser<MiraiCheckBoxWidget> {
@@ -40,12 +39,10 @@ class __MiraiCheckBoxWidgetState extends State<_MiraiCheckBoxWidget> {
 
   @override
   void initState() {
-    try {
+    if (widget.model.id != null) {
       context
           .read<MiraiFormCubit>()
-          .registerValue(widget.model.id, widget.model.value);
-    } catch (e) {
-      Log.d(e);
+          .registerValue(widget.model.id!, widget.model.value);
     }
 
     super.initState();
@@ -59,16 +56,13 @@ class __MiraiCheckBoxWidgetState extends State<_MiraiCheckBoxWidget> {
           setState(() {
             isMarkChecked = !isMarkChecked;
           });
-
-          try {
+          if (widget.model.id != null) {
             context
                 .read<MiraiFormCubit>()
-                .updateValue(widget.model.id, isMarkChecked);
+                .updateValue(widget.model.id!, isMarkChecked);
             context
                 .read<MiraiFormCubit>()
-                .updateValidation(widget.model.id, isMarkChecked);
-          } catch (e) {
-            Log.d(e);
+                .updateValidation(widget.model.id!, isMarkChecked);
           }
         },
         activeColor: widget.model.activeColor.toColor,

packages/mirai/lib/src/parsers/mirai_input_decoration/mirai_input_decoration.dart

@@ -50,7 +50,7 @@ class MiraiInputDecoration with _$MiraiInputDecoration {
     Map<String, dynamic>? counter,
     String? counterText,
     MiraiTextStyle? counterStyle,
-    @Default(false) bool filled,
+    bool? filled,
     String? fillColor,
     String? hoverColor,
     String? focusColor,

packages/mirai/lib/src/parsers/mirai_input_decoration/mirai_input_decoration.freezed.dart

@@ -60,7 +60,7 @@ mixin _$MiraiInputDecoration {
   Map<String, dynamic>? get counter => throw _privateConstructorUsedError;
   String? get counterText => throw _privateConstructorUsedError;
   MiraiTextStyle? get counterStyle => throw _privateConstructorUsedError;
-  bool get filled => throw _privateConstructorUsedError;
+  bool? get filled => throw _privateConstructorUsedError;
   String? get fillColor => throw _privateConstructorUsedError;
   String? get hoverColor => throw _privateConstructorUsedError;
   String? get focusColor => throw _privateConstructorUsedError;
@@ -125,7 +125,7 @@ abstract class $MiraiInputDecorationCopyWith<$Res> {
       Map<String, dynamic>? counter,
       String? counterText,
       MiraiTextStyle? counterStyle,
-      bool filled,
+      bool? filled,
       String? fillColor,
       String? hoverColor,
       String? focusColor,
@@ -210,7 +210,7 @@ class _$MiraiInputDecorationCopyWithImpl<$Res,
     Object? counter = freezed,
     Object? counterText = freezed,
     Object? counterStyle = freezed,
-    Object? filled = null,
+    Object? filled = freezed,
     Object? fillColor = freezed,
     Object? hoverColor = freezed,
     Object? focusColor = freezed,
@@ -370,10 +370,10 @@ class _$MiraiInputDecorationCopyWithImpl<$Res,
           ? _value.counterStyle
           : counterStyle // ignore: cast_nullable_to_non_nullable
               as MiraiTextStyle?,
-      filled: null == filled
+      filled: freezed == filled
           ? _value.filled
           : filled // ignore: cast_nullable_to_non_nullable
-              as bool,
+              as bool?,
       fillColor: freezed == fillColor
           ? _value.fillColor
           : fillColor // ignore: cast_nullable_to_non_nullable
@@ -693,7 +693,7 @@ abstract class _$$_MiraiInputDecorationCopyWith<$Res>
       Map<String, dynamic>? counter,
       String? counterText,
       MiraiTextStyle? counterStyle,
-      bool filled,
+      bool? filled,
       String? fillColor,
       String? hoverColor,
       String? focusColor,
@@ -793,7 +793,7 @@ class __$$_MiraiInputDecorationCopyWithImpl<$Res>
     Object? counter = freezed,
     Object? counterText = freezed,
     Object? counterStyle = freezed,
-    Object? filled = null,
+    Object? filled = freezed,
     Object? fillColor = freezed,
     Object? hoverColor = freezed,
     Object? focusColor = freezed,
@@ -953,10 +953,10 @@ class __$$_MiraiInputDecorationCopyWithImpl<$Res>
           ? _value.counterStyle
           : counterStyle // ignore: cast_nullable_to_non_nullable
               as MiraiTextStyle?,
-      filled: null == filled
+      filled: freezed == filled
           ? _value.filled
           : filled // ignore: cast_nullable_to_non_nullable
-              as bool,
+              as bool?,
       fillColor: freezed == fillColor
           ? _value.fillColor
           : fillColor // ignore: cast_nullable_to_non_nullable
@@ -1053,7 +1053,7 @@ class _$_MiraiInputDecoration implements _MiraiInputDecoration {
       final Map<String, dynamic>? counter,
       this.counterText,
       this.counterStyle,
-      this.filled = false,
+      this.filled,
       this.fillColor,
       this.hoverColor,
       this.focusColor,
@@ -1209,8 +1209,7 @@ class _$_MiraiInputDecoration implements _MiraiInputDecoration {
   @override
   final MiraiTextStyle? counterStyle;
   @override
-  @JsonKey()
-  final bool filled;
+  final bool? filled;
   @override
   final String? fillColor;
   @override
@@ -1452,7 +1451,7 @@ abstract class _MiraiInputDecoration implements MiraiInputDecoration {
       final Map<String, dynamic>? counter,
       final String? counterText,
       final MiraiTextStyle? counterStyle,
-      final bool filled,
+      final bool? filled,
       final String? fillColor,
       final String? hoverColor,
       final String? focusColor,
@@ -1543,7 +1542,7 @@ abstract class _MiraiInputDecoration implements MiraiInputDecoration {
   @override
   MiraiTextStyle? get counterStyle;
   @override
-  bool get filled;
+  bool? get filled;
   @override
   String? get fillColor;
   @override

packages/mirai/lib/src/parsers/mirai_text_form_field/mirai_text_form_field.dart

@@ -16,7 +16,7 @@ part 'mirai_text_form_field.g.dart';
 @freezed
 class MiraiTextFormField with _$MiraiTextFormField {
   const factory MiraiTextFormField({
-    required String id,
+    String? id,
     String? compareId,
     MiraiInputDecoration? decoration,
     String? initialValue,