Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2024-09-27 03:52:57 +02:00
Code Issues Projects Releases Wiki Activity

fixes for font cutoff on samsung devices (#1838)

Browse Source
This commit is contained in:
Matt Portune 2022-03-10 13:55:48 -05:00 committed by GitHub
parent 5ade10d1fe
commit a2ec263116
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/App/Controls/AccountViewCell/AccountViewCell.xaml
View File

@ -59,26 +59,26 @@
Grid.Row="0" Grid.Row="0"
Text="{Binding AccountView.Email}" Text="{Binding AccountView.Email}"
IsVisible="{Binding IsActive}" IsVisible="{Binding IsActive}"
StyleClass="list-title" StyleClass="accountlist-title, accountlist-title-platform"
LineBreakMode="TailTruncation" /> LineBreakMode="TailTruncation" />
<Label <Label
Grid.Row="0" Grid.Row="0"
Text="{Binding AccountView.Email}" Text="{Binding AccountView.Email}"
IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}" IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}"
StyleClass="list-title" StyleClass="accountlist-title, accountlist-title-platform"
TextColor="{DynamicResource MutedColor}" TextColor="{DynamicResource MutedColor}"
LineBreakMode="TailTruncation" /> LineBreakMode="TailTruncation" />
<Label <Label
Grid.Row="1" Grid.Row="1"
IsVisible="{Binding ShowHostname}" IsVisible="{Binding ShowHostname}"
Text="{Binding AccountView.Hostname}" Text="{Binding AccountView.Hostname}"
StyleClass="list-sub" StyleClass="accountlist-sub, accountlist-sub-platform"
LineBreakMode="TailTruncation" /> LineBreakMode="TailTruncation" />
<Label <Label
Grid.Row="2" Grid.Row="2"
Text="{u:I18n AccountUnlocked}" Text="{u:I18n AccountUnlocked}"
IsVisible="{Binding IsUnlockedAndNotActive}" IsVisible="{Binding IsUnlockedAndNotActive}"
StyleClass="list-sub" StyleClass="accountlist-sub, accountlist-sub-platform"
FontAttributes="Italic" FontAttributes="Italic"
TextTransform="Lowercase" TextTransform="Lowercase"
LineBreakMode="TailTruncation" /> LineBreakMode="TailTruncation" />
@ -86,7 +86,7 @@
Grid.Row="2" Grid.Row="2"
Text="{u:I18n AccountLocked}" Text="{u:I18n AccountLocked}"
IsVisible="{Binding IsLockedAndNotActive}" IsVisible="{Binding IsLockedAndNotActive}"
StyleClass="list-sub" StyleClass="accountlist-sub, accountlist-sub-platform"
FontAttributes="Italic" FontAttributes="Italic"
TextTransform="Lowercase" TextTransform="Lowercase"
LineBreakMode="TailTruncation" /> LineBreakMode="TailTruncation" />
@ -94,7 +94,7 @@
Grid.Row="2" Grid.Row="2"
Text="{u:I18n AccountLoggedOut}" Text="{u:I18n AccountLoggedOut}"
IsVisible="{Binding IsLoggedOutAndNotActive}" IsVisible="{Binding IsLoggedOutAndNotActive}"
StyleClass="list-sub" StyleClass="accountlist-sub, accountlist-sub-platform"
FontAttributes="Italic" FontAttributes="Italic"
TextTransform="Lowercase" TextTransform="Lowercase"
LineBreakMode="TailTruncation" /> LineBreakMode="TailTruncation" />
@ -144,7 +144,7 @@
AutomationProperties.IsInAccessibleTree="False" /> AutomationProperties.IsInAccessibleTree="False" />
<Label <Label
Text="{u:I18n AddAccount}" Text="{u:I18n AddAccount}"
StyleClass="list-title" StyleClass="accountlist-title, accountlist-title-platform"
LineBreakMode="TailTruncation" LineBreakMode="TailTruncation"
VerticalOptions="Center" VerticalOptions="Center"
Grid.Column="1" /> Grid.Column="1" />

16
src/App/Styles/Android.xaml
View File

@ -92,7 +92,7 @@
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{DynamicResource ButtonTextColor}" /> Value="{DynamicResource ButtonTextColor}" />
<Setter Property="FontSize" <Setter Property="FontSize"
Value="18" /> Value="Medium" />
<Setter Property="CornerRadius" <Setter Property="CornerRadius"
Value="5" /> Value="5" />
<Setter Property="Margin" <Setter Property="Margin"
@ -126,7 +126,7 @@
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{DynamicResource ButtonPrimaryTextColor}" /> Value="{DynamicResource ButtonPrimaryTextColor}" />
<Setter Property="FontSize" <Setter Property="FontSize"
Value="18" /> Value="Medium" />
<Setter Property="FontAttributes" <Setter Property="FontAttributes"
Value="Bold" /> Value="Bold" />
<Setter Property="CornerRadius" <Setter Property="CornerRadius"
@ -298,6 +298,18 @@
<Setter Property="FontSize" <Setter Property="FontSize"
Value="25" /> Value="25" />
</Style> </Style>
<Style TargetType="Label"
Class="accountlist-title-platform"
ApplyToDerivedTypes="True">
<Setter Property="FontSize"
Value="Body" />
</Style>
<Style TargetType="Label"
Class="accountlist-sub-platform"
ApplyToDerivedTypes="True">
<Setter Property="FontSize"
Value="Caption" />
</Style>
<!-- Box --> <!-- Box -->

8
src/App/Styles/Base.xaml
View File

@ -221,6 +221,14 @@
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{DynamicResource MutedColor}" /> Value="{DynamicResource MutedColor}" />
</Style> </Style>
<Style TargetType="Label"
Class="accountlist-title">
</Style>
<Style TargetType="Label"
Class="accountlist-sub">
<Setter Property="TextColor"
Value="{DynamicResource MutedColor}" />
</Style>
<Style TargetType="Label" <Style TargetType="Label"
ApplyToDerivedTypes="True" ApplyToDerivedTypes="True"
Class="list-title-icon"> Class="list-title-icon">

14
src/App/Styles/iOS.xaml
View File

@ -105,7 +105,7 @@
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{DynamicResource ButtonTextColor}" /> Value="{DynamicResource ButtonTextColor}" />
<Setter Property="FontSize" <Setter Property="FontSize"
Value="18" /> Value="Medium" />
<Setter Property="Margin" <Setter Property="Margin"
Value="0, 5, 0, 0" /> Value="0, 5, 0, 0" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
@ -143,7 +143,7 @@
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{DynamicResource ButtonPrimaryTextColor}" /> Value="{DynamicResource ButtonPrimaryTextColor}" />
<Setter Property="FontSize" <Setter Property="FontSize"
Value="18" /> Value="Medium" />
<Setter Property="FontAttributes" <Setter Property="FontAttributes"
Value="Bold" /> Value="Bold" />
<Setter Property="Margin" <Setter Property="Margin"
@ -320,6 +320,16 @@
<Setter Property="FontSize" <Setter Property="FontSize"
Value="25" /> Value="25" />
</Style> </Style>
<Style TargetType="Label"
Class="accountlist-title-platform"
ApplyToDerivedTypes="True">
</Style>
<Style TargetType="Label"
Class="accountlist-sub-platform"
ApplyToDerivedTypes="True">
<Setter Property="FontSize"
Value="Small" />
</Style>
<!-- Box --> <!-- Box -->