mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 02:18:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

header upper on iOS

Browse source
This commit is contained in:
Kyle Spearrin 2019-06-20 17:05:28 -04:00
parent dd8d5fd84c
commit 44782b1ddf
9 changed files with 46 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/App/Pages/Accounts/EnvironmentPage.xaml
View file

@ -21,7 +21,7 @@
<StackLayout Spacing="20"> <StackLayout Spacing="20">
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n SelfHostedEnvironment}" <Label Text="{u:I18n SelfHostedEnvironment, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row"> <StackLayout StyleClass="box-row">
@ -42,7 +42,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n CustomEnvironment}" <Label Text="{u:I18n CustomEnvironment, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row"> <StackLayout StyleClass="box-row">

2
src/App/Pages/Generator/GeneratorPage.xaml
View file

@ -52,7 +52,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n Options}" <Label Text="{u:I18n Options, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row, box-row-input"> <StackLayout StyleClass="box-row, box-row-input">

4
src/App/Pages/Settings/OptionsPage.xaml
View file

@ -96,7 +96,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}"> <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n AutofillService}" <Label Text="{u:I18n AutofillService, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row, box-row-switch"> <StackLayout StyleClass="box-row, box-row-switch">
@ -134,7 +134,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAccessibilitySettings}"> <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAccessibilitySettings}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n AutofillAccessibilityService}" <Label Text="{u:I18n AutofillAccessibilityService, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row, box-row-switch"> <StackLayout StyleClass="box-row, box-row-switch">

14
src/App/Pages/Vault/AddEditPage.xaml
View file

@ -57,7 +57,7 @@
<StackLayout Spacing="20"> <StackLayout Spacing="20">
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n ItemInformation}" <Label Text="{u:I18n ItemInformation, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row, box-row-input" <StackLayout StyleClass="box-row, box-row-input"
@ -421,7 +421,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box" IsVisible="{Binding IsLogin}"> <StackLayout StyleClass="box" IsVisible="{Binding IsLogin}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n URIs}" <Label Text="{u:I18n URIs, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<controls:RepeaterView ItemsSource="{Binding Uris}"> <controls:RepeaterView ItemsSource="{Binding Uris}">
@ -464,7 +464,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n Miscellaneous}" <Label Text="{u:I18n Miscellaneous, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row, box-row-input"> <StackLayout StyleClass="box-row, box-row-input">
@ -491,7 +491,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n Notes}" <Label Text="{u:I18n Notes, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row, box-row-input"> <StackLayout StyleClass="box-row, box-row-input">
@ -504,7 +504,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n CustomFields}" <Label Text="{u:I18n CustomFields, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<controls:RepeaterView ItemsSource="{Binding Fields}"> <controls:RepeaterView ItemsSource="{Binding Fields}">
@ -584,7 +584,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box" IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}"> <StackLayout StyleClass="box" IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n Ownership}" <Label Text="{u:I18n Ownership, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row, box-row-input"> <StackLayout StyleClass="box-row, box-row-input">
@ -600,7 +600,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box" IsVisible="{Binding ShowCollections}"> <StackLayout StyleClass="box" IsVisible="{Binding ShowCollections}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n Collections}" <Label Text="{u:I18n Collections, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout Spacing="0" Padding="0" <StackLayout Spacing="0" Padding="0"

2
src/App/Pages/Vault/AttachmentsPage.xaml
View file

@ -64,7 +64,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n AddNewAttachment}" <Label Text="{u:I18n AddNewAttachment, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row"> <StackLayout StyleClass="box-row">

2
src/App/Pages/Vault/SharePage.xaml
View file

@ -49,7 +49,7 @@
<StackLayout StyleClass="box" <StackLayout StyleClass="box"
IsVisible="{Binding OrganizationId, Converter={StaticResource notNull}}"> IsVisible="{Binding OrganizationId, Converter={StaticResource notNull}}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n Collections}" <Label Text="{u:I18n Collections, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row" <StackLayout StyleClass="box-row"

10
src/App/Pages/Vault/ViewPage.xaml
View file

@ -48,7 +48,7 @@
<StackLayout Spacing="20" x:Name="_mainLayout"> <StackLayout Spacing="20" x:Name="_mainLayout">
<StackLayout StyleClass="box"> <StackLayout StyleClass="box">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n ItemInformation}" <Label Text="{u:I18n ItemInformation, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row"> <StackLayout StyleClass="box-row">
@ -418,7 +418,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box" IsVisible="{Binding ShowUris}"> <StackLayout StyleClass="box" IsVisible="{Binding ShowUris}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n URIs}" <Label Text="{u:I18n URIs, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}"> <controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}">
@ -479,7 +479,7 @@
<StackLayout StyleClass="box" <StackLayout StyleClass="box"
IsVisible="{Binding Cipher.Notes, Converter={StaticResource stringHasValue}}"> IsVisible="{Binding Cipher.Notes, Converter={StaticResource stringHasValue}}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n Notes}" <Label Text="{u:I18n Notes, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<StackLayout StyleClass="box-row"> <StackLayout StyleClass="box-row">
@ -496,7 +496,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box" IsVisible="{Binding Cipher.HasFields}"> <StackLayout StyleClass="box" IsVisible="{Binding Cipher.HasFields}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n CustomFields}" <Label Text="{u:I18n CustomFields, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<controls:RepeaterView ItemsSource="{Binding Fields}"> <controls:RepeaterView ItemsSource="{Binding Fields}">
@ -569,7 +569,7 @@
</StackLayout> </StackLayout>
<StackLayout StyleClass="box" IsVisible="{Binding ShowAttachments}"> <StackLayout StyleClass="box" IsVisible="{Binding ShowAttachments}">
<StackLayout StyleClass="box-row-header"> <StackLayout StyleClass="box-row-header">
<Label Text="{u:I18n Attachments}" <Label Text="{u:I18n Attachments, Header=True}"
StyleClass="box-header, box-header-platform" /> StyleClass="box-header, box-header-platform" />
</StackLayout> </StackLayout>
<controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}"> <controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}">

