Rename: IPageLifecycle -> IPageLifecycleEvent

nuskey8 · nuskey8 · commit 1d2b69aa546b · 2024-04-15T18:08:24.000+09:00
diff --git a/src/NavStack/Assets/NavStack/Runtime/IPageLifecycleEvent.cs b/src/NavStack/Assets/NavStack/Runtime/IPageLifecycleEvent.cs
@@ -3,7 +3,7 @@
 
 namespace NavStack
 {
-    public interface IPageLifecycle
+    public interface IPageLifecycleEvent
     {
         UniTask OnAttached(CancellationToken cancellationToken = default);
         UniTask OnDetached(CancellationToken cancellationToken = default);
diff --git a/src/NavStack/Assets/NavStack/Runtime/IPageLifecycleEvent.cs.meta b/src/NavStack/Assets/NavStack/Runtime/IPageLifecycleEvent.cs.meta
diff --git a/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationSheetCore.cs b/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationSheetCore.cs
@@ -21,7 +21,7 @@ public sealed class NavigationSheetCore
         public async UniTask AddAsync(IPage page, CancellationToken cancellationToken = default)
         {
             OnPageAttached?.Invoke(page);
-            if (page is IPageLifecycle lifecycle)
+            if (page is IPageLifecycleEvent lifecycle)
             {
                 await lifecycle.OnAttached(cancellationToken);
             }
@@ -37,7 +37,7 @@ public async UniTask RemoveAsync(IPage page, CancellationToken cancellationToken
             if (!remove) throw new InvalidOperationException(); // TODO: add message
 
             OnPageDetached?.Invoke(page);
-            if (page is IPageLifecycle lifecycle)
+            if (page is IPageLifecycleEvent lifecycle)
             {
                 await lifecycle.OnDetached(cancellationToken);
             }
@@ -50,7 +50,7 @@ public UniTask RemoveAllAsync(CancellationToken cancellationToken = default)
             {
                 var page = pages[i];
                 OnPageDetached?.Invoke(page); // TODO: fix callback timing
-                array[i] = page is IPageLifecycle lifecycle ? lifecycle.OnDetached(cancellationToken) : UniTask.CompletedTask;
+                array[i] = page is IPageLifecycleEvent lifecycle ? lifecycle.OnDetached(cancellationToken) : UniTask.CompletedTask;
             }
 
             activePage = null;
diff --git a/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationStackCore.cs b/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationStackCore.cs
@@ -61,11 +61,11 @@ public async UniTask PopAsync(INavigation navigation, NavigationContext context,
                 {
                     task2 = navigationAware2.OnNavigatedFrom(copiedContext, cancellationToken);
                 }
-                
+
                 await UniTask.WhenAll(task1, task2);
 
                 OnPageDetached?.Invoke(page);
-                if (page is IPageLifecycle pageLifecycle)
+                if (page is IPageLifecycleEvent pageLifecycle)
                 {
                     await pageLifecycle.OnDetached(cancellationToken);
                 }
@@ -80,7 +80,7 @@ public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> page
         {
             var copiedContext = context.CreateCopy();
             copiedContext.Options = context.Options ?? navigation.DefaultOptions;
-            
+
             if (isRunning)
             {
                 switch (copiedContext.Options.AwaitOperation)
@@ -102,7 +102,7 @@ public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> page
                 var page = await pageFactory();
 
                 OnPageAttached?.Invoke(page);
-                if (page is IPageLifecycle pageLifecycle)
+                if (page is IPageLifecycleEvent pageLifecycle)
                 {
                     await pageLifecycle.OnAttached(cancellationToken);
                 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace NavStack`
`5`	`5`	`{`
`6`		`- public interface IPageLifecycle`
	`6`	`+ public interface IPageLifecycleEvent`
`7`	`7`	`{`
`8`	`8`	`UniTask OnAttached(CancellationToken cancellationToken = default);`
`9`	`9`	`UniTask OnDetached(CancellationToken cancellationToken = default);`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public sealed class NavigationSheetCore`
`21`	`21`	`public async UniTask AddAsync(IPage page, CancellationToken cancellationToken = default)`
`22`	`22`	`{`
`23`	`23`	`OnPageAttached?.Invoke(page);`
`24`		`- if (page is IPageLifecycle lifecycle)`
	`24`	`+ if (page is IPageLifecycleEvent lifecycle)`
`25`	`25`	`{`
`26`	`26`	`await lifecycle.OnAttached(cancellationToken);`
`27`	`27`	`}`
`@@ -37,7 +37,7 @@ public async UniTask RemoveAsync(IPage page, CancellationToken cancellationToken`
`37`	`37`	`if (!remove) throw new InvalidOperationException(); // TODO: add message`
`38`	`38`
`39`	`39`	`OnPageDetached?.Invoke(page);`
`40`		`- if (page is IPageLifecycle lifecycle)`
	`40`	`+ if (page is IPageLifecycleEvent lifecycle)`
`41`	`41`	`{`
`42`	`42`	`await lifecycle.OnDetached(cancellationToken);`
`43`	`43`	`}`
`@@ -50,7 +50,7 @@ public UniTask RemoveAllAsync(CancellationToken cancellationToken = default)`
`50`	`50`	`{`
`51`	`51`	`var page = pages[i];`
`52`	`52`	`OnPageDetached?.Invoke(page); // TODO: fix callback timing`
`53`		`- array[i] = page is IPageLifecycle lifecycle ? lifecycle.OnDetached(cancellationToken) : UniTask.CompletedTask;`
	`53`	`+ array[i] = page is IPageLifecycleEvent lifecycle ? lifecycle.OnDetached(cancellationToken) : UniTask.CompletedTask;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`activePage = null;`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,11 @@ public async UniTask PopAsync(INavigation navigation, NavigationContext context,`
`61`	`61`	`{`
`62`	`62`	`task2 = navigationAware2.OnNavigatedFrom(copiedContext, cancellationToken);`
`63`	`63`	`}`
`64`		`-`
	`64`	`+`
`65`	`65`	`await UniTask.WhenAll(task1, task2);`
`66`	`66`
`67`	`67`	`OnPageDetached?.Invoke(page);`
`68`		`- if (page is IPageLifecycle pageLifecycle)`
	`68`	`+ if (page is IPageLifecycleEvent pageLifecycle)`
`69`	`69`	`{`
`70`	`70`	`await pageLifecycle.OnDetached(cancellationToken);`
`71`	`71`	`}`
`@@ -80,7 +80,7 @@ public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> page`
`80`	`80`	`{`
`81`	`81`	`var copiedContext = context.CreateCopy();`
`82`	`82`	`copiedContext.Options = context.Options ?? navigation.DefaultOptions;`
`83`		`-`
	`83`	`+`
`84`	`84`	`if (isRunning)`
`85`	`85`	`{`
`86`	`86`	`switch (copiedContext.Options.AwaitOperation)`
`@@ -102,7 +102,7 @@ public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> page`
`102`	`102`	`var page = await pageFactory();`
`103`	`103`
`104`	`104`	`OnPageAttached?.Invoke(page);`
`105`		`- if (page is IPageLifecycle pageLifecycle)`
	`105`	`+ if (page is IPageLifecycleEvent pageLifecycle)`
`106`	`106`	`{`
`107`	`107`	`await pageLifecycle.OnAttached(cancellationToken);`
`108`	`108`	`}`