yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

舍弃原来的主题系统

Browse Source
This commit is contained in:
HapeLee
2025-06-06 05:08:55 +08:00
parent 68dd23b57e
commit 6ed3ef9566
48 changed files with 182 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+1 -1
View File
@@ -49,7 +49,7 @@ android {
defaultConfig {
applicationId "io.legato.kazusa"
minSdk 21
minSdk 24
targetSdk 35
versionCode 10000 + gitCommits
versionName version
app/src/main/java/io/legato/kazusa/ui/association/AddToBookshelfDialog.kt
+3 -2
View File
@@ -6,6 +6,7 @@ import android.content.DialogInterface
import android.os.Bundle
import android.view.View
import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.fragment.app.viewModels
import androidx.lifecycle.MutableLiveData
import io.legato.kazusa.R
@@ -70,9 +71,9 @@ class AddToBookshelfDialog() : BaseDialogFragment(R.layout.dialog_add_to_bookshe
}
viewModel.loadStateLiveData.observe(this) {
if (it) {
binding.rotateLoading.visible()
binding.rotateLoading.isVisible = true
} else {
binding.rotateLoading.gone()
binding.rotateLoading.isVisible = true
}
}
viewModel.loadErrorLiveData.observe(this) {
app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
+3 -2
View File
@@ -9,6 +9,7 @@ import android.widget.ImageButton
import androidx.appcompat.widget.SearchView
import androidx.appcompat.widget.Toolbar
import androidx.core.os.bundleOf
import androidx.core.view.isVisible
import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle.State.STARTED
import androidx.lifecycle.lifecycleScope
@@ -215,7 +216,7 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b
private fun initLiveData() {
viewModel.searchStateData.observe(viewLifecycleOwner) {
//binding.refreshProgressBar.isAutoLoading = it
binding.refreshProgressBar.isVisible = it
if (it) {
startStopMenuItem?.let { item ->
item.setIcon(R.drawable.ic_stop_black_24dp)
@@ -227,7 +228,7 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b
item.setTitle(R.string.refresh)
}
}
binding.toolBar.menu.applyTint(requireContext())
//binding.toolBar.menu.applyTint(requireContext())
}
lifecycleScope.launch {
repeatOnLifecycle(STARTED) {
app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterTocAdapter.kt
+5 -2
View File
@@ -11,6 +11,7 @@ import io.legato.kazusa.lib.theme.ThemeUtils
//import io.legado.app.lib.theme.accentColor
import io.legato.kazusa.utils.getCompatColor
import io.legato.kazusa.utils.gone
import io.legato.kazusa.utils.themeColor
import io.legato.kazusa.utils.visible
class ChangeChapterTocAdapter(context: Context, val callback: Callback) :
@@ -30,11 +31,13 @@ class ChangeChapterTocAdapter(context: Context, val callback: Callback) :
) {
binding.run {
val isDur = durChapterIndex == item.index
if (isDur) {
//tvChapterName.setTextColor(context.accentColor)
tvChapterName.setTextColor(context.themeColor(com.google.android.material.R.attr.colorPrimary))
} else {
tvChapterName.setTextColor(context.getCompatColor(R.color.primaryText))
tvChapterName.setTextColor(context.themeColor(com.google.android.material.R.attr.colorOnSurface))
}
tvChapterName.text = item.title
if (item.isVolume) {
//卷名，如第一卷 突出显示
app/src/main/java/io/legato/kazusa/ui/book/read/page/AutoPager.kt
+5 -2
View File
@@ -1,5 +1,6 @@
package io.legato.kazusa.ui.book.read.page
import android.content.Context
import android.graphics.Canvas
import android.graphics.Paint
import android.os.SystemClock
@@ -10,11 +11,13 @@ import io.legato.kazusa.lib.theme.ThemeStore
import io.legato.kazusa.ui.book.read.page.entities.PageDirection
import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory
import io.legato.kazusa.utils.canvasrecorder.recordIfNeeded
import io.legato.kazusa.utils.themeColor
/**
* 自动翻页
*/
class AutoPager(private val readView: ReadView) {
class AutoPager(
private val readView: ReadView) {
private var progress = 0
var isRunning = false
private set
@@ -28,7 +31,7 @@ class AutoPager(private val readView: ReadView) {
fun start() {
isRunning = true
paint.color = ThemeStore.accentColor
paint.color = readView.context.themeColor(com.google.android.material.R.attr.colorPrimary)
lastTimeMillis = SystemClock.uptimeMillis()
readView.curPage.upSelectAble(false)
readView.invalidate()
app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextLine.kt
+2 -1
View File
@@ -19,6 +19,7 @@ import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider
import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory
import io.legato.kazusa.utils.canvasrecorder.recordIfNeededThenDraw
import io.legato.kazusa.utils.dpToPx
import io.legato.kazusa.utils.themeColor
/**
* 行信息
@@ -173,7 +174,7 @@ data class TextLine(
ChapterProvider.contentPaint
}
val textColor = if (isReadAloud) {
ThemeStore.accentColor
view.context.themeColor(com.google.android.material.R.attr.colorPrimary)
} else {
ReadBookConfig.textColor
}
app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/TextColumn.kt
+2 -1
View File
@@ -9,6 +9,7 @@ import io.legato.kazusa.ui.book.read.page.ContentTextView
import io.legato.kazusa.ui.book.read.page.entities.TextLine
import io.legato.kazusa.ui.book.read.page.entities.TextLine.Companion.emptyTextLine
import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider
import io.legato.kazusa.utils.themeColor
/**
* 文字列
@@ -49,7 +50,7 @@ data class TextColumn(
ChapterProvider.contentPaint
}
val textColor = if (textLine.isReadAloud || isSearchResult) {
ThemeStore.accentColor
view.context.themeColor(com.google.android.material.R.attr.colorPrimary)
} else {
ReadBookConfig.textColor
}
app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentAdapter.kt
+4 -3
View File
@@ -9,13 +9,14 @@ import io.legato.kazusa.databinding.ItemSearchListBinding
//import io.legado.app.lib.theme.accentColor
import io.legato.kazusa.utils.getCompatColor
import io.legato.kazusa.utils.hexString
import io.legato.kazusa.utils.themeColor
class SearchContentAdapter(context: Context, val callback: Callback) :
RecyclerAdapter<SearchResult, ItemSearchListBinding>(context) {
val textColor = context.getCompatColor(R.color.primaryText).hexString.substring(2)
//val accentColor = context.accentColor.hexString.substring(2)
val textColor = context.themeColor(com.google.android.material.R.attr.colorOnSurface).hexString.substring(2)
val accentColor = context.themeColor(com.google.android.material.R.attr.colorPrimary).hexString.substring(2)
override fun getViewBinding(parent: ViewGroup): ItemSearchListBinding {
return ItemSearchListBinding.inflate(inflater, parent, false)
@@ -30,7 +31,7 @@ class SearchContentAdapter(context: Context, val callback: Callback) :
binding.run {
val isDur = callback.durChapterIndex() == item.chapterIndex
if (payloads.isEmpty()) {
//tvSearchResult.text = item.getHtmlCompat(textColor, accentColor)
tvSearchResult.text = item.getHtmlCompat(textColor, accentColor)
tvSearchResult.paint.isFakeBoldText = isDur
}
}
app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter.kt
+3 -2
View File
@@ -17,6 +17,7 @@ import io.legato.kazusa.help.glide.ImageLoader
import io.legato.kazusa.help.glide.OkHttpModelLoader
import io.legato.kazusa.utils.getCompatColor
import io.legato.kazusa.utils.gone
import io.legato.kazusa.utils.themeColor
import io.legato.kazusa.utils.visible
@@ -73,9 +74,9 @@ class RssArticlesAdapter(context: Context, callBack: CallBack) :
}.into(imageView)
}
if (item.read) {
tvTitle.setTextColor(context.getCompatColor(R.color.tv_text_summary))
tvTitle.setTextColor(context.themeColor(com.google.android.material.R.attr.colorOnSurfaceVariant))
} else {
tvTitle.setTextColor(context.getCompatColor(R.color.primaryText))
tvTitle.setTextColor(context.themeColor(com.google.android.material.R.attr.colorOnSurface))
}
}
}
app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter2.kt
+3 -2
View File
@@ -17,6 +17,7 @@ import io.legato.kazusa.help.glide.ImageLoader
import io.legato.kazusa.help.glide.OkHttpModelLoader
import io.legato.kazusa.utils.getCompatColor
import io.legato.kazusa.utils.gone
import io.legato.kazusa.utils.themeColor
import io.legato.kazusa.utils.visible
@@ -73,9 +74,9 @@ class RssArticlesAdapter2(context: Context, callBack: CallBack) :
}.into(imageView)
}
if (item.read) {
tvTitle.setTextColor(context.getCompatColor(R.color.tv_text_summary))
tvTitle.setTextColor(context.themeColor(com.google.android.material.R.attr.colorOnSurfaceVariant))
} else {
tvTitle.setTextColor(context.getCompatColor(R.color.primaryText))
tvTitle.setTextColor(context.themeColor(com.google.android.material.R.attr.colorOnSurface))
}
}
}
app/src/main/java/io/legato/kazusa/ui/widget/DetailSeekBar.kt
+6 -4
View File
@@ -59,13 +59,15 @@ class DetailSeekBar @JvmOverloads constructor(
// binding.tvSeekValue.setTextColor(textColor)
}
binding.ivSeekPlus.setOnClickListener {
binding.slider.value = binding.slider.value + 1
onChanged?.invoke(binding.slider.value.toInt())
val newValue = (binding.slider.value + 1).coerceAtMost(binding.slider.valueTo)
binding.slider.value = newValue
onChanged?.invoke(newValue.toInt())
}
binding.ivSeekReduce.setOnClickListener {
binding.slider.value = binding.slider.value - 1
onChanged?.invoke(binding.slider.value.toInt())
val newValue = (binding.slider.value - 1).coerceAtLeast(binding.slider.valueFrom)
binding.slider.value = newValue
onChanged?.invoke(newValue.toInt())
}
binding.slider.addOnChangeListener { _, value, fromUser ->
app/src/main/java/io/legato/kazusa/ui/widget/image/CircleImageView.kt
+26 -24
View File
@@ -23,6 +23,8 @@ import io.legato.kazusa.utils.spToPx
import kotlin.math.min
import kotlin.math.pow
import androidx.core.graphics.createBitmap
import io.legato.kazusa.utils.themeColor
import androidx.core.content.withStyledAttributes
@Suppress("unused", "MemberVisibilityCanBePrivate")
class CircleImageView @JvmOverloads constructor(
@@ -117,35 +119,35 @@ class CircleImageView @JvmOverloads constructor(
private var text: String? = null
private var textColor = context.getCompatColor(R.color.primaryText)
private var textColor = context.themeColor(com.google.android.material.R.attr.colorOnSurface)
private var textBold = false
var isInView = false
init {
val a = context.obtainStyledAttributes(attrs, R.styleable.CircleImageView)
mBorderWidth =
a.getDimensionPixelSize(
R.styleable.CircleImageView_civ_border_width,
DEFAULT_BORDER_WIDTH
)
mBorderColor =
a.getColor(R.styleable.CircleImageView_civ_border_color, DEFAULT_BORDER_COLOR)
mBorderOverlay =
a.getBoolean(R.styleable.CircleImageView_civ_border_overlay, DEFAULT_BORDER_OVERLAY)
mCircleBackgroundColor =
a.getColor(
R.styleable.CircleImageView_civ_circle_background_color,
DEFAULT_CIRCLE_BACKGROUND_COLOR
)
text = a.getString(R.styleable.CircleImageView_text)
contentDescription = text
if (a.hasValue(R.styleable.CircleImageView_textColor)) {
textColor = a.getColor(
R.styleable.CircleImageView_textColor,
context.getCompatColor(R.color.primaryText)
)
context.withStyledAttributes(attrs, R.styleable.CircleImageView) {
mBorderWidth =
getDimensionPixelSize(
R.styleable.CircleImageView_civ_border_width,
DEFAULT_BORDER_WIDTH
)
mBorderColor =
getColor(R.styleable.CircleImageView_civ_border_color, DEFAULT_BORDER_COLOR)
mBorderOverlay =
getBoolean(R.styleable.CircleImageView_civ_border_overlay, DEFAULT_BORDER_OVERLAY)
mCircleBackgroundColor =
getColor(
R.styleable.CircleImageView_civ_circle_background_color,
DEFAULT_CIRCLE_BACKGROUND_COLOR
)
text = getString(R.styleable.CircleImageView_text)
contentDescription = text
if (hasValue(R.styleable.CircleImageView_textColor)) {
textColor = getColor(
R.styleable.CircleImageView_textColor,
context.themeColor(com.google.android.material.R.attr.colorOnSurface)
)
}
}
a.recycle()
mReady = true
app/src/main/java/io/legato/kazusa/utils/ContextExtensions.kt
+6
View File
@@ -29,6 +29,7 @@ import android.os.BatteryManager
import android.os.Build
import android.os.Process
import android.provider.Settings
import android.util.TypedValue
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
import androidx.core.content.ContextCompat
@@ -417,3 +418,8 @@ val Context.isDebuggable: Boolean
val Context.dataStore by preferencesDataStore(name = "settings")
fun Context.themeColor(attr: Int): Int {
val typedValue = TypedValue()
theme.resolveAttribute(attr, typedValue, true)
return ContextCompat.getColor(this, typedValue.resourceId)
}
app/src/main/res/drawable/ic_fill_colors.xml
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">
<path android:fillColor="@android:color/white" android:pathData="M247,56L304,0L647,343Q670,366 670,400Q670,434 647,457L457,647Q434,670 400,670Q366,670 343,647L153,457Q130,434 130,400Q130,366 153,343L343,152L247,56ZM400,209L209,400Q209,400 209,400Q209,400 209,400L591,400Q591,400 591,400Q591,400 591,400L400,209ZM760,680Q727,680 703.5,656.5Q680,633 680,600Q680,579 692.5,555Q705,531 720,510Q729,498 739,485Q749,472 760,460Q771,472 781,485Q791,498 800,510Q815,531 827.5,555Q840,579 840,600Q840,633 816.5,656.5Q793,680 760,680ZM80,960L80,800L880,800L880,960L80,960Z"/>
</vector>
app/src/main/res/drawable/ic_palette.xml
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">
<path android:fillColor="@android:color/white" android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 112.5,324Q145,251 200.5,197Q256,143 330,111.5Q404,80 488,80Q568,80 639,107.5Q710,135 763.5,183.5Q817,232 848.5,298.5Q880,365 880,442Q880,557 810,618.5Q740,680 640,680L566,680Q557,680 553.5,685Q550,690 550,696Q550,708 565,730.5Q580,753 580,782Q580,832 552.5,856Q525,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM260,520Q286,520 303,503Q320,486 320,460Q320,434 303,417Q286,400 260,400Q234,400 217,417Q200,434 200,460Q200,486 217,503Q234,520 260,520ZM380,360Q406,360 423,343Q440,326 440,300Q440,274 423,257Q406,240 380,240Q354,240 337,257Q320,274 320,300Q320,326 337,343Q354,360 380,360ZM580,360Q606,360 623,343Q640,326 640,300Q640,274 623,257Q606,240 580,240Q554,240 537,257Q520,274 520,300Q520,326 537,343Q554,360 580,360ZM700,520Q726,520 743,503Q760,486 760,460Q760,434 743,417Q726,400 700,400Q674,400 657,417Q640,434 640,460Q640,486 657,503Q674,520 700,520ZM480,800Q489,800 494.5,795Q500,790 500,782Q500,768 485,749Q470,730 470,692Q470,650 499,625Q528,600 570,600L640,600Q706,600 753,561.5Q800,523 800,442Q800,321 707.5,240.5Q615,160 488,160Q352,160 256,253Q160,346 160,480Q160,613 253.5,706.5Q347,800 480,800Z"/>
</vector>
app/src/main/res/layout-land/activity_book_info.xml
-12
View File
@@ -101,7 +101,6 @@
android:includeFontPadding="false"
android:singleLine="true"
android:text="@string/book_name"
android:textColor="@color/primaryText"
android:textSize="18sp"
tools:ignore="RtlHardcoded" />
@@ -141,7 +140,6 @@
android:includeFontPadding="false"
android:singleLine="true"
android:text="@string/author"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
tools:ignore="NestedWeights,TextContrastCheck" />
@@ -204,7 +202,6 @@
android:contentDescription="@string/origin_format"
android:paddingRight="2dp"
android:src="@drawable/ic_web_outline"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -216,7 +213,6 @@
android:includeFontPadding="false"
android:paddingRight="6dp"
android:singleLine="true"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry,TextContrastCheck"
tools:text="@string/origin_format" />
@@ -250,7 +246,6 @@
android:contentDescription="@string/read_dur_progress"
android:paddingRight="2dp"
android:src="@drawable/ic_book_last"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -262,7 +257,6 @@
android:includeFontPadding="false"
android:paddingRight="6dp"
android:singleLine="true"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry,TextContrastCheck"
tools:text="@string/read_dur_progress" />
@@ -283,7 +277,6 @@
android:contentDescription="@string/read_dur_progress"
android:paddingRight="2dp"
android:src="@drawable/ic_groups"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -295,7 +288,6 @@
android:includeFontPadding="false"
android:paddingRight="6dp"
android:singleLine="true"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry,TextContrastCheck"
tools:text="@string/group_s" />
@@ -327,7 +319,6 @@
android:contentDescription="@string/read_dur_progress"
android:paddingRight="2dp"
android:src="@drawable/ic_folder_open"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -339,7 +330,6 @@
android:includeFontPadding="false"
android:paddingRight="6dp"
android:singleLine="true"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry,TextContrastCheck"
tools:text="@string/toc_s" />
@@ -370,7 +360,6 @@
android:paddingLeft="8dp"
android:paddingBottom="8dp"
android:text="@string/book_intro"
android:textColor="@color/secondaryText"
android:textIsSelectable="true"
android:textSize="14sp"
android:visibility="visible"
@@ -398,7 +387,6 @@
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/remove_from_bookshelf"
android:textColor="@color/primaryText"
android:textSize="15sp" />
<io.legato.kazusa.ui.widget.text.AccentBgTextView
app/src/main/res/layout/activity_manga.xml
+2 -5
View File
@@ -53,7 +53,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
app:indicatorColor="@color/white"
app:indicatorSize="36dp"
app:trackCornerRadius="99dp"
app:trackThickness="3dp" />
@@ -63,8 +62,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/loading"
android:textColor="@color/primaryText" />
android:text="@string/loading" />
</LinearLayout>
<LinearLayout
@@ -78,8 +76,7 @@
<TextView
android:id="@+id/tv_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/primaryText" />
android:layout_height="wrap_content" />
<io.legato.kazusa.ui.widget.text.AccentTextView
android:id="@+id/tv_retry"
app/src/main/res/layout/activity_read_record.xml
+5 -7
View File
@@ -16,8 +16,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:paddingHorizontal="16dp">
<TextView
android:id="@+id/tv_book_name"
@@ -25,7 +24,6 @@
android:layout_height="wrap_content"
android:padding="6dp"
android:singleLine="true"
android:textColor="@color/primaryText"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_remove"
app:layout_constraintTop_toTopOf="parent"
@@ -38,20 +36,19 @@
android:layout_height="wrap_content"
android:padding="6dp"
android:singleLine="true"
android:textColor="@color/secondaryText"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_remove"
app:layout_constraintTop_toBottomOf="@id/tv_book_name"
tools:text="readingTime" />
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:padding="6dp"
app:icon="@drawable/ic_clear_all"
android:text="@string/clear"
android:textColor="@color/primaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -62,6 +59,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingHorizontal="16dp"
android:clipToPadding="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
app/src/main/res/layout/activity_search_content.xml
+10 -11
View File
@@ -50,33 +50,32 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@color/primaryText"
android:textSize="12sp" />
<Space
android:layout_width="20dp"
android:layout_height="1dp" />
<androidx.appcompat.widget.AppCompatImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_search_content_top"
android:layout_width="36dp"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_height="36dp"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:contentDescription="@string/go_to_top"
android:src="@drawable/ic_arrow_drop_up"
app:icon="@drawable/ic_arrow_drop_up"
app:iconGravity="textStart"
android:tooltipText="@string/go_to_top"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<androidx.appcompat.widget.AppCompatImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_search_content_bottom"
android:layout_width="36dp"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_height="36dp"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:contentDescription="@string/go_to_bottom"
android:src="@drawable/ic_arrow_drop_down"
app:icon="@drawable/ic_arrow_drop_down"
app:iconGravity="textStart"
android:tooltipText="@string/go_to_bottom"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
</LinearLayout>
app/src/main/res/layout/activity_source_debug.xml
+5 -16
View File
@@ -52,8 +52,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="调试搜索>>输入关键字，如："
android:textColor="@color/secondaryText"
android:text="调试搜索 - 输入关键字，如："
tools:ignore="HardcodedText" />
<LinearLayout
@@ -75,7 +74,6 @@
android:paddingRight="12dp"
android:paddingBottom="4dp"
android:text="我的"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="HardcodedText,UnusedAttribute" />
@@ -93,7 +91,6 @@
android:paddingRight="12dp"
android:paddingBottom="4dp"
android:text="系统"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="HardcodedText,UnusedAttribute" />
</LinearLayout>
@@ -102,8 +99,7 @@
android:id="@+id/text_fx_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="调试发现>>输入发现URL，如："
android:textColor="@color/secondaryText"
android:text="调试发现 - 输入发现URL，如："
tools:ignore="HardcodedText" />
<TextView
@@ -120,15 +116,13 @@
android:paddingRight="12dp"
android:paddingBottom="4dp"
android:text="系统::http://xxx"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="HardcodedText,UnusedAttribute" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="调试详情页>>输入详情页URL，如："
android:textColor="@color/secondaryText"
android:text="调试详情页 - 输入详情页URL，如："
tools:ignore="HardcodedText" />
<TextView
@@ -145,15 +139,13 @@
android:paddingRight="12dp"
android:paddingBottom="4dp"
android:text="https://m.qidian.com/book/1015609210"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="HardcodedText,UnusedAttribute" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="调试目录页>>输入目录页URL，如："
android:textColor="@color/secondaryText"
android:text="调试目录页 - 输入目录页URL，如："
tools:ignore="HardcodedText" />
<TextView
@@ -170,15 +162,13 @@
android:paddingRight="12dp"
android:paddingBottom="4dp"
android:text="++https://www.zhaishuyuan.com/read/30394"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="HardcodedText,UnusedAttribute" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="调试正文页>>输入正文页URL，如："
android:textColor="@color/secondaryText"
android:text="调试正文页 - 输入正文页URL，如："
tools:ignore="HardcodedText" />
<TextView
@@ -195,7 +185,6 @@
android:paddingRight="12dp"
android:paddingBottom="4dp"
android:text="--https://www.zhaishuyuan.com/chapter/30394/20940996"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="HardcodedText,UnusedAttribute" />
app/src/main/res/layout/dialog_add_to_bookshelf.xml
+2 -3
View File
@@ -11,7 +11,6 @@
android:layout_height="wrap_content"
android:padding="18dp"
android:text="@string/add_to_bookshelf"
android:textColor="@color/primaryText"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent" />
@@ -80,10 +79,11 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<io.legato.kazusa.ui.widget.anima.RotateLoading
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/rotate_loading"
android:layout_width="48dp"
android:layout_height="48dp"
android:indeterminate="false"
app:layout_constraintBottom_toBottomOf="@+id/book_info"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -106,7 +106,6 @@
android:layout_height="wrap_content"
android:padding="16dp"
android:text="@string/cancel"
android:textColor="@color/secondaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_ok"
app:layout_constraintTop_toBottomOf="@+id/book_info" />
app/src/main/res/layout/dialog_book_change_source.xml
+1 -3
View File
@@ -10,7 +10,6 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:contentInsetStartWithNavigation="0dp"
app:displayHomeAsUp="false"
@@ -24,7 +23,7 @@
android:indeterminate="true"
app:layout_constraintTop_toBottomOf="@+id/tool_bar" />
<io.legato.kazusa.ui.widget.recycler.scroller.FastScrollRecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -73,5 +72,4 @@
tools:ignore="UnusedAttribute" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/dialog_chapter_change_source.xml
+1 -5
View File
@@ -52,7 +52,6 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@color/primaryText"
android:textSize="12sp" />
<androidx.appcompat.widget.AppCompatImageView
@@ -63,7 +62,6 @@
android:contentDescription="@string/go_to_top"
android:src="@drawable/ic_arrow_drop_up"
android:tooltipText="@string/go_to_top"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<androidx.appcompat.widget.AppCompatImageView
@@ -74,7 +72,6 @@
android:contentDescription="@string/go_to_bottom"
android:src="@drawable/ic_arrow_drop_down"
android:tooltipText="@string/go_to_bottom"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
</LinearLayout>
@@ -98,8 +95,7 @@
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_arrow_down"
app:tint="@color/primaryText" />
android:src="@drawable/ic_arrow_down" />
</FrameLayout>
app/src/main/res/layout/dialog_custom_group.xml
-2
View File
@@ -25,7 +25,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/add_group"
android:textColor="@color/primaryText"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/sw_add_group" />
@@ -35,7 +34,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/custom_group_summary"
android:textColor="@color/secondaryText"
app:layout_constraintTop_toBottomOf="@+id/tv_add_group_title"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/sw_add_group" />
app/src/main/res/layout/dialog_manga_footer_setting.xml
-4
View File
@@ -20,7 +20,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/manga_header_chapter"
android:textColor="@color/primaryText"
android:textSize="14sp" />
<LinearLayout
@@ -58,7 +57,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/manga_header_page"
android:textColor="@color/primaryText"
android:textSize="14sp" />
<LinearLayout
@@ -88,7 +86,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/manga_header_progress"
android:textColor="@color/primaryText"
android:textSize="14sp" />
<LinearLayout
@@ -118,7 +115,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/manga_header_footer"
android:textColor="@color/primaryText"
android:textSize="14sp" />
<RadioGroup
app/src/main/res/layout/dialog_open_url_confirm.xml
+5 -6
View File
@@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_card_view"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
@@ -21,7 +20,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:textColor="@color/primaryText"
android:textSize="16sp" />
<com.google.android.flexbox.FlexboxLayout
@@ -30,18 +28,19 @@
app:flexDirection="row"
app:justifyContent="flex_end">
<io.legato.kazusa.ui.widget.text.AccentTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_marginEnd="8dp"
android:text="@string/cancel" />
<io.legato.kazusa.ui.widget.text.AccentTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
style="@style/Widget.Material3.Button.TonalButton"
android:text="@string/ok" />
</com.google.android.flexbox.FlexboxLayout>
app/src/main/res/layout/dialog_page_key.xml
+4 -9
View File
@@ -47,7 +47,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:textColor="@color/secondaryText"
android:text="@string/page_key_set_help" />
<LinearLayout
@@ -56,37 +55,33 @@
android:layout_margin="5dp"
android:orientation="horizontal">
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_reset"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/selector_fillet_btn_bg"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/reset"
android:textColor="@color/primaryText" />
android:text="@string/reset" />
<Space
android:layout_width="3dp"
android:layout_height="wrap_content" />
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_ok"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/selector_fillet_btn_bg"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/ok"
android:textColor="@color/primaryText" />
android:text="@string/ok" />
</LinearLayout>
app/src/main/res/layout/dialog_read_aloud.xml
-1
View File
@@ -162,7 +162,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingHorizontal="3dp"
android:textColor="@color/primaryText"
android:textSize="14sp" />
<Space
app/src/main/res/layout/dialog_simulated_reading.xml
+12 -37
View File
@@ -5,15 +5,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="20dp"
android:padding="16dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center"
android:orientation="horizontal"
android:padding="16dp">
android:layout_height="wrap_content"
android:gravity="start"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
@@ -21,31 +20,16 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="2dp"
android:text="@string/switch_on"
android:textColor="@color/primaryText"
android:textSize="16sp"
tools:ignore="RtlHardcoded"
android:minWidth="88dp" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="53dp"
android:layout_height="match_parent"
android:gravity="center_vertical">
<com.google.android.material.materialswitch.MaterialSwitch
android:layout_height="wrap_content"
android:id="@+id/sr_enabled"
android:gravity="start|center_vertical"
android:layout_width="wrap_content" />
<androidx.appcompat.widget.SwitchCompat
android:layout_height="wrap_content"
android:id="@+id/sr_enabled"
android:layout_weight="1"
android:gravity="start|center_vertical"
style="@style/Widget.AppCompat.CompoundButton.Switch"
android:layout_width="match_parent"
android:width="20dp" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<View
android:layout_width="0dp"
@@ -58,7 +42,6 @@
android:layout_width="match_parent"
android:layout_height="65dp"
android:orientation="horizontal"
android:padding="16dp"
android:gravity="start|center_vertical">
<TextView
@@ -66,7 +49,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/start_from"
android:textColor="@color/primaryText"
android:textSize="16sp"
android:gravity="center_vertical"
android:minWidth="100dp" />
@@ -98,9 +80,8 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="63dp"
android:gravity="center_horizontal|left"
android:padding="16dp">
android:layout_height="wrap_content"
android:gravity="start">
<LinearLayout
android:orientation="horizontal"
@@ -114,7 +95,6 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="2dp"
android:text="@string/start_chapter"
android:textColor="@color/primaryText"
android:textSize="16sp"
tools:ignore="RtlHardcoded" />
@@ -136,8 +116,6 @@
android:paddingTop="4dp"
android:paddingRight="5dp"
android:paddingBottom="4dp"
android:textColor="@color/primaryText"
android:textCursorDrawable="@drawable/shape_text_cursor"
android:textSize="14sp"
tools:ignore="TouchTargetSizeCheck,TextContrastCheck" />
@@ -151,10 +129,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="25dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="5dp"
android:text="@string/daily_chapters"
android:textColor="@color/primaryText"
android:textSize="16sp" />
<EditText
@@ -173,8 +150,6 @@
android:paddingTop="4dp"
android:paddingRight="5dp"
android:paddingBottom="4dp"
android:textColor="@color/primaryText"
android:textCursorDrawable="@drawable/shape_text_cursor"
android:textSize="14sp"
tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck,TextContrastCheck"
android:textAlignment="center" />
app/src/main/res/layout/dialog_tip_config.xml
+15 -35
View File
@@ -11,7 +11,7 @@
android:orientation="vertical"
android:padding="16dp">
<io.legato.kazusa.ui.widget.text.AccentTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/body_title"
@@ -23,21 +23,21 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<RadioButton
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/rb_title_mode1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dp"
android:text="@string/title_left" />
<RadioButton
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/rb_title_mode2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dp"
android:text="@string/title_center" />
<RadioButton
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/rb_title_mode3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
app:max="100"
app:title="@string/title_margin_bottom" />
<io.legato.kazusa.ui.widget.text.AccentTextView
<TextView
android:id="@+id/tv_header_padding"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -89,15 +89,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/show_hide"
android:textColor="@color/primaryText" />
android:text="@string/show_hide" />
<TextView
android:id="@+id/tv_header_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/show_hide" />
</LinearLayout>
@@ -115,15 +113,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/left"
android:textColor="@color/primaryText" />
android:text="@string/left" />
<TextView
android:id="@+id/tv_header_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/title" />
</LinearLayout>
@@ -141,15 +137,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/middle"
android:textColor="@color/primaryText" />
android:text="@string/middle" />
<TextView
android:id="@+id/tv_header_middle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/title" />
</LinearLayout>
@@ -167,15 +161,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/right"
android:textColor="@color/primaryText" />
android:text="@string/right" />
<TextView
android:id="@+id/tv_header_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/title" />
</LinearLayout>
@@ -199,15 +191,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/show_hide"
android:textColor="@color/primaryText" />
android:text="@string/show_hide" />
<TextView
android:id="@+id/tv_footer_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/show_hide" />
</LinearLayout>
@@ -225,15 +215,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/left"
android:textColor="@color/primaryText" />
android:text="@string/left" />
<TextView
android:id="@+id/tv_footer_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/title" />
</LinearLayout>
@@ -251,15 +239,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/middle"
android:textColor="@color/primaryText" />
android:text="@string/middle" />
<TextView
android:id="@+id/tv_footer_middle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/title" />
</LinearLayout>
@@ -277,15 +263,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/right"
android:textColor="@color/primaryText" />
android:text="@string/right" />
<TextView
android:id="@+id/tv_footer_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/title" />
</LinearLayout>
@@ -309,15 +293,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/text_color"
android:textColor="@color/primaryText" />
android:text="@string/text_color" />
<TextView
android:id="@+id/tv_tip_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/text_color" />
</LinearLayout>
@@ -335,15 +317,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="6dp"
android:text="@string/tip_divider_color"
android:textColor="@color/primaryText" />
android:text="@string/tip_divider_color" />
<TextView
android:id="@+id/tv_tip_divider_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
tools:text="@string/tip_divider_color" />
</LinearLayout>
app/src/main/res/layout/fragment_bookshelf1.xml
+2 -1
View File
@@ -10,6 +10,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.CollapsingToolbarLayout
@@ -34,7 +35,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:background="@color/transparent"
android:background="?attr/colorSurface"
tools:ignore="RtlSymmetry" />
</com.google.android.material.appbar.AppBarLayout>
app/src/main/res/layout/item_1line_text.xml
+1 -2
View File
@@ -14,7 +14,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true"
android:textColor="@color/primaryText" />
android:singleLine="true" />
</LinearLayout>
app/src/main/res/layout/item_book_file_import.xml
+1 -2
View File
@@ -4,13 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
android:padding="16dp">
<TextView
android:id="@+id/cb_file_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/primaryText"
android:textSize="14sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app/src/main/res/layout/item_bookshelf_grid_group.xml
-1
View File
@@ -68,7 +68,6 @@
android:includeFontPadding="false"
android:lines="2"
android:text="@string/book_name"
android:textColor="@color/primaryText"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
app/src/main/res/layout/item_bookshelf_list.xml
-8
View File
@@ -68,7 +68,6 @@
android:scrollbars="none"
android:singleLine="true"
android:text="@string/book_name"
android:textColor="@color/primaryText"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/tv_author"
app:layout_constraintLeft_toRightOf="@+id/iv_cover"
@@ -88,7 +87,6 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_author"
app:layout_constraintLeft_toLeftOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="@+id/tv_author"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -101,7 +99,6 @@
android:scrollbars="none"
android:singleLine="true"
android:text="@string/author"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@+id/tv_read"
app:layout_constraintLeft_toRightOf="@+id/iv_author"
@@ -119,7 +116,6 @@
android:scrollbars="none"
android:singleLine="true"
android:text=""
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@+id/tv_read"
app:layout_constraintHorizontal_bias="0.0"
@@ -140,7 +136,6 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_read"
app:layout_constraintLeft_toLeftOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="@+id/tv_read"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -151,7 +146,6 @@
android:scrollbars="none"
android:singleLine="true"
android:text="@string/read_dur_progress"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@id/tv_last"
app:layout_constraintLeft_toRightOf="@+id/iv_read"
@@ -171,7 +165,6 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_last"
app:layout_constraintLeft_toLeftOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="@+id/tv_last"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -182,7 +175,6 @@
android:scrollbars="none"
android:singleLine="true"
android:text="@string/lasted_show"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/iv_last"
app/src/main/res/layout/item_bookshelf_list_group.xml
-7
View File
@@ -63,7 +63,6 @@
android:paddingLeft="2dp"
android:singleLine="true"
android:text="@string/book_name"
android:textColor="@color/primaryText"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/tv_author"
app:layout_constraintLeft_toRightOf="@+id/iv_cover"
@@ -82,7 +81,6 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_author"
app:layout_constraintLeft_toLeftOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="@+id/tv_author"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -93,7 +91,6 @@
android:maxLines="1"
android:paddingEnd="6dp"
android:text="@string/author"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@+id/tv_read"
app:layout_constraintLeft_toRightOf="@+id/iv_author"
@@ -112,7 +109,6 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_read"
app:layout_constraintLeft_toLeftOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="@+id/tv_read"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -122,7 +118,6 @@
android:includeFontPadding="false"
android:singleLine="true"
android:text="@string/read_dur_progress"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@id/tv_last"
app:layout_constraintLeft_toRightOf="@+id/iv_read"
@@ -141,7 +136,6 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_last"
app:layout_constraintLeft_toLeftOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="@+id/tv_last"
app:tint="@color/tv_text_summary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
@@ -151,7 +145,6 @@
android:layout_marginBottom="8dp"
android:singleLine="true"
android:text="@string/lasted_show"
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/iv_last"
app/src/main/res/layout/item_change_source.xml
+2 -7
View File
@@ -5,7 +5,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
tools:ignore="RtlHardcoded,RtlSymmetry">
tools:ignore="RtlHardcoded,RtlSymmetry"
android:paddingHorizontal="16dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_good"
@@ -41,7 +42,6 @@
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:singleLine="true"
android:textColor="@color/primaryText"
tools:text="bookSourceName"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_author"
@@ -55,7 +55,6 @@
android:maxWidth="160dp"
android:singleLine="true"
tools:text="author"
android:textColor="@color/secondaryText"
app:layout_constraintRight_toLeftOf="@+id/iv_checked"
app:layout_constraintTop_toTopOf="parent" />
@@ -67,7 +66,6 @@
android:layout_marginBottom="10dp"
android:singleLine="true"
tools:text="latest chapter name"
android:textColor="@color/secondaryText"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/iv_checked"
app:layout_constraintTop_toBottomOf="@+id/tv_origin" />
@@ -80,7 +78,6 @@
android:layout_marginBottom="10dp"
android:singleLine="false"
tools:text="word count"
android:textColor="@color/secondaryText"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/iv_checked"
app:layout_constraintTop_toBottomOf="@+id/tv_last" />
@@ -93,7 +90,6 @@
android:layout_marginBottom="10dp"
android:singleLine="false"
tools:text="respond time"
android:textColor="@color/secondaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/iv_checked"
@@ -111,7 +107,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@color/primaryText"
tools:visibility="visible" />
app/src/main/res/layout/item_cover.xml
-1
View File
@@ -25,7 +25,6 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/book_source"
android:textColor="@color/primaryText"
android:textSize="16sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
app/src/main/res/layout/item_import_book.xml
+1 -2
View File
@@ -27,8 +27,7 @@
android:layout_height="match_parent"
android:scaleType="center"
android:visibility="invisible"
android:src="@drawable/ic_folder"
app:tint="@color/primaryText" />
android:src="@drawable/ic_folder" />
</FrameLayout>
<LinearLayout
app/src/main/res/layout/item_rss_article_1.xml
-1
View File
@@ -27,7 +27,6 @@
android:maxLines="2"
android:ellipsize="end"
android:text="@string/app_name"
android:textColor="@color/primaryText"
android:textSize="15sp"
android:textStyle="bold"
android:paddingLeft="12dp"
app/src/main/res/layout/item_rss_article_2.xml
-1
View File
@@ -29,7 +29,6 @@
android:maxLines="2"
android:ellipsize="end"
android:text="@string/app_name"
android:textColor="@color/primaryText"
android:textSize="13sp"
android:paddingTop="10dp"
app:layout_constraintTop_toBottomOf="@+id/image_view"
app/src/main/res/layout/item_rss_source.xml
+2 -4
View File
@@ -14,8 +14,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:singleLine="true"
android:textColor="@color/primaryText" />
android:singleLine="true" />
<io.legato.kazusa.lib.theme.view.ThemeSwitch
android:id="@+id/swt_enabled"
@@ -35,7 +34,7 @@
android:contentDescription="@string/edit"
android:padding="6dp"
android:src="@drawable/ic_edit"
android:tint="@color/primaryText" />
/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_menu_more"
@@ -45,7 +44,6 @@
android:contentDescription="@string/more_menu"
android:padding="6dp"
android:src="@drawable/ic_more_vert"
android:tint="@color/primaryText"
tools:ignore="RtlHardcoded" />
</LinearLayout>
app/src/main/res/layout/item_search_list.xml
+3 -7
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
@@ -10,10 +10,6 @@
<TextView
android:id="@+id/tv_search_result"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="false"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="parent" />
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
app/src/main/res/layout/item_theme_config.xml
-3
View File
@@ -15,7 +15,6 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="1"
android:textColor="@color/primaryText"
android:textSize="16sp"
tools:text="theme" />
@@ -29,7 +28,6 @@
android:padding="6dp"
android:tooltipText="@string/edit"
android:src="@drawable/ic_share"
android:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<androidx.appcompat.widget.AppCompatImageView
@@ -41,7 +39,6 @@
android:tooltipText="@string/delete"
android:padding="6dp"
android:src="@drawable/ic_clear_all"
android:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
</LinearLayout>
app/src/main/res/layout/item_toc_regex.xml
-2
View File
@@ -36,7 +36,6 @@
android:contentDescription="@string/edit"
android:padding="6dp"
android:src="@drawable/ic_edit"
android:tint="@color/primaryText"
android:tooltipText="@string/edit"
app:layout_constraintBottom_toTopOf="@id/title_example"
app:layout_constraintRight_toLeftOf="@id/iv_delete"
@@ -51,7 +50,6 @@
android:contentDescription="@string/delete"
android:padding="6dp"
android:src="@drawable/ic_clear_all"
android:tint="@color/primaryText"
android:tooltipText="@string/delete"
app:layout_constraintBottom_toTopOf="@id/title_example"
app:layout_constraintRight_toRightOf="parent"
app/src/main/res/layout/view_detail_seek_bar.xml
+4 -7
View File
@@ -12,7 +12,6 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="seek"
android:textColor="@color/primaryText"
tools:ignore="HardcodedText" />
<androidx.appcompat.widget.AppCompatImageView
@@ -21,8 +20,7 @@
android:layout_height="24dp"
android:contentDescription="@string/reduce"
android:src="@drawable/ic_reduce"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:tint="@color/primaryText" />
android:background="?android:attr/selectableItemBackgroundBorderless" />
<io.legato.kazusa.lib.theme.view.ThemeSlider
android:id="@+id/slider"
@@ -39,16 +37,15 @@
android:contentDescription="@string/plus"
android:src="@drawable/ic_add"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:tint="@color/primaryText" />
/>
<TextView
android:id="@+id/tv_seek_value"
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="right"
android:gravity="end"
android:singleLine="true"
android:text="0"
android:textColor="@color/primaryText"
tools:ignore="HardcodedText,RtlHardcoded" />
/>
</LinearLayout>
app/src/main/res/layout/view_search_menu.xml
+25 -31
View File
@@ -23,7 +23,6 @@
android:contentDescription="上个结果"
android:rotation="180"
android:src="@drawable/ic_arrow_right"
android:tint="@color/primaryText"
android:tooltipText="@string/search_content"
app:elevation="2dp"
app:fabSize="mini"
@@ -40,7 +39,6 @@
android:layout_margin="16dp"
android:contentDescription="下个结果"
android:src="@drawable/ic_arrow_right"
android:tint="@color/primaryText"
android:tooltipText="@string/search_content"
app:elevation="2dp"
app:fabSize="mini"
@@ -66,28 +64,6 @@
android:paddingLeft="10dp"
android:paddingRight="10dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_search_content_up"
android:layout_width="36dp"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_to_top"
android:src="@drawable/ic_arrow_drop_up"
android:tooltipText="@string/go_to_top"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_search_content_down"
android:layout_width="36dp"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_to_bottom"
android:src="@drawable/ic_arrow_drop_down"
android:tooltipText="@string/go_to_bottom"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<TextView
android:id="@+id/tv_current_search_info"
android:layout_width="0dp"
@@ -99,14 +75,38 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@color/primaryText"
android:textSize="12sp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_search_content_up"
android:layout_width="36dp"
android:layout_height="match_parent"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
app:iconGravity="textStart"
android:contentDescription="@string/go_to_top"
app:icon="@drawable/ic_arrow_drop_up"
android:tooltipText="@string/go_to_top"
android:layout_marginEnd="8dp"
tools:ignore="UnusedAttribute" />
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_search_content_down"
android:layout_width="36dp"
android:layout_height="match_parent"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
app:iconGravity="textStart"
android:contentDescription="@string/go_to_bottom"
app:icon="@drawable/ic_arrow_drop_down"
android:tooltipText="@string/go_to_bottom"
tools:ignore="UnusedAttribute" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_bottom_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
android:baselineAligned="false"
android:orientation="horizontal">
@@ -138,7 +138,6 @@
android:contentDescription="结果"
android:maxHeight="20dp"
android:src="@drawable/ic_toc"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
<TextView
@@ -149,7 +148,6 @@
android:layout_marginTop="3dp"
android:maxLines="1"
android:text="结果"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
@@ -179,7 +177,6 @@
android:contentDescription="@string/main_menu"
android:maxHeight="20dp"
android:src="@drawable/ic_menu"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
<TextView
@@ -190,7 +187,6 @@
android:layout_marginTop="3dp"
android:maxLines="1"
android:text="@string/main_menu"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
@@ -219,7 +215,6 @@
android:contentDescription="退出"
android:maxHeight="20dp"
android:src="@drawable/ic_auto_page_stop"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
<TextView
@@ -230,7 +225,6 @@
android:layout_marginTop="3dp"
android:maxLines="1"
android:text="退出"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
app/src/main/res/values/styles.xml
+2 -2
View File
@@ -74,7 +74,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLightStatusBar">true</item>
<item name="tabStyle">@style/Widget.App.TabLayout</item>
<!-- <item name="collapsingToolbarLayoutStyle">@style/CollapsingToolbar</item>-->
<item name="collapsingToolbarLayoutStyle">@style/CollapsingToolbar</item>
</style>
<style name="Widget.App.TabLayout" parent="Widget.Material3.TabLayout">
@@ -115,7 +115,7 @@
<style name="CollapsingToolbar" parent="Widget.Material3.CollapsingToolbar">
<item name="titleCollapseMode">scale</item>
<item name="contentScrim">?attr/colorSurfaceContainer</item>
<item name="contentScrim">?attr/colorSurface</item>
</style>
<style name="ChapterNameText">