make context great again

engine/types/screen.go

@@ -1,6 +1,7 @@
 package types
 
 import (
+	"context"
 	"lab.zaar.be/thefish/alchemyst-go/util/appctx"
 )
 
@@ -13,14 +14,14 @@ type Screen interface {
 }
 
 type ScreenManager struct {
-	ctx            appctx.ClientCtx
+	ctx            context.Context
 	Screens        map[string]Screen
 	CurrentScreen  Screen
 	PreviousScreen Screen
 }
 
 // NewScreenManager is a convenience/constructor method to properly initialize a new ScreenManager
-func NewScreenManager(ctx appctx.ClientCtx) *ScreenManager {
+func NewScreenManager(ctx context.Context) *ScreenManager {
 	manager := ScreenManager{
 		ctx:ctx,
 		Screens: make(map[string]Screen),
@@ -35,7 +36,7 @@ func (sm *ScreenManager) AddScreen(screenName string, screen Screen) {
 		// A screen with the given name does not yet exist on the ScreenManager, go ahead and add it
 		sm.Screens[screenName] = screen
 	} else {
-		sm.ctx.Logger().Warn().Msgf("A screen with name %v was already added to the ScreenManager %v!", screenName, sm)
+		appctx.Logger(sm.ctx).Warn().Msgf("A screen with name %v was already added to the ScreenManager %v!", screenName, sm)
 	}
 }
 
@@ -48,7 +49,7 @@ func (sm *ScreenManager) RemoveScreen(screenName string, screen Screen) {
 		delete(sm.Screens, screenName)
 	} else {
 		// A screen with the given name does not exist
-		sm.ctx.Logger().Warn().Msgf("A screen with name %v was not found on ScreenManager %v!", screenName, sm)
+		appctx.Logger(sm.ctx).Warn().Msgf("A screen with name %v was not found on ScreenManager %v!", screenName, sm)
 	}
 }
 
@@ -83,6 +84,6 @@ func (sm *ScreenManager) SetScreenByName(screenName string) {
 		sm.CurrentScreen.Enter()
 	} else {
 		// A screen with the given name does not exist
-		sm.ctx.Logger().Warn().Msgf("A screen with name %v was not found on ScreenManager %v!", screenName, sm)
+		appctx.Logger(sm.ctx).Warn().Msgf("A screen with name %v was not found on ScreenManager %v!", screenName, sm)
 	}
 }