hargata/lubelog
1
0
Fork 0
mirror of https://github.com/hargata/lubelog.git synced 2025-12-10 00:46:08 -06:00
Code Issues Packages Projects Releases 51 Wiki Activity

Merge pull request #627 from hargata/Hargata/adaptive.color.mode

Browse Source 
Added switch for adaptive color mode.
This commit is contained in:
Hargata Softworks 2024-09-23 08:34:01 -06:00 committed by GitHub
commit dfa56c2b12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Helper/ConfigHelper.cs
View File

@ -179,6 +179,7 @@ namespace CarCareTracker.Helper
{ {
EnableCsvImports = bool.Parse(_config[nameof(UserConfig.EnableCsvImports)]), EnableCsvImports = bool.Parse(_config[nameof(UserConfig.EnableCsvImports)]),
UseDarkMode = bool.Parse(_config[nameof(UserConfig.UseDarkMode)]), UseDarkMode = bool.Parse(_config[nameof(UserConfig.UseDarkMode)]),
UseSystemColorMode = bool.Parse(_config[nameof(UserConfig.UseSystemColorMode)]),
UseMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]), UseMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]),
UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]), UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]),
EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]), EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),

1
Models/UserConfig.cs
View File

@ -3,6 +3,7 @@
public class UserConfig public class UserConfig
{ {
public bool UseDarkMode { get; set; } public bool UseDarkMode { get; set; }
public bool UseSystemColorMode { get; set; }
public bool EnableCsvImports { get; set; } public bool EnableCsvImports { get; set; }
public bool UseMPG { get; set; } public bool UseMPG { get; set; }
public bool UseDescending { get; set; } public bool UseDescending { get; set; }

8
Views/Home/_Settings.cshtml
View File

@ -13,10 +13,14 @@
<div class="col-12 col-md-6"> <div class="col-12 col-md-6">
<input id="preferredGasUnit" style="display:none;" value="@Model.UserConfig.PreferredGasUnit" /> <input id="preferredGasUnit" style="display:none;" value="@Model.UserConfig.PreferredGasUnit" />
<input id="preferredFuelMileageUnit" style="display:none;" value="@Model.UserConfig.PreferredGasMileageUnit" /> <input id="preferredFuelMileageUnit" style="display:none;" value="@Model.UserConfig.PreferredGasMileageUnit" />
<div class="form-check form-switch"> <div class="form-check form-switch form-check-inline">
<input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableDarkMode" checked="@Model.UserConfig.UseDarkMode"> <input class="form-check-input" onChange="updateColorModeSettings(this)" type="checkbox" role="switch" id="enableDarkMode" checked="@Model.UserConfig.UseDarkMode">
<label class="form-check-label" for="enableDarkMode">@translator.Translate(userLanguage, "Dark Mode")</label> <label class="form-check-label" for="enableDarkMode">@translator.Translate(userLanguage, "Dark Mode")</label>
</div> </div>
<div class="form-check form-switch form-check-inline">
<input class="form-check-input" onChange="updateColorModeSettings(this)" type="checkbox" role="switch" id="useSystemColorMode" checked="@Model.UserConfig.UseSystemColorMode">
<label class="form-check-label" for="useSystemColorMode">@translator.Translate(userLanguage, "Adaptive Color Mode")</label>
</div>
<div class="form-check form-switch"> <div class="form-check form-switch">
<input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableCsvImports" checked="@Model.UserConfig.EnableCsvImports"> <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableCsvImports" checked="@Model.UserConfig.EnableCsvImports">
<label class="form-check-label" for="enableCsvImports">@translator.Translate(userLanguage, "Enable CSV Imports")</label> <label class="form-check-label" for="enableCsvImports">@translator.Translate(userLanguage, "Enable CSV Imports")</label>

3
Views/Shared/_Layout.cshtml
View File

@ -5,6 +5,7 @@
@{ @{
var userConfig = config.GetUserConfig(User); var userConfig = config.GetUserConfig(User);
var useDarkMode = userConfig.UseDarkMode; var useDarkMode = userConfig.UseDarkMode;
var useSystemColorMode = userConfig.UseSystemColorMode;
var enableCsvImports = userConfig.EnableCsvImports; var enableCsvImports = userConfig.EnableCsvImports;
var useMPG = userConfig.UseMPG; var useMPG = userConfig.UseMPG;
var useMarkDown = userConfig.UseMarkDownOnSavedNotes; var useMarkDown = userConfig.UseMarkDownOnSavedNotes;
@ -128,7 +129,7 @@
</div> </div>
</body> </body>
</html> </html>
@if (!useDarkMode) @if (useSystemColorMode)
{ {
<script> <script>
setThemeBasedOnDevice(); setThemeBasedOnDevice();

1
appsettings.json
View File

@ -7,6 +7,7 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"UseDarkMode": false, "UseDarkMode": false,
"UseSystemColorMode": false,
"EnableCsvImports": true, "EnableCsvImports": true,
"UseMPG": true, "UseMPG": true,
"UseDescending": false, "UseDescending": false,

2
wwwroot/defaults/en_US.json
View File

File diff suppressed because one or more lines are too long

15
wwwroot/js/settings.js
View File

@ -21,6 +21,20 @@ function deleteLanguage() {
updateSettings(); updateSettings();
}); });
} }
function updateColorModeSettings(e) {
var colorMode = $(e).prop("id");
switch (colorMode) {
case "enableDarkMode":
//uncheck system prefernce
$("#useSystemColorMode").prop('checked', false);
updateSettings();
break;
case "useSystemColorMode":
$("#enableDarkMode").prop('checked', false);
updateSettings();
break;
}
}
function updateSettings() { function updateSettings() {
var visibleTabs = getCheckedTabs(); var visibleTabs = getCheckedTabs();
var defaultTab = $("#defaultTab").val(); var defaultTab = $("#defaultTab").val();
@ -34,6 +48,7 @@ function updateSettings() {
var userConfigObject = { var userConfigObject = {
useDarkMode: $("#enableDarkMode").is(':checked'), useDarkMode: $("#enableDarkMode").is(':checked'),
useSystemColorMode: $("#useSystemColorMode").is(':checked'),
enableCsvImports: $("#enableCsvImports").is(':checked'), enableCsvImports: $("#enableCsvImports").is(':checked'),
useMPG: $("#useMPG").is(':checked'), useMPG: $("#useMPG").is(':checked'),
useDescending: $("#useDescending").is(':checked'), useDescending: $("#useDescending").is(':checked'),