diff --git a/app/src/main/java/io/legado/app/model/remote/RemoteBook.kt b/app/src/main/java/io/legado/app/model/remote/RemoteBook.kt index 2485fe0e9..f620b58d5 100644 --- a/app/src/main/java/io/legado/app/model/remote/RemoteBook.kt +++ b/app/src/main/java/io/legado/app/model/remote/RemoteBook.kt @@ -1,6 +1,6 @@ package io.legado.app.model.remote -import com.android.tools.r8.Keep +import androidx.annotation.Keep import io.legado.app.lib.webdav.WebDavFile import io.legado.app.model.localBook.LocalBook diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt index 77759eb26..6a698e5ca 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt @@ -1,6 +1,7 @@ package io.legado.app.ui.book.read.page.entities -import com.android.tools.r8.Keep + +import androidx.annotation.Keep import kotlin.math.min /** diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt index 004de6ab7..8f679a4b8 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt @@ -1,7 +1,7 @@ package io.legado.app.ui.book.read.page.entities import android.text.TextPaint -import com.android.tools.r8.Keep +import androidx.annotation.Keep import io.legado.app.ui.book.read.page.entities.column.BaseColumn import io.legado.app.ui.book.read.page.provider.ChapterProvider import io.legado.app.utils.textHeight diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt index 318cad235..76d9951b6 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt @@ -2,7 +2,7 @@ package io.legado.app.ui.book.read.page.entities import android.text.Layout import android.text.StaticLayout -import com.android.tools.r8.Keep +import androidx.annotation.Keep import io.legado.app.R import io.legado.app.help.config.ReadBookConfig import io.legado.app.model.ReadBook diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPos.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPos.kt index 841be4cd0..d8ec877d0 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPos.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPos.kt @@ -1,6 +1,6 @@ package io.legado.app.ui.book.read.page.entities -import com.android.tools.r8.Keep +import androidx.annotation.Keep /** * 位置信息 diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ButtonColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ButtonColumn.kt index f4ef14a74..63db76675 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ButtonColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ButtonColumn.kt @@ -1,6 +1,6 @@ package io.legado.app.ui.book.read.page.entities.column -import com.android.tools.r8.Keep +import androidx.annotation.Keep /** diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ImageColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ImageColumn.kt index b4c91921e..d372eda21 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ImageColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ImageColumn.kt @@ -1,6 +1,6 @@ package io.legado.app.ui.book.read.page.entities.column -import com.android.tools.r8.Keep +import androidx.annotation.Keep /** * 图片列 diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ReviewColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ReviewColumn.kt index 5b035d20a..89d4b1394 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ReviewColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ReviewColumn.kt @@ -3,7 +3,7 @@ package io.legado.app.ui.book.read.page.entities.column import android.graphics.Canvas import android.graphics.Paint import android.graphics.Path -import com.android.tools.r8.Keep +import androidx.annotation.Keep import io.legado.app.ui.book.read.page.provider.ChapterProvider /** diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/TextColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/TextColumn.kt index b30f8e970..0ffe9d39a 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/TextColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/TextColumn.kt @@ -1,6 +1,6 @@ package io.legado.app.ui.book.read.page.entities.column -import com.android.tools.r8.Keep +import androidx.annotation.Keep /** * 文字列