From 7ba691be3c9f5e877c1e78bf6e602eafdf27eccc Mon Sep 17 00:00:00 2001
From: "I.Maruyama" <i-maruyama@fit.ac.jp>
Date: Thu, 27 May 2021 23:54:15 +0900
Subject: [PATCH 1/2] ready for issue
 https://github.com/cocoa-mhlw/cocoa/issues/198

---
 .../ViewModels/HomePage/NotContactPageViewModel.cs          | 6 +++++-
 .../Covid19Radar/Views/HomePage/NotContactPage.xaml         | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotContactPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotContactPageViewModel.cs
index 6d9bc50ff..cb3b15019 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotContactPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotContactPageViewModel.cs
@@ -2,6 +2,7 @@
  * 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.Common;
 using Covid19Radar.Services;
 using Covid19Radar.Services.Logs;
@@ -13,7 +14,10 @@ namespace Covid19Radar.ViewModels
     public class NotContactPageViewModel : ViewModelBase
     {
         private readonly ILoggerService loggerService;
-
+        public string NowDate
+        {
+            get { return DateTime.Now.ToLocalTime().ToString("D"); }
+        }
         public NotContactPageViewModel(INavigationService navigationService, ILoggerService loggerService, IUserDataService userDataService) : base(navigationService)
         {
             Title = Resources.AppResources.TitileUserStatusSettings;
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml
index 48a8e5a48..edcdd7c6a 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml
@@ -27,6 +27,8 @@
                 <Label HorizontalOptions="Center" Style="{StaticResource DefaultTitleLabel}">
                     <Label.FormattedText>
                         <FormattedString>
+                            <Span Text="{Binding NowDate}" />
+                            <Span Text="&#xa;" />
                             <Span Text="{x:Static resources:AppResources.NotContactPageLabel1}" />
                         </FormattedString>
                     </Label.FormattedText>
@@ -57,4 +59,4 @@
             </Grid>
         </Grid>
     </ScrollView>
-</ContentPage>
\ No newline at end of file
+</ContentPage>

From 326e77c885f2b9fcaa400e59b16cd706c23f796c Mon Sep 17 00:00:00 2001
From: "I.Maruyama" <i-maruyama@fit.ac.jp>
Date: Wed, 9 Jun 2021 21:41:49 +0900
Subject: [PATCH 2/2] ContactPage add c.f. 
 https://github.com/cocoa-mhlw/cocoa/issues/198#issuecomment-857660416

---
 .../HomePage/ContactedNotifyPageViewModel.cs        |  5 +++++
 .../Views/HomePage/ContactedNotifyPage.xaml         | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
index f80b11ca8..83456e94f 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
@@ -8,6 +8,7 @@
 using Xamarin.Forms;
 using Xamarin.Essentials;
 using Covid19Radar.Resources;
+using System;
 
 namespace Covid19Radar.ViewModels
 {
@@ -20,6 +21,10 @@ public string ExposureCount
             get { return _exposureCount; }
             set { SetProperty(ref _exposureCount, value); }
         }
+        public string NowDate
+        {
+            get { return DateTime.Now.ToLocalTime().ToString("D"); }
+        }
 
         public ContactedNotifyPageViewModel(INavigationService navigationService, ILoggerService loggerService, IExposureNotificationService exposureNotificationService) : base(navigationService)
         {
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
index f38ed2c0e..5c8939996 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
@@ -32,8 +32,15 @@
                         Source="InfoMark.png" />
                     <Label
                         Margin="0,0,0,5"
-                        Style="{StaticResource DefaultTitleLabel}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageMainText}" />
+                        Style="{StaticResource DefaultTitleLabel}" >
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="{Binding NowDate}" />
+                                <Span Text="&#xa;" />
+                                <Span Text="{x:Static resources:AppResources.ContactedNotifyPageMainText}" />
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
                     <Label
                         Margin="0,0,0,5"
                         FontSize="Large"
@@ -66,4 +73,4 @@
                 Text="{x:Static resources:AppResources.ContactedNotifyPageButton1}" />
         </StackLayout>
     </ScrollView>
-</ContentPage>
\ No newline at end of file
+</ContentPage>