Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 26 additions & 42 deletions AutoDarkModeApp/Strings/en-us/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<value>Active delays</value>
</data>
<data name="AdaptiveTaskbarAccent" xml:space="preserve">
<value>Use Taskbar Accent Color during</value>
<value>Use Taskbar accent color during</value>
</data>
<data name="AdaptToSystem" xml:space="preserve">
<value>Adapt to system</value>
Expand Down Expand Up @@ -212,7 +212,7 @@
<value>Enable color filter during dark mode</value>
</data>
<data name="ColorizationPick_Description" xml:space="preserve">
<value>Customize the Windows system color scheme to your liking.</value>
<value>Customize the Windows system color scheme to your liking</value>
</data>
<data name="Conditions" xml:space="preserve">
<value>Conditions</value>
Expand Down Expand Up @@ -468,16 +468,11 @@ Would you like to create an issue on the Auto Dark Mode repository?</value>
</data>
<data name="Monitor" xml:space="preserve">
<value>Monitor</value>
<comment>noun (device)</comment>
</data>
<data name="Msg_AutoSwitchEnabled" xml:space="preserve">
<value>Auto theme switching is enabled</value>
</data>
<data name="Msg_ChangedsSaved" xml:space="preserve">
<value>Your changes have been saved!</value>
</data>
<data name="Msg_ClickApply" xml:space="preserve">
<value>Your changes will be saved automatically.</value>
</data>
<data name="Msg_DowngradeAvailable" xml:space="preserve">
<value>A downgrade is available</value>
</data>
Expand Down Expand Up @@ -514,17 +509,13 @@ Would you like to create an issue on the Auto Dark Mode repository?</value>
<data name="Msg_SwitchPending" xml:space="preserve">
<value>Theme switch pending</value>
</data>
<data name="Msg_ThemeError" xml:space="preserve">
<value>Warning: We couldn't read your current theme.</value>
Comment thread
Armin2208 marked this conversation as resolved.
</data>
<data name="Msg_UpdateAvailable" xml:space="preserve">
<value>An update is available!</value>
</data>
<data name="Msg_UpdaterText" xml:space="preserve">
<value>A new version is available on GitHub with fixes and enhancements.
<value>A new version with fixes and enhancements is available on GitHub.

Currently installed version: {0}, new version: {1}</value>
<comment>This should be handled with discrete ("Update" or "Dismiss") buttons</comment>
Currently installed: {0}, new: {1}</value>
</data>
<data name="Msg_VersionInfoCopied" xml:space="preserve">
<value>Version info copied to clipboard</value>
Expand All @@ -546,7 +537,6 @@ Currently installed version: {0}, new version: {1}</value>
</data>
<data name="OpenConfigFile" xml:space="preserve">
<value>Open configuration file</value>
<comment>Don't use unnessecary abbreviations</comment>
</data>
<data name="OpenConfigFolder" xml:space="preserve">
<value>Open configuration folder</value>
Expand All @@ -570,7 +560,7 @@ Currently installed version: {0}, new version: {1}</value>
<value>Open updater log</value>
</data>
<data name="OpenWindowsNightLight" xml:space="preserve">
<value>Go to Night light settings</value>
<value>Open Night light settings</value>
</data>
<data name="PathAt" xml:space="preserve">
<value>Path:</value>
Expand All @@ -588,19 +578,19 @@ Currently installed version: {0}, new version: {1}</value>
<value>Select mouse pointers</value>
</data>
<data name="PickCursor_Description" xml:space="preserve">
<value>Configure different mouse pointers for dark and light modes.</value>
<value>Configure mouse pointers for dark and light modes</value>
</data>
<data name="PickTheme" xml:space="preserve">
<value>Select a theme</value>
</data>
<data name="PickTheme_Description" xml:space="preserve">
<value>Select a different Windows theme for dark and light mode respectively. Allows full theme customization, but requires you to set up .theme files.</value>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should you remove this sentence explaining the hustle of this option?

Copy link
Copy Markdown
Contributor Author

@Jay-o-Way Jay-o-Way Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the UX would be clear enough. There's a longer description on that page already.
Also: now it's one sentence that doesn't need a period at the end

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also make a long sentence without a period at the end :D

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert/improve this

