Unify layout for new update and crash screens

This commit is contained in:
arkon 2022-12-30 23:14:29 -05:00
parent bbf5817805
commit 01ec26842d
7 changed files with 232 additions and 198 deletions

View File

@ -0,0 +1,141 @@
package eu.kanade.presentation.components
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Newspaper
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBarDefaults
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import eu.kanade.presentation.theme.TachiyomiTheme
import eu.kanade.presentation.util.ThemePreviews
import eu.kanade.presentation.util.padding
import eu.kanade.presentation.util.secondaryItemAlpha
@Composable
fun InfoScaffold(
icon: ImageVector,
headingText: String,
subtitleText: String,
acceptText: String,
onAcceptClick: () -> Unit,
rejectText: String,
onRejectClick: () -> Unit,
content: @Composable ColumnScope.() -> Unit,
) {
Scaffold(
bottomBar = {
val strokeWidth = Dp.Hairline
val borderColor = MaterialTheme.colorScheme.outline
Column(
modifier = Modifier
.background(MaterialTheme.colorScheme.background)
.drawBehind {
drawLine(
borderColor,
Offset(0f, 0f),
Offset(size.width, 0f),
strokeWidth.value,
)
}
.windowInsetsPadding(NavigationBarDefaults.windowInsets)
.padding(
horizontal = MaterialTheme.padding.medium,
vertical = MaterialTheme.padding.small,
),
) {
androidx.compose.material3.Button(
modifier = Modifier.fillMaxWidth(),
onClick = onAcceptClick,
) {
Text(text = acceptText)
}
OutlinedButton(
modifier = Modifier.fillMaxWidth(),
onClick = onRejectClick,
) {
Text(text = rejectText)
}
}
},
) { paddingValues ->
// Status bar scrim
Box(
modifier = Modifier
.zIndex(2f)
.secondaryItemAlpha()
.background(MaterialTheme.colorScheme.background)
.fillMaxWidth()
.height(paddingValues.calculateTopPadding()),
)
Column(
modifier = Modifier
.verticalScroll(rememberScrollState())
.fillMaxWidth()
.padding(paddingValues)
.padding(top = 48.dp)
.padding(horizontal = MaterialTheme.padding.medium),
) {
Icon(
imageVector = icon,
contentDescription = null,
modifier = Modifier
.padding(bottom = MaterialTheme.padding.small)
.size(48.dp),
tint = MaterialTheme.colorScheme.primary,
)
Text(
text = headingText,
style = MaterialTheme.typography.headlineLarge,
)
Text(
text = subtitleText,
modifier = Modifier
.secondaryItemAlpha()
.padding(vertical = MaterialTheme.padding.small),
style = MaterialTheme.typography.titleSmall,
)
content()
}
}
}
@ThemePreviews
@Composable
private fun InfoScaffoldPreview() {
TachiyomiTheme {
InfoScaffold(
icon = Icons.Outlined.Newspaper,
headingText = "Heading",
subtitleText = "Subtitle",
acceptText = "Accept",
onAcceptClick = {},
rejectText = "Reject",
onRejectClick = {},
) {
Text("Hello world")
}
}
}

View File

