Skip to content
This repository has been archived by the owner on Apr 12, 2023. It is now read-only.

接触がないときの画面のピクトグラムを変更 #1056

Merged
3 commits merged into from
Jun 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,535 changes: 1,812 additions & 723 deletions Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions Covid19Radar/Covid19Radar/Resources/AppResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 13 additions & 3 deletions Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml
Original file line number Diff line number Diff line change
@@ -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/. -->
Expand Down Expand Up @@ -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>
cocoa-dev003 marked this conversation as resolved.
Show resolved Hide resolved
<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>
Expand Down