<value>Select a Windows theme for light and dark mode</value>
</data>
<data name="PickWallpaper" xml:space="preserve">
<value>Personalize your background</value>
</data>
<data name="PickWallpaper_Description" xml:space="preserve">
<value>Customize your desktop for all monitors, individual monitors, set a background color or enable spotlight.</value>
<value>Customize your desktop for all monitors, individual monitors, set a background color or enable spotlight</value>
</data>
<data name="Position" xml:space="preserve">
<value>Position</value>
Expand Down Expand Up @@ -679,9 +669,11 @@ Currently installed version: {0}, new version: {1}</value>
</data>
<data name="Reset" xml:space="preserve">
<value>Reset</value>
<comment>verb</comment>
</data>
<data name="Restart" xml:space="preserve">
<value>Restart</value>
<comment>verb</comment>
</data>
<data name="RestartNeeded" xml:space="preserve">
<value>Restart to apply changes</value>
Expand Down Expand Up @@ -820,9 +812,10 @@ Currently installed version: {0}, new version: {1}</value>
</data>
<data name="Updates" xml:space="preserve">
<value>Updates</value>
<comment>noun, plural</comment>
</data>
<data name="UseLocationService" xml:space="preserve">
<value>Use Location Service</value>
<value>Use location service</value>
</data>
<data name="Version" xml:space="preserve">
<value>Version</value>
Expand All @@ -842,15 +835,11 @@ Currently installed version: {0}, new version: {1}</value>
<data name="WallpaperMode_Spotlight" xml:space="preserve">
<value>Windows spotlight</value>
</data>
<data name="Warning1903" xml:space="preserve">
<value>This option is disabled. Need to run on Windows 10 April 2019 or later.</value>
<comment>Don't blame a user directly!</comment>
</data>
<data name="WindowsAutostartDisabled" xml:space="preserve">
<value>You have disabled the auto start entry via Windows.</value>
</data>
<data name="ThemeTutorialDescription" xml:space="preserve">
<value>1. Go to Windows Settings &gt; Personalization &gt; Colors.
<value>1. Open Windows Settings &gt; Personalization &gt; Colors.
2. Change the system color to 'Light' for the light theme.
3. Go to Windows Settings &gt; Personalization &gt; Themes.
4. Select your favorite wallpaper, mouse pointers and accent color.
Expand All @@ -877,7 +866,7 @@ Currently installed version: {0}, new version: {1}</value>
<value>Path</value>
</data>
<data name="StartWithWindowsFailed_Content" xml:space="preserve">
<value>Auto start has been disabled in Windows Settings. To enable Auto Dark Mode to start with Windows again, please go to Windows Settings &gt; Apps &gt; Startup and enable it.</value>
<value>Auto start is disabled in Windows Settings.</value>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert / improve

