|
@@ -6,6 +6,7 @@ import android.content.Intent
|
|
|
import android.graphics.Typeface
|
|
import android.graphics.Typeface
|
|
|
import android.os.Handler
|
|
import android.os.Handler
|
|
|
import android.os.Looper
|
|
import android.os.Looper
|
|
|
|
|
+import android.widget.TextView
|
|
|
import androidx.activity.compose.rememberLauncherForActivityResult
|
|
import androidx.activity.compose.rememberLauncherForActivityResult
|
|
|
import androidx.activity.result.contract.ActivityResultContracts
|
|
import androidx.activity.result.contract.ActivityResultContracts
|
|
|
import androidx.compose.animation.AnimatedVisibility
|
|
import androidx.compose.animation.AnimatedVisibility
|
|
@@ -61,6 +62,7 @@ import androidx.compose.ui.Alignment
|
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.Modifier
|
|
|
import androidx.compose.ui.draw.clip
|
|
import androidx.compose.ui.draw.clip
|
|
|
import androidx.compose.ui.graphics.Color
|
|
import androidx.compose.ui.graphics.Color
|
|
|
|
|
+import androidx.compose.ui.graphics.toArgb
|
|
|
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
|
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
|
|
import androidx.compose.ui.platform.LocalContext
|
|
import androidx.compose.ui.platform.LocalContext
|
|
|
import androidx.compose.ui.res.stringArrayResource
|
|
import androidx.compose.ui.res.stringArrayResource
|
|
@@ -90,6 +92,7 @@ import io.legado.app.ui.widget.components.SplicedColumnGroup
|
|
|
import io.legado.app.ui.widget.components.alert.AppAlertDialog
|
|
import io.legado.app.ui.widget.components.alert.AppAlertDialog
|
|
|
import io.legado.app.ui.widget.components.button.series.SmallPlainButton
|
|
import io.legado.app.ui.widget.components.button.series.SmallPlainButton
|
|
|
import io.legado.app.ui.widget.components.card.GlassCard
|
|
import io.legado.app.ui.widget.components.card.GlassCard
|
|
|
|
|
+import io.legado.app.ui.widget.components.card.NormalCard
|
|
|
import io.legado.app.ui.widget.components.dialog.ColorPickerSheet
|
|
import io.legado.app.ui.widget.components.dialog.ColorPickerSheet
|
|
|
import io.legado.app.ui.widget.components.icon.AppIcons
|
|
import io.legado.app.ui.widget.components.icon.AppIcons
|
|
|
import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
|
|
import io.legado.app.ui.widget.components.modalBottomSheet.AppModalBottomSheet
|
|
@@ -797,7 +800,8 @@ fun ThemeConfigScreen(
|
|
|
) {
|
|
) {
|
|
|
fontItems.forEach { fontDoc ->
|
|
fontItems.forEach { fontDoc ->
|
|
|
item {
|
|
item {
|
|
|
- Card(
|
|
|
|
|
|
|
+ val textColor = LegadoTheme.colorScheme.onSurface.toArgb()
|
|
|
|
|
+ NormalCard(
|
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
.fillMaxWidth()
|
|
|
.height(100.dp),
|
|
.height(100.dp),
|
|
@@ -805,15 +809,14 @@ fun ThemeConfigScreen(
|
|
|
ThemeConfig.appFontPath = fontDoc.uri.toString()
|
|
ThemeConfig.appFontPath = fontDoc.uri.toString()
|
|
|
showFontSheet = false
|
|
showFontSheet = false
|
|
|
},
|
|
},
|
|
|
- colors = CardDefaults.cardColors(
|
|
|
|
|
- containerColor = MaterialTheme.colorScheme.surfaceVariant
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ containerColor = LegadoTheme.colorScheme.onSheetContent
|
|
|
) {
|
|
) {
|
|
|
AndroidView(
|
|
AndroidView(
|
|
|
factory = { ctx ->
|
|
factory = { ctx ->
|
|
|
- android.widget.TextView(ctx).apply {
|
|
|
|
|
|
|
+ TextView(ctx).apply {
|
|
|
text = fontDoc.name
|
|
text = fontDoc.name
|
|
|
textSize = 14f
|
|
textSize = 14f
|
|
|
|
|
+ setTextColor(textColor)
|
|
|
gravity = android.view.Gravity.CENTER
|
|
gravity = android.view.Gravity.CENTER
|
|
|
maxLines = 2
|
|
maxLines = 2
|
|
|
ellipsize = android.text.TextUtils.TruncateAt.END
|
|
ellipsize = android.text.TextUtils.TruncateAt.END
|