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
26 changes: 24 additions & 2 deletions app/src/main/java/to/bitkit/ui/scaffold/AppScaffold.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
package to.bitkit.ui.scaffold

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccountCircle
import androidx.compose.material.icons.filled.Bolt
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material3.ExperimentalMaterial3Api
Expand All @@ -13,14 +18,20 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import to.bitkit.R
import to.bitkit.ui.components.Title
import to.bitkit.ui.navigateToNodeState
import to.bitkit.ui.navigateToSettings
import to.bitkit.ui.shared.util.clickableAlpha
import to.bitkit.ui.theme.Colors
import to.bitkit.utils.Logger

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun AppScaffold(
navController: NavController,
Expand All @@ -29,10 +40,21 @@ fun AppScaffold(
) {
Scaffold(
topBar = {
@OptIn(ExperimentalMaterial3Api::class)
TopAppBar(
title = {
Title(text = titleText)
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.clickableAlpha { Logger.debug("Coming soon: Profile") }
) {
Icon(
imageVector = Icons.Filled.AccountCircle,
contentDescription = null,
tint = Colors.White64,
modifier = Modifier.size(32.dp)
)
Spacer(modifier = Modifier.width(16.dp))
Title(text = titleText)
}
},
actions = {
IconButton(onClick = navController::navigateToNodeState) {
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.Manifest
import android.os.Build
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
Expand Down Expand Up @@ -65,6 +64,7 @@ import to.bitkit.ui.screens.wallets.activity.ActivityList
import to.bitkit.ui.screens.wallets.receive.ReceiveQRScreen
import to.bitkit.ui.screens.wallets.send.SendOptionsView
import to.bitkit.ui.shared.TabBar
import to.bitkit.ui.shared.util.clickableAlpha
import to.bitkit.ui.theme.AppThemeSurface
import to.bitkit.ui.theme.Colors
import to.bitkit.ui.utils.screenSlideIn
Expand Down Expand Up @@ -180,7 +180,7 @@ private fun HomeContentView(
) {
AppScaffold(
navController = rootNavController,
titleText = "Your Name",
titleText = stringResource(R.string.slashtags__your_name_capital),
) {
RequestNotificationPermissions()
val balances = LocalBalances.current
Expand Down Expand Up @@ -217,7 +217,7 @@ private fun HomeContentView(
sats = balances.totalOnchainSats.toLong(),
icon = painterResource(id = R.drawable.ic_btc_circle),
modifier = Modifier
.clickable(onClick = { walletNavController.navigate(HomeRoutes.Savings) })
.clickableAlpha { walletNavController.navigate(HomeRoutes.Savings) }
.padding(vertical = 4.dp)
)
VerticalDivider()
Expand All @@ -226,7 +226,7 @@ private fun HomeContentView(
sats = balances.totalLightningSats.toLong(),
icon = painterResource(id = R.drawable.ic_ln_circle),
modifier = Modifier
.clickable(onClick = { walletNavController.navigate(HomeRoutes.Spending) })
.clickableAlpha { walletNavController.navigate(HomeRoutes.Spending) }
.padding(vertical = 4.dp)
.padding(start = 16.dp)
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package to.bitkit.ui.screens.wallets.activity

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -29,14 +28,15 @@ import androidx.compose.ui.unit.dp
import to.bitkit.R
import to.bitkit.ext.toActivityItemDate
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.PrimaryDisplay
import to.bitkit.ui.LocalCurrencies
import to.bitkit.ui.components.BodyMSB
import to.bitkit.ui.components.CaptionB
import to.bitkit.ui.currencyViewModel
import to.bitkit.ui.shared.util.DarkModePreview
import to.bitkit.ui.shared.util.clickableAlpha
import to.bitkit.ui.theme.AppThemeSurface
import to.bitkit.ui.theme.Colors
import to.bitkit.models.PrimaryDisplay
import uniffi.bitkitcore.Activity
import uniffi.bitkitcore.PaymentState
import uniffi.bitkitcore.PaymentType
Expand Down Expand Up @@ -75,8 +75,8 @@ fun ActivityRow(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxWidth()
.clickable(onClick = { onClick(id) })
.padding(horizontal = 0.dp, vertical = 16.dp)
.clickableAlpha { onClick(id) }
.padding(vertical = 16.dp)
) {
TransactionIcon(item)
Spacer(modifier = Modifier.width(12.dp))
Expand Down