github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #58 from nventive/dev/madi/fix-background-color

Browse source 
Fix Background color for xamarin platforms
This commit is contained in:
MaximeDionNventiveCom 2019-05-27 08:15:43 -04:00 • committed by GitHub
commit 8c425ec42c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 284 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

453
src/Calculator.Shared/Styles.xaml
View file

@ -1,17 +1,16 @@
<ResourceDictionary <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:xamarin="http://uno.ui/xamarin"
xmlns:xamarin="http://uno.ui/xamarin" xmlns:android="http://uno.ui/android"
xmlns:android="http://uno.ui/android" xmlns:ios="http://uno.ui/ios"
xmlns:ios="http://uno.ui/ios" xmlns:wasm="http://uno.ui/wasm"
xmlns:wasm="http://uno.ui/wasm" xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="using:CalculatorApp.Controls"
xmlns:Controls="using:CalculatorApp.Controls" xmlns:common="using:CalculatorApp.Common"
xmlns:common="using:CalculatorApp.Common" xmlns:converters="using:CalculatorApp.Converters"
xmlns:converters="using:CalculatorApp.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="using:CalculatorApp"
xmlns:local="using:CalculatorApp" mc:Ignorable="xamarin android ios wasm">
mc:Ignorable="xamarin android ios wasm">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<!-- <!--
@ -193,6 +192,8 @@
<Color x:Key="AccentHoverColor">#FF0077D7</Color> <Color x:Key="AccentHoverColor">#FF0077D7</Color>
<Color x:Key="XamarinBackgroundColor">#FFEBEBEB</Color>
<SolidColorBrush x:Key="AccentPressBackgroundColorBrush" <SolidColorBrush x:Key="AccentPressBackgroundColorBrush"
Color="{StaticResource AccentPressColor}" /> Color="{StaticResource AccentPressColor}" />
@ -229,17 +230,20 @@
<SolidColorBrush x:Key="AppControlPageTextBaseMediumHighBrush" <SolidColorBrush x:Key="AppControlPageTextBaseMediumHighBrush"
Color="{StaticResource SystemBaseMediumHighColor}" /> Color="{StaticResource SystemBaseMediumHighColor}" />
<win:RevealBackgroundBrush x:Key="AppControlHoverButtonFaceBrush" <SolidColorBrush x:Key="XamarinBackgroundBrush"
Color="#17000000" /> Color="{StaticResource XamarinBackgroundColor}" />
<xamarin:SolidColorBrush x:Key="AppControlHoverButtonFaceBrush" <win:RevealBackgroundBrush x:Key="AppControlHoverButtonFaceBrush"
Color="{ThemeResource SystemColorHighlightColor}" /> Color="#17000000" />
<win:RevealBackgroundBrush x:Key="AppControlPressedButtonFaceBrush" <xamarin:SolidColorBrush x:Key="AppControlHoverButtonFaceBrush"
Color="#30000000" /> Color="{ThemeResource SystemColorHighlightColor}" />
<xamarin:SolidColorBrush x:Key="AppControlPressedButtonFaceBrush" <win:RevealBackgroundBrush x:Key="AppControlPressedButtonFaceBrush"
Color="{ThemeResource SystemColorButtonFaceColor}" /> Color="#30000000" />
<xamarin:SolidColorBrush x:Key="AppControlPressedButtonFaceBrush"
Color="{ThemeResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="AppControlTransparentAccentColorBrush" <SolidColorBrush x:Key="AppControlTransparentAccentColorBrush"
Color="{ThemeResource SystemAccentColor}" /> Color="{ThemeResource SystemAccentColor}" />
@ -575,15 +579,68 @@
BasedOn="{StaticResource SymbolOperatorButtonStyle}" BasedOn="{StaticResource SymbolOperatorButtonStyle}"
TargetType="Controls:CalculatorButton"> TargetType="Controls:CalculatorButton">
<Setter Property="HoverBackground" <Setter Property="Template">
Value="{StaticResource AccentHoverBackgroundColorBrush}" /> <Setter.Value>
<Setter Property="HoverForeground" <ControlTemplate TargetType="Controls:CalculatorButton">
Value="{ThemeResource AccentHoverForegroundColorBrush}" /> <Grid x:Name="RootGrid"
Background="{TemplateBinding Background}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualStateGroup.Transitions>
<VisualTransition GeneratedDuration="0" />
<VisualTransition From="Normal"
GeneratedDuration="0:0:0.1"
To="KeyBoardEntry" />
</VisualStateGroup.Transitions>
<VisualState x:Name="Normal" />
<win:VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="RootGrid.(RevealBrush.State)"
Value="PointerOver" />
<Setter Target="RootGrid.Background"
Value="{StaticResource AccentHoverBackgroundColorBrush}" />
<Setter Target="ContentPresenter.(ContentPresenter.Foreground)"
Value="{ThemeResource AccentHoverForegroundColorBrush}" />
</VisualState.Setters>
</win:VisualState>
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="RootGrid.(RevealBrush.State)"
Value="Pressed" />
<Setter Target="RootGrid.Background"
Value="{StaticResource AccentPressBackgroundColorBrush}" />
<Setter Target="ContentPresenter.(ContentPresenter.Foreground)"
Value="{ThemeResource AccentHoverForegroundColorBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="ContentPresenter.Foreground"
Value="{ThemeResource SystemControlDisabledBaseLowBrush}" />
<Setter Target="ContentPresenter.BorderThickness"
Value="0" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="KeyBoardEntry" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<Setter Property="PressBackground" <ContentPresenter x:Name="ContentPresenter"
Value="{StaticResource AccentPressBackgroundColorBrush}" /> Margin="{TemplateBinding Padding}"
<Setter Property="PressForeground" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
Value="{ThemeResource AccentHoverForegroundColorBrush}" /> VerticalAlignment="{TemplateBinding VerticalAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
BorderBrush="{ThemeResource AppControlForegroundTransparentRevealBorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
AutomationProperties.AccessibilityView="Raw"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTransitions="{TemplateBinding ContentTransitions}" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style> </Style>
<!-- RESULTS --> <!-- RESULTS -->
@ -619,103 +676,103 @@
Value="Disabled" /> Value="Disabled" />
</Style> </Style>
<Style x:Key="CalculationResultStyleL" <Style x:Key="CalculationResultStyleL"
TargetType="Controls:CalculationResult"> TargetType="Controls:CalculationResult">
<Setter Property="Background" <Setter Property="Background"
Value="Transparent" /> Value="Transparent" />
<Setter Property="Foreground" <Setter Property="Foreground"
Value="{ThemeResource SystemControlPageTextBaseHighBrush}" /> Value="{ThemeResource SystemControlPageTextBaseHighBrush}" />
<Setter Property="HorizontalAlignment" <Setter Property="HorizontalAlignment"
Value="Stretch" /> Value="Stretch" />
<Setter Property="VerticalAlignment" <Setter Property="VerticalAlignment"
Value="Stretch" /> Value="Stretch" />
<Setter Property="HorizontalContentAlignment" <Setter Property="HorizontalContentAlignment"
Value="Right" /> Value="Right" />
<Setter Property="VerticalContentAlignment" <Setter Property="VerticalContentAlignment"
Value="Top" /> Value="Top" />
<Setter Property="IsTextScaleFactorEnabled" <Setter Property="IsTextScaleFactorEnabled"
Value="False" /> Value="False" />
<Setter Property="UseSystemFocusVisuals" <Setter Property="UseSystemFocusVisuals"
Value="True" /> Value="True" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Controls:CalculationResult"> <ControlTemplate TargetType="Controls:CalculationResult">
<Grid x:Name="Border" <Grid x:Name="Border"
Background="{TemplateBinding Background}"> Background="{TemplateBinding Background}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="12" /> <ColumnDefinition Width="12" />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition Width="12" /> <ColumnDefinition Width="12" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="ActiveStates"> <VisualStateGroup x:Name="ActiveStates">
<VisualState x:Name="Active" /> <VisualState x:Name="Active" />
<VisualState x:Name="Normal"> <VisualState x:Name="Normal">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="NormalOutput.FontWeight" <Setter Target="NormalOutput.FontWeight"
Value="Light" /> Value="Light" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<ScrollViewer x:Name="TextContainer" <ScrollViewer x:Name="TextContainer"
Grid.Column="1" Grid.Column="1"
Padding="0,0,0,0" Padding="0,0,0,0"
Style="{ThemeResource ResultsScrollerSnapped}" Style="{ThemeResource ResultsScrollerSnapped}"
AutomationProperties.AccessibilityView="Raw"> AutomationProperties.AccessibilityView="Raw">
<TextBlock x:Name="NormalOutput" <TextBlock x:Name="NormalOutput"
Margin="{TemplateBinding DisplayMargin}" Margin="{TemplateBinding DisplayMargin}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Text="{TemplateBinding DisplayValue}" Text="{TemplateBinding DisplayValue}"
TextAlignment="{TemplateBinding HorizontalContentAlignment}" TextAlignment="{TemplateBinding HorizontalContentAlignment}"
TextWrapping="NoWrap" /> TextWrapping="NoWrap" />
</ScrollViewer> </ScrollViewer>
<HyperlinkButton x:Name="ScrollLeft" <HyperlinkButton x:Name="ScrollLeft"
Grid.Column="0" Grid.Column="0"
Width="20" Width="20"
MinWidth="20" MinWidth="20"
MinHeight="24" MinHeight="24"
Margin="-4,0,-4,0" Margin="-4,0,-4,0"
Padding="0,-3,0,4" Padding="0,-3,0,4"
VerticalAlignment="Top" VerticalAlignment="Top"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundAccentBrush}" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
BorderThickness="0" BorderThickness="0"
Visibility="Collapsed"> Visibility="Collapsed">
<FontIcon x:Name="ScrollLeftText" <FontIcon x:Name="ScrollLeftText"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12" FontSize="12"
Glyph="&#xE26C;" /> Glyph="&#xE26C;" />
</HyperlinkButton> </HyperlinkButton>
<HyperlinkButton x:Name="ScrollRight" <HyperlinkButton x:Name="ScrollRight"
Grid.Column="2" Grid.Column="2"
Width="20" Width="20"
MinWidth="20" MinWidth="20"
MinHeight="24" MinHeight="24"
Margin="-4,0,-4,0" Margin="-4,0,-4,0"
Padding="0,-3,0,4" Padding="0,-3,0,4"
VerticalAlignment="Top" VerticalAlignment="Top"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundAccentBrush}" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
BorderThickness="0" BorderThickness="0"
Visibility="Collapsed"> Visibility="Collapsed">
<FontIcon x:Name="ScrollRightText" <FontIcon x:Name="ScrollRightText"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12" FontSize="12"
Glyph="&#xE26B;" /> Glyph="&#xE26B;" />
</HyperlinkButton> </HyperlinkButton>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="CalculationResultStyleM" <Style x:Key="CalculationResultStyleM"
TargetType="Controls:CalculationResult"> TargetType="Controls:CalculationResult">
@ -741,8 +798,8 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Controls:CalculationResult"> <ControlTemplate TargetType="Controls:CalculationResult">
<Grid x:Name="Border" <Grid x:Name="Border"
Background="{TemplateBinding Background}"> Background="{TemplateBinding Background}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="12" /> <ColumnDefinition Width="12" />
@ -750,79 +807,79 @@
<ColumnDefinition Width="12" /> <ColumnDefinition Width="12" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="ActiveStates"> <VisualStateGroup x:Name="ActiveStates">
<VisualState x:Name="Active" /> <VisualState x:Name="Active" />
<VisualState x:Name="Normal"> <VisualState x:Name="Normal">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="NormalOutput.FontWeight" <Setter Target="NormalOutput.FontWeight"
Value="Light" /> Value="Light" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<ScrollViewer x:Name="TextContainer" <ScrollViewer x:Name="TextContainer"
Grid.Column="1" Grid.Column="1"
Padding="0,0,0,0" Padding="0,0,0,0"
Style="{ThemeResource ResultsScrollerSnapped}" Style="{ThemeResource ResultsScrollerSnapped}"
AutomationProperties.AccessibilityView="Raw"> AutomationProperties.AccessibilityView="Raw">
<TextBlock x:Name="NormalOutput" <TextBlock x:Name="NormalOutput"
Margin="{TemplateBinding DisplayMargin}" Margin="{TemplateBinding DisplayMargin}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Text="{TemplateBinding DisplayValue}" Text="{TemplateBinding DisplayValue}"
TextAlignment="{TemplateBinding HorizontalContentAlignment}" TextAlignment="{TemplateBinding HorizontalContentAlignment}"
TextWrapping="NoWrap" /> TextWrapping="NoWrap" />
</ScrollViewer> </ScrollViewer>
<HyperlinkButton x:Name="ScrollLeft" <HyperlinkButton x:Name="ScrollLeft"
Grid.Column="0" Grid.Column="0"
Width="20" Width="20"
MinWidth="20" MinWidth="20"
MinHeight="24" MinHeight="24"
Margin="-4,0,-4,0" Margin="-4,0,-4,0"
Padding="0,-3,0,4" Padding="0,-3,0,4"
VerticalAlignment="Top" VerticalAlignment="Top"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundAccentBrush}" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
BorderThickness="0" BorderThickness="0"
Visibility="Collapsed"> Visibility="Collapsed">
<FontIcon x:Name="ScrollLeftText" <FontIcon x:Name="ScrollLeftText"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12" FontSize="12"
Glyph="&#xE26C;" /> Glyph="&#xE26C;" />
</HyperlinkButton> </HyperlinkButton>
<HyperlinkButton x:Name="ScrollRight" <HyperlinkButton x:Name="ScrollRight"
Grid.Column="2" Grid.Column="2"
Width="20" Width="20"
MinWidth="20" MinWidth="20"
MinHeight="24" MinHeight="24"
Margin="-4,0,-4,0" Margin="-4,0,-4,0"
Padding="0,-3,0,4" Padding="0,-3,0,4"
VerticalAlignment="Top" VerticalAlignment="Top"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundAccentBrush}" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
BorderThickness="0" BorderThickness="0"
Visibility="Collapsed"> Visibility="Collapsed">
<FontIcon x:Name="ScrollRightText" <FontIcon x:Name="ScrollRightText"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12" FontSize="12"
Glyph="&#xE26B;" /> Glyph="&#xE26B;" />
</HyperlinkButton> </HyperlinkButton>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="CalculationResultStyleS" <Style x:Key="CalculationResultStyleS"
TargetType="Controls:CalculationResult"> TargetType="Controls:CalculationResult">

