From d3d5b8eb8a070bab19a0d053bcd94902b447df34 Mon Sep 17 00:00:00 2001
From: Nick Winans <nick@winans.codes>
Date: Fri, 21 Oct 2022 22:10:55 -0500
Subject: [PATCH] fix(displays): Adjust alignment and spacing

* Adjust alignment and spacing
* Fix char array lengths
---
 app/src/display/status_screen.c          |  2 +-
 app/src/display/widgets/battery_status.c |  5 +++--
 app/src/display/widgets/layer_status.c   |  8 ++++----
 app/src/display/widgets/output_status.c  | 16 ++++++++--------
 app/src/display/widgets/wpm_status.c     |  3 ++-
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/src/display/status_screen.c b/app/src/display/status_screen.c
index 6ace1925..0fe7212d 100644
--- a/app/src/display/status_screen.c
+++ b/app/src/display/status_screen.c
@@ -68,7 +68,7 @@ lv_obj_t *zmk_display_status_screen() {
 
 #if IS_ENABLED(CONFIG_ZMK_WIDGET_WPM_STATUS)
     zmk_widget_wpm_status_init(&wpm_status_widget, screen);
-    lv_obj_align(zmk_widget_wpm_status_obj(&wpm_status_widget), NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -12,
+    lv_obj_align(zmk_widget_wpm_status_obj(&wpm_status_widget), NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0,
                  0);
 #endif
     return screen;
diff --git a/app/src/display/widgets/battery_status.c b/app/src/display/widgets/battery_status.c
index 3dfcdb47..9179b0d0 100644
--- a/app/src/display/widgets/battery_status.c
+++ b/app/src/display/widgets/battery_status.c
@@ -27,13 +27,13 @@ struct battery_status_state {
 };
 
 static void set_battery_symbol(lv_obj_t *label, struct battery_status_state state) {
-    char text[2] = "  ";
+    char text[8] = {};
 
     uint8_t level = state.level;
 
 #if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
     if (state.usb_present) {
-        strcpy(text, LV_SYMBOL_CHARGE);
+        strcpy(text, LV_SYMBOL_CHARGE " ");
     }
 #endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */
 
@@ -49,6 +49,7 @@ static void set_battery_symbol(lv_obj_t *label, struct battery_status_state stat
         strcat(text, LV_SYMBOL_BATTERY_EMPTY);
     }
     lv_label_set_text(label, text);
+    lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 }
 
 void battery_status_update_cb(struct battery_status_state state) {
diff --git a/app/src/display/widgets/layer_status.c b/app/src/display/widgets/layer_status.c
index 32bdb828..a4a7be58 100644
--- a/app/src/display/widgets/layer_status.c
+++ b/app/src/display/widgets/layer_status.c
@@ -24,15 +24,15 @@ struct layer_status_state {
 
 static void set_layer_symbol(lv_obj_t *label, struct layer_status_state state) {
     if (state.label == NULL) {
-        char text[6] = {};
+        char text[7] = {};
 
-        sprintf(text, LV_SYMBOL_KEYBOARD "%i", state.index);
+        sprintf(text, LV_SYMBOL_KEYBOARD " %i", state.index);
 
         lv_label_set_text(label, text);
     } else {
-        char text[12] = {};
+        char text[13] = {};
 
-        snprintf(text, 12, LV_SYMBOL_KEYBOARD "%s", state.label);
+        snprintf(text, sizeof(text), LV_SYMBOL_KEYBOARD " %s", state.label);
 
         lv_label_set_text(label, text);
     }
diff --git a/app/src/display/widgets/output_status.c b/app/src/display/widgets/output_status.c
index fe99ac96..8bbe1a7e 100644
--- a/app/src/display/widgets/output_status.c
+++ b/app/src/display/widgets/output_status.c
@@ -39,24 +39,24 @@ static struct output_status_state get_state(const zmk_event_t *_eh) {
 }
 
 static void set_status_symbol(lv_obj_t *label, struct output_status_state state) {
-    char text[9] = {};
+    char text[10] = {};
 
     switch (state.selected_endpoint) {
     case ZMK_ENDPOINT_USB:
-        strcat(text, LV_SYMBOL_USB "   ");
+        strcat(text, LV_SYMBOL_USB);
         break;
     case ZMK_ENDPOINT_BLE:
         if (state.active_profile_bonded) {
             if (state.active_profile_connected) {
-                snprintf(text, sizeof(text), LV_SYMBOL_WIFI "%i " LV_SYMBOL_OK,
-                         state.active_profile_index);
+                snprintf(text, sizeof(text), LV_SYMBOL_WIFI " %i " LV_SYMBOL_OK,
+                         state.active_profile_index + 1);
             } else {
-                snprintf(text, sizeof(text), LV_SYMBOL_WIFI "%i " LV_SYMBOL_CLOSE,
-                         state.active_profile_index);
+                snprintf(text, sizeof(text), LV_SYMBOL_WIFI " %i " LV_SYMBOL_CLOSE,
+                         state.active_profile_index + 1);
             }
         } else {
-            snprintf(text, sizeof(text), LV_SYMBOL_WIFI "%i " LV_SYMBOL_SETTINGS,
-                     state.active_profile_index);
+            snprintf(text, sizeof(text), LV_SYMBOL_WIFI " %i " LV_SYMBOL_SETTINGS,
+                     state.active_profile_index + 1);
         }
         break;
     }
diff --git a/app/src/display/widgets/wpm_status.c b/app/src/display/widgets/wpm_status.c
index 7ed047c3..a2c6a287 100644
--- a/app/src/display/widgets/wpm_status.c
+++ b/app/src/display/widgets/wpm_status.c
@@ -28,9 +28,10 @@ void set_wpm_symbol(lv_obj_t *label, struct wpm_status_state state) {
     char text[4] = {};
 
     LOG_DBG("WPM changed to %i", state.wpm);
-    snprintf(text, sizeof(text), "%i ", state.wpm);
+    snprintf(text, sizeof(text), "%i", state.wpm);
 
     lv_label_set_text(label, text);
+    lv_obj_align(label, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
 }
 
 void wpm_status_update_cb(struct wpm_status_state state) {