ViewTypes implemented

Author: intendednull

src/front.py

@@ -2,7 +2,7 @@
 
 from . import widget
 from .animate import Direction
-from .view import Window
+from .view import Window, View
 from .cache import Cache
 
 
@@ -27,21 +27,21 @@ def __next(self):
 
     def __load(self, name, image, data):
         self.title.config(text=name)
-        self.bio.load(data)
+        self.bio.data.load(data)
         self._last = self.image
-        self.image = image
+        self.image = View(image, 'image')
         self.update()
 
     def __change_image(self, direction: Direction):
         self.__next()
-        self.window.change_view(self.image, direction, viewtype='image')
+        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.bio = View(Bio(self.window), 'widget')
         self.image = None
 
         self.btn_dislike = widget.PrimaryButton(
@@ -66,14 +66,16 @@ def init(self):
         self.cache
 
     def cmd_dislike(self):
-        self.__change_image('LEFT')
+        self.__change_image('right')
 
     def cmd_like(self):
-        self.__change_image('RIGHT')
+        self.__change_image('left')
 
     def cmd_bio(self):
-        self.window.move_out(self.image, 'UP', 'image')
-        self.window.move
+        if self.window.current != self.bio:
+            self.window.change_view(self.bio, 'up')
+        else:
+            self.window.change_view(self.image, 'down')
 
     @property
     def cache(self):
@@ -106,6 +108,7 @@ def __make_item(self, name, value):
         return item
 
     def load(self, data: dict):
+        print(data)
         for name, val in data.items():
             item = self.__make_item(name, val)
             item.pack()

src/view.py

@@ -16,10 +16,13 @@ class ViewType(Enum):
 T = TypeVar('T', ImageTk.PhotoImage, tk.Widget)
 
 
-@dataclass
 class View:
-    data: T
-    viewtype: ViewType
+
+    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
 
 
 class Window(widget.PrimaryCanvas):
@@ -35,12 +38,12 @@ def __coord(self, id):
 
     def __set_image(self, image: ImageTk.PhotoImage, coord: Coord):
         return self.create_image(
-            coord, image=view, anchor='nw'
+            coord, image=image, anchor='nw'
         )
 
     def __set_widget(self, widget: tk.Widget, coord: Coord):
         return self.create_window(
-            coord, window=view, anchor='nw'
+            coord, window=widget, anchor='nw'
         )
 
     def __set(self, view: View, coord: Coord):
@@ -66,7 +69,7 @@ def move_view(self, view: View, end: Coord):
     def move_in(self, view: View, direction: Direction):
         distance = self.get_distance(direction)
         start = self.origin + distance
-        wid = self.__set(view, start, viewtype)
+        wid = self.__set(view, start)
         self.move_view(view, self.origin)
         return wid