Merge branch 'background-cover' into develop

Conflicts:
	mopidy_touchscreen/graphic_utils/dynamic_background.py
	mopidy_touchscreen/graphic_utils/screen_objects.py
	mopidy_touchscreen/screen_manager.py
	mopidy_touchscreen/screens/main_screen.py

mopidy_touchscreen/screen_manager.py

@@ -28,6 +28,7 @@ class ScreenManager():
         self.core = core
         self.cache = cache
         self.fonts = {}
+        self.background = None
         self.current_screen = library_index
 
         # Init variables in init
@@ -37,7 +38,10 @@ class ScreenManager():
         self.track = None
         self.input_manager = InputManager(size)
         self.down_bar_objects = ScreenObjectsManager()
+<<<<<<< HEAD
         self.down_bar_solid = None
+=======
+>>>>>>> background-cover
         self.down_bar = None
 
         self.init_manager(size)
@@ -45,7 +49,6 @@ class ScreenManager():
     def init_manager(self, size):
         self.size = size
         self.background = DynamicBackground(self.size)
-        self.current_screen = 0
         self.base_size = self.size[1] / 8
         font = resource_filename(
             Requirement.parse("mopidy-touchscreen"),
@@ -132,11 +135,16 @@ class ScreenManager():
         self.change_screen(self.current_screen)
 
     def update(self):
+<<<<<<< HEAD
         surface = pygame.Surface(self.size)
         self.background.draw_background([surface,
                                          self.down_bar_solid])
         self.screens[self.current_screen].update(surface)
         surface.blit(self.down_bar_solid, (0, self.base_size * 7))
+=======
+        surface = self.background.draw_background()
+        self.screens[self.current_screen].update(surface)
+>>>>>>> background-cover
         surface.blit(self.down_bar, (0, self.base_size * 7))
         self.down_bar_objects.render(surface)
         return surface