Project structure overhaul

Author: intendednull

res/settings.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-main.title = Cat Tinder
+main.title = App
 main.geometry = 400x500
 main.background = black
 cachesize = 10
@@ -15,5 +15,6 @@ back.background = blue
 bio.text = Bio
 bio.background = blue
 
-[DEV]
-main.title = DEV MODE CAT TINDER
+
+[APP]
+title = App

res/widgets.ini

@@ -0,0 +1,6 @@
+[base]
+
+[primary]
+
+[secondary]
+

src/__init__.py

@@ -5,5 +5,6 @@
 RES: Path = ROOT / 'res'
 
 SETTINGS: Path = RES / 'settings.ini'
+THEME: Path = RES / 'widgets.ini'
 IMAGES: Path = RES / 'images'
 SOUNDS: Path = RES / 'sounds'

src/__main__.py

@@ -1,4 +1,4 @@
-from .mainwindow import Tinder
+from .mainwindow import App
 
 if __name__ == "__main__":
-    Tinder().start()
+    App().mainloop()

src/animate.py

@@ -3,6 +3,7 @@
 import tkinter as tk
 import operator
 import time
+from . import widget
 from typing import NamedTuple, Callable, TypeVar, Generator, Tuple, Iterable
 from enum import Enum
 from dataclasses import dataclass
@@ -148,7 +149,6 @@ def add_motion(self, id: int, endpoints: Iterable[Coord], **kwargs):
         if not isinstance(endpoints, Iterable):
             endpoints = (endpoints,)
 
-        endpoints = (Coord(*point) for point in endpoints)  # Reinforce type
         motion = Motion(self.canvas, id, endpoints, **kwargs)
         self.add(motion)
 
@@ -214,7 +214,6 @@ def frame(increment: Coord, count: int):
             for _ in range(count):
                 move(*increment)
                 self.canvas.master.update_idletasks()
-                # self.canvas.master.update()
 
         for end in self.endpoints:
             start = Coord(*self.canvas.coords(self.id)[:2])
@@ -236,3 +235,53 @@ def __hash__(self):
 
     def __eq__(self):
         return isinstance(self, type(other)) and self.__key() == other.__key()
+
+
+class Window(widget.PrimaryCanvas):
+    origin = Coord(0, 0)
+    animation_speed = 2
+    current = None
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.animater = Animater(self)
+
+    def __coord(self, id):
+        return Coord(*self.coords(id)[:2])
+
+    def clear(self):
+        if self.current is not None:
+            self.delete(self.current)
+            self.update()
+
+    def set_view(self, view: tk.Widget):
+        self.clear()
+        self.current = self.create_window(self.origin, view)
+
+    def change_view(self, view: tk.Widget, direction: Direction):
+        if self.current is None:
+            self.set_view(view)
+            return
+
+        if not isinstance(direction, Direction):
+            direction = Direction[direction]  # Cast string for convenience
+
+        if direction in (Direction.UP, Direction.DOWN):
+            edge = self.winfo_screenheight()
+        elif direction in (Direction.LEFT, Direction.RIGHT):
+            edge = self.winfo_screenwidth()
+        else:
+            raise NotImplementedError
+
+        pos = self.__coord(self.current)
+        end = pos + edge
+        beg = pos - edge
+        wid = self.create_window(beg, view)
+
+        self.animater.clear()
+        self.animater.add_motion(self.current, end)
+        self.animater.add_motion(wid, self.origin)
+
+        self.animater.start()
+        self.current = wid

src/cache.py

@@ -23,7 +23,6 @@ def __init__(self, root):
         # get settings
         cp = configparser.ConfigParser()
         cp.read(str(SETTINGS))
-        cp.read('settings.ini')
 
         # for now, let's just look up the DEV settings
         # can change this later

src/front.py

