Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修正对话框的错误宽度与滑动指示器 #92

Merged
merged 2 commits into from
Aug 31, 2024
Merged

修正对话框的错误宽度与滑动指示器 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0490520
修正对话框的错误宽度与滑动指示器
dmzz-yyhyy Aug 31, 2024
54bcb79
修改版本号
dmzz-yyhyy Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ android {
minSdk = 24
targetSdk = 34
// 版本号为x.y.z则versionCode为x*1000000+y*10000+z*100+debug版本号(开发需要时迭代, 两位数)
versionCode = 4_04_014
versionCode = 4_04_015
versionName = "0.4.4"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
219 changes: 126 additions & 93 deletions app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/components/Dialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,27 @@ import android.annotation.SuppressLint
import android.content.Intent
import android.net.Uri
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.sizeIn
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Checkbox
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
Expand All @@ -42,13 +46,14 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.unit.times
import androidx.compose.ui.window.Dialog
import androidx.core.content.ContextCompat.startActivity
import dev.jeziellago.compose.markdowntext.MarkdownText
import indi.dmzz_yyhyy.lightnovelreader.BuildConfig
Expand All @@ -67,62 +72,73 @@ fun BaseDialog(
confirmationText: String,
content: @Composable ColumnScope.() -> Unit
) {
AlertDialog(
Dialog(
onDismissRequest = onDismissRequest,
text = {
Column(
) {
Card(
modifier = Modifier
.sizeIn(minWidth = 280.dp, maxWidth = 560.dp),
shape = RoundedCornerShape(28.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh),
) {
Box(Modifier.height(24.dp))
Icon(
modifier = Modifier.size(24.dp).align(Alignment.CenterHorizontally),
painter = icon,
tint = MaterialTheme.colorScheme.secondary,
contentDescription = null
)
Box(Modifier.height(16.dp))
Text(
modifier = Modifier.align(Alignment.CenterHorizontally),
text = title,
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.W400,
)
Box(Modifier.height(16.dp))
Text(
modifier = Modifier
.fillMaxWidth()
.padding(top = 14.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(16.dp)
.sizeIn(minWidth = 280.dp, maxWidth = 560.dp)
.padding(horizontal = 24.dp),
textAlign = TextAlign.Start,
text = description,
style = MaterialTheme.typography.bodyMedium,
fontWeight = FontWeight.W400,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Box(Modifier.height(16.dp))
content.invoke(this)
Row(
modifier = Modifier
.padding(8.dp, 24.dp, 24.dp, 24.dp)
.align(Alignment.End),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
Icon(
modifier = Modifier.size(24.dp),
painter = icon,
tint = MaterialTheme.colorScheme.secondary,
contentDescription = null
)
Text(
text = title,
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.W400,
)
Text(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 24.dp),
text = description,
style = MaterialTheme.typography.bodyMedium,
fontWeight = FontWeight.W400,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Column(
modifier = Modifier
.padding(top = 20.dp)
.wrapContentHeight()
.heightIn(max = 350.dp)
.verticalScroll(state = rememberScrollState())
Box(
Modifier
.padding(12.dp, 10.dp)
.clickable(onClick = onDismissRequest),
) {
content.invoke(this)
Text(
text = dismissText,
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.primary,
)
}
Box(
Modifier
.padding(12.dp, 10.dp)
.clickable(onClick = onConfirmation),
) {
Text(
text = confirmationText,
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.primary,
)
}
}
},
confirmButton = {
TextButton(
onClick = onConfirmation
) {
Text(confirmationText)
}
},
dismissButton = {
TextButton(
onClick = onDismissRequest
) {
Text(dismissText)
}
}
)
}
}


Expand Down Expand Up @@ -224,23 +240,43 @@ fun AddBookToBookshelfDialog(
dismissText = "取消",
confirmationText = "添加至选定分组",
) {
allBookshelf.forEachIndexed { index, bookshelf ->
ListItem(
modifier = Modifier.fillMaxWidth(),
colors = ListItemDefaults.colors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh),
headlineContent = { Text(text = bookshelf.name, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.W400) },
supportingContent = { Text(text = "共 ${bookshelf.allBookIds.size} 本", style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.W400, color = MaterialTheme.colorScheme.onSurfaceVariant) },
trailingContent = {
Checkbox(
checked = selectedBookshelfIds.contains(bookshelf.id),
onCheckedChange = {
if (it) onSelectBookshelf(bookshelf.id) else onDeselectBookshelf(bookshelf.id)
}
)
Column(Modifier.width(IntrinsicSize.Max)) {
allBookshelf.forEachIndexed { index, bookshelf ->
ListItem(
modifier = Modifier
.sizeIn(minWidth = 280.dp, maxWidth = 500.dp)
.fillMaxWidth()
.padding(horizontal = 14.dp),
colors = ListItemDefaults.colors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh),
headlineContent = {
Text(
text = bookshelf.name,
style = MaterialTheme.typography.bodyLarge,
fontWeight = FontWeight.W400
)
},
supportingContent = {
Text(
text = "共 ${bookshelf.allBookIds.size} 本",
style = MaterialTheme.typography.bodyLarge,
fontWeight = FontWeight.W400,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
},
trailingContent = {
Checkbox(
checked = selectedBookshelfIds.contains(bookshelf.id),
onCheckedChange = {
if (it) onSelectBookshelf(bookshelf.id) else onDeselectBookshelf(
bookshelf.id
)
}
)
}
)
if (index != allBookshelf.size - 1) {
HorizontalDivider(Modifier.padding(horizontal = 14.dp))
}
)
if (index != allBookshelf.size - 1) {
HorizontalDivider()
}
}
}
Expand Down Expand Up @@ -269,36 +305,33 @@ fun SliderDialog(
confirmationText = stringResource(R.string.apply),
) {
val sliderPercentage = (value - valueRange.start) / (valueRange.endInclusive - valueRange.start)
var boxWidth by remember { mutableStateOf(0.dp) }
val current = LocalDensity.current
var indicatorWidthDp by remember { mutableStateOf(0F) }

Box(modifier = Modifier
.fillMaxWidth()
.onGloballyPositioned { layoutCoordinates ->
boxWidth = layoutCoordinates.size.width.dp
}
) {
Box(modifier = Modifier
.offset(x = (sliderPercentage * (boxWidth - 170.dp) / 2.8F))
.padding(vertical = 8.dp)
Box(modifier = Modifier.width(350.dp)) {
Box(
modifier = Modifier
.offset(x = ((sliderPercentage * 300 + 25) - (indicatorWidthDp / 2)).dp)
.clip(RoundedCornerShape(64.dp))
.background(MaterialTheme.colorScheme.surfaceContainerHighest)
.padding(12.dp)
) {
Box(
Text(
modifier = Modifier
.clip(RoundedCornerShape(64.dp))
.background(MaterialTheme.colorScheme.surfaceContainerHighest)
.wrapContentWidth()
.padding(12.dp)
) {
Text(
modifier = Modifier.padding(horizontal = 12.dp),
text = value.toInt().toString(),
textAlign = TextAlign.Center,
fontSize = 16.sp
)
}
.onGloballyPositioned { layoutCoordinates ->
with(current) {
indicatorWidthDp = layoutCoordinates.size.width.toDp().value
}
}
.padding(horizontal = 12.dp),
text = value.toInt().toString(),
textAlign = TextAlign.Center,
fontSize = 16.sp
)
}
}
Slider(
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.width(300.dp).align(Alignment.CenterHorizontally),
value = value,
valueRange = valueRange,
steps = steps,
Expand Down
9 changes: 6 additions & 3 deletions app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/components/Filter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.animation.fadeOut
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.FilterChip
Expand All @@ -20,6 +19,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -200,9 +200,12 @@ fun FilterChipsDialog(
confirmationText = stringResource(id = R.string.apply),
) {
FlowRow(
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.align(Alignment.CenterHorizontally)
.padding(horizontal = 33.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp)
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(0.dp),
maxItemsInEachRow = 4
) {
choices.forEach { choice ->
FilterChip(
Expand Down
Loading