refactoring

Author: mpociot

config/nativephp.php

@@ -1,6 +1,11 @@
 <?php
 
 return [
+    /**
+     * The version of your app.
+     * It is used to determine if the app needs to be updated.
+     * Increment this value every time you release a new version of your app.
+     */
     'version' => env('NATIVEPHP_APP_VERSION', '1.0.0'),
 
     'app_id' => env('NATIVEPHP_APP_ID'),

resources/stubs/NativeAppServiceProvider.php.stub

@@ -4,9 +4,9 @@ namespace App\Providers;
 
 use Native\Laravel\Facades\ContextMenu;
 use Native\Laravel\Facades\Dock;
+use Native\Laravel\Facades\Window;
 use Native\Laravel\GlobalShortcut;
 use Native\Laravel\Menu\Menu;
-use Native\Laravel\Window as AppWindow;
 
 class NativeAppServiceProvider
 {
@@ -29,12 +29,9 @@ class NativeAppServiceProvider
             )
             ->register();
 
-        AppWindow::new()
-            ->url(url('/'))
-            ->title('Laravel Native App')
+        Window::open()
             ->width(800)
-            ->height(800)
-            ->open();
+            ->height(800);
 
         /**
             Dock::menu(

src/Clipboard.php

@@ -10,6 +10,11 @@ public function __construct(protected Client $client)
     {
     }
 
+    public function clear()
+    {
+        $this->client->delete('clipboard');
+    }
+
     public function text($text = null): string
     {
         if (is_null($text)) {
@@ -22,4 +27,38 @@ public function text($text = null): string
 
         return $text;
     }
+
+    public function html($html = null): string
+    {
+        if (is_null($html)) {
+            return $this->client->get('clipboard/html')->json('html');
+        }
+
+        $this->client->post('clipboard/html', [
+            'html' => $html,
+        ]);
+
+        return $html;
+    }
+
+    public function image($image = null): string
+    {
+        if (is_null($image)) {
+            return $this->client->get('clipboard/image')->json('image');
+        }
+
+        $dataUri = $image;
+
+        if (is_string($image) && file_exists($image)) {
+            $type = pathinfo($image, PATHINFO_EXTENSION);
+            $data = file_get_contents($image);
+            $dataUri = "data:image/{$type};base64," . base64_encode($data);
+        }
+
+        $this->client->post('clipboard/image', [
+            'image' => $dataUri,
+        ]);
+
+        return $image;
+    }
 }

src/Concerns/DetectsWindowId.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Native\Laravel\Concerns;
+
+use Illuminate\Support\Facades\URL;
+
+trait DetectsWindowId
+{
+    protected function detectId(): ?string
+    {
+        $previousUrl = request()->headers->get('Referer');
+        $currentUrl = URL::current();
+
+        // Return the _windowId query parameter from either the previous or current URL.
+        $parsedUrl = parse_url($previousUrl ?? $currentUrl);
+        parse_str($parsedUrl['query'] ?? '', $query);
+
+        return $query['_windowId'] ?? null;
+    }
+}

src/Concerns/HasDimensions.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Native\Laravel\Concerns;
+
+trait HasDimensions
+{
+    protected int $width = 400;
+
+    protected int $height = 400;
+
+    protected int $minWidth = 0;
+
+    protected int $minHeight = 0;
+
+    protected $x;
+
+    protected $y;
+
+    public function width($width): self
+    {
+        $this->width = $width;
+
+        return $this;
+    }
+
+    public function height($height): self
+    {
+        $this->height = $height;
+
+        return $this;
+    }
+
+    public function minWidth($width): self
+    {
+        $this->minWidth = $width;
+
+        return $this;
+    }
+
+    public function minHeight($height): self
+    {
+        $this->minHeight = $height;
+
+        return $this;
+    }
+
+    public function position($x, $y): self
+    {
+        $this->x = $x;
+        $this->y = $y;
+
+        return $this;
+    }
+}

src/Concerns/HasVibrancy.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Native\Laravel\Concerns;
+
+trait HasVibrancy
+{
+    protected string $vibrancy = 'appearance-based';
+
+    protected string $backgroundColor = '#FFFFFF';
+
+    protected bool $transparent = false;
+
+    public function transparent($value = true): self
+    {
+        $this->transparent = $value;
+        if ($value === true) {
+            $this->backgroundColor = '#00000000';
+        }
+
+        return $this;
+    }
+
+    public function vibrancy(string $vibrancy): self
+    {
+        $this->vibrancy = $vibrancy;
+
+        return $this;
+    }
+
+    public function lightVibrancy(): self
+    {
+        return $this->vibrancy('light');
+    }
+
+    public function blendBackgroundBehindWindow(): self
+    {
+        $this->transparent();
+
+        return $this->vibrancy('under-window');
+    }
+
+    public function darkVibrancy(): self
+    {
+        return $this->vibrancy('dark');
+    }
+}

src/Events/App/ApplicationBooted.php

@@ -10,7 +10,7 @@ class ApplicationBooted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    public function __construct(public $path)
+    public function __construct()
     {
 
     }

src/Facades/MenuBar.php

@@ -8,6 +8,6 @@ class MenuBar extends Facade
 {
     protected static function getFacadeAccessor()
     {
-        return \Native\Laravel\MenuBar::class;
+        return \Native\Laravel\MenuBar\MenuBarManager::class;
     }
 }

src/Facades/Window.php

@@ -8,8 +8,6 @@ class Window extends Facade
 {
     protected static function getFacadeAccessor()
     {
-        self::clearResolvedInstance(\Native\Laravel\Window::class);
-
-        return \Native\Laravel\Window::class;
+        return \Native\Laravel\Windows\WindowManager::class;
     }
 }

src/Http/Middleware/PreventRegularBrowserAccess.php

@@ -17,11 +17,11 @@ public function handle(Request $request, Closure $next)
         $cookie = $request->cookie('_php_native');
         $header = $request->header('X-NativePHP-Secret');
 
-        if ($cookie && $cookie === config('nativephp.secret')) {
+        if ($cookie && $cookie === config('nativephp-internal.secret')) {
             return $next($request);
         }
 
-        if ($header && $header === config('nativephp.secret')) {
+        if ($header && $header === config('nativephp-internal.secret')) {
             return $next($request);
         }