feature: audio support

Author: Frederick-S

lib/main.dart

@@ -8,7 +8,7 @@ import 'package:nhk_easy/widget/news_list.dart';
 main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  await GlobalConfiguration().loadFromAsset("config");
+  await GlobalConfiguration().loadFromAsset('config');
 
   runZoned<Future<void>>(() async {
     runApp(MyApp());

lib/model/news.dart

@@ -13,6 +13,8 @@ class News {
 
   int publishedAtEpoch;
 
+  String m3u8Url;
+
   News();
 
   factory News.fromJson(Map<String, dynamic> json) {
@@ -25,6 +27,7 @@ class News {
     news.publishedAtUtc = json['publishedAtUtc'];
     news.publishedAtEpoch =
         DateTime.parse(news.publishedAtUtc).millisecondsSinceEpoch;
+    news.m3u8Url = json['m3u8Url'];
 
     return news;
   }
@@ -37,7 +40,8 @@ class News {
       'body': body,
       'imageUrl': imageUrl,
       'publishedAtUtc': publishedAtUtc,
-      'publishedAtEpoch': publishedAtEpoch
+      'publishedAtEpoch': publishedAtEpoch,
+      'm3u8Url': m3u8Url
     };
   }
 }

lib/repository/base_repository.dart

@@ -12,7 +12,7 @@ class BaseRepository {
       onUpgrade: (db, oldVersion, newVersion) {
         _executeScript(db);
       },
-      version: 3,
+      version: 4,
     );
 
     return database;
@@ -35,7 +35,7 @@ class BaseRepository {
     batch.execute(
         'CREATE TABLE IF NOT EXISTS config(id INTEGER PRIMARY KEY, newsFetchedStartUtc TEXT, newsFetchedEndUtc TEXT)');
     batch.execute(
-        'CREATE TABLE IF NOT EXISTS news(newsId TEXT PRIMARY KEY, title TEXT, titleWithRuby TEXT, body TEXT, imageUrl TEXT, publishedAtUtc TEXT, publishedAtEpoch INTEGER)');
+        'CREATE TABLE IF NOT EXISTS news(newsId TEXT PRIMARY KEY, title TEXT, titleWithRuby TEXT, body TEXT, imageUrl TEXT, publishedAtUtc TEXT, publishedAtEpoch INTEGER, m3u8Url TEXT)');
 
     batch.commit();
   }

lib/widget/news_detail.dart

@@ -1,17 +1,40 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:just_audio/just_audio.dart';
+import 'package:nhk_easy/error_reporter.dart';
 import 'package:nhk_easy/model/news.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
 class NewsDetail extends StatelessWidget {
   final News news;
+  AudioPlayer _audioPlayer;
 
-  NewsDetail({Key key, @required this.news}) : super(key: key);
+  NewsDetail({Key key, @required this.news}) : super(key: key) {
+    _audioPlayer = AudioPlayer();
+
+    if (_hasAudio()) {
+      _audioPlayer.setUrl(news.m3u8Url).catchError((error, stackTrace) {
+        ErrorReporter.reportError(error, stackTrace);
+      });
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return WillPopScope(
+      onWillPop: () async {
+        if (_hasAudio()) {
+          try {
+            await _audioPlayer.dispose();
+          } catch (error, stackTrace) {
+            ErrorReporter.reportError(error, stackTrace);
+          }
+        }
+
+        return true;
+      },
+      child: Scaffold(
         appBar: AppBar(
           title: Text('NHK NEWS EASY'),
         ),
@@ -21,7 +44,29 @@ class NewsDetail extends StatelessWidget {
               initialUrl: Uri.dataFromString(_buildHtml(news),
                       mimeType: 'text/html', encoding: utf8)
                   .toString()),
-        ));
+        ),
+        floatingActionButton: _hasAudio()
+            ? FloatingActionButton(
+                onPressed: () async {
+                  if (_audioPlayer.playbackState ==
+                          AudioPlaybackState.stopped ||
+                      _audioPlayer.playbackState == AudioPlaybackState.paused) {
+                    _audioPlayer.play().catchError((error, stackTrace) {
+                      ErrorReporter.reportError(error, stackTrace);
+                    });
+                  } else if (_audioPlayer.playbackState ==
+                      AudioPlaybackState.playing) {
+                    _audioPlayer.pause().catchError((error, stackTrace) {
+                      ErrorReporter.reportError(error, stackTrace);
+                    });
+                  }
+                },
+                child: _audioPlayer.playbackState == AudioPlaybackState.playing
+                    ? Icon(Icons.pause)
+                    : Icon(Icons.play_arrow))
+            : Container(),
+      ),
+    );
   }
 
   _buildHtml(News news) {
@@ -52,4 +97,8 @@ class NewsDetail extends StatelessWidget {
       </html>
     """;
   }
+
+  bool _hasAudio() {
+    return news.m3u8Url != null && news.m3u8Url != '';
+  }
 }

pubspec.lock

@@ -114,6 +114,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.12"
+  just_audio:
+    dependency: "direct main"
+    description:
+      name: just_audio
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.10"
   matcher:
     dependency: transitive
     description:
@@ -135,6 +142,27 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.4"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.6.9"
+  path_provider_macos:
+    dependency: transitive
+    description:
+      name: path_provider_macos
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.0.4+3"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.2"
   pedantic:
     dependency: transitive
     description:
@@ -149,6 +177,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.4.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.2.1"
   platform_detect:
     dependency: transitive
     description:
@@ -184,6 +219,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.3"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.24.1"
   sentry:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -11,7 +11,7 @@ description: A new Flutter application.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.2+5
+version: 1.2.0+6
 
 environment:
   sdk: ">=2.2.0 <3.0.0"
@@ -33,6 +33,7 @@ dependencies:
   global_configuration: ^1.5.0
   settings_ui: ^0.3.0
   url_launcher: ^5.4.10
+  just_audio: ^0.1.10
 
 dev_dependencies:
   flutter_test: