mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-22 04:22:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix download and overflow buttons getting pushed to the side

Browse Source
This commit is contained in:
Syer10
2021-06-17 09:34:03 -04:00
parent aad08a0335
commit c5ffdf8360
2 changed files with 124 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/main/kotlin/ca/gosyer/ui/downloads/DownloadsMenu.kt
View File

@@ -7,8 +7,8 @@
package ca.gosyer.ui.downloads package ca.gosyer.ui.downloads
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxHeight
@@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredWidth
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
@@ -94,51 +93,62 @@ private fun downloadsItem(
onDownloadCancel: (Chapter?) -> Unit, onDownloadCancel: (Chapter?) -> Unit,
onMoveDownloadToBottom: (Chapter?) -> Unit onMoveDownloadToBottom: (Chapter?) -> Unit
) { ) {
Row( BoxWithConstraints {
modifier = Modifier.fillMaxWidth() Row(
.height(56.dp) modifier = Modifier.fillMaxWidth()
.padding(vertical = 8.dp), .height(56.dp)
horizontalArrangement = Arrangement.SpaceAround .padding(vertical = 8.dp),
) { horizontalArrangement = Arrangement.SpaceAround
Column(Modifier.fillMaxHeight(), verticalArrangement = Arrangement.SpaceAround) {
Row(Modifier.fillMaxWidth().padding(horizontal = 32.dp), horizontalArrangement = Arrangement.SpaceBetween) {
Text(chapter.chapter?.name.toString(), maxLines = 1, overflow = TextOverflow.Ellipsis)
// Spacer(Modifier.width(16.dp))
if (chapter.chapter?.pageCount != null && chapter.chapter.pageCount != -1) {
Text(
"${(chapter.chapter.pageCount * chapter.progress).toInt()}/${chapter.chapter.pageCount}",
Modifier.padding(start = 16.dp).requiredWidth(IntrinsicSize.Max),
style = MaterialTheme.typography.body2,
color = LocalContentColor.current.copy(alpha = ContentAlpha.disabled),
maxLines = 1,
overflow = TextOverflow.Visible
)
} else {
Spacer(Modifier.width(32.dp))
}
}
Spacer(Modifier.height(4.dp))
LinearProgressIndicator(
chapter.progress,
Modifier.fillMaxWidth()
.padding(start = 32.dp, end = 16.dp, bottom = 8.dp)
)
}
DropdownIconButton(
chapter.mangaId to chapter.chapterIndex,
{
DropdownMenuItem(onClick = { onDownloadCancel(chapter.chapter) }) {
Text("Cancel")
}
DropdownMenuItem(onClick = { onMoveDownloadToBottom(chapter.chapter) }) {
Text("Move to bottom")
}
}
) { ) {
Icon( Column(Modifier.fillMaxHeight().width(this@BoxWithConstraints.maxWidth - 46.dp).padding(horizontal = 32.dp), verticalArrangement = Arrangement.SpaceAround) {
Icons.Default.MoreVert, Row(
null Modifier.fillMaxWidth(),
) horizontalArrangement = Arrangement.SpaceBetween
) {
Text(
chapter.chapter?.name.toString(),
Modifier.width(this@BoxWithConstraints.maxWidth - 200.dp),
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
// Spacer(Modifier.width(16.dp))
if (chapter.chapter?.pageCount != null && chapter.chapter.pageCount != -1) {
Text(
"${(chapter.chapter.pageCount * chapter.progress).toInt()}/${chapter.chapter.pageCount}",
Modifier.padding(horizontal = 8.dp),
style = MaterialTheme.typography.body2,
color = LocalContentColor.current.copy(alpha = ContentAlpha.disabled),
maxLines = 1,
overflow = TextOverflow.Visible
)
} else {
Spacer(Modifier.width(32.dp))
}
}
Spacer(Modifier.height(4.dp))
LinearProgressIndicator(
chapter.progress,
Modifier.fillMaxWidth()
.padding(bottom = 8.dp)
)
}
DropdownIconButton(
chapter.mangaId to chapter.chapterIndex,
{
DropdownMenuItem(onClick = { onDownloadCancel(chapter.chapter) }) {
Text("Cancel")
}
DropdownMenuItem(onClick = { onMoveDownloadToBottom(chapter.chapter) }) {
Text("Move to bottom")
}
}
) {
Icon(
Icons.Default.MoreVert,
null
)
}
} }
} }
} }

