Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import com.flipcash.features.backupkey.R
import com.getcode.manager.BottomBarAction
import com.getcode.manager.BottomBarManager
import com.getcode.theme.CodeTheme
import com.getcode.ui.components.Cloudy
import com.getcode.ui.components.BlurredContent
import com.getcode.ui.components.SelectionContainer
import com.getcode.ui.components.rememberSelectionState
import com.getcode.ui.core.addIf
Expand Down Expand Up @@ -122,7 +122,7 @@ internal fun BackupKeyScreenContent(viewModel: BackupKeyScreenViewModel) {
.windowInsetsPadding(WindowInsets.navigationBars),
state = selectionState,
) {
Cloudy(
BlurredContent(
modifier = Modifier
.fillMaxSize(),
enabled = selectionState.shown
Expand Down Expand Up @@ -187,9 +187,9 @@ internal fun BackupKeyScreenContent(viewModel: BackupKeyScreenViewModel) {
dataState.accessKeyCroppedBitmap?.let { bitmap ->
Image(
modifier = Modifier
.scale(selectionState.scale.value)
.fillMaxWidth()
.weight(1f)
.scale(selectionState.scale.value),
.weight(1f),
bitmap = bitmap.asImageBitmap(),
contentScale = ContentScale.Crop,
contentDescription = dataState.wordsFormatted,
Expand Down
2 changes: 0 additions & 2 deletions apps/flipcash/features/discovery/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ android {
}

dependencies {
implementation(libs.bundles.haze)

implementation(project(":apps:flipcash:shared:analytics"))
implementation(project(":apps:flipcash:shared:featureflags"))
implementation(project(":apps:flipcash:shared:shareable"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import com.getcode.manager.BottomBarManager
import com.getcode.navigation.core.LocalCodeNavigator
import com.getcode.theme.CodeTheme
import com.getcode.theme.White
import com.getcode.ui.components.Cloudy
import com.getcode.ui.components.BlurredContent
import com.getcode.ui.components.SelectionContainer
import com.getcode.ui.components.rememberSelectionState
import com.getcode.ui.core.addIf
Expand Down Expand Up @@ -174,7 +174,7 @@ private fun AccessKeyScreenContent(
.windowInsetsPadding(WindowInsets.navigationBars),
state = selectionState,
) {
Cloudy(
BlurredContent(
modifier = Modifier
.fillMaxSize(),
enabled = selectionState.shown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import com.flipcash.features.shareapp.R
import com.getcode.libs.qr.rememberQrBitmapPainter
import com.getcode.navigation.core.LocalCodeNavigator
import com.getcode.theme.CodeTheme
import com.getcode.ui.components.Cloudy
import com.getcode.ui.components.BlurredContent
import com.getcode.ui.components.SelectionContainer
import com.getcode.ui.components.rememberSelectionState
import com.getcode.ui.core.longClickable
Expand Down Expand Up @@ -67,7 +67,7 @@ internal fun ShareAppScreenContent() {
contentRect = contentRect,
state = selectionState,
) { onClick ->
Cloudy(
BlurredContent(
modifier = Modifier
.fillMaxSize(),
enabled = selectionState.shown
Expand Down
2 changes: 0 additions & 2 deletions apps/flipcash/features/tokens/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ android {
}

dependencies {
implementation(libs.bundles.haze)

implementation(project(":apps:flipcash:shared:amount-entry"))
implementation(project(":apps:flipcash:shared:analytics"))
implementation(project(":apps:flipcash:shared:onramp:coinbase"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,26 @@ abstract class BaseAccessKeyViewModel(
val words = mnemonicManager.fromEntropyBase64(entropyB64).words
val wordsFormatted = getAccessKeyText(words).joinToString("\n")

uiFlow.value = uiFlow.value.copy(
entropyB64 = entropyB64,
words = words,
wordsFormatted = wordsFormatted
)
uiFlow.update {
it.copy(
entropyB64 = entropyB64,
words = words,
wordsFormatted = wordsFormatted
)
}

viewModelScope.launch(dispatchers.IO) {
val accessKeyBitmap = createBitmapForExport(words = words, entropyB64 = entropyB64)
val accessKeyBitmapDisplay =
createBitmapForExport(drawBackground = true, words, entropyB64)
val accessKeyBitmap = createBitmapForExport(drawBackground = true, words = words, entropyB64 = entropyB64)
val accessKeyBitmapDisplay = createBitmapForExport(drawBackground = false, words, entropyB64)
val accessKeyCroppedBitmap =
Bitmap.createBitmap(accessKeyBitmapDisplay, 0, 500, 1200, 1450)

uiFlow.value = uiFlow.value.copy(
accessKeyBitmap = accessKeyBitmap,
accessKeyCroppedBitmap = accessKeyCroppedBitmap
)
uiFlow.update {
it.copy(
accessKeyBitmap = accessKeyBitmap,
accessKeyCroppedBitmap = accessKeyCroppedBitmap
)
}
}
}

Expand Down
2 changes: 0 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ bugsnag-gradle-plugin = "1.1.0"
rinku = "1.6.0"
compose-unstyled = "2.8.0"
haze = "2.0.0-alpha03"
cloudy = "0.5.0"
phantom-connect-kmp = "2.0.2-1.0.0"
vico = "3.2.3"

Expand Down Expand Up @@ -258,7 +257,6 @@ sodium-bindings = { module = "com.ionspin.kotlin:multiplatform-crypto-libsodium-
eddsa = { module = "net.i2p.crypto:eddsa", version = "0.3.0" }

# Misc
cloudy = { module = "com.github.skydoves:cloudy", version.ref = "cloudy" }
fingerprint-pro = { module = "com.fingerprint.android:pro", version = "2.4.0" }
haze = { module = "dev.chrisbanes.haze:haze", version.ref = "haze" }
haze-blur = { module = "dev.chrisbanes.haze:haze-blur", version.ref = "haze" }
Expand Down
2 changes: 1 addition & 1 deletion ui/components/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
implementation(project(":ui:emojis"))
implementation(project(":ui:theme"))
implementation(project(":ui:resources"))
api(libs.cloudy)

implementation(libs.coil3)
implementation(libs.coil3.network)
implementation(libs.kotlinx.datetime)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.getcode.ui.components

import androidx.annotation.IntRange
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import com.getcode.theme.CodeTheme
import dev.chrisbanes.haze.blur.blurEffect
import dev.chrisbanes.haze.blur.materials.HazeMaterials
import dev.chrisbanes.haze.hazeEffect
import dev.chrisbanes.haze.hazeSource
import dev.chrisbanes.haze.rememberHazeState

@Composable
fun Cloudy(
modifier: Modifier = Modifier,
enabled: Boolean = true,
@IntRange(from = 0, to = 25) radius: Int = 25,
containerColor: Color = CodeTheme.colors.background,
content: @Composable BoxScope.() -> Unit
) {
val blurRadius by animateDpAsState(
targetValue = if (enabled) radius.dp else 0.dp,
label = "blur radius"
)

val hazeState = rememberHazeState()
val material = HazeMaterials.regular(containerColor = containerColor)

Box(modifier) {
Box(Modifier.hazeSource(hazeState)) {
content()
}
if (enabled) {
Box(
Modifier
.matchParentSize()
.hazeEffect(hazeState) {
blurEffect {
this.blurRadius = blurRadius
style = material
}
}
)
}
}
}
21 changes: 0 additions & 21 deletions ui/components/src/main/kotlin/com/getcode/ui/components/Cloudy.kt

This file was deleted.

Loading