diff --git a/Covid19Radar/Covid19Radar/Destination.cs b/Covid19Radar/Covid19Radar/Destination.cs index 387308600..7c40584dc 100644 --- a/Covid19Radar/Covid19Radar/Destination.cs +++ b/Covid19Radar/Covid19Radar/Destination.cs @@ -20,7 +20,7 @@ public static class DestinationExtensions { private static string SplashPagePath = "/" + nameof(SplashPage); private static string EndOfServiceNoticePath => $"/{nameof(MenuPage)}/{nameof(NavigationPage)}/{nameof(EndOfServiceNoticePage)}"; - private static string EndOfServicePath => $"/{nameof(EndOfServicePage)}"; + private static string EndOfServicePath => $"/{nameof(NavigationPage)}/{nameof(EndOfServicePage)}"; public static string ToPath(this Destination destination) { diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs index 97331c3c5..e18b23cf6 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs @@ -589,6 +589,15 @@ public static string EndOfServiceNotificationContent { } } + /// + /// Looks up a localized string similar to About this app. + /// + public static string EndOfServicePageAboutAppTextLink { + get { + return ResourceManager.GetString("EndOfServicePageAboutAppTextLink", resourceCulture); + } + } + /// /// Looks up a localized string similar to Functionality of the COCOA contact-confirming app ended in November 2022. Thank you for using the app.​. /// diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx index b177e7671..f5605edcf 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx @@ -1510,6 +1510,10 @@ COCOAのソースコードは次のURLから入手できます。 詳細を確認する 詳細を確認する + + このアプリについて + このアプリについて + 機能停止の確認 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx index 1f1a088b7..c391b1e59 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.resx @@ -1616,6 +1616,10 @@ By collecting the number of notifications, we can use it to understand how many Check the Details 詳細を確認する + + About this app + このアプリについて + Confirm to end COCOA diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx index b55615d4a..b3d81c332 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx @@ -1514,6 +1514,10 @@ COCOAのソースコードは次のURLから入手できます。 确认详情​ 詳細を確認する + + 关于本应用 + このアプリについて + 确认功能关停​ diff --git a/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServicePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServicePageViewModel.cs index df9e21ad0..e6dee18e5 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServicePageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServicePageViewModel.cs @@ -3,6 +3,7 @@ // file, You can obtain one at https://mozilla.org/MPL/2.0/. using Covid19Radar.Common; using Covid19Radar.Resources; +using Covid19Radar.Views; using Prism.Navigation; using Xamarin.Essentials; using Xamarin.Forms; @@ -12,6 +13,7 @@ namespace Covid19Radar.ViewModels.EndOfService public class EndOfServicePageViewModel : ViewModelBase { public string CheckDetailsLinkReadText => $"{AppResources.EndOfServicePageTextLink} {AppResources.Button}"; + public string AboutAppLinkReadText => $"{AppResources.EndOfServicePageAboutAppTextLink} {AppResources.Button}"; public EndOfServicePageViewModel(INavigationService navigationService) : base(navigationService) { @@ -21,6 +23,11 @@ public EndOfServicePageViewModel(INavigationService navigationService) : base(na { await Browser.OpenAsync(AppConstants.EndOfServiceCheckDetailsUrl, BrowserLaunchMode.SystemPreferred); }); + + public Command AboutAppCommand => new Command(async () => + { + await NavigationService.NavigateAsync(nameof(SettingsPage)); + }); } } diff --git a/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServicePage.xaml b/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServicePage.xaml index 153e9939d..e3a99f33a 100644 --- a/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServicePage.xaml +++ b/Covid19Radar/Covid19Radar/Views/EndOfService/EndOfServicePage.xaml @@ -11,6 +11,7 @@ xmlns:prism="http://prismlibrary.com" xmlns:resources="clr-namespace:Covid19Radar.Resources;assembly=Covid19Radar" Title="{x:Static resources:AppResources.EndOfServicePageTitle}" + NavigationPage.HasNavigationBar="False" ios:Page.UseSafeArea="true" prism:ViewModelLocator.AutowireViewModel="True" Style="{StaticResource DefaultPageStyle}" @@ -49,6 +50,18 @@ + diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/SplashNavigationServiceTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/SplashNavigationServiceTests.cs index eecc8aa4a..05b4d9d4d 100644 --- a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/SplashNavigationServiceTests.cs +++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/SplashNavigationServiceTests.cs @@ -51,7 +51,7 @@ public async Task NavigateNextAsyncTest_EndOfServicePage() await unitUnderTest.NavigateNextAsync(); mockUserDataRepository.Verify(x => x.IsAllAgreed(), Times.Once()); - mockNavigatoinService.Verify(x => x.NavigateAsync("/EndOfServicePage", It.IsAny()), Times.Once()); + mockNavigatoinService.Verify(x => x.NavigateAsync("/NavigationPage/EndOfServicePage", It.IsAny()), Times.Once()); } [Fact]