Skip to content

Commit 9059eaa

Browse files
committed
feat: add confirm input button
1 parent fe2aed4 commit 9059eaa

File tree

1 file changed

+26
-14
lines changed

1 file changed

+26
-14
lines changed

app/src/main/java/to/bitkit/ui/screens/wallets/receive/EditInvoiceScreen.kt

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import to.bitkit.ui.components.Caption13Up
3333
import to.bitkit.ui.components.Keyboard
3434
import to.bitkit.ui.components.NumberPadTextField
3535
import to.bitkit.ui.components.PrimaryButton
36-
import to.bitkit.ui.components.Text13Up
3736
import to.bitkit.ui.components.UnitButton
3837
import to.bitkit.ui.currencyViewModel
3938
import to.bitkit.ui.scaffold.SheetTopBar
@@ -74,8 +73,10 @@ fun EditInvoiceScreen(
7473
onBack = onBack,
7574
onTextChanged = { newNote -> noteText = newNote },
7675
keyboardVisible = keyboardVisible,
77-
onClickBalance = { keyboardVisible = !keyboardVisible },
78-
onInputChanged = { newText -> }
76+
onClickBalance = { keyboardVisible = true },
77+
onInputChanged = { newText -> input = newText },
78+
onContinueKeyboard = { keyboardVisible = false },
79+
onContinueGeneral = {}
7980
)
8081
}
8182

@@ -88,7 +89,9 @@ fun EditInvoiceContent(
8889
displayUnit: BitcoinDisplayUnit,
8990
onEvent: (SendEvent) -> Unit,
9091
onBack: () -> Unit,
92+
onContinueKeyboard: () -> Unit,
9193
onClickBalance: () -> Unit,
94+
onContinueGeneral: () -> Unit,
9295
onTextChanged: (String) -> Unit,
9396
onInputChanged: (String) -> Unit,
9497
) {
@@ -106,7 +109,7 @@ fun EditInvoiceContent(
106109
Column(
107110
modifier = Modifier.padding(horizontal = 16.dp)
108111
) {
109-
Spacer(Modifier.height(16.dp))
112+
Spacer(Modifier.height(32.dp))
110113

111114
NumberPadTextField(
112115
input = input,
@@ -119,12 +122,7 @@ fun EditInvoiceContent(
119122
)
120123

121124
if (keyboardVisible) {
122-
Text13Up(
123-
text = stringResource(R.string.wallet__send_available),
124-
color = Colors.White64,
125-
modifier = Modifier.testTag("available_balance")
126-
)
127-
Spacer(modifier = Modifier.height(4.dp))
125+
Spacer(modifier = Modifier.weight(1f))
128126

129127
Row(
130128
verticalAlignment = Alignment.CenterVertically,
@@ -148,7 +146,15 @@ fun EditInvoiceContent(
148146
.fillMaxWidth()
149147
.testTag("amount_keyboard"),
150148
)
149+
150+
Spacer(modifier = Modifier.height(41.dp))
151+
152+
PrimaryButton(
153+
text = stringResource(R.string.continue_button),
154+
onClick = onContinueKeyboard,
155+
)
151156
} else {
157+
152158
Spacer(modifier = Modifier.height(44.dp))
153159

154160
Caption13Up(text = stringResource(R.string.wallet__note), color = Colors.White64)
@@ -178,7 +184,7 @@ fun EditInvoiceContent(
178184

179185
PrimaryButton(
180186
text = stringResource(R.string.continue_button),
181-
onClick = { }, //TODO IMPLEMENT
187+
onClick = onContinueGeneral,
182188
)
183189
}
184190

@@ -201,7 +207,9 @@ private fun Preview() {
201207
onTextChanged = {},
202208
keyboardVisible = false,
203209
onClickBalance = {},
204-
onInputChanged = {}
210+
onInputChanged = {},
211+
onContinueGeneral = {},
212+
onContinueKeyboard = {}
205213
)
206214
}
207215
}
@@ -221,7 +229,9 @@ private fun Preview2() {
221229
onTextChanged = {},
222230
keyboardVisible = false,
223231
onClickBalance = {},
224-
onInputChanged = {}
232+
onInputChanged = {},
233+
onContinueGeneral = {},
234+
onContinueKeyboard = {}
225235
)
226236
}
227237
}
@@ -240,7 +250,9 @@ private fun Preview3() {
240250
onTextChanged = {},
241251
keyboardVisible = true,
242252
onClickBalance = {},
243-
onInputChanged = {}
253+
onInputChanged = {},
254+
onContinueGeneral = {},
255+
onContinueKeyboard = {}
244256
)
245257
}
246258
}

0 commit comments

Comments
 (0)