Skip to content

Commit

Permalink
Merge pull request #231 from Securrency-OSS/asim/form-builder-fix
Browse files Browse the repository at this point in the history
fix: Removed imports from `mirai.dart` and rebuilt packages
  • Loading branch information
divyanshub024 authored Nov 9, 2023
2 parents d927917 + 0daccaf commit 5765701
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 70 deletions.
42 changes: 21 additions & 21 deletions examples/mirai_gallery/lib/app/example/example_screen.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,30 @@ class _$ExampleScreenCopyWithImpl<$Res, $Val extends ExampleScreen>
}

/// @nodoc
abstract class _$$_ExampleScreenCopyWith<$Res>
abstract class _$$ExampleScreenImplCopyWith<$Res>
implements $ExampleScreenCopyWith<$Res> {
factory _$$_ExampleScreenCopyWith(
_$_ExampleScreen value, $Res Function(_$_ExampleScreen) then) =
__$$_ExampleScreenCopyWithImpl<$Res>;
factory _$$ExampleScreenImplCopyWith(
_$ExampleScreenImpl value, $Res Function(_$ExampleScreenImpl) then) =
__$$ExampleScreenImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String assetPath});
}

/// @nodoc
class __$$_ExampleScreenCopyWithImpl<$Res>
extends _$ExampleScreenCopyWithImpl<$Res, _$_ExampleScreen>
implements _$$_ExampleScreenCopyWith<$Res> {
__$$_ExampleScreenCopyWithImpl(
_$_ExampleScreen _value, $Res Function(_$_ExampleScreen) _then)
class __$$ExampleScreenImplCopyWithImpl<$Res>
extends _$ExampleScreenCopyWithImpl<$Res, _$ExampleScreenImpl>
implements _$$ExampleScreenImplCopyWith<$Res> {
__$$ExampleScreenImplCopyWithImpl(
_$ExampleScreenImpl _value, $Res Function(_$ExampleScreenImpl) _then)
: super(_value, _then);

@pragma('vm:prefer-inline')
@override
$Res call({
Object? assetPath = null,
}) {
return _then(_$_ExampleScreen(
return _then(_$ExampleScreenImpl(
assetPath: null == assetPath
? _value.assetPath
: assetPath // ignore: cast_nullable_to_non_nullable
Expand All @@ -96,11 +96,11 @@ class __$$_ExampleScreenCopyWithImpl<$Res>

/// @nodoc
@JsonSerializable()
class _$_ExampleScreen implements _ExampleScreen {
const _$_ExampleScreen({required this.assetPath});
class _$ExampleScreenImpl implements _ExampleScreen {
const _$ExampleScreenImpl({required this.assetPath});

factory _$_ExampleScreen.fromJson(Map<String, dynamic> json) =>
_$$_ExampleScreenFromJson(json);
factory _$ExampleScreenImpl.fromJson(Map<String, dynamic> json) =>
_$$ExampleScreenImplFromJson(json);

@override
final String assetPath;
Expand All @@ -114,7 +114,7 @@ class _$_ExampleScreen implements _ExampleScreen {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_ExampleScreen &&
other is _$ExampleScreenImpl &&
(identical(other.assetPath, assetPath) ||
other.assetPath == assetPath));
}
Expand All @@ -126,28 +126,28 @@ class _$_ExampleScreen implements _ExampleScreen {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$_ExampleScreenCopyWith<_$_ExampleScreen> get copyWith =>
__$$_ExampleScreenCopyWithImpl<_$_ExampleScreen>(this, _$identity);
_$$ExampleScreenImplCopyWith<_$ExampleScreenImpl> get copyWith =>
__$$ExampleScreenImplCopyWithImpl<_$ExampleScreenImpl>(this, _$identity);

@override
Map<String, dynamic> toJson() {
return _$$_ExampleScreenToJson(
return _$$ExampleScreenImplToJson(
this,
);
}
}

abstract class _ExampleScreen implements ExampleScreen {
const factory _ExampleScreen({required final String assetPath}) =
_$_ExampleScreen;
_$ExampleScreenImpl;

factory _ExampleScreen.fromJson(Map<String, dynamic> json) =
_$_ExampleScreen.fromJson;
_$ExampleScreenImpl.fromJson;

@override
String get assetPath;
@override
@JsonKey(ignore: true)
_$$_ExampleScreenCopyWith<_$_ExampleScreen> get copyWith =>
_$$ExampleScreenImplCopyWith<_$ExampleScreenImpl> get copyWith =>
throw _privateConstructorUsedError;
}
6 changes: 3 additions & 3 deletions examples/mirai_gallery/lib/app/example/example_screen.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 deletions examples/mirai_gallery/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ packages:
dependency: transitive
description:
name: build_resolvers
sha256: d912852cce27c9e80a93603db721c267716894462e7033165178b91138587972
sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8"
url: "https://pub.dev"
source: hosted
version: "2.3.2"
version: "2.4.1"
build_runner:
dependency: "direct dev"
description:
Expand All @@ -93,10 +93,10 @@ packages:
dependency: transitive
description:
name: build_runner_core
sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185
url: "https://pub.dev"
source: hosted
version: "7.2.10"
version: "7.2.11"
built_collection:
dependency: transitive
description:
Expand All @@ -109,10 +109,10 @@ packages:
dependency: transitive
description:
name: built_value
sha256: ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf
sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74
url: "https://pub.dev"
source: hosted
version: "8.6.2"
version: "8.6.3"
characters:
dependency: transitive
description:
Expand Down Expand Up @@ -141,10 +141,10 @@ packages:
dependency: transitive
description:
name: code_builder
sha256: "315a598c7fbe77f22de1c9da7cfd6fd21816312f16ffa124453b4fc679e540f1"
sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677"
url: "https://pub.dev"
source: hosted
version: "4.6.0"
version: "4.7.0"
collection:
dependency: transitive
description:
Expand Down Expand Up @@ -181,18 +181,18 @@ packages:
dependency: transitive
description:
name: dart_style
sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
sha256: abd7625e16f51f554ea244d090292945ec4d4be7bfbaf2ec8cccea568919d334
url: "https://pub.dev"
source: hosted
version: "2.3.2"
version: "2.3.3"
dio:
dependency: "direct main"
description:
name: dio
sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197
sha256: "417e2a6f9d83ab396ec38ff4ea5da6c254da71e4db765ad737a42af6930140b7"
url: "https://pub.dev"
source: hosted
version: "5.3.2"
version: "5.3.3"
fake_async:
dependency: transitive
description:
Expand Down Expand Up @@ -247,10 +247,10 @@ packages:
dependency: "direct dev"
description:
name: freezed
sha256: "83462cfc33dc9680533a7f3a4a6ab60aa94f287db5f4ee6511248c22833c497f"
sha256: "21bf2825311de65501d22e563e3d7605dff57fb5e6da982db785ae5372ff018a"
url: "https://pub.dev"
source: hosted
version: "2.4.2"
version: "2.4.5"
freezed_annotation:
dependency: "direct main"
description:
Expand Down Expand Up @@ -617,18 +617,18 @@ packages:
dependency: transitive
description:
name: webview_flutter
sha256: "82f6787d5df55907aa01e49bd9644f4ed1cc82af7a8257dd9947815959d2e755"
sha256: c1ab9b81090705c6069197d9fdc1625e587b52b8d70cdde2339d177ad0dbb98e
url: "https://pub.dev"
source: hosted
version: "4.2.4"
version: "4.4.1"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
sha256: "9427774649fd3c8b7ff53523051395d13aed2ca355822b822e6493d79f5fc05a"
sha256: b0cd33dd7d3dd8e5f664e11a19e17ba12c352647269921a3b568406b001f1dff
url: "https://pub.dev"
source: hosted
version: "3.10.0"
version: "3.12.0"
webview_flutter_platform_interface:
dependency: transitive
description:
Expand All @@ -641,10 +641,10 @@ packages:
dependency: transitive
description:
name: webview_flutter_wkwebview
sha256: d2f7241849582da80b79acb03bb936422412ce5c0c79fb5f6a1de5421a5aecc4
sha256: b4b42295b3aa91ed22ba6d3dd7de56efbb8f3ab3d6e41d8b1615d13537c7801d
url: "https://pub.dev"
source: hosted
version: "3.7.4"
version: "3.9.2"
yaml:
dependency: transitive
description:
Expand Down
2 changes: 0 additions & 2 deletions packages/mirai/lib/src/framework/mirai.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:mirai/src/action_parsers/action_parsers.dart';
import 'package:mirai/src/framework/mirai_registry.dart';
import 'package:mirai/src/network/mirai_network.dart';
import 'package:mirai/src/network/mirai_request.dart';
import 'package:mirai/src/parsers/mirai_align/mirai_align_parser.dart';
import 'package:mirai/src/parsers/mirai_center/mirai_center_parser.dart';
import 'package:mirai/src/parsers/mirai_check_box_widget/mirai_check_box_widget_parser.dart';
Expand Down
42 changes: 21 additions & 21 deletions packages/mirai/lib/src/parsers/mirai_align/mirai_align.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ class _$MiraiAlignCopyWithImpl<$Res, $Val extends MiraiAlign>
}

/// @nodoc
abstract class _$$MiraiAlignImplCopyWith<$Res>
abstract class _$$_MiraiAlignCopyWith<$Res>
implements $MiraiAlignCopyWith<$Res> {
factory _$$MiraiAlignImplCopyWith(
_$MiraiAlignImpl value, $Res Function(_$MiraiAlignImpl) then) =
__$$MiraiAlignImplCopyWithImpl<$Res>;
factory _$$_MiraiAlignCopyWith(
_$_MiraiAlign value, $Res Function(_$_MiraiAlign) then) =
__$$_MiraiAlignCopyWithImpl<$Res>;
@override
@useResult
$Res call(
Expand All @@ -99,11 +99,11 @@ abstract class _$$MiraiAlignImplCopyWith<$Res>
}

/// @nodoc
class __$$MiraiAlignImplCopyWithImpl<$Res>
extends _$MiraiAlignCopyWithImpl<$Res, _$MiraiAlignImpl>
implements _$$MiraiAlignImplCopyWith<$Res> {
__$$MiraiAlignImplCopyWithImpl(
_$MiraiAlignImpl _value, $Res Function(_$MiraiAlignImpl) _then)
class __$$_MiraiAlignCopyWithImpl<$Res>
extends _$MiraiAlignCopyWithImpl<$Res, _$_MiraiAlign>
implements _$$_MiraiAlignCopyWith<$Res> {
__$$_MiraiAlignCopyWithImpl(
_$_MiraiAlign _value, $Res Function(_$_MiraiAlign) _then)
: super(_value, _then);

@pragma('vm:prefer-inline')
Expand All @@ -114,7 +114,7 @@ class __$$MiraiAlignImplCopyWithImpl<$Res>
Object? heightFactor = freezed,
Object? child = freezed,
}) {
return _then(_$MiraiAlignImpl(
return _then(_$_MiraiAlign(
alignment: null == alignment
? _value.alignment
: alignment // ignore: cast_nullable_to_non_nullable
Expand All @@ -137,16 +137,16 @@ class __$$MiraiAlignImplCopyWithImpl<$Res>

/// @nodoc
@JsonSerializable()
class _$MiraiAlignImpl implements _MiraiAlign {
const _$MiraiAlignImpl(
class _$_MiraiAlign implements _MiraiAlign {
const _$_MiraiAlign(
{this.alignment = MiraiAlignmentDirectional.center,
this.widthFactor,
this.heightFactor,
final Map<String, dynamic>? child})
: _child = child;

factory _$MiraiAlignImpl.fromJson(Map<String, dynamic> json) =>
_$$MiraiAlignImplFromJson(json);
factory _$_MiraiAlign.fromJson(Map<String, dynamic> json) =>
_$$_MiraiAlignFromJson(json);

@override
@JsonKey()
Expand Down Expand Up @@ -174,7 +174,7 @@ class _$MiraiAlignImpl implements _MiraiAlign {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$MiraiAlignImpl &&
other is _$_MiraiAlign &&
(identical(other.alignment, alignment) ||
other.alignment == alignment) &&
(identical(other.widthFactor, widthFactor) ||
Expand All @@ -192,12 +192,12 @@ class _$MiraiAlignImpl implements _MiraiAlign {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$MiraiAlignImplCopyWith<_$MiraiAlignImpl> get copyWith =>
__$$MiraiAlignImplCopyWithImpl<_$MiraiAlignImpl>(this, _$identity);
_$$_MiraiAlignCopyWith<_$_MiraiAlign> get copyWith =>
__$$_MiraiAlignCopyWithImpl<_$_MiraiAlign>(this, _$identity);

@override
Map<String, dynamic> toJson() {
return _$$MiraiAlignImplToJson(
return _$$_MiraiAlignToJson(
this,
);
}
Expand All @@ -208,10 +208,10 @@ abstract class _MiraiAlign implements MiraiAlign {
{final MiraiAlignmentDirectional alignment,
final double? widthFactor,
final double? heightFactor,
final Map<String, dynamic>? child}) = _$MiraiAlignImpl;
final Map<String, dynamic>? child}) = _$_MiraiAlign;

factory _MiraiAlign.fromJson(Map<String, dynamic> json) =
_$MiraiAlignImpl.fromJson;
_$_MiraiAlign.fromJson;

@override
MiraiAlignmentDirectional get alignment;
Expand All @@ -223,6 +223,6 @@ abstract class _MiraiAlign implements MiraiAlign {
Map<String, dynamic>? get child;
@override
@JsonKey(ignore: true)
_$$MiraiAlignImplCopyWith<_$MiraiAlignImpl> get copyWith =>
_$$_MiraiAlignCopyWith<_$_MiraiAlign> get copyWith =>
throw _privateConstructorUsedError;
}
6 changes: 3 additions & 3 deletions packages/mirai/lib/src/parsers/mirai_align/mirai_align.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5765701

Please sign in to comment.