Merge pull request #13 from smartmobilefactory/_master/dynamicCss

timfreiheit · web-flow · commit eabcb018bb68 · 2017-12-22T23:20:05.000+01:00
master/dynamic css
diff --git a/app/src/main/assets/books/styles/night_mode.css b/app/src/main/assets/books/styles/night_mode.css
@@ -0,0 +1 @@
+body { zoom: 100%; } * { background: #111111 !important; color: #ABABAB !important; } :link, :link * { color: #DBDBDC !important } :visited, :visited * { color: #5B5B5B !important }
diff --git a/app/src/main/java/com/smartmobilefactory/epubreader/sample/MainActivity.java b/app/src/main/java/com/smartmobilefactory/epubreader/sample/MainActivity.java
@@ -1,6 +1,7 @@
 package com.smartmobilefactory.epubreader.sample;
 
 import android.app.Application;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.StrictMode;
@@ -161,6 +162,16 @@ public void onStopTrackingTouch(SeekBar seekBar) {
             binding.epubView.setScrollDirection(EpubScrollDirection.SINGLE_CHAPTER_VERTICAL);
         });
 
+        binding.nightmode.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked) {
+                binding.epubView.getSettings().setCustomChapterCss(new String[]{"file:///android_asset/books/styles/night_mode.css"});
+                binding.epubView.setBackgroundColor(Color.parseColor("#111111"));
+            } else {
+                binding.epubView.getSettings().setCustomChapterCss(new String[]{});
+                binding.epubView.setBackgroundColor(Color.WHITE);
+            }
+        });
+
     }
 
     private void observeEpub() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -141,6 +141,14 @@
 
                         </LinearLayout>
                     </HorizontalScrollView>
+
+                    <CheckBox
+                        android:id="@+id/nightmode"
+                        android:layout_marginTop="12dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Nightmode"/>
+
                 </LinearLayout>
 
             </FrameLayout>
diff --git a/library/build.gradle b/library/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 25
         versionCode 1
-        versionName "0.1.1"
+        versionName "0.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,9 +1,3 @@
-<manifest package="com.smartmobilefactory.epubreader"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application android:label="@string/app_name"
-                 android:supportsRtl="true">
-
-    </application>
+<manifest package="com.smartmobilefactory.epubreader">
 
 </manifest>
diff --git a/library/src/main/java/com/smartmobilefactory/epubreader/EpubScrollDirection.java b/library/src/main/java/com/smartmobilefactory/epubreader/EpubScrollDirection.java
@@ -1,7 +1,45 @@
 package com.smartmobilefactory.epubreader;
 
 public enum EpubScrollDirection {
+
+    /**
+     * make chapters internally vertical scrollable
+     * but each chapter has its own page
+     * the user can swipe horizontally through the chapters
+     *
+     * | chapter1 | | chapter2 | | chapter3 | | chapter4 |
+     * | chapter1 | | chapter2 | | chapter3 | | chapter4 |
+     * | chapter1 | | chapter2 |              | chapter4 |
+     * | chapter1 |
+     * | chapter1 |
+     */
     HORIZONTAL_WITH_VERTICAL_CONTENT,
+
+    /**
+     * make all chapters vertical scrollable
+     * WARNING: this mode is not well tested and experimental
+     *
+     * | chapter1 |
+     * | chapter1 |
+     * | chapter1 |
+     * | chapter1 |
+     * | chapter1 |
+     * | chapter2 |
+     * | chapter2 |
+     * | chapter2 |
+     * | chapter3 |
+     * | chapter4 |
+     */
     VERTICAL_WITH_VERTICAL_CONTENT,
+
+    /**
+     * show only a single chapter which is vertically scrollable
+     *
+     * | chapter1 |
+     * | chapter1 |
+     * | chapter1 |
+     * | chapter1 |
+     * | chapter1 |
+     */
     SINGLE_CHAPTER_VERTICAL
 }
