Fix margin on episode tile progress indicator. Fix flashing chapter a…

…rt when offline.
amugofjava · Nov 4, 2021 · dc7093a · dc7093a
1 parent 473c791
commit dc7093a
Show file tree

Hide file tree

Showing 5 changed files with 164 additions and 178 deletions.
diff --git a/lib/bloc/podcast/audio_bloc.dart b/lib/bloc/podcast/audio_bloc.dart
@@ -89,7 +89,7 @@ class AudioBloc extends Bloc {
           await audioPlayerService.pause();
           break;
         case TransitionState.fastforward:
-          await audioPlayerService.fastforward();
+          await audioPlayerService.fastForward();
           break;
         case TransitionState.rewind:
           await audioPlayerService.rewind();

diff --git a/lib/services/audio/audio_player_service.dart b/lib/services/audio/audio_player_service.dart
@@ -51,7 +51,7 @@ abstract class AudioPlayerService {
   Future<void> rewind();
 
   /// Fast forward the current episode by pre-set number of seconds.
-  Future<void> fastforward();
+  Future<void> fastForward();
 
   /// Seek to the specified position within the current episode.
   Future<void> seek({@required int position});

diff --git a/lib/services/audio/mobile_audio_player_service.dart b/lib/services/audio/mobile_audio_player_service.dart
@@ -179,7 +179,7 @@ class MobileAudioPlayerService extends AudioPlayerService {
   }
 
   @override
-  Future<void> fastforward() => AudioService.fastForward();
+  Future<void> fastForward() => AudioService.fastForward();
 
   @override
   Future<void> rewind() => AudioService.rewind();
@@ -490,22 +490,21 @@ class MobileAudioPlayerService extends AudioPlayerService {
     }
   }
 
+  /// Calculate our current chapter based on playback position, and if it's different to
+  /// the currently stored chapter - update.
   void _updateChapter(int seconds, int duration) {
     if (_episode == null) {
       log.fine('Warning. Attempting to update chapter information on a null _episode');
     } else if (_episode.hasChapters && _episode.chaptersAreLoaded) {
       final chapters = _episode.chapters;
 
-      // What is our current chapter?
-      _episode.currentChapter = null;
-
-      for (var x = 0; x < _episode.chapters.length; x++) {
-        final startTime = chapters[x].startTime;
-        final endTime = x == (_episode.chapters.length - 1) ? duration : chapters[x + 1].startTime;
+      for (var chapterPtr = 0; chapterPtr < _episode.chapters.length; chapterPtr++) {
+        final startTime = chapters[chapterPtr].startTime;
+        final endTime = chapterPtr == (_episode.chapters.length - 1) ? duration : chapters[chapterPtr + 1].startTime;
 
         if (seconds >= startTime && seconds < endTime) {
-          if (chapters[x] != _episode.currentChapter) {
-            _episode.currentChapter = chapters[x];
+          if (chapters[chapterPtr] != _episode.currentChapter) {
+            _episode.currentChapter = chapters[chapterPtr];
             _episodeEvent.sink.add(_episode);
             break;
           }