Splash page fix

Author: intendednull

src/main.py

@@ -5,7 +5,7 @@
 from .view import Window, View
 from .front import Front
 from .splash import Splash
-from . import SETTINGS, widget
+from . import SETTINGS
 
 
 parser = configparser.ConfigParser()
@@ -21,13 +21,10 @@ def __init__(self, *args, **kwds):
         for name, val in parser['APP'].items():
             getattr(self, name)(val)
 
-        # self.frame = widget.PrimaryFrame(self)
         self.window = Window(self)
-
-        # self.frame.pack(expand=True, fill='both')
         self.window.pack(expand=True, fill='both')
-
         self.update()
+
         self.splash = View(
             self.window,
             window=Splash(self.window),
@@ -40,14 +37,32 @@ def __init__(self, *args, **kwds):
             height=self.winfo_height(),
             width=self.winfo_width()
         )
-        self.after(0, self.build, self.splash)
+        self.execution_order = iter((
+            self.splash,
+            self.front,
+            # self.result
+        ))
+        self.update()
+        self.current: View = None
+        self.after(0, self.switch)
+
+    def switch(self):
+        try:
+            self.update()
+            if self.current is not None:
+                self.current.data.cleanup()
+            self.current = next(self.execution_order)
+            self.build(self.current)
+        except StopIteration:
+            self.cleanup()
 
     def build(self, view):
         self.update()
-        view.master.set_view(view)
+        view.master.change_view(view, 'up')
+        self.update()
         view.data.build()
 
     def cleanup(self):
         with suppress(Exception):
-            self.front.cleanup()
+            self.current.cleanup()
             self.destroy()

src/splash.py

@@ -11,33 +11,42 @@ class Splash(widget.PrimaryFrame):
         questions = json.load(fp)
 
     def init(self):
-        self.intro = Intro(self)
-        self.intro.pack(fill='both', expand=True)
+        self.intro = Intro(self, bg='gray')
 
-        self.btn_confirm = widget.PrimaryButton(self.intro.window, command=self.next, text='Okay')
+        self.btn_confirm = widget.PrimaryButton(
+            self.intro.window, command=self.switch, text='Okay'
+        )
+        self.update()
 
     def build(self):
+        self.update()
+        self.intro.pack(fill='both', expand=True)
         self.intro.build()
-        bouncer = View(self.intro.window, window=self.btn_confirm)
-        self.bounce(bouncer)
+        self.bounce(
+            View(self.intro.window, window=self.btn_confirm)
+        )
 
     def bounce(self, view):
+        self.update()
         start = view.master.center + (Direction.LEFT * 175) + (Direction.DOWN * 100)
         wid = view.master.set_view(view, start)
         motion = BounceBall(view.master, wid, view.master.origin, speed=6)
         motion.kick(Direction.UP)
         self.after(0, view.master.run, motion)
 
-    def next(self):
+    def switch(self):
         self.master.master.switch()
 
+    def cleanup(self):
+        self.intro.cleanup()
+
 
 class Intro(widget.PrimaryFrame):
     intro = (DOCS / 'intro.txt').read_text()
 
     def init(self):
-        self.window = Window(self, bg='gray')
-        self.window.pack(fill='both', expand=True)
+        self.window = Window(self)
+        self.window.pack(expand=True, fill='both')
         self.update()
 
         width = self.winfo_reqwidth()
@@ -53,15 +62,17 @@ def init(self):
             width=width,
             font=('sys', 12), justify='center'
         )
-        self.update()
 
     def build(self):
-        self.window.set_view(self.title)
+        self.update()
         adjust = (Direction.LEFT * 175) + (Direction.DOWN * 100)
-        self.window.set_view(
-            self.intro,
-            self.window.center + adjust
-        )
+
+        self.window.set_view(self.title)
+        self.window.set_view(self.intro, self.window.center + adjust)
+        self.update()
+
+    def cleanup(self):
+        self.window.animater.clear()
 
 
 class Question(widget.PrimaryFrame):

src/view.py

@@ -47,7 +47,7 @@ def move_out(self, view: View, direction: Direction):
         del self.views[view]
 
     def change_view(self, view: View, direction: Direction = None):
-        if direction is None:
+        if direction is None or self.current is None:
             self.set_view(view)
             return
         if not isinstance(direction, Direction):

src/widget.py

@@ -86,7 +86,7 @@ def __init__(self, *args, **kwds):
 
 class PrimaryCanvas(tk.Canvas):
     DEFAULT = {
-        'bg': 'black'
+        'bg': 'gray'
     }
 
     def __init__(self, *args, **kwds):