From 2a3be4ef1ca8f1155643911c44553265b1ed66ec Mon Sep 17 00:00:00 2001 From: jideguru Date: Tue, 26 Dec 2023 22:34:11 +0100 Subject: [PATCH] rfac: minor refactor --- .../common/domain/models/category_feed.dart | 24 +++++++++---------- pubspec.lock | 22 ++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/src/common/domain/models/category_feed.dart b/lib/src/common/domain/models/category_feed.dart index 49e86dc1..6f5eb0c1 100644 --- a/lib/src/common/domain/models/category_feed.dart +++ b/lib/src/common/domain/models/category_feed.dart @@ -117,12 +117,12 @@ class Feed { : null; if (json['entry'] != null) { final String t = json['entry'].runtimeType.toString(); - if (t == 'List' || t == '_GrowableList') { + try { entry = []; json['entry'].forEach((v) { entry!.add(Entry.fromJson(v as Map)); }); - } else { + } catch (_) { entry = []; entry!.add(Entry.fromJson(json['entry'] as Map)); } @@ -324,9 +324,9 @@ class Entry { ? Id.fromJson(json['id'] as Map) : null; if (json['author'] != null) { - if (json['author'].runtimeType.toString() == 'List') { + try { author = Author1.fromJson(json['author'][0] as Map); - } else { + } catch (_) { author = Author1.fromJson(json['author'] as Map); } } @@ -350,14 +350,12 @@ class Entry { ? Id.fromJson(json['summary'] as Map) : null; if (json['category'] != null) { - final String t = json['category'].runtimeType.toString(); - if (t.toLowerCase().contains('list')) { - category = []; + category = []; + try { json['category'].forEach((v) { category!.add(Category.fromJson(v as Map)); }); - } else { - category = []; + } catch (_) { category!.add( Category.fromJson(json['category'] as Map), ); @@ -365,9 +363,11 @@ class Entry { } if (json['link'] != null) { link = []; - json['link'].forEach((v) { - link!.add(Link1.fromJson(v as Map)); - }); + try { + json['link'].forEach((v) { + link!.add(Link1.fromJson(v as Map)); + }); + } catch (_) {} } schemaSeries = json[r'schema$Series'] != null ? SchemaSeries.fromJson(json[r'schema$Series'] as Map) diff --git a/pubspec.lock b/pubspec.lock index 1de39c2f..889eeddb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -637,10 +637,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -1131,10 +1131,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" state_notifier: dependency: transitive description: @@ -1147,10 +1147,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -1187,10 +1187,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" time: dependency: transitive description: @@ -1315,10 +1315,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1368,5 +1368,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0"