From 87aae5d7984711a9d98a54429c3a90015b611cf2 Mon Sep 17 00:00:00 2001 From: Koji Wakamiya Date: Wed, 28 Jun 2023 21:28:50 +0900 Subject: [PATCH] Update --- build.yaml | 9 +- lib/model/entity/api_exception.dart | 2 +- lib/model/entity/api_exception.freezed.dart | 162 ------------ lib/model/entity/memo_result.dart | 6 +- lib/model/entity/memo_result.freezed.dart | 234 +++--------------- lib/view/home/history/history_widget.dart | 27 +- lib/view/home/home_screen.dart | 4 +- .../home/simple/simple_search_screen.dart | 2 +- lib/view/router.g.dart | 16 ++ .../search/search_meeting_detail_screen.dart | 2 +- .../search/search_meeting_summary_screen.dart | 2 +- lib/view/search/search_speech_screen.dart | 2 +- lib/view/status/issue_detail_screen.dart | 2 +- lib/view/status/speech_detail_screen.dart | 2 +- pubspec.lock | 20 +- pubspec.yaml | 2 +- 16 files changed, 97 insertions(+), 397 deletions(-) diff --git a/build.yaml b/build.yaml index ea403bc..49a57fa 100644 --- a/build.yaml +++ b/build.yaml @@ -15,4 +15,11 @@ targets: include_if_null: false freezed: options: - maybe_when: false + map: + map: false + map_or_null: false + maybe_map: false + when: + when: false + when_or_null: false + maybe_when: false diff --git a/lib/model/entity/api_exception.dart b/lib/model/entity/api_exception.dart index 69e33a6..3feb402 100644 --- a/lib/model/entity/api_exception.dart +++ b/lib/model/entity/api_exception.dart @@ -5,7 +5,7 @@ part 'api_exception.freezed.dart'; part 'api_exception.g.dart'; @freezed -class ApiException with _$ApiException implements Exception { +sealed class ApiException with _$ApiException implements Exception { const factory ApiException.error({ required String message, @Default([]) List details, diff --git a/lib/model/entity/api_exception.freezed.dart b/lib/model/entity/api_exception.freezed.dart index bc3aa50..d7cf663 100644 --- a/lib/model/entity/api_exception.freezed.dart +++ b/lib/model/entity/api_exception.freezed.dart @@ -29,44 +29,6 @@ ApiException _$ApiExceptionFromJson(Map json) { /// @nodoc mixin _$ApiException { - @optionalTypeArgs - TResult when({ - required TResult Function(String message, List details) error, - required TResult Function() other, - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult? whenOrNull({ - TResult? Function(String message, List details)? error, - TResult? Function()? other, - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult maybeWhen({ - TResult Function(String message, List details)? error, - TResult Function()? other, - required TResult orElse(), - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult map({ - required TResult Function(ApiExceptionError value) error, - required TResult Function(ApiExceptionOther value) other, - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult? mapOrNull({ - TResult? Function(ApiExceptionError value)? error, - TResult? Function(ApiExceptionOther value)? other, - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult maybeMap({ - TResult Function(ApiExceptionError value)? error, - TResult Function(ApiExceptionOther value)? other, - required TResult orElse(), - }) => - throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; } @@ -187,68 +149,6 @@ class _$ApiExceptionError _$$ApiExceptionErrorCopyWith<_$ApiExceptionError> get copyWith => __$$ApiExceptionErrorCopyWithImpl<_$ApiExceptionError>(this, _$identity); - @override - @optionalTypeArgs - TResult when({ - required TResult Function(String message, List details) error, - required TResult Function() other, - }) { - return error(message, details); - } - - @override - @optionalTypeArgs - TResult? whenOrNull({ - TResult? Function(String message, List details)? error, - TResult? Function()? other, - }) { - return error?.call(message, details); - } - - @override - @optionalTypeArgs - TResult maybeWhen({ - TResult Function(String message, List details)? error, - TResult Function()? other, - required TResult orElse(), - }) { - if (error != null) { - return error(message, details); - } - return orElse(); - } - - @override - @optionalTypeArgs - TResult map({ - required TResult Function(ApiExceptionError value) error, - required TResult Function(ApiExceptionOther value) other, - }) { - return error(this); - } - - @override - @optionalTypeArgs - TResult? mapOrNull({ - TResult? Function(ApiExceptionError value)? error, - TResult? Function(ApiExceptionOther value)? other, - }) { - return error?.call(this); - } - - @override - @optionalTypeArgs - TResult maybeMap({ - TResult Function(ApiExceptionError value)? error, - TResult Function(ApiExceptionOther value)? other, - required TResult orElse(), - }) { - if (error != null) { - return error(this); - } - return orElse(); - } - @override Map toJson() { return _$$ApiExceptionErrorToJson( @@ -322,68 +222,6 @@ class _$ApiExceptionOther @override int get hashCode => runtimeType.hashCode; - @override - @optionalTypeArgs - TResult when({ - required TResult Function(String message, List details) error, - required TResult Function() other, - }) { - return other(); - } - - @override - @optionalTypeArgs - TResult? whenOrNull({ - TResult? Function(String message, List details)? error, - TResult? Function()? other, - }) { - return other?.call(); - } - - @override - @optionalTypeArgs - TResult maybeWhen({ - TResult Function(String message, List details)? error, - TResult Function()? other, - required TResult orElse(), - }) { - if (other != null) { - return other(); - } - return orElse(); - } - - @override - @optionalTypeArgs - TResult map({ - required TResult Function(ApiExceptionError value) error, - required TResult Function(ApiExceptionOther value) other, - }) { - return other(this); - } - - @override - @optionalTypeArgs - TResult? mapOrNull({ - TResult? Function(ApiExceptionError value)? error, - TResult? Function(ApiExceptionOther value)? other, - }) { - return other?.call(this); - } - - @override - @optionalTypeArgs - TResult maybeMap({ - TResult Function(ApiExceptionError value)? error, - TResult Function(ApiExceptionOther value)? other, - required TResult orElse(), - }) { - if (other != null) { - return other(this); - } - return orElse(); - } - @override Map toJson() { return _$$ApiExceptionOtherToJson( diff --git a/lib/model/entity/memo_result.dart b/lib/model/entity/memo_result.dart index f386546..da30476 100644 --- a/lib/model/entity/memo_result.dart +++ b/lib/model/entity/memo_result.dart @@ -4,10 +4,10 @@ import 'package:freezed_annotation/freezed_annotation.dart'; part 'memo_result.freezed.dart'; @freezed -class MemoResult with _$MemoResult { +sealed class MemoResult with _$MemoResult { const factory MemoResult({ required String memo, - }) = _MemoResult; + }) = MemoResultSuccess; - const factory MemoResult.cancel() = _MemoResultCanecel; + const factory MemoResult.cancel() = MemoResultCancel; } diff --git a/lib/model/entity/memo_result.freezed.dart b/lib/model/entity/memo_result.freezed.dart index 3144d08..b8b0ab2 100644 --- a/lib/model/entity/memo_result.freezed.dart +++ b/lib/model/entity/memo_result.freezed.dart @@ -15,46 +15,7 @@ final _privateConstructorUsedError = UnsupportedError( 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); /// @nodoc -mixin _$MemoResult { - @optionalTypeArgs - TResult when( - TResult Function(String memo) $default, { - required TResult Function() cancel, - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult? whenOrNull( - TResult? Function(String memo)? $default, { - TResult? Function()? cancel, - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult maybeWhen( - TResult Function(String memo)? $default, { - TResult Function()? cancel, - required TResult orElse(), - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult map( - TResult Function(_MemoResult value) $default, { - required TResult Function(_MemoResultCanecel value) cancel, - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult? mapOrNull( - TResult? Function(_MemoResult value)? $default, { - TResult? Function(_MemoResultCanecel value)? cancel, - }) => - throw _privateConstructorUsedError; - @optionalTypeArgs - TResult maybeMap( - TResult Function(_MemoResult value)? $default, { - TResult Function(_MemoResultCanecel value)? cancel, - required TResult orElse(), - }) => - throw _privateConstructorUsedError; -} +mixin _$MemoResult {} /// @nodoc abstract class $MemoResultCopyWith<$Res> { @@ -75,20 +36,20 @@ class _$MemoResultCopyWithImpl<$Res, $Val extends MemoResult> } /// @nodoc -abstract class _$$_MemoResultCopyWith<$Res> { - factory _$$_MemoResultCopyWith( - _$_MemoResult value, $Res Function(_$_MemoResult) then) = - __$$_MemoResultCopyWithImpl<$Res>; +abstract class _$$MemoResultSuccessCopyWith<$Res> { + factory _$$MemoResultSuccessCopyWith( + _$MemoResultSuccess value, $Res Function(_$MemoResultSuccess) then) = + __$$MemoResultSuccessCopyWithImpl<$Res>; @useResult $Res call({String memo}); } /// @nodoc -class __$$_MemoResultCopyWithImpl<$Res> - extends _$MemoResultCopyWithImpl<$Res, _$_MemoResult> - implements _$$_MemoResultCopyWith<$Res> { - __$$_MemoResultCopyWithImpl( - _$_MemoResult _value, $Res Function(_$_MemoResult) _then) +class __$$MemoResultSuccessCopyWithImpl<$Res> + extends _$MemoResultCopyWithImpl<$Res, _$MemoResultSuccess> + implements _$$MemoResultSuccessCopyWith<$Res> { + __$$MemoResultSuccessCopyWithImpl( + _$MemoResultSuccess _value, $Res Function(_$MemoResultSuccess) _then) : super(_value, _then); @pragma('vm:prefer-inline') @@ -96,7 +57,7 @@ class __$$_MemoResultCopyWithImpl<$Res> $Res call({ Object? memo = null, }) { - return _then(_$_MemoResult( + return _then(_$MemoResultSuccess( memo: null == memo ? _value.memo : memo // ignore: cast_nullable_to_non_nullable @@ -107,8 +68,10 @@ class __$$_MemoResultCopyWithImpl<$Res> /// @nodoc -class _$_MemoResult with DiagnosticableTreeMixin implements _MemoResult { - const _$_MemoResult({required this.memo}); +class _$MemoResultSuccess + with DiagnosticableTreeMixin + implements MemoResultSuccess { + const _$MemoResultSuccess({required this.memo}); @override final String memo; @@ -130,7 +93,7 @@ class _$_MemoResult with DiagnosticableTreeMixin implements _MemoResult { bool operator ==(dynamic other) { return identical(this, other) || (other.runtimeType == runtimeType && - other is _$_MemoResult && + other is _$MemoResultSuccess && (identical(other.memo, memo) || other.memo == memo)); } @@ -140,103 +103,42 @@ class _$_MemoResult with DiagnosticableTreeMixin implements _MemoResult { @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') - _$$_MemoResultCopyWith<_$_MemoResult> get copyWith => - __$$_MemoResultCopyWithImpl<_$_MemoResult>(this, _$identity); - - @override - @optionalTypeArgs - TResult when( - TResult Function(String memo) $default, { - required TResult Function() cancel, - }) { - return $default(memo); - } - - @override - @optionalTypeArgs - TResult? whenOrNull( - TResult? Function(String memo)? $default, { - TResult? Function()? cancel, - }) { - return $default?.call(memo); - } - - @override - @optionalTypeArgs - TResult maybeWhen( - TResult Function(String memo)? $default, { - TResult Function()? cancel, - required TResult orElse(), - }) { - if ($default != null) { - return $default(memo); - } - return orElse(); - } - - @override - @optionalTypeArgs - TResult map( - TResult Function(_MemoResult value) $default, { - required TResult Function(_MemoResultCanecel value) cancel, - }) { - return $default(this); - } - - @override - @optionalTypeArgs - TResult? mapOrNull( - TResult? Function(_MemoResult value)? $default, { - TResult? Function(_MemoResultCanecel value)? cancel, - }) { - return $default?.call(this); - } - - @override - @optionalTypeArgs - TResult maybeMap( - TResult Function(_MemoResult value)? $default, { - TResult Function(_MemoResultCanecel value)? cancel, - required TResult orElse(), - }) { - if ($default != null) { - return $default(this); - } - return orElse(); - } + _$$MemoResultSuccessCopyWith<_$MemoResultSuccess> get copyWith => + __$$MemoResultSuccessCopyWithImpl<_$MemoResultSuccess>(this, _$identity); } -abstract class _MemoResult implements MemoResult { - const factory _MemoResult({required final String memo}) = _$_MemoResult; +abstract class MemoResultSuccess implements MemoResult { + const factory MemoResultSuccess({required final String memo}) = + _$MemoResultSuccess; String get memo; @JsonKey(ignore: true) - _$$_MemoResultCopyWith<_$_MemoResult> get copyWith => + _$$MemoResultSuccessCopyWith<_$MemoResultSuccess> get copyWith => throw _privateConstructorUsedError; } /// @nodoc -abstract class _$$_MemoResultCanecelCopyWith<$Res> { - factory _$$_MemoResultCanecelCopyWith(_$_MemoResultCanecel value, - $Res Function(_$_MemoResultCanecel) then) = - __$$_MemoResultCanecelCopyWithImpl<$Res>; +abstract class _$$MemoResultCancelCopyWith<$Res> { + factory _$$MemoResultCancelCopyWith( + _$MemoResultCancel value, $Res Function(_$MemoResultCancel) then) = + __$$MemoResultCancelCopyWithImpl<$Res>; } /// @nodoc -class __$$_MemoResultCanecelCopyWithImpl<$Res> - extends _$MemoResultCopyWithImpl<$Res, _$_MemoResultCanecel> - implements _$$_MemoResultCanecelCopyWith<$Res> { - __$$_MemoResultCanecelCopyWithImpl( - _$_MemoResultCanecel _value, $Res Function(_$_MemoResultCanecel) _then) +class __$$MemoResultCancelCopyWithImpl<$Res> + extends _$MemoResultCopyWithImpl<$Res, _$MemoResultCancel> + implements _$$MemoResultCancelCopyWith<$Res> { + __$$MemoResultCancelCopyWithImpl( + _$MemoResultCancel _value, $Res Function(_$MemoResultCancel) _then) : super(_value, _then); } /// @nodoc -class _$_MemoResultCanecel +class _$MemoResultCancel with DiagnosticableTreeMixin - implements _MemoResultCanecel { - const _$_MemoResultCanecel(); + implements MemoResultCancel { + const _$MemoResultCancel(); @override String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) { @@ -252,75 +154,13 @@ class _$_MemoResultCanecel @override bool operator ==(dynamic other) { return identical(this, other) || - (other.runtimeType == runtimeType && other is _$_MemoResultCanecel); + (other.runtimeType == runtimeType && other is _$MemoResultCancel); } @override int get hashCode => runtimeType.hashCode; - - @override - @optionalTypeArgs - TResult when( - TResult Function(String memo) $default, { - required TResult Function() cancel, - }) { - return cancel(); - } - - @override - @optionalTypeArgs - TResult? whenOrNull( - TResult? Function(String memo)? $default, { - TResult? Function()? cancel, - }) { - return cancel?.call(); - } - - @override - @optionalTypeArgs - TResult maybeWhen( - TResult Function(String memo)? $default, { - TResult Function()? cancel, - required TResult orElse(), - }) { - if (cancel != null) { - return cancel(); - } - return orElse(); - } - - @override - @optionalTypeArgs - TResult map( - TResult Function(_MemoResult value) $default, { - required TResult Function(_MemoResultCanecel value) cancel, - }) { - return cancel(this); - } - - @override - @optionalTypeArgs - TResult? mapOrNull( - TResult? Function(_MemoResult value)? $default, { - TResult? Function(_MemoResultCanecel value)? cancel, - }) { - return cancel?.call(this); - } - - @override - @optionalTypeArgs - TResult maybeMap( - TResult Function(_MemoResult value)? $default, { - TResult Function(_MemoResultCanecel value)? cancel, - required TResult orElse(), - }) { - if (cancel != null) { - return cancel(this); - } - return orElse(); - } } -abstract class _MemoResultCanecel implements MemoResult { - const factory _MemoResultCanecel() = _$_MemoResultCanecel; +abstract class MemoResultCancel implements MemoResult { + const factory MemoResultCancel() = _$MemoResultCancel; } diff --git a/lib/view/home/history/history_widget.dart b/lib/view/home/history/history_widget.dart index be92f7e..c9a8758 100644 --- a/lib/view/home/history/history_widget.dart +++ b/lib/view/home/history/history_widget.dart @@ -17,7 +17,7 @@ class HistoryWidget extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final margin = MediaQuery.of(context).breakpointMargin; + final margin = context.breakpointMargin; final box = ref.watch(searchHistoryBoxProvider); return ValueListenableBuilder( @@ -102,19 +102,18 @@ class HistoryWidget extends ConsumerWidget { return; } - await result.when( - (memo) async { - final newHistory = SearchHistory( - updatedAt: DateTime.now(), - memo: memo, - params: history.params, - ); - await box.putAt(index, newHistory); - }, - cancel: () { - // nop - }, - ); + return switch (result) { + MemoResultSuccess(memo: final memo) => + await box.putAt( + index, + SearchHistory( + updatedAt: DateTime.now(), + memo: memo, + params: history.params, + ), + ), + MemoResultCancel() => null, + }; }, icon: const Icon(Icons.edit), ), diff --git a/lib/view/home/home_screen.dart b/lib/view/home/home_screen.dart index c98fdbf..04b53df 100644 --- a/lib/view/home/home_screen.dart +++ b/lib/view/home/home_screen.dart @@ -29,7 +29,7 @@ class HomeScreen extends ConsumerWidget { /// get current HomeMode from path HomeMode _getHomeMode(BuildContext context) { - final path = GoRouter.of(context).location; + final path = GoRouterState.of(context).location; return HomeMode.values.lastWhere( (e) => path.startsWith(e.path), orElse: () => HomeMode.simple, @@ -38,7 +38,7 @@ class HomeScreen extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final screenSize = MediaQuery.of(context).breakpointScreenSize; + final screenSize = context.breakpointScreenSize; final mode = _getHomeMode(context); final index = HomeMode.values.indexOf(mode); diff --git a/lib/view/home/simple/simple_search_screen.dart b/lib/view/home/simple/simple_search_screen.dart index 228f151..67d0ea9 100644 --- a/lib/view/home/simple/simple_search_screen.dart +++ b/lib/view/home/simple/simple_search_screen.dart @@ -11,7 +11,7 @@ class SimpleSearchWidget extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final margin = MediaQuery.of(context).breakpointMargin; + final margin = context.breakpointMargin; final any = ref.watch( searchStateManagerProvider.select((value) => value.any), diff --git a/lib/view/router.g.dart b/lib/view/router.g.dart index 968e2d5..54bd650 100644 --- a/lib/view/router.g.dart +++ b/lib/view/router.g.dart @@ -74,6 +74,8 @@ extension $SimpleRouteExtension on SimpleRoute { void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); } extension $SearchMeetingDetailRouteExtension on SearchMeetingDetailRoute { @@ -95,6 +97,8 @@ extension $SearchMeetingDetailRouteExtension on SearchMeetingDetailRoute { void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); } extension $SearchMeetingSummaryRouteExtension on SearchMeetingSummaryRoute { @@ -116,6 +120,8 @@ extension $SearchMeetingSummaryRouteExtension on SearchMeetingSummaryRoute { void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); } extension $SearchSpeechRouteExtension on SearchSpeechRoute { @@ -136,6 +142,8 @@ extension $SearchSpeechRouteExtension on SearchSpeechRoute { void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); } extension $SpeechDetailRouteExtension on SpeechDetailRoute { @@ -153,6 +161,8 @@ extension $SpeechDetailRouteExtension on SpeechDetailRoute { void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); } extension $IssueDetailRouteExtension on IssueDetailRoute { @@ -170,6 +180,8 @@ extension $IssueDetailRouteExtension on IssueDetailRoute { void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); } extension $FullRouteExtension on FullRoute { @@ -185,6 +197,8 @@ extension $FullRouteExtension on FullRoute { void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); } extension $HistoryRouteExtension on HistoryRoute { @@ -200,6 +214,8 @@ extension $HistoryRouteExtension on HistoryRoute { void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); } // ************************************************************************** diff --git a/lib/view/search/search_meeting_detail_screen.dart b/lib/view/search/search_meeting_detail_screen.dart index 03affc2..683f444 100644 --- a/lib/view/search/search_meeting_detail_screen.dart +++ b/lib/view/search/search_meeting_detail_screen.dart @@ -25,7 +25,7 @@ class SearchMeetingDetailScreen extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final margin = MediaQuery.of(context).breakpointMargin; + final margin = context.breakpointMargin; final dataSource = ref.watch( dataSourceMeetingDetailProvider( diff --git a/lib/view/search/search_meeting_summary_screen.dart b/lib/view/search/search_meeting_summary_screen.dart index 77a4cd5..18fc1f1 100644 --- a/lib/view/search/search_meeting_summary_screen.dart +++ b/lib/view/search/search_meeting_summary_screen.dart @@ -25,7 +25,7 @@ class SearchMeetingSummaryScreen extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final margin = MediaQuery.of(context).breakpointMargin; + final margin = context.breakpointMargin; final dataSource = ref.watch( dataSourceMeetingSummaryProvider( params: params, diff --git a/lib/view/search/search_speech_screen.dart b/lib/view/search/search_speech_screen.dart index ea2afa9..f1a1fcf 100644 --- a/lib/view/search/search_speech_screen.dart +++ b/lib/view/search/search_speech_screen.dart @@ -24,7 +24,7 @@ class SearchSpeechScreen extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final margin = MediaQuery.of(context).breakpointMargin; + final margin = context.breakpointMargin; final dataSource = ref.watch( dataSourceSpeechProvider( params: params, diff --git a/lib/view/status/issue_detail_screen.dart b/lib/view/status/issue_detail_screen.dart index eef375b..6ab10cc 100644 --- a/lib/view/status/issue_detail_screen.dart +++ b/lib/view/status/issue_detail_screen.dart @@ -16,7 +16,7 @@ class IssueDetailScreen extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final margin = MediaQuery.of(context).breakpointMargin; + final margin = context.breakpointMargin; final dataSource = ref.watch( dataSourceIssueProvider( issueID: issueID, diff --git a/lib/view/status/speech_detail_screen.dart b/lib/view/status/speech_detail_screen.dart index 2d05a8a..0528a6b 100644 --- a/lib/view/status/speech_detail_screen.dart +++ b/lib/view/status/speech_detail_screen.dart @@ -47,7 +47,7 @@ class SpeechDetailScreen extends ConsumerWidget { ); } - final margin = MediaQuery.of(context).breakpointMargin; + final margin = context.breakpointMargin; return Scaffold( appBar: AppBar( diff --git a/pubspec.lock b/pubspec.lock index 44c22b7..30fc9cc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -53,10 +53,10 @@ packages: dependency: "direct main" description: name: breakpoints_mq - sha256: "26975061f00191914e45a81f816ef25583ea42454431ea7361b366d8b18341ae" + sha256: "65b1730d79bc4844c5c05bab6afcd9bccc6cb38367dbb8b732b90d3aef068ad6" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" build: dependency: transitive description: @@ -345,18 +345,18 @@ packages: dependency: "direct main" description: name: go_router - sha256: "2cb236ba3f923043fdbe14a6a3a796b8c250e85658e28caee3e86c0c275847e5" + sha256: "1531542666c2d052c44bbf6e2b48011bf3771da0404b94c60eabec1228a62906" url: "https://pub.dev" source: hosted - version: "8.2.0" + version: "9.0.0" go_router_builder: dependency: "direct dev" description: name: go_router_builder - sha256: c7db6ba9c2397851a9dce63cc2cd98659315e48b41da5bcf5e7dcf061e80c64c + sha256: dbd5028908e5e1409ffc3da02257a489f6ac1caa509a0e03f126b1c2e451bb65 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.2.0" google_fonts: dependency: "direct main" description: @@ -409,10 +409,10 @@ packages: dependency: "direct main" description: name: http - sha256: "4c3f04bfb64d3efd508d06b41b825542f08122d30bda4933fb95c069d22a4fa3" + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" http_hive_cache: dependency: "direct main" description: @@ -958,10 +958,10 @@ packages: dependency: transitive description: name: win32 - sha256: "1414f27dd781737e51afa9711f2ac2ace6ab4498ee98e20863fa5505aa00c58c" + sha256: dfdf0136e0aa7a1b474ea133e67cb0154a0acd2599c4f3ada3b49d38d38793ee url: "https://pub.dev" source: hosted - version: "5.0.4" + version: "5.0.5" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 3d5edaf..6b21942 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: xml: ^6.0.0 http: ^1.0.0 - go_router: ^8.0.0 + go_router: ^9.0.0 freezed_annotation: ^2.0.0 json_annotation: ^4.8.1