41
src/Calculator.Shared/Views/MainPage.xaml
View file

@ -1,19 +1,20 @@
<Page x:Class="CalculatorApp.MainPage" <Page x:Class="CalculatorApp.MainPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:automation="using:CalculatorApp.Common.Automation" xmlns:automation="using:CalculatorApp.Common.Automation"
xmlns:common="using:CalculatorApp.Common" xmlns:common="using:CalculatorApp.Common"
xmlns:controls="using:CalculatorApp.Controls" xmlns:controls="using:CalculatorApp.Controls"
xmlns:converters="using:CalculatorApp.Converters" xmlns:converters="using:CalculatorApp.Converters"
xmlns:local="using:CalculatorApp" xmlns:local="using:CalculatorApp"
xmlns:vm="using:WindowsCalculatorShared.ViewModel" xmlns:vm="using:WindowsCalculatorShared.ViewModel"
xmlns:toolkit="using:Uno.UI.Toolkit" xmlns:toolkit="using:Uno.UI.Toolkit"
x:Name="pageRoot" x:Name="pageRoot"
Background="{ThemeResource AppChromeAcrylicHostBackdropMediumLowBrush}" Background="{ThemeResource AppChromeAcrylicHostBackdropMediumLowBrush}"
Loaded="OnPageLoaded" Loaded="OnPageLoaded"
xmlns:android="http://nventive.com/android" xmlns:xamarin="http://uno.ui/xamarin"
mc:Ignorable="android"> xmlns:android="http://nventive.com/android"
mc:Ignorable="android xamarin">
<!-- <!--
xmlns:automation="using:WindowsCalculator.Common.Automation" xmlns:automation="using:WindowsCalculator.Common.Automation"
--> -->
@ -63,7 +64,7 @@
</Page.Resources> </Page.Resources>
<Grid toolkit:VisibleBoundsPadding.PaddingMask="All" <Grid toolkit:VisibleBoundsPadding.PaddingMask="All"
android:Background="White"> xamarin:Background="{StaticResource XamarinBackgroundBrush}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<!-- <!--
@ -127,13 +128,13 @@
<!-- <!--
--> -->
<local:TitleBar x:Name="CustomTitleBar" <local:TitleBar x:Name="CustomTitleBar"
Grid.Row="0" Grid.Row="0"
Visibility="Collapsed"/> Visibility="Collapsed" />
<!--UNO TODO <!--UNO TODO
--> -->
<NavigationView x:Name="NavView" <NavigationView x:Name="NavView"
CompactModeThresholdWidth="10000" CompactModeThresholdWidth="10000"
ExpandedModeThresholdWidth="10000" ExpandedModeThresholdWidth="10000"
IsBackButtonVisible="Collapsed" IsBackButtonVisible="Collapsed"
PaneClosed="OnNavPaneClosed" PaneClosed="OnNavPaneClosed"