</data>
<data name="Beta" xml:space="preserve">
<value>Beta</value>
Expand All @@ -892,7 +881,7 @@ Currently installed version: {0}, new version: {1}</value>
<value>Language</value>
</data>
<data name="OpenWindowsSpotlight" xml:space="preserve">
<value>Go to Windows Spotlight settings</value>
<value>Open Windows Spotlight settings</value>
</data>
<data name="Stable" xml:space="preserve">
<value>Stable</value>
Expand Down Expand Up @@ -922,13 +911,13 @@ Currently installed version: {0}, new version: {1}</value>
<value>The hotkey didn't work? Don't worry, let's save it again</value>
</data>
<data name="SaveSuccessfully" xml:space="preserve">
<value>Save successfully</value>
<value>Save successfull</value>
</data>
<data name="SaveFailed" xml:space="preserve">
<value>Save failed</value>
</data>
<data name="AddApps" xml:space="preserve">
<value>Start typing to add any apps</value>
<value>Start typing to add apps</value>
</data>
<data name="AppMode" xml:space="preserve">
<value>App mode</value>
Expand All @@ -951,9 +940,6 @@ Currently installed version: {0}, new version: {1}</value>
<data name="AccentSurfaces" xml:space="preserve">
<value>Accent Surfaces</value>
</data>
<data name="AccentSurfacesChoose" xml:space="preserve">
<value>Choose when the accent color should be applied</value>
</data>
<data name="ApplyDuring" xml:space="preserve">
<value>Apply during</value>
</data>
Expand Down Expand Up @@ -983,7 +969,7 @@ Please note: This may introduce slight to moderate lag on some systems during th
<value>Dark mode for your web browser</value>
</data>
<data name="DarkModeForWebbrowserDescription" xml:space="preserve">
<value>Dark Reader is a browser extension which makes websites in Chrome, Edge and Firefox respect the current theme of your system. Click here to learn more</value>
<value>Dark Reader is a browser extension which makes websites in Chrome, Edge and Firefox respect the current theme of your system. Click here to learn more.</value>
</data>
<data name="WindowsMousePointerSetting" xml:space="preserve">
<value>Open Windows mouse pointer settings</value>
Expand All @@ -1003,25 +989,23 @@ Please note: This may introduce slight to moderate lag on some systems during th
<value>Copied</value>
</data>
<data name="AggressiveDWMRefreshDescription" xml:space="preserve">
<value>Attempts to reduce wrong UI colors in the explorer, taskbar and start menu by fixing the theme after every switch.</value>
<value>Attempts to reduce wrong UI colors in the explorer, taskbar and start menu by fixing the theme after every switch</value>
</data>
<data name="OpenWindowsSettings" xml:space="preserve">
<value>Open Windows settings</value>
<value>Open Windows Settings</value>
</data>
<data name="SelectedColor" xml:space="preserve">
<value>Selected color</value>
</data>
<data name="WindowsColors" xml:space="preserve">
<value>Windows colors</value>
</data>
<data name="Msg_AutomaticColorModeDescription" xml:space="preserve">
<value>Automatic accent color is selected. The color will be determined by the current wallpaper</value>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But we use this string?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I just thought it was way too obvious, explaining what "automatic color" means?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think its good to have a message saying that automatic Color is activated. Without the message, its not obvious why the user doesnt see a color picker.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert

</data>
<data name="ColorPreview" xml:space="preserve">
<value>Color preview</value>
</data>
<data name="Preview" xml:space="preserve">
<value>Preview</value>
<comment>noun</comment>
</data>
<data name="AccentApplyTaskbar" xml:space="preserve">
<value>Accent color for the taskbar</value>
Expand All @@ -1033,7 +1017,7 @@ Please note: This may introduce slight to moderate lag on some systems during th
<value>Ambient light sensor</value>
</data>
<data name="AmbientLightSensor_Description" xml:space="preserve">
<value>Automatically switch themes based on ambient light levels detected by your device's light sensor.</value>
<value>Automatically switch themes based on ambient light levels detected by your device's light sensor</value>
</data>
<data name="AmbientLightThresholds" xml:space="preserve">
<value>Light thresholds</value>
Expand All @@ -1042,7 +1026,7 @@ Please note: This may introduce slight to moderate lag on some systems during th
<value>Configure light thresholds</value>
</data>
<data name="AmbientLightThresholds_Description" xml:space="preserve">
<value>This feature automatically switches the theme based on the brightness of your environment. Set the light levels (in lux) at which the theme should switch. Use different thresholds to prevent rapid switching.</value>
<value>Automatically switch the theme based on the brightness of your environment. Set the light levels (in lux) at which the theme should switch. Use different thresholds to prevent rapid switching.</value>
</data>
<data name="AmbientLightDarkThreshold" xml:space="preserve">
<value>Dark below (lux)</value>
Expand All @@ -1066,7 +1050,7 @@ Please note: This may introduce slight to moderate lag on some systems during th
<value>Dimly lit room</value>
</data>
<data name="AmbientLightRef_LivingRoom" xml:space="preserve">
<value>Living room / bedroom</value>
<value>Livingroom / bedroom</value>
</data>
<data name="AmbientLightRef_Office" xml:space="preserve">
<value>Office lighting</value>
Expand All @@ -1093,7 +1077,7 @@ Please note: This may introduce slight to moderate lag on some systems during th
<value>Automatically switches the theme based on environment lighting</value>
</data>
<data name="AmbientLightSensor_Unavailable_ToolTip" xml:space="preserve">
<value>This feature isn't available on your device because no ambient light sensor was detected</value>
Comment thread
Armin2208 marked this conversation as resolved.
<value>This feature isn't available because no ambient light sensor was detected</value>
</data>
<data name="AmbientLightCurrent" xml:space="preserve">
<value>Current:</value>
Expand Down
7 changes: 3 additions & 4 deletions AutoDarkModeApp/ViewModels/SettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,10 @@ private async Task GetAutostartInfo(bool toggleVisibility = true)
Title = "StartWithWindows".GetLocalized(),
Content = "StartWithWindowsFailed_Content".GetLocalized(),
XamlRoot = App.MainWindow.Content.XamlRoot,
PrimaryButtonText = "OpenWindowsSettings".GetLocalized(),
PrimaryButtonCommand = new RelayCommand(OpenAutostartSettings),
PrimaryButtonStyle = (Style)App.Current.Resources["AccentButtonStyle"],
CloseButtonText = "Close".GetLocalized(),
IsSecondaryButtonEnabled = true,
SecondaryButtonText = "OpenWindowsSettings".GetLocalized(),
SecondaryButtonCommand = new RelayCommand(OpenAutostartSettings),
DefaultButton = ContentDialogButton.Secondary
};

