Minor cleanup/address lint warnings

This commit is contained in:
arkon
2023-12-30 10:30:32 -05:00
parent ccec5c3efe
commit 6bb77bcf1a
30 changed files with 91 additions and 63 deletions
@@ -59,7 +59,7 @@ fun NewUpdateScreen(
modifier = Modifier.padding(top = MaterialTheme.padding.small),
) {
Text(text = stringResource(MR.strings.update_check_open))
Spacer(modifier = Modifier.width(MaterialTheme.padding.tiny))
Spacer(modifier = Modifier.width(MaterialTheme.padding.extraSmall))
Icon(imageVector = Icons.AutoMirrored.Outlined.OpenInNew, contentDescription = null)
}
}
@@ -15,6 +15,7 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import eu.kanade.presentation.theme.TachiyomiTheme
import tachiyomi.i18n.MR
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
internal class GuidesStep(
@@ -29,7 +30,7 @@ internal class GuidesStep(
Column(
modifier = Modifier.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
) {
Text(stringResource(MR.strings.onboarding_guides_new_user, stringResource(MR.strings.app_name)))
Button(
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
@@ -20,6 +21,7 @@ import kotlinx.coroutines.flow.collectLatest
import tachiyomi.domain.storage.service.StoragePreferences
import tachiyomi.i18n.MR
import tachiyomi.presentation.core.components.material.Button
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@@ -40,7 +42,7 @@ internal class StorageStep : OnboardingStep {
Column(
modifier = Modifier.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
) {
Text(
stringResource(
@@ -317,7 +317,7 @@ object SettingsTrackingScreen : SearchableSettings {
)
},
confirmButton = {
Row(horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.tiny)) {
Row(horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall)) {
OutlinedButton(
modifier = Modifier.weight(1f),
onClick = onDismissRequest,
@@ -87,6 +87,8 @@ class CreateBackupScreen : Screen() {
}
}
// TODO: separate sections for library and settings
item {
LabeledCheckbox(
label = stringResource(MR.strings.manga),
@@ -16,6 +16,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import eu.kanade.tachiyomi.util.storage.DiskUtil
import tachiyomi.i18n.MR
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
import tachiyomi.presentation.core.theme.header
import tachiyomi.presentation.core.util.secondaryItemAlpha
@@ -30,7 +31,7 @@ fun StorageInfo(
Column(
modifier = modifier,
verticalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
) {
storages.forEach {
StorageInfo(it)
@@ -50,7 +51,7 @@ private fun StorageInfo(
val totalText = remember(total) { Formatter.formatFileSize(context, total) }
Column(
verticalArrangement = Arrangement.spacedBy(4.dp),
verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
) {
Text(
text = file.absolutePath,
@@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.lazy.LazyItemScope
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.CollectionsBookmark
import androidx.compose.material.icons.outlined.LocalLibrary
@@ -18,10 +18,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import eu.kanade.presentation.more.stats.components.StatsItem
import eu.kanade.presentation.more.stats.components.StatsOverviewItem
import eu.kanade.presentation.more.stats.components.StatsSection
import eu.kanade.presentation.more.stats.data.StatsData
import eu.kanade.presentation.util.toDurationString
import tachiyomi.i18n.MR
import tachiyomi.presentation.core.components.SectionCard
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
import java.util.Locale
@@ -33,9 +33,7 @@ fun StatsScreenContent(
state: StatsScreenState.Success,
paddingValues: PaddingValues,
) {
val statListState = rememberLazyListState()
LazyColumn(
state = statListState,
contentPadding = paddingValues,
verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
) {
@@ -55,7 +53,7 @@ fun StatsScreenContent(
}
@Composable
private fun OverviewSection(
private fun LazyItemScope.OverviewSection(
data: StatsData.Overview,
) {
val none = stringResource(MR.strings.none)
@@ -65,7 +63,7 @@ private fun OverviewSection(
.toDuration(DurationUnit.MILLISECONDS)
.toDurationString(context, fallback = none)
}
StatsSection(MR.strings.label_overview_section) {
SectionCard(MR.strings.label_overview_section) {
Row(
modifier = Modifier.height(IntrinsicSize.Min),
) {
@@ -89,10 +87,10 @@ private fun OverviewSection(
}
@Composable
private fun TitlesStats(
private fun LazyItemScope.TitlesStats(
data: StatsData.Titles,
) {
StatsSection(MR.strings.label_titles_section) {
SectionCard(MR.strings.label_titles_section) {
Row {
StatsItem(
data.globalUpdateItemCount.toString(),
@@ -111,10 +109,10 @@ private fun TitlesStats(
}
@Composable
private fun ChapterStats(
private fun LazyItemScope.ChapterStats(
data: StatsData.Chapters,
) {
StatsSection(MR.strings.chapters) {
SectionCard(MR.strings.chapters) {
Row {
StatsItem(
data.totalChapterCount.toString(),
@@ -133,7 +131,7 @@ private fun ChapterStats(
}
@Composable
private fun TrackerStats(
private fun LazyItemScope.TrackerStats(
data: StatsData.Trackers,
) {
val notApplicable = stringResource(MR.strings.not_applicable)
@@ -145,7 +143,7 @@ private fun TrackerStats(
notApplicable
}
}
StatsSection(MR.strings.label_tracker_section) {
SectionCard(MR.strings.label_tracker_section) {
Row {
StatsItem(
data.trackedTitleCount.toString(),
@@ -1,38 +0,0 @@
package eu.kanade.presentation.more.stats.components
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import dev.icerock.moko.resources.StringResource
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
@Composable
fun StatsSection(
titleRes: StringResource,
content: @Composable () -> Unit,
) {
Text(
modifier = Modifier.padding(horizontal = MaterialTheme.padding.extraLarge),
text = stringResource(titleRes),
style = MaterialTheme.typography.titleSmall,
)
ElevatedCard(
modifier = Modifier
.fillMaxWidth()
.padding(
horizontal = MaterialTheme.padding.medium,
vertical = MaterialTheme.padding.small,
),
shape = MaterialTheme.shapes.extraLarge,
) {
Column(modifier = Modifier.padding(MaterialTheme.padding.medium)) {
content()
}
}
}