Merge pull request #417 from KishanViramgama/master

Update jQuery 3.4.1
FolioReader · Jan 9, 2020 · 2ef9269 · 2ef9269
2 parents 2a3b4d5 + 4138c1d
commit 2ef9269
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 18 deletions.
diff --git a/folioreader/src/main/assets/js/jquery-3.1.1.min.js b/folioreader/src/main/assets/js/jquery-3.1.1.min.js
diff --git a/folioreader/src/main/assets/js/jquery-3.4.1.min.js b/folioreader/src/main/assets/js/jquery-3.4.1.min.js
diff --git a/folioreader/src/main/java/com/folioreader/ui/base/HtmlUtil.java b/folioreader/src/main/java/com/folioreader/ui/base/HtmlUtil.java
@@ -27,7 +27,7 @@ public static String getHtmlContent(Context context, String htmlContent, Config
                 "file:///android_asset/js/jsface.min.js") + "\n";
 
         jsPath = jsPath + String.format(context.getString(R.string.script_tag),
-                "file:///android_asset/js/jquery-3.1.1.min.js") + "\n";
+                "file:///android_asset/js/jquery-3.4.1.min.js") + "\n";
 
         jsPath = jsPath + String.format(context.getString(R.string.script_tag),
                 "file:///android_asset/js/rangy-core.js") + "\n";

diff --git a/folioreader/src/main/java/com/folioreader/ui/fragment/MediaControllerFragment.kt b/folioreader/src/main/java/com/folioreader/ui/fragment/MediaControllerFragment.kt
@@ -83,7 +83,7 @@ class MediaControllerFragment : BottomSheetDialogFragment() {
 
             if (event.action == MotionEvent.ACTION_DOWN) {
                 Log.v(LOG_TAG, "-> onTouch -> touch_outside -> ${getView()}")
-                dialog.hide()
+                dialog!!.hide()
                 visible = false
                 return@setOnTouchListener true
             }
@@ -115,10 +115,10 @@ class MediaControllerFragment : BottomSheetDialogFragment() {
         super.onStart()
         Log.v(LOG_TAG, "-> onStart")
 
-        dialog.setOnKeyListener { _, keyCode, event ->
+        dialog!!.setOnKeyListener { _, keyCode, event ->
             if (event.action == MotionEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
                 Log.v(LOG_TAG, "-> Back button pressed")
-                dialog.hide()
+                dialog!!.hide()
                 visible = false
                 return@setOnKeyListener true
             }
@@ -129,7 +129,7 @@ class MediaControllerFragment : BottomSheetDialogFragment() {
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
 
         if (!visible)
-            dialog.hide()
+            dialog!!.hide()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -155,7 +155,7 @@ class MediaControllerFragment : BottomSheetDialogFragment() {
         visible = true
         if (isAdded) {
             //Log.v(LOG_TAG, "-> Is already added")
-            dialog.show()
+            dialog!!.show()
         } else {
             //Log.v(LOG_TAG, "-> Not added")
             show(fragmentManager, MediaControllerFragment.LOG_TAG)

diff --git a/folioreader/src/main/java/com/folioreader/ui/view/FolioWebView.kt b/folioreader/src/main/java/com/folioreader/ui/view/FolioWebView.kt
@@ -336,7 +336,7 @@ class FolioWebView : WebView {
         val bundle = Bundle()
         bundle.putString(Constants.SELECTED_WORD, selectedText?.trim())
         dictionaryFragment.arguments = bundle
-        dictionaryFragment.show(parentFragment.fragmentManager, DictionaryFragment::class.java.name)
+        dictionaryFragment.show(parentFragment.fragmentManager!!, DictionaryFragment::class.java.name)
     }
 
     private fun onHighlightColorItemsClicked(style: HighlightStyle, isAlreadyCreated: Boolean) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -53,8 +53,8 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$versions.appcompat"
     implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation "androidx.test.ext:junit:1.0.0"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation project(':folioreader')
     //implementation "com.folioreader:folioreader:$versions.folioreaderSdk"
@@ -63,4 +63,12 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson"
     implementation "com.fasterxml.jackson.core:jackson-databind:$versions.jackson"
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$versions.jackson"
+
+    //progressBar error solve
+    configurations.matching { it.name == '_internal_aapt2_binary' }.all { config ->
+        config.resolutionStrategy.eachDependency { details ->
+            details.useVersion("3.3.2-5309881")
+        }
+    }
+
 }
diff --git a/versions.gradle b/versions.gradle
@@ -11,18 +11,18 @@ versions.androidMinSdk = 21
 versions.androidCompileSdk = 28
 versions.androidTargetSdk = 28
 
-versions.androidGradlePlugin = "3.2.1"
+versions.androidGradlePlugin = "3.5.3"
 versions.kotlin = "1.3.11"
 
-versions.appcompat = "1.0.2"
+versions.appcompat = "1.1.0"
 versions.constraintLayout = "1.1.3"
-versions.recyclerview = "1.0.0"
+versions.recyclerview = "1.1.0"
 versions.material = "1.0.0"
 
 versions.retrofit = "2.5.0"
 versions.jackson = "2.9.7"
 versions.gson = "2.8.5"
 
-versions.lifecycle = "2.0.0"
+versions.lifecycle = "2.1.0"
 
 ext.versions = versions