From c2139af5ad9500d6c6e018124949af6f4725a7cc Mon Sep 17 00:00:00 2001
From: zervo <contact@dev.zervo.org>
Date: Sat, 1 Feb 2025 16:35:52 +0100
Subject: [PATCH] Restructure

---
 src/internal/ui/layout.go         |  2 +-
 src/internal/ui/sidebar.go        |  6 +++---
 src/internal/ui/views.go          | 35 ++++++-------------------------
 src/internal/ui/views/home.go     | 13 ++++++++++++
 src/internal/ui/views/parts.go    | 13 ++++++++++++
 src/internal/ui/views/settings.go | 13 ++++++++++++
 src/pkg/types/ui/constants.go     |  2 +-
 7 files changed, 50 insertions(+), 34 deletions(-)
 create mode 100644 src/internal/ui/views/home.go
 create mode 100644 src/internal/ui/views/parts.go
 create mode 100644 src/internal/ui/views/settings.go

diff --git a/src/internal/ui/layout.go b/src/internal/ui/layout.go
index c8d724b..9d0cfe4 100644
--- a/src/internal/ui/layout.go
+++ b/src/internal/ui/layout.go
@@ -9,7 +9,7 @@ import (
 	"gioui.org/op"
 )
 
-var currentView t_ui.UIView = t_ui.UIViewMain
+var currentView t_ui.UIView = t_ui.UIViewHome
 
 // run takes a window as parameter and runs the UI on it.
 func run(window *app.Window) error {
diff --git a/src/internal/ui/sidebar.go b/src/internal/ui/sidebar.go
index 099f903..8fe63f4 100644
--- a/src/internal/ui/sidebar.go
+++ b/src/internal/ui/sidebar.go
@@ -52,7 +52,7 @@ func renderSidebar(th *material.Theme) layout.Widget {
 						Axis:      layout.Vertical,
 						Alignment: layout.Start,
 					}.Layout(gtx,
-						layout.Rigid(renderNavButton(th, icons.ActionHome, "Main", &mainButton, t_ui.UIViewMain)),
+						layout.Rigid(renderNavButton(th, icons.ActionHome, "Main", &mainButton, t_ui.UIViewHome)),
 						layout.Rigid(renderNavButton(th, icons.ActionBuild, "Parts", &partsButton, t_ui.UIViewParts)),
 						layout.Rigid(renderNavButton(th, icons.ActionSettings, "Settings", &settingsButton, t_ui.UIViewSettings)),
 					)
@@ -71,14 +71,14 @@ func renderNavButton(th *material.Theme, icon *widget.Icon, label string, btn *w
 
 		// Padding for each button, to add spacing between them.
 		in := layout.Inset{
-			Bottom: unit.Dp(8),
+			Bottom: unit.Dp(12),
 			Left:   unit.Dp(4),
 			Right:  unit.Dp(4),
 		}
 
 		return in.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
 			btn := material.IconButton(th, btn, icon, label)
-			btn.Size = unit.Dp(30)
+			btn.Size = unit.Dp(gtx.Constraints.Max.X / 2)
 			return btn.Layout(gtx)
 		})
 	}
diff --git a/src/internal/ui/views.go b/src/internal/ui/views.go
index 8686151..bce1b37 100644
--- a/src/internal/ui/views.go
+++ b/src/internal/ui/views.go
@@ -1,11 +1,10 @@
 package ui
 
 import (
+	"icdb/internal/ui/views"
 	t_ui "icdb/pkg/types/ui"
-	"image/color"
 
 	"gioui.org/layout"
-	"gioui.org/text"
 	"gioui.org/widget/material"
 )
 
@@ -13,36 +12,14 @@ import (
 func renderView(th *material.Theme) layout.Widget {
 	return func(gtx layout.Context) layout.Dimensions {
 		switch currentView {
-		case t_ui.UIViewMain:
-			return renderMainView(gtx, th)
+		case t_ui.UIViewHome:
+			return views.HomeView(gtx, th)
 		case t_ui.UIViewParts:
-			return renderPartsView(gtx, th)
+			return views.PartsView(gtx, th)
 		case t_ui.UIViewSettings:
-			return renderSettingsView(gtx, th)
+			return views.SettingsView(gtx, th)
 		default:
-			return renderMainView(gtx, th)
+			return views.HomeView(gtx, th)
 		}
 	}
 }
-
-// renderMainView displays the main view
-func renderMainView(gtx layout.Context, th *material.Theme) layout.Dimensions {
-	title := material.H2(th, "Welcome to ICDB")
-	title.Color = color.NRGBA{R: 127, G: 0, B: 0, A: 255}
-	title.Alignment = text.Middle
-	return title.Layout(gtx)
-}
-
-// renderPartsView displays the parts list
-func renderPartsView(gtx layout.Context, th *material.Theme) layout.Dimensions {
-	title := material.H2(th, "Parts Management")
-	title.Alignment = text.Middle
-	return title.Layout(gtx)
-}
-
-// renderSettingsView displays the settings view
-func renderSettingsView(gtx layout.Context, th *material.Theme) layout.Dimensions {
-	title := material.H2(th, "Settings")
-	title.Alignment = text.Middle
-	return title.Layout(gtx)
-}
diff --git a/src/internal/ui/views/home.go b/src/internal/ui/views/home.go
new file mode 100644
index 0000000..5f05c9a
--- /dev/null
+++ b/src/internal/ui/views/home.go
@@ -0,0 +1,13 @@
+package views
+
+import (
+	"gioui.org/layout"
+	"gioui.org/text"
+	"gioui.org/widget/material"
+)
+
+func HomeView(gtx layout.Context, th *material.Theme) layout.Dimensions {
+	title := material.H2(th, "Welcome to ICDB")
+	title.Alignment = text.Middle
+	return title.Layout(gtx)
+}
diff --git a/src/internal/ui/views/parts.go b/src/internal/ui/views/parts.go
new file mode 100644
index 0000000..39a3be9
--- /dev/null
+++ b/src/internal/ui/views/parts.go
@@ -0,0 +1,13 @@
+package views
+
+import (
+	"gioui.org/layout"
+	"gioui.org/text"
+	"gioui.org/widget/material"
+)
+
+func PartsView(gtx layout.Context, th *material.Theme) layout.Dimensions {
+	title := material.H2(th, "Parts")
+	title.Alignment = text.Middle
+	return title.Layout(gtx)
+}
diff --git a/src/internal/ui/views/settings.go b/src/internal/ui/views/settings.go
new file mode 100644
index 0000000..b5c065b
--- /dev/null
+++ b/src/internal/ui/views/settings.go
@@ -0,0 +1,13 @@
+package views
+
+import (
+	"gioui.org/layout"
+	"gioui.org/text"
+	"gioui.org/widget/material"
+)
+
+func SettingsView(gtx layout.Context, th *material.Theme) layout.Dimensions {
+	title := material.H2(th, "Settings")
+	title.Alignment = text.Middle
+	return title.Layout(gtx)
+}
diff --git a/src/pkg/types/ui/constants.go b/src/pkg/types/ui/constants.go
index a2f18ae..eef0147 100644
--- a/src/pkg/types/ui/constants.go
+++ b/src/pkg/types/ui/constants.go
@@ -1,7 +1,7 @@
 package ui
 
 const (
-	UIViewMain       UIView = 0
+	UIViewHome       UIView = 0
 	UIViewParts      UIView = 1
 	UIViewCategories UIView = 2
 	UIViewLocations  UIView = 3