diff --git a/lib/model/entity/meeting_record.g.dart b/lib/model/entity/meeting_record.g.dart index 8d8f17b..8d12a74 100644 --- a/lib/model/entity/meeting_record.g.dart +++ b/lib/model/entity/meeting_record.g.dart @@ -13,11 +13,14 @@ _$MeetingRecordResponseDetailImpl _$$MeetingRecordResponseDetailImplFromJson( json, ($checkedConvert) { final val = _$MeetingRecordResponseDetailImpl( - numberOfRecords: $checkedConvert('numberOfRecords', (v) => v as int), - numberOfReturn: $checkedConvert('numberOfReturn', (v) => v as int), - startRecord: $checkedConvert('startRecord', (v) => v as int), - nextRecordPosition: - $checkedConvert('nextRecordPosition', (v) => v as int?), + numberOfRecords: + $checkedConvert('numberOfRecords', (v) => (v as num).toInt()), + numberOfReturn: + $checkedConvert('numberOfReturn', (v) => (v as num).toInt()), + startRecord: + $checkedConvert('startRecord', (v) => (v as num).toInt()), + nextRecordPosition: $checkedConvert( + 'nextRecordPosition', (v) => (v as num?)?.toInt()), meetingRecord: $checkedConvert( 'meetingRecord', (v) => @@ -59,8 +62,9 @@ _$MeetingRecordDetailImpl _$$MeetingRecordDetailImplFromJson( final val = _$MeetingRecordDetailImpl( issueID: $checkedConvert('issueID', (v) => v as String), imageKind: $checkedConvert('imageKind', (v) => v as String), - searchObject: $checkedConvert('searchObject', (v) => v as int), - session: $checkedConvert('session', (v) => v as int), + searchObject: + $checkedConvert('searchObject', (v) => (v as num).toInt()), + session: $checkedConvert('session', (v) => (v as num).toInt()), nameOfHouse: $checkedConvert('nameOfHouse', (v) => v as String), nameOfMeeting: $checkedConvert('nameOfMeeting', (v) => v as String), issue: $checkedConvert('issue', (v) => v as String), @@ -106,7 +110,8 @@ _$MeetingRecordDetailSpeechImpl _$$MeetingRecordDetailSpeechImplFromJson( ($checkedConvert) { final val = _$MeetingRecordDetailSpeechImpl( speechID: $checkedConvert('speechID', (v) => v as String), - speechOrder: $checkedConvert('speechOrder', (v) => v as int), + speechOrder: + $checkedConvert('speechOrder', (v) => (v as num).toInt()), speaker: $checkedConvert('speaker', (v) => v as String), speakerYomi: $checkedConvert('speakerYomi', (v) => v as String? ?? ''), @@ -117,7 +122,7 @@ _$MeetingRecordDetailSpeechImpl _$$MeetingRecordDetailSpeechImplFromJson( speakerRole: $checkedConvert('speakerRole', (v) => v as String? ?? ''), speech: $checkedConvert('speech', (v) => v as String), - startPage: $checkedConvert('startPage', (v) => v as int), + startPage: $checkedConvert('startPage', (v) => (v as num).toInt()), createTime: $checkedConvert('createTime', (v) => v as String), updateTime: $checkedConvert('updateTime', (v) => v as String), speechURL: $checkedConvert('speechURL', (v) => v as String), @@ -150,11 +155,14 @@ _$MeetingRecordSummaryResponseImpl _$$MeetingRecordSummaryResponseImplFromJson( json, ($checkedConvert) { final val = _$MeetingRecordSummaryResponseImpl( - numberOfRecords: $checkedConvert('numberOfRecords', (v) => v as int), - numberOfReturn: $checkedConvert('numberOfReturn', (v) => v as int), - startRecord: $checkedConvert('startRecord', (v) => v as int), - nextRecordPosition: - $checkedConvert('nextRecordPosition', (v) => v as int?), + numberOfRecords: + $checkedConvert('numberOfRecords', (v) => (v as num).toInt()), + numberOfReturn: + $checkedConvert('numberOfReturn', (v) => (v as num).toInt()), + startRecord: + $checkedConvert('startRecord', (v) => (v as num).toInt()), + nextRecordPosition: $checkedConvert( + 'nextRecordPosition', (v) => (v as num?)?.toInt()), meetingRecord: $checkedConvert( 'meetingRecord', (v) => @@ -196,8 +204,9 @@ _$MeetingRecordSummaryImpl _$$MeetingRecordSummaryImplFromJson( final val = _$MeetingRecordSummaryImpl( issueID: $checkedConvert('issueID', (v) => v as String), imageKind: $checkedConvert('imageKind', (v) => v as String), - searchObject: $checkedConvert('searchObject', (v) => v as int), - session: $checkedConvert('session', (v) => v as int), + searchObject: + $checkedConvert('searchObject', (v) => (v as num).toInt()), + session: $checkedConvert('session', (v) => (v as num).toInt()), nameOfHouse: $checkedConvert('nameOfHouse', (v) => v as String), nameOfMeeting: $checkedConvert('nameOfMeeting', (v) => v as String), issue: $checkedConvert('issue', (v) => v as String), @@ -243,7 +252,8 @@ _$MeetingRecordSummarySpeechImpl _$$MeetingRecordSummarySpeechImplFromJson( ($checkedConvert) { final val = _$MeetingRecordSummarySpeechImpl( speechID: $checkedConvert('speechID', (v) => v as String), - speechOrder: $checkedConvert('speechOrder', (v) => v as int), + speechOrder: + $checkedConvert('speechOrder', (v) => (v as num).toInt()), speaker: $checkedConvert('speaker', (v) => v as String), speechURL: $checkedConvert('speechURL', (v) => v as String), ); diff --git a/lib/model/entity/search_params.g.dart b/lib/model/entity/search_params.g.dart index 27b1da7..95edd57 100644 --- a/lib/model/entity/search_params.g.dart +++ b/lib/model/entity/search_params.g.dart @@ -277,7 +277,8 @@ _$SearchParamsImpl _$$SearchParamsImplFromJson(Map json) => $enumDecodeNullable(_$SearchRangeEnumMap, v) ?? SearchRange.none), closing: $checkedConvert('closing', (v) => v as bool? ?? false), - speechNumber: $checkedConvert('speechNumber', (v) => v as int?), + speechNumber: + $checkedConvert('speechNumber', (v) => (v as num?)?.toInt()), speakerPosition: $checkedConvert('speakerPosition', (v) => v as String? ?? ''), speakerGroup: @@ -289,10 +290,11 @@ _$SearchParamsImpl _$$SearchParamsImplFromJson(Map json) => SpeakerRole.none), speechID: $checkedConvert('speechID', (v) => v as String? ?? ''), issueID: $checkedConvert('issueID', (v) => v as String? ?? ''), - sessionFrom: $checkedConvert('sessionFrom', (v) => v as int?), - sessionTo: $checkedConvert('sessionTo', (v) => v as int?), - issueFrom: $checkedConvert('issueFrom', (v) => v as int?), - issueTo: $checkedConvert('issueTo', (v) => v as int?), + sessionFrom: + $checkedConvert('sessionFrom', (v) => (v as num?)?.toInt()), + sessionTo: $checkedConvert('sessionTo', (v) => (v as num?)?.toInt()), + issueFrom: $checkedConvert('issueFrom', (v) => (v as num?)?.toInt()), + issueTo: $checkedConvert('issueTo', (v) => (v as num?)?.toInt()), ); return val; }, diff --git a/lib/model/entity/speech_record.g.dart b/lib/model/entity/speech_record.g.dart index 991372a..f222c2d 100644 --- a/lib/model/entity/speech_record.g.dart +++ b/lib/model/entity/speech_record.g.dart @@ -13,11 +13,14 @@ _$SpeechRecordResponseeImpl _$$SpeechRecordResponseeImplFromJson( json, ($checkedConvert) { final val = _$SpeechRecordResponseeImpl( - numberOfRecords: $checkedConvert('numberOfRecords', (v) => v as int), - numberOfReturn: $checkedConvert('numberOfReturn', (v) => v as int), - startRecord: $checkedConvert('startRecord', (v) => v as int), - nextRecordPosition: - $checkedConvert('nextRecordPosition', (v) => v as int?), + numberOfRecords: + $checkedConvert('numberOfRecords', (v) => (v as num).toInt()), + numberOfReturn: + $checkedConvert('numberOfReturn', (v) => (v as num).toInt()), + startRecord: + $checkedConvert('startRecord', (v) => (v as num).toInt()), + nextRecordPosition: $checkedConvert( + 'nextRecordPosition', (v) => (v as num?)?.toInt()), speechRecord: $checkedConvert( 'speechRecord', (v) => @@ -59,13 +62,15 @@ _$SpeechRecordImpl _$$SpeechRecordImplFromJson(Map json) => speechID: $checkedConvert('speechID', (v) => v as String), issueID: $checkedConvert('issueID', (v) => v as String), imageKind: $checkedConvert('imageKind', (v) => v as String), - searchObject: $checkedConvert('searchObject', (v) => v as int), - session: $checkedConvert('session', (v) => v as int), + searchObject: + $checkedConvert('searchObject', (v) => (v as num).toInt()), + session: $checkedConvert('session', (v) => (v as num).toInt()), nameOfHouse: $checkedConvert('nameOfHouse', (v) => v as String), nameOfMeeting: $checkedConvert('nameOfMeeting', (v) => v as String), issue: $checkedConvert('issue', (v) => v as String), date: $checkedConvert('date', (v) => v as String), - speechOrder: $checkedConvert('speechOrder', (v) => v as int), + speechOrder: + $checkedConvert('speechOrder', (v) => (v as num).toInt()), speaker: $checkedConvert('speaker', (v) => v as String), speakerYomi: $checkedConvert('speakerYomi', (v) => v as String? ?? ''), @@ -76,7 +81,7 @@ _$SpeechRecordImpl _$$SpeechRecordImplFromJson(Map json) => speakerRole: $checkedConvert('speakerRole', (v) => v as String? ?? ''), speech: $checkedConvert('speech', (v) => v as String), - startPage: $checkedConvert('startPage', (v) => v as int), + startPage: $checkedConvert('startPage', (v) => (v as num).toInt()), speechURL: $checkedConvert('speechURL', (v) => v as String), meetingURL: $checkedConvert('meetingURL', (v) => v as String), pdfURL: $checkedConvert('pdfURL', (v) => v as String? ?? ''), diff --git a/pubspec.lock b/pubspec.lock index 5dca822..50ef669 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.0" async: dependency: transitive description: @@ -93,10 +93,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21" + sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" url: "https://pub.dev" source: hosted - version: "2.4.8" + version: "2.4.9" build_runner_core: dependency: transitive description: @@ -117,10 +117,10 @@ packages: dependency: transitive description: name: built_value - sha256: a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6 + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.9.0" + version: "8.9.2" characters: dependency: transitive description: @@ -137,22 +137,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" - ci: - dependency: transitive - description: - name: ci - sha256: "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13" - url: "https://pub.dev" - source: hosted - version: "0.1.0" - cli_util: - dependency: transitive - description: - name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 - url: "https://pub.dev" - source: hosted - version: "0.4.1" clock: dependency: transitive description: @@ -193,30 +177,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.3" - custom_lint: - dependency: transitive - description: - name: custom_lint - sha256: f89ff83efdba7c8996e86bb3bad0b759d58f9b19ae4d0e277a386ddd8b481217 - url: "https://pub.dev" - source: hosted - version: "0.6.0" custom_lint_core: dependency: transitive description: name: custom_lint_core - sha256: "1e9128e095ad5e0973469bdaac1ead8bfc86c485954c23cf617299de5e6fa029" + sha256: a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6 url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.3" dart_style: dependency: transitive description: name: dart_style - sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368" + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.3.6" fake_async: dependency: transitive description: @@ -274,10 +250,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" flutter_localizations: dependency: "direct main" description: flutter @@ -287,10 +263,10 @@ packages: dependency: transitive description: name: flutter_riverpod - sha256: "4bce556b7ecbfea26109638d5237684538d4abc509d253e6c5c4c5733b360098" + sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d" url: "https://pub.dev" source: hosted - version: "2.4.10" + version: "2.5.1" flutter_test: dependency: "direct dev" description: flutter @@ -305,10 +281,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: "57247f692f35f068cae297549a46a9a097100685c6780fe67177503eea5ed4e5" + sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1 url: "https://pub.dev" source: hosted - version: "2.4.7" + version: "2.5.2" freezed_annotation: dependency: "direct main" description: @@ -321,10 +297,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" gap: dependency: "direct main" description: @@ -345,26 +321,26 @@ packages: dependency: "direct main" description: name: go_router - sha256: "170c46e237d6eb0e6e9f0e8b3f56101e14fb64f787016e42edd74c39cf8b176a" + sha256: "9e0f7d1a3e7dc5010903e330fbc5497872c4c3cf6626381d69083cc1d5113c1e" url: "https://pub.dev" source: hosted - version: "13.2.0" + version: "14.0.2" go_router_builder: dependency: "direct dev" description: name: go_router_builder - sha256: f84449079eb1f09f59344fbbb8cdc6a6349d8973a83746a57953bd4130d852b6 + sha256: "7cbd20d9e17396b966af6f40a071d84b039caff360ec80d08ac8a589a56b6804" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.6.1" google_fonts: dependency: "direct main" description: name: google_fonts - sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8 + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.1" graphs: dependency: transitive description: @@ -401,10 +377,10 @@ packages: dependency: "direct main" description: name: hooks_riverpod - sha256: "758b07eba336e3cbacbd81dba481f2228a14102083fdde07045e8514e8054c49" + sha256: "45b2030a18bcd6dbd680c2c91bc3b33e3fe7c323e3acb5ecec93a613e2fbaa8a" url: "https://pub.dev" source: hosted - version: "2.4.10" + version: "2.5.1" http: dependency: "direct main" description: @@ -465,18 +441,18 @@ packages: dependency: "direct main" description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" json_serializable: dependency: "direct dev" description: name: json_serializable - sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 + sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b url: "https://pub.dev" source: hosted - version: "6.7.1" + version: "6.8.0" leak_tracker: dependency: transitive description: @@ -593,18 +569,18 @@ packages: dependency: transitive description: name: path_provider - sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b + sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" + sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.4" path_provider_foundation: dependency: transitive description: @@ -697,10 +673,10 @@ packages: dependency: transitive description: name: riverpod - sha256: "548e2192eb7aeb826eb89387f814edb76594f3363e2c0bb99dd733d795ba3589" + sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.5.1" riverpod_analyzer_utils: dependency: transitive description: @@ -713,26 +689,18 @@ packages: dependency: "direct main" description: name: riverpod_annotation - sha256: "77e5d51afa4fa3e67903fb8746f33d368728d7051a0b6c292bcee60aeba46d95" + sha256: e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.3.5" riverpod_generator: dependency: "direct dev" description: name: riverpod_generator - sha256: "359068f04879347ae4edbe66c81cc95f83fa1743806d1a0c86e55dd3c33ebb32" + sha256: d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22 url: "https://pub.dev" source: hosted - version: "2.3.11" - rxdart: - dependency: transitive - description: - name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" - url: "https://pub.dev" - source: hosted - version: "0.27.7" + version: "2.4.0" shelf: dependency: transitive description: @@ -778,14 +746,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" - sprintf: - dependency: transitive - description: - name: sprintf - sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" - url: "https://pub.dev" - source: hosted - version: "7.0.0" stack_trace: dependency: transitive description: @@ -870,26 +830,26 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c + sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e" url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.2.6" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 + sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" + sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.2.5" url_launcher_linux: dependency: transitive description: @@ -918,10 +878,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" url_launcher_windows: dependency: transitive description: @@ -930,14 +890,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" - uuid: - dependency: transitive - description: - name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 - url: "https://pub.dev" - source: hosted - version: "4.3.3" vector_math: dependency: transitive description: @@ -966,26 +918,26 @@ packages: dependency: transitive description: name: web - sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad" + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.5.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2" + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.5" win32: dependency: transitive description: name: win32 - sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" + sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "5.5.0" xdg_directories: dependency: transitive description: @@ -1012,4 +964,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.19.0" + flutter: ">=3.19.2" diff --git a/pubspec.yaml b/pubspec.yaml index b7ec8ba..b6043ae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,10 +18,10 @@ dependencies: xml: ^6.0.0 http: ^1.0.0 - go_router: ^13.0.0 + go_router: ^14.0.0 freezed_annotation: ^2.0.0 - json_annotation: ^4.8.1 + json_annotation: ^4.9.0 riverpod_annotation: ^2.0.0 flutter_hooks: ^0.20.0