Hide readium classes from View into ReadiumService

Rename ReadiumServer to ReadiumService
Make navigating table of contents function

Author: devgrapher

OCEBook/app/src/main/java/com/devgrapher/ocebook/ReaderActivity.java

@@ -18,12 +18,16 @@
 import android.widget.Toast;
 
 import com.devgrapher.ocebook.model.ContainerHolder;
-import com.devgrapher.ocebook.readium.TocManager;
+import com.devgrapher.ocebook.readium.ReadiumService;
+import com.devgrapher.ocebook.readium.TocHelper;
 
 import org.readium.sdk.android.Container;
 import org.readium.sdk.android.EPub3;
 import org.readium.sdk.android.Package;
 import org.readium.sdk.android.SdkErrorHandler;
+import org.readium.sdk.android.components.navigation.NavigationPoint;
+
+import java.util.concurrent.atomic.AtomicInteger;
 
 
 public class ReaderActivity extends AppCompatActivity
@@ -33,9 +37,9 @@ public class ReaderActivity extends AppCompatActivity
 
     private final String TAG = ReaderActivity.class.toString();
     private Container mContainer;
-    private TocManager mTocManager;
     private NavigationView mTocNavView;
 
+
     // TODO: 외부에서 값을 받아와야 함
     private final String BOOK_PATH = "/sdcard/ocebook/alice3.epub";
 
