Skip to content
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

Jump to bottom

Fix: Update Jetpack compose dependency to 2023.06.01 #323

Merged
merged 2 commits into from
Aug 1, 2023
Merged

Fix: Update Jetpack compose dependency to 2023.06.01 #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b8766e
Fix: Update Jetpack compose dependency to 2023.06.01
Prakhar-Agarwal-byte Jul 29, 2023
d3dc58f
Fix: Update BottomSheetScaffold in SendScreen.kt
Prakhar-Agarwal-byte Jul 31, 2023
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
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ dependencies {
// Compose
// Adding the Bill of Materials synchronizes dependencies in the androidx.compose namespace
// You can remove the library version in your dependency declaration
implementation(platform("androidx.compose:compose-bom:2023.01.00"))
implementation(platform("androidx.compose:compose-bom:2023.06.01"))

// Why does this work? As far as I understand it the androidx.activity namespace is not managed by the compose bill of materials
// Was implementation("androidx.activity:activity-compose:1.6.1")
Expand Down
313 changes: 175 additions & 138 deletions app/src/main/java/com/goldenraven/padawanwallet/ui/wallet/SendScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.BottomSheetScaffold
import androidx.compose.material.*
import androidx.compose.material.BottomSheetScaffoldState
import androidx.compose.material3.*
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
Expand All @@ -41,6 +42,8 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.constraintlayout.compose.Dimension
import androidx.navigation.NavHostController
import com.goldenraven.padawanwallet.R
import com.goldenraven.padawanwallet.data.Wallet
Expand Down Expand Up @@ -96,170 +99,204 @@ internal fun SendScreen(navController: NavHostController, walletViewModel: Walle
sheetPeekHeight = 0.dp,
backgroundColor = padawan_theme_background
) {

PadawanAppBar(navController = navController, title = "Send bitcoin")

val padding = when (getScreenSizeWidth(LocalConfiguration.current.screenWidthDp)) {
ScreenSizeWidth.Small -> 12.dp
ScreenSizeWidth.Phone -> 32.dp
}

val scrollState = rememberScrollState()
Column(

ConstraintLayout(
modifier = Modifier
.fillMaxSize()
.standardBackground(padding)
.verticalScroll(scrollState)
) {
Row(modifier = Modifier.padding(top = 8.dp, bottom = 8.dp)) {
val (screenTitle, content) = createRefs()
Row(
Modifier
.constrainAs(screenTitle) {
top.linkTo(parent.top)
start.linkTo(parent.start)
end.linkTo(parent.end)
}
) {
PadawanAppBar(navController = navController, title = "Send bitcoin")
}

Column(
modifier = Modifier
.constrainAs(content) {
top.linkTo(screenTitle.bottom)
bottom.linkTo(parent.bottom)
start.linkTo(parent.start)
end.linkTo(parent.end)
height = Dimension.fillToConstraints
}
.verticalScroll(scrollState)
) {
Row(modifier = Modifier.padding(top = 8.dp, bottom = 8.dp)) {
Text(
text = "Amount",
fontWeight = FontWeight.Bold,
textAlign = TextAlign.Start,
fontSize = 20.sp,
modifier = Modifier
.weight(weight = 0.5f)
.align(Alignment.Bottom)
)
Text(
text = "Balance: $balance sats",
textAlign = TextAlign.End,
modifier = Modifier
.weight(weight = 0.5f)
.align(Alignment.Bottom)
)
}
TextField(
modifier = Modifier
.wideTextField()
.height(IntrinsicSize.Min),
shape = RoundedCornerShape(20.dp),
value = amount.value,
onValueChange = { value -> amount.value = value.filter { it.isDigit() } },
singleLine = true,
placeholder = { Text("Enter amount (sats)") },
colors = TextFieldDefaults.textFieldColors(
// backgroundColor = padawan_theme_background_secondary,
containerColor = padawan_theme_background_secondary,
cursorColor = padawan_theme_onPrimary,
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent,
errorIndicatorColor = Color.Transparent,
),
enabled = (true),
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Number,
imeAction = ImeAction.Next
),
)

Text(
text = "Amount",
text = "Address",
fontWeight = FontWeight.Bold,
textAlign = TextAlign.Start,
fontSize = 20.sp,
modifier = Modifier
.weight(weight = 0.5f)
.align(Alignment.Bottom)
modifier = Modifier.padding(top = 16.dp)
)
Text(
text = "Balance: $balance sats",
textAlign = TextAlign.End,
TextField(
modifier = Modifier
.weight(weight = 0.5f)
.align(Alignment.Bottom)
)
}
TextField(
modifier = Modifier
.wideTextField()
.height(IntrinsicSize.Min),
shape = RoundedCornerShape(20.dp),
value = amount.value,
onValueChange = { value -> amount.value = value.filter { it.isDigit() } },
singleLine = true,
placeholder = { Text("Enter amount (sats)") },
colors = TextFieldDefaults.textFieldColors(
// backgroundColor = padawan_theme_background_secondary,
containerColor = padawan_theme_background_secondary,
cursorColor = padawan_theme_onPrimary,
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent,
errorIndicatorColor = Color.Transparent,
),
enabled = (true),
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Number,
imeAction = ImeAction.Next
),
)

Text(
text = "Address",
fontWeight = FontWeight.Bold,
textAlign = TextAlign.Start,
fontSize = 20.sp,
modifier = Modifier.padding(top = 16.dp)
)
TextField(
modifier = Modifier
.wideTextField()
.height(IntrinsicSize.Min),
shape = RoundedCornerShape(20.dp),
value = recipientAddress.value,
onValueChange = { recipientAddress.value = it },
singleLine = true,
placeholder = { Text(text = "Enter a bitcoin testnet address") },
colors = TextFieldDefaults.textFieldColors(
// backgroundColor = padawan_theme_background_secondary,
containerColor = padawan_theme_background_secondary,
cursorColor = padawan_theme_onPrimary,
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent,
errorIndicatorColor = Color.Transparent,
),
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Text,
imeAction = ImeAction.Next
),
trailingIcon = {
Row {
VerticalTextFieldDivider()
IconButton(
onClick = {
navController.navigate(Screen.QRScanScreen.route) {
launchSingleTop = true
}
},
modifier = Modifier.align(Alignment.CenterVertically)
) {
Icon(
painter = painterResource(id = R.drawable.ic_camera),
contentDescription = "Scan QR Icon",
)
.wideTextField()
.height(IntrinsicSize.Min),
shape = RoundedCornerShape(20.dp),
value = recipientAddress.value,
onValueChange = { recipientAddress.value = it },
singleLine = true,
placeholder = { Text(text = "Enter a bitcoin testnet address") },
colors = TextFieldDefaults.textFieldColors(
// backgroundColor = padawan_theme_background_secondary,
containerColor = padawan_theme_background_secondary,
cursorColor = padawan_theme_onPrimary,
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent,
errorIndicatorColor = Color.Transparent,
),
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Text,
imeAction = ImeAction.Next
),
trailingIcon = {
Row {
VerticalTextFieldDivider()
IconButton(
onClick = {
navController.navigate(Screen.QRScanScreen.route) {
launchSingleTop = true
}
},
modifier = Modifier.align(Alignment.CenterVertically)
) {
Icon(
painter = painterResource(id = R.drawable.ic_camera),
contentDescription = "Scan QR Icon",
)
}
}
}
}
)
)

Text(
text = "Fees (sats/vbytes)",
fontWeight = FontWeight.Bold,
textAlign = TextAlign.Start,
fontSize = 20.sp,
modifier = Modifier.padding(top = 16.dp)
)
Text(
text = "Fees (sats/vbytes)",
fontWeight = FontWeight.Bold,
textAlign = TextAlign.Start,
fontSize = 20.sp,
modifier = Modifier.padding(top = 16.dp)
)

var sliderPosition by remember { mutableStateOf(1f) }
Slider(
modifier = Modifier.semantics { contentDescription = "Localized Description" },
value = sliderPosition,
onValueChange = { sliderPosition = it },
valueRange = 1f..8f,
onValueChangeFinished = { feeRate.value = sliderPosition.toString().take(3) },
steps = 6
)
Text(text = sliderPosition.toString().take(3))
var sliderPosition by remember { mutableStateOf(1f) }
Slider(
modifier = Modifier.semantics { contentDescription = "Localized Description" },
value = sliderPosition,
onValueChange = { sliderPosition = it },
valueRange = 1f..8f,
onValueChangeFinished = { feeRate.value = sliderPosition.toString().take(3) },
steps = 6
)
Text(text = sliderPosition.toString().take(3))

Button(
onClick = {
val inputsAreValid = verifyInputs(recipientAddress.value, amount.value, feeRate.value, scope, bottomSheetScaffoldState.snackbarHostState)
try {
if (inputsAreValid) {
val txBR = Wallet.createTransaction(recipientAddress.value, amount.value.toULong(), feeRate.value.toFloat())
txBuilderResult.value = txBR
coroutineScope.launch {
if (bottomSheetScaffoldState.bottomSheetState.isCollapsed) {
bottomSheetScaffoldState.bottomSheetState.expand()
Button(
onClick = {
val inputsAreValid = verifyInputs(
recipientAddress.value,
amount.value,
feeRate.value,
scope,
bottomSheetScaffoldState.snackbarHostState
)
try {
if (inputsAreValid) {
val txBR = Wallet.createTransaction(
recipientAddress.value,
amount.value.toULong(),
feeRate.value.toFloat()
)
txBuilderResult.value = txBR
coroutineScope.launch {
if (bottomSheetScaffoldState.bottomSheetState.isCollapsed) {
bottomSheetScaffoldState.bottomSheetState.expand()
}
}
}
} catch (exception: Exception) {
scope.launch {
bottomSheetScaffoldState.snackbarHostState.showSnackbar(
message = "$exception",
duration = SnackbarDurationM2.Short
)
}
}
} catch (exception: Exception) {
scope.launch {
bottomSheetScaffoldState.snackbarHostState.showSnackbar(message = "$exception", duration = SnackbarDurationM2.Short)
}
}

},
colors = ButtonDefaults.buttonColors(containerColor = padawan_theme_button_primary),
shape = RoundedCornerShape(20.dp),
border = standardBorder,
modifier = Modifier
.padding(top = 32.dp, start = 4.dp, end = 4.dp, bottom = 24.dp)
.standardShadow(20.dp)
.height(70.dp)
.width(240.dp)
.align(Alignment.CenterHorizontally)
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(vertical = 4.dp)
},
colors = ButtonDefaults.buttonColors(containerColor = padawan_theme_button_primary),
shape = RoundedCornerShape(20.dp),
border = standardBorder,
modifier = Modifier
.padding(top = 32.dp, start = 4.dp, end = 4.dp, bottom = 24.dp)
.standardShadow(20.dp)
.height(70.dp)
.width(240.dp)
.align(Alignment.CenterHorizontally)
) {
Text(
text = "Verify transaction",
color = Color(0xff000000)
)
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(vertical = 4.dp)
) {
Text(
text = "Verify transaction",
color = Color(0xff000000)
)
}
}
}
}
Expand Down
Loading