Update UI for settings page

4 files changed, 86 insertions, 57 deletions

diff --git a/src/drawing.c b/src/drawing.c
index f3115c5..fbc741c 100644
--- a/src/drawing.c
+++ b/src/drawing.c
@@ -363,15 +363,36 @@ draw_play() {
 }
 
 void
+draw_wrench(u8 x, u8 y, u8 clr) {
+    draw_line(x + 10, y + 3, x + 13, y + 3, clr);
+    draw_line(x + 10, y + 5, x + 13, y + 5, clr);
+    draw_line(x + 19, y + 3, x + 22, y + 3, clr);
+    draw_line(x + 19, y + 5, x + 22, y + 5, clr);
+    draw_line(x + 13, y + 4, x + 19, y + 4, clr);
+}
+
+void
 draw_settings() {
     size_t x = SETTINGS_START_X;
     size_t y = SETTINGS_START_Y;
     draw_rect(x + 2, y, x + R_COL_W, y + PLAY_STOP_H, COL_OFF);
-    draw_line(x + 10, y + 3, x + 13, y + 3, COL_OFF);
-    draw_line(x + 10, y + 5, x + 13, y + 5, COL_OFF);
-    draw_line(x + 19, y + 3, x + 22, y + 3, COL_OFF);
-    draw_line(x + 19, y + 5, x + 22, y + 5, COL_OFF);
-    draw_line(x + 13, y + 4, x + 19, y + 4, COL_OFF);
+    draw_wrench(x, y, COL_OFF);
+}
+
+void
+draw_settings_cursor(void) {
+    u8 y_pos[] = {
+        49,
+        49 + 17,
+        49 + 17 * 3,
+        49 + 17 * 4,
+        49 + 17 * 5,
+        49 + 17 * 6,
+    };
+    int x = 8;
+    int y = y_pos[settings_cursor_loc];
+    draw_line(x, y, x + 64, y, COL_ACC_0);
+    draw_line(x, y + 1, x + 64, y + 1, COL_ACC_0);
 }
 
 void
