Update intl and xml

lib/domain/atom_feed.dart

@@ -48,9 +48,9 @@ class AtomFeed {
     }
 
     return AtomFeed(
-      id: findElementOrNull(feedElement, 'id')?.text,
-      title: findElementOrNull(feedElement, 'title')?.text,
-      updated: findElementOrNull(feedElement, 'updated')?.text,
+      id: findElementOrNull(feedElement, 'id')?.value,
+      title: findElementOrNull(feedElement, 'title')?.value,
+      updated: findElementOrNull(feedElement, 'updated')?.value,
       items: feedElement
           .findElements('entry')
           .map((element) => AtomItem.parse(element))
@@ -73,10 +73,10 @@ class AtomFeed {
           .toList(),
       generator:
           AtomGenerator.parse(findElementOrNull(feedElement, 'generator')),
-      icon: findElementOrNull(feedElement, 'icon')?.text,
-      logo: findElementOrNull(feedElement, 'logo')?.text,
-      rights: findElementOrNull(feedElement, 'rights')?.text,
-      subtitle: findElementOrNull(feedElement, 'subtitle')?.text,
+      icon: findElementOrNull(feedElement, 'icon')?.value,
+      logo: findElementOrNull(feedElement, 'logo')?.value,
+      rights: findElementOrNull(feedElement, 'rights')?.value,
+      subtitle: findElementOrNull(feedElement, 'subtitle')?.value,
     );
   }
 }

lib/domain/atom_generator.dart

@@ -13,7 +13,7 @@ class AtomGenerator {
     }
     final uri = element.getAttribute('uri');
     final version = element.getAttribute('version');
-    final value = element.text;
+    final value = element.value;
     return AtomGenerator(uri, version, value);
   }
 }

lib/domain/atom_item.dart

