From dbae91fe9b93a7d128c97dccbfacf34891e46297 Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Fri, 10 Nov 2023 20:17:40 +0100
Subject: [PATCH 1/9] Add missing closed parenthesis

---
 .../solidus_admin/layout/navigation/item/component.rb           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/layout/navigation/item/component.rb b/admin/app/components/solidus_admin/layout/navigation/item/component.rb
index 04261e09dfa..7a0a4443c50 100644
--- a/admin/app/components/solidus_admin/layout/navigation/item/component.rb
+++ b/admin/app/components/solidus_admin/layout/navigation/item/component.rb
@@ -4,7 +4,7 @@
 class SolidusAdmin::Layout::Navigation::Item::Component < SolidusAdmin::BaseComponent
   with_collection_parameter :item
 
-  # @param item [SolidusAdmin::MainNavItem
+  # @param item [SolidusAdmin::MainNavItem]
   # @param fullpath [String] the current path
   # @param url_helpers [#solidus_admin, #spree] context for generating paths
   def initialize(

From 04c4cf30d88fc7e4738e971cab8c6528b48dd588 Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Tue, 14 Nov 2023 11:07:51 +0100
Subject: [PATCH 2/9] Add a missing translation to the `orders/show` component

---
 admin/app/components/solidus_admin/orders/show/component.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/app/components/solidus_admin/orders/show/component.yml b/admin/app/components/solidus_admin/orders/show/component.yml
index fd3f57289c5..4ad65648bc8 100644
--- a/admin/app/components/solidus_admin/orders/show/component.yml
+++ b/admin/app/components/solidus_admin/orders/show/component.yml
@@ -7,6 +7,7 @@ en:
   customer: Customer
   no_name: No name available
   order_email: Order contact email
+  back: Back to orders
   same_as_shipping: Same as shipping address
 
   edit_email: "Edit order email"

From 9296111cc1249396f036399bb4c73f06552270b5 Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Mon, 13 Nov 2023 13:13:36 +0100
Subject: [PATCH 3/9] Let clicks go through the `ui/toast` component container

Otherwise the transparent element would have captured some of them.
---
 admin/app/views/layouts/solidus_admin/application.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/app/views/layouts/solidus_admin/application.html.erb b/admin/app/views/layouts/solidus_admin/application.html.erb
index d994b6d2e52..8d81debc164 100644
--- a/admin/app/views/layouts/solidus_admin/application.html.erb
+++ b/admin/app/views/layouts/solidus_admin/application.html.erb
@@ -21,7 +21,7 @@
       </main>
     </div>
 
-    <div class="fixed inset-x-0 bottom-3 flex items-center justify-center flex-col gap-3" role="alert">
+    <div class="fixed inset-x-0 bottom-3 flex items-center justify-center flex-col gap-3 pointer-events-none" role="alert">
       <% flash.each do |key, message| %>
         <%= render component("ui/toast").new(text: message, scheme: key == :error ? :error : :default) %>
       <% end %>

From b3ea5e97772cce3626057de038d30fd37fce8bb7 Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Mon, 13 Nov 2023 13:14:59 +0100
Subject: [PATCH 4/9] Fallback to the default locale if the selected one is
 unsupported

This can happen if the list of available locales changes and an old
value is stored in the session.
---
 .../app/controllers/solidus_admin/controller_helpers/locale.rb  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/app/controllers/solidus_admin/controller_helpers/locale.rb b/admin/app/controllers/solidus_admin/controller_helpers/locale.rb
index 37094e7bd9b..5aec0cb61d8 100644
--- a/admin/app/controllers/solidus_admin/controller_helpers/locale.rb
+++ b/admin/app/controllers/solidus_admin/controller_helpers/locale.rb
@@ -27,6 +27,6 @@ def user_locale
   end
 
   def set_locale
-    I18n.locale = user_locale
+    I18n.locale = I18n.locale_available?(user_locale) ? user_locale : I18n.default_locale
   end
 end

From 5a22b144888ede24eb3e6385f372a3be878a019b Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Tue, 14 Nov 2023 10:36:00 +0100
Subject: [PATCH 5/9] Add a stimulus controller for closing details when
 clicking outside

---
 .../layout/navigation/account/component.html.erb     |  6 +++++-
 .../controllers/details_click_outside_controller.js  | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 admin/app/javascript/solidus_admin/controllers/details_click_outside_controller.js

diff --git a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
index c5aa95a8da1..53c0699c078 100644
--- a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
+++ b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
@@ -1,4 +1,8 @@
-<details class="relative w-full" aria-label="<%= t('.account') %>">
+<details
+  data-controller="details-click-outside"
+  class="relative w-full"
+  aria-label="<%= t('.account') %>"
+>
   <summary
     class="
       flex gap-1.5
diff --git a/admin/app/javascript/solidus_admin/controllers/details_click_outside_controller.js b/admin/app/javascript/solidus_admin/controllers/details_click_outside_controller.js
new file mode 100644
index 00000000000..d18acf745e0
--- /dev/null
+++ b/admin/app/javascript/solidus_admin/controllers/details_click_outside_controller.js
@@ -0,0 +1,12 @@
+import { Controller } from "@hotwired/stimulus"
+import { useClickOutside } from "stimulus-use"
+
+export default class extends Controller {
+  connect() {
+    useClickOutside(this)
+  }
+
+  clickOutside() {
+    this.element.removeAttribute("open")
+  }
+}

From 0b6faea6b19c079a8a30576585ccb1599bb0c731 Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Fri, 10 Nov 2023 21:26:01 +0100
Subject: [PATCH 6/9] Extract a locales helper in the nav account component

---
 .../navigation/account/component.html.erb     | 19 +++----------------
 .../layout/navigation/account/component.rb    |  9 +++++++++
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
index 53c0699c078..8840092a969 100644
--- a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
+++ b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
@@ -31,34 +31,21 @@
           <label class="flex gap-2 items-center px-2">
             <%= icon_tag("global-line", class: "w-full max-w-[20px] h-5 fill-current shrink") %>
             <select class="w-full appearance-none grow bg-transparent outline-none" onchange="this.form.requestSubmit()" name="switch_to_locale">
-              <%= options_for_select(
-                available_locales
-                  .map do |locale|
-                    [
-                      t(
-                        "spree.i18n.this_file_language",
-                        locale: locale,
-                        default: locale.to_s,
-                        fallback: false
-                      ),
-                      locale
-                    ]
-                  end
-                  .sort,
-                selected: I18n.locale,
-              ) %>
+              <%= options_for_select(locale_options_for_select(available_locales), selected: I18n.locale) %>
             </select>
             <%= icon_tag("expand-up-down-line", class: "w-full max-w-[20px] h-5 fill-current shrink") %>
           </label>
         <% end %>
       </li>
     <% end %>
+
     <li class="h-8 flex items-center hover:bg-gray-25 rounded">
       <%= link_to @account_path, class: 'flex gap-2 items-center px-2' do %>
         <%= icon_tag("user-3-line", class: "w-5 h-5 fill-current shrink") %>
         <span><%= t('.account') %></span>
       <% end %>
     </li>
+
     <li class="h-8 flex items-center hover:bg-gray-25 rounded">
       <%= button_to @logout_path, method: @logout_method, class: 'flex gap-2 items-center px-2' do %>
         <%= icon_tag("logout-box-line", class: "w-5 h-5 fill-current shrink") %>
diff --git a/admin/app/components/solidus_admin/layout/navigation/account/component.rb b/admin/app/components/solidus_admin/layout/navigation/account/component.rb
index d9337c5a928..85a37f133b5 100644
--- a/admin/app/components/solidus_admin/layout/navigation/account/component.rb
+++ b/admin/app/components/solidus_admin/layout/navigation/account/component.rb
@@ -12,4 +12,13 @@ def initialize(user_label:, account_path:, logout_path:, logout_method:)
     @logout_path = logout_path
     @logout_method = logout_method
   end
+
+  def locale_options_for_select(available_locales)
+    available_locales.map do |locale|
+      [
+        t("spree.i18n.this_file_language", locale: locale, default: locale.to_s, fallback: false),
+        locale,
+      ]
+    end.sort
+  end
 end

From fe6da3904046d4d2f1c9251ef30961a6f704ffed Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Mon, 13 Nov 2023 16:03:17 +0100
Subject: [PATCH 7/9] Extract the SolidusAdmin locale change autoselect

---
 .../layout/navigation/account/component.html.erb   | 14 +++++---------
 .../layout/navigation/account/component.rb         | 13 +++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
index 8840092a969..e5616c5e9ba 100644
--- a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
+++ b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
@@ -27,15 +27,11 @@
 
     <% if (available_locales = Spree.i18n_available_locales).any? %>
       <li class="h-8 flex items-center hover:bg-gray-25 rounded">
-        <%= form_tag request.fullpath, method: :get do %>
-          <label class="flex gap-2 items-center px-2">
-            <%= icon_tag("global-line", class: "w-full max-w-[20px] h-5 fill-current shrink") %>
-            <select class="w-full appearance-none grow bg-transparent outline-none" onchange="this.form.requestSubmit()" name="switch_to_locale">
-              <%= options_for_select(locale_options_for_select(available_locales), selected: I18n.locale) %>
-            </select>
-            <%= icon_tag("expand-up-down-line", class: "w-full max-w-[20px] h-5 fill-current shrink") %>
-          </label>
-        <% end %>
+        <%= autosubmit_select_tag(
+          "switch_to_locale",
+          options_for_select(locale_options_for_select(available_locales), selected: I18n.locale),
+          icon: 'global-line',
+        ) %>
       </li>
     <% end %>
 
diff --git a/admin/app/components/solidus_admin/layout/navigation/account/component.rb b/admin/app/components/solidus_admin/layout/navigation/account/component.rb
index 85a37f133b5..f4f1dd3af93 100644
--- a/admin/app/components/solidus_admin/layout/navigation/account/component.rb
+++ b/admin/app/components/solidus_admin/layout/navigation/account/component.rb
@@ -21,4 +21,17 @@ def locale_options_for_select(available_locales)
       ]
     end.sort
   end
