diff --git a/CHANGELOG.md b/CHANGELOG.md index e69c436a1..606d1e5e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co ## [Unreleased] ### Changed - Don't prompt users to enable Google Play services if disabled or unavailable ([@leodyversemilla07](https://github.com/leodyversemilla07)) ([#3152](https://github.com/mihonapp/mihon/pull/3152)) +- Make "Support Us" more prominent in More screen ([@AntsyLich](https://github.com/AntsyLich)) ([#3196](https://github.com/mihonapp/mihon/pull/3196)) ### Improved - Show informative error when trying to add unapproved titles to list on MAL ([@MajorTanya](https://github.com/MajorTanya)) ([#3155](https://github.com/mihonapp/mihon/pull/3155)) diff --git a/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt b/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt index 881d96b64..9fae140be 100644 --- a/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt @@ -1,6 +1,7 @@ package eu.kanade.presentation.more import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -15,7 +16,9 @@ import androidx.compose.ui.unit.dp import eu.kanade.tachiyomi.R @Composable -fun LogoHeader() { +fun LogoHeader( + iconPadding: PaddingValues = PaddingValues(), +) { Column( modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally, @@ -25,7 +28,7 @@ fun LogoHeader() { contentDescription = null, tint = MaterialTheme.colorScheme.onSurface, modifier = Modifier - .padding(vertical = 56.dp) + .padding(iconPadding) .size(64.dp), ) diff --git a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt index b40086542..2ec2d8f33 100644 --- a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt @@ -1,10 +1,10 @@ package eu.kanade.presentation.more -import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.HelpOutline import androidx.compose.material.icons.automirrored.outlined.Label -import androidx.compose.material.icons.outlined.AttachMoney +import androidx.compose.material.icons.filled.VolunteerActivism import androidx.compose.material.icons.outlined.CloudOff import androidx.compose.material.icons.outlined.GetApp import androidx.compose.material.icons.outlined.Info @@ -13,10 +13,10 @@ import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.Storage import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.unit.dp import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.tachiyomi.R @@ -45,11 +45,11 @@ fun MoreScreen( val uriHandler = LocalUriHandler.current Scaffold { contentPadding -> - ScrollbarLazyColumn( - modifier = Modifier.padding(contentPadding), - ) { + ScrollbarLazyColumn(contentPadding = contentPadding) { item { - LogoHeader() + LogoHeader( + iconPadding = PaddingValues(vertical = 32.dp), + ) } item { SwitchPreferenceWidget( @@ -132,6 +132,13 @@ fun MoreScreen( onPreferenceClick = onClickSettings, ) } + item { + TextPreferenceWidget( + title = stringResource(MR.strings.label_support_us), + icon = Icons.Default.VolunteerActivism, + onPreferenceClick = { uriHandler.openUri(Constants.URL_DONATE) }, + ) + } item { TextPreferenceWidget( title = stringResource(MR.strings.pref_category_about), @@ -146,13 +153,6 @@ fun MoreScreen( onPreferenceClick = { uriHandler.openUri(Constants.URL_HELP) }, ) } - item { - TextPreferenceWidget( - title = stringResource(MR.strings.label_donate), - icon = Icons.Outlined.AttachMoney, - onPreferenceClick = { uriHandler.openUri(Constants.URL_DONATE) }, - ) - } } } } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt index f1b4adbdc..91e0aaa3e 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt @@ -3,6 +3,7 @@ package eu.kanade.presentation.more.settings.screen.about import android.content.Context import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -85,7 +86,9 @@ object AboutScreen : Screen() { contentPadding = contentPadding, ) { item { - LogoHeader() + LogoHeader( + iconPadding = PaddingValues(vertical = 56.dp), + ) } item { diff --git a/i18n/src/commonMain/moko-resources/base/strings.xml b/i18n/src/commonMain/moko-resources/base/strings.xml index 390ac68ed..c67a037f2 100644 --- a/i18n/src/commonMain/moko-resources/base/strings.xml +++ b/i18n/src/commonMain/moko-resources/base/strings.xml @@ -36,7 +36,7 @@ Extensions Extension info Help - Donate + Support Us Default Warning Auto