Merge pull request #1056 from cocoa-mhlw/feature/pictogram

接触がないときの画面のピクトグラムを変更
cocoa-mhlw · Jun 24, 2022 · c1affa7 · c1affa7
2 parents 4034b79 + 0873e4d
commit c1affa7
Show file tree

Hide file tree

Showing 17 changed files with 1,837 additions and 726 deletions.
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/Nocontact10.png
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/Nocontact10.png
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@2x.png
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@3x.png
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
@@ -1375,6 +1375,10 @@
  <value>引き続き「新しい生活様式」の実践をよろしくお願いいたします。</value>
  <comment>引き続き「新しい生活様式」の実践をよろしくお願いいたします。</comment>
  </data>
+ <data name="NotContactPagePictogramHelpText" xml:space="preserve">
+ <value>換気、咳エチケット、手洗い、密集回避、密接回避、密閉回避、のイラスト</value>
+ <comment>日本語のみ：換気、咳エチケット、手洗い、密集回避、密接回避、密閉回避、のイラスト</comment>
+ </data>
 
  <data name="GeneralErrorTitle" xml:space="preserve">
  <value>エラーが発生しました</value>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
@@ -1480,6 +1480,10 @@ In case you have been close to a large number of positive registrants a big cont
  <value>Please keep practicing 'New Lifestyle' recommended by the government.</value>
  <comment>引き続き「新しい生活様式」の実践をよろしくお願いいたします。</comment>
  </data>
+ <data name="NotContactPagePictogramHelpText" xml:space="preserve">
+ <value></value>
+ <comment>日本語のみ：換気、咳エチケット、手洗い、密集回避、密接回避、密閉回避、のイラスト</comment>
+ </data>
 
  <data name="GeneralErrorTitle" xml:space="preserve">
  <value>An error has occurred</value>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
@@ -1378,6 +1378,10 @@
  <value>为了进一步地防范疫情的扩散，请遵循日本政府提倡的“新生活模式”。</value>
  <comment>引き続き「新しい生活様式」の実践をよろしくお願いいたします。</comment>
  </data>
+ <data name="NotContactPagePictogramHelpText" xml:space="preserve">
+ <value></value>
+ <comment>日本語のみ：換気、咳エチケット、手洗い、密集回避、密接回避、密閉回避、のイラスト</comment>
+ </data>
 
  <data name="GeneralErrorTitle" xml:space="preserve">
  <value>发生错误</value>

diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!-- 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 http://mozilla.org/MPL/2.0/. -->
@@ -46,10 +46,20 @@
  </Label.FormattedText>
  </Label>
  <ffimageloading:CachedImage
- AutomationProperties.IsInAccessibleTree="False"
+ AutomationProperties.IsInAccessibleTree="True"
+ AutomationProperties.HelpText="{x:Static resources:AppResources.NotContactPagePictogramHelpText}"
  Margin="0,20,0,0"
  Aspect="AspectFit"
- Source="Nocontact10.png" />
+ Source="Nocontact10.png">
+ <ffimageloading:CachedImage.Triggers>
+ <DataTrigger
+ TargetType="ffimageloading:CachedImage"
+ Binding="{Binding Source={x:Static resources:AppResources.NotContactPagePictogramHelpText}}"
+ Value="">
+ <Setter Property="AutomationProperties.IsInAccessibleTree" Value="False" />
+ </DataTrigger>
+ </ffimageloading:CachedImage.Triggers>
+ </ffimageloading:CachedImage>
  </StackLayout>
  </ListView.Header>
  <ListView.ItemTemplate>