Skip to content

Fix colors on More tab #270

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

Merged
Shinokuni merged 1 commit into from
Feb 15, 2025
Merged

Fix colors on More tab #270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
202 changes: 103 additions & 99 deletions app/src/main/java/com/readrops/app/more/MoreTab.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -65,126 +66,129 @@ object MoreTab : Tab, KoinComponent {
)
}

Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.fillMaxSize()
.statusBarsPadding()
) {
LargeSpacer()

Image(
painter = adaptiveIconPainterResource(id = R.mipmap.ic_launcher),
contentDescription = null,
modifier = Modifier.size(64.dp)
)

MediumSpacer()
Surface(color = MaterialTheme.colorScheme.background) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.fillMaxSize()
.statusBarsPadding()
) {
LargeSpacer()

Text(
text = stringResource(R.string.app_name),
style = MaterialTheme.typography.titleLarge
)
Image(
painter = adaptiveIconPainterResource(id = R.mipmap.ic_launcher),
contentDescription = null,
modifier = Modifier.size(64.dp)
)

ShortSpacer()
MediumSpacer()

IconText(
text = if (BuildConfig.DEBUG) {
"v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
} else {
"v${BuildConfig.VERSION_NAME}"
},
icon = painterResource(id = R.drawable.ic_version),
style = MaterialTheme.typography.labelLarge
)
Text(
text = stringResource(R.string.app_name),
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onBackground
)

ShortSpacer()
ShortSpacer()

Text(
text = stringResource(id = R.string.app_licence),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
IconText(
text = if (BuildConfig.DEBUG) {
"v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
} else {
"v${BuildConfig.VERSION_NAME}"
},
icon = painterResource(id = R.drawable.ic_version),
style = MaterialTheme.typography.labelLarge
)

ShortSpacer()
ShortSpacer()

Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth()
) {
IconButton(
onClick = { context.openUrl(context.getString(R.string.app_url)) }
) {
Icon(
painter = painterResource(id = R.drawable.ic_github),
contentDescription = null,
modifier = Modifier.size(24.dp)
)
}
Text(
text = stringResource(id = R.string.app_licence),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)

IconButton(
onClick = { context.openUrl(context.getString(R.string.changelog_url)) }
) {
Icon(
painter = painterResource(id = R.drawable.ic_changelog),
contentDescription = null,
modifier = Modifier.size(24.dp)
)
}
ShortSpacer()

IconButton(
onClick = { context.openUrl(context.getString(R.string.app_issues_url)) }
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth()
) {
Icon(
painter = painterResource(id = R.drawable.ic_bug_report),
contentDescription = null
)
IconButton(
onClick = { context.openUrl(context.getString(R.string.app_url)) }
) {
Icon(
painter = painterResource(id = R.drawable.ic_github),
contentDescription = null,
modifier = Modifier.size(24.dp)
)
}

IconButton(
onClick = { context.openUrl(context.getString(R.string.changelog_url)) }
) {
Icon(
painter = painterResource(id = R.drawable.ic_changelog),
contentDescription = null,
modifier = Modifier.size(24.dp)
)
}

IconButton(
onClick = { context.openUrl(context.getString(R.string.app_issues_url)) }
) {
Icon(
painter = painterResource(id = R.drawable.ic_bug_report),
contentDescription = null
)
}
}
}

MediumSpacer()
MediumSpacer()

SelectableIconText(
icon = painterResource(id = R.drawable.ic_settings),
text = stringResource(R.string.settings),
style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Normal),
spacing = MaterialTheme.spacing.largeSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
tint = MaterialTheme.colorScheme.primary,
onClick = { navigator.push(PreferencesScreen()) }
)

SelectableIconText(
icon = painterResource(id = R.drawable.ic_library),
text = stringResource(id = R.string.open_source_libraries),
style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Normal),
spacing = MaterialTheme.spacing.largeSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
tint = MaterialTheme.colorScheme.primary,
onClick = { navigator.push(AboutLibrariesScreen()) }
)
SelectableIconText(
icon = painterResource(id = R.drawable.ic_settings),
text = stringResource(R.string.settings),
style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Normal),
spacing = MaterialTheme.spacing.largeSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
tint = MaterialTheme.colorScheme.primary,
onClick = { navigator.push(PreferencesScreen()) }
)

SelectableIconText(
icon = painterResource(id = R.drawable.ic_donation),
text = stringResource(id = R.string.make_donation),
style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Normal),
spacing = MaterialTheme.spacing.largeSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
tint = MaterialTheme.colorScheme.primary,
onClick = { showDonationDialog = true }
)
SelectableIconText(
icon = painterResource(id = R.drawable.ic_library),
text = stringResource(id = R.string.open_source_libraries),
style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Normal),
spacing = MaterialTheme.spacing.largeSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
tint = MaterialTheme.colorScheme.primary,
onClick = { navigator.push(AboutLibrariesScreen()) }
)

if (BuildConfig.DEBUG) {
SelectableIconText(
icon = painterResource(id = R.drawable.ic_bug),
text = "Debug",
icon = painterResource(id = R.drawable.ic_donation),
text = stringResource(id = R.string.make_donation),
style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Normal),
spacing = MaterialTheme.spacing.largeSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
tint = MaterialTheme.colorScheme.primary,
onClick = { navigator.push(DebugScreen()) }
onClick = { showDonationDialog = true }
)

if (BuildConfig.DEBUG) {
SelectableIconText(
icon = painterResource(id = R.drawable.ic_bug),
text = "Debug",
style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Normal),
spacing = MaterialTheme.spacing.largeSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
tint = MaterialTheme.colorScheme.primary,
onClick = { navigator.push(DebugScreen()) }
)
}
}
}
}
Expand Down