Skip to content

Commit 61858ca

Browse files
build: apply first ktlint format
1 parent 576c574 commit 61858ca

File tree

12 files changed

+46
-40
lines changed

12 files changed

+46
-40
lines changed

.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ ktlint_standard_multiline-expression-wrapping = disabled
1010
ktlint_standard_string-template-indent = disabled
1111
ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 5
1212
ktlint_function_naming_ignore_when_annotated_with=Composable
13+
ktlint_standard_function-expression-body = disabled
14+
ktlint_standard_class-signature = disabled

app/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ protobuf {
107107
}
108108

109109
ktlint {
110+
version = "1.5.0"
110111
ignoreFailures = false
111112
reporters {
112113
reporter(ReporterType.PLAIN).apply { outputToConsole = true }

app/src/main/java/org/bitcoindevkit/devkitwallet/domain/UserPreferencesRepository.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class UserPreferencesRepository(
4242
wallet
4343
}
4444
}
45-
currentPreferences.toBuilder()
45+
currentPreferences
46+
.toBuilder()
4647
.clearWallets()
4748
.addAllWallets(updatedWalletsList)
4849
.build()

app/src/main/java/org/bitcoindevkit/devkitwallet/domain/Wallet.kt

+6-4
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,12 @@ class Wallet private constructor(
236236
KeychainKind.INTERNAL
237237
)
238238
val walletId = UUID.randomUUID().toString()
239-
val connection = Connection("$internalAppFilesPath/wallet-${walletId.take(8)}.sqlite3",)
239+
val connection = Connection("$internalAppFilesPath/wallet-${walletId.take(8)}.sqlite3")
240240

241241
// Create SingleWallet object for saving to datastore
242242
val newWalletForDatastore: SingleWallet =
243-
SingleWallet.newBuilder()
243+
SingleWallet
244+
.newBuilder()
244245
.setId(walletId)
245246
.setName(newWalletConfig.name)
246247
.setNetwork(newWalletConfig.network.intoProto())
@@ -321,11 +322,12 @@ class Wallet private constructor(
321322
KeychainKind.INTERNAL
322323
)
323324
val walletId = UUID.randomUUID().toString()
324-
val connection = Connection("$internalAppFilesPath/wallet-${walletId.take(8)}.sqlite3",)
325+
val connection = Connection("$internalAppFilesPath/wallet-${walletId.take(8)}.sqlite3")
325326

326327
// Create SingleWallet object for saving to datastore
327328
val newWalletForDatastore: SingleWallet =
328-
SingleWallet.newBuilder()
329+
SingleWallet
330+
.newBuilder()
329331
.setId(walletId)
330332
.setName(recoverWalletConfig.name)
331333
.setNetwork(recoverWalletConfig.network.intoProto())

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/components/TransactionCards.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ fun ConfirmedTransactionCard(details: TxDetails, navController: NavController) {
4343
.background(
4444
color = DevkitWalletColors.primaryLight,
4545
shape = RoundedCornerShape(16.dp)
46-
)
47-
.clickable { viewTransaction(navController = navController, txid = details.txid) },
46+
).clickable { viewTransaction(navController = navController, txid = details.txid) },
4847
verticalAlignment = Alignment.CenterVertically,
4948
horizontalArrangement = Arrangement.Absolute.SpaceBetween
5049
) {
@@ -77,13 +76,11 @@ fun PendingTransactionCard(details: TxDetails, navController: NavController) {
7776
.background(
7877
color = DevkitWalletColors.primaryLight,
7978
shape = RoundedCornerShape(16.dp)
80-
)
81-
.border(
79+
).border(
8280
width = 2.dp,
8381
color = DevkitWalletColors.accent1,
8482
shape = RoundedCornerShape(16.dp)
85-
)
86-
.clickable {
83+
).clickable {
8784
viewTransaction(
8885
navController = navController,
8986
txid = details.txid

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/RecoveryPhraseScreen.kt

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ internal fun RecoveryPhraseScreen(recoveryPhrase: List<String>, navController: N
4444
},
4545
containerColor = DevkitWalletColors.primary
4646
) { paddingValues ->
47-
4847
Crossfade(
4948
modifier = Modifier.padding(paddingValues),
5049
targetState = currentIndex,

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/intro/CreateNewWallet.kt

+4-8
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ internal fun CreateNewWalletScreen(
8080
top.linkTo(parent.top)
8181
start.linkTo(parent.start)
8282
end.linkTo(parent.end)
83-
}
84-
.fillMaxSize()
83+
}.fillMaxSize()
8584
.background(color = DevkitWalletColors.primary)
8685
.padding(horizontal = 32.dp)
8786
) {
@@ -119,8 +118,7 @@ internal fun CreateNewWalletScreen(
119118
bottom.linkTo(parent.bottom)
120119
start.linkTo(parent.start)
121120
end.linkTo(parent.end)
122-
}
123-
.fillMaxWidth()
121+
}.fillMaxWidth()
124122
.padding(horizontal = 32.dp)
125123
) {
126124
NeutralButton(
@@ -156,8 +154,7 @@ fun NetworkOptionCard(networks: List<Network>, selectedNetwork: MutableState<Net
156154
width = 2.dp,
157155
color = DevkitWalletColors.secondary,
158156
shape = RoundedCornerShape(16.dp)
159-
)
160-
.background(
157+
).background(
161158
color = DevkitWalletColors.primaryLight,
162159
shape = RoundedCornerShape(16.dp)
163160
),
@@ -201,8 +198,7 @@ fun ScriptTypeOptionCard(
201198
width = 2.dp,
202199
color = DevkitWalletColors.secondary,
203200
shape = RoundedCornerShape(16.dp)
204-
)
205-
.background(
201+
).background(
206202
color = DevkitWalletColors.primaryLight,
207203
shape = RoundedCornerShape(16.dp)
208204
),

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/intro/RecoverWalletScreen.kt

+21-6
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,20 @@ internal fun RecoverWalletScreen(
6666
) {
6767
val (screenTitle, body) = createRefs()
6868

69-
val emptyRecoveryPhrase: Map<Int, String> =
70-
mapOf(
71-
1 to "", 2 to "", 3 to "", 4 to "", 5 to "", 6 to "",
72-
7 to "", 8 to "", 9 to "", 10 to "", 11 to "", 12 to ""
73-
)
69+
val emptyRecoveryPhrase: Map<Int, String> = mapOf(
70+
1 to "",
71+
2 to "",
72+
3 to "",
73+
4 to "",
74+
5 to "",
75+
6 to "",
76+
7 to "",
77+
8 to "",
78+
9 to "",
79+
10 to "",
80+
11 to "",
81+
12 to ""
82+
)
7483
val (recoveryPhraseWordMap, setRecoveryPhraseWordMap) = remember { mutableStateOf(emptyRecoveryPhrase) }
7584
val walletName: MutableState<String> = remember { mutableStateOf("") }
7685
var selectedNetwork: Network by remember { mutableStateOf(Network.TESTNET) }
@@ -243,7 +252,13 @@ fun WordField(
243252
private fun buildRecoveryPhrase(recoveryPhraseWordMap: Map<Int, String>): String {
244253
var recoveryPhrase = ""
245254
recoveryPhraseWordMap.values.forEach {
246-
recoveryPhrase = recoveryPhrase.plus(it.trim().replace(" ", "").lowercase().plus(" "))
255+
recoveryPhrase = recoveryPhrase.plus(
256+
it
257+
.trim()
258+
.replace(" ", "")
259+
.lowercase()
260+
.plus(" ")
261+
)
247262
}
248263
return recoveryPhrase.trim()
249264
}

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/wallet/ReceiveScreen.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ internal fun ReceiveScreen(
106106
start.linkTo(parent.start)
107107
end.linkTo(parent.end)
108108
height = Dimension.fillToConstraints
109-
}
110-
.padding(horizontal = 32.dp)
109+
}.padding(horizontal = 32.dp)
111110
) {
112111
val qr: ImageBitmap? = state.address?.let { addressToQR(it) }
113112
Log.i("ReceiveScreen", "New receive address is ${state.address}")
@@ -131,8 +130,7 @@ internal fun ReceiveScreen(
131130
snackbarHostState,
132131
null
133132
)
134-
}
135-
.background(
133+
}.background(
136134
color = DevkitWalletColors.primaryLight,
137135
shape = RoundedCornerShape(16.dp)
138136
).padding(12.dp),
@@ -168,8 +166,7 @@ internal fun ReceiveScreen(
168166
bottom.linkTo(parent.bottom)
169167
start.linkTo(parent.start)
170168
end.linkTo(parent.end)
171-
}
172-
.padding(bottom = 24.dp)
169+
}.padding(bottom = 24.dp)
173170
) {
174171
Button(
175172
onClick = { onAction(ReceiveScreenAction.UpdateAddress) },

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/wallet/SendScreen.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ internal fun SendScreen(navController: NavController, sendViewModel: SendViewMod
142142
bottom.linkTo(parent.bottom)
143143
start.linkTo(parent.start)
144144
end.linkTo(parent.end)
145-
}
146-
.padding(bottom = 32.dp)
145+
}.padding(bottom = 32.dp)
147146
) {
148147
Button(
149148
onClick = { setShowDialog(true) },

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/wallet/TransactionScreen.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ internal fun TransactionScreen(txid: String?, navController: NavController) {
6666
top.linkTo(parent.top)
6767
start.linkTo(parent.start)
6868
end.linkTo(parent.end)
69-
}
70-
.padding(top = 70.dp)
69+
}.padding(top = 70.dp)
7170
) {
7271
Text(
7372
text = "Transaction",

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/wallet/WalletHomeScreen.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,12 @@ internal fun WalletHomeScreen(
9696
interactionSource,
9797
indication = null,
9898
onClick = { onAction(WalletScreenAction.SwitchUnit) }
99-
)
100-
.fillMaxWidth(0.9f)
99+
).fillMaxWidth(0.9f)
101100
.padding(horizontal = 8.dp)
102101
.background(
103102
color = DevkitWalletColors.primaryLight,
104103
shape = RoundedCornerShape(16.dp)
105-
)
106-
.height(100.dp),
104+
).height(100.dp),
107105
verticalAlignment = Alignment.CenterVertically,
108106
horizontalArrangement = Arrangement.SpaceEvenly
109107
) {

0 commit comments

Comments
 (0)