Splash formatting

Author: intendednull

res/docs/intro.txt

@@ -1,6 +1,5 @@
-Welcome to the "Always one-hundred percent correct, never wrong in any way, completely correct"
-personality quiz. Through this quiz you will achieve new levels of spiritual insight, of not only
-yourself, but the very fabric of reality.
+Note:
 
-However, first I'd like to get to know you a little. Please answer these very important questions
-with the utmost honesty, they are crucial to achieving enlightenment.
+Through this quiz you will achieve new levels of spiritual insight, of not only yourself, but the very fabric of reality.
+
+Please answer these very important questions with the utmost honesty, they are crucial to achieving true enlightenment.

res/settings.ini

@@ -1,20 +1,3 @@
-[DEFAULT]
-main.title = App
-main.geometry = 400x500
-main.background = black
-cachesize = 10
-catapi = https://api.thecatapi.com/v1/images/search
-namefile = https://www.pawclub.com.au/assets/js/namesTemp.json
-hobbiesfile = https://gist.githubusercontent.com/mbejda/453fdb77ef8d4d3b3a67/raw/e8334f09109dc212892406e25fdee03efdc23f56/hobbies.txt
-like.text = Like
-like.background = red
-dislike.text = Dislike
-dislike.background = red
-back.text = Back to Photo
-back.background = blue
-bio.text = Bio
-bio.background = blue
-
-
 [APP]
-title = App
+title = The Always (One-Hundred Percent of the Time) Correct and Never Wrong (In Any Way), Completely Accurate Personality Quiz Adventure
+geometry = 400x500

src/animate.py

@@ -154,7 +154,7 @@ def add(self, motion: Motion):
         self._motions.add(iter(motion))
 
     def add_motion(self, id: int, end: Coord, **kwargs):
-        motion = Motion(self.canvas, id, (end,), **kwargs)
+        motion = Motion(self.canvas, id, end, **kwargs)
         self.add(motion)
 
     def clear(self):
@@ -172,31 +172,32 @@ class Motion:
     """
     canvas: tk.Canvas
     id: int
-    endpoints: Tuple[Coord]
+    end: Coord
 
     speed: int = 1
 
     def start(self) -> Generator[Callable]:
         """
         The entry point for generating move commands.
         """
-        move = partial(self.canvas.move, self.id)
-
         def frame(increment: Coord, count: int = 1):
             for _ in range(count):
                 move(*increment)
                 self.canvas.master.update_idletasks()
 
-        for end in self.endpoints:
-            start = self.current
-            steps = round(start.distance(end) / self.speed)
-            frames = round(steps / self.speed)
-            increment = (end - start) / steps
+        start = self.current
+        steps = round(start.distance(self.end) / self.speed)
+        frames = round(steps / self.speed)
+        increment = (self.end - start) / steps
+
+        for _ in range(frames):
+            yield partial(frame, increment, round(steps / frames))
+        buffer = self.end - self.current
+        yield partial(frame, buffer)
 
-            for _ in range(frames):
-                yield partial(frame, increment, round(steps / frames))
-            buffer = end - self.current
-            yield partial(frame, buffer)
+    @property
+    def move(self):
+        return partial(self.canvas.move, self.id)
 
     @property
     def current(self):
@@ -213,3 +214,7 @@ def __hash__(self):
 
     def __eq__(self):
         return isinstance(self, type(other)) and self.__key() == other.__key()
+
+
+class BounceBall(Motion):
+

src/main.py

@@ -4,7 +4,7 @@
 
 from .front import Front
 from .splash import Splash
-from . import SETTINGS
+from . import SETTINGS, widget
 
 
 parser = configparser.ConfigParser()
@@ -15,17 +15,18 @@ class App(tk.Tk):
     appconfig = parser['APP']
 
     def __init__(self, *args, **kwds):
-        title = self.appconfig.pop('title')
         super().__init__(*args, **kwds)
-        self.title = title
+        self.resizable(False, False)
 
-        self.geometry = '400x500'
-        self.minsize(400, 500)
-        self.maxsize(400, 500)
+        for name, val in parser['APP'].items():
+            getattr(self, name)(val)
 
-        # self.splash = Splash(self)
+        self.frame = widget.PrimaryFrame(self)
+        self.frame.pack(expand=True, fill='both')
+
+        # self.splash = Splash(self.frame)
         # self.splash.pack(expand=True, fill='both')
-        self.front = Front(self)
+        self.front = Front(self.frame)
         self.front.pack(fill='both', expand=True)
 
     def cleanup(self):

src/splash.py

@@ -29,19 +29,30 @@ def load(self, choices):
 
 class Splash(widget.PrimaryFrame):
 
-    intro = (DOCS / 'intro.txt').read_text()  # .replace('\n', ' ').split('  ')
+    intro = (DOCS / 'intro.txt').read_text()
     with (DOCS / 'questions.json').open() as fp:
         questions = json.load(fp)
 
     def init(self):
-        self.window = Window(self)
-        self.window.pack(expand=True, fill='both')
+        self.title = widget.PrimaryLabel(
+            self, text=self.master.master.title(),
+            font=('Courier', 14), wraplength=300
+        )
 
+        self.window = Window(self, bg='gray')
         self.intro = View(
             self.window,
             text=self.intro,
             width=self.window.winfo_reqwidth(),
-            font=('sys', 14),
-            fill='white'
+            font=('sys', 10), justify='center'
         )
         self.window.set_view(self.intro)
+
+        self.btn_confirm = widget.PrimaryButton(self, command=self.begin, text='Okay')
+
+        self.title.pack(fill='x', pady=20)
+        self.btn_confirm.pack(side='bottom', expand=True)
+
+
+    def begin(self):
+        pass

src/widget.py

@@ -78,7 +78,7 @@ class PrimaryLabel(tk.Label):
     DEFAULT = {
         'font': ('Courier', 25),
         'bg': 'black',
-        'fg': 'blue'
+        'fg': 'gray'
     }
 
     def __init__(self, *args, **kwds):