keyboard-switch: Force top location

The keyboard switcher is only used from the top so remove the option to
create it in the bottom location. This simplifies the event hander.

Author: NickeZ

src/ui/components/keyboard_switch.c

@@ -30,7 +30,6 @@
  */
 typedef struct {
     keyboard_mode_t mode;
-    slider_location_t location;
     bool active; // Marker is 'active', i.e., touched
     // if true, the special chars keyboard mode is available.
     bool special_chars;
@@ -90,18 +89,19 @@ static void _render(component_t* component)
 static void _on_event(const event_t* event, component_t* component)
 {
     keyboard_switch_data_t* ks_data = (keyboard_switch_data_t*)component->data;
+    if (event->data.source != top_slider) {
+        return;
+    }
     switch (event->id) {
     case EVENT_CONTINUOUS_TAP:
-        if (event->data.source == top_slider && ks_data->location == top_slider &&
-            event->data.position > SLIDER_POSITION_ONE_THIRD &&
+        if (event->data.position > SLIDER_POSITION_ONE_THIRD &&
             event->data.position <= SLIDER_POSITION_TWO_THIRD) {
             ks_data->active = true;
             break;
         }
         /* FALLTHROUGH */
     case EVENT_SHORT_TAP:
-        if (event->data.source == top_slider && ks_data->location == top_slider &&
-            event->data.position > SLIDER_POSITION_ONE_THIRD &&
+        if (event->data.position > SLIDER_POSITION_ONE_THIRD &&
             event->data.position <= SLIDER_POSITION_TWO_THIRD) {
             ks_data->active = false;
             switch (ks_data->mode) {
@@ -145,7 +145,6 @@ static component_functions_t _component_functions = {
 /********************************** Create Instance **********************************/
 
 component_t* keyboard_switch_create(
-    slider_location_t location,
     bool special_chars,
     bool default_to_digits,
     component_t* parent,
@@ -164,7 +163,6 @@ component_t* keyboard_switch_create(
     }
     memset(ks_data, 0, sizeof(keyboard_switch_data_t));
 
-    ks_data->location = location;
     ks_data->mode = default_to_digits ? DIGITS : LOWER_CASE;
     ks_data->active = false;
     ks_data->special_chars = special_chars;

src/ui/components/keyboard_switch.h

@@ -30,7 +30,6 @@ typedef enum { LOWER_CASE, UPPER_CASE, DIGITS, SPECIAL_CHARS } keyboard_mode_t;
  * @param[in] parent The parent component.
  */
 component_t* keyboard_switch_create(
-    slider_location_t location,
     bool special_chars,
     bool default_to_digits,
     component_t* parent,

src/ui/components/trinary_input_string.c

@@ -495,7 +495,6 @@ component_t* trinary_input_string_create(
 
     if (params->wordlist == NULL && !params->number_input) {
         data->keyboard_switch_component = keyboard_switch_create(
-            top_slider,
             params->special_chars,
             params->default_to_digits,
             component,

test/unit-test/test_ui_components.c

@@ -142,7 +142,7 @@ static void test_ui_components_keyboard_switch(void** state)
     component_t* mock_component = fake_component_create();
 
     component_t* keyboard_switch =
-        keyboard_switch_create(top_slider, true, false, mock_component, _ks_cb, NULL);
+        keyboard_switch_create(true, false, mock_component, _ks_cb, NULL);
     assert_non_null(keyboard_switch);
     assert_ui_component_functions(keyboard_switch);
     keyboard_switch->f->cleanup(keyboard_switch);