Merge pull request #1065 from cocoa-mhlw/feature/low-resolution

低解像度端末、フォントサイズを大きく設定した状態でテキストが見切れないように修正
cocoa-mhlw · Jul 5, 2022 · d62f4af · d62f4af
2 parents 60714c9 + 8f708cb
commit d62f4af
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 56 deletions.
diff --git a/Covid19Radar/Covid19Radar/App.xaml b/Covid19Radar/Covid19Radar/App.xaml
@@ -122,7 +122,6 @@
  <Setter Property="PlaceholderColor" Value="{StaticResource SecondaryText}" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
  <Setter Property="FontSize" Value="Default" />
- <Setter Property="HeightRequest" Value="40" />
  <Setter Property="Opacity" Value="0.6" />
  <Style.Triggers>
  <Trigger TargetType="Entry" Property="IsFocused" Value="True">

diff --git a/Covid19Radar/Covid19Radar/Templates/HelpMenuTemplate.xaml b/Covid19Radar/Covid19Radar/Templates/HelpMenuTemplate.xaml
@@ -19,7 +19,6 @@
  FontSize="Default"
  Text="{Binding Title}"
  LineBreakMode="WordWrap"
- MaxLines="2"
  TextColor="{StaticResource NavBarText}"
  VerticalOptions="Center" />
  <Image

diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage2.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage2.xaml
@@ -33,29 +33,20 @@
  AutomationProperties.IsInAccessibleTree="True"
  Style="{StaticResource DefaultTitleLabel}"
  Text="{x:Static resources:AppResources.HelpPage2Label1}" />
- <Grid Margin="0,0,0,0">
- <Grid ColumnSpacing="10" RowSpacing="0">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="0.4*" />
- <ColumnDefinition Width="0.6*" />
- </Grid.ColumnDefinitions>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
- <ffimageloading:CachedImage
- Grid.Row="0"
- Grid.Column="0"
- AutomationProperties.IsInAccessibleTree="False"
- Aspect="AspectFit"
- Source="HelpPage30.png" />
- <Label
- Grid.Row="0"
- Grid.Column="1"
- AutomationProperties.IsInAccessibleTree="True"
- Style="{StaticResource DefaultLabel}"
- Text="{x:Static resources:AppResources.HelpPage2Description1}" />
- </Grid>
- </Grid>
+ <StackLayout
+ Orientation="Horizontal"
+ Spacing="20">
+ <ffimageloading:CachedImage
+ AutomationProperties.IsInAccessibleTree="False"
+ WidthRequest="100"
+ Aspect="AspectFit"
+ Source="HelpPage30.png" />
+ <Label
+ AutomationProperties.IsInAccessibleTree="True"
+ Style="{StaticResource DefaultLabel}"
+ Text="{x:Static resources:AppResources.HelpPage2Description1}"
+ VerticalTextAlignment="Center" />
+ </StackLayout>
  </StackLayout>
  <StackLayout Grid.Row="1" Spacing="20">
  <Label

diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogCompletePage.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogCompletePage.xaml
@@ -34,45 +34,34 @@
  Margin="0"
  Padding="0"
  Grid.Row="1">
- <Grid
- Margin="0"
- Padding="20"
- Style="{StaticResource DefaultGridLayout}">
- <Grid.RowDefinitions>
- <RowDefinition Height="*" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
- <StackLayout Grid.Row="0">
- <Label
- AutomationProperties.IsInAccessibleTree="True"
- Style="{StaticResource DefaultLabel}"
- Text="{x:Static resources:AppResources.SendLogCompletePageDescription2}" />
- <Label
- AutomationProperties.IsInAccessibleTree="True"
- Margin="0, 10"
- Style="{StaticResource AnnotationLabel}">
- <Label.FormattedText>
- <FormattedString>
- <Span Text="{x:Static resources:AppResources.AnnotationSymbol}"/>
- <Span Text="{x:Static resources:AppResources.CocoaAnnotationText}"/>
- </FormattedString>
- </Label.FormattedText>
- </Label>
- </StackLayout>
+ <StackLayout
+ Spacing="10"
+ Margin="20, 10">
+ <Label
+ AutomationProperties.IsInAccessibleTree="True"
+ Style="{StaticResource DefaultLabel}"
+ Text="{x:Static resources:AppResources.SendLogCompletePageDescription2}" />
+ <Label
+ AutomationProperties.IsInAccessibleTree="True"
+ Style="{StaticResource AnnotationLabel}">
+ <Label.FormattedText>
+ <FormattedString>
+ <Span Text="{x:Static resources:AppResources.AnnotationSymbol}"/>
+ <Span Text="{x:Static resources:AppResources.CocoaAnnotationText}"/>
+ </FormattedString>
+ </Label.FormattedText>
+ </Label>
  <Button
- Grid.Row="1"
  AutomationProperties.IsInAccessibleTree="True"
  Command="{Binding Path=OnClickSendMailCommand}"
  Style="{StaticResource DefaultButton}"
  Text="{x:Static resources:AppResources.SendLogCompletePageButton1}" />
  <Button
- Grid.Row="2"
  AutomationProperties.IsInAccessibleTree="True"
  Command="{Binding Path=OnClickHomeCommand}"
  Style="{StaticResource DefaultButtonGrayedOut}"
  Text="{x:Static resources:AppResources.SendLogCompletePageButton2}" />
- </Grid>
+ </StackLayout>
  </ScrollView>
  </Grid>
  </ContentPage.Content>

diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
@@ -197,7 +197,6 @@
  BackgroundColor="#CECECE"
  CornerRadius="7"
  HasShadow="False"
- HeightRequest="90"
  HorizontalOptions="FillAndExpand">
  <Frame
  Margin="3"

diff --git a/Covid19Radar/Covid19Radar/Views/MenuPage.xaml b/Covid19Radar/Covid19Radar/Views/MenuPage.xaml
@@ -64,8 +64,8 @@
  <ListView
  AutomationProperties.IsInAccessibleTree="True"
  ItemsSource="{Binding MenuItems}"
- RowHeight="60"
  SelectedItem="{Binding SelectedMenuItem}"
+ HasUnevenRows="True"
  SeparatorColor="#E0E0E0"
  SeparatorVisibility="Default"
  >