@@ -128,7 +132,12 @@ public boolean onNavigationItemSelected(MenuItem item) {
         // Handle navigation view item clicks here.
         int id = item.getItemId();
 
-
+        Package pckg = mContainer.getDefaultPackage();
+        NavigationPoint nav = TocHelper.getAt(pckg, id);
+        if (nav != null) {
+            ReadiumService.getApi().openContentUrl(
+                    nav.getContent(), pckg.getTableOfContents().getSourceHref());
+        }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         drawer.closeDrawer(GravityCompat.START);
@@ -150,10 +159,14 @@ public boolean handleSdkError(String message, boolean isSevereEpubError) {
     public void onPackageOpen(Package pckg) {
         mTocNavView.getMenu().removeGroup(R.id.menu_group_toc);
 
-        mTocManager = new TocManager(pckg);
-        mTocManager.getTableOfContents()
+        AtomicInteger index = new AtomicInteger(0);
+        TocHelper.flatTableOfContents(pckg)
                 .forEach(e -> {
-                    mTocNavView.getMenu().add(R.id.menu_group_toc, Menu.NONE, Menu.NONE, e.getTitle());
+                    mTocNavView.getMenu().add(
+                            R.id.menu_group_toc,
+                            index.getAndIncrement(),
+                            Menu.NONE,
+                            e.getTitle());
         });
 
         ((TextView) mTocNavView.findViewById(R.id.tv_nav_book_title))

OCEBook/app/src/main/java/com/devgrapher/ocebook/WebViewFragment.java

@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Bundle;
 import android.app.Fragment;
 import android.util.Log;
@@ -18,14 +17,11 @@
 import android.webkit.WebViewClient;
 import android.widget.TextView;
 
-import com.devgrapher.ocebook.readium.TocManager;
-import com.devgrapher.ocebook.readium.ScriptProcessor;
-import com.devgrapher.ocebook.readium.ReadiumServer;
+import com.devgrapher.ocebook.readium.ReadiumService;
 import com.devgrapher.ocebook.model.ContainerHolder;
 import com.devgrapher.ocebook.model.OpenPageRequest;
 import com.devgrapher.ocebook.model.Page;
 import com.devgrapher.ocebook.model.PaginationInfo;
-import com.devgrapher.ocebook.model.ReadiumJSApi;
 import com.devgrapher.ocebook.model.ViewerSettings;
 
 import org.readium.sdk.android.Container;
@@ -49,20 +45,14 @@
 public class WebViewFragment extends Fragment {
     private static final String TAG = WebViewFragment.class.toString();
     private static final String ARG_CONTAINER_ID = "package";
-    private static final String READER_SKELETON = "file:///android_asset/readium-shared-js/reader.html";
 
     private Package mPackage;
     private OnFragmentInteractionListener mListener;
     private ViewerSettings mViewerSettings;
-    private ReadiumJSApi mReadiumJSApi;
-    private ReadiumServer mReadiumServer;
-    private TocManager mTocManager;
 
     private WebView mWebView;
     private TextView mPageInfoTextView;
 
-    private ScriptProcessor mScriptProcessor;
-
     public WebViewFragment() {
         // Required empty public constructor
     }
@@ -106,21 +96,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         initWebView();
         intReadium();
 
-
         mViewerSettings = new ViewerSettings(
                 ViewerSettings.SyntheticSpreadMode.AUTO,
                 ViewerSettings.ScrollMode.AUTO, 100, 20);
 
-        mReadiumJSApi = new ReadiumJSApi(new ReadiumJSApi.JSLoader() {
-            @Override
-            public void loadJS(String javascript) {
-                mWebView.loadUrl(javascript);
-            }
-        });
-
-        mReadiumServer.start();
-
-        mTocManager = new TocManager(mPackage);
         return view;
     }
 
@@ -130,34 +109,30 @@ private void initWebView() {
                 != 0) {
             WebView.setWebContentsDebuggingEnabled(true);
         }
-        mWebView.loadUrl(READER_SKELETON);
+
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setMediaPlaybackRequiresUserGesture(false);
         mWebView.getSettings().setAllowUniversalAccessFromFileURLs(true);
         mWebView.setWebViewClient(new ReadiumWebViewClient());
         mWebView.setWebChromeClient(new WebChromeClient());
 
-        mWebView.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
+        mWebView.setOnTouchListener((View v, MotionEvent event) -> {
                 switch (event.getAction()) {
                     case MotionEvent.ACTION_UP:
                         if (event.getX() < v.getWidth() / 2) {
                             Log.d(TAG, "Touch left");
-                            mReadiumJSApi.openPageLeft();
+                            ReadiumService.getApi().openPageLeft();
                         } else {
                             Log.d(TAG, "Touch right");
-                            mReadiumJSApi.openPageRight();
+                            ReadiumService.getApi().openPageRight();
                         }
                 }
                 return false;
-            }
         });
     }
 
     private void intReadium() {
-        mScriptProcessor = new ScriptProcessor(
-            new ScriptProcessor.ContentProcessorDelegate() {
+        ReadiumService.getInstance().start(new ReadiumService.WebViewDelegate() {
                 @Override
                 public void evaluateJavascript(String script) {
                     getActivity().runOnUiThread(() -> {
@@ -178,15 +153,16 @@ public InputStream openAsset(String fileName) {
                 }
 
                 @Override
-                public void addJavascriptInterface(ScriptProcessor.JsInterface jsInterface,
-                                                   String name) {
+                public void addJavascriptInterface(ReadiumService.JsInterface jsInterface, String name) {
                     mWebView.addJavascriptInterface(jsInterface, name);
                 }
-            }, mPackage);
 
-        mScriptProcessor.setEventListener(new ReadiumJsEventListener());
+                @Override
+                public void loadUrl(String url) {
+                    mWebView.loadUrl(url);
+                }
 
-        mReadiumServer = new ReadiumServer(mScriptProcessor, mPackage);
+            }, new ReadiumPageEventListener(), mPackage);
     }
 
     @Override
@@ -222,8 +198,8 @@ public void onDetach() {
     public void onDestroy() {
         super.onDestroy();
 
-        mReadiumServer.stop();
-        mWebView.loadUrl(READER_SKELETON);
+        ReadiumService.getInstance().stop();
+        //TODO: mWebView.loadUrl(READER_SKELETON);
         ((ViewGroup) mWebView.getParent()).removeView(mWebView);
         mWebView.removeAllViews();
         mWebView.clearCache(true);
@@ -272,8 +248,9 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest req) {
             Log.d(TAG, "-------- interceptRequest: " + req.getUrl().toString());
 
-            WebResourceResponse res = mScriptProcessor.interceptRequest(
-                            req.getUrl().toString());
+            WebResourceResponse res = ReadiumService.getInstance()
+                    .handleWebRequest(req.getUrl().toString());
+
             if (res == null) {
                 return super.shouldInterceptRequest(view, req);
             }
@@ -282,15 +259,15 @@ public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceReque
         }
     }
 
-    public final class ReadiumJsEventListener implements ScriptProcessor.JsEventListener {
+    public final class ReadiumPageEventListener implements ReadiumService.PageEventListener {
 
         @Override
         public void onReaderInitialized() {
             getActivity().runOnUiThread(() -> {
                 mPackage.getSpineItems().stream()
                         .findAny()
                         .ifPresent(item -> {
-                            mReadiumJSApi.openBook(mPackage, mViewerSettings,
+                            ReadiumService.getApi().openBook(mPackage, mViewerSettings,
                                     OpenPageRequest.fromIdref(item.getIdRef()));
                             mListener.onPackageOpen(mPackage);
                         });