22
src/App/Styles/iOS.xaml
View file

@ -31,7 +31,7 @@
<Style TargetType="Label" <Style TargetType="Label"
Class="list-header-platform"> Class="list-header-platform">
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{StaticResource ListHeaderTextColor}" /> Value="{StaticResource MutedColor}" />
<Setter Property="FontSize" <Setter Property="FontSize"
Value="Small" /> Value="Small" />
</Style> </Style>
@ -63,7 +63,25 @@
ApplyToDerivedTypes="True" ApplyToDerivedTypes="True"
Class="list-row-button-platform"> Class="list-row-button-platform">
<Setter Property="WidthRequest" <Setter Property="WidthRequest"
Value="40" /> Value="37" />
<Setter Property="FontSize"
Value="25" />
</Style>
<!-- Box -->
<Style TargetType="Label"
Class="box-header-platform">
<Setter Property="TextColor"
Value="{StaticResource MutedColor}" />
<Setter Property="FontSize"
Value="Small" />
</Style>
<Style TargetType="Button"
ApplyToDerivedTypes="True"
Class="box-row-button-platform">
<Setter Property="WidthRequest"
Value="37" />
<Setter Property="FontSize" <Setter Property="FontSize"
Value="25" /> Value="25" />
</Style> </Style>

8
src/App/Utilities/I18nExtension.cs
View file

@ -20,10 +20,16 @@ namespace Bit.App.Utilities
public string P1 { get; set; } public string P1 { get; set; }
public string P2 { get; set; } public string P2 { get; set; }
public string P3 { get; set; } public string P3 { get; set; }
public bool Header { get; set; }
public object ProvideValue(IServiceProvider serviceProvider) public object ProvideValue(IServiceProvider serviceProvider)
{ {
return _i18nService.T(Id, P1, P2, P3); var val = _i18nService.T(Id, P1, P2, P3);
if(Header && Device.RuntimePlatform == Device.iOS)
{
return val.ToUpper();
}
return val;
} }
} }
} }