Skip to content

Use ViewWillAppear for iOS activation #1182

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
kentcb merged 3 commits into from
Oct 29, 2016
Merged

Use ViewWillAppear for iOS activation #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fb65d2
Changed Cocoa activation to trigger on WillAppear instead of DidAppear.
thedillonb Dec 17, 2014
02ed175
Merge branch 'rxui7-master' into PR779
kentcb Oct 29, 2016
cc8617c
Trigger activation of ReactiveSplitViewController on ViewWillAppear
kentcb Oct 29, 2016
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
4 changes: 2 additions & 2 deletions src/ReactiveUI/Cocoa/ReactiveCollectionViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ public IDisposable SuppressChangeNotifications()
Subject<Unit> deactivated = new Subject<Unit>();
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }

public override void ViewDidAppear(bool animated)
public override void ViewWillAppear(bool animated)
{
base.ViewDidAppear(animated);
base.ViewWillAppear(animated);
activated.OnNext(Unit.Default);
this.ActivateSubviews(true);
}
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI/Cocoa/ReactiveNSViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ public IDisposable SuppressChangeNotifications()
Subject<Unit> deactivated = new Subject<Unit>();
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }

public override void ViewDidAppear(bool animated)
public override void ViewWillAppear(bool animated)
{
base.ViewDidAppear(animated);
base.ViewWillAppear(animated);
activated.OnNext(Unit.Default);
this.ActivateSubviews(true);
}
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI/Cocoa/ReactivePageViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ public IDisposable SuppressChangeNotifications()
Subject<Unit> deactivated = new Subject<Unit>();
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }

public override void ViewDidAppear(bool animated)
public override void ViewWillAppear(bool animated)
{
base.ViewDidAppear(animated);
base.ViewWillAppear(animated);
activated.OnNext(Unit.Default);
this.ActivateSubviews(true);
}
Expand Down
10 changes: 5 additions & 5 deletions src/ReactiveUI/Cocoa/ReactiveSplitViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)

/// <summary>
/// Represents an Observable that fires *before* a property is about to
/// be changed.
/// be changed.
/// </summary>
public IObservable<IReactivePropertyChangedEventArgs<ReactiveSplitViewController>> Changing
{
Expand Down Expand Up @@ -100,9 +100,9 @@ public IDisposable SuppressChangeNotifications()
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }

#if UIKIT
public override void ViewDidAppear(bool animated)
public override void ViewWillAppear(bool animated)
{
base.ViewDidAppear(animated);
base.ViewWillAppear(animated);
activated.OnNext(Unit.Default);
this.ActivateSubviews(true);
}
Expand All @@ -114,9 +114,9 @@ public override void ViewDidDisappear(bool animated)
this.ActivateSubviews(false);
}
#else
public override void ViewDidAppear()
public override void ViewWillAppear()
{
base.ViewDidAppear();
base.ViewWillAppear();
activated.OnNext(Unit.Default);
#if UNIFIED
this.ActivateSubviews(true);
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI/Cocoa/ReactiveTabBarController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ public IDisposable SuppressChangeNotifications()
Subject<Unit> deactivated = new Subject<Unit>();
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }

public override void ViewDidAppear(bool animated)
public override void ViewWillAppear(bool animated)
{
base.ViewDidAppear(animated);
base.ViewWillAppear(animated);
activated.OnNext(Unit.Default);
this.ActivateSubviews(true);
}
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI/Cocoa/ReactiveTableViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ public IDisposable SuppressChangeNotifications()
Subject<Unit> deactivated = new Subject<Unit>();
public IObservable<Unit> Deactivated { get { return deactivated.AsObservable(); } }

public override void ViewDidAppear(bool animated)
public override void ViewWillAppear(bool animated)
{
base.ViewDidAppear(animated);
base.ViewWillAppear(animated);
activated.OnNext(Unit.Default);
this.ActivateSubviews(true);
}
Expand Down