@ -1,37 +1,22 @@
package eu.kanade.presentation.crash package eu.kanade.presentation.crash
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.BugReport import androidx.compose.material.icons.outlined.BugReport
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
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.draw.drawBehind
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp import eu.kanade.presentation.components.InfoScaffold
import androidx.compose.ui.unit.dp import eu.kanade.presentation.theme.TachiyomiTheme
import eu.kanade.presentation.util.ThemePreviews
import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.padding
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.util.CrashLogUtil import eu.kanade.tachiyomi.util.CrashLogUtil
@ -44,82 +29,41 @@ fun CrashScreen(
) { ) {
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val context = LocalContext.current val context = LocalContext.current
Scaffold(
contentWindowInsets = WindowInsets.systemBars, InfoScaffold(
bottomBar = { icon = Icons.Outlined.BugReport,
val strokeWidth = Dp.Hairline headingText = stringResource(R.string.crash_screen_title),
val borderColor = MaterialTheme.colorScheme.outline subtitleText = stringResource(R.string.crash_screen_description, stringResource(R.string.app_name)),
Column( acceptText = stringResource(R.string.pref_dump_crash_logs),
modifier = Modifier onAcceptClick = {
.background(MaterialTheme.colorScheme.surface) scope.launch {
.drawBehind { CrashLogUtil(context).dumpLogs()
drawLine(
borderColor,
Offset(0f, 0f),
Offset(size.width, 0f),
strokeWidth.value,
)
}
.padding(WindowInsets.navigationBars.asPaddingValues())
.padding(horizontal = MaterialTheme.padding.medium, vertical = MaterialTheme.padding.small),
verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
) {
Button(
onClick = {
scope.launch {
CrashLogUtil(context).dumpLogs()
}
},
modifier = Modifier.fillMaxWidth(),
) {
Text(text = stringResource(R.string.pref_dump_crash_logs))
}
OutlinedButton(
onClick = onRestartClick,
modifier = Modifier.fillMaxWidth(),
) {
Text(text = stringResource(R.string.crash_screen_restart_application))
}
} }
}, },
) { paddingValues -> rejectText = stringResource(R.string.crash_screen_restart_application),
Column( onRejectClick = onRestartClick,
) {
Box(
modifier = Modifier modifier = Modifier
.verticalScroll(rememberScrollState()) .padding(vertical = MaterialTheme.padding.small)
.padding(paddingValues) .clip(MaterialTheme.shapes.small)
.padding(top = 56.dp) .fillMaxWidth()
.padding(horizontal = MaterialTheme.padding.medium), .background(MaterialTheme.colorScheme.surfaceVariant),
horizontalAlignment = Alignment.CenterHorizontally,
) { ) {
Icon(
imageVector = Icons.Outlined.BugReport,
contentDescription = null,
modifier = Modifier
.size(64.dp),
)
Text( Text(
text = stringResource(R.string.crash_screen_title), text = exception.toString(),
style = MaterialTheme.typography.titleLarge,
)
Text(
text = stringResource(R.string.crash_screen_description, stringResource(R.string.app_name)),
modifier = Modifier modifier = Modifier
.padding(vertical = MaterialTheme.padding.small), .padding(all = MaterialTheme.padding.small),
color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
Box(
modifier = Modifier
.padding(vertical = MaterialTheme.padding.small)
.clip(MaterialTheme.shapes.small)
.fillMaxWidth()
.background(MaterialTheme.colorScheme.surfaceVariant),
) {
Text(
text = exception.toString(),
modifier = Modifier
.padding(all = MaterialTheme.padding.small),
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
} }
} }
} }
@ThemePreviews
@Composable
private fun CrashScreenPreview() {
TachiyomiTheme {
CrashScreen(exception = RuntimeException("Dummy")) {}
}
}

View File

@ -39,6 +39,7 @@ import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.Divider
@ -250,6 +251,7 @@ private fun TrackDetailsItem(
maxLines = 2, maxLines = 2,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center,
) )
} }
} }

View File

