Skip to content

Commit 4d8e5ce

Browse files
moswaldmoswald
committed
Merge pull request #1095 from aalmada/AsObservable
Added .AsObservable() when ISubject is returned as IObservable
2 parents a9aee36 + e4c111b commit 4d8e5ce

26 files changed

+74
-55
lines changed

‎ReactiveUI.AndroidSupport/ReactiveActionBarActivity.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ public IDisposable SuppressChangeNotifications()
109109
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
110110

111111
readonly Subject<Unit> activated = new Subject<Unit>();
112-
public IObservable<Unit> Activated { get { return activated; } }
112+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
113113

114114
readonly Subject<Unit> deactivated = new Subject<Unit>();
115-
public IObservable<Unit> Deactivated { get { return deactivated; } }
115+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
116116

117117
protected override void OnPause()
118118
{
@@ -129,7 +129,7 @@ protected override void OnResume()
129129
readonly Subject<Tuple<int, Result, Intent>> activityResult = new Subject<Tuple<int, Result, Intent>>();
130130
public IObservable<Tuple<int, Result, Intent>> ActivityResult
131131
{
132-
get { return activityResult; }
132+
get { return activityResult.AsObservable(); }
133133
}
134134

135135
protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)

‎ReactiveUI.AndroidSupport/ReactiveDialogFragment.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.ComponentModel;
33
using System.Reactive.Subjects;
44
using System.Reactive;
5+
using System.Reactive.Linq;
56

