Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display the system default font name correctly, set colour on font menu items

Browse Source
This commit is contained in:
Jackson Harper
2023-05-08 15:10:21 +08:00
parent 44309467da
commit e4e153e01f
2 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebPreferencesDialog.kt → android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/ReaderPreferencesView.kt
View File

@ -1,6 +1,5 @@
package app.omnivore.omnivore.ui.reader
import android.util.Log
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.*
@ -24,11 +23,10 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import app.omnivore.omnivore.R
import app.omnivore.omnivore.ui.components.SegmentedControl
import app.omnivore.omnivore.ui.theme.OmnivoreTheme
@Composable
fun WebPreferencesView(webReaderViewModel: WebReaderViewModel) {
fun ReaderPreferencesView(webReaderViewModel: WebReaderViewModel) {
val isDark = isSystemInDarkTheme()
val currentWebPreferences = webReaderViewModel.storedWebPreferences(isDark)
val isFontListExpanded = remember { mutableStateOf(false) }
@ -36,7 +34,7 @@ fun WebPreferencesView(webReaderViewModel: WebReaderViewModel) {
val justifyTextSwitchState = remember { mutableStateOf(currentWebPreferences.prefersJustifyText) }
val selectedWebFontRawValue = remember { mutableStateOf(currentWebPreferences.fontFamily.rawValue) }
val selectedWebFontName = remember { mutableStateOf(currentWebPreferences.fontFamily.displayText) }
var fontSizeSliderValue by remember { mutableStateOf(currentWebPreferences.textFontSize.toFloat()) }
@ -74,24 +72,27 @@ fun WebPreferencesView(webReaderViewModel: WebReaderViewModel) {
// containerColor = Color.Transparent,
),
) {
Text(selectedWebFontRawValue.value)
Text(selectedWebFontName.value)
}
if (isFontListExpanded.value) {
DropdownMenu(
expanded = isFontListExpanded.value,
onDismissRequest = { isFontListExpanded.value = false }
onDismissRequest = { isFontListExpanded.value = false },
) {
WebFont.values().forEach {
DropdownMenuItem(
text = { Text(it.displayText) },
text = {
Text(it.displayText, style = TextStyle(
fontSize = 15.sp,
fontWeight = FontWeight.Normal,
color = Color(red = 137, green = 137, blue = 137)
))
},
onClick = {
webReaderViewModel.applyWebFont(it)
selectedWebFontRawValue.value = it.rawValue
selectedWebFontName.value = it.displayText
isFontListExpanded.value = false
},
colors = MenuDefaults.itemColors(
textColor = Color(red = 137, green = 137, blue = 137),
)
)
}
}

24
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
View File

@ -1,6 +1,5 @@
package app.omnivore.omnivore.ui.reader
import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.view.View
@ -19,7 +18,6 @@ import androidx.compose.material.icons.filled.Home
import androidx.compose.material3.*
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.*
import androidx.compose.runtime.livedata.observeAsState
@ -148,7 +146,7 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
sheetContent = {
if (showWebPreferencesDialog) {
BottomSheetUI("Reader Preferences") {
WebPreferencesView(webReaderViewModel)
ReaderPreferencesView(webReaderViewModel)
}
}
Spacer(modifier = Modifier.weight(1.0F))
@ -282,26 +280,6 @@ fun BottomSheetUI(title: String?, content: @Composable () -> Unit) {
.statusBarsPadding()
) {
Scaffold(
topBar = {
TopAppBar(
title = { Text(title ?: "") },
modifier = Modifier.statusBarsPadding(),
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.background
),
// navigationIcon = {
// IconButton(onClick = {
// onBackPressedDispatcher?.onBackPressed()
// }) {
// Icon(
// imageVector = Icons.Filled.ArrowBack,
// modifier = Modifier,
// contentDescription = "Back"
// )
// }
// }
)
}
) { paddingValues ->
Box(modifier = Modifier
.padding(paddingValues)