From 4f94f4d6cf8b2edd05b1120f129c8de4dfd7ba79 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 7 Mar 2018 23:40:28 -0500 Subject: [PATCH] synth create - increase error flash duration --- .../Modules/Spreader/VM/SyntheticEditorVM.cs | 6 +++--- src/client/spark/core/Utility/ViewModelBase.cs | 7 +++++-- src/client/spark/view/Spark/Core/SparkUtils.cs | 17 +++++++++++------ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index feb6eb516..df31b54e2 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -58,15 +58,15 @@ namespace mbts.spark { commit = new DelegateCommand(async () => { bool valid = true; if (string.IsNullOrWhiteSpace(name)) { - flash_error_msg("Please enter a name", nameof(name)).ignore(); + flash_error_msg("Please enter a name", SparkUtils.UI.MessageFlashDuration, nameof(name)).ignore(); valid = false; } else if (!await model.verify_name_is_unique(name)) { - flash_error_msg("Name already taken", nameof(name)).ignore(); + flash_error_msg("Name already taken", SparkUtils.UI.MessageFlashDuration, nameof(name)).ignore(); valid = false; } if (_tick_factors == null || !_tick_factors.is_valid()) { - flash_error_msg("Invalid ticks", nameof(tick_factors)).ignore(); + flash_error_msg("Invalid ticks", SparkUtils.UI.MessageFlashDuration, nameof(tick_factors)).ignore(); valid = false; } if (valid) { diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index 39cf8ccbb..1f4db1681 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -205,14 +205,17 @@ namespace mbts.ui.shell } } - protected async Task flash_error_msg(string msg, params string[] properties) { + protected async Task flash_error_msg(string msg, TimeSpan duration, params string[] properties) { foreach (var prop in properties) set_error(prop, msg); - await Task.Delay(1000); + await Task.Delay(duration); foreach (var prop in properties) clear_error(prop); } + protected async Task flash_error_msg(string msg, params string[] properties) => + await flash_error_msg(msg, mbts.spark.SparkUtils.UI.ErrorFlashDuration, properties); + protected async Task flash_error(params string[] properties) => await flash_error_msg(string.Empty, properties); diff --git a/src/client/spark/view/Spark/Core/SparkUtils.cs b/src/client/spark/view/Spark/Core/SparkUtils.cs index 948fafd0f..cadcab331 100644 --- a/src/client/spark/view/Spark/Core/SparkUtils.cs +++ b/src/client/spark/view/Spark/Core/SparkUtils.cs @@ -8,12 +8,11 @@ using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; -namespace mbts.spark -{ - static class SparkUtils - { - public static readonly TimeSpan DefaultTimeOut = TimeSpan.FromSeconds(3); - public static readonly TimeSpan DefaultPollInterval = TimeSpan.FromSeconds(0.1); +namespace mbts.spark { + static class SparkUtils { + public static readonly TimeSpan + DefaultPollInterval = TimeSpan.FromSeconds(0.1), + DefaultTimeOut = TimeSpan.FromSeconds(3); #region Serialization public static T deserialize_proto(byte[] proto_bytes) => @@ -96,5 +95,11 @@ namespace mbts.spark return (filtered_added.Except(filtered_changed, comparer), filtered_removed.Except(filtered_changed, comparer), filtered_changed); } #endregion + + public static class UI { + public static readonly TimeSpan + ErrorFlashDuration = TimeSpan.FromSeconds(3), + MessageFlashDuration = TimeSpan.FromSeconds(2); + } } } \ No newline at end of file