Skip to content

Use theme colours throughout the app #24

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
merged 1 commit into from
Jul 1, 2025
Merged

Use theme colours throughout the app #24

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
3 changes: 2 additions & 1 deletion ...c/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/components/LoadingAnimation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.delay
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors

@Composable
fun LoadingAnimation(
circleColor: Color = Color(0xffE9C46A),
circleColor: Color = DevkitWalletColors.accent1,
circleSize: Dp = 21.dp,
animationDelay: Int = 800,
initialAlpha: Float = 0.3f,
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/components/TransactionCards.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ fun PendingTransactionCard(details: TxDetails, navController: NavController) {
.padding(top = 16.dp, end = 16.dp)
.size(size = 24.dp)
.clip(shape = CircleShape)
.background(Color(0xffE9C46A))
.background(DevkitWalletColors.accent1)
.align(Alignment.Top)
)
}
Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/intro/OnboardingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ fun OnboardingScreen(onFinishOnboarding: () -> Unit) {
.size(size = 16.dp)
.clip(shape = CircleShape)
.background(
if (currentIndex == 1) Color(0xffE9C46A) else Color(0xffE9C46A).copy(alpha = 0.3f)
if (currentIndex == 1) DevkitWalletColors.accent1 else DevkitWalletColors.accent1.copy(alpha = 0.3f)
)
)
Box(
Expand All @@ -108,7 +108,7 @@ fun OnboardingScreen(onFinishOnboarding: () -> Unit) {
.size(size = 16.dp)
.clip(shape = CircleShape)
.background(
if (currentIndex == 2) Color(0xffE9C46A) else Color(0xffE9C46A).copy(alpha = 0.3f)
if (currentIndex == 2) DevkitWalletColors.accent1 else DevkitWalletColors.accent1.copy(alpha = 0.3f)
)
)
Box(
Expand All @@ -117,7 +117,7 @@ fun OnboardingScreen(onFinishOnboarding: () -> Unit) {
.size(size = 16.dp)
.clip(shape = CircleShape)
.background(
if (currentIndex == 3) Color(0xffE9C46A) else Color(0xffE9C46A).copy(alpha = 0.3f)
if (currentIndex == 3) DevkitWalletColors.accent1 else DevkitWalletColors.accent1.copy(alpha = 0.3f)
)
)
}
Expand Down
5 changes: 4 additions & 1 deletion .../main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/wallet/ReceiveScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
Expand All @@ -63,6 +64,7 @@ import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.ReceiveScreenAction
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.ReceiveScreenState
import androidx.core.graphics.set

private const val TAG = "ReceiveScreen"

Expand Down Expand Up @@ -193,7 +195,8 @@ private fun addressToQR(address: String): ImageBitmap? {
for (x in 0 until 1000) {
for (y in 0 until 1000) {
// DevkitWalletColors.primaryDark for dark and DevkitWalletColors.white for light
bitMap.setPixel(x, y, if (bitMatrix[x, y]) 0xff203b46.toInt() else 0xffffffff.toInt())
bitMap[x, y] =
if (bitMatrix[x, y]) DevkitWalletColors.primaryDark.toArgb() else DevkitWalletColors.white.toArgb()
}
}
return bitMap.asImageBitmap()
Expand Down
Loading