From 9134b9d96424b7f14257805ddd3e0a79066c5795 Mon Sep 17 00:00:00 2001
From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com>
Date: Tue, 29 Mar 2022 09:43:30 +0900
Subject: [PATCH 1/4] Refactor layout of ContactedNotifyPage

---
 .../HomePage/ContactedNotifyPageViewModel.cs  |   4 +-
 .../Views/HomePage/ContactedNotifyPage.xaml   | 182 +++++++++---------
 2 files changed, 88 insertions(+), 98 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
index b49b1d176..c2b2c6ef8 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
@@ -24,14 +24,14 @@ public class ContactedNotifyPageViewModel : ViewModelBase
 
         private readonly IExposureRiskCalculationConfigurationRepository _exposureRiskCalculationConfigurationRepository;
 
-        private string _exposureDurationInMinutes;
+        private string _exposureDurationInMinutes = "";
         public string ExposureDurationInMinutes
         {
             get { return _exposureDurationInMinutes; }
             set { SetProperty(ref _exposureDurationInMinutes, value); }
         }
 
-        private string _exposureCount;
+        private string _exposureCount = "";
         public string ExposureCount
         {
             get { return _exposureCount; }
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
index 947f73fdf..ca9e7824d 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
@@ -7,7 +7,6 @@
     x:Class="Covid19Radar.Views.ContactedNotifyPage"
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:ffimageloading="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
     xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
     xmlns:prism="http://prismlibrary.com"
     xmlns:resources="clr-namespace:Covid19Radar.Resources"
@@ -21,100 +20,91 @@
         https://github.com/xamarin/Xamarin.Forms/issues/13597
     -->
     <ContentView>
-    <ScrollView>
-        <StackLayout
-            Padding="10"
-            BackgroundColor="#FFFFFF"
-            Spacing="10">
-            <Frame
-                Padding="16"
-                BackgroundColor="#FFF3DD"
-                CornerRadius="10">
-                <StackLayout>
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="0,10,0,5"
-                        Style="{StaticResource DefaultTitleLabel}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageMainText}"
-                        >
-                    </Label>
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="0,0,0,5"
-                        FontSize="Large"
-                        HorizontalTextAlignment="Center"
-                        Style="{StaticResource DefaultTitleLabel}">
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span Text="{Binding ExposureDurationInMinutes}" />
-                            </FormattedString>
-                        </Label.FormattedText>
-                    </Label>
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="0,0,0,5"
-                        FontSize="Large"
-                        HorizontalTextAlignment="Center"
-                        Style="{StaticResource DefaultTitleLabel}">
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span Text="{Binding ExposureCount}" />
-                            </FormattedString>
-                        </Label.FormattedText>
-                    </Label>
-
-                    <Button
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="0,0,0,20"
-                        Command="{prism:NavigateTo 'ExposuresPage'}"
-                        Style="{StaticResource DefaultButton}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageButton1}" />
-
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="0, 15, 0, 5"
-                        HorizontalTextAlignment="Start"
-                        Style="{StaticResource DefaultLabelSmall}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription2}" />
-
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="5, 5, 0, 0"
-                        HorizontalTextAlignment="Start"
-                        Style="{StaticResource DefaultLabelSmall}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription3}" />
-
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="5, 5, 0, 0"
-                        HorizontalTextAlignment="Start"
-                        Style="{StaticResource DefaultLabelSmall}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription4}" />
-
-                     <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="5, 5, 0, 0"
-                        HorizontalTextAlignment="Start"
-                        Style="{StaticResource DefaultLabelSmall}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription5}" />
-
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="0, 25, 0, 10"
-                        HorizontalTextAlignment="Start"
-                        Style="{StaticResource DefaultSubTitleLabel}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1}" />
-
-                    <Button
-                        AutomationProperties.IsInAccessibleTree="True"
-                        Margin="0,15,0,20"
-                        Command="{Binding Path=OnClickByForm}"
-                        Style="{StaticResource DefaultButton}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageButton2}" />
-
-                </StackLayout>
-            </Frame>
-        </StackLayout>
-    </ScrollView>
+        <ScrollView>
+            <StackLayout
+                Spacing="10">
+                <Frame
+                    Margin="10"
+                    Padding="16"
+                    BackgroundColor="#FFF3DD"
+                    CornerRadius="10">
+                    <StackLayout
+                        Spacing="20">
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            Style="{StaticResource DefaultTitleLabel}"
+                            Text="{x:Static resources:AppResources.ContactedNotifyPageMainText}" />
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            FontSize="Large"
+                            HorizontalTextAlignment="Center"
+                            Style="{StaticResource DefaultTitleLabel}"
+                            Text="{Binding ExposureDurationInMinutes}">
+                            <Label.Triggers>
+                                <DataTrigger
+                                    TargetType="Label"
+                                    Binding="{Binding ExposureDurationInMinutes}"
+                                    Value="">
+                                    <Setter Property="IsVisible" Value="False" />
+                                </DataTrigger>
+                            </Label.Triggers>
+                        </Label>
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            FontSize="Large"
+                            HorizontalTextAlignment="Center"
+                            Style="{StaticResource DefaultTitleLabel}"
+                            Text="{Binding ExposureCount}">
+                            <Label.Triggers>
+                                <DataTrigger
+                                    TargetType="Label"
+                                    Binding="{Binding ExposureCount}"
+                                    Value="">
+                                    <Setter Property="IsVisible" Value="False" />
+                                </DataTrigger>
+                            </Label.Triggers>
+                        </Label>
+                        <Button
+                            AutomationProperties.IsInAccessibleTree="True"
+                            Command="{prism:NavigateTo 'ExposuresPage'}"
+                            Style="{StaticResource DefaultButton}"
+                            Text="{x:Static resources:AppResources.ContactedNotifyPageButton1}" />
+                        <StackLayout
+                            Spacing="10">
+                            <Label
+                                AutomationProperties.IsInAccessibleTree="True"
+                                HorizontalTextAlignment="Start"
+                                Style="{StaticResource DefaultLabelSmall}"
+                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription2}" />
+                            <Label
+                                AutomationProperties.IsInAccessibleTree="True"
+                                HorizontalTextAlignment="Start"
+                                Style="{StaticResource DefaultLabelSmall}"
+                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription3}" />
+                            <Label
+                                AutomationProperties.IsInAccessibleTree="True"
+                                HorizontalTextAlignment="Start"
+                                Style="{StaticResource DefaultLabelSmall}"
+                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription4}" />
+                            <Label
+                                AutomationProperties.IsInAccessibleTree="True"
+                                HorizontalTextAlignment="Start"
+                                Style="{StaticResource DefaultLabelSmall}"
+                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription5}" />
+                        </StackLayout>
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            HorizontalTextAlignment="Start"
+                            Style="{StaticResource DefaultSubTitleLabel}"
+                            Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1}" />
+                        <Button
+                            AutomationProperties.IsInAccessibleTree="True"
+                            Command="{Binding Path=OnClickByForm}"
+                            Style="{StaticResource DefaultButton}"
+                            Text="{x:Static resources:AppResources.ContactedNotifyPageButton2}" />
+                    </StackLayout>
+                </Frame>
+            </StackLayout>
+        </ScrollView>
     </ContentView>
 </ContentPage>

