Properly resolve namespaced paths out for themes

src/ThemesServiceProvider.php

@@ -58,10 +58,6 @@ public function provides()
 	 */
 	protected function registerServices()
 	{
-        $this->app->singleton('view.finder', function($app) {
-            return new ThemeViewFinder($app['files'], $app['config']['view.paths'], null);
-        });
-
 		$this->app->singleton('caffeinated.themes', function($app) {
             $themes = $this->app['files']->directories(config('themes.paths.absolute'));
 
@@ -73,6 +69,10 @@ protected function registerServices()
 
 			return new Theme($items);
 		});
+
+        $this->app->singleton('view.finder', function($app) {
+            return new ThemeViewFinder($app['files'], $app['config']['view.paths'], null);
+        });
 	}
 
     /**

src/View/ThemeViewFinder.php

@@ -2,6 +2,7 @@
 
 namespace Caffeinated\Themes\View;
 
+use Theme;
 use Illuminate\View\FileViewFinder;
 
 class ThemeViewFinder extends FileViewFinder
@@ -19,4 +20,39 @@ public function removeLocation(string $location)
             unset($this->paths[$key]);
         }
     }
+
+    /**
+     * Get the path to a template with a named path.
+     *
+     * @param  string  $name
+     * @return string
+     */
+    protected function findNamespacedView($name)
+    {
+        list($namespace, $view) = $this->parseNamespaceSegments($name);
+
+        $this->addThemeNamespaceHints($namespace);
+
+        return $this->findInPaths($view, $this->hints[$namespace]);
+    }
+
+    /**
+     * Add namespace hints for the currently set theme.
+     *
+     * @param  string  $namespace
+     * @return array
+     */
+    protected function addThemeNamespaceHints($namespace)
+    {
+        $theme = Theme::getCurrent();
+
+        $hints   = array_reverse($this->hints[$namespace]);
+        $hints[] = Theme::absolutePath('views/vendor/'.$namespace);
+
+        if (class_exists(\Caffeinated\Modules\Modules::class)) {
+            $hints[] = Theme::absolutePath('views/modules/'.$namespace);
+        }
+
+        $this->hints[$namespace] = array_reverse($hints);
+    }
 }