From 51dea058b583024a6ff42fa50a937c6ddf8ce900 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 25 Aug 2025 20:57:42 +0800 Subject: [PATCH] compose: details: Switch from bodyVerySmall to bodySmall Follow the material typography scheme completely. bodyVerySmall is quite hard to read otherwise. Signed-off-by: Aayush Gupta --- .../java/com/aurora/extensions/Typography.kt | 19 ------------------- .../composables/BlackListComposable.kt | 3 +-- .../composables/FavouriteComposable.kt | 3 +-- .../composables/InstalledAppComposable.kt | 3 +-- .../compose/composables/app/AppComposable.kt | 3 +-- .../composables/app/AppListComposable.kt | 3 +-- .../composables/details/ExodusComposable.kt | 3 +-- .../ui/details/components/AppDetails.kt | 3 +-- 8 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 app/src/main/java/com/aurora/extensions/Typography.kt diff --git a/app/src/main/java/com/aurora/extensions/Typography.kt b/app/src/main/java/com/aurora/extensions/Typography.kt deleted file mode 100644 index 47cc69047..000000000 --- a/app/src/main/java/com/aurora/extensions/Typography.kt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 The Calyx Institute - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.aurora.extensions - -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Typography -import androidx.compose.runtime.Composable -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.unit.sp - -/** - * Text style for composable with very small text - */ -val Typography.bodyVerySmall: TextStyle - @Composable - get() = MaterialTheme.typography.bodySmall.copy(fontSize = 10.sp) diff --git a/app/src/main/java/com/aurora/store/compose/composables/BlackListComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/BlackListComposable.kt index cbe7064a2..008266518 100644 --- a/app/src/main/java/com/aurora/store/compose/composables/BlackListComposable.kt +++ b/app/src/main/java/com/aurora/store/compose/composables/BlackListComposable.kt @@ -29,7 +29,6 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.core.graphics.drawable.toBitmap import androidx.core.graphics.drawable.toDrawable -import com.aurora.extensions.bodyVerySmall import com.aurora.store.BuildConfig import com.aurora.store.R @@ -91,7 +90,7 @@ fun BlackListComposable( ) Text( text = stringResource(R.string.version, versionName, versionCode), - style = MaterialTheme.typography.bodyVerySmall, + style = MaterialTheme.typography.bodySmall, maxLines = 1, overflow = TextOverflow.Ellipsis ) diff --git a/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt index 21292bdad..27c1bb220 100644 --- a/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt +++ b/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt @@ -35,7 +35,6 @@ import coil3.compose.AsyncImage import coil3.compose.LocalAsyncImagePreviewHandler import coil3.request.ImageRequest import coil3.request.crossfade -import com.aurora.extensions.bodyVerySmall import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.compose.preview.AppPreviewProvider @@ -100,7 +99,7 @@ fun FavouriteComposable( favourite.added, DateUtils.FORMAT_SHOW_DATE ), - style = MaterialTheme.typography.bodyVerySmall + style = MaterialTheme.typography.bodySmall ) } } diff --git a/app/src/main/java/com/aurora/store/compose/composables/InstalledAppComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/InstalledAppComposable.kt index 83a6c5e5d..f3d68605a 100644 --- a/app/src/main/java/com/aurora/store/compose/composables/InstalledAppComposable.kt +++ b/app/src/main/java/com/aurora/store/compose/composables/InstalledAppComposable.kt @@ -26,7 +26,6 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.core.graphics.drawable.toBitmap import androidx.core.graphics.drawable.toDrawable -import com.aurora.extensions.bodyVerySmall import com.aurora.store.BuildConfig import com.aurora.store.R @@ -84,7 +83,7 @@ fun InstalledAppComposable( ) Text( text = stringResource(R.string.version, versionName, versionCode), - style = MaterialTheme.typography.bodyVerySmall, + style = MaterialTheme.typography.bodySmall, maxLines = 1, overflow = TextOverflow.Ellipsis ) diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt index 681cc1733..3ee4d300b 100644 --- a/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt +++ b/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt @@ -28,7 +28,6 @@ import coil3.compose.AsyncImage import coil3.compose.LocalAsyncImagePreviewHandler import coil3.request.ImageRequest import coil3.request.crossfade -import com.aurora.extensions.bodyVerySmall import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.compose.preview.AppPreviewProvider @@ -74,7 +73,7 @@ fun AppComposable(modifier: Modifier = Modifier, app: App, onClick: () -> Unit = } else { app.downloadString }, - style = MaterialTheme.typography.bodyVerySmall + style = MaterialTheme.typography.bodySmall ) } } diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt index c5a5a745d..67e3c55a0 100644 --- a/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt +++ b/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt @@ -29,7 +29,6 @@ import coil3.compose.AsyncImage import coil3.compose.LocalAsyncImagePreviewHandler import coil3.request.ImageRequest import coil3.request.crossfade -import com.aurora.extensions.bodyVerySmall import com.aurora.extensions.requiresGMS import com.aurora.gplayapi.data.models.App import com.aurora.store.R @@ -78,7 +77,7 @@ fun AppListComposable(modifier: Modifier = Modifier, app: App, onClick: () -> Un Text(text = app.developerName, style = MaterialTheme.typography.bodySmall) Text( text = buildExtras(app).joinToString(separator = " • "), - style = MaterialTheme.typography.bodyVerySmall + style = MaterialTheme.typography.bodySmall ) } } diff --git a/app/src/main/java/com/aurora/store/compose/composables/details/ExodusComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/details/ExodusComposable.kt index ac4b6d940..6f837a8e8 100644 --- a/app/src/main/java/com/aurora/store/compose/composables/details/ExodusComposable.kt +++ b/app/src/main/java/com/aurora/store/compose/composables/details/ExodusComposable.kt @@ -14,7 +14,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview -import com.aurora.extensions.bodyVerySmall import com.aurora.store.R import com.aurora.store.data.model.ExodusTracker @@ -40,7 +39,7 @@ fun ExodusComposable(modifier: Modifier = Modifier, tracker: ExodusTracker) { ) Text( text = tracker.date, - style = MaterialTheme.typography.bodyVerySmall, + style = MaterialTheme.typography.bodySmall, maxLines = 1, overflow = TextOverflow.Ellipsis ) diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/components/AppDetails.kt b/app/src/main/java/com/aurora/store/compose/ui/details/components/AppDetails.kt index 93176cb24..269881d1b 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/components/AppDetails.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/components/AppDetails.kt @@ -24,7 +24,6 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import coil3.compose.LocalAsyncImagePreviewHandler -import com.aurora.extensions.bodyVerySmall import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.compose.composables.app.AnimatedAppIconComposable @@ -86,7 +85,7 @@ fun AppDetails( app.versionCode ) }, - style = MaterialTheme.typography.bodyVerySmall + style = MaterialTheme.typography.bodySmall ) } }