From 6254bae7c073966f0e63aa233ac191652e939a76 Mon Sep 17 00:00:00 2001
From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com>
Date: Tue, 29 Mar 2022 11:30:52 +0900
Subject: [PATCH 2/4] Fixed text of ContactedNotifyPage

---
 Covid19Radar/Covid19Radar/App.xaml            |  3 ++
 .../Resources/AppResources.Designer.cs        | 22 +++++++-----
 .../Resources/AppResources.ja.resx            | 27 +++++++-------
 .../Covid19Radar/Resources/AppResources.resx  | 32 +++++++++--------
 .../Resources/AppResources.zh-Hans.resx       | 35 ++++++++++---------
 .../Views/HomePage/ContactedNotifyPage.xaml   | 15 +++++---
 6 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/App.xaml b/Covid19Radar/Covid19Radar/App.xaml
index 1b5940d67..d967a8049 100644
--- a/Covid19Radar/Covid19Radar/App.xaml
+++ b/Covid19Radar/Covid19Radar/App.xaml
@@ -312,6 +312,9 @@
             <Style x:Key="AnnotationLabel" TargetType="Label" BasedOn="{StaticResource DefaultLabelSmall}">
                 <Setter Property="TextColor" Value="{StaticResource SecondaryText}" />
             </Style>