+
+  def autosubmit_select_tag(name, options, icon:, &block)
+    form_tag(request.fullpath, method: :get, 'data-turbo': false, class: "w-full") do
+      safe_join([
+        block_given? ? capture(&block) : nil,
+        tag.label(safe_join([
+          icon_tag(icon, class: "w-full max-w-[20px] h-5 fill-current shrink"),
+          tag.select(options, name: name, onchange: "this.form.requestSubmit()", class: "w-full appearance-none grow bg-transparent outline-none"),
+          icon_tag("expand-up-down-line", class: "w-full max-w-[20px] h-5 fill-current shrink"),
+        ]), class: "flex gap-2 items-center px-2"),
+      ])
+    end
+  end
 end

From 74efa667f106d99833ceaef3e4b3e4218e93465f Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Mon, 13 Nov 2023 16:04:05 +0100
Subject: [PATCH 8/9] Keep the account navigation menu open when changing the
 locale

---
 .../navigation/account/component.html.erb      |  1 +
 .../solidus_admin/controller_helpers/locale.rb |  2 +-
 admin/spec/features/accounts_spec.rb           | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
index e5616c5e9ba..c396d5528bc 100644
--- a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
+++ b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
@@ -2,6 +2,7 @@
   data-controller="details-click-outside"
   class="relative w-full"
   aria-label="<%= t('.account') %>"
