Skip to content

Commit 37f8049

Browse files
committed
refactor: simplify user string conversion
1 parent 05e3f0e commit 37f8049

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/Converters/StringConverters.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,5 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
8181

8282
public static readonly FuncValueConverter<string, bool> ContainsSpaces =
8383
new FuncValueConverter<string, bool>(v => v != null && v.Contains(' '));
84-
85-
public static readonly FuncValueConverter<Models.User, string> UserToString =
86-
new FuncValueConverter<Models.User, string>(v => v == null ? string.Empty : $"{v.Name} <{v.Email}>");
8784
}
8885
}

src/Models/User.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ public static User FindOrAdd(string data)
4343
return _caches.GetOrAdd(data, key => new User(key));
4444
}
4545

46+
public override string ToString()
47+
{
48+
return $"{Name} <{Email}>";
49+
}
50+
4651
private static ConcurrentDictionary<string, User> _caches = new ConcurrentDictionary<string, User>();
4752
private readonly int _hash;
4853
}

src/Views/Histories.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<Grid Grid.Column="1"
167167
ColumnDefinitions="20,*"
168168
Background="Transparent"
169-
ToolTip.Tip="{Binding Author, Converter={x:Static c:StringConverters.UserToString}}">
169+
ToolTip.Tip="{Binding Author}">
170170
<v:Avatar Grid.Column="0"
171171
Width="16" Height="16"
172172
Margin="4,0,0,0"

0 commit comments

Comments
 (0)