+            <Style x:Key="AnnotationLabelDark" TargetType="Label" BasedOn="{StaticResource DefaultLabelSmall}">
+                <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
+            </Style>
 
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs
index 6f6b6d383..3db578132 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs
@@ -1091,27 +1091,33 @@ public static string ContactedNotifyPageDescription1 {
             }
         }
         
-        public static string ContactedNotifyPageDescription2 {
+        public static string ContactedNotifyPageDescription1_1 {
             get {
-                return ResourceManager.GetString("ContactedNotifyPageDescription2", resourceCulture);
+                return ResourceManager.GetString("ContactedNotifyPageDescription1_1", resourceCulture);
+            }
+        }
+        
+        public static string ContactedNotifyPageDescription1_2 {
+            get {
+                return ResourceManager.GetString("ContactedNotifyPageDescription1_2", resourceCulture);
             }
         }
         
-        public static string ContactedNotifyPageDescription3 {
+        public static string ContactedNotifyPageDescription1_3 {
             get {
-                return ResourceManager.GetString("ContactedNotifyPageDescription3", resourceCulture);
+                return ResourceManager.GetString("ContactedNotifyPageDescription1_3", resourceCulture);
             }
         }
         
-        public static string ContactedNotifyPageDescription4 {
+        public static string ContactedNotifyPageDescription2 {
             get {
-                return ResourceManager.GetString("ContactedNotifyPageDescription4", resourceCulture);
+                return ResourceManager.GetString("ContactedNotifyPageDescription2", resourceCulture);
             }
         }
         
-        public static string ContactedNotifyPageDescription5 {
+        public static string ContactedNotifyPageHighRiskActionAnnotationText {
             get {
-                return ResourceManager.GetString("ContactedNotifyPageDescription5", resourceCulture);
+                return ResourceManager.GetString("ContactedNotifyPageHighRiskActionAnnotationText", resourceCulture);
             }
         }
         
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
index d72564457..43f283594 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
@@ -679,28 +679,31 @@
     <comment>検査等の相談先を探す</comment>
   </data>
   <data name="ContactedNotifyPageDescription1" xml:space="preserve">
-    <value>症状がない場合、
-陽性者と接触した心当たりがない場合は、
-感染対策に留意しつつ普段通りの生活をお送りください。
-ただし、体調に変化があった場合は、受診を検討ください。</value>
-    <comment>症状がない場合、陽性者と接触した心当たりがない場合は、感染対策に留意しつつ普段通りの生活をお送りください。ただし、体調に変化があった場合は、受診を検討ください。</comment>
-  </data>
-  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
     <value>次のいずれかに当てはまる方は、アプリの案内に従い、診療・検査医療機関等への受診を検討ください。</value>
     <comment>次のいずれかに当てはまる方は、アプリの案内に従い、診療・検査医療機関等への受診を検討ください。</comment>
   </data>
-  <data name="ContactedNotifyPageDescription3" xml:space="preserve">
+  <data name="ContactedNotifyPageDescription1_1" xml:space="preserve">
     <value>・発熱等の症状や基礎疾患がある</value>
     <comment>・発熱等の症状や基礎疾患がある</comment>
   </data>
-  <data name="ContactedNotifyPageDescription4" xml:space="preserve">
-    <value>・陽性者と接触した心当たりがある</value>
-    <comment>・陽性者と接触した心当たりがある</comment>
+  <data name="ContactedNotifyPageDescription1_2" xml:space="preserve">
+    <value>・感染リスクの高い行動（※）をとった</value>
+    <comment>・感染リスクの高い行動（※）をとった</comment>
   </data>
-  <data name="ContactedNotifyPageDescription5" xml:space="preserve">
+  <data name="ContactedNotifyPageDescription1_3" xml:space="preserve">
     <value>・その他、受診を希望する</value>
     <comment>・その他、受診を希望する</comment>
   </data>
+  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
+    <value>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動（※）を控えていただくなど、感染対策に留意しながらお過ごしください。
+ただし、体調に変化があった場合は、受診を検討ください。</value>
+    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動（※）を控えていただくなど、感染対策に留意しながらお過ごしください。
+ただし、体調に変化があった場合は、受診を検討ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageHighRiskActionAnnotationText" xml:space="preserve">
+    <value>（※）大人数や長時間に及ぶ飲食など</value>
+    <comment>（※）大人数や長時間に及ぶ飲食など</comment>
+  </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>確認しました</value>
     <comment>確認しました</comment>
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
index b7ab01d2a..50a28b87f 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
@@ -797,26 +797,30 @@
     <comment>検査等の相談先を探す</comment>
   </data>
   <data name="ContactedNotifyPageDescription1" xml:space="preserve">
-    <value>In case you have no symptoms, or you had no contact with a positive person, please lead a normal life while paying attention to infection prevention measures.​
-However, if your physical condition changes, please consider consulting a doctor.​</value>
-    <comment>症状がない場合、陽性者と接触した心当たりがない場合は、感染対策に留意しつつ普段通りの生活をお送りください。ただし、体調に変化があった場合は、受診を検討ください。</comment>
+    <value>If you fall under any of the following, please consider going to an examination center/ medical institution, etc. according to the guidance of the app</value>
+    <comment>次のいずれかに当てはまる方は、アプリの案内に従い、診療・検査医療機関等への受診を検討ください。</comment>
   </data>
-  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
-    <value>If you fall under any of the below cases, please consider going to a clinic / examination medical institution, etc. according to the guidance of the app.</value>
-    <comment>次のいずれかに当てはまる方は、アプリの案内に従って相談先をご確認ください。</comment>
-  </data>
-  <data name="ContactedNotifyPageDescription3" xml:space="preserve">
-    <value>・Symptoms such as fever and underlying illness​</value>
+  <data name="ContactedNotifyPageDescription1_1" xml:space="preserve">
+    <value>・ Symptoms such as fever and underlying illness</value>
     <comment>・発熱等の症状や基礎疾患がある</comment>
   </data>
-  <data name="ContactedNotifyPageDescription4" xml:space="preserve">
-    <value>・Chance of close contact with a positive person​</value>
-    <comment>・陽性者と接触した心当たりがある</comment>
+  <data name="ContactedNotifyPageDescription1_2" xml:space="preserve">
+    <value>・ Taking actions (*) with a high risk of infection</value>
+    <comment>・感染リスクの高い行動（※）をとった</comment>
   </data>
-  <data name="ContactedNotifyPageDescription5" xml:space="preserve">
-    <value>・Others such as necessity of consult a doctor​</value>
+  <data name="ContactedNotifyPageDescription1_3" xml:space="preserve">
+    <value>・ Others, such as getting a medical examination</value>
     <comment>・その他、受診を希望する</comment>
   </data>
+  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
+    <value>Even if you do not get a medical examination,　we recommend to spend 7 days, from the date of contact, paying attention to infection control measures, such as refraining from contact with individuals with high risk of aggravation like elderly people and avoiding actions (*) with a high risk of infection</value>
+    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動（※）を控えていただくなど、感染対策に留意しながらお過ごしください。
+ただし、体調に変化があった場合は、受診を検討ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageHighRiskActionAnnotationText" xml:space="preserve">
+    <value>(*) Eating and drinking for a long time and with a large numbers of people etc.</value>
+    <comment>（※）大人数や長時間に及ぶ飲食など</comment>
+  </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>Agree</value>
     <comment>確認しました</comment>
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
index 770b74cb7..4b6dbd344 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
@@ -685,28 +685,31 @@
     <comment>検査等の相談先を探す</comment>
   </data>
   <data name="ContactedNotifyPageDescription1" xml:space="preserve">
-    <value>如果没有症状，​
-如果您没有与阳性者接触的印象，请在注意感染控制的同时可以正常的生活。​
-但是，如果您感觉有任何身体变化，请考虑去接受诊疗。
-    </value>
-    <comment>症状がない場合、陽性者と接触した心当たりがない場合は、感染対策に留意しつつ普段通りの生活をお送りください。ただし、体調に変化があった場合は、受診を検討ください。</comment>
+    <value>如果您属于以下任何一种情况，请考虑根据应用的指导去医疗诊断机构。</value>
+    <comment>次のいずれかに当てはまる方は、アプリの案内に従い、診療・検査医療機関等への受診を検討ください。</comment>
   </data>
-  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
-    <value>如果您属于以下任何一种情况，请考虑根据应用的指导去诊疗机构。</value>
-    <comment>次のいずれかに当てはまる方は、アプリの案内に従って相談先をご確認ください。</comment>
-  </data>
-  <data name="ContactedNotifyPageDescription3" xml:space="preserve">
-    <value>・发烧或者有基础疾病</value>
+  <data name="ContactedNotifyPageDescription1_1" xml:space="preserve">
+    <value>・发烧或者有潜在疾病</value>
     <comment>・発熱等の症状や基礎疾患がある</comment>
   </data>
-  <data name="ContactedNotifyPageDescription4" xml:space="preserve">
-    <value>・有与阳性者接触的印象</value>
-    <comment>・陽性者と接触した心当たりがある</comment>
+  <data name="ContactedNotifyPageDescription1_2" xml:space="preserve">
+    <value>・有感染风险高的行为（*）</value>
+    <comment>・感染リスクの高い行動（※）をとった</comment>
   </data>
-  <data name="ContactedNotifyPageDescription5" xml:space="preserve">
-    <value>・其他想接受诊疗的情况</value>
+  <data name="ContactedNotifyPageDescription1_3" xml:space="preserve">
+    <value>・其他想接受诊断的情况</value>
     <comment>・その他、受診を希望する</comment>
   </data>
+  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
+    <value>即使您不去接受诊断，请从接触之日起7天内，注意感染控制措施，例如避免与高危人群（如老年人和容易病情加重的人）接触，避免感染风险高的行为(*)。
+但是，如果您感觉身体有任何变化，请考虑去接受诊断。</value>
+    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動（※）を控えていただくなど、感染対策に留意しながらお過ごしください。
+ただし、体調に変化があった場合は、受診を検討ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageHighRiskActionAnnotationText" xml:space="preserve">
+    <value>(*) 长时间多人聚餐等行为</value>
+    <comment>（※）大人数や長時間に及ぶ飲食など</comment>
+  </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>同意</value>
     <comment>確認しました</comment>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
index ca9e7824d..e08c3ce20 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
@@ -75,28 +75,33 @@
                                 AutomationProperties.IsInAccessibleTree="True"
                                 HorizontalTextAlignment="Start"
                                 Style="{StaticResource DefaultLabelSmall}"
-                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription2}" />
+                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1}" />
                             <Label
                                 AutomationProperties.IsInAccessibleTree="True"
                                 HorizontalTextAlignment="Start"
                                 Style="{StaticResource DefaultLabelSmall}"
-                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription3}" />
+                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1_1}" />
                             <Label
                                 AutomationProperties.IsInAccessibleTree="True"
                                 HorizontalTextAlignment="Start"
                                 Style="{StaticResource DefaultLabelSmall}"
