diff --git a/1.jpg b/1.jpg deleted file mode 100644 index 69fade2ec..000000000 Binary files a/1.jpg and /dev/null differ diff --git a/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt index 046c6adea..3c92ab1bc 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt @@ -2,7 +2,6 @@ package io.legato.kazusa.ui.book.info import android.annotation.SuppressLint import android.content.Intent -import android.graphics.Bitmap import android.graphics.Color import android.graphics.RenderEffect import android.graphics.Shader @@ -13,7 +12,6 @@ import android.os.Build import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.view.View import android.widget.CheckBox import android.widget.LinearLayout import androidx.activity.result.contract.ActivityResultContracts @@ -21,9 +19,6 @@ import androidx.activity.viewModels import androidx.core.content.ContextCompat import androidx.lifecycle.lifecycleScope import androidx.palette.graphics.Palette -import com.google.android.material.button.MaterialButton -import com.google.android.material.color.utilities.Hct -import com.google.android.material.color.utilities.SchemeTonalSpot import io.legato.kazusa.R import io.legato.kazusa.base.VMBaseActivity import io.legato.kazusa.constant.BookType @@ -46,10 +41,6 @@ import io.legato.kazusa.help.config.AppConfig import io.legato.kazusa.help.config.LocalConfig import io.legato.kazusa.lib.dialogs.alert import io.legato.kazusa.lib.dialogs.selector -//import io.legado.app.lib.theme.accentColor -//import io.legado.app.lib.theme.backgroundColor -//import io.legado.app.lib.theme.bottomBackground -//import io.legado.app.lib.theme.getPrimaryTextColor import io.legato.kazusa.model.BookCover import io.legato.kazusa.model.remote.RemoteBookWebDav import io.legato.kazusa.ui.about.AppLogDialog @@ -348,8 +339,10 @@ class BookInfoActivity : tvAuthor.text = getString(R.string.author_show, book.getRealAuthor()) tvOrigin.text = getString(R.string.origin_show, book.originName) tvLasted.text = getString(R.string.lasted_show, book.latestChapterTitle) - tvDetail.let { it.text = book.getDisplayIntro() } - llToc.visible(!book.isWebFile) + tvChapter.text = getString(R.string.read_chapter_total, book.totalChapterNum) + tvChapterIndex.text = getString(R.string.read_chapter_index, book.durChapterIndex) + tvDetail.text = book.getDisplayIntro() + tvToc.visible(!book.isWebFile) upTvBookshelf() upKinds(book) upGroup(book.group) @@ -371,9 +364,7 @@ class BookInfoActivity : lbKind.gone() } else { lbKind.visible() - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { - lbKind.setLabels(kinds) - } + lbKind.setLabels(kinds) } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/LabelsBar.kt b/app/src/main/java/io/legato/kazusa/ui/widget/LabelsBar.kt index ff627149a..a8ecda5ae 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/LabelsBar.kt +++ b/app/src/main/java/io/legato/kazusa/ui/widget/LabelsBar.kt @@ -3,9 +3,7 @@ package io.legato.kazusa.ui.widget import android.content.Context import android.content.res.ColorStateList import android.graphics.Color -import android.os.Build import android.util.AttributeSet -import androidx.annotation.RequiresApi import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup import com.google.android.material.color.MaterialColors @@ -19,8 +17,6 @@ class LabelsBar @JvmOverloads constructor( private val unUsedChips = arrayListOf() private val usedChips = arrayListOf() - - @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) fun setLabels(labels: List) { clear() labels.forEach { @@ -28,7 +24,6 @@ class LabelsBar @JvmOverloads constructor( } } - @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) fun setLabels(labels: Array) { setLabels(labels.toList()) } diff --git a/app/src/main/res/drawable/bg_gradient_mask.xml b/app/src/main/res/drawable/bg_gradient_mask.xml index c7dba5bcb..5dfd8cd11 100644 --- a/app/src/main/res/drawable/bg_gradient_mask.xml +++ b/app/src/main/res/drawable/bg_gradient_mask.xml @@ -4,6 +4,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_gradient_mask_land.xml b/app/src/main/res/drawable/bg_gradient_mask_land.xml new file mode 100644 index 000000000..f81651d17 --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_mask_land.xml @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/app/src/main/res/layout-land/activity_book_info.xml b/app/src/main/res/layout-land/activity_book_info.xml index aa03af64d..560bef1ad 100644 --- a/app/src/main/res/layout-land/activity_book_info.xml +++ b/app/src/main/res/layout-land/activity_book_info.xml @@ -22,7 +22,7 @@ @@ -86,7 +86,6 @@ android:id="@+id/tv_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:maxLines="2" android:text="@string/book_name" style="@style/TextAppearance.Material3.ActionBar.Title" tools:ignore="RtlHardcoded" /> @@ -152,7 +151,7 @@ - + android:visibility="visible" /> @@ -195,16 +196,13 @@ + android:orientation="horizontal"> + - - + android:paddingVertical="8dp" + android:paddingHorizontal="2dp" + android:orientation="vertical"> - - - - - - - + - + - + + + + + - + diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index 630038e98..6487c2cf6 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -1,7 +1,6 @@ @@ -9,6 +8,7 @@ android:id="@+id/navigation_rail_view" android:layout_width="wrap_content" android:layout_height="0dp" + android:background="?attr/colorSurfaceContainer" app:menuGravity="center" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml index 61713abb4..0c00de9a4 100644 --- a/app/src/main/res/layout/activity_book_info.xml +++ b/app/src/main/res/layout/activity_book_info.xml @@ -45,7 +45,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - - - - + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> + android:background="?attr/colorSurface" + android:orientation="vertical"> @@ -259,86 +255,68 @@ - - + android:paddingHorizontal="16dp" + android:paddingVertical="8dp" + android:orientation="vertical"> - - - - - - - + - + - + + + + + - + - - - - - + + android:orientation="vertical" + android:gravity="center_horizontal" + android:layout_marginHorizontal="16dp" + android:layout_marginVertical="8dp"> - + + - + android:layout_marginBottom="12dp" + android:hint="@string/book_name"> - + + - - + android:layout_marginBottom="16dp" + android:hint="@string/author"> + + + - @@ -133,11 +138,12 @@ android:layout_height="wrap_content" android:hint="@string/book_intro"> - + android:layout_height="wrap_content" /> + + \ No newline at end of file diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 28a62bebc..239d1d40c 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -84,7 +84,7 @@ 来源:%s 最近:%s 书名 - 最新:%s + 最新 · %s 是否将《%s》放入书架? 共 %s 个文本文件 加载中… @@ -590,7 +590,7 @@ 新建替换 分组 %s - 已读:%s + 在读 · %s 启用发现 禁用发现 启用所选 @@ -686,7 +686,7 @@ 设置分组 查看目录 导航栏阴影 - 当前阴影大小(elevation):%s + 当前阴影大小(elevation): %s 默认 主菜单 点击授予权限 @@ -802,7 +802,7 @@ 自动清除过期搜索数据 超过一天的搜索数据 重新分段 - 样式名称: + 样式名称: 点击右上角文件夹图标,选择文件夹 智能扫描 导入文件名 @@ -1218,4 +1218,7 @@ 隐藏漫画列表标题 刷新发现 图标已修改 + 共 %d 章 + 已读 %d 章 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3118c8731..b4545e5f8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1223,4 +1223,7 @@ 图标已修改 配置替换规则 更多设置 + 共 %d 章 + 已读 %d 章 +