diff --git a/src/main.c b/src/main.c
index c424d9c..ae14d87 100644
--- a/src/main.c
+++ b/src/main.c
@@ -129,14 +129,49 @@ render_sequencer(void) {
 
 void
 render_settings(void) {
-    txt_drawf_small("settings", 11, 5, COL_FG)
-    txt_printf("\n\n\n");
-    txt_printf("  SYNC:   %s\n\n", sync_setting_str[settings.sync]);
-    txt_printf("  THEME:  %s\n\n", theme_setting_str[settings.theme]);
-    txt_printf("  CURSOR: %s\n\n", cursor_setting_str[settings.cursor]);
-    txt_printf("  HELP:   %s\n\n", help_setting_str[settings.help]);
-    txt_render();
-    txt_clear();
+    size_t x0 = 8;
+    size_t x1 = x0 + 64;
+    size_t y0 = 6;
+
+    // Header.
+    txt_drawf("SETTINGS", x0, y0, COL_FG)
+    draw_wrench(SCREEN_WIDTH - 32, y0, COL_FG);
+    y0 = 16;
+    draw_filled_rect(x0, y0 - 1, SCREEN_WIDTH - 9,  y0, COL_FG);
+    y0 = 20;
+
+    // Globals.
+    txt_drawf("GLOBAL", x0, y0, COL_FG);
+    draw_line(x0, y0 + 9, SCREEN_WIDTH - 9,  y0 + 9, COL_FG);
+    y0 += 17;
+    draw_rect(x0, y0, x1, y0 + 10, COL_FG);
+    txt_drawf("MUTE", x0 + 2, y0 + 1, COL_FG);
+    txt_drawf("OFF", x1 + 8, y0 + 1, COL_FG);
+    y0 += 17;
+    draw_rect(x0, y0, x1, y0 + 10, COL_FG);
+    txt_drawf("BPM", x0 + 2, y0 + 1, COL_FG);
+    txt_drawf("OFF", x1 + 8, y0 + 1, COL_FG);
+    y0 += 17;
+
+    txt_drawf("GENERAL", x0, y0, COL_FG);
+    draw_line(x0, y0 + 9, SCREEN_WIDTH - 9,  y0 + 9, COL_FG);
+    y0 += 17;
+    draw_rect(x0, y0, x1, y0 + 10, COL_FG);
+    txt_drawf("AUTO-SAVE", x0 + 2, y0 + 1, COL_FG);
+    txt_drawf("OFF", x1 + 8, y0 + 1, COL_FG);
+    y0 += 17;
+    draw_rect(x0, y0, x1, y0 + 10, COL_FG);
+    txt_drawf("SYNC", x0 + 2, y0 + 1, COL_FG);
+    txt_drawf("%s", x1 + 8, y0 + 1, COL_FG, sync_setting_str[settings.sync]);
+    y0 += 17;
+    draw_rect(x0, y0, x1, y0 + 10, COL_FG);
+    txt_drawf("THEME", x0 + 2, y0 + 1, COL_FG);
+    txt_drawf("%s", x1 + 8, y0 + 1, COL_FG, theme_setting_str[settings.theme]);
+    y0 += 17;
+    draw_rect(x0, y0, x1, y0 + 10, COL_FG);
+    txt_drawf("HELP", x0 + 2, y0 + 1, COL_FG);
+    txt_drawf("%s", x1 + 8, y0 + 1, COL_FG, help_setting_str[settings.help]);
+
     PROF(draw_settings_cursor(), draw_cursor_cycles);
 }
 
diff --git a/src/settings.c b/src/settings.c
index d2491b8..eb1393b 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -4,15 +4,6 @@
 static Settings settings = {0};
 static int settings_cursor_loc = 0;
 
-void
-draw_settings_cursor(void) {
-    int x = 6;
-    int y = 17 + settings_cursor_loc * 12;
-    draw_line(x + 1, y + 3, x + 1, y + 7, COL_ACC_0);
-    draw_line(x + 2, y + 4, x + 2, y + 6, COL_ACC_0);
-    draw_line(x + 3, y + 5, x + 3, y + 5, COL_ACC_0);
-}
-
 void serial_irq(void);
 void stop_sound(void);
 void toggle_playing(void);
@@ -62,7 +53,7 @@ set_audio_settings(void) {
 void
 handle_settings_input(void) {
     if (key_tap(KEY_DOWN)) {
-        if (settings_cursor_loc == (N_SETTINGS - 1)) {
+        if (settings_cursor_loc == (SETTINGS_NUM - 1)) {
             settings_cursor_loc = 0;
         } else {
             settings_cursor_loc++;
@@ -71,7 +62,7 @@ handle_settings_input(void) {
     }
     if (key_tap(KEY_UP)) {
         if (settings_cursor_loc == 0) {
-            settings_cursor_loc = N_SETTINGS - 1;
+            settings_cursor_loc = SETTINGS_NUM - 1;
         } else {
             settings_cursor_loc--;
         }
@@ -79,7 +70,7 @@ handle_settings_input(void) {
     }
     if (key_tap(KEY_R)) {
         switch (settings_cursor_loc) {
-            case 0: {
+            case SETTINGS_SYNC: {
                 if ((settings.sync + 1) >= SYNC_NUM) {
                     settings.sync = 0;
                 } else {
@@ -87,7 +78,7 @@ handle_settings_input(void) {
                 }
                 set_audio_settings();
             } break;
-            case 1: {
+            case SETTINGS_THEME: {
                 if ((settings.theme + 1) >= THEME_NUM) {
                     settings.theme = 0;
                 } else {
@@ -95,14 +86,7 @@ handle_settings_input(void) {
                 }
                 swap_palette(settings.theme);
             } break;
-            case 2: {
-                if ((settings.cursor + 1) >= CURSOR_NUM) {
-                    settings.cursor = 0;
-                } else {
-                    settings.cursor++;
-                }
-            } break;
-            case 3: {
+            case SETTINGS_HELP: {
                 if ((settings.help + 1) >= HELP_NUM) {
                     settings.help = 0;
                 } else {
@@ -115,7 +99,7 @@ handle_settings_input(void) {
     }
     if (key_tap(KEY_L)) {
         switch (settings_cursor_loc) {
-            case 0: {
+            case SETTINGS_SYNC: {
                 if (settings.sync == 0) {
                     settings.sync = SYNC_NUM - 1;
                 } else {
@@ -123,7 +107,7 @@ handle_settings_input(void) {
                 }
                 set_audio_settings();
             } break;
-            case 1: {
+            case SETTINGS_THEME: {
                 if (settings.theme == 0) {
                     settings.theme = THEME_NUM - 1;
                 } else {
@@ -131,14 +115,7 @@ handle_settings_input(void) {
                 }
                 swap_palette(settings.theme);
             } break;
-            case 2: {
-                if (settings.cursor == 0) {
-                    settings.cursor = CURSOR_NUM - 1;
-                } else {
-                    settings.cursor--;
-                }
-            } break;
-            case 3: {
+            case SETTINGS_HELP: {
                 if (settings.help == 0) {
                     settings.help = HELP_NUM - 1;
                 } else {
diff --git a/src/settings.h b/src/settings.h
index 332e6fd..f917534 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,7 +1,15 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#define N_SETTINGS 4
+typedef enum SettingsList {
+    SETTINGS_GLOB_MUTE,
+    SETTINGS_GLOB_BPM,
+    SETTINGS_AUTO_SAVE,
+    SETTINGS_SYNC,
+    SETTINGS_THEME,
+    SETTINGS_HELP,
+    SETTINGS_NUM,
+} SettingsList;
 
 typedef enum SyncSetting {
     SYNC_NONE = 0,
@@ -51,17 +59,6 @@ char * theme_setting_str[] = {
     "MERVEILLES",
 };
 
-typedef enum  CursorSetting {
-    CURSOR_THICK_LINE = 0,
-    CURSOR_LINE,
-    CURSOR_NUM,
-} CursorSetting;
-
-char * cursor_setting_str[] = {
-    "THICK LINE",
-    "LINE",
-};
-
 typedef enum HelpSetting {
     HELP_OFF = 0,
     HELP_ON,
@@ -76,7 +73,6 @@ char * help_setting_str[] = {
 typedef struct Settings {
     SyncSetting sync;
     ThemeSetting theme;
-    CursorSetting cursor;
     HelpSetting help;
     u8 reserved[63];
 } Settings;