From a084a5761946d8cb7c056bb06b89d52f8f14efbc Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Tue, 30 Dec 2025 15:33:40 +0800 Subject: [PATCH] ktlint: Format all compose code Signed-off-by: Aayush Gupta --- .editorconfig | 3 +- .../store/compose/composable/BlackListItem.kt | 2 +- .../compose/composable/DispenserListItem.kt | 2 +- .../compose/composable/DownloadListItem.kt | 2 +- .../compose/composable/FavouriteListItem.kt | 4 +- .../aurora/store/compose/composable/Header.kt | 4 +- .../aurora/store/compose/composable/Logo.kt | 1 - .../aurora/store/compose/composable/MicroG.kt | 7 +- .../compose/composable/app/AnimatedAppIcon.kt | 2 +- .../composable/app/LargeAppListItem.kt | 34 +++--- .../composable/details/ExodusListItem.kt | 2 +- .../composable/details/ReviewListItem.kt | 2 +- .../aurora/store/compose/navigation/Screen.kt | 2 +- .../compose/preview/AppPreviewProvider.kt | 4 +- .../store/compose/preview/PreviewTemplate.kt | 2 +- .../store/compose/ui/about/AboutScreen.kt | 2 +- .../compose/ui/blacklist/BlacklistScreen.kt | 8 +- .../compose/ui/details/AppDetailsScreen.kt | 103 +++++++++--------- .../store/compose/ui/details/ExodusScreen.kt | 2 +- .../ui/details/ManualDownloadScreen.kt | 5 +- .../store/compose/ui/details/MicroGScreen.kt | 11 +- .../store/compose/ui/details/ReviewScreen.kt | 7 +- .../compose/ui/details/composable/Actions.kt | 4 +- .../ui/details/composable/Changelog.kt | 4 +- .../ui/details/composable/Compatibility.kt | 8 +- .../ui/details/composable/DataSafety.kt | 6 +- .../compose/ui/details/composable/Details.kt | 11 +- .../ui/details/composable/DeveloperDetails.kt | 4 +- .../compose/ui/details/composable/Privacy.kt | 6 +- .../ui/details/composable/RatingAndReviews.kt | 10 +- .../ui/details/composable/Screenshots.kt | 4 +- .../compose/ui/details/composable/Tags.kt | 6 +- .../compose/ui/details/composable/Testing.kt | 4 +- .../store/compose/ui/dev/DevProfileScreen.kt | 2 +- .../compose/ui/dispenser/DispenserScreen.kt | 2 +- .../ui/dispenser/InputDispenserDialog.kt | 2 +- .../compose/ui/downloads/DownloadsScreen.kt | 2 +- .../compose/ui/favourite/FavouriteScreen.kt | 4 +- .../compose/ui/installed/InstalledScreen.kt | 2 +- .../store/compose/ui/onboarding/MicroGPage.kt | 7 +- .../compose/ui/onboarding/OnboardingScreen.kt | 16 ++- .../store/compose/ui/search/SearchScreen.kt | 11 +- .../store/compose/ui/spoof/DevicePage.kt | 19 ++-- .../store/compose/ui/spoof/LocalePage.kt | 7 +- .../store/compose/ui/spoof/SpoofScreen.kt | 2 +- 45 files changed, 195 insertions(+), 159 deletions(-) diff --git a/.editorconfig b/.editorconfig index 8eaa53b43..1af01d6f7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,4 +7,5 @@ root = true [*.{kt,kts}] ktlint_code_style = android_studio -ktlint_function_naming_ignore_when_annotated_with=Composable +ktlint_function_naming_ignore_when_annotated_with = Composable +ktlint_standard_class-signature = disabled diff --git a/app/src/main/java/com/aurora/store/compose/composable/BlackListItem.kt b/app/src/main/java/com/aurora/store/compose/composable/BlackListItem.kt index 1a443dcd7..81a5bfd76 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/BlackListItem.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/BlackListItem.kt @@ -75,7 +75,7 @@ fun BlackListItem( modifier = Modifier.requiredSize(dimensionResource(R.dimen.icon_size_medium)) ) Column( - modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.margin_small)), + modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.margin_small)) ) { Text( text = displayName, diff --git a/app/src/main/java/com/aurora/store/compose/composable/DispenserListItem.kt b/app/src/main/java/com/aurora/store/compose/composable/DispenserListItem.kt index db2654916..20dd4cd57 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/DispenserListItem.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/DispenserListItem.kt @@ -68,9 +68,9 @@ fun DispenserListItem( overflow = TextOverflow.Ellipsis ) } - } } + @Preview(showBackground = true) @Composable private fun DispenserListItemPreview() { diff --git a/app/src/main/java/com/aurora/store/compose/composable/DownloadListItem.kt b/app/src/main/java/com/aurora/store/compose/composable/DownloadListItem.kt index 1fc74f3cf..21c4abddd 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/DownloadListItem.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/DownloadListItem.kt @@ -138,7 +138,7 @@ fun DownloadListItem( ) Column( modifier = Modifier - .padding(horizontal = dimensionResource(R.dimen.margin_small)), + .padding(horizontal = dimensionResource(R.dimen.margin_small)) ) { Text( text = download.displayName, diff --git a/app/src/main/java/com/aurora/store/compose/composable/FavouriteListItem.kt b/app/src/main/java/com/aurora/store/compose/composable/FavouriteListItem.kt index 73be5442e..3820a20a1 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/FavouriteListItem.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/FavouriteListItem.kt @@ -102,7 +102,9 @@ fun FavouriteListItem( .clip(RoundedCornerShape(dimensionResource(R.dimen.radius_medium))) ) Column( - modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.margin_small)) + modifier = Modifier.padding( + horizontal = dimensionResource(R.dimen.margin_small) + ) ) { Text( text = favourite.displayName, diff --git a/app/src/main/java/com/aurora/store/compose/composable/Header.kt b/app/src/main/java/com/aurora/store/compose/composable/Header.kt index 24569e9bd..edc58f094 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/Header.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/Header.kt @@ -62,7 +62,7 @@ fun Header( text = title, style = MaterialTheme.typography.titleMedium, maxLines = 1, - overflow = TextOverflow.Ellipsis, + overflow = TextOverflow.Ellipsis ) if (!subtitle.isNullOrBlank()) { Text( @@ -74,7 +74,7 @@ fun Header( if (onClick != null) { Icon( painter = painterResource(R.drawable.ic_arrow_right), - contentDescription = null, + contentDescription = null ) } } diff --git a/app/src/main/java/com/aurora/store/compose/composable/Logo.kt b/app/src/main/java/com/aurora/store/compose/composable/Logo.kt index a790eae2a..0727e638f 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/Logo.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/Logo.kt @@ -57,7 +57,6 @@ fun Logo(modifier: Modifier = Modifier) { overflow = TextOverflow.Ellipsis ) } - } @Preview(showBackground = true) diff --git a/app/src/main/java/com/aurora/store/compose/composable/MicroG.kt b/app/src/main/java/com/aurora/store/compose/composable/MicroG.kt index b68e62edc..46878134f 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/MicroG.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/MicroG.kt @@ -87,7 +87,7 @@ fun MicroG( ) { Text( text = stringResource(R.string.onboarding_gms_microg), - style = MaterialTheme.typography.bodyMedium, + style = MaterialTheme.typography.bodyMedium ) links.fastForEach { link -> @@ -132,10 +132,11 @@ fun MicroG( modifier = Modifier.fillMaxWidth() ) { Text( - text = if (uiState.isDownloading) + text = if (uiState.isDownloading) { stringResource(R.string.action_installing) - else + } else { stringResource(R.string.action_install_microG) + } ) } if (uiState.isDownloading) { diff --git a/app/src/main/java/com/aurora/store/compose/composable/app/AnimatedAppIcon.kt b/app/src/main/java/com/aurora/store/compose/composable/app/AnimatedAppIcon.kt index bfa890b9a..b6d68c0d3 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/app/AnimatedAppIcon.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/app/AnimatedAppIcon.kt @@ -92,7 +92,7 @@ fun AnimatedAppIcon( } } -private class ProgressProvider: PreviewParameterProvider { +private class ProgressProvider : PreviewParameterProvider { override val values: Sequence get() = sequenceOf(0F, 50F) } diff --git a/app/src/main/java/com/aurora/store/compose/composable/app/LargeAppListItem.kt b/app/src/main/java/com/aurora/store/compose/composable/app/LargeAppListItem.kt index a70d92dc1..524e99a51 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/app/LargeAppListItem.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/app/LargeAppListItem.kt @@ -64,7 +64,7 @@ fun LargeAppListItem(modifier: Modifier = Modifier, app: App, onClick: () -> Uni .clip(RoundedCornerShape(dimensionResource(R.dimen.radius_medium))) ) Column( - modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.margin_small)), + modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.margin_small)) ) { Text( text = app.displayName, @@ -90,25 +90,23 @@ fun LargeAppListItemPreview(@PreviewParameter(AppPreviewProvider::class) app: Ap } @Composable -private fun buildExtras(app: App): List { - return mutableListOf().apply { - add(if (app.size > 0) CommonUtil.addSiPrefix(app.size) else app.downloadString) - add("${app.labeledRating}★") +private fun buildExtras(app: App): List = mutableListOf().apply { + add(if (app.size > 0) CommonUtil.addSiPrefix(app.size) else app.downloadString) + add("${app.labeledRating}★") - if (app.isFree) { - add(stringResource(R.string.details_free)) - } else { - add(stringResource(R.string.details_paid)) - } + if (app.isFree) { + add(stringResource(R.string.details_free)) + } else { + add(stringResource(R.string.details_paid)) + } - if (app.containsAds) { - add(stringResource(R.string.details_contains_ads)) - } else { - add(stringResource(R.string.details_no_ads)) - } + if (app.containsAds) { + add(stringResource(R.string.details_contains_ads)) + } else { + add(stringResource(R.string.details_no_ads)) + } - if (app.requiresGMS()) { - add(stringResource(R.string.details_gsf_dependent)) - } + if (app.requiresGMS()) { + add(stringResource(R.string.details_gsf_dependent)) } } diff --git a/app/src/main/java/com/aurora/store/compose/composable/details/ExodusListItem.kt b/app/src/main/java/com/aurora/store/compose/composable/details/ExodusListItem.kt index ba43acbf3..f7380a3bc 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/details/ExodusListItem.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/details/ExodusListItem.kt @@ -54,7 +54,7 @@ private fun ExodusListItemPreview() { ExodusListItem( tracker = ExodusTracker( name = "Google Analytics", - signature = "com.google.android.apps.analytics.|com.google.android.gms.analytics.|com.google.analytics.", + signature = "com.google.android.apps.analytics.|com.google.analytics.", date = "2017-09-24" ) ) diff --git a/app/src/main/java/com/aurora/store/compose/composable/details/ReviewListItem.kt b/app/src/main/java/com/aurora/store/compose/composable/details/ReviewListItem.kt index dae2b46c0..a4e6c4746 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/details/ReviewListItem.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/details/ReviewListItem.kt @@ -60,7 +60,7 @@ fun ReviewListItem(modifier: Modifier = Modifier, review: Review) { .clip(RoundedCornerShape(dimensionResource(R.dimen.radius_medium))) ) Column( - modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.margin_small)), + modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.margin_small)) ) { Text( text = review.userName, diff --git a/app/src/main/java/com/aurora/store/compose/navigation/Screen.kt b/app/src/main/java/com/aurora/store/compose/navigation/Screen.kt index 3489056bb..26d463ee3 100644 --- a/app/src/main/java/com/aurora/store/compose/navigation/Screen.kt +++ b/app/src/main/java/com/aurora/store/compose/navigation/Screen.kt @@ -26,7 +26,7 @@ sealed class Screen : NavKey, Parcelable { data object Blacklist : Screen() @Serializable - data class DevProfile(val developerId: String): Screen() + data class DevProfile(val developerId: String) : Screen() @Serializable data class AppDetails(val packageName: String) : Screen() diff --git a/app/src/main/java/com/aurora/store/compose/preview/AppPreviewProvider.kt b/app/src/main/java/com/aurora/store/compose/preview/AppPreviewProvider.kt index a6e34e64c..e8991d781 100644 --- a/app/src/main/java/com/aurora/store/compose/preview/AppPreviewProvider.kt +++ b/app/src/main/java/com/aurora/store/compose/preview/AppPreviewProvider.kt @@ -49,7 +49,7 @@ class AppPreviewProvider : PreviewParameterProvider { developerName = "Rahul Kumar Patel", versionCode = BuildConfig.VERSION_CODE.toLong(), versionName = BuildConfig.VERSION_NAME, - shortDescription = "An unofficial FOSS client to Google Play with an elegant design and privacy", + shortDescription = "An unofficial FOSS client to Google Play", changes = CHANGELOG, description = DESCRIPTION, isFree = true, @@ -82,7 +82,7 @@ class AppPreviewProvider : PreviewParameterProvider { Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE ), - privacyPolicyUrl = "https://gitlab.com/AuroraOSS/AuroraStore/-/blob/master/POLICY.md", + privacyPolicyUrl = "https://gitlab.com/AuroraOSS/AuroraStore/" ) ) } diff --git a/app/src/main/java/com/aurora/store/compose/preview/PreviewTemplate.kt b/app/src/main/java/com/aurora/store/compose/preview/PreviewTemplate.kt index 1e42f5e7f..a5965deac 100644 --- a/app/src/main/java/com/aurora/store/compose/preview/PreviewTemplate.kt +++ b/app/src/main/java/com/aurora/store/compose/preview/PreviewTemplate.kt @@ -14,7 +14,7 @@ import com.aurora.store.compose.theme.AuroraTheme * Template for previewing composable with default theme and remote image handling */ @Composable -fun PreviewTemplate(content : @Composable () -> Unit) { +fun PreviewTemplate(content: @Composable () -> Unit) { AuroraTheme { CompositionLocalProvider( value = LocalAsyncImagePreviewHandler provides coilPreviewProvider, diff --git a/app/src/main/java/com/aurora/store/compose/ui/about/AboutScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/about/AboutScreen.kt index 2cc9a6431..a8c6d8ee0 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/about/AboutScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/about/AboutScreen.kt @@ -77,7 +77,7 @@ private fun ScreenContent(onNavigateUp: () -> Unit = {}, onAboutAurora: () -> Un R.drawable.ic_ethereum_eth, R.drawable.ic_bhim, R.drawable.ic_paypal, - R.drawable.ic_libera_pay, + R.drawable.ic_libera_pay ) val links = linkURLS.mapIndexed { index, url -> diff --git a/app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt index ad9d4c6d5..7687e1527 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt @@ -51,9 +51,9 @@ import com.aurora.store.compose.ui.blacklist.menu.BlacklistMenu import com.aurora.store.compose.ui.blacklist.menu.MenuItem import com.aurora.store.util.PackageUtil import com.aurora.store.viewmodel.blacklist.BlacklistViewModel +import java.util.Calendar import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch -import java.util.Calendar @Composable fun BlacklistScreen(onNavigateUp: () -> Unit, viewModel: BlacklistViewModel = hiltViewModel()) { @@ -132,7 +132,9 @@ private fun ScreenContent( BlacklistMenu { menuItem -> when (menuItem) { MenuItem.SELECT_ALL -> onBlacklistAll() + MenuItem.REMOVE_ALL -> onWhitelistAll() + MenuItem.IMPORT -> { docImportLauncher.launch(arrayOf(Constants.JSON_MIME_TYPE)) } @@ -218,7 +220,9 @@ private fun ScreenContent( val isFiltered = isPackageFiltered(pkg) BlackListItem( icon = PackageUtil.getIconForPackage(context, pkg.packageName)!!, - displayName = pkg.applicationInfo!!.loadLabel(context.packageManager).toString(), + displayName = pkg.applicationInfo!!.loadLabel( + context.packageManager + ).toString(), packageName = pkg.packageName, versionName = pkg.versionName!!, versionCode = PackageInfoCompat.getLongVersionCode(pkg), diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt index ad140cbd3..7ee852ea5 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt @@ -50,6 +50,7 @@ import com.aurora.extensions.share import com.aurora.extensions.toast import com.aurora.gplayapi.data.models.App import com.aurora.gplayapi.data.models.Review +import com.aurora.gplayapi.data.models.datasafety.Report as DataSafetyReport import com.aurora.store.R import com.aurora.store.compose.composable.ContainedLoadingIndicator import com.aurora.store.compose.composable.Error @@ -85,9 +86,8 @@ import com.aurora.store.util.FlavouredUtil import com.aurora.store.util.PackageUtil import com.aurora.store.util.ShortcutManagerUtil import com.aurora.store.viewmodel.details.AppDetailsViewModel -import kotlinx.coroutines.launch import kotlin.random.Random -import com.aurora.gplayapi.data.models.datasafety.Report as DataSafetyReport +import kotlinx.coroutines.launch @Composable fun AppDetailsScreen( @@ -112,6 +112,7 @@ fun AppDetailsScreen( when (state) { is AppState.Loading -> ScreenContentLoading(onNavigateUp = onNavigateUp) + is AppState.Error -> { ScreenContentError( onNavigateUp = onNavigateUp, @@ -238,8 +239,8 @@ private fun ScreenContentApp( fun onInstall(requestedApp: App = app, ignoreMicroG: Boolean = false) { if (isPermittedToInstall(context, app)) { - val shouldPromptMicroGInstall = app.requiresGMS() - && FlavouredUtil.promptMicroGInstall(context) + val shouldPromptMicroGInstall = app.requiresGMS() && + FlavouredUtil.promptMicroGInstall(context) if (shouldPromptMicroGInstall && !ignoreMicroG) { showExtraPane(ExtraScreen.MicroG) @@ -262,11 +263,15 @@ private fun ScreenContentApp( AppDetailsMenu(isFavorite = isFavorite, state = state) { menuItem -> when (menuItem) { MenuItem.FAVORITE -> onFavorite() + MenuItem.MANUAL_DOWNLOAD -> { showExtraPane(ExtraScreen.ManualDownload) } + MenuItem.SHARE -> context.share(app.displayName, app.packageName) + MenuItem.APP_INFO -> context.appInfo(app.packageName) + MenuItem.ADD_TO_HOME -> { ShortcutManagerUtil.requestPinShortcut(context, app.packageName) } @@ -454,61 +459,59 @@ private fun ScreenContentApp( } @Composable - fun ExtraPane(screen: NavKey) { - return when (screen) { - is ExtraScreen.Review -> ReviewScreen( - packageName = app.packageName, - onNavigateUp = ::onNavigateBack - ) + fun ExtraPane(screen: NavKey) = when (screen) { + is ExtraScreen.Review -> ReviewScreen( + packageName = app.packageName, + onNavigateUp = ::onNavigateBack + ) - is ExtraScreen.Exodus -> ExodusScreen( - packageName = app.packageName, - onNavigateUp = ::onNavigateBack - ) + is ExtraScreen.Exodus -> ExodusScreen( + packageName = app.packageName, + onNavigateUp = ::onNavigateBack + ) - is ExtraScreen.More -> MoreScreen( - packageName = app.packageName, - onNavigateUp = ::onNavigateBack, - onNavigateToAppDetails = onNavigateToAppDetails - ) + is ExtraScreen.More -> MoreScreen( + packageName = app.packageName, + onNavigateUp = ::onNavigateBack, + onNavigateToAppDetails = onNavigateToAppDetails + ) - is ExtraScreen.Permission -> PermissionScreen( - packageName = app.packageName, - onNavigateUp = ::onNavigateBack - ) + is ExtraScreen.Permission -> PermissionScreen( + packageName = app.packageName, + onNavigateUp = ::onNavigateBack + ) - is ExtraScreen.Screenshot -> ScreenshotScreen( - packageName = app.packageName, - index = screen.index, - onNavigateUp = ::onNavigateBack - ) + is ExtraScreen.Screenshot -> ScreenshotScreen( + packageName = app.packageName, + index = screen.index, + onNavigateUp = ::onNavigateBack + ) - is ExtraScreen.ManualDownload -> ManualDownloadScreen( - packageName = app.packageName, - onNavigateUp = ::onNavigateBack, - onRequestInstall = { requestedApp -> onInstall(requestedApp) } - ) + is ExtraScreen.ManualDownload -> ManualDownloadScreen( + packageName = app.packageName, + onNavigateUp = ::onNavigateBack, + onRequestInstall = { requestedApp -> onInstall(requestedApp) } + ) - is ExtraScreen.MicroG -> MicroGScreen( - packageName = app.packageName, - onNavigateUp = ::onNavigateBack, - onIgnore = { onInstall(ignoreMicroG = it) } - ) + is ExtraScreen.MicroG -> MicroGScreen( + packageName = app.packageName, + onNavigateUp = ::onNavigateBack, + onIgnore = { onInstall(ignoreMicroG = it) } + ) - is Screen.DevProfile -> DevProfileScreen( - publisherId = app.developerName, - onNavigateUp = ::onNavigateBack, - onNavigateToAppDetails = { onNavigateToAppDetails(it) } - ) + is Screen.DevProfile -> DevProfileScreen( + publisherId = app.developerName, + onNavigateUp = ::onNavigateBack, + onNavigateToAppDetails = { onNavigateToAppDetails(it) } + ) - is Screen.PermissionRationale -> PermissionRationaleScreen( - onNavigateUp = ::onNavigateBack, - requiredPermissions = screen.requiredPermissions, - onPermissionCallback = { onInstall() } - ) + is Screen.PermissionRationale -> PermissionRationaleScreen( + onNavigateUp = ::onNavigateBack, + requiredPermissions = screen.requiredPermissions, + onPermissionCallback = { onInstall() } + ) - else -> {} - } + else -> {} } NavigableSupportingPaneScaffold( diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt index 6ee06b031..2e22ed8f6 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt @@ -162,7 +162,7 @@ private fun ScreenContentError( navigationIcon = windowAdaptiveInfo.adaptiveNavigationIcon, onNavigateUp = onNavigateUp ) - }, + } ) { paddingValues -> Error( modifier = Modifier.padding(paddingValues), diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/ManualDownloadScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/ManualDownloadScreen.kt index 501ea9398..1d49f31d7 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/ManualDownloadScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/ManualDownloadScreen.kt @@ -107,7 +107,6 @@ private fun ScreenContent( onRequestInstall: (versionCode: Long) -> Unit = {}, windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo() ) { - val coroutineScope = rememberCoroutineScope() val snackBarHostState = remember { SnackbarHostState() } val errorMessage = stringResource(R.string.manual_download_version_error) @@ -180,7 +179,9 @@ private fun ScreenContent( Row( modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.padding_medium)) + horizontalArrangement = Arrangement.spacedBy( + dimensionResource(R.dimen.padding_medium) + ) ) { FilledTonalButton( modifier = Modifier.weight(1F), diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt index 95af7c428..0f6408f23 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt @@ -116,7 +116,9 @@ private fun ScreenContent( Row( modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.padding_medium)) + horizontalArrangement = Arrangement.spacedBy( + dimensionResource(R.dimen.padding_medium) + ) ) { FilledTonalButton( modifier = Modifier.weight(1F), @@ -135,10 +137,11 @@ private fun ScreenContent( enabled = !uiState.isDownloading ) { Text( - text = if (uiState.isInstalled) + text = if (uiState.isInstalled) { stringResource(R.string.action_install) - else - stringResource(R.string.action_ignore), + } else { + stringResource(R.string.action_ignore) + }, maxLines = 1, overflow = TextOverflow.Ellipsis ) diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt index 9522b14c6..a987c53fc 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt @@ -50,8 +50,8 @@ import com.aurora.store.compose.preview.PreviewTemplate import com.aurora.store.compose.preview.ReviewPreviewProvider import com.aurora.store.viewmodel.details.AppDetailsViewModel import com.aurora.store.viewmodel.details.ReviewViewModel -import kotlinx.coroutines.flow.MutableStateFlow import kotlin.random.Random +import kotlinx.coroutines.flow.MutableStateFlow @Composable fun ReviewScreen( @@ -90,7 +90,6 @@ private fun ScreenContent( onFilter: (filter: Review.Filter) -> Unit = {}, windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo() ) { - Scaffold( topBar = { TopAppBar( @@ -131,8 +130,6 @@ private fun ScreenContent( } } } - - } } @@ -175,7 +172,7 @@ private fun FilterHeader(onClick: (filter: Review.Filter) -> Unit) { contentDescription = stringResource(filters.getValue(filter)) ) } - }, + } ) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Actions.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Actions.kt index fd72305e5..dae2e1cdf 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Actions.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Actions.kt @@ -85,7 +85,9 @@ fun Actions( @Composable private fun ActionsPreview() { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { Actions( primaryActionDisplayName = stringResource(R.string.action_install), secondaryActionDisplayName = stringResource(R.string.title_manual_download) diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Changelog.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Changelog.kt index 31bf765ce..eb25db005 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Changelog.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Changelog.kt @@ -59,7 +59,9 @@ fun Changelog(changelog: String) { @Composable private fun ChangelogPreview(@PreviewParameter(AppPreviewProvider::class) app: App) { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { Changelog(changelog = app.changes) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Compatibility.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Compatibility.kt index ced77484d..b0d26b2a4 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Compatibility.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Compatibility.kt @@ -31,7 +31,7 @@ import com.aurora.store.data.model.Scores fun Compatibility(needsGms: Boolean, plexusScores: Scores? = null) { Header( title = stringResource(R.string.details_compatibility_title), - subtitle = stringResource(R.string.plexus_powered), + subtitle = stringResource(R.string.plexus_powered) ) if (!needsGms) { @@ -63,7 +63,7 @@ fun Compatibility(needsGms: Boolean, plexusScores: Scores? = null) { val scoresStatus = mapOf( R.string.details_compatibility_no_gms to plexusScores?.aosp?.status, - R.string.details_compatibility_microg to plexusScores?.microG?.status, + R.string.details_compatibility_microg to plexusScores?.microG?.status ) scoresStatus.forEach { (title, description) -> Info( @@ -80,7 +80,9 @@ fun Compatibility(needsGms: Boolean, plexusScores: Scores? = null) { @Composable private fun CompatibilityPreview() { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { Compatibility(needsGms = true) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/DataSafety.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/DataSafety.kt index 6f351e44e..01db06aa3 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/DataSafety.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/DataSafety.kt @@ -70,7 +70,7 @@ fun DataSafety(report: Report, privacyPolicyUrl: String) { .ifBlank { stringResource(R.string.details_data_safety_share_none) } - ), + ) ) } @@ -84,7 +84,9 @@ fun DataSafety(report: Report, privacyPolicyUrl: String) { @Composable private fun DataSafetyPreview(@PreviewParameter(AppPreviewProvider::class) app: App) { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { DataSafety( privacyPolicyUrl = app.privacyPolicyUrl, report = Report( diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Details.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Details.kt index 78fc7c7c7..9623835db 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Details.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Details.kt @@ -44,7 +44,7 @@ import com.aurora.store.util.PackageUtil fun Details( app: App, state: AppState = AppState.Unavailable, - onNavigateToDetailsDevProfile: (developerName: String) -> Unit = {}, + onNavigateToDetailsDevProfile: (developerName: String) -> Unit = {} ) { val context = LocalContext.current val versionName = if (state is AppState.Installed) state.versionName else app.versionName @@ -82,7 +82,7 @@ fun Details( AppState.Installing::class, AppState.Downloading::class -> { "${Formatter.formatShortFileSize(context, speed)}/s" + - ", " + CommonUtil.getETAString(context, timeRemaining) + ", " + CommonUtil.getETAString(context, timeRemaining) } AppState.Updatable::class -> { @@ -96,6 +96,7 @@ fun Details( } AppState.Queued::class -> stringResource(R.string.status_queued) + AppState.Purchasing::class -> stringResource(R.string.preparing_to_install) else -> { @@ -112,8 +113,10 @@ fun Details( @Composable private fun DetailsPreview(@PreviewParameter(AppPreviewProvider::class) app: App) { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { - Details(app = app) + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { + Details(app = app) } } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/DeveloperDetails.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/DeveloperDetails.kt index 784f281e3..77d77d51f 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/DeveloperDetails.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/DeveloperDetails.kt @@ -72,7 +72,9 @@ fun DeveloperDetails(address: String, website: String, email: String) { @Composable private fun DeveloperDetailsPreview(@PreviewParameter(AppPreviewProvider::class) app: App) { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { DeveloperDetails( address = app.developerAddress, website = app.developerWebsite, diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Privacy.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Privacy.kt index cf62951e6..b81684510 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Privacy.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Privacy.kt @@ -37,7 +37,9 @@ fun Privacy(report: Report?, onNavigateToDetailsExodus: (() -> Unit)? = null) { val reportStatus = when { report == null -> stringResource(R.string.failed_to_fetch_report) + report.id == -1 -> stringResource(R.string.exodus_progress) + else -> if (report.trackers.isEmpty()) { stringResource(R.string.exodus_no_tracker) } else { @@ -60,7 +62,9 @@ fun Privacy(report: Report?, onNavigateToDetailsExodus: (() -> Unit)? = null) { @Composable private fun PrivacyPreview() { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { Privacy(report = Report(), onNavigateToDetailsExodus = {}) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/RatingAndReviews.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/RatingAndReviews.kt index 32bf77630..c48dd5f04 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/RatingAndReviews.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/RatingAndReviews.kt @@ -60,7 +60,11 @@ fun RatingAndReviews( windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo() ) { val stars = listOf( - rating.oneStar, rating.twoStar, rating.threeStar, rating.fourStar, rating.fiveStar + rating.oneStar, + rating.twoStar, + rating.threeStar, + rating.fourStar, + rating.fiveStar ).map { it.toFloat() }.also { // No ratings available, nothing to show if (it.sum() == 0F) return @@ -150,7 +154,9 @@ private fun RatingAndReviewsPreview(@PreviewParameter(AppPreviewProvider::class) ) } PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { RatingAndReviews(rating = app.rating, featuredReviews = reviews) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Screenshots.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Screenshots.kt index b2b868f73..b995cf7c2 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Screenshots.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Screenshots.kt @@ -50,7 +50,9 @@ fun Screenshots(screenshots: List, onNavigateToScreenshot: (index: Int) @Composable private fun ScreenshotsPreview(@PreviewParameter(AppPreviewProvider::class) app: App) { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { Screenshots(screenshots = app.screenshots) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Tags.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Tags.kt index 6be0113e0..113f49e2e 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Tags.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Tags.kt @@ -56,7 +56,7 @@ fun Tags(app: App) { Formatter.formatShortFileSize(context, app.size) to R.drawable.ic_apk_install, app.updatedOn to R.drawable.ic_updates, paidLabel to R.drawable.ic_paid, - adsLabel to R.drawable.ic_campaign, + adsLabel to R.drawable.ic_campaign ).filterKeys { it != null } LazyRow( @@ -72,7 +72,9 @@ fun Tags(app: App) { @Composable private fun TagsPreview(@PreviewParameter(AppPreviewProvider::class) app: App) { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { Tags(app = app) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Testing.kt b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Testing.kt index c19b5d5a2..abf6941c4 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/composable/Testing.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/composable/Testing.kt @@ -73,7 +73,9 @@ fun Testing(isSubscribed: Boolean, onTestingSubscriptionChange: (subscribe: Bool @Composable private fun TestingPreview(@PreviewParameter(AppPreviewProvider::class) app: App) { PreviewTemplate { - Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) { + Column( + verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) + ) { Testing(isSubscribed = app.testingProgram!!.isSubscribed) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/dev/DevProfileScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/dev/DevProfileScreen.kt index 47292515c..6adbc41e6 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/dev/DevProfileScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/dev/DevProfileScreen.kt @@ -36,8 +36,8 @@ import com.aurora.store.compose.preview.AppPreviewProvider import com.aurora.store.compose.preview.PreviewTemplate import com.aurora.store.viewmodel.details.DevProfileViewModel import com.aurora.store.viewmodel.search.SearchViewModel -import kotlinx.coroutines.flow.MutableStateFlow import kotlin.random.Random +import kotlinx.coroutines.flow.MutableStateFlow /** * Screen to display apps from a developer using the developerId diff --git a/app/src/main/java/com/aurora/store/compose/ui/dispenser/DispenserScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/dispenser/DispenserScreen.kt index 9ee02c1c7..5df1b7124 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/dispenser/DispenserScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/dispenser/DispenserScreen.kt @@ -48,7 +48,7 @@ fun DispenserScreen(onNavigateUp: () -> Unit, viewModel: DispenserViewModel = hi ) } - var shouldRemoveDispenser : String? by rememberSaveable { mutableStateOf(null) } + var shouldRemoveDispenser: String? by rememberSaveable { mutableStateOf(null) } shouldRemoveDispenser?.let { url -> RemoveDispenserDialog( url = url, diff --git a/app/src/main/java/com/aurora/store/compose/ui/dispenser/InputDispenserDialog.kt b/app/src/main/java/com/aurora/store/compose/ui/dispenser/InputDispenserDialog.kt index 2201e5a3f..abfe565b9 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/dispenser/InputDispenserDialog.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/dispenser/InputDispenserDialog.kt @@ -65,7 +65,7 @@ fun InputDispenserDialog(onAdd: (url: String) -> Unit = {}, onDismiss: () -> Uni onValueChange = { url = it }, shape = RoundedCornerShape(10.dp), singleLine = true, - keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), + keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }) ) } }, diff --git a/app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt index a29a94964..f9a3dfe1b 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt @@ -45,8 +45,8 @@ import com.aurora.store.compose.ui.downloads.menu.MenuItem import com.aurora.store.data.model.DownloadStatus import com.aurora.store.data.room.download.Download import com.aurora.store.viewmodel.downloads.DownloadsViewModel -import kotlinx.coroutines.flow.MutableStateFlow import kotlin.random.Random +import kotlinx.coroutines.flow.MutableStateFlow @Composable fun DownloadsScreen( diff --git a/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt index bc36df8aa..77430b970 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt @@ -44,9 +44,9 @@ import com.aurora.store.compose.ui.favourite.menu.FavouriteMenu import com.aurora.store.compose.ui.favourite.menu.MenuItem import com.aurora.store.data.room.favourite.Favourite import com.aurora.store.viewmodel.all.FavouriteViewModel -import kotlinx.coroutines.flow.MutableStateFlow import java.util.Calendar import kotlin.random.Random +import kotlinx.coroutines.flow.MutableStateFlow @Composable fun FavouriteScreen( @@ -179,7 +179,7 @@ private fun ScreenContent( @Preview @Composable private fun FavouriteScreenPreview( - @PreviewParameter(FavouritePreviewProvider ::class) favourite: Favourite + @PreviewParameter(FavouritePreviewProvider::class) favourite: Favourite ) { PreviewTemplate { val favourites = List(10) { diff --git a/app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt index 98ccdae7c..1ee6ce66f 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt @@ -36,8 +36,8 @@ import com.aurora.store.compose.composable.app.LargeAppListItem import com.aurora.store.compose.preview.AppPreviewProvider import com.aurora.store.compose.preview.PreviewTemplate import com.aurora.store.viewmodel.all.InstalledViewModel -import kotlinx.coroutines.flow.MutableStateFlow import kotlin.random.Random +import kotlinx.coroutines.flow.MutableStateFlow @Composable fun InstalledScreen( diff --git a/app/src/main/java/com/aurora/store/compose/ui/onboarding/MicroGPage.kt b/app/src/main/java/com/aurora/store/compose/ui/onboarding/MicroGPage.kt index f26fdac17..502582860 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/onboarding/MicroGPage.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/onboarding/MicroGPage.kt @@ -33,12 +33,12 @@ import com.aurora.store.viewmodel.onboarding.MicroGViewModel @Composable fun MicroGPage( onMicrogTOSChecked: (Boolean) -> Unit = {}, - viewModel: MicroGViewModel = hiltViewModel(), + viewModel: MicroGViewModel = hiltViewModel() ) { ScreenContent( uiState = viewModel.uiState, onInstall = { viewModel.downloadMicroG() }, - onMicrogTOSChecked = onMicrogTOSChecked, + onMicrogTOSChecked = onMicrogTOSChecked ) } @@ -88,7 +88,6 @@ private fun ScreenContent( onTOSChecked = onMicrogTOSChecked ) } - } @Preview(showBackground = true) @@ -96,7 +95,7 @@ private fun ScreenContent( private fun MicroGPagePreview() { PreviewTemplate { ScreenContent( - uiState = MicroGUIState(), + uiState = MicroGUIState() ) } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt index 53cf8a5cb..66d67f521 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt @@ -71,9 +71,7 @@ private fun ScreenContent( val pagerState = rememberPagerState { pages.size } val coroutineScope = rememberCoroutineScope() - fun isFinalPage(): Boolean { - return pagerState.currentPage == (pagerState.pageCount - 1) - } + fun isFinalPage(): Boolean = pagerState.currentPage == (pagerState.pageCount - 1) @Composable fun SetupActions(uiState: OnboardingUiState) { @@ -105,6 +103,7 @@ private fun ScreenContent( onClick = { when (pagerState.currentPage) { 0 -> onFinishOnboarding() + else -> { coroutineScope.launch { pagerState.animateScrollToPage(pagerState.currentPage - 1) @@ -125,10 +124,13 @@ private fun ScreenContent( Button( modifier = buttonWidthModifier, - enabled = !isFinalPage() || (!uiState.isMicroBundleChecked || uiState.isMicroGBundleInstalled), + enabled = + !isFinalPage() || + (!uiState.isMicroBundleChecked || uiState.isMicroGBundleInstalled), onClick = { when { isFinalPage() -> onFinishOnboarding() + else -> { coroutineScope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) @@ -182,8 +184,12 @@ private fun ScreenContent( ) { page -> when (pages[page]) { OnboardingPage.WELCOME -> WelcomePage() + OnboardingPage.PERMISSIONS -> PermissionsPage() - OnboardingPage.MICRO_G -> MicroGPage(onMicrogTOSChecked = onMicrogTOSChecked) + + OnboardingPage.MICRO_G -> MicroGPage( + onMicrogTOSChecked = onMicrogTOSChecked + ) } } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt index 492fdff85..a92ce7df2 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt @@ -73,11 +73,11 @@ import com.aurora.store.compose.preview.PreviewTemplate import com.aurora.store.compose.ui.details.AppDetailsScreen import com.aurora.store.data.model.SearchFilter import com.aurora.store.viewmodel.search.SearchViewModel +import kotlin.random.Random import kotlinx.coroutines.android.awaitFrame import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch -import kotlin.random.Random @Composable fun SearchScreen(onNavigateUp: () -> Unit, viewModel: SearchViewModel = hiltViewModel()) { @@ -103,7 +103,7 @@ private fun ScreenContent( onFetchSuggestions: (String) -> Unit = {}, onSearch: (String) -> Unit = {}, onFilter: (filter: SearchFilter) -> Unit = {}, - isAnonymous: Boolean = true, + isAnonymous: Boolean = true ) { val textFieldState = rememberTextFieldState() val searchBarState = rememberSearchBarState() @@ -191,8 +191,9 @@ private fun ScreenContent( @Composable fun ListPane() { + // TODO: https://issuetracker.google.com/issues/445720462 Scaffold( - modifier = Modifier.focusable(), //TODO: https://issuetracker.google.com/issues/445720462 + modifier = Modifier.focusable(), topBar = { SearchBar() } ) { paddingValues -> Column( @@ -317,7 +318,7 @@ private fun FilterHeader( contentDescription = stringResource(filter) ) } - }, + } ) } @@ -344,7 +345,7 @@ private fun FilterHeader( painter = painterResource(R.drawable.ic_arrow_drop_down), contentDescription = stringResource(filter) ) - }, + } ) DropdownMenu(expanded = isExpanded, onDismissRequest = { isExpanded = false }) { diff --git a/app/src/main/java/com/aurora/store/compose/ui/spoof/DevicePage.kt b/app/src/main/java/com/aurora/store/compose/ui/spoof/DevicePage.kt index de6202643..2de199f3b 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/spoof/DevicePage.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/spoof/DevicePage.kt @@ -28,10 +28,7 @@ import java.util.Properties import kotlin.random.Random @Composable -fun DevicePage( - onRequestNavigateToSplash: () -> Unit, - viewModel: SpoofViewModel = hiltViewModel(), -) { +fun DevicePage(onRequestNavigateToSplash: () -> Unit, viewModel: SpoofViewModel = hiltViewModel()) { val availableDevices by viewModel.availableDevices.collectAsStateWithLifecycle() val currentDevice by viewModel.currentDevice.collectAsStateWithLifecycle() @@ -100,14 +97,12 @@ private fun PageContent( @Preview(showBackground = true) @Composable private fun DevicePagePreview() { - fun getDevice(): Properties { - return Properties().apply { - setProperty("UserReadableName", "Google Pixel 9a") - setProperty("Build.VERSION.SDK_INT", "35") - setProperty("Build.MANUFACTURER", "Google") - setProperty("Platforms", "arm64-v8a") - setProperty("Build.PRODUCT", Random.nextInt().toString()) - } + fun getDevice(): Properties = Properties().apply { + setProperty("UserReadableName", "Google Pixel 9a") + setProperty("Build.VERSION.SDK_INT", "35") + setProperty("Build.MANUFACTURER", "Google") + setProperty("Platforms", "arm64-v8a") + setProperty("Build.PRODUCT", Random.nextInt().toString()) } PreviewTemplate { diff --git a/app/src/main/java/com/aurora/store/compose/ui/spoof/LocalePage.kt b/app/src/main/java/com/aurora/store/compose/ui/spoof/LocalePage.kt index 5543efa68..99c75fae6 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/spoof/LocalePage.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/spoof/LocalePage.kt @@ -27,10 +27,7 @@ import com.aurora.store.viewmodel.spoof.SpoofViewModel import java.util.Locale @Composable -fun LocalePage( - onRequestNavigateToSplash: () -> Unit, - viewModel: SpoofViewModel = hiltViewModel() -) { +fun LocalePage(onRequestNavigateToSplash: () -> Unit, viewModel: SpoofViewModel = hiltViewModel()) { val availableLocales by viewModel.availableLocales.collectAsStateWithLifecycle() val currentLocale by viewModel.currentLocale.collectAsStateWithLifecycle() @@ -50,7 +47,7 @@ private fun PageContent( defaultLocale: Locale = Locale.getDefault(), locales: List = emptyList(), isLocaleSelected: (locale: Locale) -> Boolean = { false }, - onLocaleSelected: (locale: Locale) -> Unit = {}, + onLocaleSelected: (locale: Locale) -> Unit = {} ) { LazyColumn( modifier = Modifier.fillMaxSize(), diff --git a/app/src/main/java/com/aurora/store/compose/ui/spoof/SpoofScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/spoof/SpoofScreen.kt index 7bd6e2325..4c2f1e392 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/spoof/SpoofScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/spoof/SpoofScreen.kt @@ -47,7 +47,7 @@ import kotlinx.coroutines.launch fun SpoofScreen( onNavigateUp: () -> Unit, onNavigateToSplash: () -> Unit, - viewModel: SpoofViewModel = hiltViewModel(), + viewModel: SpoofViewModel = hiltViewModel() ) { ScreenContent( onNavigateUp = onNavigateUp,