+  <%= :open if params[:account_menu_open] %>
 >
   <summary
     class="
diff --git a/admin/app/controllers/solidus_admin/controller_helpers/locale.rb b/admin/app/controllers/solidus_admin/controller_helpers/locale.rb
index 5aec0cb61d8..69e2c92fa27 100644
--- a/admin/app/controllers/solidus_admin/controller_helpers/locale.rb
+++ b/admin/app/controllers/solidus_admin/controller_helpers/locale.rb
@@ -18,7 +18,7 @@ def update_user_locale
       session[set_user_language_locale_key] = requested_locale
 
       flash[:notice] = t('spree.locale_changed')
-      redirect_to url_for(request.params.except(:switch_to_locale))
+      redirect_to params.except(:switch_to_locale).permit!.to_h.merge(account_menu_open: true)
     end
   end
 
diff --git a/admin/spec/features/accounts_spec.rb b/admin/spec/features/accounts_spec.rb
index 55f2f6c9fb0..e8cdf6b0f35 100644
--- a/admin/spec/features/accounts_spec.rb
+++ b/admin/spec/features/accounts_spec.rb
@@ -13,4 +13,22 @@
     expect(page).to have_content(user.email)
     expect(current_path).to eq("/admin/users/#{user.id}/edit")
   end