diff --git a/library/src/main/java/com/smartmobilefactory/epubreader/display/EpubDisplayHelper.java b/library/src/main/java/com/smartmobilefactory/epubreader/display/EpubDisplayHelper.java
@@ -2,6 +2,7 @@
 
 import android.net.Uri;
 import android.os.Build;
+import android.support.annotation.CheckResult;
 import android.webkit.WebView;
 
 import com.smartmobilefactory.epubreader.EpubViewSettings;
@@ -14,6 +15,7 @@
 import java.util.List;
 import java.util.Locale;
 
+import io.reactivex.Completable;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -25,7 +27,8 @@ public class EpubDisplayHelper {
     private static String INJECT_CSS_FORMAT = "<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">\n";
     private static String INJECT_JAVASCRIPT_FORMAT = "<script src=\"%s\"></script>\n";
 
-    public static BaseDisposableObserver loadHtmlData(WebView webView, Epub epub, SpineReference spineReference, EpubViewSettings settings) {
+    @CheckResult
+    public static Completable loadHtmlData(WebView webView, Epub epub, SpineReference spineReference, EpubViewSettings settings) {
 
         WeakReference<WebView> webViewWeakReference = new WeakReference<>(webView);
 
@@ -58,7 +61,7 @@ public static BaseDisposableObserver loadHtmlData(WebView webView, Epub epub, Sp
                         );
                     }
                 })
