Audio is playing and syncing much better.

unfoldingWord-dev · Dec 29, 2015 · dc543a9 · dc543a9
1 parent 597f3ab
commit dc543a9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 11 deletions.
diff --git a/app/app/src/main/java/fragments/Reading/StoryReadingFragment.java b/app/app/src/main/java/fragments/Reading/StoryReadingFragment.java
@@ -26,6 +26,7 @@
 import eventbusmodels.BiblePagingEvent;
 import eventbusmodels.StoriesPagingEvent;
 import model.daoModels.StoryPage;
+import singletons.UWAudioPlayer;
 import utils.UWPreferenceDataAccessor;
 import view.ReadingDoubleTapHandler;
 
@@ -177,7 +178,9 @@ public void onPageScrollStateChanged(int state) {
                 if (position < pages.size()) {
                     StoryPage mainModel = pages.get(position);
                     StoryPage secondaryModel = adapter.getSecondChapter().getStoryPages().get(position);
-                    EventBus.getDefault().postSticky(new StoriesPagingEvent(mainModel, secondaryModel));
+                    StoriesPagingEvent event = new StoriesPagingEvent(mainModel, secondaryModel);
+                    UWAudioPlayer.getInstance(getContext()).onEvent(event);
+                    EventBus.getDefault().postSticky(event);
                 }
             }
         });

diff --git a/app/app/src/main/java/utils/UWPreferenceDataManager.java b/app/app/src/main/java/utils/UWPreferenceDataManager.java
@@ -113,14 +113,14 @@ public static void setNewStoriesVersion(Context context, Version newVersion, boo
             long newPageId = page.getId();
             changedToStoryPage(context, newPageId, isSecond);
             changedToStoryPage(context, newPageId, !isSecond);
-            return;
         }
-
-        DaoSession session = DaoDBHelper.getDaoSession(context);
-        Book book = newVersion.getBookForBookSlug(currentPage.getStoriesChapter().getBook().getSlug(), session);
-        StoriesChapter newChapter = book.getStoriesChapterForNumber(currentPage.getStoriesChapter().getNumber());
-        StoryPage newPage = newChapter.getStoryPageForNumber(currentPage.getNumber());
-        changedToStoryPage(context, newPage.getId(), isSecond);
+        else {
+            DaoSession session = DaoDBHelper.getDaoSession(context);
+            Book book = newVersion.getBookForBookSlug(currentPage.getStoriesChapter().getBook().getSlug(), session);
+            StoriesChapter newChapter = book.getStoriesChapterForNumber(currentPage.getStoriesChapter().getNumber());
+            StoryPage newPage = newChapter.getStoryPageForNumber(currentPage.getNumber());
+            changedToStoryPage(context, newPage.getId(), isSecond);
+        }
         EventBus.getDefault().postSticky(UWPreferenceDataAccessor.getSharedInstance(context).createStoriesPagingEvent());
     }
 

diff --git a/app/app/src/main/java/view/AudioPlayerViewGroup.java b/app/app/src/main/java/view/AudioPlayerViewGroup.java
@@ -87,13 +87,36 @@ public void onClick(View v) {
             }
         });
 
-        seekBar.setOnTouchListener(new View.OnTouchListener() {
+        seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+
+            private boolean wasPlaying = false;
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+                wasPlaying = UWAudioPlayer.getInstance(context).isPlaying();
+                UWAudioPlayer.getInstance(context).pause();
+            }
+
             @Override
-            public boolean onTouch(View v, MotionEvent event) {
+            public void onStopTrackingTouch(SeekBar seekBar) {
                 seekChange();
-                return false;
+                if(wasPlaying) {
+                    UWAudioPlayer.getInstance(context).play();
+                    wasPlaying = false;
+                }
             }
         });
+//        seekBar.setOnTouchListener(new View.OnTouchListener() {
+//            @Override
+//            public boolean onTouch(View v, MotionEvent event) {
+//                seekChange();
+//                return false;
+//            }
+//        });
         UWAudioPlayer.getInstance(context).addListener(this);
     }