@ -1,41 +1,28 @@
package eu.kanade.presentation.more package eu.kanade.presentation.more
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.OpenInNew import androidx.compose.material.icons.filled.OpenInNew
import androidx.compose.material.icons.outlined.NewReleases import androidx.compose.material.icons.outlined.NewReleases
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBarDefaults
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import com.halilibo.richtext.markdown.Markdown import com.halilibo.richtext.markdown.Markdown
import com.halilibo.richtext.ui.RichTextStyle import com.halilibo.richtext.ui.RichTextStyle
import com.halilibo.richtext.ui.material3.Material3RichText import com.halilibo.richtext.ui.material3.Material3RichText
import com.halilibo.richtext.ui.string.RichTextStringStyle import com.halilibo.richtext.ui.string.RichTextStringStyle
import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.InfoScaffold
import eu.kanade.presentation.theme.TachiyomiTheme
import eu.kanade.presentation.util.ThemePreviews
import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.padding
import eu.kanade.presentation.util.secondaryItemAlpha
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
@Composable @Composable
@ -46,98 +33,56 @@ fun NewUpdateScreen(
onRejectUpdate: () -> Unit, onRejectUpdate: () -> Unit,
onAcceptUpdate: () -> Unit, onAcceptUpdate: () -> Unit,
) { ) {
Scaffold( InfoScaffold(
bottomBar = { icon = Icons.Outlined.NewReleases,
val strokeWidth = Dp.Hairline headingText = stringResource(R.string.update_check_notification_update_available),
val borderColor = MaterialTheme.colorScheme.outline subtitleText = versionName,
Column( acceptText = stringResource(id = R.string.update_check_confirm),
modifier = Modifier onAcceptClick = onAcceptUpdate,
.background(MaterialTheme.colorScheme.background) rejectText = stringResource(R.string.action_not_now),
.drawBehind { onRejectClick = onRejectUpdate,
drawLine( ) {
borderColor, Material3RichText(
Offset(0f, 0f),
Offset(size.width, 0f),
strokeWidth.value,
)
}
.windowInsetsPadding(NavigationBarDefaults.windowInsets)
.padding(
horizontal = MaterialTheme.padding.medium,
vertical = MaterialTheme.padding.small,
),
) {
TextButton(
modifier = Modifier.fillMaxWidth(),
onClick = onAcceptUpdate,
) {
Text(text = stringResource(id = R.string.update_check_confirm))
}
TextButton(
modifier = Modifier.fillMaxWidth(),
onClick = onRejectUpdate,
) {
Text(text = stringResource(R.string.action_not_now))
}
}
},
) { paddingValues ->
// Status bar scrim
Box(
modifier = Modifier modifier = Modifier
.zIndex(2f)
.secondaryItemAlpha()
.background(MaterialTheme.colorScheme.background)
.fillMaxWidth() .fillMaxWidth()
.height(paddingValues.calculateTopPadding()), .padding(vertical = MaterialTheme.padding.large),
) style = RichTextStyle(
stringStyle = RichTextStringStyle(
Column( linkStyle = SpanStyle(color = MaterialTheme.colorScheme.primary),
modifier = Modifier
.verticalScroll(rememberScrollState())
.padding(paddingValues)
.padding(top = 48.dp)
.padding(horizontal = MaterialTheme.padding.medium),
) {
Icon(
imageVector = Icons.Outlined.NewReleases,
contentDescription = null,
modifier = Modifier
.padding(bottom = MaterialTheme.padding.small)
.size(48.dp),
tint = MaterialTheme.colorScheme.primary,
)
Text(
text = stringResource(R.string.update_check_notification_update_available),
style = MaterialTheme.typography.headlineLarge,
)
Text(
text = versionName,
modifier = Modifier.secondaryItemAlpha(),
style = MaterialTheme.typography.titleSmall,
)
Material3RichText(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = MaterialTheme.padding.large),
style = RichTextStyle(
stringStyle = RichTextStringStyle(
linkStyle = SpanStyle(color = MaterialTheme.colorScheme.primary),
),
), ),
) { ),
Markdown(content = changelogInfo) ) {
Markdown(content = changelogInfo)
TextButton( TextButton(
onClick = onOpenInBrowser, onClick = onOpenInBrowser,
modifier = Modifier.padding(top = MaterialTheme.padding.small), modifier = Modifier.padding(top = MaterialTheme.padding.small),
) { ) {
Text(text = stringResource(R.string.update_check_open)) Text(text = stringResource(R.string.update_check_open))
Spacer(modifier = Modifier.width(MaterialTheme.padding.tiny)) Spacer(modifier = Modifier.width(MaterialTheme.padding.tiny))
Icon(imageVector = Icons.Default.OpenInNew, contentDescription = null) Icon(imageVector = Icons.Default.OpenInNew, contentDescription = null)
}
} }
} }
} }
} }
@ThemePreviews
@Composable
private fun NewUpdateScreenPreview() {
TachiyomiTheme {
NewUpdateScreen(
versionName = "v0.99.9",
changelogInfo = """
## Yay
Foobar
### More info
- Hello
- World
""".trimIndent(),
onOpenInBrowser = {},
onRejectUpdate = {},
onAcceptUpdate = {},
)
}
}

View File