@@ -40,9 +40,9 @@ class AtomItem {
 
   factory AtomItem.parse(XmlElement element) {
     return AtomItem(
-      id: findElementOrNull(element, 'id')?.text,
-      title: findElementOrNull(element, 'title')?.text,
-      updated: findElementOrNull(element, 'updated')?.text,
+      id: findElementOrNull(element, 'id')?.value,
+      title: findElementOrNull(element, 'title')?.value,
+      updated: findElementOrNull(element, 'updated')?.value,
       authors: element
           .findElements('author')
           .map((element) => AtomPerson.parse(element))
@@ -60,10 +60,10 @@ class AtomItem {
           .map((element) => AtomPerson.parse(element))
           .toList(),
       source: AtomSource.parse(findElementOrNull(element, 'source')),
-      published: findElementOrNull(element, 'published')?.text,
-      content: findElementOrNull(element, 'content')?.text,
-      summary: findElementOrNull(element, 'summary')?.text,
-      rights: findElementOrNull(element, 'rights')?.text,
+      published: findElementOrNull(element, 'published')?.value,
+      content: findElementOrNull(element, 'content')?.value,
+      summary: findElementOrNull(element, 'summary')?.value,
+      rights: findElementOrNull(element, 'rights')?.value,
       media: Media.parse(element),
     );
   }

lib/domain/atom_person.dart

@@ -9,9 +9,9 @@ class AtomPerson {
   const AtomPerson(this.name, this.uri, this.email);
 
   factory AtomPerson.parse(XmlElement element) {
-    final name = findElementOrNull(element, 'name')?.text;
-    final uri = findElementOrNull(element, 'uri')?.text;
-    final email = findElementOrNull(element, 'email')?.text;
+    final name = findElementOrNull(element, 'name')?.value;
+    final uri = findElementOrNull(element, 'uri')?.value;
+    final email = findElementOrNull(element, 'email')?.value;
     return AtomPerson(name, uri, email);
   }
 }

lib/domain/atom_source.dart

@@ -12,9 +12,9 @@ class AtomSource {
     if (element == null) {
       return null;
     }
-    final id = findElementOrNull(element, 'id')?.text;
-    final title = findElementOrNull(element, 'title')?.text;
-    final updated = findElementOrNull(element, 'updated')?.text;
+    final id = findElementOrNull(element, 'id')?.value;
+    final title = findElementOrNull(element, 'title')?.value;
+    final updated = findElementOrNull(element, 'updated')?.value;
     return AtomSource(id, title, updated);
   }
 }

lib/domain/dart_rss.dart

@@ -1,8 +1,6 @@
 import 'package:dart_rss/dart_rss.dart';
 import 'package:http/http.dart' as http;
-import 'package:dart_rss/domain/atom_feed.dart';
 import 'package:dart_rss/domain/rss1_feed.dart';
-import 'package:dart_rss/domain/rss_feed.dart';
 import 'package:xml/xml.dart' as xml;
 import 'package:intl/intl.dart';
 
@@ -142,7 +140,7 @@ class WebFeed {
         : rssRefs.first.getAttribute('version')?.contains('2');
     xmlns = feedRefs.isEmpty
         ? false
-        : feedRefs.first.getAttribute('xmlns')?.toLowerCase()?.contains('atom');
+        : feedRefs.first.getAttribute('xmlns')?.toLowerCase().contains('atom');
 
     if (rdfRefs.isNotEmpty) {
       return RssVersion.RSS1;

lib/domain/dublin_core/dublin_core.dart

@@ -41,24 +41,27 @@ class DublinCore {
   factory DublinCore.parse(XmlElement element) {
     final subjects = findAllDirectElementsOrNull(element, 'dc:subject');
     return DublinCore(
-      title: findElementOrNull(element, 'dc:title')?.text,
-      description: findElementOrNull(element, 'dc:description')?.text,
-      creator: findElementOrNull(element, 'dc:creator')?.text,
-      subject: findElementOrNull(element, 'dc:subject')?.text,
+      title: findElementOrNull(element, 'dc:title')?.value,
+      description: findElementOrNull(element, 'dc:description')?.value,
+      creator: findElementOrNull(element, 'dc:creator')?.value,
+      subject: findElementOrNull(element, 'dc:subject')?.value,
       subjects: subjects == null
           ? <String>[]
-          : subjects.map((subjectElement) => subjectElement.text).toList(),
-      publisher: findElementOrNull(element, 'dc:publisher')?.text,
-      contributor: findElementOrNull(element, 'dc:contributor')?.text,
-      date: findElementOrNull(element, 'dc:date')?.text,
-      type: findElementOrNull(element, 'dc:type')?.text,
-      format: findElementOrNull(element, 'dc:format')?.text,
-      identifier: findElementOrNull(element, 'dc:identifier')?.text,
-      source: findElementOrNull(element, 'dc:source')?.text,
-      language: findElementOrNull(element, 'dc:language')?.text,
-      relation: findElementOrNull(element, 'dc:relation')?.text,
-      coverage: findElementOrNull(element, 'dc:coverage')?.text,
-      rights: findElementOrNull(element, 'dc:rights')?.text,
+          : subjects
+              .where((element) => element.value != null)
+              .map((subjectElement) => subjectElement.value!)
+              .toList(),
+      publisher: findElementOrNull(element, 'dc:publisher')?.value,
+      contributor: findElementOrNull(element, 'dc:contributor')?.value,
+      date: findElementOrNull(element, 'dc:date')?.value,
+      type: findElementOrNull(element, 'dc:type')?.value,
+      format: findElementOrNull(element, 'dc:format')?.value,
+      identifier: findElementOrNull(element, 'dc:identifier')?.value,
+      source: findElementOrNull(element, 'dc:source')?.value,
+      language: findElementOrNull(element, 'dc:language')?.value,
+      relation: findElementOrNull(element, 'dc:relation')?.value,
+      coverage: findElementOrNull(element, 'dc:coverage')?.value,
+      rights: findElementOrNull(element, 'dc:rights')?.value,
     );
   }
 }

lib/domain/media/category.dart

@@ -18,7 +18,7 @@ class Category {
     return Category(
       scheme: element.getAttribute('scheme'),
       label: element.getAttribute('label'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/copyright.dart

@@ -15,7 +15,7 @@ class Copyright {
     }
     return Copyright(
       url: element.getAttribute('url'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/credit.dart

@@ -15,7 +15,7 @@ class Credit {
     return Credit(
       role: element.getAttribute('role'),
       scheme: element.getAttribute('scheme'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/description.dart

@@ -15,7 +15,7 @@ class Description {
     }
     return Description(
       type: element.getAttribute('type'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/hash.dart

@@ -15,7 +15,7 @@ class Hash {
     }
     return Hash(
       algo: element.getAttribute('algo'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/license.dart

@@ -18,7 +18,7 @@ class License {
     return License(
       type: element.getAttribute('type'),
       href: element.getAttribute('href'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/media.dart

@@ -93,7 +93,7 @@ class Media {
       title: Title.parse(findElementOrNull(element, 'media:title')),
       description:
           Description.parse(findElementOrNull(element, 'media:description')),
-      keywords: findElementOrNull(element, 'media:keywords')?.text,
+      keywords: findElementOrNull(element, 'media:keywords')?.value,
       thumbnails: element
           .findElements('media:thumbnail')
           .map((e) => Thumbnail.parse(e))
@@ -107,19 +107,21 @@ class Media {
       community: Community.parse(findElementOrNull(element, 'media:community')),
       comments: findElementOrNull(element, 'media:comments')
               ?.findElements('media:comment')
-              ?.map((e) => e.text)
-              ?.toList() ??
+              .map((e) => e.value!)
+              .toList() ??
           <String>[],
       embed: Embed.parse(findElementOrNull(element, 'media:embed')),
       responses: findElementOrNull(element, 'media:responses')
               ?.findElements('media:response')
-              ?.map((e) => e.text)
-              ?.toList() ??
+              .where((e) => e.value != null)
+              .map((e) => e.value!)
+              .toList() ??
           <String>[],
       backLinks: findElementOrNull(element, 'media:backLinks')
               ?.findElements('media:backLink')
-              ?.map((e) => e.text)
-              ?.toList() ??
+              .where((e) => e.value != null)
+              .map((e) => e.value!)
+              .toList() ??
           <String>[],
       status: Status.parse(findElementOrNull(element, 'media:status')),
       prices: element
@@ -131,8 +133,8 @@ class Media {
       rights: Rights.parse(findElementOrNull(element, 'media:rights')),
       scenes: findElementOrNull(element, 'media:scenes')
               ?.findElements('media:scene')
-              ?.map((e) => Scene.parse(e))
-              ?.toList() ??
+              .map((e) => Scene.parse(e))
+              .toList() ??
           <Scene>[],
     );
   }

lib/domain/media/param.dart

@@ -12,7 +12,7 @@ class Param {
   factory Param.parse(XmlElement element) {
     return Param(
       name: element.getAttribute('name'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/peer_link.dart

@@ -18,7 +18,7 @@ class PeerLink {
     return PeerLink(
       type: element.getAttribute('type'),
       href: element.getAttribute('href'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/player.dart

@@ -21,7 +21,7 @@ class Player {
       url: element.getAttribute('url'),
       width: int.tryParse(element.getAttribute('width') ?? '0') ?? 0,
       height: int.tryParse(element.getAttribute('height') ?? '0') ?? 0,
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/rating.dart

@@ -15,7 +15,7 @@ class Rating {
     }
     return Rating(
       scheme: element.getAttribute('scheme'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/restriction.dart

@@ -18,7 +18,7 @@ class Restriction {
     return Restriction(
       relationship: element.getAttribute('relationship'),
       type: element.getAttribute('type'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/scene.dart

@@ -16,10 +16,10 @@ class Scene {
 
   factory Scene.parse(XmlElement element) {
     return Scene(
-      title: findElementOrNull(element, 'sceneTitle')?.text,
-      description: findElementOrNull(element, 'sceneDescription')?.text,
-      startTime: findElementOrNull(element, 'sceneStartTime')?.text,
-      endTime: findElementOrNull(element, 'sceneEndTime')?.text,
+      title: findElementOrNull(element, 'sceneTitle')?.value,
+      description: findElementOrNull(element, 'sceneDescription')?.value,
+      startTime: findElementOrNull(element, 'sceneStartTime')?.value,
+      endTime: findElementOrNull(element, 'sceneEndTime')?.value,
     );
   }
 }

lib/domain/media/tags.dart

@@ -14,7 +14,7 @@ class Tags {
       return null;
     }
     return Tags(
-      tags: element.text,
+      tags: element.value,
       weight: int.tryParse(element.getAttribute('weight') ?? '1') ?? 1,
     );
   }

lib/domain/media/text.dart

@@ -24,7 +24,7 @@ class Text {
       lang: element.getAttribute('lang'),
       start: element.getAttribute('start'),
       end: element.getAttribute('end'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/media/title.dart

@@ -15,7 +15,7 @@ class Title {
     }
     return Title(
       type: element.getAttribute('type'),
-      value: element.text,
+      value: element.value,
     );
   }
 }

lib/domain/podcast_index/rss_podcast_index_funding.dart

@@ -14,7 +14,7 @@ class RssPodcastIndexFunding {
 
     return RssPodcastIndexFunding(
       url: element.getAttribute('url'),
-      value: element.text.trim(),
+      value: element.value?.trim(),
     );
   }
 }

lib/domain/podcast_index/rss_podcast_index_locked.dart

@@ -14,7 +14,7 @@ class RssPodcastIndexLocked {
 
     return RssPodcastIndexLocked(
       owner: element.getAttribute('owner'),
-      locked: element.text == 'yes' ? true : false,
+      locked: element.value == 'yes' ? true : false,
     );
   }
 }

lib/domain/podcast_index/rss_podcast_index_soudbite.dart

@@ -19,7 +19,7 @@ class RssPodcastIndexSoundbite {
     return RssPodcastIndexSoundbite(
       startTime: double.parse(element.getAttribute('startTime') ?? '0.0'),
       duration: double.parse(element.getAttribute('duration') ?? '0.0'),
-      value: element.text.trim(),
+      value: element.value?.trim(),
     );
   }
 }