67
namespace ReactiveUI.AndroidSupport
78
{
@@ -90,10 +91,10 @@ public IDisposable SuppressChangeNotifications()
9091
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
9192

9293
readonly Subject<Unit> activated = new Subject<Unit>();
93-
public IObservable<Unit> Activated { get { return activated; } }
94+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
9495

9596
readonly Subject<Unit> deactivated = new Subject<Unit>();
96-
public IObservable<Unit> Deactivated { get { return deactivated; } }
97+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
9798

9899
public override void OnPause()
99100
{

‎ReactiveUI.AndroidSupport/ReactiveFragment.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using System.Runtime.CompilerServices;
2121
using Splat;
2222
using System.Reactive;
23+
using System.Reactive.Linq;
2324

2425
namespace ReactiveUI.AndroidSupport
2526
{
@@ -102,10 +103,10 @@ public IDisposable SuppressChangeNotifications()
102103
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
103104

104105
readonly Subject<Unit> activated = new Subject<Unit>();
105-
public IObservable<Unit> Activated { get { return activated; } }
106+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
106107

107108
readonly Subject<Unit> deactivated = new Subject<Unit>();
108-
public IObservable<Unit> Deactivated { get { return deactivated; } }
109+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
109110

110111
public override void OnPause()
111112
{

‎ReactiveUI.AndroidSupport/ReactiveFragmentActivity.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ public IDisposable SuppressChangeNotifications()
109109
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
110110

111111
readonly Subject<Unit> activated = new Subject<Unit>();
112-
public IObservable<Unit> Activated { get { return activated; } }
112+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
113113

114114
readonly Subject<Unit> deactivated = new Subject<Unit>();
115-
public IObservable<Unit> Deactivated { get { return deactivated; } }
115+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
116116

117117
protected override void OnPause()
118118
{
@@ -129,7 +129,7 @@ protected override void OnResume()
129129
readonly Subject<Tuple<int, Result, Intent>> activityResult = new Subject<Tuple<int, Result, Intent>>();
130130
public IObservable<Tuple<int, Result, Intent>> ActivityResult
131131
{
132-
get { return activityResult; }
132+
get { return activityResult.AsObservable(); }
133133
}
134134

135135
protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)

‎ReactiveUI/Android/ReactiveActivity.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ public IDisposable SuppressChangeNotifications()
114114
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
115115

116116
readonly Subject<Unit> activated = new Subject<Unit>();
117-
public IObservable<Unit> Activated { get { return activated; } }
117+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
118118

119119
readonly Subject<Unit> deactivated = new Subject<Unit>();
120-
public IObservable<Unit> Deactivated { get { return deactivated; } }
120+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
121121

122122
protected override void OnPause()
123123
{
@@ -133,7 +133,7 @@ protected override void OnResume()
133133

134134
readonly Subject<Tuple<int, Result, Intent>> activityResult = new Subject<Tuple<int, Result, Intent>>();
135135
public IObservable<Tuple<int, Result, Intent>> ActivityResult {
136-
get { return activityResult; }
136+
get { return activityResult.AsObservable(); }
137137
}
138138

139139
protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)

‎ReactiveUI/Android/ReactiveFragment.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using System.Runtime.CompilerServices;
2121
using Splat;
2222
using System.Reactive;
23+
using System.Reactive.Linq;
2324

2425
namespace ReactiveUI
2526
{
@@ -110,10 +111,10 @@ public IDisposable SuppressChangeNotifications()
110111
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
111112

112113
readonly Subject<Unit> activated = new Subject<Unit>();
113-
public IObservable<Unit> Activated { get { return activated; } }
114+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
114115

115116
readonly Subject<Unit> deactivated = new Subject<Unit>();
116-
public IObservable<Unit> Deactivated { get { return deactivated; } }
117+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
117118

118119
public override void OnPause()
119120
{

‎ReactiveUI/Android/ReactivePreferenceActivity.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ public IDisposable SuppressChangeNotifications()
101101
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
102102

103103
readonly Subject<Unit> activated = new Subject<Unit>();
104-
public IObservable<Unit> Activated { get { return activated; } }
104+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
105105

106106
readonly Subject<Unit> deactivated = new Subject<Unit>();
107-
public IObservable<Unit> Deactivated { get { return deactivated; } }
107+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
108108

109109
protected override void OnPause()
110110
{
@@ -120,7 +120,7 @@ protected override void OnResume()
120120

121121
readonly Subject<Tuple<int, Result, Intent>> activityResult = new Subject<Tuple<int, Result, Intent>>();
122122
public IObservable<Tuple<int, Result, Intent>> ActivityResult {
123-
get { return activityResult; }
123+
get { return activityResult.AsObservable(); }
124124
}
125125

126126
protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)

‎ReactiveUI/Android/ReactivePreferenceFragment.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Reactive.Subjects;
55
using System.Reactive;
66
using Android.Preferences;
7+
using System.Reactive.Linq;
78

89
namespace ReactiveUI
910
{
@@ -94,10 +95,10 @@ public IDisposable SuppressChangeNotifications()
9495
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
9596

9697
readonly Subject<Unit> activated = new Subject<Unit>();
97-
public IObservable<Unit> Activated { get { return activated; } }
98+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
9899

99100
readonly Subject<Unit> deactivated = new Subject<Unit>();
100-
public IObservable<Unit> Deactivated { get { return deactivated; } }
101+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
101102

102103
public override void OnPause()
103104
{

‎ReactiveUI/Cocoa/ReactiveCollectionReusableView.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using System.Threading;
1515
using ReactiveUI;
1616
using Splat;
17+
using System.Reactive.Linq;
1718

1819
#if UNIFIED
1920
using CoreGraphics;
@@ -94,9 +95,9 @@ public IDisposable SuppressChangeNotifications()
9495
}
9596

9697
Subject<Unit> activated = new Subject<Unit>();
97-
public IObservable<Unit> Activated { get { return activated; } }
98+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
9899
Subject<Unit> deactivated = new Subject<Unit>();
99-
public IObservable<Unit> Deactivated { get { return deactivated; } }
100+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
100101

101102
public override void WillMoveToSuperview(UIView newsuper)
102103
{

‎ReactiveUI/Cocoa/ReactiveCollectionView.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using System.Threading;
1515
using ReactiveUI;
1616
using Splat;
17+
using System.Reactive.Linq;
1718

1819
#if UNIFIED
1920
using CoreGraphics;
@@ -93,9 +94,9 @@ public IDisposable SuppressChangeNotifications()
9394
}
9495

9596
Subject<Unit> activated = new Subject<Unit>();
96-
public IObservable<Unit> Activated { get { return activated; } }
97+
public IObservable<Unit> Activated { get { return activated.AsObservable(); } }
9798
Subject<Unit> deactivated = new Subject<Unit>();
98-
public IObservable<Unit> Deactivated { get { return deactivated; } }
99+
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }
99100

100101
public override void WillMoveToSuperview(UIView newsuper)
101102
{

0 commit comments

Comments
 (0)