Skip to content

refactor: Remove the weak event managers #2276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 10, 2019
Merged

refactor: Remove the weak event managers #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2fd2323
refactor: Remove the weak event managers
glennawatson Dec 9, 2019
d818217
Further removals
glennawatson Dec 9, 2019
8606eb3
More removing classes
glennawatson Dec 9, 2019
0e11a80
fix
glennawatson Dec 10, 2019
286ae6b
fix
glennawatson Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ReactiveUI.Android.Tests/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="ReactiveUI.Android.Tests" android:versionCode="1" android:versionName="1.0" android:installLocation="preferExternal">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<application android:label="Splat.Android.Tests" android:icon="@drawable/Icon"></application>
</manifest>
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<application android:label="Splat.Android.Tests" android:icon="@drawable/Icon"></application>
</manifest>
1 change: 0 additions & 1 deletion src/ReactiveUI.Android.Tests/ReactiveUI.Android.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidSupport/ReactiveAppCompatActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,10 @@ protected ReactiveAppCompatActivity(IntPtr handle, JniHandleOwnership ownership)
}

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <inheritdoc/>
public IObservable<IReactivePropertyChangedEventArgs<ReactiveAppCompatActivity>> Changing => this.GetChangingObservable();
Expand Down Expand Up @@ -129,13 +121,13 @@ public event PropertyChangedEventHandler PropertyChanged
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

/// <inheritdoc/>
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidSupport/ReactiveDialogFragment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,10 @@ protected ReactiveDialogFragment()
}

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <inheritdoc/>
public IObservable<Exception> ThrownExceptions => this.GetThrownExceptionsObservable();
Expand All @@ -98,13 +90,13 @@ public event PropertyChangedEventHandler PropertyChanged
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

/// <inheritdoc />
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidSupport/ReactiveFragment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,10 @@ protected ReactiveFragment()
}

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <inheritdoc/>
public IObservable<Exception> ThrownExceptions => this.GetThrownExceptionsObservable();
Expand All @@ -116,13 +108,13 @@ public event PropertyChangedEventHandler PropertyChanged
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

/// <inheritdoc />
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidSupport/ReactiveFragmentActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,10 @@ public class ReactiveFragmentActivity : FragmentActivity, IReactiveObject, IReac
private readonly Subject<(int requestCode, Result result, Intent intent)> _activityResult = new Subject<(int requestCode, Result result, Intent intent)>();

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <inheritdoc />
public IObservable<IReactivePropertyChangedEventArgs<ReactiveFragmentActivity>> Changing => this.GetChangingObservable();
Expand Down Expand Up @@ -117,13 +109,13 @@ public event PropertyChangedEventHandler PropertyChanged
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

/// <inheritdoc />
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewViewHolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,10 @@ protected ReactiveRecyclerViewViewHolder(View view)
}

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <summary>
/// Gets an observable that signals that this ViewHolder has been selected.
Expand Down Expand Up @@ -174,13 +166,13 @@ public bool AreChangeNotificationsEnabled()
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

[OnDeserialized]
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidX/ReactiveAppCompatActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,10 @@ protected ReactiveAppCompatActivity(IntPtr handle, JniHandleOwnership ownership)
}

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <inheritdoc/>
public IObservable<IReactivePropertyChangedEventArgs<ReactiveAppCompatActivity>> Changing => this.GetChangingObservable();
Expand Down Expand Up @@ -129,13 +121,13 @@ public event PropertyChangedEventHandler PropertyChanged
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

/// <inheritdoc/>
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidX/ReactiveDialogFragment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,10 @@ protected ReactiveDialogFragment()
}

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <inheritdoc/>
public IObservable<Exception> ThrownExceptions => this.GetThrownExceptionsObservable();
Expand All @@ -98,13 +90,13 @@ public event PropertyChangedEventHandler PropertyChanged
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

/// <inheritdoc />
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidX/ReactiveFragment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,10 @@ protected ReactiveFragment()
}

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <inheritdoc/>
public IObservable<Exception> ThrownExceptions => this.GetThrownExceptionsObservable();
Expand All @@ -98,13 +90,13 @@ public event PropertyChangedEventHandler PropertyChanged
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

/// <inheritdoc />
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidX/ReactiveFragmentActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,10 @@ public class ReactiveFragmentActivity : FragmentActivity, IReactiveObject, IReac
private readonly Subject<(int requestCode, Result result, Intent intent)> _activityResult = new Subject<(int requestCode, Result result, Intent intent)>();

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <inheritdoc />
public IObservable<IReactivePropertyChangedEventArgs<ReactiveFragmentActivity>> Changing => this.GetChangingObservable();
Expand Down Expand Up @@ -102,13 +94,13 @@ public event PropertyChangedEventHandler PropertyChanged
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

/// <inheritdoc />
Expand Down
16 changes: 4 additions & 12 deletions src/ReactiveUI.AndroidX/ReactiveRecyclerViewViewHolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,10 @@ protected ReactiveRecyclerViewViewHolder(View view)
}

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
{
add => PropertyChangingEventManager.AddHandler(this, value);
remove => PropertyChangingEventManager.RemoveHandler(this, value);
}
public event PropertyChangingEventHandler PropertyChanging;

/// <inheritdoc/>
public event PropertyChangedEventHandler PropertyChanged
{
add => PropertyChangedEventManager.AddHandler(this, value);
remove => PropertyChangedEventManager.RemoveHandler(this, value);
}
public event PropertyChangedEventHandler PropertyChanged;

/// <summary>
/// Gets an observable that signals that this ViewHolder has been selected.
Expand Down Expand Up @@ -174,13 +166,13 @@ public bool AreChangeNotificationsEnabled()
/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
{
PropertyChangingEventManager.DeliverEvent(this, args);
PropertyChanging?.Invoke(this, args);
}

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
{
PropertyChangedEventManager.DeliverEvent(this, args);
PropertyChanged?.Invoke(this, args);
}

[OnDeserialized]
Expand Down
Loading