Integrate local repo of modified r2-streamer-kotlin

Author: hrishikesh-kadam

.gitignore

@@ -1,3 +1,13 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+
 # Custom
 _site
 
@@ -37,4 +47,7 @@ out
 # Maven
 target
 release.properties
-pom.xml.*
+pom.xml.*
+
+# Readium DRM LCP
+liblcp.aar

build.gradle

@@ -24,6 +24,8 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     }
 }
 
@@ -40,6 +42,12 @@ ext {
     ANDROID_LIB_VERSION = '28.0.0-rc01'
 
     CONSTRAINT_LAYOUT_VERSION = "1.1.3"
+
+    JACKSON_VERSION = '2.8.6'
+
+    //r2 local project implementation variables
+    kotlin_version = '1.2.61'
+    support_version = '27.1.1'
 }
 
 task clean(type: Delete) {

folioreader/build.gradle

@@ -72,6 +72,8 @@ android {
 
     lintOptions {
         abortOnError false
+        disable 'LogNotTimber', 'StringFormatInTimber', 'ThrowableNotAtBeginning',
+                'BinaryOperationInTimber', 'TimberArgCount', 'TimberArgTypes', 'TimberTagLength'
     }
 
     checkstyle {
@@ -96,16 +98,37 @@ dependencies {
     implementation "com.android.support:support-v4:$ANDROID_LIB_VERSION"
     implementation "com.android.support:design:$ANDROID_LIB_VERSION"
 
+    implementation 'org.slf4j:slf4j-android:1.7.25'
     implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
 
     //Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
 
     // r2-streamer
-    api "org.readium:r2-fetcher:$R2_STREAMER_VERSION"
-    api "org.readium:r2-parser:$R2_STREAMER_VERSION"
-    api "org.readium:r2-server:$R2_STREAMER_VERSION"
+//    api "org.readium:r2-fetcher:$R2_STREAMER_VERSION"
+//    api "org.readium:r2-parser:$R2_STREAMER_VERSION"
+//    api "org.readium:r2-server:$R2_STREAMER_VERSION"
 
     implementation 'org.greenrobot:eventbus:3.1.1'
+
+    implementation "com.fasterxml.jackson.core:jackson-core:$JACKSON_VERSION"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$JACKSON_VERSION"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$JACKSON_VERSION"
+
+//    implementation 'com.github.readium:r2-shared-kotlin:develop-SNAPSHOT'
+//    implementation 'com.github.readium:r2-streamer-kotlin:develop-SNAPSHOT'
+
+//    implementation 'com.github.readium:r2-shared-kotlin:1.0.3'
+    implementation project(":r2-shared-local")
+//    implementation('com.github.readium:r2-streamer-kotlin:1.0.3') {
+//        exclude group: "org.slf4j", module: "slf4j-api"
+//    }
+    api(project(':r2-streamer-kotlin-local')) {
+        exclude group: "org.slf4j", module: "slf4j-api"
+    }
+
+    // required for local implementation of r2-streamer-kotlin
+    implementation 'org.nanohttpd:nanohttpd:2.3.2-SNAPSHOT'
+    implementation 'org.nanohttpd:nanohttpd-nanolets:2.3.2-SNAPSHOT'
 }
 apply from: '../folioreader/bintray/bintrayv1.gradle'

folioreader/libs/epublib-core-latest.jar

@@ -6,6 +6,7 @@
  * Created by mobisys on 10/4/2016.
  */
 public class Constants {
+    public static final String PUBLICATION = "PUBLICATION";
     public static final String SELECTED_CHAPTER_POSITION = "selected_chapter_position";
     public static final String TYPE = "type";
     public static final String CHAPTER_SELECTED = "chapter_selected";

folioreader/libs/slf4j-android-1.5.8.jar

@@ -10,11 +10,11 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.folioreader.model.search.SearchItem
 import com.folioreader.model.search.SearchItemType
+import com.folioreader.r2_streamer_java.SearchQueryResults
 import com.folioreader.ui.folio.activity.SearchActivity
 import com.folioreader.ui.folio.adapter.ListViewType
 import com.folioreader.ui.folio.adapter.SearchAdapter
 import com.folioreader.util.AppUtil
-import org.readium.r2_streamer.model.searcher.SearchQueryResults
 import java.io.BufferedReader
 import java.io.InputStream
 import java.io.InputStreamReader

folioreader/src/main/java/com/folioreader/Constants.java

@@ -5,7 +5,7 @@
 import com.folioreader.FolioReader;
 import com.folioreader.ui.folio.activity.FolioActivity;
 
-import org.readium.r2_streamer.model.publication.EpubPublication;
+import org.readium.r2.shared.Publication;
 
 /**
  * Interface contract for last read position
@@ -16,25 +16,15 @@ public interface ReadPosition extends Parcelable {
 
     /**
      * Returns the bookId if sent in {@link FolioReader}'s openBook() else logic defined in
-     * {@link FolioActivity#onLoadPublication(EpubPublication)} will return the bookId.
+     * {@link FolioActivity#onBookInitSuccess()} will return the bookId.
      */
     String getBookId();
 
-    /**
-     * Returns the idref of the spine item.
-     */
-    String getChapterId();
-
     /**
      * Returns the href of the manifest item.
      */
     String getChapterHref();
 
-    /**
-     * Returns the chapter index from spine tag
-     */
-    int getChapterIndex();
-
     /**
      * Returns true if span tag has id
      */

folioreader/src/main/java/com/folioreader/loaders/SearchLoader.kt

@@ -4,6 +4,7 @@
 import android.os.Parcelable;
 import android.util.Log;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectWriter;
@@ -14,7 +15,8 @@
 /**
  * Created by Hrishikesh Kadam on 20/04/2018.
  */
-@JsonPropertyOrder({"bookId", "chapterId", "chapterHref", "chapterIndex", "usingId", "value"})
+@JsonPropertyOrder({"bookId", "chapterHref", "usingId", "value"})
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ReadPositionImpl implements ReadPosition, Parcelable {
 
     public static final Creator<ReadPositionImpl> CREATOR = new Creator<ReadPositionImpl>() {
@@ -31,21 +33,16 @@ public ReadPositionImpl[] newArray(int size) {
 
     private static final String LOG_TAG = ReadPositionImpl.class.getSimpleName();
     private String bookId;
-    private String chapterId;
     private String chapterHref;
-    private int chapterIndex = -1;
     private boolean usingId;
     private String value;
 
     public ReadPositionImpl() {
     }
 
-    public ReadPositionImpl(String bookId, String chapterId, String chapterHref, int chapterIndex,
-                            boolean usingId, String value) {
+    public ReadPositionImpl(String bookId, String chapterHref, boolean usingId, String value) {
         this.bookId = bookId;
-        this.chapterId = chapterId;
         this.chapterHref = chapterHref;
-        this.chapterIndex = chapterIndex;
         this.usingId = usingId;
         this.value = value;
     }
@@ -66,19 +63,15 @@ public static ReadPosition createInstance(String jsonString) {
 
     protected ReadPositionImpl(Parcel in) {
         bookId = in.readString();
-        chapterId = in.readString();
         chapterHref = in.readString();
-        chapterIndex = in.readInt();
         usingId = in.readByte() != 0;
         value = in.readString();
     }
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(bookId);
-        dest.writeString(chapterId);
         dest.writeString(chapterHref);
-        dest.writeInt(chapterIndex);
         dest.writeByte((byte) (usingId ? 1 : 0));
         dest.writeString(value);
     }
@@ -92,24 +85,6 @@ public void setBookId(String bookId) {
         this.bookId = bookId;
     }
 
-    @Override
-    public String getChapterId() {
-        return chapterId;
-    }
-
-    public void setChapterId(String chapterId) {
-        this.chapterId = chapterId;
-    }
-
-    @Override
-    public int getChapterIndex() {
-        return chapterIndex;
-    }
-
-    public void setChapterIndex(int chapterIndex) {
-        this.chapterIndex = chapterIndex;
-    }
-
     @Override
     public String getChapterHref() {
         return chapterHref;

folioreader/src/main/java/com/folioreader/model/ReadPosition.java

@@ -2,7 +2,7 @@
 
 import com.folioreader.util.MultiLevelExpIndListAdapter;
 
-import org.readium.r2_streamer.model.tableofcontents.TOCLink;
+import org.readium.r2.shared.Link;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,18 +11,18 @@
  * Created by Mahavir on 3/10/17.
  */
 
-public class TOCLinkWrapper implements MultiLevelExpIndListAdapter.ExpIndData{
-    private TOCLink tocLink;
+public class TOCLinkWrapper implements MultiLevelExpIndListAdapter.ExpIndData {
+    private Link tocLink;
     private int indentation;
     private ArrayList<TOCLinkWrapper> tocLinkWrappers;
     private boolean mIsGroup;
     private int mGroupSize;
 
-    public TOCLinkWrapper(TOCLink tocLink, int indentation) {
+    public TOCLinkWrapper(Link tocLink, int indentation) {
         this.tocLink = tocLink;
         this.indentation = indentation;
         this.tocLinkWrappers = new ArrayList<>();
-        this.mIsGroup = (tocLink.getTocLinks()!=null && tocLink.getTocLinks().size()>0);
+        this.mIsGroup = (tocLink.getChildren().size() > 0);
     }
 
     @Override
@@ -44,11 +44,11 @@ public void setIndentation(int indentation) {
         this.indentation = indentation;
     }
 
-    public TOCLink getTocLink() {
+    public Link getTocLink() {
         return tocLink;
     }
 
-    public void setTocLink(TOCLink tocLink) {
+    public void setTocLink(Link tocLink) {
         this.tocLink = tocLink;
     }