Merge pull request #1145 from cocoa-mhlw/feature/splash-transition

起動時にサービス終了画面へ遷移するようにする
cocoa-mhlw · Sep 19, 2022 · 30da086 · 30da086
2 parents d5485de + df690d0
commit 30da086
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 28 deletions.
diff --git a/Covid19Radar/Covid19Radar.Android/MainActivity.cs b/Covid19Radar/Covid19Radar.Android/MainActivity.cs
@@ -122,12 +122,12 @@ private async Task NavigateToDestinationFromIntent(Intent intent)
                 else
                 {
                     _loggerService.Value.Error("Failed to navigate NotifyOtherPage with invalid processingNumber");
-                    await AppInstance?.NavigateToSplashAsync(Destination.HomePage, new NavigationParameters());
+                    await AppInstance?.NavigateToSplashAsync(Destination.EndOfServiceNotice, new NavigationParameters());
                 }
             }
             else if (intent.HasExtra(EXTRA_KEY_DESTINATION))
             {
-                int ordinal = intent.GetIntExtra(EXTRA_KEY_DESTINATION, (int)Destination.HomePage);
+                int ordinal = intent.GetIntExtra(EXTRA_KEY_DESTINATION, (int)Destination.EndOfServiceNotice);
                 var destination = (Destination)Enum.ToObject(typeof(Destination), ordinal);
 
                 _loggerService.Value.Info($"Intent has destination: {destination}");
@@ -137,7 +137,7 @@ private async Task NavigateToDestinationFromIntent(Intent intent)
             }
             else
             {
-                await AppInstance?.NavigateToSplashAsync(Destination.HomePage, new NavigationParameters());
+                await AppInstance?.NavigateToSplashAsync(Destination.EndOfServiceNotice, new NavigationParameters());
             }
 
             _loggerService.Value.EndMethod();

diff --git a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
@@ -112,7 +112,7 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary launchOpt
 
             if (!IsUniversalLinks(launchOptions) && !IsLocalNotification(launchOptions))
             {
-                InvokeOnMainThread(async () => await AppInstance?.NavigateToSplashAsync(Destination.HomePage, new NavigationParameters()));
+                InvokeOnMainThread(async () => await AppInstance?.NavigateToSplashAsync(Destination.EndOfServiceNotice, new NavigationParameters()));
             }
 
             UIApplication.SharedApplication.SetMinimumBackgroundFetchInterval(UIApplication.BackgroundFetchIntervalMinimum);
@@ -247,7 +247,7 @@ private void NavigateUniversalLinks(NSUrl url)
                     else
                     {
                         _loggerService.Value.Error("Failed to navigate NotifyOtherPage with invalid processingNumber");
-                        InvokeOnMainThread(async () => await AppInstance?.NavigateToSplashAsync(Destination.HomePage, new NavigationParameters()));
+                        InvokeOnMainThread(async () => await AppInstance?.NavigateToSplashAsync(Destination.EndOfServiceNotice, new NavigationParameters()));
                     }
                 }
             }

diff --git a/Covid19Radar/Covid19Radar/App.xaml.cs b/Covid19Radar/Covid19Radar/App.xaml.cs
@@ -17,6 +17,8 @@
 using Covid19Radar.Services.Migration;
 using Covid19Radar.Repository;
 using DryIoc;
