diff --git a/app/src/main/java/io/legado/app/help/config/ReadTipConfig.kt b/app/src/main/java/io/legado/app/help/config/ReadTipConfig.kt index cd47805a7..4bed28097 100644 --- a/app/src/main/java/io/legado/app/help/config/ReadTipConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/ReadTipConfig.kt @@ -17,10 +17,11 @@ object ReadTipConfig { const val bookName = 7 const val timeBattery = 8 const val timeBatteryPercentage = 9 + const val totalProgress1 = 10 val tipValues = arrayOf( none, bookName, chapterTitle, time, battery, batteryPercentage, page, - totalProgress, pageAndTotal, timeBattery, timeBatteryPercentage + totalProgress, totalProgress1, pageAndTotal, timeBattery, timeBatteryPercentage ) val tipNames get() = appCtx.resources.getStringArray(R.array.read_tip).toList() diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt index d350b0eca..2721ab709 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt @@ -40,6 +40,7 @@ class PageView(context: Context) : FrameLayout(context) { private var tvBookName: BatteryView? = null private var tvTimeBattery: BatteryView? = null private var tvTimeBatteryP: BatteryView? = null + private var tvTotalProgress1: BatteryView? = null val headerHeight: Int get() { @@ -168,6 +169,12 @@ class PageView(context: Context) : FrameLayout(context) { typeface = ChapterProvider.typeface textSize = 12f } + tvTotalProgress1 = getTipView(ReadTipConfig.totalProgress1)?.apply { + tag = ReadTipConfig.totalProgress1 + isBattery = false + typeface = ChapterProvider.typeface + textSize = 12f + } tvPageAndTotal = getTipView(ReadTipConfig.pageAndTotal)?.apply { tag = ReadTipConfig.pageAndTotal isBattery = false @@ -295,6 +302,7 @@ class PageView(context: Context) : FrameLayout(context) { tvTitle?.text = textPage.title tvPage?.text = "${index.plus(1)}/$pageSize" tvTotalProgress?.text = readProgress + tvTotalProgress1?.text = "${textPage.chapterIndex.plus(1)}/${textPage.chapterSize}" tvPageAndTotal?.text = "${index.plus(1)}/$pageSize $readProgress" } diff --git a/app/src/main/res/values-es-rES/arrays.xml b/app/src/main/res/values-es-rES/arrays.xml index d0b8c0979..8640121d2 100644 --- a/app/src/main/res/values-es-rES/arrays.xml +++ b/app/src/main/res/values-es-rES/arrays.xml @@ -92,7 +92,8 @@ Batería Batería% Páginas - Avance + Avance(%) + Avance(xx/yyy) Páginas y avance Tiempo y Batería Tiempo y Batería% diff --git a/app/src/main/res/values-pt-rBR/arrays.xml b/app/src/main/res/values-pt-rBR/arrays.xml index 987073362..4f3755b82 100644 --- a/app/src/main/res/values-pt-rBR/arrays.xml +++ b/app/src/main/res/values-pt-rBR/arrays.xml @@ -92,7 +92,8 @@ Bateria Bateria% Páginas - Progresso + Progresso(%) + Progresso(xx/yyy) Páginas e progresso Tempo e Bateria Tempo e Bateria% diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml index 0eaf1a340..60863f6cc 100644 --- a/app/src/main/res/values-zh-rHK/arrays.xml +++ b/app/src/main/res/values-zh-rHK/arrays.xml @@ -55,7 +55,8 @@ 電量 電量% 頁數 - 進度 + 進度(%) + 進度(xx/yyy) 頁數同埋進度 時間同埋電量 時間同埋電量% diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml index 1a77821ff..aabcbc23e 100644 --- a/app/src/main/res/values-zh-rTW/arrays.xml +++ b/app/src/main/res/values-zh-rTW/arrays.xml @@ -90,7 +90,8 @@ 電量 電量% 頁數 - 進度 + 進度(%) + 進度(xx/yyy) 頁數及進度 時間及電量 時間及電量% diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml index b29ea4d04..bf705abed 100644 --- a/app/src/main/res/values-zh/arrays.xml +++ b/app/src/main/res/values-zh/arrays.xml @@ -77,7 +77,8 @@ 电量 电量% 页数 - 进度 + 进度(%) + 进度(xx/yyy) 页数及进度 时间及电量 时间及电量% diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 21c0e25ab..9d79595a9 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -112,7 +112,8 @@ Battery Battery% Pages - Progress + Progress(%) + Progress(xx/yyy) Pages and progress Time and Battery Time and Battery%