-                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription4}" />
+                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1_2}" />
                             <Label
                                 AutomationProperties.IsInAccessibleTree="True"
                                 HorizontalTextAlignment="Start"
                                 Style="{StaticResource DefaultLabelSmall}"
-                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription5}" />
+                                Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1_3}" />
                         </StackLayout>
                         <Label
                             AutomationProperties.IsInAccessibleTree="True"
                             HorizontalTextAlignment="Start"
                             Style="{StaticResource DefaultSubTitleLabel}"
-                            Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1}" />
+                            Text="{x:Static resources:AppResources.ContactedNotifyPageDescription2}" />
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            HorizontalTextAlignment="Start"
+                            Style="{StaticResource AnnotationLabelDark}"
+                            Text="{x:Static resources:AppResources.ContactedNotifyPageHighRiskActionAnnotationText}" />
                         <Button
                             AutomationProperties.IsInAccessibleTree="True"
                             Command="{Binding Path=OnClickByForm}"

From fff1a0491488e3fc6423118e2b01acb55fa78730 Mon Sep 17 00:00:00 2001
From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com>
Date: Tue, 29 Mar 2022 14:14:09 +0900
Subject: [PATCH 3/4] Fixed text

---
 .../Covid19Radar/Resources/AppResources.ja.resx  |  8 ++++----
 .../Covid19Radar/Resources/AppResources.resx     | 16 ++++++++--------
 .../Resources/AppResources.zh-Hans.resx          | 10 +++++-----
 .../Views/HomePage/ContactedNotifyPage.xaml      | 16 ++++++++--------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
