Code cleanup

Create packages

mopidy_touchscreen/graphic_utils/__init__.py

@@ -0,0 +1,4 @@
+# flake8: noqa
+from dynamic_background import DynamicBackground
+from list_view import ListView
+from screen_objects import *

mopidy_touchscreen/list_view.py → mopidy_touchscreen/graphic_utils/list_view.py

@@ -1,7 +1,7 @@
 import logging
 
-from .input_manager import InputManager
-from .screen_objects import ScreenObjectsManager, ScrollBar, \
+from ..input import *
+from screen_objects import ScreenObjectsManager, ScrollBar, \
     TouchAndTextItem
 
 logger = logging.getLogger(__name__)

mopidy_touchscreen/input/__init__.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+from input_manager import InputManager

mopidy_touchscreen/screen_manager.py

@@ -1,22 +1,11 @@
 import logging
 import traceback
-
 from pkg_resources import Requirement, resource_filename
-
 import pygame
 
-from .dynamic_background import DynamicBackground
-from .input_manager import InputManager
-from .library_screen import LibraryScreen
-from .main_screen import MainScreen
-from .menu_screen import MenuScreen
-from .playlist_screen import PlaylistScreen
-from .screen_objects import ScreenObjectsManager, \
-    TouchAndTextItem
-from .search_screen import SearchScreen
-
-
-from .tracklist import Tracklist
+from graphic_utils import *
+from input import *
+from screens import *
 
 
 logger = logging.getLogger(__name__)

mopidy_touchscreen/screens/__init__.py

@@ -0,0 +1,7 @@
+# flake8: noqa
+from library_screen import LibraryScreen
+from main_screen import MainScreen
+from menu_screen import MenuScreen
+from playlist_screen import PlaylistScreen
+from search_screen import SearchScreen
+from tracklist import Tracklist

mopidy_touchscreen/library_screen.py → mopidy_touchscreen/screens/library_screen.py

@@ -1,7 +1,7 @@
 import mopidy.models
 
-from .base_screen import BaseScreen
-from .list_view import ListView
+from base_screen import BaseScreen
+from ..graphic_utils import *
 
 
 class LibraryScreen(BaseScreen):

mopidy_touchscreen/main_screen.py → mopidy_touchscreen/screens/main_screen.py

@@ -6,16 +6,11 @@ import time
 import urllib
 import urllib2
 from threading import Thread
-
 import mopidy.core
 
-import pygame
-
-
-from .base_screen import BaseScreen
-from .input_manager import InputManager
-from .screen_objects import (Progressbar, ScreenObjectsManager,
-                             TouchAndTextItem)
+from base_screen import BaseScreen
+from ..input import InputManager
+from ..graphic_utils import *
 
 
 logger = logging.getLogger(__name__)

mopidy_touchscreen/menu_screen.py → mopidy_touchscreen/screens/menu_screen.py

@@ -1,11 +1,10 @@
 import os
 import socket
-
 import mopidy
 
-from .base_screen import BaseScreen
-from .input_manager import InputManager
-from .screen_objects import ScreenObjectsManager, TouchAndTextItem
+from base_screen import BaseScreen
+from ..input import InputManager
+from ..graphic_utils import *
 
 
 class MenuScreen(BaseScreen):

mopidy_touchscreen/playlist_screen.py → mopidy_touchscreen/screens/playlist_screen.py

@@ -1,5 +1,5 @@
-from .base_screen import BaseScreen
-from .list_view import ListView
+from base_screen import BaseScreen
+from ..graphic_utils import *
 
 
 class PlaylistScreen(BaseScreen):

mopidy_touchscreen/search_screen.py → mopidy_touchscreen/screens/search_screen.py

@@ -1,11 +1,8 @@
 import pygame
 
-from .base_screen import BaseScreen
-from .input_manager import InputManager
-from .list_view import ListView
-from .screen_objects import ScreenObjectsManager, \
-    TextItem, TouchAndTextItem
-
+from base_screen import BaseScreen
+from ..input import InputManager
+from ..graphic_utils import *
 
 mode_track_name = 0
 mode_album_name = 1

mopidy_touchscreen/tracklist.py → mopidy_touchscreen/screens/tracklist.py

@@ -1,5 +1,5 @@
-from .base_screen import BaseScreen
-from .list_view import ListView
+from base_screen import BaseScreen
+from ..graphic_utils import *
 from .main_screen import MainScreen
 
 

mopidy_touchscreen/touch_screen.py

@@ -2,11 +2,8 @@ import logging
 import os
 import traceback
 from threading import Thread
-
 from mopidy import core, utils
-
 import pygame
-
 import pykka
 
 from .screen_manager import ScreenManager
@@ -45,7 +42,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
         self.gpio = config['touchscreen']['gpio']
         if self.gpio:
 
-            from .gpio_inpput_manager import GPIOManager
+            from input import GPIOManager
 
             pins = {}
             pins['left'] = config['touchscreen']['gpio_left']