+using Covid19Radar.Views.EndOfService;
+using Covid19Radar.Model;
 
 /*
  * Our mission...is
@@ -187,6 +189,10 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
             containerRegistry.RegisterForNavigation<HowToReceiveProcessingNumberPage>();
             containerRegistry.RegisterForNavigation<WebAccessibilityPolicyPage>();
             containerRegistry.RegisterForNavigation<TroubleshootingPage>();
+
+            // End of service
+            containerRegistry.RegisterForNavigation<EndOfServiceNoticePage>();
+            containerRegistry.RegisterForNavigation<EndOfServicePage>();
         }
 
         private static void RegisterCommonTypes(IContainer container)

diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj
@@ -28,6 +28,7 @@
     <None Remove="Controls\**" />
     <None Remove="ViewModels\ExposureCheckPage\" />
     <None Remove="Polly" />
+    <None Remove="Views\EndOfService\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -141,6 +142,7 @@
     <Folder Include="Controls\" />
     <Folder Include="Services\Migration\" />
     <Folder Include="Repository\" />
+    <Folder Include="Views\EndOfService\" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='Release'">
     <Compile Remove="ViewModels/Settings/DebugPageViewModel.cs" />

diff --git a/Covid19Radar/Covid19Radar/Destination.cs b/Covid19Radar/Covid19Radar/Destination.cs
@@ -2,34 +2,35 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+using System;
 using Covid19Radar.Views;
+using Covid19Radar.Views.EndOfService;
 using Xamarin.Forms;
 
 namespace Covid19Radar
 {
     public enum Destination : int
     {
         SplashPage,
-        HomePage,
         ContactedNotifyPage,
         NotifyOtherPage,
+        EndOfServiceNotice,
+        EndOfService,
     }
 
     public static class DestinationExtensions
     {
         private static string SplashPagePath = "/" + nameof(SplashPage);
-        private static string HomePagePath => "/" + nameof(MenuPage) + "/" + nameof(NavigationPage) + "/" + nameof(HomePage);
-        private static string ContactedNotifyPagePath => HomePagePath + "/" + nameof(ContactedNotifyPage);
-        private static string NotifyOtherPagePath => HomePagePath + "/" + nameof(NotifyOtherPage);
+        private static string EndOfServiceNoticePath => $"/{nameof(MenuPage)}/{nameof(NavigationPage)}/{nameof(EndOfServiceNoticePage)}";
+        private static string EndOfServicePath => $"/{nameof(EndOfServicePage)}";
 
         public static string ToPath(this Destination destination)
         {
             return destination switch
             {
                 Destination.SplashPage => SplashPagePath,
-                Destination.HomePage => HomePagePath,
-                Destination.ContactedNotifyPage => ContactedNotifyPagePath,
-                Destination.NotifyOtherPage => NotifyOtherPagePath,
+                Destination.EndOfServiceNotice => EndOfServiceNoticePath,
+                Destination.EndOfService => EndOfServicePath,
                 _ => throw new System.NotImplementedException()
             };
         }

diff --git a/Covid19Radar/Covid19Radar/Services/SplashNavigationService.cs b/Covid19Radar/Covid19Radar/Services/SplashNavigationService.cs
@@ -55,7 +55,7 @@ public async Task<INavigationResult> NavigateNextAsync(bool isSetupLaterEventLog
                 }
                 else
                 {
-                    name = $"/{nameof(TutorialPage1)}";
+                    name = Destination.EndOfService.ToPath();
                     parameters = null;
                 }
 

diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs
@@ -240,7 +240,7 @@ await UserDialogs.Instance.AlertAsync(
                         AppResources.NotifyOtherPageDialogReturnHomeTitle,
                         AppResources.ButtonOk
                     );
-                    await NavigationService.NavigateAsync(Destination.HomePage.ToPath());
+                    //await NavigationService.NavigateAsync(Destination.HomePage.ToPath());
 
                     loggerService.Error($"Exceeded the number of trials.");
                     return;

diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/SplashPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/SplashPageViewModel.cs
@@ -36,7 +36,7 @@ public override async void OnNavigatedTo(INavigationParameters parameters)
 
             await _migrationService.MigrateAsync();
 
-            Destination destination = Destination.HomePage;
+            Destination destination = Destination.EndOfServiceNotice;
             if (parameters.ContainsKey(SplashPage.DestinationKey))
             {
                 destination = parameters.GetValue<Destination>(SplashPage.DestinationKey);

diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/SubmitDiagnosisKeysCompletePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/SubmitDiagnosisKeysCompletePageViewModel.cs
@@ -17,7 +17,7 @@ INavigationService navigationService
 
         public Command OnToHomeButton => new Command(async () =>
         {
-            _ = await NavigationService.NavigateAsync(Destination.HomePage.ToPath());
+            //_ = await NavigationService.NavigateAsync(Destination.HomePage.ToPath());
         });
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServiceNoticePage.xaml b/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServiceNoticePage.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Covid19Radar.Views.EndOfService.EndOfServiceNoticePage">
+    <ContentPage.Content>
+        <Label Text="EndOfServiceNoticePage" />
+    </ContentPage.Content>
+</ContentPage>
+
diff --git a/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServiceNoticePage.xaml.cs b/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServiceNoticePage.xaml.cs
@@ -0,0 +1,19 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+using System;
+using System.Collections.Generic;
+
+using Xamarin.Forms;
+
+namespace Covid19Radar.Views.EndOfService
+{
+    public partial class EndOfServiceNoticePage : ContentPage
+    {
+        public EndOfServiceNoticePage()
+        {
+            InitializeComponent();
+        }
+    }
+}
+
diff --git a/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServicePage.xaml b/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServicePage.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Covid19Radar.Views.EndOfService.EndOfServicePage">
+    <ContentPage.Content>
+        <Label Text="EndOfServicePage" />
+    </ContentPage.Content>
+</ContentPage>
+
diff --git a/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServicePage.xaml.cs b/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServicePage.xaml.cs
@@ -0,0 +1,19 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+using System;
+using System.Collections.Generic;
+
+using Xamarin.Forms;
+
+namespace Covid19Radar.Views.EndOfService
+{
+    public partial class EndOfServicePage : ContentPage
+    {
+        public EndOfServicePage()
+        {
+            InitializeComponent();
+        }
+    }
+}
+
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/SplashNavigationServiceTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/SplashNavigationServiceTests.cs
@@ -22,12 +22,6 @@ public class SplashNavigationServiceTests
         private readonly Mock<IUserDataRepository> mockUserDataRepository;
         private readonly Mock<ILoggerService> mockLoggerService;
 
-        private readonly TermsUpdateInfoModel _termsUpdateInfoDefault = new TermsUpdateInfoModel
-        {
-            TermsOfService = new TermsUpdateInfoModel.Detail { Text = "Test: Terms of service", UpdateDateTimeJst = DateTime.Now },
-            PrivacyPolicy = new TermsUpdateInfoModel.Detail { Text = "Test: Privacy policy", UpdateDateTimeJst = DateTime.Now }
-        };
-
         public SplashNavigationServiceTests()
         {
             mockRepository = new MockRepository(MockBehavior.Default);
@@ -45,27 +39,27 @@ public SplashNavigationService CreateService()
         }
 
         [Fact]
-        public async Task NavigateNextAsyncTest_Tutorial()
+        public async Task NavigateNextAsyncTest_EndOfServicePage()
         {
             SplashNavigationService unitUnderTest = CreateService();
 
-            unitUnderTest.Destination = Destination.HomePage;
+            unitUnderTest.Destination = Destination.EndOfServiceNotice;
             unitUnderTest.DestinationPageParameters = new NavigationParameters();
 
             mockUserDataRepository.Setup(x => x.IsAllAgreed()).Returns(false);
 
             await unitUnderTest.NavigateNextAsync();
 
             mockUserDataRepository.Verify(x => x.IsAllAgreed(), Times.Once());
-            mockNavigatoinService.Verify(x => x.NavigateAsync("/TutorialPage1", It.IsAny<INavigationParameters>()), Times.Once());
+            mockNavigatoinService.Verify(x => x.NavigateAsync("/EndOfServicePage", It.IsAny<INavigationParameters>()), Times.Once());
         }
 
         [Fact]
         public async Task NavigateNextAsyncTest_Destination()
         {
             SplashNavigationService unitUnderTest = CreateService();
 
-            unitUnderTest.Destination = Destination.HomePage;
+            unitUnderTest.Destination = Destination.EndOfServiceNotice;
             unitUnderTest.DestinationPageParameters = new NavigationParameters { { "test-key", "test-value" } };
 
             mockUserDataRepository.Setup(x => x.IsAllAgreed()).Returns(true);
@@ -74,7 +68,7 @@ public async Task NavigateNextAsyncTest_Destination()
 
             mockUserDataRepository.Verify(x => x.IsAllAgreed(), Times.Once());
             mockNavigatoinService.Verify(x => x.NavigateAsync(
-                Destination.HomePage.ToPath(),
+                Destination.EndOfServiceNotice.ToPath(),
                 It.Is<INavigationParameters>(x =>
                     x.ContainsKey("test-key") &&
                     x.GetValue<string>("test-key") == "test-value")),

diff --git a/...19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/NotifyOtherPageViewModelTests.cs b/...19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/NotifyOtherPageViewModelTests.cs
@@ -118,7 +118,7 @@ public void CheckRegisterButtonMaxErrorCountReturnHomeTest()
                 null
             ), Times.Once());
 
-            mockNavigationService.Verify(x => x.NavigateAsync("/MenuPage/NavigationPage/HomePage"), Times.Once());
+            //mockNavigationService.Verify(x => x.NavigateAsync("/MenuPage/NavigationPage/HomePage"), Times.Once());
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                     else
                     {
-                        name = $"/{nameof(TutorialPage1)}";
+                        name = Destination.EndOfService.ToPath();
                         parameters = null;
                     }
@@ Expand Down @@