Fix #3

.github/ISSUE_TEMPLATE/bug.yml

@@ -28,7 +28,7 @@ body:
  attributes:
  label: Package Version
  description: What version of our Package are you running? Please be as specific as possible
- placeholder: 2.0.0
+ placeholder: 3.0.0
  validations:
  required: true
  - type: input
@@ -44,19 +44,9 @@ body:
  attributes:
  label: Laravel Version
  description: What version of Laravel are you running? Please be as specific as possible
- placeholder: 9.0.0
+ placeholder: 10.0.0
  validations:
  required: true
- - type: dropdown
- id: operating-systems
- attributes:
- label: Which operating systems does with happen with?
- description: You may select more than one.
- multiple: true
- options:
- - macOS
- - Windows
- - Linux
  - type: textarea
  id: notes
  attributes:

resources/views/filament/pages/themes.blade.php

@@ -47,7 +47,7 @@
  <x-filament::section>
  <x-slot name="heading">
  {{ ucfirst($name) }} 
- @if ($this->getCurrentTheme() === $name)
+ @if ($this->getCurrentTheme()->getName() === $name)
  <span class="ml-2 text-xs bg-primary-200 text-primary-700 px-2 py-1 rounded">Active</span>
  @endif
  </x-slot>

src/Filament/Pages/Themes.php

@@ -29,7 +29,7 @@ public function getThemes()
 
  public function getCurrentTheme()
  {
- return app(\Hasnayeen\Themes\Themes::class)->getCurrentTheme()->getName();
+ return app(\Hasnayeen\Themes\Themes::class)->getCurrentTheme();
  }
 
  public function getColors()

src/Themes.php

@@ -65,6 +65,8 @@ public function getCurrentThemeColor(): array
  $color = Filament::getCurrentPanel()->auth()->user()->theme_color ?? null;
  }
 
- return ['primary' => Arr::get($this->getCurrentTheme()->getThemeColor(), $color)] ?? $this->getCurrentTheme()->getPrimaryColor();
+ return Arr::has($this->getCurrentTheme()->getThemeColor(), $color)
+ ? ['primary' => Arr::get($this->getCurrentTheme()->getThemeColor(), $color)]
+ : $this->getCurrentTheme()->getPrimaryColor();
  }
 }

src/Themes/DefaultTheme.php

@@ -25,6 +25,6 @@ public function getThemeColor(): array
 
  public function getPrimaryColor(): array
  {
- return ['primary' => Color::rgb($this->getThemeColor()['blue'])];
+ return ['primary' => $this->getThemeColor()['blue']];
  }
 }

src/Themes/Sunset.php

@@ -26,6 +26,6 @@ public function getThemeColor(): array
 
  public function getPrimaryColor(): array
  {
- return ['primary' => Color::rgb($this->getThemeColor()['blue'])];
+ return ['primary' => $this->getThemeColor()['blue']];
  }
 }

src/ThemesServiceProvider.php

@@ -2,10 +2,12 @@
 
 namespace Hasnayeen\Themes;
 
+use Composer\InstalledVersions;
 use Filament\Support\Assets\Asset;
 use Filament\Support\Assets\Css;
 use Filament\Support\Facades\FilamentAsset;
 use Hasnayeen\Themes\Commands\UpgradeCommand;
+use Illuminate\Foundation\Console\AboutCommand;
 use Spatie\LaravelPackageTools\Commands\InstallCommand;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
@@ -65,6 +67,15 @@ public function packageBooted(): void
  if (app()->runningInConsole()) {
  FilamentAsset::register($this->getAssets(), $this->getAssetPackageName());
  }
+ if (class_exists(AboutCommand::class) && class_exists(InstalledVersions::class)) {
+ AboutCommand::add('Themes', [
+ 'Version' => InstalledVersions::getPrettyVersion('hasnayeen/themes'),
+ 'Themes' => app(Themes::class)
+ ->getThemes()
+ ->transform(fn ($item, $key) => $key)
+ ->join(', '),
+ ]);
+ }
  }
 
  protected function getAssetPackageName(): ?string