navbar darkmode

src/Layout/Navbar.php

@@ -27,8 +27,6 @@ class Navbar implements Renderable
             'right' => collect(),
         ];
 
-        $this->addDefaultElements();
-
         $this->callResolving();
     }
 
@@ -56,13 +54,6 @@ class Navbar implements Renderable
         return $this;
     }
 
-    protected function addDefaultElements()
-    {
-        if (config('admin.layout.dark_mode_switch')) {
-            $this->right((new DarkModeSwitcher())->render());
-        }
-    }
-
     /**
      * @param string $part
      *

src/Middleware/Bootstrap.php

@@ -4,6 +4,7 @@ namespace Dcat\Admin\Middleware;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Support\Helper;
+use Dcat\Admin\Widgets\DarkModeSwitcher;
 use Illuminate\Http\Request;
 
 class Bootstrap
@@ -11,8 +12,9 @@ class Bootstrap
     public function handle(Request $request, \Closure $next)
     {
         $this->includeBootstrapFile();
-        $this->setupScript();
+        $this->addScript();
         $this->fireEvents();
+        $this->setUpDarkMode();
 
         $response = $next($request);
 
@@ -21,6 +23,13 @@ class Bootstrap
         return $response;
     }
 
+    protected function setUpDarkMode()
+    {
+        if (config('admin.layout.dark_mode_switch')) {
+            Admin::navbar()->right((new DarkModeSwitcher())->render());
+        }
+    }
+
     protected function includeBootstrapFile()
     {
         if (is_file($bootstrap = admin_path('bootstrap.php'))) {
@@ -28,7 +37,7 @@ class Bootstrap
         }
     }
 
-    protected function setupScript()
+    protected function addScript()
     {
         $token = csrf_token();
         Admin::script("Dcat.token = \"$token\";");