Changed View to auto-get drawtype

Author: intendednull

res/docs/questions.json

@@ -1,4 +1,3 @@
 {
-    "What is your least favorite color?": ["#0801d5", "#ee018d", "#03a130", "#db0013", "#fd9501"],
-    
+    "What is your least favorite color?": ["#0801d5", "#ee018d", "#03a130", "#db0013", "#fd9501"]
 }

src/main.py

@@ -1,8 +1,6 @@
 import configparser
 import tkinter as tk
 from contextlib import suppress
-from pygame import mixer
-
 
 from .front import Front
 from .splash import Splash
@@ -20,14 +18,13 @@ def __init__(self, *args, **kwds):
         title = self.appconfig.pop('title')
         super().__init__(*args, **kwds)
         self.title = title
-        mixer.init()
 
         self.geometry = '400x500'
         self.minsize(400, 500)
         self.maxsize(400, 500)
 
         self.splash = Splash(self)
-        self.splash.pack()
+        self.splash.pack(expand=True, fill='both')
         # self.front = Front(self)
         # self.front.pack(fill='both', expand=True)
 

src/splash.py

@@ -1,7 +1,7 @@
 import tkinter as tk
 import json
 
-from .view import Window
+from .view import Window, View
 from . import widget, DOCS, IMAGES
 
 
@@ -29,10 +29,19 @@ def load(self, choices):
 
 class Splash(widget.PrimaryFrame):
 
-    intro = (DOCS / 'intro.txt').read_text().replace('\n', ' ').split('  ')
+    intro = (DOCS / 'intro.txt').read_text()  # .replace('\n', ' ').split('  ')
+    with (DOCS / 'questions.json').open() as fp:
+        questions = json.load(fp)
 
     def init(self):
         self.window = Window(self)
-        Question(self)
-
-        
+        self.window.pack(expand=True, fill='both')
+
+        self.intro = View(
+            self.window,
+            text=self.intro,
+            width=self.window.winfo_reqwidth(),
+            font=('sys', 14),
+            fill='white'
+        )
+        self.window.set_view(self.intro)

src/view.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import tkinter as tk
 from typing import TypeVar
 from enum import Enum
@@ -7,26 +9,6 @@
 from .animate import Coord, Animater, Direction
 
 
-class ViewType(Enum):
-    IMAGE = 'IMAGE'
-    WIDGET = 'WIDGET'
-
-
-T = TypeVar('T', ImageTk.PhotoImage, tk.Widget)
-
-
-class View:
-
-    def __init__(self, data: T, viewtype: ViewType):
-        self.data = data
-        if not isinstance(viewtype, ViewType):
-            viewtype = ViewType(viewtype.upper())  # Breaks if not string
-        self.viewtype = viewtype
-
-    def __getattr__(self, name):
-        return getattr(self.data, name)
-
-
 class Window(widget.PrimaryCanvas):
     animation_speed = 4
     current = None
@@ -38,23 +20,8 @@ def init(self):
     def __coord(self, id):
         return Coord(*self.coords(id)[:2])
 
-    def __set_image(self, image: ImageTk.PhotoImage, coord: Coord):
-        return self.create_image(
-            coord, image=image, anchor='nw'
-        )
-
-    def __set_widget(self, widget: tk.Widget, coord: Coord):
-        return self.create_window(
-            coord, window=widget, anchor='nw'
-        )
-
     def __set(self, view: View, coord: Coord):
-        if view.viewtype == ViewType.IMAGE:
-            wid = self.__set_image(view.data, coord)
-        elif view.viewtype == ViewType.WIDGET:
-            wid = self.__set_widget(view.data, coord)
-        else:
-            raise NotImplementedError
+        wid = view.draw(coord, anchor='nw')
         self.views[view] = wid
         return wid
 
@@ -115,3 +82,28 @@ def active(self):
     @property
     def origin(self):
         return Coord(self.canvasx(0), self.canvasy(0))
+
+
+class DrawType(Enum):
+    IMAGE = 'create_image'
+    WIDGET = 'create_window'
+    TEXT = 'create_text'
+
+
+class View:
+
+    def __init__(self, window: Window, **kwds):
+        self.window = window
+        self.kwds = kwds
+        self.drawtype = self.data = None
+        for k, v in self.kwds.items():
+            k = k.upper()
+            if hasattr(DrawType, k):
+                self.drawtype = DrawType[k]
+                self.data = v
+        if self.drawtype is None:
+            raise NotImplementedError
+
+    def draw(self, *args, **kwds):
+        fn = getattr(self.window, self.drawtype.value)
+        return fn(*args, **{**self.kwds, **kwds})