Skip to content

chore: tweak bill asset placements more #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Feb 8, 2024
Merged

chore: tweak bill asset placements more #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@ android {
}

buildFeatures {
buildConfig = true
viewBinding = true
dataBinding = true
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = Versions.compose_compiler
}
Expand Down Expand Up @@ -95,10 +97,6 @@ android {
resources.excludes.add("META-INF/LICENSE.md")
resources.excludes.add("META-INF/LICENSE-notice.md")
}

buildFeatures {
buildConfig = true
}
}


Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/getcode/view/login/PhoneVerifyViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class PhoneVerifyViewModel @Inject constructor(

val phoneNumberCombined = areaCode.toString() + phoneInput

Timber.d("phoneNumber=$phoneNumberCombined")

val phoneNumber = phoneNumberCombined.makeE164(
java.util.Locale(java.util.Locale.getDefault().language, countryCode)
)
Expand All @@ -168,6 +168,7 @@ class PhoneVerifyViewModel @Inject constructor(
client.startSmsRetriever()
}

Timber.d("phoneNumber=$phoneNumber")
phoneRepository.sendVerificationCode(phoneNumber)
.firstElement()
.observeOn(AndroidSchedulers.mainThread())
Expand Down Expand Up @@ -220,6 +221,7 @@ class PhoneVerifyViewModel @Inject constructor(
)
}
}, {
it.printStackTrace()
setIsLoading(false)
TopBarManager.showMessage(getGenericError())
}
Expand Down
109 changes: 55 additions & 54 deletions app/src/main/java/com/getcode/view/main/bill/CashBill.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsIgnoringVisibility
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -59,6 +61,7 @@ import com.getcode.model.KinAmount
import com.getcode.solana.keys.Key32.Companion.kinMint
import com.getcode.solana.keys.base58
import com.getcode.theme.CodeTheme
import com.getcode.ui.utils.debugBounds
import com.getcode.util.formattedRaw
import com.getcode.ui.utils.nonScaledSp
import com.getcode.ui.utils.punchCircle
Expand Down Expand Up @@ -167,12 +170,16 @@ private class CashBillGeometry(width: Dp, height: Dp) {
val codeSize: Dp
get() = size.width * 0.6f

val globeWidth: Dp
get() = size.width * 1.45f
val globePosition: Offset
get() = Offset(
x = -(size.width.value * 1.25f),
y = size.height.value * 0.5f
x = -(size.width.value * 0.75f),
y = size.height.value * 0.65f
)

val gridWidth: Dp
get() = size.width * 1.75f

val linesHeight: Dp
get() = (topStripHeight.value - 2).dp
Expand Down Expand Up @@ -235,41 +242,49 @@ internal fun CashBill(
image = ImageBitmap.imageResource(R.drawable.ic_bill_hexagons),
blendMode = BlendMode.Multiply,
alpha = 0.6f,
fill = true,
)

// Waves
BillDecorImage(
modifier = Modifier
.matchParentSize()
.clipToBounds(),
image = ImageBitmap.imageResource(R.drawable.ic_bill_waves),
fill = true,
topLeft = Offset(
x = 0f,
y = with(LocalDensity.current) { geometry.securityStripPosition.y.toPx() }),
)
// Grid pattern
CashBillAssets.grid?.let {
Image(
modifier = Modifier
.requiredWidth(geometry.gridWidth)
.clipToBounds(),
alpha = 0.5f,
bitmap = it,
contentDescription = null
)
}

// Globe
BillDecorImage(
modifier = Modifier
.matchParentSize()
.clipToBounds(),
size = DpSize(width = geometry.size.width * 1.45f, height = Dp.Unspecified),
image = CashBillAssets.globe,
topLeft = geometry.globePosition
)
CashBillAssets.globe?.let {
Image(
modifier = Modifier
.requiredWidth(geometry.globeWidth)
.offset {
IntOffset(
x = geometry.globePosition.x.toInt(),
y = geometry.globePosition.y.toInt()
)
},
bitmap = it,
contentDescription = null
)
}

// Grid pattern
BillDecorImage(
// Waves
Image(
modifier = Modifier
.matchParentSize()
.offset {
IntOffset(
x = 0,
y = geometry.securityStripPosition.y.roundToPx(),
)
}
.clipToBounds(),
image = CashBillAssets.grid,
alpha = 0.5f,
topLeft = Offset(
x = 0f,
y = with(LocalDensity.current) { geometry.securityStripPosition.y.toPx() }),
contentDescription = null,
contentScale = ContentScale.FillBounds,
bitmap = ImageBitmap.imageResource(R.drawable.ic_bill_waves),
)

// Security strip
Expand Down Expand Up @@ -408,36 +423,22 @@ private fun BillDecorImage(
size: DpSize = DpSize.Unspecified,
topLeft: Offset = Offset.Zero,
blendMode: BlendMode = DrawScope.DefaultBlendMode,
fill: Boolean = false,
) {
Canvas(
modifier = modifier,
) {
// Hexagons
image?.let {
if (fill) {
drawImage(
image = it,
dstSize = IntSize(
width = if (size.isSpecified && size.width.isSpecified) size.width.roundToPx() else this.size.width.toInt(),
height = if (size.isSpecified && size.height.isSpecified) size.height.roundToPx() else this.size.height.toInt(),
),
alpha = alpha,
dstOffset = IntOffset(topLeft.x.roundToInt(), topLeft.y.roundToInt()),
blendMode = blendMode,
)
} else {
drawImage(
image = it,
alpha = alpha,
dstSize = IntSize(
width = if (size.isSpecified && size.width.isSpecified) size.width.roundToPx() else this.size.width.toInt(),
height = if (size.isSpecified && size.height.isSpecified) size.height.roundToPx() else this.size.height.toInt(),
),
dstOffset = IntOffset(topLeft.x.roundToInt(), topLeft.y.roundToInt()),
blendMode = blendMode,
)
}
drawImage(
image = it,
dstSize = IntSize(
width = if (size.isSpecified && size.width.isSpecified) size.width.roundToPx() else this.size.width.toInt(),
height = if (size.isSpecified && size.height.isSpecified) size.height.roundToPx() else this.size.height.toInt(),
),
alpha = alpha,
dstOffset = IntOffset(topLeft.x.roundToInt(), topLeft.y.roundToInt()),
blendMode = blendMode,
)
}
}
}
Expand Down