index 43f283594..6e7eee06a 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
@@ -695,14 +695,14 @@
     <comment>・その他、受診を希望する</comment>
   </data>
   <data name="ContactedNotifyPageDescription2" xml:space="preserve">
-    <value>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動（※）を控えていただくなど、感染対策に留意しながらお過ごしください。
+    <value>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動を控えていただくなど、感染対策に留意しながらお過ごしください。
 ただし、体調に変化があった場合は、受診を検討ください。</value>
-    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動（※）を控えていただくなど、感染対策に留意しながらお過ごしください。
+    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動を控えていただくなど、感染対策に留意しながらお過ごしください。
 ただし、体調に変化があった場合は、受診を検討ください。</comment>
   </data>
   <data name="ContactedNotifyPageHighRiskActionAnnotationText" xml:space="preserve">
-    <value>（※）大人数や長時間に及ぶ飲食など</value>
-    <comment>（※）大人数や長時間に及ぶ飲食など</comment>
+    <value>※大人数や長時間に及ぶ飲食など</value>
+    <comment>※大人数や長時間に及ぶ飲食など</comment>
   </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>確認しました</value>
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
index 50a28b87f..968b0db90 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
@@ -797,29 +797,29 @@
     <comment>検査等の相談先を探す</comment>
   </data>
   <data name="ContactedNotifyPageDescription1" xml:space="preserve">
