keyboard: add num template for PIN input
Credit for the xml updates:
fordownloads (vnukov.d03@gmail.com)
MrYacha (yacha@orangefox.tech)
Change-Id: Ie776b7de206dbeda122184052d474ebf5fbd7d68
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index ae9b4be..542e4b6 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -4596,6 +4596,11 @@
<action function="page">decrypt_pattern</action>
</action>
+ <action>
+ <condition var1="tw_crypto_pwtype" var2="3"/>
+ <action function="page">decrypt_pin</action>
+ </action>
+
<text style="text_l">
<placement x="%col1_x_header%" y="%row3_header_y%"/>
<text>{@mount_hdr=Mount}</text>
@@ -4725,6 +4730,69 @@
</button>
</page>
+ <page name="decrypt_pin">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@mount_hdr=Mount}</text>
+ </text>
+
+ <text style="text_m">
+ <placement x="%col1_x_header%" y="%row4_header_y%"/>
+ <text>{@decrypt_data_hdr=Decrypt Data}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <condition var1="tw_is_fbe" op="!=" var2="1"/>
+ <placement x="%center_x%" y="%row2_y%" placement="5"/>
+ <text>{@decrypt_data_enter_pass=Enter PIN:}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <condition var1="tw_is_fbe" var2="1"/>
+ <placement x="%center_x%" y="%row2_y%" placement="5"/>
+ <text>{@decrypt_data_enter_pass_fbe=Enter PIN for User [%tw_crypto_user_id%]}</text>
+ </text>
+
+ <input>
+ <placement x="%col1_x_left%" y="%row3_input_y%" w="%content_width%" h="%input_height%"/>
+ <text>%tw_crypto_display%</text>
+ <data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display"/>
+ <restrict minlen="1" maxlen="254"/>
+ <action function="page">trydecrypt</action>
+ </input>
+
+ <fill color="%accent_color%">
+ <placement x="%col1_x_left%" y="row5_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <fill color="%text_fail_color%">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%col1_x_left%" y="row5_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <text style="text_m_fail">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%col1_x_left%" y="%row5_y%"/>
+ <text>{@decrypt_data_failed=PIN failed, please try again!}</text>
+ </text>
+
+ <button style="main_button_half_width_low">
+ <placement x="%indent%" y="%row6_y%"/>
+ <text>{@cancel_btn=Cancel}</text>
+ <action function="page">canceldecrypt</action>
+ </button>
+
+ <button style="main_button_half_width_low">
+ <placement x="%indent_right%" y="%row6_y%" placement="1"/>
+ <text>{@sel_lang_btn=Select Language}</text>
+ <action function="overlay">select_language</action>
+ </button>
+
+ <template name="keyboardnum"/>
+ </page>
+
<page name="trydecrypt">
<template name="page"/>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 4efed64..b742a6f 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -4719,6 +4719,11 @@
<action function="page">decrypt_pattern</action>
</action>
+ <action>
+ <condition var1="tw_crypto_pwtype" var2="3"/>
+ <action function="page">decrypt_pin</action>
+ </action>
+
<text style="text_l">
<placement x="%col1_x_header%" y="%row3_header_y%"/>
<text>{@mount_hdr=Mount}</text>
@@ -4855,6 +4860,69 @@
</button>
</page>
+ <page name="decrypt_pin">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@mount_hdr=Mount}</text>
+ </text>
+
+ <text style="text_m">
+ <placement x="%col1_x_header%" y="%row4_header_y%"/>
+ <text>{@decrypt_data_hdr=Decrypt Data}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <condition var1="tw_is_fbe" op="!=" var2="1"/>
+ <placement x="%center_x%" y="%row2_y%" placement="5"/>
+ <text>{@decrypt_data_enter_pass=Enter PIN:}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <condition var1="tw_is_fbe" var2="1"/>
+ <placement x="%center_x%" y="%row2_y%" placement="5"/>
+ <text>{@decrypt_data_enter_pass_fbe=Enter PIN for User [%tw_crypto_user_id%]}</text>
+ </text>
+
+ <input>
+ <placement x="%indent%" y="%row3_input_y%" w="%content_width%" h="%input_height%"/>
+ <text>%tw_crypto_display%</text>
+ <data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display"/>
+ <restrict minlen="1" maxlen="254"/>
+ <action function="page">trydecrypt</action>
+ </input>
+
+ <fill color="%accent_color%">
+ <placement x="%indent%" y="row4a_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <fill color="%text_fail_color%">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%indent%" y="row4a_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <text style="text_m_fail">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%indent%" y="%row5_y%"/>
+ <text>{@decrypt_data_failed=PIN failed, please try again!}</text>
+ </text>
+
+ <button style="main_button_half_height">
+ <placement x="%indent%" y="%row10_y%"/>
+ <text>{@cancel_btn=Cancel}</text>
+ <action function="page">canceldecrypt</action>
+ </button>
+
+ <button style="main_button_half_height">
+ <placement x="%center_x%" y="%row10_y%"/>
+ <text>{@sel_lang_btn=Select Language}</text>
+ <action function="overlay">select_language</action>
+ </button>
+
+ <template name="keyboardnum"/>
+ </page>
+
<page name="trydecrypt">
<template name="page"/>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 171fc38..27a208e 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -5416,6 +5416,11 @@
<action function="page">decrypt_pattern</action>
</action>
+ <action>
+ <condition var1="tw_crypto_pwtype" var2="3"/>
+ <action function="page">decrypt_pin</action>
+ </action>
+
<text style="text_m">
<placement x="%col1_x_left%" y="%row1_header_y%"/>
<text>{@mount_hdr=Mount} > {@decrypt_data_hdr=Decrypt Data}</text>
@@ -5586,6 +5591,66 @@
</button>
</page>
+ <page name="decrypt_pin">
+ <template name="page"/>
+
+ <template name="statusbar"/>
+
+ <text style="text_m">
+ <placement x="%col1_x_left%" y="%row1_header_y%"/>
+ <text>{@mount_hdr=Mount} > {@decrypt_data_hdr=Decrypt Data}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <condition var1="tw_is_fbe" op="!=" var2="1"/>
+ <placement x="%col1_x_left%" y="%row1_y%"/>
+ <text>{@decrypt_data_enter_pass=Enter PIN:}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <condition var1="tw_is_fbe" var2="1"/>
+ <placement x="%col1_x_left%" y="%row1_y%"/>
+ <text>{@decrypt_data_enter_pass_fbe=Enter PIN for User [%tw_crypto_user_id%]}</text>
+ </text>
+
+ <input>
+ <placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%input_height%"/>
+ <text>%tw_crypto_display%</text>
+ <data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display"/>
+ <restrict minlen="1" maxlen="254"/>
+ <action function="page">trydecrypt</action>
+ </input>
+
+ <fill color="%accent_color%">
+ <placement x="%col1_x_left%" y="row3_input_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <fill color="%text_fail_color%">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%col1_x_left%" y="row3_input_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <text style="text_m_fail">
+ <condition var1="tw_password_fail" var2="1"/>
+ <placement x="%col1_x_left%" y="%row3_input_y%"/>
+ <text>{@decrypt_data_failed=PIN failed, please try again!}</text>
+ </text>
+
+ <button style="main_button_half_height">
+ <placement x="%col1_x_left%" y="%row4_y%"/>
+ <text>{@sel_lang_btn=Select Language}</text>
+ <action function="page">settings_language</action>
+ </button>
+
+ <button style="main_button_half_height">
+ <placement x="%col1_x_right%" y="%row4_y%"/>
+ <text>{@cancel_btn=Cancel}</text>
+ <action function="page">canceldecrypt</action>
+ </button>
+
+ <template name="keyboardnum"/>
+ </page>
+
<page name="trydecrypt">
<template name="page"/>