diff --git a/NebulaAuth.sln b/NebulaAuth.sln index b3092fc..d813747 100644 --- a/NebulaAuth.sln +++ b/NebulaAuth.sln @@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "changelog", "changelog", "{ changelog\1.4.5.html = changelog\1.4.5.html changelog\1.4.6.html = changelog\1.4.6.html changelog\1.4.7.html = changelog\1.4.7.html + changelog\1.4.8.html = changelog\1.4.8.html EndProjectSection EndProject Global diff --git a/NebulaAuth/App.xaml b/NebulaAuth/App.xaml index 8f47884..ba657d7 100644 --- a/NebulaAuth/App.xaml +++ b/NebulaAuth/App.xaml @@ -18,6 +18,7 @@ + diff --git a/NebulaAuth/Converters/ProxyTextConverter.cs b/NebulaAuth/Converters/ProxyTextConverter.cs index 889a351..a3806fb 100644 --- a/NebulaAuth/Converters/ProxyTextConverter.cs +++ b/NebulaAuth/Converters/ProxyTextConverter.cs @@ -1,6 +1,7 @@ using System; using System.Globalization; using System.Windows.Data; +using AchiesUtilities.Web.Proxy; using NebulaAuth.Model.Entities; namespace NebulaAuth.Converters; @@ -14,7 +15,25 @@ public class ProxyTextConverter : IValueConverter return string.Empty; } - return $"{p.Id}: {p.Data.Address}"; + return $"{p.Id}: {p.Data.Address}:{p.Data.Port}"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } +} + +public class ProxyDataTextConverter : IValueConverter +{ + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is not ProxyData p) + { + return string.Empty; + } + + return $"{p.Address}:{p.Port}"; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/NebulaAuth/Core/SnackbarController.cs b/NebulaAuth/Core/SnackbarController.cs index fc0accb..fb3ac05 100644 --- a/NebulaAuth/Core/SnackbarController.cs +++ b/NebulaAuth/Core/SnackbarController.cs @@ -7,11 +7,8 @@ public class SnackbarController { public static SnackbarMessageQueue MessageQueue { get; } = new() { DiscardDuplicates = true}; - private const int MIN_SNACKBAR_TIME = 1000; - public SnackbarController() - { + private const int MIN_SNACKBAR_TIME = 1200; - } /// /// /// @@ -46,10 +43,12 @@ public class SnackbarController private static TimeSpan GetSnackbarTime(string str) { - if (str.Length <= 100) return TimeSpan.FromMilliseconds(MIN_SNACKBAR_TIME); - - var length = str.Length / 0.07; - return TimeSpan.FromMilliseconds(length); + var duration = str.Length / 0.03; + if (duration < MIN_SNACKBAR_TIME) + { + duration = MIN_SNACKBAR_TIME; + } + return TimeSpan.FromMilliseconds(duration); } diff --git a/NebulaAuth/MainWindow.xaml b/NebulaAuth/MainWindow.xaml index 71982c4..ee42c42 100644 --- a/NebulaAuth/MainWindow.xaml +++ b/NebulaAuth/MainWindow.xaml @@ -68,7 +68,7 @@ - + - + @@ -34,8 +34,8 @@ - - @@ -51,8 +51,9 @@ Margin="15" FontSize="16"> - + + @@ -61,7 +62,7 @@ - + + + + +
+ +
+
Version 1.4.8
+
DATE
+
+ - Fixed crash when attempting to update/save mafile without SessionData on proxy and group change
+ - The account found through the search will be selected automatically
+ - Added proxy support types: without authentication (no user and password), domain proxy (localhost, mydomain.com), with "http://" scheme
+ - Added "Timer changed" snackbar to indicate that preferences was updated
+ - Now the port is visible in the proxy text
+ - Few tooltips added on "Groups" and "Proxy" fields"
+ - Small UI improvements
+
+
+
+ + + \ No newline at end of file