+
+  it "can change locale", :js do
+    I18n.config.available_locales_set << :"en-UK"
+    I18n.config.available_locales_set << "en-UK"
+    I18n.backend.store_translations('en-UK', spree: { i18n: { this_file_language: "English (UK)" } })
+
+    user = create(:admin_user, email: 'admin@example.com')
+    stub_authorization! user
+    sign_in user
+
+    visit "/admin/products"
+    find('summary', text: user.email).click
+    expect(page).to have_content("English (US)")
+    select "English (UK)", from: "switch_to_locale"
+    expect(page).to have_content("English (UK)")
+    select "English (US)", from: 'switch_to_locale'
+    expect(page).to have_content("English (US)")
+  end
 end

From b94c635483390b8780ef48d3b9222dd4d8bdbcbb Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Mon, 13 Nov 2023 17:10:05 +0100
Subject: [PATCH 9/9] Add theme support to the SolidusAdmin UI with dark and
 dimmed variants

- Save the user preference alongside the system preference so that
  when the system switches the UI will follow along.
- Use the session to store preferences so that we start the page
  with the correct theme(s).
- Keep the current theme in the select tag up to date at page load
  and whenever the system changes.

Add dark and dimmed theme variants

dark:
  Full black background with no alteration on images.

dimmed:
  Dark gray background with dimmed images, easier on the eyes but
  less accurate colors.
---
 .../assets/stylesheets/solidus_admin/dark.css | 12 ++++++++
 .../stylesheets/solidus_admin/dimmed.css      | 11 +++++++
 .../navigation/account/component.html.erb     | 20 +++++++++++++
 .../layout/navigation/account/component.rb    |  4 +++
 .../solidus_admin/base_controller.rb          |  1 +
 .../solidus_admin/controller_helpers/theme.rb | 30 +++++++++++++++++++
 .../solidus_admin/application.html.erb        |  4 ++-
 admin/lib/solidus_admin/configuration.rb      | 20 +++++++++++++
 admin/spec/features/accounts_spec.rb          |  5 +++-
 9 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 admin/app/assets/stylesheets/solidus_admin/dark.css
 create mode 100644 admin/app/assets/stylesheets/solidus_admin/dimmed.css
 create mode 100644 admin/app/controllers/solidus_admin/controller_helpers/theme.rb

