From 508bbb79fb3173e5d5711b7cab4ace25cb52f3d9 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 23 Mar 2026 02:48:47 +0200 Subject: [PATCH 1/2] refactor: move font package under ui/ --- README.md | 10 ++++++++-- main.go | 2 +- {font => ui/font}/FiraCode-Regular.ttf | Bin {font => ui/font}/LICENSE | 0 {font => ui/font}/font.go | 0 5 files changed, 9 insertions(+), 3 deletions(-) rename {font => ui/font}/FiraCode-Regular.ttf (100%) rename {font => ui/font}/LICENSE (100%) rename {font => ui/font}/font.go (100%) diff --git a/README.md b/README.md index e8c11c9..223bb40 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,19 @@ golangci-lint run --fix ## Architecture -Dependencies point downward: Application → Infrastructure → Domain. Exception is `data/shell` → `infra/platform` for OS detection. ``` +Dependencies point downward: + Application → Infrastructure → Domain. + +Exception is `data/shell` → `infra/platform` for OS detection. + + Application Layer: main.go -> lifecycle app/ -> application state ui/ -> immediate-mode GUI rendering + font/ -> embedded font assets Infrastructure Layer: infra/ @@ -57,4 +63,4 @@ Copyright © 2026 bosiakov Licensed under MIT (see [LICENSE](LICENSE)). -The font `font/FiraCode-Regular.ttf` is licensed under the OFL-1.1. See [font/LICENSE](font/LICENSE) for details. \ No newline at end of file +The font `ui/font/FiraCode-Regular.ttf` is licensed under the OFL-1.1. See [ui/font/LICENSE](ui/font/LICENSE) for details. \ No newline at end of file diff --git a/main.go b/main.go index b00629b..53fd8f8 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,7 @@ import ( appstate "github.com/debrief-dev/debrief/app" "github.com/debrief-dev/debrief/data/model" "github.com/debrief-dev/debrief/data/shell" - "github.com/debrief-dev/debrief/font" + "github.com/debrief-dev/debrief/ui/font" "github.com/debrief-dev/debrief/infra/autostart" "github.com/debrief-dev/debrief/infra/config" "github.com/debrief-dev/debrief/infra/hotkey" diff --git a/font/FiraCode-Regular.ttf b/ui/font/FiraCode-Regular.ttf similarity index 100% rename from font/FiraCode-Regular.ttf rename to ui/font/FiraCode-Regular.ttf diff --git a/font/LICENSE b/ui/font/LICENSE similarity index 100% rename from font/LICENSE rename to ui/font/LICENSE diff --git a/font/font.go b/ui/font/font.go similarity index 100% rename from font/font.go rename to ui/font/font.go From 4fceb68ea7207d8c445a3b802a3aa6b9ece3c498 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 23 Mar 2026 02:51:29 +0200 Subject: [PATCH 2/2] golangci-lint run --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 53fd8f8..d5970d5 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,6 @@ import ( appstate "github.com/debrief-dev/debrief/app" "github.com/debrief-dev/debrief/data/model" "github.com/debrief-dev/debrief/data/shell" - "github.com/debrief-dev/debrief/ui/font" "github.com/debrief-dev/debrief/infra/autostart" "github.com/debrief-dev/debrief/infra/config" "github.com/debrief-dev/debrief/infra/hotkey" @@ -35,6 +34,7 @@ import ( "github.com/debrief-dev/debrief/infra/tray" "github.com/debrief-dev/debrief/infra/window" "github.com/debrief-dev/debrief/ui" + "github.com/debrief-dev/debrief/ui/font" ) // Window lifecycle coordination channels