Refactoring

2 files changed, 8 insertions, 14 deletions

diff --git a/interface/matrix.go b/interface/matrix.go
index 95122cc..40710ac 100644
--- a/interface/matrix.go
+++ b/interface/matrix.go
@@ -25,16 +25,21 @@ type MatrixContainer interface {
 	Client() *gomatrix.Client
 	InitClient() error
 	Initialized() bool
-	Login(user, password string) error
+
 	Start()
 	Stop()
+
+	Login(user, password string) error
+
 	SendMessage(roomID, msgtype, message string) (string, error)
 	SendMarkdownMessage(roomID, msgtype, message string) (string, error)
 	SendTyping(roomID string, typing bool)
 	JoinRoom(roomID string) (*rooms.Room, error)
 	LeaveRoom(roomID string) error
+
 	GetHistory(roomID, prevBatch string, limit int) ([]gomatrix.Event, string, error)
 	GetRoom(roomID string) *rooms.Room
+
 	Download(mxcURL string) ([]byte, string, string, error)
 	GetCachePath(homeserver, fileID string) string
 }
diff --git a/interface/ui.go b/interface/ui.go
index add3ee7..e487d3e 100644
--- a/interface/ui.go
+++ b/interface/ui.go
@@ -25,21 +25,13 @@ import (
 	"maunium.net/go/tcell"
 )
 
-type View string
-
-// Allowed views in GomuksUI
-const (
-	ViewLogin View = "login"
-	ViewMain  View = "main"
-)
-
 type UIProvider func(gmx Gomuks) GomuksUI
 
 type GomuksUI interface {
 	Render()
-	SetView(name View)
+	OnLogin()
+	OnLogout()
 	MainView() MainView
-	LoginView() LoginView
 
 	Init()
 	Start() error
@@ -62,9 +54,6 @@ type MainView interface {
 	NotifyMessage(room *rooms.Room, message Message, should pushrules.PushActionArrayShould)
 }
 
-type LoginView interface {
-}
-
 type MessageDirection int
 
 const (