diff --git a/admin/app/assets/stylesheets/solidus_admin/dark.css b/admin/app/assets/stylesheets/solidus_admin/dark.css
new file mode 100644
index 00000000000..e03ce11406e
--- /dev/null
+++ b/admin/app/assets/stylesheets/solidus_admin/dark.css
@@ -0,0 +1,12 @@
+/*
+ * = require solidus_admin/tailwind.css
+*/
+
+html {
+  -webkit-filter: invert(100%);
+  filter: invert(100%) hue-rotate(180deg);
+}
+
+main img {
+  filter: invert(100%) hue-rotate(-180deg);
+}
diff --git a/admin/app/assets/stylesheets/solidus_admin/dimmed.css b/admin/app/assets/stylesheets/solidus_admin/dimmed.css
new file mode 100644
index 00000000000..48f987743f8
--- /dev/null
+++ b/admin/app/assets/stylesheets/solidus_admin/dimmed.css
@@ -0,0 +1,11 @@
+/*
+ * = require solidus_admin/tailwind.css
+*/
+
+html {
+  filter: invert(91%) hue-rotate(180deg);
+}
+
+main img {
+  filter: invert(91%) brightness(1.5) contrast(1.5) hue-rotate(-180deg);
+}
diff --git a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
index c396d5528bc..4b10ff51939 100644
--- a/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
+++ b/admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
@@ -36,6 +36,26 @@
       </li>
     <% end %>
 
+    <li class="h-8 items-center hover:bg-gray-25 rounded dark:hidden flex">
+      <%= autosubmit_select_tag(
+        "switch_to_theme",
+        options_for_select(theme_options_for_select, session[:admin_light_theme]),
+        icon: 'sun-line',
+      ) do %>
+        <%= hidden_field_tag(:system_theme, :light) %>
+      <% end %>
+    </li>
+
+    <li class="h-8 items-center hover:bg-gray-25 rounded hidden dark:flex">
+      <%= autosubmit_select_tag(
+        "switch_to_theme",
+        options_for_select(theme_options_for_select, session[:admin_dark_theme]),
+        icon: 'moon-line',
+      ) do %>
+        <%= hidden_field_tag(:system_theme, :dark) %>
+      <% end %>
+    </li>
+
     <li class="h-8 flex items-center hover:bg-gray-25 rounded">
       <%= link_to @account_path, class: 'flex gap-2 items-center px-2' do %>
         <%= icon_tag("user-3-line", class: "w-5 h-5 fill-current shrink") %>
diff --git a/admin/app/components/solidus_admin/layout/navigation/account/component.rb b/admin/app/components/solidus_admin/layout/navigation/account/component.rb
index f4f1dd3af93..79c7308c471 100644
--- a/admin/app/components/solidus_admin/layout/navigation/account/component.rb
+++ b/admin/app/components/solidus_admin/layout/navigation/account/component.rb
@@ -22,6 +22,10 @@ def locale_options_for_select(available_locales)
     end.sort
   end
 