if (IsAutostart)
Expand Down
7 changes: 0 additions & 7 deletions AutoDarkModeApp/Views/ColorizationPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@
<!-- Accent Color -->
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">

<!-- Automatic color mode info -->
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert

<InfoBar
IsClosable="False"
IsOpen="{x:Bind ViewModel.AutomaticColorPromptSettingsCardVisibility, Mode=OneWay}"
Message="{helpers:ResourceString Name=Msg_AutomaticColorModeDescription}"
Severity="Informational" />

<!-- Automatic color mode settingscard -->
<controls:SettingsCard
Header="{helpers:ResourceString Name=AccentColor}"
Expand Down
4 changes: 1 addition & 3 deletions AutoDarkModeApp/Views/SystemAreasPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@


<!-- Accent Mode for title bars and window borders -->
<controls:SettingsExpander Description="{helpers:ResourceString Name=AccentSurfacesChoose}"
Header="{helpers:ResourceString Name=AccentApplyTitlebarAndBorders}"
<controls:SettingsExpander Header="{helpers:ResourceString Name=AccentApplyTitlebarAndBorders}"
HeaderIcon="{ui:FontIcon Glyph=&#xE737;}">

<ToggleSwitch IsOn="{x:Bind ViewModel.IsDWMPrevalenceSwitch, Mode=TwoWay}"/>
Expand All @@ -64,7 +63,6 @@
<!-- Accent mode for the taskbar -->
<controls:SettingsExpander Header="{helpers:ResourceString Name=AccentApplyTaskbar}"
HeaderIcon="{ui:FontIcon Glyph=&#xE90E;}"
Description="{helpers:ResourceString Name=AccentSurfacesChoose}"
IsEnabled="{x:Bind ViewModel.AllowTaskbarColorSwitch, Mode=OneWay}"
IsExpanded="{x:Bind ViewModel.IsAccentApplyTaskbarExpanded, Mode=TwoWay}">
<ToggleSwitch IsOn="{x:Bind ViewModel.IsTaskbarColorSwitch, Mode=TwoWay}"/>
Expand Down
4 changes: 2 additions & 2 deletions AutoDarkModeApp/Views/TimePage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</InfoBar>

<!-- About time -->
<controls:SettingsCard ContentAlignment="Vertical" Visibility="{x:Bind ViewModel.AutoThemeSwitchingEnabled, Mode=OneWay}">
<controls:SettingsCard ContentAlignment="Vertical" IsEnabled="{x:Bind ViewModel.AutoThemeSwitchingEnabled, Mode=OneWay}">
<controls:SettingsCard.Description>
<StackPanel HorizontalAlignment="Stretch" Spacing="12">
<StackPanel Spacing="{StaticResource RadioButtonsRowSpacing}">
Expand Down Expand Up @@ -67,7 +67,7 @@
Content="{helpers:ResourceString Name=FollowWindowsNightLight}"
GroupName="TriggerMode"
IsChecked="{x:Bind ViewModel.SelectedTriggerMode, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=WindowsNightLight, Mode=OneWay}" />
<!-- Wrap in Border to show tooltip even when RadioButton is disabled -->
<!-- Wrap in StackPanel to show tooltip even when RadioButton is disabled -->
<StackPanel
Orientation="Horizontal"
Spacing="8"
Expand Down