#7: Audio plays. TODO: Mantain state of which

yringler · yringler · commit d26bbf92fdd0 · 2019-10-07T22:21:59.000-04:00
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,10 +1,10 @@
 import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/material.dart';
 import 'package:inside_chassidus/data/insideData.dart';
-import 'package:inside_chassidus/screens/lesson-screen/index.dart';
-import 'package:inside_chassidus/screens/top-lessons.dart';
+import 'package:inside_chassidus/routes/lesson-route/index.dart';
+import 'package:inside_chassidus/routes/top-lessons.dart';
 import 'package:provider/provider.dart';
-import 'screens/site-section/index.dart';
+import 'routes/section-route/index.dart';
 
 void main() => runApp(Provider<AudioPlayer>.value(
       value: AudioPlayer(),
@@ -22,13 +22,13 @@ class MyApp extends StatelessWidget {
         WidgetBuilder builder;
 
         switch (settings.name) {
-          case SiteSectionScreen.routeName:
+          case SectionRoute.routeName:
             final SiteSection routeSection = settings.arguments;
-            builder = (context) => SiteSectionScreen(section: routeSection);
+            builder = (context) => SectionRoute(section: routeSection);
             break;
-          case LessonScreen.routeName:
+          case LessonRoute.routeName:
             final Lesson lesson = settings.arguments;
-            builder = (context) => LessonScreen(lesson: lesson);
+            builder = (context) => LessonRoute(lesson: lesson);
             break;
           default:
             throw ArgumentError("Unknown route: ${settings.name}");
diff --git a/lib/routes/lesson-route/index.dart b/lib/routes/lesson-route/index.dart
@@ -0,0 +1 @@
+export 'lesson-route.dart';
diff --git a/lib/routes/lesson-route/lesson-route.dart b/lib/routes/lesson-route/lesson-route.dart
@@ -4,18 +4,21 @@ import 'package:inside_chassidus/widgets/inside-scaffold.dart';
 import 'package:inside_chassidus/widgets/media-list/index.dart';
 
 /// Route to display all of the lessons for a given section.
-class LessonScreen extends StatelessWidget {
+class LessonRoute extends StatelessWidget {
   static const String routeName = "/lessons";
 
   final Lesson lesson;
 
-  LessonScreen({this.lesson});
+  LessonRoute({this.lesson});
 
   @override
   Widget build(BuildContext context) => InsideScaffold(
       insideData: lesson,
-      body: Row(children: <Widget>[
-        if (lesson.description?.isNotEmpty) Text(lesson.description),
-        MediaList(media: lesson.audio)
-      ]));
+      body: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 8).copyWith(top: 8),
+        child: Column(children: <Widget>[
+          if (lesson.description?.isNotEmpty) Text(lesson.description),
+          MediaList(media: lesson.audio)
+        ]),
+      ));
 }
diff --git a/lib/routes/section-route/index.dart b/lib/routes/section-route/index.dart
@@ -0,0 +1 @@
+export 'section-route.dart';
diff --git a/lib/routes/section-route/section-route.dart b/lib/routes/section-route/section-route.dart
@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+import 'package:inside_chassidus/data/insideData.dart';
+import 'package:inside_chassidus/routes/lesson-route/index.dart';
+import 'package:inside_chassidus/routes/section-route/widgets/index.dart';
+import 'package:inside_chassidus/widgets/inside-data-retriever.dart';
+import 'package:inside_chassidus/widgets/inside-navigator.dart';
+import 'package:inside_chassidus/widgets/inside-scaffold.dart';
+import 'package:inside_chassidus/widgets/navigate-to-section.dart';
+
+/// Displays contents of a site section. All subsections and lessons.
+class SectionRoute extends StatelessWidget {
+  static const String routeName = "/sections";
+
+  final SiteSection section;
+
+  SectionRoute({this.section});
+
+  @override
+  Widget build(BuildContext context) => InsideScaffold(
+      insideData: section,
+      body: InsideDataRetriever(builder: (context, data) {
+        final sections = List<SiteSection>.from(data.getSections(section));
+        final lessons = List<Lesson>.from(data.getLessons(section));
+
+        return ListView.builder(
+          itemCount: sections.length + lessons.length,
+          itemBuilder: (context, i) {
+            if (i < sections.length) {
+              return NavigateToSection(
+                  section: sections[i],
+                  child: InsideDataCard(insideData: sections[i]));
+            } else {
+              int adjustedIndex = i - sections.length;
+              final lesson = lessons[adjustedIndex];
+
+              return InsideNavigator(
+                child: InsideDataCard(insideData: lesson),
+                routeName: LessonRoute.routeName, 
+                data: lesson,
+              );
+            }
+          },
+        );
+      }));
+}
diff --git a/lib/routes/section-route/widgets/index.dart b/lib/routes/section-route/widgets/index.dart
diff --git a/lib/routes/section-route/widgets/informative-text-painter.dart b/lib/routes/section-route/widgets/informative-text-painter.dart
diff --git a/lib/routes/section-route/widgets/inside-data-card.dart b/lib/routes/section-route/widgets/inside-data-card.dart
@@ -1,7 +1,7 @@
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:inside_chassidus/data/insideData.dart';
-import 'package:inside_chassidus/screens/site-section/widgets/informative-text-painter.dart';
+import 'package:inside_chassidus/routes/section-route/widgets/informative-text-painter.dart';
 
 class InsideDataCard extends StatefulWidget {
   final CountableInsideData insideData;
diff --git a/lib/routes/top-lessons.dart b/lib/routes/top-lessons.dart
diff --git a/lib/screens/lesson-screen/index.dart b/lib/screens/lesson-screen/index.dart
diff --git a/lib/screens/site-section/index.dart b/lib/screens/site-section/index.dart
diff --git a/lib/screens/site-section/site-section-screen.dart b/lib/screens/site-section/site-section-screen.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:inside_chassidus/data/insideData.dart';
-import 'package:inside_chassidus/screens/lesson-screen/index.dart';
-import 'package:inside_chassidus/screens/site-section/widgets/index.dart';
+import 'package:inside_chassidus/routes/lesson-route/index.dart';
+import 'package:inside_chassidus/routes/section-route/widgets/index.dart';
 import 'package:inside_chassidus/widgets/inside-data-retriever.dart';
 import 'package:inside_chassidus/widgets/inside-navigator.dart';
 import 'package:inside_chassidus/widgets/inside-scaffold.dart';
@@ -35,7 +35,7 @@ class SiteSectionScreen extends StatelessWidget {
 
               return InsideNavigator(
                 child: InsideDataCard(insideData: lesson),
-                routeName: LessonScreen.routeName, 
+                routeName: LessonRoute.routeName, 
                 data: lesson,
               );
             }
diff --git a/lib/widgets/media-list/media-list.dart b/lib/widgets/media-list/media-list.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:audioplayers/audioplayers.dart';
 import 'package:inside_chassidus/data/insideData.dart';
+import 'package:provider/provider.dart';
 import './play-button.dart';
 
 class MediaList extends StatelessWidget {
@@ -8,16 +10,31 @@ class MediaList extends StatelessWidget {
   MediaList({this.media});
 
   @override
-  Widget build(BuildContext context) => ListView.builder(
-      itemCount: this.media.length,
-      itemBuilder: (context, i) {
-        var media = this.media[i];
+  Widget build(BuildContext context) => Expanded(
+        child: ListView.builder(
+            itemCount: this.media.length,
+            itemBuilder: (context, i) {
+              var media = this.media[i];
+              String title = media.title;
+              Text subtitle;
 
-        return ListTile(
-          contentPadding: EdgeInsets.all(4),
-          title: Text(media.title),
-          subtitle: Text(media.description, maxLines: 1),
-          trailing: PlayButton(media: media),
-        );
-      });
+              if (media.description?.isNotEmpty ?? false) {
+                subtitle = Text(media.description, maxLines: 1);
+              }
+
+              if (title?.isEmpty ?? true) {
+                title = "Lesson ${i + 1}";
+              }
+
+              return ListTile(
+                contentPadding: EdgeInsets.all(4),
+                title: Text(title),
+                subtitle: subtitle,
+                trailing: PlayButton(
+                  media: media,
+                  audioPlayer: Provider.of<AudioPlayer>(context),
+                ),
+              );
+            }),
+      );
 }
diff --git a/lib/widgets/media-list/play-button.dart b/lib/widgets/media-list/play-button.dart
@@ -1,32 +1,60 @@
+import 'dart:async';
+
 import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/material.dart';
 import 'package:inside_chassidus/data/insideData.dart';
 import 'package:provider/provider.dart';
 
 class PlayButton extends StatefulWidget {
   final Media media;
+  final AudioPlayer audioPlayer;
 
-  PlayButton({@required this.media});
+  PlayButton({@required this.media, @required this.audioPlayer});
 
   @override
   State<StatefulWidget> createState() => _PlayButtonState();
 }
 
 class _PlayButtonState extends State<PlayButton> {
-  bool isPlaying = false;
+  bool isPlaying;
+  StreamSubscription<AudioPlayerState> subscription;
+
+  @override void initState() {
+    super.initState();
+
+   subscription = widget.audioPlayer.onPlayerStateChanged.listen(_listenToStateChange);
+  }
+
+  @override void dispose() {
+    subscription?.cancel();
+
+    super.dispose();
+  }
 
   @override
-  Widget build(BuildContext context) => GestureDetector(
-    onTap: () {
-      this.setState(() => this.isPlaying = !this.isPlaying);
-
-      var player = Provider.of<AudioPlayer>(context);
-      
-      if (this.isPlaying) {
-        player.play(this.widget.media.source);
-      } else {
-        player.pause();
-      }
-    },
-    child: Icon(this.isPlaying ? Icons.pause : Icons.play_arrow));
-}
+  Widget build(BuildContext context) {
+    isPlaying = widget.audioPlayer.state == AudioPlayerState.PLAYING;
+
+    return GestureDetector(
+        onTap: () {
+          this.setState(() => this.isPlaying = !this.isPlaying);
+
+          var player = Provider.of<AudioPlayer>(context);
+
+          if (this.isPlaying) {
+            player.play(this.widget.media.source);
+          } else {
+            player.pause();
+          }
+        },
+        child: Icon(this.isPlaying ? Icons.pause : Icons.play_arrow));
+  }
+
+  _listenToStateChange(AudioPlayerState state) {
+    bool isPlaying = state == AudioPlayerState.PLAYING;
+    
+    if (isPlaying != this.isPlaying) {
+      this.setState(() => this.isPlaying = isPlaying);
+    }
+  }
+}
diff --git a/lib/widgets/navigate-to-section.dart b/lib/widgets/navigate-to-section.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:inside_chassidus/data/insideData.dart';
-import 'package:inside_chassidus/screens/site-section/index.dart';
+import 'package:inside_chassidus/routes/section-route/index.dart';
 import 'package:inside_chassidus/widgets/inside-navigator.dart';
 
 /// Navigates to given section when child is tapped.
 class NavigateToSection extends InsideNavigator {
   NavigateToSection({@required Widget child, @required SiteSection section})
-  : super(child: child, data: section, routeName: SiteSectionScreen.routeName);
+  : super(child: child, data: section, routeName: SectionRoute.routeName);
 }
