Use recommanded UX macros from recents SDKs

This commit is contained in:
TamtamHero
2020-10-20 15:40:31 +02:00
parent 62a144b22b
commit 1f9ef34845
14 changed files with 148 additions and 167 deletions

View File

@@ -5,7 +5,7 @@
unsigned int io_seproxyhal_touch_stark_ok(const bagl_element_t *e);
UX_FLOW_DEF_NOCB(ux_stark_limit_order_1_step,
UX_STEP_NOCB(ux_stark_limit_order_1_step,
pnn,
{
&C_icon_eye,
@@ -13,42 +13,42 @@ UX_FLOW_DEF_NOCB(ux_stark_limit_order_1_step,
"transaction",
});
UX_FLOW_DEF_NOCB(ux_stark_limit_order_2_step,
UX_STEP_NOCB(ux_stark_limit_order_2_step,
bnnn_paging,
{
.title = "Limit",
.text = "Order"
});
UX_FLOW_DEF_NOCB(ux_stark_limit_order_3_step,
UX_STEP_NOCB(ux_stark_limit_order_3_step,
bnnn_paging,
{
.title = "Trading",
.text = "Pair"
});
UX_FLOW_DEF_NOCB(ux_stark_limit_order_4_step,
UX_STEP_NOCB(ux_stark_limit_order_4_step,
bnnn_paging,
{
.title = "Sell",
.text = strings.common.fullAmount
});
UX_FLOW_DEF_NOCB(ux_stark_limit_order_5_step,
UX_STEP_NOCB(ux_stark_limit_order_5_step,
bnnn_paging,
{
.title = "Buy",
.text = strings.common.maxFee
});
UX_FLOW_DEF_NOCB(ux_stark_limit_order_6_step,
UX_STEP_NOCB(ux_stark_limit_order_6_step,
bnnn_paging,
{
.title = "Token Accont",
.text = strings.common.fullAddress
});
UX_FLOW_DEF_VALID(
UX_STEP_CB(
ux_stark_limit_order_7_step,
pbb,
io_seproxyhal_touch_stark_ok(NULL),
@@ -57,7 +57,7 @@ UX_FLOW_DEF_VALID(
"Accept",
"and send",
});
UX_FLOW_DEF_VALID(
UX_STEP_CB(
ux_stark_limit_order_8_step,
pb,
io_seproxyhal_touch_tx_cancel(NULL),
@@ -66,7 +66,7 @@ UX_FLOW_DEF_VALID(
"Reject",
});
const ux_flow_step_t * const ux_stark_limit_order_flow [] = {
UX_FLOW(ux_stark_limit_order_flow,
&ux_stark_limit_order_1_step,
&ux_stark_limit_order_2_step,
&ux_stark_limit_order_3_step,
@@ -74,12 +74,11 @@ const ux_flow_step_t * const ux_stark_limit_order_flow [] = {
&ux_stark_limit_order_5_step,
&ux_stark_limit_order_6_step,
&ux_stark_limit_order_7_step,
&ux_stark_limit_order_8_step,
FLOW_END_STEP,
};
&ux_stark_limit_order_8_step
);
//////////////////////////////////////////////////////////////////////
UX_FLOW_DEF_NOCB(ux_stark_transfer_1_step,
UX_STEP_NOCB(ux_stark_transfer_1_step,
pnn,
{
&C_icon_eye,
@@ -87,14 +86,14 @@ UX_FLOW_DEF_NOCB(ux_stark_transfer_1_step,
"transaction",
});
UX_FLOW_DEF_NOCB(ux_stark_transfer_2_step,
UX_STEP_NOCB(ux_stark_transfer_2_step,
bnnn_paging,
{
.title = "Transfer",
.text = " "
});
UX_FLOW_DEF_NOCB(ux_stark_self_transfer_2_step,
UX_STEP_NOCB(ux_stark_self_transfer_2_step,
bnnn_paging,
{
.title = "Self",
@@ -102,28 +101,28 @@ UX_FLOW_DEF_NOCB(ux_stark_self_transfer_2_step,
});
UX_FLOW_DEF_NOCB(ux_stark_transfer_3_step,
UX_STEP_NOCB(ux_stark_transfer_3_step,
bnnn_paging,
{
.title = "Amount",
.text = tmpContent.tmp
});
UX_FLOW_DEF_NOCB(ux_stark_transfer_4_step,
UX_STEP_NOCB(ux_stark_transfer_4_step,
bnnn_paging,
{
.title = "Master Account",
.text = strings.tmp.tmp
});
UX_FLOW_DEF_NOCB(ux_stark_transfer_5_step,
UX_STEP_NOCB(ux_stark_transfer_5_step,
bnnn_paging,
{
.title = "Token Accont",
.text = strings.tmp.tmp2
});
UX_FLOW_DEF_VALID(
UX_STEP_CB(
ux_stark_transfer_6_step,
pbb,
io_seproxyhal_touch_stark_ok(NULL),
@@ -132,7 +131,7 @@ UX_FLOW_DEF_VALID(
"Accept",
"and send",
});
UX_FLOW_DEF_VALID(
UX_STEP_CB(
ux_stark_transfer_7_step,
pb,
io_seproxyhal_touch_tx_cancel(NULL),
@@ -141,25 +140,23 @@ UX_FLOW_DEF_VALID(
"Reject",
});
const ux_flow_step_t * const ux_stark_transfer_flow [] = {
UX_FLOW(ux_stark_transfer_flow,
&ux_stark_transfer_1_step,
&ux_stark_transfer_2_step,
&ux_stark_transfer_3_step,
&ux_stark_transfer_4_step,
&ux_stark_transfer_5_step,
&ux_stark_transfer_6_step,
&ux_stark_transfer_7_step,
FLOW_END_STEP,
};
&ux_stark_transfer_7_step
);
const ux_flow_step_t * const ux_stark_self_transfer_flow [] = {
UX_FLOW(ux_stark_self_transfer_flow,
&ux_stark_transfer_1_step,
&ux_stark_self_transfer_2_step,
&ux_stark_transfer_3_step,
&ux_stark_transfer_5_step,
&ux_stark_transfer_6_step,
&ux_stark_transfer_7_step,
FLOW_END_STEP,
};
&ux_stark_transfer_7_step
);
#endif