Merge pull request #337 from codetoart/master

Prepare version 0.5.4 for release
FolioReader · Jan 11, 2019 · 51dc6b6 · 51dc6b6
2 parents 8701a23 + 3254d84
commit 51dc6b6
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.5.4
+
+- Search API from codetoart/r2-streamer-kotlin now use window.find() instead of Rangy solution.
+
 ## 0.5.3
 
 - FolioReader migrated to AndroidX. You will have to migrate your project to AndroidX. Read more about it here - [Migrating to AndroidX](https://developer.android.com/jetpack/androidx/migrate)

diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Add following dependency to your app module `build.gradle` file:
 ```groovy
 dependencies {
     ...
-    implementation "com.folioreader:folioreader:0.5.3"
+    implementation "com.folioreader:folioreader:0.5.4"
     ...
 }
 ```
@@ -83,7 +83,7 @@ folioReader.openBook("file:///android_asset/TheSilverChair.epub");
 ##### opening book from raw -
 
 ```java
-folioReader.openBook(R.raw.adventures);
+folioReader.openBook(R.raw.accessible_epub_3);
 ```
 
 

diff --git a/folioreader/src/main/java/com/folioreader/ui/activity/FolioActivity.kt b/folioreader/src/main/java/com/folioreader/ui/activity/FolioActivity.kt
@@ -506,7 +506,7 @@ class FolioActivity : AppCompatActivity(), FolioActivityCallback, MediaControlle
     private fun onBookInitSuccess() {
 
         val publication = pubBox!!.publication
-        spine = publication.spine
+        spine = publication.readingOrder
         title = publication.metadata.title
 
         if (mBookId == null) {

diff --git a/folioreader/src/main/java/com/folioreader/ui/fragment/TableOfContentFragment.java b/folioreader/src/main/java/com/folioreader/ui/fragment/TableOfContentFragment.java
@@ -91,7 +91,7 @@ private void initAdapter() {
                 }
                 onLoadTOC(tocLinkWrappers);
             } else {
-                onLoadTOC(createTOCFromSpine(publication.getSpine()));
+                onLoadTOC(createTOCFromSpine(publication.getReadingOrder()));
             }
         } else {
             onError();

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -56,8 +56,6 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:1.0.0"
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 
-    implementation 'androidx.multidex:multidex:2.0.0'
-
     implementation project(':folioreader')
     //implementation "com.folioreader:folioreader:$versions.folioreaderSdk"
 

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     package="com.folioreader.android.sample">
 
     <application
-        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/sample/src/main/res/raw/adventures.epub → sample/src/main/assets/adventures.epub b/sample/src/main/res/raw/adventures.epub → sample/src/main/assets/adventures.epub
diff --git a/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java b/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java
@@ -67,7 +67,7 @@ public void onClick(View v) {
                 config.setAllowedDirection(Config.AllowedDirection.VERTICAL_AND_HORIZONTAL);
 
                 folioReader.setConfig(config, true)
-                        .openBook(R.raw.adventures);
+                        .openBook(R.raw.accessible_epub_3);
             }
         });
 

diff --git a/sample/src/main/res/raw/accessible_epub_3.epub b/sample/src/main/res/raw/accessible_epub_3.epub
diff --git a/versions.gradle b/versions.gradle
@@ -1,8 +1,8 @@
 def versions = [:]
 
-versions.folioreaderSdk = "0.5.3"
-versions.r2SharedKotlin = "1.0.4-1"
-versions.r2StreamerKotlin = "1.0.4-1"
+versions.folioreaderSdk = "0.5.4"
+versions.r2SharedKotlin = "1.0.4-2"
+versions.r2StreamerKotlin = "1.0.4-2"
 
 versions.projectVersionCode = 1
 versions.projectVersionName = "1.0"