Skip to content

Commit

Permalink
Merge pull request #337 from codetoart/master
Browse files Browse the repository at this point in the history
Prepare version 0.5.4 for release
  • Loading branch information
Mahavir Jain authored Jan 11, 2019
2 parents 8701a23 + 3254d84 commit 51dc6b6
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
...
}
```
Expand All @@ -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);
```


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private void initAdapter() {
}
onLoadTOC(tocLinkWrappers);
} else {
onLoadTOC(createTOCFromSpine(publication.getSpine()));
onLoadTOC(createTOCFromSpine(publication.getReadingOrder()));
}
} else {
onError();
Expand Down
2 changes: 0 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
});

Expand Down
Binary file added sample/src/main/res/raw/accessible_epub_3.epub
Binary file not shown.
6 changes: 3 additions & 3 deletions versions.gradle
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 51dc6b6

Please sign in to comment.