From bbf7a20b33de2d203518687cb5cd1aa85005ea27 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 13 Feb 2023 03:19:02 +1100
Subject: Refactor Leader key feature (#19632)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/splitkb/kyria/keymaps/plattfot/keymap.c | 142 +++++++++++-----------
 1 file changed, 68 insertions(+), 74 deletions(-)

(limited to 'keyboards/splitkb/kyria/keymaps/plattfot/keymap.c')

diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
index 1a351803a2..2233e9b01b 100644
--- a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
@@ -400,82 +400,76 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 #endif
 
-LEADER_EXTERNS();
-
-void matrix_scan_user(void) {
-    LEADER_DICTIONARY() {
-        leading = false;
-        leader_end();
-        // Sway navigation
-        SEQ_ONE_KEY(KC_Q) {  // Jump to workspace 1
-            SEND_STRING(SS_LGUI("1"));
-        }
-        SEQ_ONE_KEY(KC_W) {  // Jump to workspace 2
-            SEND_STRING(SS_LGUI("2"));
-        }
-        SEQ_ONE_KEY(KC_E) {  // Jump to workspace 3
-            SEND_STRING(SS_LGUI("3"));
-        }
-        SEQ_ONE_KEY(KC_R) {  // Jump to workspace 4
-            SEND_STRING(SS_LGUI("4"));
-        }
-        SEQ_ONE_KEY(KC_T) {  // Jump to workspace 5
-            SEND_STRING(SS_LGUI("5"));
-        }
+void leader_end_user(void) {
+    // Sway navigation
+    if (leader_sequence_one_key(KC_Q)) {  // Jump to workspace 1
+        SEND_STRING(SS_LGUI("1"));
+    }
+    if (leader_sequence_one_key(KC_W)) {  // Jump to workspace 2
+        SEND_STRING(SS_LGUI("2"));
+    }
+    if (leader_sequence_one_key(KC_E)) {  // Jump to workspace 3
+        SEND_STRING(SS_LGUI("3"));
+    }
+    if (leader_sequence_one_key(KC_R)) {  // Jump to workspace 4
+        SEND_STRING(SS_LGUI("4"));
+    }
+    if (leader_sequence_one_key(KC_T)) {  // Jump to workspace 5
+        SEND_STRING(SS_LGUI("5"));
+    }
 
-        SEQ_ONE_KEY(KC_Y) {  // Jump to workspace 6
-            SEND_STRING(SS_LGUI("6"));
-        }
-        SEQ_ONE_KEY(KC_U) {  // Jump to workspace 7
-            SEND_STRING(SS_LGUI("7"));
-        }
-        SEQ_ONE_KEY(KC_I) {  // Jump to workspace 8
-            SEND_STRING(SS_LGUI("8"));
-        }
-        SEQ_ONE_KEY(KC_O) {  // Jump to workspace 9
-            SEND_STRING(SS_LGUI("9"));
-        }
-        SEQ_ONE_KEY(KC_P) {  // Jump to workspace 0
-            SEND_STRING(SS_LGUI("0"));
-        }
-        SEQ_ONE_KEY(KC_G) {  // View scratch pad
-            SEND_STRING(SS_LGUI("-"));
-        }
+    if (leader_sequence_one_key(KC_Y)) {  // Jump to workspace 6
+        SEND_STRING(SS_LGUI("6"));
+    }
+    if (leader_sequence_one_key(KC_U)) {  // Jump to workspace 7
+        SEND_STRING(SS_LGUI("7"));
+    }
+    if (leader_sequence_one_key(KC_I)) {  // Jump to workspace 8
+        SEND_STRING(SS_LGUI("8"));
+    }
+    if (leader_sequence_one_key(KC_O)) {  // Jump to workspace 9
+        SEND_STRING(SS_LGUI("9"));
+    }
+    if (leader_sequence_one_key(KC_P)) {  // Jump to workspace 0
+        SEND_STRING(SS_LGUI("0"));
+    }
+    if (leader_sequence_one_key(KC_G)) {  // View scratch pad
+        SEND_STRING(SS_LGUI("-"));
+    }
 
-        // Sway move window
-        SEQ_TWO_KEYS(KC_M, KC_Q) {  // Move to workspace 1
-            SEND_STRING(SS_LSFT(SS_LGUI("1")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_W) {  // Move to workspace 2
-            SEND_STRING(SS_LSFT(SS_LGUI("2")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_E) {  // Move to workspace 3
-            SEND_STRING(SS_LSFT(SS_LGUI("3")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_R) {  // Move to workspace 4
-            SEND_STRING(SS_LSFT(SS_LGUI("4")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_T) {  // Move to workspace 5
-            SEND_STRING(SS_LSFT(SS_LGUI("5")));
-        }
+    // Sway move window
+    if (leader_sequence_two_keys(KC_M, KC_Q)) {  // Move to workspace 1
+        SEND_STRING(SS_LSFT(SS_LGUI("1")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_W)) {  // Move to workspace 2
+        SEND_STRING(SS_LSFT(SS_LGUI("2")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_E)) {  // Move to workspace 3
+        SEND_STRING(SS_LSFT(SS_LGUI("3")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_R)) {  // Move to workspace 4
+        SEND_STRING(SS_LSFT(SS_LGUI("4")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_T)) {  // Move to workspace 5
+        SEND_STRING(SS_LSFT(SS_LGUI("5")));
+    }
 
-        SEQ_TWO_KEYS(KC_M, KC_Y) {  // Move to workspace 6
-            SEND_STRING(SS_LSFT(SS_LGUI("6")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_U) {  // Move to workspace 7
-            SEND_STRING(SS_LSFT(SS_LGUI("7")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_I) {  // Move to workspace 8
-            SEND_STRING(SS_LSFT(SS_LGUI("8")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_O) {  // Move to workspace 9
-            SEND_STRING(SS_LSFT(SS_LGUI("9")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_P) {  // Move to workspace 0
-            SEND_STRING(SS_LSFT(SS_LGUI("0")));
-        }
-        SEQ_TWO_KEYS(KC_M, KC_G) {  // Move to scratch pad
-            SEND_STRING(SS_LSFT(SS_LGUI("-")));
-        }
+    if (leader_sequence_two_keys(KC_M, KC_Y)) {  // Move to workspace 6
+        SEND_STRING(SS_LSFT(SS_LGUI("6")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_U)) {  // Move to workspace 7
+        SEND_STRING(SS_LSFT(SS_LGUI("7")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_I)) {  // Move to workspace 8
+        SEND_STRING(SS_LSFT(SS_LGUI("8")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_O)) {  // Move to workspace 9
+        SEND_STRING(SS_LSFT(SS_LGUI("9")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_P)) {  // Move to workspace 0
+        SEND_STRING(SS_LSFT(SS_LGUI("0")));
+    }
+    if (leader_sequence_two_keys(KC_M, KC_G)) {  // Move to scratch pad
+        SEND_STRING(SS_LSFT(SS_LGUI("-")));
     }
 }
-- 
cgit v1.2.3