123
src/main/kotlin/ca/gosyer/ui/manga/ChapterItem.kt
View File

@@ -8,13 +8,15 @@ package ca.gosyer.ui.manga
import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Card import androidx.compose.material.Card
@@ -39,6 +41,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ca.gosyer.data.download.model.DownloadChapter import ca.gosyer.data.download.model.DownloadChapter
import ca.gosyer.data.download.model.DownloadState import ca.gosyer.data.download.model.DownloadState
@@ -65,7 +68,7 @@ fun ChapterItem(
elevation = 1.dp, elevation = 1.dp,
shape = RoundedCornerShape(4.dp) shape = RoundedCornerShape(4.dp)
) { ) {
Row( BoxWithConstraints(
Modifier.combinedMouseClickable( Modifier.combinedMouseClickable(
onClick = { onClick = {
onClick(chapter.index) onClick(chapter.index)
@@ -80,58 +83,68 @@ fun ChapterItem(
menuItem("Toggle bookmarked") { toggleBookmarked(chapter.index) } menuItem("Toggle bookmarked") { toggleBookmarked(chapter.index) }
} }
} }
), )
horizontalArrangement = Arrangement.SpaceBetween
) { ) {
Column( Row(
Modifier.padding(4.dp) horizontalArrangement = Arrangement.SpaceBetween
) { ) {
Text( Column(
chapter.name, Modifier.padding(4.dp).width(this@BoxWithConstraints.maxWidth - 60.dp)
maxLines = 1, ) {
style = MaterialTheme.typography.h6, Text(
color = LocalContentColor.current.copy( chapter.name,
alpha = if (chapter.read) ContentAlpha.disabled else ContentAlpha.high maxLines = 1,
style = MaterialTheme.typography.h6,
color = LocalContentColor.current.copy(
alpha = if (chapter.read) ContentAlpha.disabled else ContentAlpha.high
),
overflow = TextOverflow.Ellipsis
) )
) val subtitleStr = buildAnnotatedString {
val subtitleStr = buildAnnotatedString { if (chapter.uploadDate > 0) {
if (chapter.uploadDate > 0) { append(format(Instant.ofEpochMilli(chapter.uploadDate)))
append(format(Instant.ofEpochMilli(chapter.uploadDate))) }
} if (!chapter.read && chapter.lastPageRead > 0) {
if (!chapter.read && chapter.lastPageRead > 0) { if (length > 0) append(" • ")
if (length > 0) append(" • ") append(
append( AnnotatedString(
AnnotatedString( "Page " + (chapter.lastPageRead + 1).toString(),
"Page " + (chapter.lastPageRead + 1).toString(), SpanStyle(color = LocalContentColor.current.copy(alpha = ContentAlpha.disabled))
SpanStyle(color = LocalContentColor.current.copy(alpha = ContentAlpha.disabled)) )
) )
}
if (!chapter.scanlator.isNullOrBlank()) {
if (length > 0) append(" • ")
append(chapter.scanlator)
}
}
Text(
subtitleStr,
style = MaterialTheme.typography.body2,
color = LocalContentColor.current.copy(
alpha = if (chapter.read) ContentAlpha.disabled else ContentAlpha.medium
)
)
}
val downloadChapter by viewChapter.downloadChapterFlow.collectAsState()
val downloadState by viewChapter.downloadState.collectAsState()
when (downloadState) {
MangaMenuViewModel.DownloadState.Downloaded -> {
DownloadedIconButton(
chapter.mangaId to chapter.index,
onClick = { deleteDownload(chapter.index) }
) )
} }
if (!chapter.scanlator.isNullOrBlank()) { MangaMenuViewModel.DownloadState.Downloading -> {
if (length > 0) append(" • ") DownloadingIconButton(
append(chapter.scanlator) downloadChapter,
onClick = { stopDownload(chapter.index) }
)
}
MangaMenuViewModel.DownloadState.NotDownloaded -> {
DownloadIconButton(onClick = { downloadAChapter(chapter.index) })
} }
}
Text(
subtitleStr,
style = MaterialTheme.typography.body2,
color = LocalContentColor.current.copy(
alpha = if (chapter.read) ContentAlpha.disabled else ContentAlpha.medium
)
)
}
val downloadChapter by viewChapter.downloadChapterFlow.collectAsState()
val downloadState by viewChapter.downloadState.collectAsState()
when (downloadState) {
MangaMenuViewModel.DownloadState.Downloaded -> {
DownloadedIconButton(chapter.mangaId to chapter.index, onClick = { deleteDownload(chapter.index) })
}
MangaMenuViewModel.DownloadState.Downloading -> {
DownloadingIconButton(downloadChapter, onClick = { stopDownload(chapter.index) })
}
MangaMenuViewModel.DownloadState.NotDownloaded -> {
DownloadIconButton(onClick = { downloadAChapter(chapter.index) })
} }
} }
} }
@@ -152,7 +165,7 @@ private fun DownloadIconButton(onClick: () -> Unit) {
Icons.Default.ArrowDownward, Icons.Default.ArrowDownward,
null, null,
Modifier Modifier
.requiredSize(22.dp) .size(22.dp)
.padding(2.dp), .padding(2.dp),
LocalContentColor.current.copy(alpha = ContentAlpha.disabled) LocalContentColor.current.copy(alpha = ContentAlpha.disabled)
) )
@@ -173,7 +186,7 @@ private fun DownloadingIconButton(downloadChapter: DownloadChapter?, onClick: ()
when (downloadChapter?.state) { when (downloadChapter?.state) {
null, DownloadState.Queued -> CircularProgressIndicator( null, DownloadState.Queued -> CircularProgressIndicator(
Modifier Modifier
.requiredSize(26.dp) .size(26.dp)
.padding(2.dp), .padding(2.dp),
LocalContentColor.current.copy(alpha = ContentAlpha.disabled), LocalContentColor.current.copy(alpha = ContentAlpha.disabled),
2.dp 2.dp
@@ -182,7 +195,7 @@ private fun DownloadingIconButton(downloadChapter: DownloadChapter?, onClick: ()
CircularProgressIndicator( CircularProgressIndicator(
downloadChapter.progress, downloadChapter.progress,
Modifier Modifier
.requiredSize(26.dp) .size(26.dp)
.padding(2.dp), .padding(2.dp),
LocalContentColor.current.copy(alpha = ContentAlpha.disabled), LocalContentColor.current.copy(alpha = ContentAlpha.disabled),
2.dp 2.dp
@@ -191,14 +204,14 @@ private fun DownloadingIconButton(downloadChapter: DownloadChapter?, onClick: ()
Icons.Default.ArrowDownward, Icons.Default.ArrowDownward,
null, null,
Modifier Modifier
.requiredSize(22.dp) .size(22.dp)
.padding(2.dp), .padding(2.dp),
LocalContentColor.current.copy(alpha = ContentAlpha.disabled) LocalContentColor.current.copy(alpha = ContentAlpha.disabled)
) )
} else { } else {
CircularProgressIndicator( CircularProgressIndicator(
Modifier Modifier
.requiredSize(26.dp) .size(26.dp)
.padding(2.dp), .padding(2.dp),
LocalContentColor.current.copy(alpha = ContentAlpha.disabled), LocalContentColor.current.copy(alpha = ContentAlpha.disabled),
2.dp 2.dp
@@ -209,7 +222,7 @@ private fun DownloadingIconButton(downloadChapter: DownloadChapter?, onClick: ()
Icons.Default.Error, Icons.Default.Error,
null, null,
Modifier Modifier
.requiredSize(22.dp) .size(22.dp)
.padding(2.dp), .padding(2.dp),
Color.Red Color.Red
) )
@@ -219,7 +232,7 @@ private fun DownloadingIconButton(downloadChapter: DownloadChapter?, onClick: ()
Icons.Default.Check, Icons.Default.Check,
null, null,
Modifier Modifier
.requiredSize(22.dp) .size(22.dp)
.padding(2.dp), .padding(2.dp),
MaterialTheme.colors.surface MaterialTheme.colors.surface
) )
@@ -243,7 +256,7 @@ private fun DownloadedIconButton(chapter: Pair<Long, Int?>, onClick: () -> Unit)
Icons.Default.Check, Icons.Default.Check,
null, null,
Modifier Modifier
.requiredSize(22.dp) .size(22.dp)
.padding(2.dp), .padding(2.dp),
MaterialTheme.colors.surface MaterialTheme.colors.surface
) )