mirror of
https://github.com/bitwarden/android.git
synced 2024-12-28 20:08:43 +03:00
b9b9c2e5ff
* [SG-166] Update fonts to have necessary icons
* [SG-166] Add new custom view to hold a button with a font icon and a label.
* [SG-166] Two Step login flow - Mobile (#2153)
* [SG-166] Add UI elements to Home and Login pages. Change VMs to function with new UI. Add new string resources.
* [SG-166] Pass email parameter from Home to Login page.
* [SG-166] Pass email to password hint page.
* [SG-166] Remove remembered email from account switching.
* [SG-166] Add GetKnownDevice endpoint to ApiService
* [SG-166] Fix GetKnownDevice string uri
* [SG-166] Add Renderer for IconLabel control. Add RemoveFontPadding bool property.
* [SG-166] include IconLabelRenderer in Android csproj file
* [SG-166] Add new control. Add styles for the control.
* [SG-166] Add verification to start login if email is remembered
* [SG-166] Pass default email to hint page
* [SG-166] Login with device button only shows if it is a known device.
* [SG-166] Change Remember Email to Remember me. Change Check to Switch control.
* [SG-166] Add command to button for SSO Login
* Revert "[SG-166] Update fonts to have necessary icons"
This reverts commit 472b541cef.
* [SG-166] Remove IconLabel Android renderer. Add RemoveFontPadding effect.
* [SG-166] Update font with new device and suitcase icon
* [SG-166] Fix RemoveFontPadding effect
* [SG-166] Remove unused property in IconLabel
* [SG-166] Fix formatting on IconLabelButton.xaml
* [SG-166] Update padding effect to IconLabel
* [SG-166] Add control variable to run code once on create
* [SG-166] Add email validation before continue
* [SG-166] Refactor icons
* [SG-166] Update iOS Extension font
* [SG-166] Remove HomePage login btn step
* [SG-166] Make clickable area smaller
* [SG-166] Fix hint filled by default
* [SG-166] Fix IconButton font issue
* [SG-166] Fix iOS extension
* [SG-166] Move style to Base instead of platforms
* [SG-166] Fix layout for IconLabelButton
* [SG-166] Switched EventHandler for Command
* [SG-166] Removed event handler
* [SG-166] Fix LoginPage layout options
* [SG-166] Fix extensions Login null email
* [SG-166] Move remembered email logic to viewmodel
* [SG-166] Protect method and show dialog in case of error
* [SG-166] Rename of GetKnownDevice api method
* [SG-166] rename text resource key name
* [SG-166] Add close button to iOS extension
* [SG-166] Switch event handlers for commands
* [SG-166] Change commands UI thread invocation.
* [SG-166] Remove Login with device button from the UI
* [SG-166] Fixed appOptions and close button on iOS Extensions
370 lines
15 KiB
XML
370 lines
15 KiB
XML
<?xml version="1.0" encoding="utf-8" ?>
|
|
<ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
|
x:Class="Bit.App.Styles.Android"
|
|
xmlns:controls="clr-namespace:Bit.App.Controls">
|
|
<Style TargetType="Entry"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="PlaceholderColor"
|
|
Value="{DynamicResource InputPlaceholderColor}" />
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource TextColor}" />
|
|
<Setter Property="Margin"
|
|
Value="-4, 0, -4, -4" />
|
|
</Style>
|
|
<Style TargetType="Picker"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource TextColor}" />
|
|
<Setter Property="Margin"
|
|
Value="-4, 0, -4, -4" />
|
|
</Style>
|
|
<Style TargetType="DatePicker"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource TextColor}" />
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource BackgroundColor}" />
|
|
</Style>
|
|
<Style TargetType="TimePicker"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource TextColor}" />
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource BackgroundColor}" />
|
|
</Style>
|
|
<Style TargetType="Editor"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource TextColor}" />
|
|
<Setter Property="PlaceholderColor"
|
|
Value="{DynamicResource InputPlaceholderColor}" />
|
|
<Setter Property="Margin"
|
|
Value="-4, 0, -4, -4" />
|
|
</Style>
|
|
<Style TargetType="Switch"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="OnColor"
|
|
Value="{DynamicResource SwitchOnColor}" />
|
|
</Style>
|
|
<Style TargetType="SearchBar"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="BackgroundColor"
|
|
Value="Transparent" />
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource TitleEntryTextColor}" />
|
|
<Setter Property="CancelButtonColor"
|
|
Value="{DynamicResource TitleEntryTextColor}" />
|
|
<Setter Property="PlaceholderColor"
|
|
Value="{DynamicResource TitleEntryPlaceholderColor}" />
|
|
</Style>
|
|
<Style TargetType="ContentPage"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource BackgroundColor}" />
|
|
</Style>
|
|
<Style TargetType="controls:ExtendedSlider">
|
|
<Setter Property="MinimumTrackColor"
|
|
Value="{DynamicResource SliderTrackMinColor}" />
|
|
<Setter Property="MaximumTrackColor"
|
|
Value="{DynamicResource SliderTrackMinColor}" />
|
|
<Setter Property="ThumbColor"
|
|
Value="{DynamicResource SliderThumbColor}" />
|
|
<Setter Property="ThumbBorderColor"
|
|
Value="{DynamicResource SliderThumbBorderColor}" />
|
|
</Style>
|
|
<Style TargetType="controls:ExtendedStepper">
|
|
<Setter Property="StepperBackgroundColor"
|
|
Value="{DynamicResource StepperBackgroundColor}" />
|
|
<Setter Property="StepperForegroundColor"
|
|
Value="{DynamicResource StepperForegroundColor}" />
|
|
</Style>
|
|
<Style TargetType="Frame"
|
|
ApplyToDerivedTypes="True"
|
|
Class="btn-icon-row">
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource ButtonBackgroundColor}" />
|
|
<Setter Property="BorderColor"
|
|
Value="{DynamicResource ButtonBorderColor}" />
|
|
<Setter Property="CornerRadius"
|
|
Value="5" />
|
|
<Setter Property="Margin"
|
|
Value="0, 5, 0, 0" />
|
|
<Setter Property="HasShadow"
|
|
Value="False" />
|
|
<Setter Property="VisualStateManager.VisualStateGroups">
|
|
<VisualStateGroupList>
|
|
<VisualStateGroup x:Name="CommonStates">
|
|
<VisualState x:Name="Normal" />
|
|
<VisualState x:Name="Disabled">
|
|
<VisualState.Setters>
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
|
|
</VisualState.Setters>
|
|
</VisualState>
|
|
</VisualStateGroup>
|
|
</VisualStateGroupList>
|
|
</Setter>
|
|
</Style>
|
|
|
|
<!-- Buttons -->
|
|
<Style TargetType="Button">
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource ButtonBackgroundColor}" />
|
|
<Setter Property="BorderColor"
|
|
Value="{DynamicResource ButtonBorderColor}" />
|
|
<Setter Property="BorderWidth"
|
|
Value="1" />
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ButtonTextColor}" />
|
|
<Setter Property="FontSize"
|
|
Value="Medium" />
|
|
<Setter Property="CornerRadius"
|
|
Value="5" />
|
|
<Setter Property="Margin"
|
|
Value="0, 5, 0, 0" />
|
|
<Setter Property="VisualStateManager.VisualStateGroups">
|
|
<VisualStateGroupList>
|
|
<VisualStateGroup x:Name="CommonStates">
|
|
<VisualState x:Name="Normal" />
|
|
<VisualState x:Name="Disabled">
|
|
<VisualState.Setters>
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
|
|
<Setter Property="BorderWidth"
|
|
Value="0" />
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ButtonTextColorDisabled}" />
|
|
</VisualState.Setters>
|
|
</VisualState>
|
|
</VisualStateGroup>
|
|
</VisualStateGroupList>
|
|
</Setter>
|
|
</Style>
|
|
<Style TargetType="Button"
|
|
Class="btn-primary">
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource PrimaryColor}" />
|
|
<Setter Property="BorderColor"
|
|
Value="{DynamicResource PrimaryColor}" />
|
|
<Setter Property="BorderWidth"
|
|
Value="1" />
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ButtonPrimaryTextColor}" />
|
|
<Setter Property="FontSize"
|
|
Value="Medium" />
|
|
<Setter Property="FontAttributes"
|
|
Value="Bold" />
|
|
<Setter Property="CornerRadius"
|
|
Value="5" />
|
|
<Setter Property="Margin"
|
|
Value="0, 5, 0, 0" />
|
|
<Setter Property="VisualStateManager.VisualStateGroups">
|
|
<VisualStateGroupList>
|
|
<VisualStateGroup x:Name="CommonStates">
|
|
<VisualState x:Name="Normal" />
|
|
<VisualState x:Name="Disabled">
|
|
<VisualState.Setters>
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ButtonPrimaryTextColorDisabled}" />
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource ButtonPrimaryBackgroundColorDisabled}" />
|
|
<Setter Property="BorderColor"
|
|
Value="{DynamicResource ButtonPrimaryBackgroundColorDisabled}" />
|
|
</VisualState.Setters>
|
|
</VisualState>
|
|
</VisualStateGroup>
|
|
</VisualStateGroupList>
|
|
</Setter>
|
|
</Style>
|
|
|
|
<Style TargetType="Button"
|
|
Class="btn-secondary">
|
|
<Setter Property="BackgroundColor"
|
|
Value="Transparent" />
|
|
<Setter Property="BorderColor"
|
|
Value="{DynamicResource ButtonBorderColor}" />
|
|
<Setter Property="BorderWidth"
|
|
Value="1" />
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ButtonTextColorOpacity}" />
|
|
<Setter Property="FontSize"
|
|
Value="Medium" />
|
|
<Setter Property="CornerRadius"
|
|
Value="5" />
|
|
<Setter Property="VisualStateManager.VisualStateGroups">
|
|
<VisualStateGroupList>
|
|
<VisualStateGroup x:Name="CommonStates">
|
|
<VisualState x:Name="Normal" />
|
|
<VisualState x:Name="Disabled">
|
|
<VisualState.Setters>
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ButtonTextColorDisabled}" />
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
|
|
<Setter Property="BorderColor"
|
|
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
|
|
</VisualState.Setters>
|
|
</VisualState>
|
|
</VisualStateGroup>
|
|
</VisualStateGroupList>
|
|
</Setter>
|
|
</Style>
|
|
<Style TargetType="Button"
|
|
Class="btn-danger">
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource DangerColor}" />
|
|
<Setter Property="BorderColor"
|
|
Value="{DynamicResource DangerColor}" />
|
|
<Setter Property="BorderWidth"
|
|
Value="1" />
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ButtonPrimaryTextColor}" />
|
|
<Setter Property="FontSize"
|
|
Value="Medium" />
|
|
<Setter Property="CornerRadius"
|
|
Value="5" />
|
|
<Setter Property="VisualStateManager.VisualStateGroups">
|
|
<VisualStateGroupList>
|
|
<VisualStateGroup x:Name="CommonStates">
|
|
<VisualState x:Name="Normal" />
|
|
<VisualState x:Name="Disabled">
|
|
<VisualState.Setters>
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ButtonTextColorDisabled}" />
|
|
<Setter Property="BackgroundColor"
|
|
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
|
|
<Setter Property="BorderColor"
|
|
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
|
|
</VisualState.Setters>
|
|
</VisualState>
|
|
</VisualStateGroup>
|
|
</VisualStateGroupList>
|
|
</Setter>
|
|
</Style>
|
|
<Style TargetType="Button"
|
|
ApplyToDerivedTypes="True"
|
|
Class="btn-icon-platform">
|
|
<Setter Property="WidthRequest"
|
|
Value="37" />
|
|
<Setter Property="FontSize"
|
|
Value="25" />
|
|
</Style>
|
|
|
|
<!-- Title -->
|
|
|
|
<Style TargetType="Button"
|
|
Class="btn-title-platform"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="WidthRequest"
|
|
Value="28" />
|
|
<Setter Property="FontSize"
|
|
Value="24" />
|
|
</Style>
|
|
|
|
<!-- List -->
|
|
|
|
<Style TargetType="BoxView"
|
|
Class="list-item-separator-bottom-platform"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="BackgroundColor"
|
|
Value="Transparent" />
|
|
</Style>
|
|
<Style TargetType="StackLayout"
|
|
Class="list-row-header-platform">
|
|
<Setter Property="Padding"
|
|
Value="10, 12" />
|
|
<Setter Property="VerticalOptions"
|
|
Value="CenterAndExpand" />
|
|
</Style>
|
|
<Style TargetType="Label"
|
|
Class="list-header-platform">
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource ListHeaderTextColor}" />
|
|
<Setter Property="FontSize"
|
|
Value="Small" />
|
|
<Setter Property="FontAttributes"
|
|
Value="Bold" />
|
|
</Style>
|
|
<Style TargetType="BoxView"
|
|
Class="list-section-separator-top-platform">
|
|
<Setter Property="Color"
|
|
Value="{DynamicResource ListItemBorderColor}" />
|
|
</Style>
|
|
<Style TargetType="BoxView"
|
|
Class="list-section-separator-bottom-platform">
|
|
<Setter Property="Color"
|
|
Value="Transparent" />
|
|
<Setter Property="IsVisible"
|
|
Value="False" />
|
|
</Style>
|
|
<Style TargetType="StackLayout"
|
|
Class="list-row-platform">
|
|
</Style>
|
|
<Style TargetType="controls:ExtendedStackLayout"
|
|
Class="list-row-platform">
|
|
</Style>
|
|
<Style TargetType="Grid"
|
|
Class="list-row-platform">
|
|
</Style>
|
|
<Style TargetType="controls:ExtendedGrid"
|
|
Class="list-row-platform">
|
|
</Style>
|
|
<Style TargetType="Label"
|
|
Class="list-icon-platform"
|
|
ApplyToDerivedTypes="True">
|
|
<Setter Property="FontSize"
|
|
Value="23" />
|
|
</Style>
|
|
<Style TargetType="Button"
|
|
ApplyToDerivedTypes="True"
|
|
Class="list-row-button-platform">
|
|
<Setter Property="WidthRequest"
|
|
Value="37" />
|
|
<Setter Property="FontSize"
|
|
Value="25" />
|
|
</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 -->
|
|
|
|
<Style TargetType="Label"
|
|
Class="box-header-platform">
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource BoxHeaderTextColor}" />
|
|
<Setter Property="FontSize"
|
|
Value="Small" />
|
|
<Setter Property="FontAttributes"
|
|
Value="Bold" />
|
|
</Style>
|
|
<Style TargetType="Button"
|
|
ApplyToDerivedTypes="True"
|
|
Class="box-row-button-platform">
|
|
<Setter Property="WidthRequest"
|
|
Value="37" />
|
|
<Setter Property="HeightRequest"
|
|
Value="45" />
|
|
<Setter Property="FontSize"
|
|
Value="25" />
|
|
</Style>
|
|
|
|
<Style TargetType="Label"
|
|
ApplyToDerivedTypes="True"
|
|
Class="title-danger">
|
|
<Setter Property="TextColor"
|
|
Value="{DynamicResource DangerColor}" />
|
|
<Setter Property="FontSize"
|
|
Value="Title" />
|
|
</Style>
|
|
</ResourceDictionary>
|