@@ -0,0 +1,91 @@
+from . import widget
+from .animate import Window, Direction
+
+
+class Front(widget.PrimaryFrame):
+
+    _cache: list = None
+
+    def __next(self):
+        data: dict = self.cache.pop()
+        data.pop('jumpscare')  # not using it for now
+        name = data.pop('name')
+        image = data.pop('image')
+        self.__load(name, image, data)
+
+    def __load(self, name, image, data):
+        self.title.config(text=name)
+        self.bio.load(data)
+
+        test = tk.Frame(self.window)
+        self.image = widget.PrimaryLabel(test, image=image)
+        self.image.pack()
+        self.image = test
+        self.update()
+
+    def __change_image(self, direction: Direction):
+        self.__next()
+        self.window.change_view(self.image, direction)
+
+    def init(self):
+        self.title = widget.PrimaryLabel(self)
+        self.window = Window(self)
+        self.commandbar = widget.SecondaryFrame(self)
+
+        self.bio = Bio(self.window)
+        self.image = None
+
+        self.btn_dislike = widget.PrimaryButton(
+            self.commandbar, text='Nope', bg='red', command=self.cmd_dislike
+        )
+        self.btn_bio = widget.SecondaryButton(
+            self.commandbar, text='Bio', command=self.cmd_bio
+        )
+        self.btn_like = widget.PrimaryButton(
+            self.commandbar, text='Yep', bg='green', command=self.cmd_like
+        )
+        self.title.pack()
+        self.window.pack()
+        self.commandbar.pack()
+
+        self.btn_dislike.pack(side='left')
+        self.btn_bio.pack(side='left')
+        self.btn_like.pack(side='left')
+
+    def cmd_dislike(self):
+        self.__change_image('LEFT')
+
+    def cmd_like(self):
+        self.__change_image('RIGHT')
+
+    def cmd_bio(self):
+        self.window.change_view(self.bio, 'UP')
+
+    @property
+    def cache(self):
+        if self._cache is None:
+            return AttributeError('cache has not been set.')
+        return self._cache
+
+    @cache.setter
+    def cache(self, data: list):
+        self._cache = data
+        # Pump the well
+        self.__next()
+        self.window.set_view(self.image)
+
+
+class Bio(widget.PrimaryFrame):
+
+    def __make_item(self, name, value):
+        item = widget.SecondaryFrame(self)
+        name = widget.SecondaryLabel(item, text=name)
+        value = widget.SecondaryLabel(item, text=value)
+        name.pack(side='left')
+        value.pack(side='left')
+        return item
+
+    def load(self, data: dict):
+        for name, val in data.items():
+            item = self.__make_item(name, val)
+            item.pack()

src/mainwindow.py

@@ -4,10 +4,41 @@
 from pygame import mixer
 from .cache import Cache
 from .animate import Animater, Coord
+from .front import Front
 
 from . import SETTINGS
 
 
+parser = configparser.ConfigParser()
+parser.read(SETTINGS)
+
+
+class App(tk.Tk):
+    appconfig = parser['APP']
+
+    def __init__(self, *args, **kwds):
+        title = self.appconfig.pop('title')
+        super().__init__(*args, **kwds)
+        self.title = title
+        mixer.init()
+
+        self.loop = asyncio.get_event_loop()
+        self.cache = Cache(self)
+
+        self.geometry = '400x500'
+        self.minsize(400, 500)
+        self.maxsize(400, 500)
+
+        self.front = Front(self)
+        self.front.pack(fill='both')
+
+        self.__cache()
+        self.front.cache = self.cache.cats
+
+    def __cache(self):
+        self.loop.run_until_complete(self.cache.refill())
+
+
 class Tinder:
     '''The main class for the application.'''
 
@@ -44,13 +75,12 @@ def __init__(self):
         self.jumpscare = False
         self.loop = asyncio.get_event_loop()
         self.cache = Cache(self.root)
+        self.window = Animater(self.root)
 
     def start(self):
         '''Starts the Tinder application'''
 
-        # getting a cache of cat info
-        self.loop.run_until_complete(self.cache.refill())
-
+        # getting a cache of cat inf
         # starting the program loop
         self.new_image()
 
@@ -89,7 +119,7 @@ def new_image(self, cat=None):
             item.pack_forget()
 
         # make a new Frame
-        self.frame = tk.Frame(self.root, bg="black")
+        self.frame = tk.Frame(self.window, bg="black")
 
         # if a dict wasn't passed to the function, get a dict from self.cats
         if not cat:
@@ -213,7 +243,7 @@ def get_bio():
                     command=back_to_photo).pack(side=tk.BOTTOM)
 
                 # packing the frame
-                self.bioid = self.window.create_window((0, 500), window=self.frame, anchor='nw')
+                self.bioid = self.window.create_window((0, 0), window=self.frame, anchor='nw')
                 end = Coord(0, 0)
                 self.window.add_motion(self.bioid, (end,), speed=3)
                 self.window.pack(fill='both', expand=True)
@@ -225,6 +255,7 @@ def get_bio():
                 command=get_bio).pack(side=tk.BOTTOM)
 
         # packing the frame
+        self.window.create_window((0, 0))
         self.frame.pack()
 
         # starting the main tkinter loop