@@ -10,11 +10,9 @@ import androidx.compose.foundation.layout.Box
1010import androidx.compose.foundation.layout.Column
1111import androidx.compose.foundation.layout.PaddingValues
1212import androidx.compose.foundation.layout.Row
13- import androidx.compose.foundation.layout.Spacer
1413import androidx.compose.foundation.layout.fillMaxHeight
1514import androidx.compose.foundation.layout.fillMaxSize
1615import androidx.compose.foundation.layout.fillMaxWidth
17- import androidx.compose.foundation.layout.height
1816import androidx.compose.foundation.layout.navigationBarsPadding
1917import androidx.compose.foundation.layout.padding
2018import androidx.compose.foundation.layout.size
@@ -90,8 +88,6 @@ fun ReceiveQrScreen(
9088 modifier : Modifier = Modifier ,
9189 initialTab : ReceiveTab ? = null,
9290) {
93- SetMaxBrightness ()
94-
9591 val haptic = LocalHapticFeedback .current
9692 val hasUsableChannels = walletState.channels.any { it.isChannelReady }
9793
@@ -175,9 +171,12 @@ fun ReceiveQrScreen(
175171 }
176172
177173 val showingCjitOnboarding = remember(walletState, cjitInvoice, hasUsableChannels) {
178- ! hasUsableChannels &&
179- walletState.nodeLifecycleState.isRunning() &&
180- cjitInvoice.isNullOrEmpty()
174+ ! hasUsableChannels && walletState.nodeLifecycleState.isRunning() && cjitInvoice.isNullOrEmpty()
175+ }
176+
177+ val showingQrCode = ! showDetails && ! (showingCjitOnboarding && selectedTab == ReceiveTab .SPENDING )
178+ if (showingQrCode) {
179+ SetMaxBrightness ()
181180 }
182181
183182 Column (
@@ -189,7 +188,7 @@ fun ReceiveQrScreen(
189188 ) {
190189 SheetTopBar (stringResource(R .string.wallet__receive_bitcoin))
191190 Column {
192- Spacer ( Modifier .height( 16 .dp) )
191+ VerticalSpacer ( 16 .dp)
193192
194193 // Tab row
195194 CustomTabRowWithSpacing (
@@ -211,7 +210,7 @@ fun ReceiveQrScreen(
211210 modifier = Modifier .padding(horizontal = 16 .dp)
212211 )
213212
214- Spacer ( Modifier .height( 24 .dp) )
213+ VerticalSpacer ( 24 .dp)
215214
216215 // Content area (QR or Details) with LazyRow
217216 LazyRow (
@@ -271,7 +270,7 @@ fun ReceiveQrScreen(
271270 }
272271 }
273272
274- Spacer ( Modifier .height( 24 .dp) )
273+ VerticalSpacer ( 24 .dp)
275274
276275 AnimatedVisibility (visible = walletState.nodeLifecycleState.isRunning()) {
277276 val showCjitButton = showingCjitOnboarding && selectedTab == ReceiveTab .SPENDING
@@ -305,16 +304,12 @@ fun ReceiveQrScreen(
305304 modifier = Modifier
306305 .padding(horizontal = 16 .dp)
307306 .testTag(
308- if (showDetails) {
309- " QRCode"
310- } else {
311- " ShowDetails"
312- }
307+ if (showDetails) " QRCode" else " ShowDetails"
313308 )
314309 )
315310 }
316311
317- Spacer ( Modifier .height( 16 .dp) )
312+ VerticalSpacer ( 16 .dp)
318313 }
319314 }
320315}
@@ -346,7 +341,7 @@ private fun ReceiveQrView(
346341 modifier = Modifier .weight(1f , fill = false )
347342 )
348343
349- Spacer (modifier = Modifier .height( 16 .dp) )
344+ VerticalSpacer ( 16 .dp)
350345 Row (
351346 horizontalArrangement = Arrangement .spacedBy(16 .dp),
352347 verticalAlignment = Alignment .Top ,
@@ -417,18 +412,18 @@ private fun ReceiveQrView(
417412 modifier = Modifier .weight(1f )
418413 )
419414 }
420- Spacer (modifier = Modifier .height( 16 .dp) )
415+ VerticalSpacer ( 16 .dp)
421416 }
422417}
423418
424419@Composable
425420fun CjitOnBoardingView (modifier : Modifier = Modifier ) {
426421 Column (
422+ horizontalAlignment = Alignment .CenterHorizontally ,
427423 modifier = modifier
428424 .clip(AppShapes .small)
429425 .background(color = Colors .Black )
430- .padding(32 .dp),
431- horizontalAlignment = Alignment .CenterHorizontally
426+ .padding(32 .dp)
432427 ) {
433428 Display (stringResource(R .string.wallet__receive_onboarding_title).withAccent(accentColor = Colors .Purple ))
434429 VerticalSpacer (8 .dp)
@@ -560,12 +555,12 @@ private fun CopyAddressCard(
560555 .padding(24 .dp)
561556 ) {
562557 Caption13Up (text = title, color = Colors .White64 )
563- Spacer (modifier = Modifier .height( 16 .dp) )
558+ VerticalSpacer ( 16 .dp)
564559 BodyS (
565560 text = (body ? : address).truncate(32 ).uppercase(),
566561 modifier = testTag?.let { Modifier .testTag(it) } ? : Modifier
567562 )
568- Spacer (modifier = Modifier .height( 16 .dp) )
563+ VerticalSpacer ( 16 .dp)
569564 Row (
570565 horizontalArrangement = Arrangement .spacedBy(16 .dp)
571566 ) {
0 commit comments