@ -377,14 +377,13 @@ class Downloader(
} }
val digitCount = (download.pages?.size ?: 0).toString().length.coerceAtLeast(3) val digitCount = (download.pages?.size ?: 0).toString().length.coerceAtLeast(3)
val filename = String.format("%0${digitCount}d", page.number) val filename = String.format("%0${digitCount}d", page.number)
val tmpFile = tmpDir.findFile("$filename.tmp") val tmpFile = tmpDir.findFile("$filename.tmp")
// Delete temp file if it exists. // Delete temp file if it exists
tmpFile?.delete() tmpFile?.delete()
// Try to find the image file. // Try to find the image file
val imageFile = tmpDir.listFiles()?.firstOrNull { it.name!!.startsWith("$filename.") || it.name!!.startsWith("${filename}__001") } val imageFile = tmpDir.listFiles()?.firstOrNull { it.name!!.startsWith("$filename.") || it.name!!.startsWith("${filename}__001") }
// If the image is already downloaded, do nothing. Otherwise download from network // If the image is already downloaded, do nothing. Otherwise download from network
@ -492,7 +491,7 @@ class Downloader(
val imageFile = tmpDir.listFiles()?.firstOrNull { it.name.orEmpty().startsWith(filenamePrefix) } val imageFile = tmpDir.listFiles()?.firstOrNull { it.name.orEmpty().startsWith(filenamePrefix) }
?: throw Error(context.getString(R.string.download_notifier_split_page_not_found, page.number)) ?: throw Error(context.getString(R.string.download_notifier_split_page_not_found, page.number))
// Check if the original page was previously splitted before then skip. // If the original page was previously split, then skip
if (imageFile.name.orEmpty().startsWith("${filenamePrefix}__")) return true if (imageFile.name.orEmpty().startsWith("${filenamePrefix}__")) return true
return try { return try {
@ -521,7 +520,7 @@ class Downloader(
val downloadPageCount = download.pages?.size ?: return val downloadPageCount = download.pages?.size ?: return
// Ensure that all pages has been downloaded // Ensure that all pages has been downloaded
if (download.downloadedImages < downloadPageCount) return if (download.downloadedImages < downloadPageCount) return
// Ensure that the chapter folder has all the pages. // Ensure that the chapter folder has all the pages
val downloadedImagesCount = tmpDir.listFiles().orEmpty().count { val downloadedImagesCount = tmpDir.listFiles().orEmpty().count {
val fileName = it.name.orEmpty() val fileName = it.name.orEmpty()
when { when {
@ -542,7 +541,8 @@ class Downloader(
// download.chapter.toDomainChapter()!!, // download.chapter.toDomainChapter()!!,
// chapterUrl, // chapterUrl,
// ) // )
// Only rename the directory if it's downloaded.
// Only rename the directory if it's downloaded
if (downloadPreferences.saveChaptersAsCBZ().get()) { if (downloadPreferences.saveChaptersAsCBZ().get()) {
archiveChapter(mangaDir, dirname, tmpDir) archiveChapter(mangaDir, dirname, tmpDir)
} else { } else {
@ -621,7 +621,7 @@ class Downloader(
private fun completeDownload(download: Download) { private fun completeDownload(download: Download) {
// Delete successful downloads from queue // Delete successful downloads from queue
if (download.status == Download.State.DOWNLOADED) { if (download.status == Download.State.DOWNLOADED) {
// remove downloaded chapter from queue // Remove downloaded chapter from queue
queue.remove(download) queue.remove(download)
} }
if (areAllDownloadsFinished()) { if (areAllDownloadsFinished()) {

View File

@ -16,6 +16,7 @@ class NewUpdateScreen(
private val releaseLink: String, private val releaseLink: String,
private val downloadLink: String, private val downloadLink: String,
) : Screen { ) : Screen {
@Composable @Composable
override fun Content() { override fun Content() {
val navigator = LocalNavigator.currentOrThrow val navigator = LocalNavigator.currentOrThrow
@ -23,6 +24,7 @@ class NewUpdateScreen(
val changelogInfoNoChecksum = remember { val changelogInfoNoChecksum = remember {
changelogInfo.replace("""---(\R|.)*Checksums(\R|.)*""".toRegex(), "") changelogInfo.replace("""---(\R|.)*Checksums(\R|.)*""".toRegex(), "")
} }
NewUpdateScreen( NewUpdateScreen(
versionName = versionName, versionName = versionName,
changelogInfo = changelogInfoNoChecksum, changelogInfo = changelogInfoNoChecksum,

View File

@ -782,7 +782,7 @@
<string name="not_installed">Not installed</string> <string name="not_installed">Not installed</string>
<!-- Crash screen --> <!-- Crash screen -->
<string name="crash_screen_title">An Unexpected Error Occurred</string> <string name="crash_screen_title">Whoops!</string>
<string name="crash_screen_description">%s ran into an unexpected error. We suggest you screenshot this message, dump the crash logs, and then share it in our support channel on Discord.</string> <string name="crash_screen_description">%s ran into an unexpected error. We suggest you screenshot this message, dump the crash logs, and then share it in our support channel on Discord.</string>
<string name="crash_screen_restart_application">Restart the application</string> <string name="crash_screen_restart_application">Restart the application</string>