From 2f8e7af395e10e9e5d5b99f9eb4f62b6054cf2bd Mon Sep 17 00:00:00 2001
From: Coveleski <1399862+coveleski@users.noreply.github.com>
Date: Fri, 17 May 2024 15:59:17 -0500
Subject: [PATCH] layout

---
 layouts/items.json         | 111 +++++++++++++++++++++----------------
 layouts/split_cardkey.json |   2 +-
 layouts/tracker.json       |  42 +++++++-------
 3 files changed, 84 insertions(+), 71 deletions(-)

diff --git a/layouts/items.json b/layouts/items.json
index 381fd16..04e58c1 100644
--- a/layouts/items.json
+++ b/layouts/items.json
@@ -173,54 +173,6 @@
                         "v_alignment": "top",
                         "h_alignment": "center",
                         "item_size": "305,40"
-                    },
-                    {
-                        "type": "group",
-                        "background": "#111111",
-                        "header": "Cerulean Cave Requirements",
-                        "dock": "top",
-                        "content": {
-                            "type": "itemgrid",
-                            "orientation": "vertical",
-                            "h_alignment": "center",
-                            "rows": [
-                                [
-                                    "badge_req",
-                                    "ccaveB_digit",
-                                    "",
-                                    "",
-                                    "key_req",
-                                    "ccaveK_digit1",
-                                    "ccaveK_digit2"
-                                ]
-                            ]
-                        }
-                    },
-                    {
-                        "type": "group",
-                        "orientation": "vertical",
-                        "background": "#111111",
-                        "header": "Victory Road Requirements",
-                        "v_alignment": "stretch",
-                        "dock": "top",
-                        "content": {
-                            "type": "itemgrid",
-                            "orientation": "vertical",
-                            "h_alignment": "center",
-                            "v_alignment": "stretch",
-                            "rows": [
-                                [
-                                    "rt22_req",
-                                    "badge_req",
-                                    "rt22_digit",
-                                    "",
-                                    "vr_req",
-                                    "badge_req",
-                                    "vr_digit",
-                                    ""
-                                ]
-                            ]
-                        }
                     }
                 ]
             }
@@ -287,6 +239,69 @@
                     }
                 }
         
+        ]
+    },
+    "requirements": {
+        "type": "array",
+        "orientation": "vertical",
+        "background": "#171717",
+        "margin": "0 0 0 0",
+        "content": [
+            {
+                "type": "group",
+                "header": "Viridian Gym",
+                "dock": "top",
+                "content":                 {
+                    "type": "itemgrid",
+                    "orientation": "vertical",
+                    "h_alignment": "left",
+                    "rows": [
+                        ["vg_req","badge_req","vg_digit",""]
+                    ]
+                }
+            },
+            {
+                "type": "group",
+                "header": "Victory Road Requirements",
+                "dock": "top",
+                "content":                 {
+                    "type": "itemgrid",
+                    "orientation": "vertical",
+                    "h_alignment": "left",
+                    "rows": [
+                        ["rt22_req","badge_req","rt22_digit","",
+                        "vr_req", "badge_req","vr_digit",""]
+                    ]
+                }
+            },
+            {
+                "type": "group",
+                "header": "Elite 4 Requirements",
+                "dock": "top",
+                "content":                 {
+                    "type": "itemgrid",
+                    "orientation": "vertical",
+                    "h_alignment": "left",
+                    "rows": [
+                        ["badge_req","e4b_digit","","key_req","e4k_digit1","e4k_digit2"],
+                        ["dex_req","e4p_digit1", "e4p_digit2","e4p_digit3",""]
+                    ]
+                
+                }
+            },
+                {
+                    "type": "group",
+                    "header": "Cerulean Cave Requirements",
+                    "dock": "top",
+                    "content":                 {
+                        "type": "itemgrid",
+                        "orientation": "vertical",
+                        "h_alignment": "left",
+                        "rows": [["badge_req","ccaveB_digit","","key_req","ccaveK_digit1","ccaveK_digit2"]]
+                    
+                    }
+                }
+        
         ]
     }
 }
diff --git a/layouts/split_cardkey.json b/layouts/split_cardkey.json
index 0a691e7..765c763 100644
--- a/layouts/split_cardkey.json
+++ b/layouts/split_cardkey.json
@@ -1,7 +1,7 @@
 {
     "cardkey": {
         "type": "itemgrid",
-        "background": "#212121",
+        "background": "#171717",
         "rows": [
             ["cardkey2f", "cardkey3f", "cardkey4f", "cardkey5f", "cardkey6f"],
             ["cardkey7f", "cardkey8f", "cardkey9f", "cardkey10f", "cardkey11f"]
diff --git a/layouts/tracker.json b/layouts/tracker.json
index 047c4c3..51b083f 100644
--- a/layouts/tracker.json
+++ b/layouts/tracker.json
@@ -1,7 +1,7 @@
 {
     "tracker_default": {
         "type": "container",
-        "background": "#212121",
+        "background": "#171717",
         "content": {
             "type": "dock",
             "dropshadow": true,
@@ -9,6 +9,7 @@
                 {
                     "type": "dock",
                     "dock": "left",
+                    "background": "#171717",
                     "v_alignment": "stretch",
                     "margin": "0,0,0,0",
                     "content": [
@@ -24,15 +25,26 @@
                         {
                             "type": "layout",
                             "key": "cardkey",
+                            "dock": "top"
                         },
                         {
-                            "type": "group",
-                            "header": "Settings",
-                            "dock": "bottom",
-                            "content": {
-                                "type": "layout",
-                                "key": "settings"
-                            }
+                            "type": "tabbed",
+                            "tabs": [
+                                {
+                                    "title": "Settings",
+                                    "content": {
+                                        "type": "layout",
+                                        "key": "settings"
+                                        }
+                                },
+                                {
+                                    "title": "Badge Requirements",
+                                    "content": {
+                                        "type": "layout",
+                                        "key": "requirements"
+                                        }
+                                }
+                            ]
                         }
                     ]
                 },
@@ -54,20 +66,6 @@
                             ]
                         }
                     ]
-                },
-                {
-                    "type": "dock",
-                    "dock": "bottom",
-
-                    "v_alignment": "stretch",
-                    "margin": "0,0,0,0",
-                    "background": "#212121",
-                    "content": [
-                        {
-                            "type": "layout",
-                            "key": "bottombar"
-                        }
-                    ]
                 }
             ]
         }