ui: Remove components

* entry_screen isn't used
* confirm_button was just a trivial wrapper

Author: NickeZ

src/CMakeLists.txt

@@ -74,15 +74,13 @@ set(DBB-FIRMWARE-UI-SOURCES
     ${CMAKE_SOURCE_DIR}/src/ui/components/trinary_input_string.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/waiting.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/screensaver.c
-    ${CMAKE_SOURCE_DIR}/src/ui/components/entry_screen.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/knight_rider.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/right_arrow.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/left_arrow.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/icon_button.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/confirm_gesture.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/label.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/confirm.c
-    ${CMAKE_SOURCE_DIR}/src/ui/components/confirm_button.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/keyboard_switch.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/orientation_arrows.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/info_centered.c

src/rust/bitbox02-sys/build.rs

@@ -200,12 +200,10 @@ const BITBOX02_SOURCES: &[&str] = &[
     "src/u2f/u2f_app.c",
     "src/u2f/u2f_packet.c",
     "src/ui/components/button.c",
-    "src/ui/components/confirm_button.c",
     "src/ui/components/confirm_gesture.c",
     "src/ui/components/confirm_transaction.c",
     "src/ui/components/confirm.c",
     "src/ui/components/empty.c",
-    "src/ui/components/entry_screen.c",
     "src/ui/components/icon_button.c",
     "src/ui/components/image.c",
     "src/ui/components/info_centered.c",

src/ui/components/confirm_button.c

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "confirm_transaction.h"
-#include "confirm_button.h"
+#include "confirm_gesture.h"
 #include "icon_button.h"
 #include "label.h"
 #include "ui_images.h"
@@ -71,6 +71,16 @@ static void _cancel(component_t* cancel_button)
     }
 }
 
+static void _confirm_button_cb(component_t* confirm_button)
+{
+    component_t* component = confirm_button->parent;
+    data_t* data = (data_t*)component->data;
+    if (data->callback) {
+        data->callback(true, data->user_data);
+        data->callback = NULL;
+    }
+}
+
 /********************************** Component Functions **********************************/
 
 /**
@@ -120,7 +130,12 @@ static component_t* _confirm_transaction_create(
 
     ui_util_add_sub_component(confirm, icon_button_create(top_slider, ICON_BUTTON_CROSS, _cancel));
 
-    ui_util_add_sub_component(confirm, confirm_button_create(longtouch, ICON_BUTTON_NEXT));
+    if (longtouch) {
+        ui_util_add_sub_component(confirm, confirm_gesture_create());
+    } else {
+        ui_util_add_sub_component(
+            confirm, icon_button_create(top_slider, ICON_BUTTON_NEXT, _confirm_button_cb));
+    }
 
     if (data->has_address) {
         ui_util_add_sub_component(

src/ui/components/confirm_button.h

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #include "trinary_input_string.h"
-#include "confirm_button.h"
 #include "confirm_gesture.h"
+#include "icon_button.h"
 #include "keyboard_switch.h"
 #include "label.h"
 #include "left_arrow.h"
@@ -389,6 +389,18 @@ static void _on_event(const event_t* event, component_t* component)
     }
 }
 
+static void _confirm_button_cb(component_t* confirm_button)
+{
+    component_t* component = confirm_button->parent;
+    data_t* data = (data_t*)component->data;
+    if (data->can_confirm) {
+        if (data->confirm_cb) {
+            data->confirm_cb(data->string, data->confirm_user_data);
+            data->confirm_cb = NULL;
+        }
+    }
+}
+
 static void _cancel(component_t* cancel_button)
 {
     component_t* component = cancel_button->parent;
@@ -484,7 +496,12 @@ component_t* trinary_input_string_create(
     data->left_arrow_component = left_arrow_create(top_slider, component);
     ui_util_add_sub_component(component, data->left_arrow_component);
 
-    data->confirm_component = confirm_button_create(params->longtouch, ICON_BUTTON_CHECK);
+    if (params->longtouch) {
+        data->confirm_component = confirm_gesture_create();
+    } else {
+        data->confirm_component =
+            icon_button_create(top_slider, ICON_BUTTON_CHECK, _confirm_button_cb);
+    }
     ui_util_add_sub_component(component, data->confirm_component);
 
     if (params->wordlist == NULL && !params->number_input) {