-    <value>If you fall under any of the following, please consider going to an examination center/ medical institution, etc. according to the guidance of the app</value>
+    <value>If you fall under any of the following, please consider going to an examination center/medical institution, etc. according to the guidance of the app.</value>
     <comment>次のいずれかに当てはまる方は、アプリの案内に従い、診療・検査医療機関等への受診を検討ください。</comment>
   </data>
   <data name="ContactedNotifyPageDescription1_1" xml:space="preserve">
-    <value>・ Symptoms such as fever and underlying illness</value>
+    <value>・Symptoms such as fever and underlying illness</value>
     <comment>・発熱等の症状や基礎疾患がある</comment>
   </data>
   <data name="ContactedNotifyPageDescription1_2" xml:space="preserve">
-    <value>・ Taking actions (*) with a high risk of infection</value>
+    <value>・Taking actions with a high risk of infection (*)</value>
     <comment>・感染リスクの高い行動（※）をとった</comment>
   </data>
   <data name="ContactedNotifyPageDescription1_3" xml:space="preserve">
-    <value>・ Others, such as getting a medical examination</value>
+    <value>・Others, such as getting a medical examination</value>
     <comment>・その他、受診を希望する</comment>
   </data>
   <data name="ContactedNotifyPageDescription2" xml:space="preserve">
-    <value>Even if you do not get a medical examination,　we recommend to spend 7 days, from the date of contact, paying attention to infection control measures, such as refraining from contact with individuals with high risk of aggravation like elderly people and avoiding actions (*) with a high risk of infection</value>
-    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動（※）を控えていただくなど、感染対策に留意しながらお過ごしください。
+    <value>Even if you do not get a medical examination, we recommend to spend 7 days, from the date of contact, paying attention to infection control measures, such as refraining from contact with individuals with high risk of aggravation like elderly people and avoiding actions with a high risk of infection.</value>
+    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動を控えていただくなど、感染対策に留意しながらお過ごしください。
 ただし、体調に変化があった場合は、受診を検討ください。</comment>
   </data>
   <data name="ContactedNotifyPageHighRiskActionAnnotationText" xml:space="preserve">
-    <value>(*) Eating and drinking for a long time and with a large numbers of people etc.</value>
-    <comment>（※）大人数や長時間に及ぶ飲食など</comment>
+    <value>*Eating and drinking for a long time and with a large numbers of people etc.</value>
+    <comment>※大人数や長時間に及ぶ飲食など</comment>
   </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>Agree</value>
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
index 4b6dbd344..843a02c82 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
@@ -693,7 +693,7 @@
     <comment>・発熱等の症状や基礎疾患がある</comment>
   </data>
   <data name="ContactedNotifyPageDescription1_2" xml:space="preserve">
-    <value>・有感染风险高的行为（*）</value>
+    <value>・有高感染风险的行为（*）</value>
     <comment>・感染リスクの高い行動（※）をとった</comment>
   </data>
   <data name="ContactedNotifyPageDescription1_3" xml:space="preserve">
@@ -701,14 +701,14 @@
     <comment>・その他、受診を希望する</comment>
   </data>
   <data name="ContactedNotifyPageDescription2" xml:space="preserve">
-    <value>即使您不去接受诊断，请从接触之日起7天内，注意感染控制措施，例如避免与高危人群（如老年人和容易病情加重的人）接触，避免感染风险高的行为(*)。
+    <value>即使您不去接受诊断，请从接触之日起7天内，注意感染控制措施，例如避免与高危人群（如老年人和容易病情加重的人）接触，避免高感染风险的行为。
 但是，如果您感觉身体有任何变化，请考虑去接受诊断。</value>
