Prepare v0.4.3

Reduced approx 15k methods to avoid 64k method limit

Author: hrishikesh-kadam

README.md

@@ -48,7 +48,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.folioreader:folioreader:0.4.2'
+    implementation 'com.folioreader:folioreader:0.4.3'
 }
 ```
 

build.gradle

@@ -17,7 +17,6 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$KOTLIN_VERSION"
     }
 }
 
@@ -29,7 +28,7 @@ allprojects {
 }
 
 ext {
-    LIBRARY_VERSION = '0.4.2'
+    LIBRARY_VERSION = '0.4.3'
     R2_STREAMER_VERSION = '0.1.8'
 
     VERSION_NAME = "1.0"
@@ -40,7 +39,7 @@ ext {
     ANDROID_TARGET_SDK_VERSION = 28
     ANDROID_LIB_VERSION = '28.0.0-rc01'
 
-    CONSTRAINT_LAYOUT_VERSION = "1.1.2"
+    CONSTRAINT_LAYOUT_VERSION = "1.1.3"
 }
 
 task clean(type: Delete) {

folioreader/build.gradle

@@ -100,14 +100,12 @@ dependencies {
 
     //Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$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"
 
     implementation 'org.greenrobot:eventbus:3.1.1'
-    implementation "org.apache.commons:commons-text:1.4"
 }
 apply from: '../folioreader/bintray/bintrayv1.gradle'

folioreader/src/main/java/com/folioreader/ui/folio/adapter/SearchAdapter.kt

@@ -20,7 +20,7 @@ class SearchAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     companion object {
         @JvmField
-        val LOG_TAG: String? = SearchAdapter::class.simpleName
+        val LOG_TAG: String? = SearchAdapter::class.java.simpleName
         const val DATA_BUNDLE = "DATA_BUNDLE"
     }
 

folioreader/src/main/java/com/folioreader/ui/folio/fragment/FolioPageFragment.java

@@ -65,7 +65,6 @@
 import com.folioreader.view.VerticalSeekbar;
 import com.folioreader.view.WebViewPager;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -506,8 +505,8 @@ public void onPageFinished(WebView view, String url) {
             if (mIsPageReloaded) {
 
                 if (searchItemVisible != null) {
-                    String escapedSearchQuery = StringEscapeUtils
-                            .escapeJava(searchItemVisible.getSearchQuery());
+                    String escapedSearchQuery = searchItemVisible.getSearchQuery()
+                            .replace("\"", "\\\"");
                     String call = String.format(getString(R.string.highlight_search_result),
                             escapedSearchQuery, searchItemVisible.getOccurrenceInChapter());
                     mWebview.loadUrl(call);
@@ -537,7 +536,8 @@ public void onPageFinished(WebView view, String url) {
                 highlightId = null;
 
             } else if (searchItemVisible != null) {
-                String escapedSearchQuery = StringEscapeUtils.escapeJava(searchItemVisible.getSearchQuery());
+                String escapedSearchQuery = searchItemVisible.getSearchQuery()
+                        .replace("\"", "\\\"");
                 String call = String.format(getString(R.string.highlight_search_result),
                         escapedSearchQuery, searchItemVisible.getOccurrenceInChapter());
                 mWebview.loadUrl(call);
@@ -1175,7 +1175,7 @@ public void highlightSearchItem(@NonNull SearchItem searchItem) {
 
         if (loadingView != null && loadingView.getVisibility() != View.VISIBLE) {
             loadingView.show();
-            String escapedSearchQuery = StringEscapeUtils.escapeJava(searchItem.getSearchQuery());
+            String escapedSearchQuery = searchItem.getSearchQuery().replace("\"", "\\\"");
             String call = String.format(getString(R.string.highlight_search_result),
                     escapedSearchQuery, searchItem.getOccurrenceInChapter());
             mWebview.loadUrl(call);