refactored window into view.py

Author: intendednull

src/animate.py

@@ -8,9 +8,6 @@
 from dataclasses import dataclass
 from functools import partialmethod, partial
 
-from . import widget
-from .cache import ImageTk
-
 
 class Coord(NamedTuple):
     """
@@ -239,81 +236,3 @@ def __hash__(self):
     def __eq__(self):
         return isinstance(self, type(other)) and self.__key() == other.__key()
 
-
-class Window(widget.PrimaryCanvas):
-    animation_speed = 4
-    current = None
-    views = {}
-
-    def init(self):
-        self.animater = Animater(self)
-
-    def __coord(self, id):
-        return Coord(*self.coords(id)[:2])
-
-    def __set_image(self, view: ImageTk.PhotoImage, coord: Coord):
-        return self.create_image(
-            coord, image=view, anchor='nw'
-        )
-
-    def __set_widget(self, view: tk.Widget, coord: Coord):
-        return self.create_window(
-            coord, window=view, anchor='nw'
-        )
-
-    def __set(self, view, coord, viewtype):
-        if viewtype == 'image':
-            wid = self.__set_image(view, coord)
-        else:
-            wid = self.__set_widget(view, coord)
-        self.views[view] = wid
-        return wid
-
-    def set_view(self, view: tk.Widget, viewtype='image'):
-        self.current = view
-        self.__set(self.current, self.origin, viewtype)
-
-    def move_view(self, wid, end):
-        self.animater.add_motion(
-            wid, end, speed=self.animation_speed
-        )
-
-    def move_in(self, view, direction: Direction, viewtype='image'):
-        distance = self.get_distance(direction)
-        start = self.origin + distance
-        wid = self.__set(view, start, viewtype)
-        self.move_view(wid, self.origin)
-        return wid
-
-    def move_out(self, view, direction, viewtype='image'):
-        wid = self.views[view]
-        distance = self.get_distance(direction)
-        end = self.origin + distance
-        self.move_view(wid, end)
-        del self.views[view]
-
-    def change_view(self, view: tk.Widget, direction: Direction, viewtype='image'):
-        if not isinstance(direction, Direction):
-            direction = Direction[direction.upper()]  # Cast string for convenience
-        self.animater.clear()
-
-        self.move_out(self.current, direction, viewtype=viewtype)
-        self.move_in(view, direction.flip(), viewtype=viewtype)
-
-        self.animater.start()
-        self.current = view
-
-    def get_distance(self, direction: Direction):
-        if not isinstance(direction, Direction):
-            direction = Direction[direction.upper()]  # Cast string for convenience
-
-        if direction in (Direction.UP, Direction.DOWN):
-            return direction * Coord(0, self.winfo_height())
-        elif direction in (Direction.LEFT, Direction.RIGHT):
-            return direction * Coord(self.winfo_width(), 0)
-        else:
-            raise NotImplementedError
-
-    @property
-    def origin(self):
-        return Coord(0, 0)

src/front.py

@@ -1,7 +1,8 @@
 import asyncio
 
 from . import widget
-from .animate import Window, Direction
+from .animate import Direction
+from .view import Window
 from .cache import Cache
 
 
@@ -71,12 +72,8 @@ def cmd_like(self):
         self.__change_image('RIGHT')
 
     def cmd_bio(self):
-        if self.bio in self.window.views:
-            self.window.move_out(self.bio, 'DOWN', viewtype='widget')
-        else:
-            self.window.move_in(self.bio, 'DOWN', viewtype='widget')
-
-        self.window.animater.start()
+        self.window.move_out(self.image, 'UP', 'image')
+        self.window.move
 
     @property
     def cache(self):
@@ -94,12 +91,18 @@ def cache(self, data: list):
 
 class Bio(widget.PrimaryFrame):
 
+    # def init(self):
+    #     width = self.master.winfo_width()
+    #     height = self.master.winfo_height()
+    #     self.config(height=height, width=width)
+    #     #self.pack_propagate(0)
+
     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')
+        value.pack(side='right')
         return item
 
     def load(self, data: dict):

src/view.py

@@ -0,0 +1,100 @@
+import tkinter as tk
+from typing import TypeVar
+from enum import Enum
+
+from . import widget
+from .animate import Coord, Animater
+from .cache import ImageTk
+
+
+class ViewType(Enum):
+    IMAGE = 'IMAGE'
+    WIDGET = 'WIDGET'
+
+
+T = TypeVar('T', ImageTk.PhotoImage, tk.Widget)
+
+
+@dataclass
+class View:
+    data: T
+    viewtype: ViewType
+
+
+class Window(widget.PrimaryCanvas):
+    animation_speed = 4
+    current = None
+    views = {}
+
+    def init(self):
+        self.animater = Animater(self)
+
+    def __coord(self, id):
+        return Coord(*self.coords(id)[:2])
+
+    def __set_image(self, view: ImageTk.PhotoImage, coord: Coord):
+        return self.create_image(
+            coord, image=view, anchor='nw'
+        )
+
+    def __set_widget(self, view: tk.Widget, coord: Coord):
+        return self.create_window(
+            coord, window=view, anchor='nw'
+        )
+
+    def __set(self, view, coord, viewtype):
+        if viewtype == 'image':
+            wid = self.__set_image(view, coord)
+        else:
+            wid = self.__set_widget(view, coord)
+        self.views[view] = wid
+        return wid
+
+    def set_view(self, view: tk.Widget, viewtype='image'):
+        self.current = view
+        self.__set(self.current, self.origin, viewtype)
+
+    def move_view(self, wid, end):
+        self.animater.add_motion(
+            wid, end, speed=self.animation_speed
+        )
+
+    def move_in(self, view, direction: Direction, viewtype='image'):
+        distance = self.get_distance(direction)
+        start = self.origin + distance
+        wid = self.__set(view, start, viewtype)
+        self.move_view(wid, self.origin)
+        return wid
+
+    def move_out(self, view, direction, viewtype='image'):
+        wid = self.views[view]
+        distance = self.get_distance(direction)
+        end = self.origin + distance
+        self.move_view(wid, end)
+        del self.views[view]
+
+    def change_view(self, view: tk.Widget, direction: Direction, viewtype='image'):
+        if not isinstance(direction, Direction):
+            direction = Direction[direction.upper()]  # Cast string for convenience
+        self.animater.clear()
+
+        self.move_out(self.current, direction, viewtype=viewtype)
+        self.move_in(view, direction.flip(), viewtype=viewtype)
+
+        self.animater.start()
+        self.current = view
+
+    def get_distance(self, direction: Direction):
+        if not isinstance(direction, Direction):
+            direction = Direction[direction.upper()]  # Cast string for convenience
+
+        if direction in (Direction.UP, Direction.DOWN):
+            return direction * Coord(0, self.winfo_height())
+        elif direction in (Direction.LEFT, Direction.RIGHT):
+            return direction * Coord(self.winfo_width(), 0)
+        else:
+            raise NotImplementedError
+
+    @property
+    def origin(self):
+        return Coord(0, 0)