Skip to content

Commit 8c5f4ab

Browse files
committed
build: fix merge
1 parent 0086c0a commit 8c5f4ab

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

src/ByteSync.Client/ViewModels/Sessions/Comparisons/Actions/Misc/SourceOrPropertyViewModel.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using ByteSync.Business.Comparisons;
2-
using Prism.Mvvm;
2+
using ReactiveUI.Fody.Helpers;
33

44
namespace ByteSync.ViewModels.Sessions.Comparisons.Actions.Misc;
55

6-
public class SourceOrPropertyViewModel : BindableBase
6+
public class SourceOrPropertyViewModel : ViewModelBase
77
{
88
private string _displayName;
99
private string _description;
@@ -29,22 +29,18 @@ public SourceOrPropertyViewModel(ComparisonProperty comparisonProperty, string d
2929
}
3030

3131
public DataPart? DataPart { get; set; }
32+
3233
public ComparisonProperty? ComparisonProperty { get; set; }
3334

3435
public bool IsDataPart { get; set; }
36+
3537
public bool IsProperty => !IsDataPart;
3638

37-
public string DisplayName
38-
{
39-
get => _displayName;
40-
set => SetProperty(ref _displayName, value);
41-
}
39+
[Reactive]
40+
public string DisplayName { get; set; }
4241

43-
public string Description
44-
{
45-
get => _description;
46-
set => SetProperty(ref _description, value);
47-
}
42+
[Reactive]
43+
public string Description { get; set; }
4844

4945
public bool IsNameProperty
5046
{

0 commit comments

Comments
 (0)