OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Rename color mode inquiry methods (#20306)
Kabiru Mwenja8cbbc0a97237
diff --git a/app/helpers/colors_helper.rb b/app/helpers/colors_helper.rbindex 17746d1b245..99491a5c293 100644--- a/app/helpers/colors_helper.rb+++ b/app/helpers/colors_helper.rb@@ -142,7 +142,7 @@ module ColorsHelperenddef set_generic_color_for(class_name:, color:)- mode_variables = User.current.pref.base_theme_dark? ? default_variables_dark : default_variables_light+ mode_variables = User.current.pref.dark_color_mode? ? default_variables_dark : default_variables_lightconcat "#{class_name} { #{default_color_styles(color.hexcode)} #{mode_variables} }"end@@ -150,7 +150,7 @@ module ColorsHelperdef set_background_colors_for(class_name:, color:)concat "#{class_name} { #{default_color_styles(color.hexcode)} }"- if User.current.pref.base_theme_dark?+ if User.current.pref.dark_color_mode?concat "#{class_name} { #{default_variables_dark} }"concat "#{class_name} { #{highlighted_background_dark} }"else@@ -162,7 +162,7 @@ module ColorsHelperdef set_foreground_colors_for(class_name:, color:)concat "#{class_name} { #{default_color_styles(color.hexcode)} }"- if User.current.pref.base_theme_dark?+ if User.current.pref.dark_color_mode?concat "#{class_name} { #{default_variables_dark} }"concat "#{class_name} { #{highlighted_foreground_dark} }"elsediff --git a/app/models/user_preference.rb b/app/models/user_preference.rbindex e8b08827707..ecedec0b147 100644--- a/app/models/user_preference.rb+++ b/app/models/user_preference.rb@@ -145,8 +145,8 @@ class UserPreference < ApplicationRecordsettings[:force_dark_theme_contrast] = to_boolean(value)end- COLOR_MODES.each do |base_theme_name|- define_method("base_theme_#{base_theme_name}?") { theme.split("_", 2)[0] == base_theme_name.to_s }+ COLOR_MODES.each do |color_mode|+ define_method("#{color_mode}_color_mode?") { theme.split("_", 2)[0] == color_mode.to_s }endTHEMES.each do |theme_name|diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rbindex 8de7a36e957..b2c87709c99 100644--- a/spec/models/user_preference_spec.rb+++ b/spec/models/user_preference_spec.rb@@ -253,7 +253,7 @@ RSpec.describe UserPreference doit "defaults to light" doexpect(subject.theme).to eq("light")expect(subject).to be_a_light_theme- expect(subject).to be_a_base_theme_light+ expect(subject).to be_a_light_color_modeendend@@ -263,7 +263,7 @@ RSpec.describe UserPreference doit "returns the dark theme" doexpect(subject.theme).to eq("dark")expect(subject).to be_a_dark_theme- expect(subject).to be_a_base_theme_dark+ expect(subject).to be_a_dark_color_modeendend@@ -274,7 +274,7 @@ RSpec.describe UserPreference doexpect(subject.theme).to eq("light")expect(subject).to be_a_light_themeexpect(subject).to be_a_light_high_contrast_theme- expect(subject).to be_a_base_theme_light+ expect(subject).to be_a_light_color_modeexpect(subject.increase_theme_contrast?).to be trueendend@@ -286,7 +286,7 @@ RSpec.describe UserPreference doexpect(subject.theme).to eq("dark")expect(subject).to be_a_dark_themeexpect(subject).to be_a_dark_high_contrast_theme- expect(subject).to be_a_base_theme_dark+ expect(subject).to be_a_dark_color_modeexpect(subject.increase_theme_contrast?).to be trueendend@@ -298,7 +298,7 @@ RSpec.describe UserPreference doexpect(subject.theme).to eq("light")expect(subject).to be_a_light_themeexpect(subject).not_to be_a_light_high_contrast_theme- expect(subject).to be_a_base_theme_light+ expect(subject).to be_a_light_color_modeexpect(subject.increase_theme_contrast?).to be falseendend@@ -310,7 +310,7 @@ RSpec.describe UserPreference doexpect(subject.theme).to eq("dark")expect(subject).to be_a_dark_themeexpect(subject).not_to be_a_dark_high_contrast_theme- expect(subject).to be_a_base_theme_dark+ expect(subject).to be_a_dark_color_modeexpect(subject.increase_theme_contrast?).to be falseendend