From 36eb40c813ed6700db5a7a7f65bc0d2ae55a6b65 Mon Sep 17 00:00:00 2001 From: atbest Date: Sat, 25 May 2019 06:24:20 -0400 Subject: [PATCH] Remove slf4j from jsonpath --- app/build.gradle | 5 ++++- app/src/main/java/io/legado/app/utils/StringExtensions.kt | 2 ++ app/src/main/res/layout/activity_replace_rule.xml | 2 +- app/src/main/res/menu/activity_main_drawer.xml | 2 +- app/src/main/res/values/strings.xml | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 215af4020..f1c81febc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,8 +77,11 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1' //规则相关 implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.jayway.jsonpath:json-path:2.4.0' implementation 'org.jsoup:jsoup:1.12.1' + // implementation 'org.apache.commons:commons-text:1.6' + // Default json parser for jsonpath + implementation 'net.minidev:json-smart:2.3' + // implementation 'com.jayway.jsonpath:json-path:2.4.0' //Retrofit implementation 'com.squareup.okhttp3:logging-interceptor:3.14.0'// diff --git a/app/src/main/java/io/legado/app/utils/StringExtensions.kt b/app/src/main/java/io/legado/app/utils/StringExtensions.kt index cf1f1c4c3..227dff7ec 100644 --- a/app/src/main/java/io/legado/app/utils/StringExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/StringExtensions.kt @@ -1,4 +1,5 @@ package io.legado.app.utils +// import org.apache.commons.text.StringEscapeUtils fun String?.strim() = if (this.isNullOrBlank()) null else this.trim() @@ -8,3 +9,4 @@ fun String.isAbsUrl() = this.startsWith("http://", true) fun String.splitNotBlank(delim: String) = if (!this.contains(delim)) sequenceOf(this) else this.split(delim).asSequence().map { it.trim() }.filterNot { it.isBlank() } +// fun String.unescapeJson() = StringEscapeUtils.unescapeJson(this) \ No newline at end of file diff --git a/app/src/main/res/layout/activity_replace_rule.xml b/app/src/main/res/layout/activity_replace_rule.xml index 5c5d4849e..d2d3d92e8 100644 --- a/app/src/main/res/layout/activity_replace_rule.xml +++ b/app/src/main/res/layout/activity_replace_rule.xml @@ -23,7 +23,7 @@ android:layout_marginBottom="8dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/titleBar" + app:layout_constraintTop_toBottomOf="@+id/title_bar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintVertical_bias="0.0"/> diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 3a491985e..665919c41 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -11,7 +11,7 @@ + android:title="@string/menu_restore"/> Settings Home - 导入 + 恢复 导入阅读数据 导入Github数据 净化替换 @@ -29,4 +29,5 @@ 编辑 删除 净化替换 + 暂无