|
@@ -382,6 +382,12 @@ object ReadBookConfig {
|
|
|
config.underline = value
|
|
config.underline = value
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ var underlineHeight: Int
|
|
|
|
|
+ get() = config.underlineHeight
|
|
|
|
|
+ set(value) {
|
|
|
|
|
+ config.underlineHeight = value
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
var dottedLine: Boolean
|
|
var dottedLine: Boolean
|
|
|
get() = config.dottedLine
|
|
get() = config.dottedLine
|
|
|
set(value) {
|
|
set(value) {
|
|
@@ -622,6 +628,9 @@ object ReadBookConfig {
|
|
|
var titleSegFlag: String = "",//分段判断,碰到指定值时分段
|
|
var titleSegFlag: String = "",//分段判断,碰到指定值时分段
|
|
|
var paragraphIndent: String = " ",//段落缩进
|
|
var paragraphIndent: String = " ",//段落缩进
|
|
|
var underline: Boolean = false, //下划线
|
|
var underline: Boolean = false, //下划线
|
|
|
|
|
+ var underlineHeight: Int = 1,
|
|
|
|
|
+ var underlineColor: String = "#3E3D3B",
|
|
|
|
|
+ var underlineColorNight: String = "#ADADAD",
|
|
|
var dottedLine: Boolean = false, //虚线
|
|
var dottedLine: Boolean = false, //虚线
|
|
|
var dottedBase: Float = 6f, //长度
|
|
var dottedBase: Float = 6f, //长度
|
|
|
var dottedRatio: Float = 6f,
|
|
var dottedRatio: Float = 6f,
|
|
@@ -678,6 +687,12 @@ object ReadBookConfig {
|
|
|
@Transient
|
|
@Transient
|
|
|
private var menuAcColorNightInt = -1
|
|
private var menuAcColorNightInt = -1
|
|
|
|
|
|
|
|
|
|
+ @Transient
|
|
|
|
|
+ private var underlineColorInt = -1
|
|
|
|
|
+
|
|
|
|
|
+ @Transient
|
|
|
|
|
+ private var underlineColorNightInt = -1
|
|
|
|
|
+
|
|
|
@Transient
|
|
@Transient
|
|
|
private var initColorInt = false
|
|
private var initColorInt = false
|
|
|
|
|
|
|
@@ -691,6 +706,8 @@ object ReadBookConfig {
|
|
|
menuBgColorNightInt = menuBgColorNight.toColorInt()
|
|
menuBgColorNightInt = menuBgColorNight.toColorInt()
|
|
|
menuAcColorInt = menuAcColor.toColorInt()
|
|
menuAcColorInt = menuAcColor.toColorInt()
|
|
|
menuAcColorNightInt = menuAcColorNight.toColorInt()
|
|
menuAcColorNightInt = menuAcColorNight.toColorInt()
|
|
|
|
|
+ underlineColorInt = underlineColor.toColorInt()
|
|
|
|
|
+ underlineColorNightInt = underlineColorNight.toColorInt()
|
|
|
initColorInt = true
|
|
initColorInt = true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -846,6 +863,27 @@ object ReadBookConfig {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ fun curUnderlineColor(): Int {
|
|
|
|
|
+ return when {
|
|
|
|
|
+ AppConfig.isNightTheme -> underlineColorNightInt
|
|
|
|
|
+ else -> underlineColorInt
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ fun setUnderlineColor(bg: Int) {
|
|
|
|
|
+ when {
|
|
|
|
|
+ AppConfig.isNightTheme -> {
|
|
|
|
|
+ underlineColorNight = "#${bg.hexString}"
|
|
|
|
|
+ underlineColorNightInt = bg
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ else -> {
|
|
|
|
|
+ underlineColor = "#${bg.hexString}"
|
|
|
|
|
+ underlineColorInt = bg
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
fun curBgType(): Int {
|
|
fun curBgType(): Int {
|
|
|
return when {
|
|
return when {
|
|
|
AppConfig.isEInkMode -> bgTypeEInk
|
|
AppConfig.isEInkMode -> bgTypeEInk
|