Skip to content

armgit / maybe

Public Imported from GitHub
0

The personal finance app for everyone

Improve theme selection (#2152)

Alex Hatzenbuhlerce83418f0b1a
diff --git a/app/views/settings/preferences/show.html.erb b/app/views/settings/preferences/show.html.erb
index 99857aba..169df40a 100644
--- a/app/views/settings/preferences/show.html.erb
+++ b/app/views/settings/preferences/show.html.erb
@@ -42,30 +42,29 @@
<% end %>
<%= settings_section title: t(".theme_title"), subtitle: t(".theme_subtitle") do %>
- <div>
- <%= styled_form_with model: @user, class: "flex flex-col md:flex-row justify-between items-center gap-4", data: { controller: "auto-submit-form" } do |form| %>
+ <div data-controller="theme" data-theme-user-preference-value="<%= @user.theme %>">
+ <%= form_with model: @user, class: "flex flex-col md:flex-row justify-between items-center gap-4", id: "theme_form",
+ data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "change" } do |form| %>
<%= form.hidden_field :redirect_to, value: "preferences" %>
- <div class="text-center">
- <%= image_tag("light-mode-preview.png", alt: "Light Theme Preview", class: "h-44 mb-4") %>
- <div class="flex justify-center items-center gap-2">
- <%= form.radio_button :theme, "light", checked: @user.theme == "light", data: { auto_submit_form_target: "auto", action: "theme#updateTheme" } %>
- <%= form.label :theme_light, t(".theme_light"), value: "light" %>
- </div>
- </div>
- <div class="text-center">
- <%= image_tag("dark-mode-preview.png", alt: "Dark Theme Preview", class: "h-44 mb-4") %>
- <div class="flex justify-center items-center gap-2">
- <%= form.radio_button :theme, "dark", checked: @user.theme == "dark", data: { auto_submit_form_target: "auto", action: "theme#updateTheme" } %>
- <%= form.label :theme_dark, t(".theme_dark"), value: "dark" %>
- </div>
- </div>
- <div class="text-center">
- <%= image_tag("system-mode-preview.png", alt: "System Theme Preview", class: "h-44 mb-4") %>
- <div class="flex items-center gap-2 justify-center">
- <%= form.radio_button :theme, "system", checked: @user.theme == "system", data: { auto_submit_form_target: "auto", action: "theme#updateTheme" } %>
- <%= form.label :theme_system, t(".theme_system"), value: "system" %>
- </div>
- </div>
+
+ <% theme_option_class = "text-center transition-all duration-200 p-3 rounded-lg hover:bg-surface-hover cursor-pointer [&:has(input:checked)]:bg-surface-hover [&:has(input:checked)]:border [&:has(input:checked)]:border-primary [&:has(input:checked)]:shadow-xs" %>
+
+ <% [
+ { value: "light", image: "light-mode-preview.png" },
+ { value: "dark", image: "dark-mode-preview.png" },
+ { value: "system", image: "system-mode-preview.png" }
+ ].each do |theme| %>
+ <%= form.label :"theme_#{theme[:value]}", class: "group" do %>
+ <div class="<%= theme_option_class %>">
+ <%= image_tag(theme[:image], alt: "#{theme[:value].titleize} Theme Preview", class: "h-44 mb-2") %>
+ <div class="<%= theme[:value] == 'system' ? 'flex items-center gap-2 justify-center' : 'text-sm font-medium text-primary' %>">
+ <%= form.radio_button :theme, theme[:value], checked: @user.theme == theme[:value], class: "sr-only",
+ data: { auto_submit_form_target: "auto", autosubmit_trigger_event: "change", action: "theme#updateTheme" } %>
+ <%= t(".theme_#{theme[:value]}") %>
+ </div>
+ </div>
+ <% end %>
+ <% end %>
<% end %>
</div>
<% end %>