From 45aff80e76ad75c9fed6cebc69e4a785bbca6ab6 Mon Sep 17 00:00:00 2001 From: Carter Jernigan Date: Wed, 22 Jun 2022 05:48:19 -0400 Subject: [PATCH] [#511] Ktlint 0.46.1 --- .../zcash/crash/ReportableExceptionExt.kt | 2 ++ .../electriccoin/zcash/crash/ReportedExceptionExt.kt | 2 ++ gradle.properties | 2 +- .../androidTest/java/cash/z/ecc/sdk/test/Iterator.kt | 2 ++ .../src/main/java/cash/z/ecc/sdk/SynchronizerExt.kt | 2 ++ .../src/main/java/cash/z/ecc/sdk/ext/StringExt.kt | 2 ++ .../cash/z/ecc/sdk/fixture/WalletBirthdayFixture.kt | 1 + .../java/cash/z/ecc/sdk/fixture/ZecRequestFixture.kt | 1 + .../cash/z/ecc/sdk/fixture/Zip321UriParseFixture.kt | 3 ++- .../src/main/java/cash/z/ecc/sdk/type/ZcashNetwork.kt | 2 ++ .../src/main/java/cash/z/ecc/sdk/ext/ui/ZecSendExt.kt | 1 - .../process/AbstractProcessNameContentProviderTest.kt | 3 ++- .../co/electriccoin/zcash/spackle/ContextExt.kt | 2 ++ .../co/electriccoin/zcash/test/ZcashUiTestRunner.kt | 1 + .../electriccoin/zcash/ui/design/component/Button.kt | 2 +- .../co/electriccoin/zcash/ui/design/component/Chip.kt | 6 +++--- .../zcash/ui/design/component/Progress.kt | 8 ++++++-- .../zcash/ui/design/theme/internal/Color.kt | 4 ++-- .../zcash/ui/design/theme/internal/Typography.kt | 6 +++--- .../view/WalletAddressViewTest.kt | 2 +- .../zcash/ui/screen/request/view/RequestViewTest.kt | 1 + .../zcash/ui/screen/restore/view/RestoreViewTest.kt | 2 +- .../update/integration/UpdateViewIntegrationTest.kt | 2 +- .../ui/screen/update/view/AppUpdateCheckerImpTest.kt | 1 - .../zcash/ui/screen/update/view/UpdateViewTest.kt | 8 ++++---- .../co/electriccoin/zcash/global/WalletCoordinator.kt | 3 ++- .../java/co/electriccoin/zcash/ui/MainActivity.kt | 8 ++++---- .../java/co/electriccoin/zcash/ui/common/ListExt.kt | 2 ++ .../zcash/ui/fixture/TestChoicesFixture.kt | 2 +- .../zcash/ui/screen/about/AndroidAboutView.kt | 2 ++ .../zcash/ui/screen/about/view/AboutView.kt | 2 +- .../view/WalletAddressView.kt | 4 ++-- .../zcash/ui/screen/backup/AndroidBackup.kt | 3 ++- .../zcash/ui/screen/backup/ext/TestChoicesExt.kt | 5 +++-- .../zcash/ui/screen/backup/view/BackupView.kt | 7 ++++--- .../backup/view/{DropDown.kt => ChipDropDown.kt} | 6 ++++-- .../electriccoin/zcash/ui/screen/home/AndroidHome.kt | 2 ++ .../zcash/ui/screen/home/viewmodel/WalletViewModel.kt | 8 +++++--- .../zcash/ui/screen/onboarding/AndroidOnboarding.kt | 2 ++ .../zcash/ui/screen/onboarding/view/OnboardingView.kt | 5 +++-- .../zcash/ui/screen/profile/AndroidProfile.kt | 2 ++ .../zcash/ui/screen/profile/view/ProfileView.kt | 2 +- .../zcash/ui/screen/request/view/RequestView.kt | 2 +- .../zcash/ui/screen/restore/view/RestoreView.kt | 10 +++++++--- .../electriccoin/zcash/ui/screen/scan/AndroidScan.kt | 2 ++ .../zcash/ui/screen/scan/util/QrCodeAnalyzer.kt | 4 ++-- .../zcash/ui/screen/scan/view/ScanView.kt | 9 +++++---- .../zcash/ui/screen/send/view/SendView.kt | 2 +- .../zcash/ui/screen/settings/AndroidSettings.kt | 5 ++++- .../zcash/ui/screen/settings/view/SettingsView.kt | 2 +- .../zcash/ui/screen/support/AndroidSupport.kt | 2 ++ .../zcash/ui/screen/support/model/TimeInfo.kt | 2 +- .../zcash/ui/screen/support/view/SupportView.kt | 11 ++++++----- .../zcash/ui/screen/update/AndroidUpdate.kt | 2 +- .../zcash/ui/screen/update/AppUpdateChecker.kt | 2 +- .../zcash/ui/screen/update/view/UpdateView.kt | 2 +- 56 files changed, 122 insertions(+), 68 deletions(-) rename ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/{wallet_address => address}/view/WalletAddressViewTest.kt (98%) rename ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/{wallet_address => address}/view/WalletAddressView.kt (98%) rename ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/{DropDown.kt => ChipDropDown.kt} (96%) diff --git a/crash-lib/src/jvmMain/kotlin/co/electriccoin/zcash/crash/ReportableExceptionExt.kt b/crash-lib/src/jvmMain/kotlin/co/electriccoin/zcash/crash/ReportableExceptionExt.kt index 4a50ab0b..e05d1cb7 100644 --- a/crash-lib/src/jvmMain/kotlin/co/electriccoin/zcash/crash/ReportableExceptionExt.kt +++ b/crash-lib/src/jvmMain/kotlin/co/electriccoin/zcash/crash/ReportableExceptionExt.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.crash import co.electriccoin.zcash.spackle.io.writeAtomically diff --git a/crash-lib/src/jvmMain/kotlin/co/electriccoin/zcash/crash/ReportedExceptionExt.kt b/crash-lib/src/jvmMain/kotlin/co/electriccoin/zcash/crash/ReportedExceptionExt.kt index fa90548d..a72688d1 100644 --- a/crash-lib/src/jvmMain/kotlin/co/electriccoin/zcash/crash/ReportedExceptionExt.kt +++ b/crash-lib/src/jvmMain/kotlin/co/electriccoin/zcash/crash/ReportedExceptionExt.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.crash import kotlinx.datetime.Instant diff --git a/gradle.properties b/gradle.properties index 4662c1e2..5c0375f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -89,7 +89,7 @@ FLANK_VERSION=21.09.0 FULLADLE_VERSION=0.17.4 GRADLE_VERSIONS_PLUGIN_VERSION=0.42.0 JGIT_VERSION=6.1.0.202203080745-r -KTLINT_VERSION=0.45.2 +KTLINT_VERSION=0.46.1 PLAY_PUBLISHER_PLUGIN_VERSION=3.7.0 ACCOMPANIST_PERMISSIONS_VERSION=0.23.1 diff --git a/sdk-ext-lib/src/androidTest/java/cash/z/ecc/sdk/test/Iterator.kt b/sdk-ext-lib/src/androidTest/java/cash/z/ecc/sdk/test/Iterator.kt index c6838146..1826bc61 100644 --- a/sdk-ext-lib/src/androidTest/java/cash/z/ecc/sdk/test/Iterator.kt +++ b/sdk-ext-lib/src/androidTest/java/cash/z/ecc/sdk/test/Iterator.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package cash.z.ecc.sdk.test fun Iterator.count(): Int { diff --git a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/SynchronizerExt.kt b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/SynchronizerExt.kt index eeadfb0b..5a5cada1 100644 --- a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/SynchronizerExt.kt +++ b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/SynchronizerExt.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package cash.z.ecc.sdk import cash.z.ecc.android.sdk.Synchronizer diff --git a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/ext/StringExt.kt b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/ext/StringExt.kt index 53036fb8..4cb17b29 100644 --- a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/ext/StringExt.kt +++ b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/ext/StringExt.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package cash.z.ecc.sdk.ext import java.nio.charset.Charset diff --git a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/WalletBirthdayFixture.kt b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/WalletBirthdayFixture.kt index 45eb1d09..76e019e2 100644 --- a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/WalletBirthdayFixture.kt +++ b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/WalletBirthdayFixture.kt @@ -7,6 +7,7 @@ object WalletBirthdayFixture { const val HEIGHT = 1500000 const val HASH = "00047a34c61409682f44640af9352023ad92f69b827d0f2b288f152ebea50f46" const val EPOCH_SECONDS = 1627076501L + @Suppress("MaxLineLength") const val TREE = "01172b95f271c6af8f68388f08c8ef970db8ec8d8d61204ecb7b2bb2c38262b92d0010016284585a6c85dadfef27ff33f1403926b4bb391de92e8be797e4280cc4ca2971000001a1ff388639379c0120782b3929bd8871af797be4b651f694aa961bad65a9c12400000001d806c98bda9653d5ae22757eed750871e16e0fb657f52c3d771a4411668e84330001260f6e9fac0922f98d58afbcc3f391ac19d5d944081466929a33b99df19c0e6a0000013d2fd009bf8a22d68f720eac19c411c99014ed9c5f85d5942e15d1fc039e28680001f08f39275112dd8905b854170b7f247cf2df18454d4fa94e6e4f9320cca05f24011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39" diff --git a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/ZecRequestFixture.kt b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/ZecRequestFixture.kt index 342ef18c..89828e8c 100644 --- a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/ZecRequestFixture.kt +++ b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/ZecRequestFixture.kt @@ -7,6 +7,7 @@ import cash.z.ecc.sdk.model.ZecRequestMessage object ZecRequestFixture { const val ADDRESS: String = WalletAddressFixture.UNIFIED_ADDRESS_STRING + @Suppress("MagicNumber") val AMOUNT = Zatoshi(123) val MESSAGE = ZecRequestMessage("Thanks for lunch") diff --git a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/Zip321UriParseFixture.kt b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/Zip321UriParseFixture.kt index 33bf5ad5..08d5154b 100644 --- a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/Zip321UriParseFixture.kt +++ b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/Zip321UriParseFixture.kt @@ -11,6 +11,7 @@ object Zip321UriParseFixture { "for%20your%20purchase" const val ADDRESS: String = WalletAddressFixture.UNIFIED_ADDRESS_STRING + @Suppress("MagicNumber") val AMOUNT = Zatoshi(123) val MESSAGE = ZecRequestMessage("Thank you for your purchase") @@ -19,6 +20,6 @@ object Zip321UriParseFixture { // Should return ZecRequest.fromUri(toParse) ideally, but it'd end up with an infinite loop for now. @Suppress("UNUSED_PARAMETER") suspend fun new( - toParse: String = URI, + toParse: String = URI ) = ZecRequest(WalletAddress.Unified.new(ADDRESS), AMOUNT, MESSAGE) } diff --git a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/type/ZcashNetwork.kt b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/type/ZcashNetwork.kt index 25ae0d8d..0b72c0ef 100644 --- a/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/type/ZcashNetwork.kt +++ b/sdk-ext-lib/src/main/java/cash/z/ecc/sdk/type/ZcashNetwork.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package cash.z.ecc.sdk.type import android.content.Context diff --git a/sdk-ext-ui-lib/src/main/java/cash/z/ecc/sdk/ext/ui/ZecSendExt.kt b/sdk-ext-ui-lib/src/main/java/cash/z/ecc/sdk/ext/ui/ZecSendExt.kt index 99ec294f..ee21304f 100644 --- a/sdk-ext-ui-lib/src/main/java/cash/z/ecc/sdk/ext/ui/ZecSendExt.kt +++ b/sdk-ext-ui-lib/src/main/java/cash/z/ecc/sdk/ext/ui/ZecSendExt.kt @@ -18,7 +18,6 @@ object ZecSendExt { memoString: String, monetarySeparators: MonetarySeparators ): ZecSendValidation { - // This runBlocking shouldn't have a performance impact, since everything needs to be loaded at this point. // However it would be better to eliminate it entirely. val destination = runBlocking { WalletAddress.Unified.new(destinationString) } diff --git a/spackle-android-lib/src/androidTest/java/co/electriccoin/zcash/spackle/process/AbstractProcessNameContentProviderTest.kt b/spackle-android-lib/src/androidTest/java/co/electriccoin/zcash/spackle/process/AbstractProcessNameContentProviderTest.kt index f4dcb375..87e4c23f 100644 --- a/spackle-android-lib/src/androidTest/java/co/electriccoin/zcash/spackle/process/AbstractProcessNameContentProviderTest.kt +++ b/spackle-android-lib/src/androidTest/java/co/electriccoin/zcash/spackle/process/AbstractProcessNameContentProviderTest.kt @@ -20,7 +20,8 @@ class AbstractProcessNameContentProviderTest { } val actualProcessName = AbstractProcessNameContentProvider.getProcessNameLegacy( - ctx, ProviderInfo() + ctx, + ProviderInfo() ) assertEquals(expectedApplicationProcessName, actualProcessName) diff --git a/spackle-android-lib/src/main/kotlin/co/electriccoin/zcash/spackle/ContextExt.kt b/spackle-android-lib/src/main/kotlin/co/electriccoin/zcash/spackle/ContextExt.kt index c3d3f32f..fb437093 100644 --- a/spackle-android-lib/src/main/kotlin/co/electriccoin/zcash/spackle/ContextExt.kt +++ b/spackle-android-lib/src/main/kotlin/co/electriccoin/zcash/spackle/ContextExt.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.spackle import android.content.Context diff --git a/test-lib/src/main/kotlin/co/electriccoin/zcash/test/ZcashUiTestRunner.kt b/test-lib/src/main/kotlin/co/electriccoin/zcash/test/ZcashUiTestRunner.kt index 9be0f9c9..e27d7004 100644 --- a/test-lib/src/main/kotlin/co/electriccoin/zcash/test/ZcashUiTestRunner.kt +++ b/test-lib/src/main/kotlin/co/electriccoin/zcash/test/ZcashUiTestRunner.kt @@ -14,6 +14,7 @@ class ZcashUiTestRunner : AndroidJUnitRunner() { val powerManager = ApplicationProvider.getApplicationContext() .getSystemService(Context.POWER_SERVICE) as PowerManager + // There is no alternative to this deprecated API. The suggestion of a view to keep the screen // on won't work well for our tests. @Suppress("DEPRECATION") diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt index 16255456..0ea9aee1 100644 --- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt @@ -34,7 +34,7 @@ fun PrimaryButton( onClick: () -> Unit, text: String, modifier: Modifier = Modifier, - enabled: Boolean = true, + enabled: Boolean = true ) { Button( onClick = onClick, diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Chip.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Chip.kt index 7a012d00..9fe8e5c8 100644 --- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Chip.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Chip.kt @@ -27,13 +27,13 @@ fun ComposablePreview() { fun Chip( index: Index, text: String, - modifier: Modifier = Modifier, + modifier: Modifier = Modifier ) { Surface( modifier = modifier.then(Modifier.padding(4.dp)), shape = RoundedCornerShape(8.dp), color = MaterialTheme.colorScheme.secondary, - shadowElevation = 8.dp, + shadowElevation = 8.dp ) { Row( modifier = Modifier @@ -42,7 +42,7 @@ fun Chip( Text( text = (index.value + 1).toString(), style = ZcashTheme.typography.chipIndex, - color = ZcashTheme.colors.chipIndex, + color = ZcashTheme.colors.chipIndex ) Spacer(modifier = Modifier.padding(horizontal = 2.dp, vertical = 0.dp)) Text( diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Progress.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Progress.kt index f55971b9..78a9bcb5 100644 --- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Progress.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Progress.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.design.component import androidx.compose.material3.LinearProgressIndicator @@ -11,8 +13,10 @@ import co.electriccoin.zcash.ui.design.theme.ZcashTheme fun PinkProgress(progress: Progress, modifier: Modifier = Modifier) { // Needs custom implementation to apply gradient LinearProgressIndicator( - progress = progress.percent(), modifier, - ZcashTheme.colors.progressStart, ZcashTheme.colors.progressBackground + progress = progress.percent(), + modifier, + ZcashTheme.colors.progressStart, + ZcashTheme.colors.progressBackground ) } diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Color.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Color.kt index c5a73768..2c3dad6a 100644 --- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Color.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Color.kt @@ -117,7 +117,7 @@ internal val DarkColorPalette = darkColorScheme( surface = Dark.backgroundStart, onSurface = Dark.textBodyOnBackground, background = Dark.backgroundStart, - onBackground = Dark.textBodyOnBackground, + onBackground = Dark.textBodyOnBackground ) internal val LightColorPalette = lightColorScheme( @@ -128,7 +128,7 @@ internal val LightColorPalette = lightColorScheme( surface = Light.backgroundStart, onSurface = Light.textBodyOnBackground, background = Light.backgroundStart, - onBackground = Light.textBodyOnBackground, + onBackground = Light.textBodyOnBackground ) internal val DarkExtendedColorPalette = ExtendedColors( diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Typography.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Typography.kt index cd33c3d1..6b6a8d6b 100644 --- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Typography.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Typography.kt @@ -39,7 +39,7 @@ internal val Typography = Typography( headlineLarge = TextStyle( fontFamily = RubikFontFamily, fontWeight = FontWeight.SemiBold, - fontSize = 30.sp, + fontSize = 30.sp ), bodyLarge = TextStyle( fontFamily = RubikFontFamily, @@ -55,13 +55,13 @@ internal val Typography = Typography( fontFamily = RubikFontFamily, fontWeight = FontWeight.Normal, fontSize = 16.sp - ), + ) ) @Immutable data class ExtendedTypography( val chipIndex: TextStyle, - val listItem: TextStyle, + val listItem: TextStyle ) val LocalExtendedTypography = staticCompositionLocalOf { diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/address/view/WalletAddressViewTest.kt similarity index 98% rename from ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/address/view/WalletAddressViewTest.kt index 3da0595d..e7c8927d 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/address/view/WalletAddressViewTest.kt @@ -1,4 +1,4 @@ -package co.electriccoin.zcash.ui.screen.wallet_address.view +package co.electriccoin.zcash.ui.screen.address.view import androidx.compose.ui.test.junit4.ComposeContentTestRule import androidx.compose.ui.test.junit4.createComposeRule diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/request/view/RequestViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/request/view/RequestViewTest.kt index 832bccbf..fe74ffab 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/request/view/RequestViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/request/view/RequestViewTest.kt @@ -206,6 +206,7 @@ class RequestViewTest : UiTestPrerequisites() { private val onBackCount = AtomicInteger(0) private val onCreateCount = AtomicInteger(0) + @Volatile private var onCreateZecRequest: ZecRequest? = null diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt index 83d456e6..c6d1e4b0 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt @@ -227,7 +227,7 @@ class RestoreViewTest : UiTestPrerequisites() { paste = { "" }, onFinished = { onFinishedCount.incrementAndGet() - }, + } ) } } diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/integration/UpdateViewIntegrationTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/integration/UpdateViewIntegrationTest.kt index 61bbee4c..b555b59e 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/integration/UpdateViewIntegrationTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/integration/UpdateViewIntegrationTest.kt @@ -31,7 +31,7 @@ class UpdateViewIntegrationTest { priority = AppUpdateChecker.Priority.HIGH, force = true, appUpdateInfo = null, - state = UpdateState.Prepared, + state = UpdateState.Prepared ) ) diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/AppUpdateCheckerImpTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/AppUpdateCheckerImpTest.kt index 7e5fa640..1dd77c9c 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/AppUpdateCheckerImpTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/AppUpdateCheckerImpTest.kt @@ -58,7 +58,6 @@ class AppUpdateCheckerImpTest { @MediumTest @OptIn(ExperimentalCoroutinesApi::class) fun start_update_availability_test() = runTest { - getAppUpdateInfoFlow().onFirst { updateInfo -> // In case we get result with FAILED state, e.g. app is still not released in the Google // Play store, there is no way to continue with the test. diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/UpdateViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/UpdateViewTest.kt index 9bac49eb..12faae5c 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/UpdateViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/UpdateViewTest.kt @@ -33,7 +33,7 @@ class UpdateViewTest : UiTestPrerequisites() { priority = AppUpdateChecker.Priority.HIGH, force = true, appUpdateInfo = null, - state = UpdateState.Prepared, + state = UpdateState.Prepared ) newTestSetup(updateInfo) @@ -58,7 +58,7 @@ class UpdateViewTest : UiTestPrerequisites() { priority = AppUpdateChecker.Priority.LOW, force = false, appUpdateInfo = null, - state = UpdateState.Prepared, + state = UpdateState.Prepared ) val testSetup = newTestSetup(updateInfo) @@ -76,7 +76,7 @@ class UpdateViewTest : UiTestPrerequisites() { priority = AppUpdateChecker.Priority.MEDIUM, force = false, appUpdateInfo = null, - state = UpdateState.Prepared, + state = UpdateState.Prepared ) newTestSetup(updateInfo) @@ -99,7 +99,7 @@ class UpdateViewTest : UiTestPrerequisites() { priority = AppUpdateChecker.Priority.HIGH, force = true, appUpdateInfo = null, - state = UpdateState.Prepared, + state = UpdateState.Prepared ) val testSetup = newTestSetup(updateInfo) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/global/WalletCoordinator.kt b/ui-lib/src/main/java/co/electriccoin/zcash/global/WalletCoordinator.kt index ddfa36bf..4946a0b2 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/global/WalletCoordinator.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/global/WalletCoordinator.kt @@ -125,7 +125,8 @@ class WalletCoordinator(context: Context) { } } .stateIn( - walletScope, SharingStarted.WhileSubscribed(), + walletScope, + SharingStarted.WhileSubscribed(), null ) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt index 180c6cf4..fab14583 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt @@ -29,6 +29,7 @@ import co.electriccoin.zcash.ui.design.component.GradientSurface import co.electriccoin.zcash.ui.design.component.Override import co.electriccoin.zcash.ui.design.theme.ZcashTheme import co.electriccoin.zcash.ui.screen.about.WrapAbout +import co.electriccoin.zcash.ui.screen.address.view.WalletAddresses import co.electriccoin.zcash.ui.screen.backup.WrapBackup import co.electriccoin.zcash.ui.screen.backup.copyToClipboard import co.electriccoin.zcash.ui.screen.home.WrapHome @@ -47,7 +48,6 @@ import co.electriccoin.zcash.ui.screen.support.WrapSupport import co.electriccoin.zcash.ui.screen.update.AppUpdateCheckerImp import co.electriccoin.zcash.ui.screen.update.WrapUpdate import co.electriccoin.zcash.ui.screen.update.model.UpdateState -import co.electriccoin.zcash.ui.screen.wallet_address.view.WalletAddresses import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking @@ -265,7 +265,7 @@ class MainActivity : ComponentActivity() { @Composable private fun WrapWalletAddresses( - goBack: () -> Unit, + goBack: () -> Unit ) { val walletAddresses = walletViewModel.addresses.collectAsState().value if (null == walletAddresses) { @@ -321,7 +321,7 @@ class MainActivity : ComponentActivity() { startActivity(chooserIntent) goBack() - }, + } ) } } @@ -343,7 +343,7 @@ class MainActivity : ComponentActivity() { synchronizer.send(spendingKey, it) goBack() - }, + } ) } } diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/common/ListExt.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/common/ListExt.kt index 1b12c136..70ad6935 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/common/ListExt.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/common/ListExt.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.common fun List.first(count: Int) = subList(0, minOf(size, count)) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/TestChoicesFixture.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/TestChoicesFixture.kt index dbb63d93..e15feefb 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/TestChoicesFixture.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/TestChoicesFixture.kt @@ -8,7 +8,7 @@ object TestChoicesFixture { val INITIAL_CHOICES = mapOf( Pair(Index(0), "baz"), - Pair(Index(1), "foo"), + Pair(Index(1), "foo") ) fun new(initial: Map = INITIAL_CHOICES) = TestChoices(initial) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/AndroidAboutView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/AndroidAboutView.kt index fad5b39a..d0e6dc5c 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/AndroidAboutView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/AndroidAboutView.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.screen.about import androidx.activity.ComponentActivity diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/view/AboutView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/view/AboutView.kt index 9fcc0465..0bb496b0 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/view/AboutView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/view/AboutView.kt @@ -44,7 +44,7 @@ fun AboutPreview() { @Composable fun About( versionInfo: VersionInfo, - goBack: () -> Unit, + goBack: () -> Unit ) { Scaffold(topBar = { AboutTopAppBar(onBack = goBack) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/address/view/WalletAddressView.kt similarity index 98% rename from ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/address/view/WalletAddressView.kt index c6704436..a011329e 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/address/view/WalletAddressView.kt @@ -1,6 +1,6 @@ -@file:Suppress("TooManyFunctions", "PackageNaming") +@file:Suppress("TooManyFunctions") -package co.electriccoin.zcash.ui.screen.wallet_address.view +package co.electriccoin.zcash.ui.screen.address.view import androidx.compose.foundation.Image import androidx.compose.foundation.border diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/AndroidBackup.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/AndroidBackup.kt index 648b9a39..2e42d212 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/AndroidBackup.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/AndroidBackup.kt @@ -36,7 +36,8 @@ internal fun WrapBackup( val backupViewModel by activity.viewModels() WrapBackup( - persistableWallet, backupViewModel.backupState, + persistableWallet, + backupViewModel.backupState, onCopyToClipboard = { copyToClipboard(activity.applicationContext, persistableWallet) }, onBackupComplete = onBackupComplete ) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/ext/TestChoicesExt.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/ext/TestChoicesExt.kt index 32cd4920..9b7a37a5 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/ext/TestChoicesExt.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/ext/TestChoicesExt.kt @@ -22,8 +22,9 @@ private fun TestChoices.toSaverMap() = buildMap { @Suppress("UNCHECKED_CAST") private fun fromSaverMap(map: Map): Map { - return if (map.isEmpty()) + return if (map.isEmpty()) { emptyMap() - else + } else { (map[KEY_TEST_CHOICES] as Map).mapKeys { Index(it.key) } + } } diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/BackupView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/BackupView.kt index eda61608..670d0230 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/BackupView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/BackupView.kt @@ -67,7 +67,7 @@ fun BackupWallet( choices: TestChoices, onCopyToClipboard: () -> Unit, onComplete: () -> Unit, - onChoicesChanged: ((choicesCount: Int) -> Unit)?, + onChoicesChanged: ((choicesCount: Int) -> Unit)? ) { Column { when (backupState.current.collectAsState().value) { @@ -185,7 +185,7 @@ private fun TestInProgress( splitSeedPhrase: List, selectedTestChoices: TestChoices, onBack: () -> Unit, - onChoicesChanged: ((choicesCount: Int) -> Unit)?, + onChoicesChanged: ((choicesCount: Int) -> Unit)? ) { val testChoices = splitSeedPhrase .mapIndexed { index, word -> TestChoice(Index(index), word) } @@ -224,8 +224,9 @@ private fun TestInProgress( this[currentIndex] = testChoices[it.value].word } ) - if (onChoicesChanged != null) + if (onChoicesChanged != null) { onChoicesChanged(selectedTestChoices.current.value.size) + } } } else { Chip( diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/DropDown.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/ChipDropDown.kt similarity index 96% rename from ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/DropDown.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/ChipDropDown.kt index 36dd53b8..9f0dad3b 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/DropDown.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/ChipDropDown.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.screen.backup.view import androidx.compose.foundation.clickable @@ -55,13 +57,13 @@ fun ChipDropDown( color = MaterialTheme.colorScheme.secondary, contentColor = MaterialTheme.colorScheme.secondary, tonalElevation = 8.dp, - shadowElevation = 8.dp, + shadowElevation = 8.dp ) { Row(modifier = Modifier.padding(8.dp)) { Text( text = (chipIndex.value + 1).toString(), style = ZcashTheme.typography.chipIndex, - color = ZcashTheme.colors.chipIndex, + color = ZcashTheme.colors.chipIndex ) Spacer(modifier = Modifier.padding(horizontal = 2.dp, vertical = 0.dp)) Text( diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/AndroidHome.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/AndroidHome.kt index ece14d96..c8ebb095 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/AndroidHome.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/AndroidHome.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.screen.home import androidx.activity.ComponentActivity diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/viewmodel/WalletViewModel.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/viewmodel/WalletViewModel.kt index 4910eec0..2c40af9a 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/viewmodel/WalletViewModel.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/viewmodel/WalletViewModel.kt @@ -127,7 +127,8 @@ class WalletViewModel(application: Application) : AndroidViewModel(application) } } .stateIn( - viewModelScope, SharingStarted.WhileSubscribed(ANDROID_STATE_FLOW_TIMEOUT), + viewModelScope, + SharingStarted.WhileSubscribed(ANDROID_STATE_FLOW_TIMEOUT), emptyList() ) @@ -136,7 +137,8 @@ class WalletViewModel(application: Application) : AndroidViewModel(application) .filterIsInstance() .map { WalletAddresses.new(it.persistableWallet) } .stateIn( - viewModelScope, SharingStarted.WhileSubscribed(ANDROID_STATE_FLOW_TIMEOUT), + viewModelScope, + SharingStarted.WhileSubscribed(ANDROID_STATE_FLOW_TIMEOUT), null ) @@ -269,7 +271,7 @@ private fun Synchronizer.toTransactions() = clearedTransactions.distinctUntilChanged(), pendingTransactions.distinctUntilChanged(), sentTransactions.distinctUntilChanged(), - receivedTransactions.distinctUntilChanged(), + receivedTransactions.distinctUntilChanged() ) { cleared, pending, sent, received -> // TODO [#157]: Sort the transactions to show the most recent buildList { diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt index d06c53a7..4028c0aa 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.screen.onboarding import android.content.ClipboardManager diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingView.kt index 4429edee..9b9b3a08 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingView.kt @@ -83,7 +83,7 @@ fun Onboarding( isDebugMenuEnabled: Boolean, onImportWallet: () -> Unit, onCreateWallet: () -> Unit, - onFixtureWallet: () -> Unit, + onFixtureWallet: () -> Unit ) { Scaffold( topBar = { @@ -270,7 +270,8 @@ private fun Wallet(onCreateWallet: () -> Unit, onImportWallet: () -> Unit) { Body(stringResource(R.string.onboarding_4_body)) PrimaryButton(onCreateWallet, stringResource(R.string.onboarding_4_create_new_wallet), Modifier.fillMaxWidth()) TertiaryButton( - onImportWallet, stringResource(R.string.onboarding_4_import_existing_wallet), + onImportWallet, + stringResource(R.string.onboarding_4_import_existing_wallet), Modifier.fillMaxWidth() ) } diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/AndroidProfile.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/AndroidProfile.kt index 2ad92a85..1253dc7c 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/AndroidProfile.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/AndroidProfile.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.screen.profile import androidx.activity.ComponentActivity diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileView.kt index e8a50913..92059728 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileView.kt @@ -92,7 +92,7 @@ private fun ProfileTopAppBar(onBack: () -> Unit) { ) { Icon( imageVector = Icons.Filled.ArrowBack, - contentDescription = stringResource(R.string.profile_back_content_description), + contentDescription = stringResource(R.string.profile_back_content_description) ) } } diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestView.kt index 86e62e72..7e304aa5 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestView.kt @@ -63,7 +63,7 @@ fun PreviewRequest() { fun Request( myAddress: WalletAddress.Unified, goBack: () -> Unit, - onCreateAndSend: (ZecRequest) -> Unit, + onCreateAndSend: (ZecRequest) -> Unit ) { Scaffold(topBar = { RequestTopAppBar(onBack = goBack) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt index 72e812f3..31009630 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt @@ -254,7 +254,8 @@ private fun ChipGridWithText( Modifier .focusRequester(focusRequester) .weight((CHIP_GRID_ROW_SIZE - chunk.size) * singleItemWeight), - text, setText + text, + setText ) } } @@ -273,7 +274,8 @@ private fun NextWordTextField(modifier: Modifier = Modifier, text: String, setTe * Treat the user input as a password, but disable the transformation to obscure input. */ TextField( - value = text, onValueChange = setText, + value = text, + onValueChange = setText, modifier = modifier .fillMaxWidth() .height(IntrinsicSize.Max) @@ -281,7 +283,9 @@ private fun NextWordTextField(modifier: Modifier = Modifier, text: String, setTe visualTransformation = VisualTransformation.None, keyboardOptions = KeyboardOptions( KeyboardCapitalization.None, - autoCorrect = false, imeAction = ImeAction.Done, keyboardType = KeyboardType.Password + autoCorrect = false, + imeAction = ImeAction.Done, + keyboardType = KeyboardType.Password ), keyboardActions = KeyboardActions(onAny = {}) ) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/AndroidScan.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/AndroidScan.kt index 44e03808..3cf879c7 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/AndroidScan.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/AndroidScan.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.screen.scan import androidx.activity.ComponentActivity diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/util/QrCodeAnalyzer.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/util/QrCodeAnalyzer.kt index 4bcf754f..2379e258 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/util/QrCodeAnalyzer.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/util/QrCodeAnalyzer.kt @@ -13,13 +13,13 @@ import java.nio.ByteBuffer // TODO [#437]: https://github.com/zcash/secant-android-wallet/issues/437 class QrCodeAnalyzer( - private val onQrCodeScanned: (String) -> Unit, + private val onQrCodeScanned: (String) -> Unit ) : ImageAnalysis.Analyzer { private val supportedImageFormats = listOf( ImageFormat.YUV_420_888, ImageFormat.YUV_422_888, - ImageFormat.YUV_444_888, + ImageFormat.YUV_444_888 ) override fun analyze(image: ImageProxy) { diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/view/ScanView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/view/ScanView.kt index 4e144998..9fabd51e 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/view/ScanView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/view/ScanView.kt @@ -98,11 +98,11 @@ fun Scan( onBack: () -> Unit, onScanned: (String) -> Unit, onOpenSettings: () -> Unit, - onScanStateChanged: (ScanState) -> Unit, + onScanStateChanged: (ScanState) -> Unit ) { Scaffold( topBar = { ScanTopAppBar(onBack = onBack) }, - snackbarHost = { SnackbarHost(snackbarHostState) }, + snackbarHost = { SnackbarHost(snackbarHostState) } ) { paddingValues -> ScanMainContent( paddingValues, @@ -210,8 +210,9 @@ private fun ScanMainContent( } else if (scanState == ScanState.Failed) { // keep current state } else if (permissionState.hasPermission) { - if (scanState != ScanState.Scanning) + if (scanState != ScanState.Scanning) { setScanState(ScanState.Scanning) + } } // we calculate the best frame size for the current device screen @@ -271,7 +272,7 @@ private fun ScanMainContent( onScanStateChanged(ScanState.Failed) val snackbarResult = snackbarHostState.showSnackbar( message = context.getString(R.string.scan_setup_failed), - actionLabel = context.getString(R.string.scan_setup_back), + actionLabel = context.getString(R.string.scan_setup_back) ) if (snackbarResult == SnackbarResult.ActionPerformed) { onBack() diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/view/SendView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/view/SendView.kt index c80eeb29..5a2ef19c 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/view/SendView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/view/SendView.kt @@ -68,7 +68,7 @@ fun PreviewSend() { fun Send( mySpendableBalance: Zatoshi, goBack: () -> Unit, - onCreateAndSend: (ZecSend) -> Unit, + onCreateAndSend: (ZecSend) -> Unit ) { // For now, we're avoiding sub-navigation to keep the navigation logic simple. But this might // change once deep-linking support is added. It depends on whether deep linking should do one of: diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/AndroidSettings.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/AndroidSettings.kt index 79558192..71211d8d 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/AndroidSettings.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/AndroidSettings.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.screen.settings import androidx.activity.ComponentActivity @@ -39,7 +41,8 @@ private fun WrapSettings( onBackupWallet = goWalletBackup, onRescanWallet = { walletViewModel.rescanBlockchain() - }, onWipeWallet = { + }, + onWipeWallet = { walletViewModel.wipeEntireWallet() val onboardingViewModel by activity.viewModels() diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsView.kt index e93ec503..f43d1ebf 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsView.kt @@ -42,7 +42,7 @@ fun Settings( onBack: () -> Unit, onBackupWallet: () -> Unit, onWipeWallet: () -> Unit, - onRescanWallet: () -> Unit, + onRescanWallet: () -> Unit ) { Scaffold(topBar = { SettingsTopAppBar(onBack = onBack) diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/AndroidSupport.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/AndroidSupport.kt index 39f587df..865d632f 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/AndroidSupport.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/AndroidSupport.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:filename") + package co.electriccoin.zcash.ui.screen.support import android.content.Intent diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/model/TimeInfo.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/model/TimeInfo.kt index 84e7e976..170db04f 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/model/TimeInfo.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/model/TimeInfo.kt @@ -36,7 +36,7 @@ class TimeInfo( currentTime = currentTime, rebootTime = currentTime - elapsedRealtime, installTime = Instant.fromEpochMilliseconds(packageInfo.firstInstallTime), - updateTime = Instant.fromEpochMilliseconds(packageInfo.lastUpdateTime), + updateTime = Instant.fromEpochMilliseconds(packageInfo.lastUpdateTime) ) } } diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/view/SupportView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/view/SupportView.kt index a36543c1..d7308baf 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/view/SupportView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/view/SupportView.kt @@ -48,7 +48,7 @@ fun PreviewSupport() { fun Support( snackbarHostState: SnackbarHostState, onBack: () -> Unit, - onSend: (String) -> Unit, + onSend: (String) -> Unit ) { val (message, setMessage) = rememberSaveable { mutableStateOf("") } val (isShowingDialog, setShowDialog) = rememberSaveable { mutableStateOf(false) } @@ -56,7 +56,8 @@ fun Support( Scaffold( topBar = { SupportTopAppBar(onBack = onBack) - }, snackbarHost = { SnackbarHost(snackbarHostState) }, + }, + snackbarHost = { SnackbarHost(snackbarHostState) }, floatingActionButton = { FloatingActionButton(onClick = { setShowDialog(true) }) { Icon( @@ -131,20 +132,20 @@ private fun SupportConfirmationDialog( }, confirmButton = { Button( - onClick = onConfirm, + onClick = onConfirm ) { Text(stringResource(id = R.string.support_confirmation_dialog_ok)) } }, dismissButton = { Button( - onClick = onDismiss, + onClick = onDismiss ) { Text(stringResource(id = R.string.support_confirmation_dialog_cancel)) } }, text = { Text(stringResource(id = R.string.support_confirmation_explanation, stringResource(id = R.string.app_name))) - }, + } ) } diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AndroidUpdate.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AndroidUpdate.kt index 60df5d69..3fae1544 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AndroidUpdate.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AndroidUpdate.kt @@ -88,7 +88,7 @@ internal fun WrapUpdate( fun openPlayStoreAppPage( context: Context, snackbarHostState: SnackbarHostState, - scope: CoroutineScope, + scope: CoroutineScope ) { val storeIntent = PlayStoreUtil.newActivityIntent(context) runCatching { diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AppUpdateChecker.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AppUpdateChecker.kt index f1ddaa5e..052938f3 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AppUpdateChecker.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AppUpdateChecker.kt @@ -45,7 +45,7 @@ interface AppUpdateChecker { } fun newCheckForUpdateAvailabilityFlow( - context: Context, + context: Context ): Flow fun newStartUpdateFlow( diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/view/UpdateView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/view/UpdateView.kt index 2906f9d6..a9df4933 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/view/UpdateView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/view/UpdateView.kt @@ -125,7 +125,7 @@ private fun UpdateTopAppBar(updateInfo: UpdateInfo) { } ) ) - }, + } ) }