Merge pull request #84 from codetoart/dev

fixed issue codetoart#83
FolioReader · Dec 8, 2017 · e1329d3 · e1329d3
2 parents 9ea84b3 + 3f14c9d
commit e1329d3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/folioreader/build.gradle b/folioreader/build.gradle
@@ -99,7 +99,6 @@ dependencies {
     compile "org.readium:r2-server:$R2_STREAMER_VERSION"
 
     compile 'org.greenrobot:eventbus:3.1.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 apply from: '../folioreader/bintray/installv1.gradle'

diff --git a/folioreader/src/main/java/com/folioreader/model/event/BusOwner.java b/folioreader/src/main/java/com/folioreader/model/event/BusOwner.java
diff --git a/folioreader/src/main/java/com/folioreader/model/event/UpdateHighlightEvent.java b/folioreader/src/main/java/com/folioreader/model/event/UpdateHighlightEvent.java
@@ -0,0 +1,8 @@
+package com.folioreader.model.event;
+
+/**
+ * Created by gautam on 8/12/17.
+ */
+
+public class UpdateHighlightEvent {
+}
diff --git a/folioreader/src/main/java/com/folioreader/ui/folio/activity/FolioActivity.java b/folioreader/src/main/java/com/folioreader/ui/folio/activity/FolioActivity.java
@@ -45,7 +45,6 @@
 import com.folioreader.R;
 import com.folioreader.model.HighlightImpl;
 import com.folioreader.model.event.AnchorIdEvent;
-import com.folioreader.model.event.BusOwner;
 import com.folioreader.model.event.MediaOverlayHighlightStyleEvent;
 import com.folioreader.model.event.MediaOverlayPlayPauseEvent;
 import com.folioreader.model.event.MediaOverlaySpeedEvent;
@@ -85,7 +84,6 @@ public class FolioActivity
         implements FolioPageFragment.FolioPageFragmentCallback,
         ObservableWebView.ToolBarListener,
         ConfigBottomSheetDialogFragment.ConfigDialogCallback,
-        BusOwner,
         MainMvpView {
 
     private static final String TAG = "FolioActivity";

diff --git a/folioreader/src/main/java/com/folioreader/ui/folio/fragment/FolioPageFragment.java b/folioreader/src/main/java/com/folioreader/ui/folio/fragment/FolioPageFragment.java
@@ -41,6 +41,7 @@
 import com.folioreader.model.event.MediaOverlaySpeedEvent;
 import com.folioreader.model.event.ReloadDataEvent;
 import com.folioreader.model.event.RewindIndexEvent;
+import com.folioreader.model.event.UpdateHighlightEvent;
 import com.folioreader.model.event.WebViewPosition;
 import com.folioreader.model.quickaction.ActionItem;
 import com.folioreader.model.quickaction.QuickAction;
@@ -293,6 +294,17 @@ public void reload(ReloadDataEvent reloadDataEvent) {
         }
     }
 
+    @Subscribe()
+    public void updateHighlight(UpdateHighlightEvent event){
+        if(isAdded()) {
+            String rangy = HighlightUtil.generateRangyString(getPageName());
+            FolioPageFragment.this.rangy = rangy;
+            if (!rangy.isEmpty()) {
+                loadRangy(mWebview, rangy);
+            }
+        }
+    }
+
     /**
      * [EVENT BUS FUNCTION]
      * Function triggered from {@link FolioActivity#onActivityResult(int, int, Intent)} when any item in toc clicked.

diff --git a/folioreader/src/main/java/com/folioreader/ui/folio/fragment/HighlightFragment.java b/folioreader/src/main/java/com/folioreader/ui/folio/fragment/HighlightFragment.java
@@ -24,6 +24,7 @@
 import com.folioreader.model.HighLight;
 import com.folioreader.model.HighlightImpl;
 import com.folioreader.model.event.ReloadDataEvent;
+import com.folioreader.model.event.UpdateHighlightEvent;
 import com.folioreader.model.sqlite.HighLightTable;
 import com.folioreader.ui.folio.adapter.HighlightAdapter;
 import com.folioreader.util.AppUtil;
@@ -91,7 +92,7 @@ public void onItemClick(HighlightImpl highlightImpl) {
     @Override
     public void deleteHighlight(int id) {
         if(HighLightTable.deleteHighlight(id)) {
-            EventBus.getDefault().post(new ReloadDataEvent());
+            EventBus.getDefault().post(new UpdateHighlightEvent());
         }
     }