-                .subscribeWith(new BaseDisposableObserver<>());
+                .toCompletable();
     }
 
     private static String getHtml(Epub epub, SpineReference reference, EpubViewSettings settings) throws IOException {
diff --git a/library/src/main/java/com/smartmobilefactory/epubreader/display/vertical_content/SingleChapterVerticalEpubDisplayStrategy.java b/library/src/main/java/com/smartmobilefactory/epubreader/display/vertical_content/SingleChapterVerticalEpubDisplayStrategy.java
@@ -34,7 +34,7 @@ public void displayEpub(final Epub epub, EpubLocation location) {
         if (location instanceof EpubLocation.ChapterLocation) {
             int chapter = ((EpubLocation.ChapterLocation) location).chapter();
             SpineReference spineReference = epub.getBook().getSpine().getSpineReferences().get(chapter);
-            EpubDisplayHelper.loadHtmlData(binding.webview, epub, spineReference, settings);
+            binding.webview.loadEpubPage(epub, spineReference, epubView.getSettings());
             setCurrentChapter(chapter);
         }
 
diff --git a/library/src/main/java/com/smartmobilefactory/epubreader/display/vertical_content/horizontal_chapters/PagerAdapter.java b/library/src/main/java/com/smartmobilefactory/epubreader/display/vertical_content/horizontal_chapters/PagerAdapter.java
@@ -60,8 +60,7 @@ public View getView(int position, ViewGroup parent) {
         binding.webview.setUrlInterceptor(strategy.urlInterceptor);
 
         SpineReference spineReference = epub.getBook().getSpine().getSpineReferences().get(position);
-        EpubDisplayHelper.loadHtmlData(binding.webview, epub, spineReference, epubView.getSettings())
-                .addTo(compositeDisposable);
+        binding.webview.loadEpubPage(epub, spineReference, epubView.getSettings());
 
         handleLocation(position, binding.webview);
 
diff --git a/library/src/main/java/com/smartmobilefactory/epubreader/display/vertical_content/vertical_chapters/ChapterAdapter.java b/library/src/main/java/com/smartmobilefactory/epubreader/display/vertical_content/vertical_chapters/ChapterAdapter.java
@@ -61,8 +61,7 @@ public void onBindViewHolder(ChapterViewHolder holder, int position) {
         holder.binding.webview.setUrlInterceptor(strategy.urlInterceptor);
 
         SpineReference spineReference = epub.getBook().getSpine().getSpineReferences().get(position);
-        EpubDisplayHelper.loadHtmlData(holder.binding.webview, epub, spineReference, epubView.getSettings())
-                .addTo(compositeDisposable);
+        holder.binding.webview.loadEpubPage(epub, spineReference, epubView.getSettings());
 
         Bridge bridge = new Bridge();
         holder.binding.webview.setInternalBridge(bridge);
diff --git a/library/src/main/java/com/smartmobilefactory/epubreader/display/view/EpubWebView.java b/library/src/main/java/com/smartmobilefactory/epubreader/display/view/EpubWebView.java
@@ -4,6 +4,7 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 import android.util.AttributeSet;
@@ -12,7 +13,9 @@
 import android.webkit.WebViewClient;
 
 import com.smartmobilefactory.epubreader.EpubViewSettings;
+import com.smartmobilefactory.epubreader.display.EpubDisplayHelper;
 import com.smartmobilefactory.epubreader.display.WebViewHelper;
+import com.smartmobilefactory.epubreader.model.Epub;
 import com.smartmobilefactory.epubreader.model.EpubFont;
 import com.smartmobilefactory.epubreader.model.EpubLocation;
 import com.smartmobilefactory.epubreader.utils.BaseDisposableObserver;
@@ -24,6 +27,7 @@
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.subjects.BehaviorSubject;
+import nl.siegmann.epublib.domain.SpineReference;
 
 public class EpubWebView extends WebView {
 
@@ -32,6 +36,7 @@ public interface UrlInterceptor {
     }
 
     private final CompositeDisposable settingsCompositeDisposable = new CompositeDisposable();
+    private final CompositeDisposable loadEpubCompositeDisposable = new CompositeDisposable();
 
     private UrlInterceptor urlInterceptor;
     private WebViewHelper webViewHelper = new WebViewHelper(this);
@@ -68,6 +73,7 @@ private void init() {
         getSettings().setAllowFileAccess(true);
         setVerticalScrollBarEnabled(false);
         setHorizontalScrollBarEnabled(false);
+        setBackgroundColor(Color.TRANSPARENT);
     }
 
     @SuppressLint({"JavascriptInterface", "AddJavascriptInterface"})
@@ -133,6 +139,21 @@ public void bindToSettings(EpubViewSettings settings) {
 
     }
 
+    public void loadEpubPage(Epub epub, SpineReference spineReference, EpubViewSettings settings) {
+        if (settings == null) {
+            return;
+        }
+        loadEpubCompositeDisposable.clear();
+        settings.anySettingHasChanged()
+                // reload html when some settings changed
+                .filter(setting -> setting == EpubViewSettings.Setting.CUSTOM_FILES)
+                .startWith(EpubViewSettings.Setting.CUSTOM_FILES)
+                .flatMap(setting -> EpubDisplayHelper.loadHtmlData(this, epub, spineReference, settings)
+                        .toObservable())
+                .subscribeWith(new BaseDisposableObserver<>())
+                .addTo(loadEpubCompositeDisposable);
+    }
+
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
@@ -145,6 +166,7 @@ protected void onAttachedToWindow() {
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         settingsCompositeDisposable.clear();
+        loadEpubCompositeDisposable.clear();
     }
 
     @SuppressLint({"JavascriptInterface", "AddJavascriptInterface"})
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+body { zoom: 100%; } * { background: #111111 !important; color: #ABABAB !important; } :link, :link * { color: #DBDBDC !important } :visited, :visited * { color: #5B5B5B !important }`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void displayEpub(final Epub epub, EpubLocation location) {`
`34`	`34`	`if (location instanceof EpubLocation.ChapterLocation) {`
`35`	`35`	`int chapter = ((EpubLocation.ChapterLocation) location).chapter();`
`36`	`36`	`SpineReference spineReference = epub.getBook().getSpine().getSpineReferences().get(chapter);`
`37`		`- EpubDisplayHelper.loadHtmlData(binding.webview, epub, spineReference, settings);`
	`37`	`+ binding.webview.loadEpubPage(epub, spineReference, epubView.getSettings());`
`38`	`38`	`setCurrentChapter(chapter);`
`39`	`39`	`}`
`40`	`40`