Skip to content

Commit ac3a06f

Browse files
committed
fix(gui): Rename "Catalog" to "Store Type Catalog" and "Store Types" to "Installed Store Types"
Signed-off-by: spbsoluble <1661003+spbsoluble@users.noreply.github.com>
1 parent 6a8839d commit ac3a06f

4 files changed

Lines changed: 18 additions & 14 deletions

File tree

pkg/gui/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
const (
2828
NavHome = "Home"
2929
NavSettings = "Settings"
30-
NavStoreTypes = "Store Types"
31-
NavCatalog = "Catalog"
30+
NavStoreTypes = "Installed Store Types"
31+
NavCatalog = "Store Type Catalog"
3232
)
3333

3434
// App represents the main GUI application

pkg/gui/theme.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,22 @@ func NewKeyfactorTheme() fyne.Theme {
3030
}
3131

3232
// Color returns the color for the specified theme color name
33-
func (t *KeyfactorTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color {
33+
// We force dark mode by always using VariantDark regardless of OS setting
34+
func (t *KeyfactorTheme) Color(name fyne.ThemeColorName, _ fyne.ThemeVariant) color.Color {
35+
// Always use dark variant for consistent appearance across platforms
36+
darkVariant := theme.VariantDark
37+
3438
switch name {
3539
case theme.ColorNamePrimary:
36-
return color.NRGBA{R: 0, G: 122, B: 204, A: 255} // Keyfactor blue
40+
return color.NRGBA{R: 95, G: 87, B: 255, A: 255} // Keyfactor purple
3741
case theme.ColorNameButton:
38-
return color.NRGBA{R: 0, G: 122, B: 204, A: 255}
42+
return color.NRGBA{R: 95, G: 87, B: 255, A: 255}
3943
case theme.ColorNameFocus:
40-
return color.NRGBA{R: 0, G: 150, B: 230, A: 255}
44+
return color.NRGBA{R: 180, G: 160, B: 255, A: 255}
4145
case theme.ColorNameSelection:
42-
return color.NRGBA{R: 0, G: 122, B: 204, A: 100}
46+
return color.NRGBA{R: 180, G: 160, B: 255, A: 255}
4347
default:
44-
return theme.DefaultTheme().Color(name, variant)
48+
return theme.DefaultTheme().Color(name, darkVariant)
4549
}
4650
}
4751

pkg/gui/views/home.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ func NewHomeView(authService *services.AuthService, navigateTo func(string)) fyn
5353

5454
storeTypesBtn := widget.NewButton(
5555
"Manage Store Types", func() {
56-
navigateTo("Store Types")
56+
navigateTo("Installed Store Types")
5757
},
5858
)
5959

6060
catalogBtn := widget.NewButton(
6161
"Browse Catalog", func() {
62-
navigateTo("Catalog")
62+
navigateTo("Store Type Catalog")
6363
},
6464
)
6565

pkg/gui/views/store_type_manager.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ func NewStoreManagerView(
436436
// For table mode, we can just refresh the table widget
437437
if SharedViewState.IsGridView {
438438
// Navigate to trigger a fresh view creation on the main thread
439-
navigateTo("Store Types")
439+
navigateTo("Installed Store Types")
440440
} else {
441441
updateView(true) // Called from goroutine - only refreshes table
442442
}
@@ -769,8 +769,8 @@ func NewStoreManagerView(
769769

770770
// Open catalog button
771771
catalogBtn := widget.NewButton(
772-
"Open Catalog", func() {
773-
navigateTo("Catalog")
772+
"Open Store Type Catalog", func() {
773+
navigateTo("Store Type Catalog")
774774
},
775775
)
776776

@@ -844,7 +844,7 @@ func NewStoreManagerView(
844844

845845
// Authentication successful - navigate to trigger fresh view creation
846846
// This avoids modifying container objects from a goroutine which causes race conditions
847-
navigateTo("Store Types")
847+
navigateTo("Installed Store Types")
848848
}()
849849
}
850850

0 commit comments

Comments
 (0)