Remove slf4j from jsonpath

pull/32/head
atbest 6 years ago
parent 225192c3f4
commit 36eb40c813
  1. 5
      app/build.gradle
  2. 2
      app/src/main/java/io/legado/app/utils/StringExtensions.kt
  3. 2
      app/src/main/res/layout/activity_replace_rule.xml
  4. 2
      app/src/main/res/menu/activity_main_drawer.xml
  5. 3
      app/src/main/res/values/strings.xml

@ -77,8 +77,11 @@ dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1'
// //
implementation 'com.google.code.gson:gson:2.8.5' 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.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 //Retrofit
implementation 'com.squareup.okhttp3:logging-interceptor:3.14.0'// implementation 'com.squareup.okhttp3:logging-interceptor:3.14.0'//

@ -1,4 +1,5 @@
package io.legado.app.utils package io.legado.app.utils
// import org.apache.commons.text.StringEscapeUtils
fun String?.strim() = if (this.isNullOrBlank()) null else this.trim() 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 fun String.splitNotBlank(delim: String) = if (!this.contains(delim)) sequenceOf(this) else
this.split(delim).asSequence().map { it.trim() }.filterNot { it.isBlank() } this.split(delim).asSequence().map { it.trim() }.filterNot { it.isBlank() }
// fun String.unescapeJson() = StringEscapeUtils.unescapeJson(this)

@ -23,7 +23,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="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_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.0"/> app:layout_constraintVertical_bias="0.0"/>

@ -11,7 +11,7 @@
<item <item
android:id="@+id/nav_import" android:id="@+id/nav_import"
android:icon="@drawable/ic_menu_gallery" android:icon="@drawable/ic_menu_gallery"
android:title="@string/menu_import"/> android:title="@string/menu_restore"/>
<item <item
android:id="@+id/nav_import_old" android:id="@+id/nav_import_old"
android:icon="@drawable/ic_menu_slideshow" android:icon="@drawable/ic_menu_slideshow"

@ -8,7 +8,7 @@
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="menu_backup">Home</string> <string name="menu_backup">Home</string>
<string name="menu_import">导入</string> <string name="menu_restore">恢复</string>
<string name="menu_import_old">导入阅读数据</string> <string name="menu_import_old">导入阅读数据</string>
<string name="menu_import_github">导入Github数据</string> <string name="menu_import_github">导入Github数据</string>
<string name="menu_replace_rule">净化替换</string> <string name="menu_replace_rule">净化替换</string>
@ -29,4 +29,5 @@
<string name="edit">编辑</string> <string name="edit">编辑</string>
<string name="delete">删除</string> <string name="delete">删除</string>
<string name="replace">净化替换</string> <string name="replace">净化替换</string>
<string name="not_available">暂无</string>
</resources> </resources>

Loading…
Cancel
Save