+  def theme_options_for_select
+    SolidusAdmin::Config.themes.keys.map { |theme| [theme.to_s.humanize, theme] }.sort
+  end
+
   def autosubmit_select_tag(name, options, icon:, &block)
     form_tag(request.fullpath, method: :get, 'data-turbo': false, class: "w-full") do
       safe_join([
diff --git a/admin/app/controllers/solidus_admin/base_controller.rb b/admin/app/controllers/solidus_admin/base_controller.rb
index 457bc8243be..44665e05295 100644
--- a/admin/app/controllers/solidus_admin/base_controller.rb
+++ b/admin/app/controllers/solidus_admin/base_controller.rb
@@ -11,6 +11,7 @@ class BaseController < ApplicationController
     include SolidusAdmin::ControllerHelpers::Authentication
     include SolidusAdmin::ControllerHelpers::Authorization
     include SolidusAdmin::ControllerHelpers::Locale
+    include SolidusAdmin::ControllerHelpers::Theme
     include SolidusAdmin::ComponentsHelper
     include SolidusAdmin::AuthenticationAdapters::Backend if defined?(Spree::Backend)
 
diff --git a/admin/app/controllers/solidus_admin/controller_helpers/theme.rb b/admin/app/controllers/solidus_admin/controller_helpers/theme.rb
new file mode 100644
index 00000000000..93ba1f60a34
--- /dev/null
+++ b/admin/app/controllers/solidus_admin/controller_helpers/theme.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module SolidusAdmin::ControllerHelpers::Theme
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :update_user_theme
+  end
+
+  private
+
+  def update_user_theme
+    requested_theme = params[:switch_to_theme].presence or return
+
+    # Avoid interpolating user content into the session key
+    system_theme = params[:system_theme].presence == "dark" ? "dark" : "light"
+    session_key = :"admin_#{system_theme}_theme"
+
+    if theme_is_available?(requested_theme) && requested_theme.to_sym != session[session_key]
+      session[session_key] = requested_theme
+
+      flash[:notice] = t('spree.theme_changed')
+      redirect_to params.except(:switch_to_theme, :system_theme).permit!.to_h.merge(account_menu_open: true)
+    end
+  end
+
+  def theme_is_available?(theme)
+    theme && SolidusAdmin::Config.themes.key?(theme.to_sym)
+  end
+end
diff --git a/admin/app/views/layouts/solidus_admin/application.html.erb b/admin/app/views/layouts/solidus_admin/application.html.erb
index 8d81debc164..615cb0cab31 100644
--- a/admin/app/views/layouts/solidus_admin/application.html.erb
+++ b/admin/app/views/layouts/solidus_admin/application.html.erb
@@ -3,7 +3,9 @@
   <head>
     <%= favicon_link_tag 'solidus_admin/favicon.ico' %>
     <title><%= solidus_admin_title %></title>
-    <%= stylesheet_link_tag "solidus_admin/application.css", "inter-font", "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag "inter-font", "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_light_theme]), media: '(prefers-color-scheme: light)', "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_dark_theme]), media: '(prefers-color-scheme: dark)', "data-turbo-track": "reload" %>
     <%= javascript_importmap_tags "solidus_admin/application", shim: false, importmap: SolidusAdmin.importmap %>
   </head>
 
diff --git a/admin/lib/solidus_admin/configuration.rb b/admin/lib/solidus_admin/configuration.rb
index e2973ef9bfb..4a03a5d84de 100644
--- a/admin/lib/solidus_admin/configuration.rb
+++ b/admin/lib/solidus_admin/configuration.rb
@@ -219,6 +219,26 @@ def components
 
     # The HTTP method used to logout the user in the admin interface.
     preference :logout_link_method, :string, default: :delete
+
+    # @!attribute [rw] themes
+    #   @return [Hash] A hash containing the themes that are available for the admin panel
+    preference :themes, :hash, default: {
+      solidus: 'solidus_admin/application',
+      solidus_dark: 'solidus_admin/dark',
+      solidus_dimmed: 'solidus_admin/dimmed',
+    }
+
+    # @!attribute [rw] theme
+    #   @return [String] Default admin theme name
+    preference :theme, :string, default: 'solidus'
+
+    # @!attribute [rw] dark_theme
+    #   @return [String] Default admin theme name
+    preference :dark_theme, :string, default: 'solidus_dark'
+
+    def theme_path(user_theme)
+      themes.fetch(user_theme&.to_sym, themes[theme.to_sym])
+    end
   end
 end
 
diff --git a/admin/spec/features/accounts_spec.rb b/admin/spec/features/accounts_spec.rb
index e8cdf6b0f35..8f22e31d722 100644
--- a/admin/spec/features/accounts_spec.rb
+++ b/admin/spec/features/accounts_spec.rb
@@ -14,7 +14,7 @@
     expect(current_path).to eq("/admin/users/#{user.id}/edit")
   end
 
-  it "can change locale", :js do
+  it "can change locale and theme", :js do
     I18n.config.available_locales_set << :"en-UK"
     I18n.config.available_locales_set << "en-UK"
     I18n.backend.store_translations('en-UK', spree: { i18n: { this_file_language: "English (UK)" } })
@@ -30,5 +30,8 @@
     expect(page).to have_content("English (UK)")
     select "English (US)", from: 'switch_to_locale'
     expect(page).to have_content("English (US)")
+
+    within('.dark\:hidden') { select "Solidus dark", from: "switch_to_theme" }
+    expect(page).to have_content("Solidus dark")
   end
 end