-    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動（※）を控えていただくなど、感染対策に留意しながらお過ごしください。
+    <comment>受診しない場合でも、目安として接触日から７日間は高齢者など重症化リスクの高い方との接触・感染リスクの高い行動を控えていただくなど、感染対策に留意しながらお過ごしください。
 ただし、体調に変化があった場合は、受診を検討ください。</comment>
   </data>
   <data name="ContactedNotifyPageHighRiskActionAnnotationText" xml:space="preserve">
-    <value>(*) 长时间多人聚餐等行为</value>
-    <comment>（※）大人数や長時間に及ぶ飲食など</comment>
+    <value>*长时间多人聚餐等行为</value>
+    <comment>※大人数や長時間に及ぶ飲食など</comment>
   </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>同意</value>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
index e08c3ce20..1c40e263e 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
@@ -74,34 +74,34 @@
                             <Label
                                 AutomationProperties.IsInAccessibleTree="True"
                                 HorizontalTextAlignment="Start"
-                                Style="{StaticResource DefaultLabelSmall}"
+                                Style="{StaticResource DefaultLabel}"
                                 Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1}" />
                             <Label
                                 AutomationProperties.IsInAccessibleTree="True"
                                 HorizontalTextAlignment="Start"
-                                Style="{StaticResource DefaultLabelSmall}"
+                                Style="{StaticResource DefaultLabel}"
                                 Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1_1}" />
                             <Label
                                 AutomationProperties.IsInAccessibleTree="True"
                                 HorizontalTextAlignment="Start"
-                                Style="{StaticResource DefaultLabelSmall}"
+                                Style="{StaticResource DefaultLabel}"
                                 Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1_2}" />
                             <Label
                                 AutomationProperties.IsInAccessibleTree="True"
                                 HorizontalTextAlignment="Start"
-                                Style="{StaticResource DefaultLabelSmall}"
+                                Style="{StaticResource DefaultLabel}"
                                 Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1_3}" />
                         </StackLayout>
                         <Label
                             AutomationProperties.IsInAccessibleTree="True"
                             HorizontalTextAlignment="Start"
-                            Style="{StaticResource DefaultSubTitleLabel}"
-                            Text="{x:Static resources:AppResources.ContactedNotifyPageDescription2}" />
+                            Style="{StaticResource AnnotationLabelDark}"
+                            Text="{x:Static resources:AppResources.ContactedNotifyPageHighRiskActionAnnotationText}" />
                         <Label
                             AutomationProperties.IsInAccessibleTree="True"
                             HorizontalTextAlignment="Start"
-                            Style="{StaticResource AnnotationLabelDark}"
-                            Text="{x:Static resources:AppResources.ContactedNotifyPageHighRiskActionAnnotationText}" />
+                            Style="{StaticResource DefaultLabel}"
+                            Text="{x:Static resources:AppResources.ContactedNotifyPageDescription2}" />
                         <Button
                             AutomationProperties.IsInAccessibleTree="True"
                             Command="{Binding Path=OnClickByForm}"

From f759dcfec0a1331d660badb9f5f78f7ff0f1f049 Mon Sep 17 00:00:00 2001
From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com>
Date: Tue, 29 Mar 2022 14:47:44 +0900
Subject: [PATCH 4/4] Fixed unit test

---
 .../ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
index c5a663cb1..d8aa54107 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
@@ -157,7 +157,7 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_HighRisk()
             var contactedNotifyViewModel = CreateViewModel();
             contactedNotifyViewModel.Initialize(new NavigationParameters());
 
-            Assert.Null(contactedNotifyViewModel.ExposureCount);
+            Assert.Empty(contactedNotifyViewModel.ExposureCount);
             Assert.Equal("1日間に合計1分間の接触", contactedNotifyViewModel.ExposureDurationInMinutes);
         }
 
@@ -202,7 +202,7 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_NoHighRisk()
             var contactedNotifyViewModel = CreateViewModel();
             contactedNotifyViewModel.Initialize(new NavigationParameters());
 
-            Assert.Null(contactedNotifyViewModel.ExposureDurationInMinutes);
+            Assert.Empty(contactedNotifyViewModel.ExposureDurationInMinutes);
             Assert.Equal("2 件", contactedNotifyViewModel.ExposureCount);
         }