mirror of
https://github.com/Microsoft/calculator.git
synced 2025-08-22 22:23:29 -07:00
Merge pull request #72 from nventive/dev/madi/xhange-app-name
Change name to Uno Calc
This commit is contained in:
MaximeDionNventiveCom
GitHub
commit
135500d6c7
8 changed files with 1007 additions and 872 deletions
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="uno.platform.calculator" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
|
||||
<uses-sdk android:targetSdkVersion="28" />
|
||||
<application android:label="Calculator" android:theme="@style/AppTheme" android:icon="@mipmap/ic_launcher" android:roundIcon="@drawable/ic_launcher_round"></application>
|
||||
<application android:label="Uno Calc" android:theme="@style/AppTheme" android:icon="@mipmap/ic_launcher" android:roundIcon="@drawable/ic_launcher_round"></application>
|
||||
</manifest>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="Hello">Hello World, Click Me!</string>
|
||||
<string name="ApplicationName">Calculator</string>
|
||||
<string name="ApplicationName">Uno Calc</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -125,14 +125,11 @@
|
|||
</StackPanel>
|
||||
|
||||
<!-- Title Bar -->
|
||||
<!--
|
||||
-->
|
||||
<local:TitleBar x:Name="CustomTitleBar"
|
||||
Grid.Row="0"
|
||||
Visibility="Collapsed" />
|
||||
|
||||
<!--UNO TODO
|
||||
-->
|
||||
<!-- UNO TODO -->
|
||||
<NavigationView x:Name="NavView"
|
||||
CompactModeThresholdWidth="10000"
|
||||
ExpandedModeThresholdWidth="10000"
|
||||
|
|
|
|||
|
|
@ -25,14 +25,16 @@
|
|||
<converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter" />
|
||||
<!-- TODO UNO <automation:NarratorNotifier x:Name="NarratorNotifier" Announcement="{x:Bind Model.Announcement, Mode=OneWay}"/>-->
|
||||
|
||||
<DataTemplate x:Key="UnitTemplate" x:DataType="vm:Unit">
|
||||
<DataTemplate x:Key="UnitTemplate"
|
||||
x:DataType="vm:Unit">
|
||||
<TextBlock Style="{ThemeResource BodyTextBlockStyle}"
|
||||
Text="{x:Bind Name}"
|
||||
TextWrapping="NoWrap" />
|
||||
<!--TODO UNO AutomationProperties.Name="{x:Bind AccessibleName}"-->
|
||||
</DataTemplate>
|
||||
|
||||
<DataTemplate x:Key="SelectedUnitTemplate" x:DataType="vm:Unit">
|
||||
<DataTemplate x:Key="SelectedUnitTemplate"
|
||||
x:DataType="vm:Unit">
|
||||
<TextBlock Style="{ThemeResource BodyTextBlockStyle}"
|
||||
FontWeight="SemiBold"
|
||||
Text="{x:Bind Name}"
|
||||
|
|
@ -40,27 +42,48 @@
|
|||
<!--TODO UNO AutomationProperties.Name="{x:Bind AccessibleName}"-->
|
||||
</DataTemplate>
|
||||
|
||||
<Style x:Key="ComboStyle" TargetType="ComboBox">
|
||||
<Setter Property="Padding" Value="12,0,0,0"/>
|
||||
<Setter Property="MinHeight" Value="32"/>
|
||||
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
|
||||
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="TabNavigation" Value="Once"/>
|
||||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
|
||||
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
|
||||
<Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled"/>
|
||||
<Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto"/>
|
||||
<Setter Property="ScrollViewer.IsVerticalRailEnabled" Value="True"/>
|
||||
<Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False"/>
|
||||
<Setter Property="ScrollViewer.BringIntoViewOnFocusChange" Value="True"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Left"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
||||
<Setter Property="VerticalAlignment" Value="Top"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
<Setter Property="IsTextScaleFactorEnabled" Value="True"/>
|
||||
<Setter Property="UseSystemFocusVisuals" Value="True"/>
|
||||
<Style x:Key="ComboStyle"
|
||||
TargetType="ComboBox">
|
||||
<Setter Property="Padding"
|
||||
Value="12,0,0,0" />
|
||||
<Setter Property="MinHeight"
|
||||
Value="32" />
|
||||
<Setter Property="Foreground"
|
||||
Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
|
||||
<Setter Property="Background"
|
||||
Value="{ThemeResource SystemControlBackgroundTransparentBrush}" />
|
||||
<Setter Property="BorderBrush"
|
||||
Value="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" />
|
||||
<Setter Property="BorderThickness"
|
||||
Value="0" />
|
||||
<Setter Property="TabNavigation"
|
||||
Value="Once" />
|
||||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
|
||||
Value="Disabled" />
|
||||
<Setter Property="ScrollViewer.VerticalScrollBarVisibility"
|
||||
Value="Auto" />
|
||||
<Setter Property="ScrollViewer.HorizontalScrollMode"
|
||||
Value="Disabled" />
|
||||
<Setter Property="ScrollViewer.VerticalScrollMode"
|
||||
Value="Auto" />
|
||||
<Setter Property="ScrollViewer.IsVerticalRailEnabled"
|
||||
Value="True" />
|
||||
<Setter Property="ScrollViewer.IsDeferredScrollingEnabled"
|
||||
Value="False" />
|
||||
<Setter Property="ScrollViewer.BringIntoViewOnFocusChange"
|
||||
Value="True" />
|
||||
<Setter Property="HorizontalContentAlignment"
|
||||
Value="Left" />
|
||||
<Setter Property="HorizontalAlignment"
|
||||
Value="Stretch" />
|
||||
<Setter Property="VerticalAlignment"
|
||||
Value="Top" />
|
||||
<Setter Property="VerticalContentAlignment"
|
||||
Value="Center" />
|
||||
<Setter Property="IsTextScaleFactorEnabled"
|
||||
Value="True" />
|
||||
<Setter Property="UseSystemFocusVisuals"
|
||||
Value="True" />
|
||||
<Setter Property="ItemsPanel">
|
||||
<Setter.Value>
|
||||
<ItemsPanelTemplate>
|
||||
|
|
@ -77,16 +100,22 @@
|
|||
<VisualState x:Name="Normal" />
|
||||
<VisualState x:Name="PointerOver">
|
||||
<VisualState.Setters>
|
||||
<Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/>
|
||||
<Setter Target="SelectedContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}"/>
|
||||
<Setter Target="DropDownGlyph.Fill" Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}"/>
|
||||
<Setter Target="BackgroundElement.Background"
|
||||
Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
|
||||
<Setter Target="SelectedContentPresenter.Foreground"
|
||||
Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
|
||||
<Setter Target="DropDownGlyph.Fill"
|
||||
Value="{ThemeResource SystemControlHighlightAltBaseMediumHighBrush}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Pressed">
|
||||
<VisualState.Setters>
|
||||
<Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/>
|
||||
<Setter Target="SelectedContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}"/>
|
||||
<Setter Target="DropDownGlyph.Fill" Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}"/>
|
||||
<Setter Target="BackgroundElement.Background"
|
||||
Value="{ThemeResource SystemControlHighlightTransparentBrush}" />
|
||||
<Setter Target="SelectedContentPresenter.Foreground"
|
||||
Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
|
||||
<Setter Target="DropDownGlyph.Fill"
|
||||
Value="{ThemeResource SystemControlHighlightAltBaseMediumBrush}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Disabled" />
|
||||
|
|
@ -127,7 +156,8 @@
|
|||
list but XAML forces the same style. Do not remove
|
||||
this element.
|
||||
-->
|
||||
<ContentPresenter x:Name="ContentPresenter" Opacity="0"/>
|
||||
<ContentPresenter x:Name="ContentPresenter"
|
||||
Opacity="0" />
|
||||
<ContentPresenter x:Name="SelectedContentPresenter"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
|
|
@ -183,80 +213,112 @@
|
|||
<Style x:Key="ValueBaseStyle"
|
||||
BasedOn="{StaticResource CalculationResultStyleL}"
|
||||
TargetType="controls:CalculationResult">
|
||||
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
|
||||
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Left"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Bottom"/>
|
||||
<Setter Property="FontWeight" Value="Light"/>
|
||||
<Setter Property="MinFontSize" Value="{ThemeResource BodyFontSize}"/>
|
||||
<Setter Property="Background"
|
||||
Value="{ThemeResource SystemControlBackgroundTransparentBrush}" />
|
||||
<Setter Property="Foreground"
|
||||
Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
|
||||
<Setter Property="HorizontalContentAlignment"
|
||||
Value="Left" />
|
||||
<Setter Property="VerticalContentAlignment"
|
||||
Value="Bottom" />
|
||||
<Setter Property="FontWeight"
|
||||
Value="Light" />
|
||||
<Setter Property="MinFontSize"
|
||||
Value="{ThemeResource BodyFontSize}" />
|
||||
</Style>
|
||||
<Style x:Key="ValueLargeStyle"
|
||||
BasedOn="{StaticResource ValueBaseStyle}"
|
||||
TargetType="controls:CalculationResult">
|
||||
<Setter Property="MaxFontSize" Value="46"/>
|
||||
<Setter Property="Margin" Value="-2,0,0,0"/>
|
||||
<Setter Property="DisplayMargin" Value="0,0,0,12"/>
|
||||
<Setter Property="MaxFontSize"
|
||||
Value="46" />
|
||||
<Setter Property="Margin"
|
||||
Value="-2,0,0,0" />
|
||||
<Setter Property="DisplayMargin"
|
||||
Value="0,0,0,12" />
|
||||
</Style>
|
||||
<Style x:Key="ValueMediumStyle"
|
||||
BasedOn="{StaticResource ValueBaseStyle}"
|
||||
TargetType="controls:CalculationResult">
|
||||
<Setter Property="MaxFontSize" Value="46"/>
|
||||
<Setter Property="Margin" Value="0,0,0,0"/>
|
||||
<Setter Property="DisplayMargin" Value="0,0,0,4"/>
|
||||
<Setter Property="MaxFontSize"
|
||||
Value="46" />
|
||||
<Setter Property="Margin"
|
||||
Value="0,0,0,0" />
|
||||
<Setter Property="DisplayMargin"
|
||||
Value="0,0,0,4" />
|
||||
</Style>
|
||||
<Style x:Key="CurrencySymbolBaseStyle" TargetType="TextBlock">
|
||||
<Setter Property="FontWeight" Value="Light"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Left"/>
|
||||
<Setter Property="VerticalAlignment" Value="Bottom"/>
|
||||
<Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
|
||||
<Style x:Key="CurrencySymbolBaseStyle"
|
||||
TargetType="TextBlock">
|
||||
<Setter Property="FontWeight"
|
||||
Value="Light" />
|
||||
<Setter Property="HorizontalAlignment"
|
||||
Value="Left" />
|
||||
<Setter Property="VerticalAlignment"
|
||||
Value="Bottom" />
|
||||
<Setter Property="Foreground"
|
||||
Value="{ThemeResource SystemControlPageTextBaseHighBrush}" />
|
||||
</Style>
|
||||
<Style x:Key="CurrencySymbolLargeStyle"
|
||||
BasedOn="{StaticResource CurrencySymbolBaseStyle}"
|
||||
TargetType="TextBlock">
|
||||
<Setter Property="FontSize" Value="32"/>
|
||||
<Setter Property="Margin" Value="0,0,0,17"/>
|
||||
<Setter Property="FontSize"
|
||||
Value="32" />
|
||||
<Setter Property="Margin"
|
||||
Value="0,0,0,17" />
|
||||
</Style>
|
||||
<Style x:Key="CurrencySymbolMediumStyle"
|
||||
BasedOn="{StaticResource CurrencySymbolBaseStyle}"
|
||||
TargetType="TextBlock">
|
||||
<Setter Property="FontSize" Value="24"/>
|
||||
<Setter Property="Margin" Value="0,0,0,8"/>
|
||||
<Setter Property="FontSize"
|
||||
Value="24" />
|
||||
<Setter Property="Margin"
|
||||
Value="0,0,0,8" />
|
||||
</Style>
|
||||
<Style x:Key="CurrencySymbolSmallStyle"
|
||||
BasedOn="{StaticResource CurrencySymbolBaseStyle}"
|
||||
TargetType="TextBlock">
|
||||
<Setter Property="FontSize" Value="17"/>
|
||||
<Setter Property="Margin" Value="0,0,0,7"/>
|
||||
<Setter Property="FontSize"
|
||||
Value="17" />
|
||||
<Setter Property="Margin"
|
||||
Value="0,0,0,7" />
|
||||
</Style>
|
||||
|
||||
<Style x:Key="ValueContainerStyle" TargetType="Grid">
|
||||
<Style x:Key="ValueContainerStyle"
|
||||
TargetType="Grid">
|
||||
<!-- TODO UNO <Setter Property="AutomationProperties.AccessibilityView" Value="Raw"/>-->
|
||||
</Style>
|
||||
|
||||
<Storyboard x:Key="AnimationStory">
|
||||
<!--TODO UNO Storyboard.TargetName="ConverterNumPad"-->
|
||||
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
|
||||
<EasingDoubleKeyFrame KeyTime="0" Value="0.92">
|
||||
<EasingDoubleKeyFrame KeyTime="0"
|
||||
Value="0.92">
|
||||
<EasingDoubleKeyFrame.EasingFunction>
|
||||
<ExponentialEase EasingMode="EaseOut" Exponent="5"/>
|
||||
<ExponentialEase EasingMode="EaseOut"
|
||||
Exponent="5" />
|
||||
</EasingDoubleKeyFrame.EasingFunction>
|
||||
</EasingDoubleKeyFrame>
|
||||
<EasingDoubleKeyFrame KeyTime="0:0:0.367" Value="1">
|
||||
<EasingDoubleKeyFrame KeyTime="0:0:0.367"
|
||||
Value="1">
|
||||
<EasingDoubleKeyFrame.EasingFunction>
|
||||
<ExponentialEase EasingMode="EaseOut" Exponent="5"/>
|
||||
<ExponentialEase EasingMode="EaseOut"
|
||||
Exponent="5" />
|
||||
</EasingDoubleKeyFrame.EasingFunction>
|
||||
</EasingDoubleKeyFrame>
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
<!--TODO UNO Storyboard.TargetName="ConverterNumPad"-->
|
||||
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleY)">
|
||||
<EasingDoubleKeyFrame KeyTime="0" Value="0.92">
|
||||
<EasingDoubleKeyFrame KeyTime="0"
|
||||
Value="0.92">
|
||||
<EasingDoubleKeyFrame.EasingFunction>
|
||||
<ExponentialEase EasingMode="EaseOut" Exponent="5"/>
|
||||
<ExponentialEase EasingMode="EaseOut"
|
||||
Exponent="5" />
|
||||
</EasingDoubleKeyFrame.EasingFunction>
|
||||
</EasingDoubleKeyFrame>
|
||||
<EasingDoubleKeyFrame KeyTime="0:0:0.367" Value="1">
|
||||
<EasingDoubleKeyFrame KeyTime="0:0:0.367"
|
||||
Value="1">
|
||||
<EasingDoubleKeyFrame.EasingFunction>
|
||||
<ExponentialEase EasingMode="EaseOut" Exponent="5"/>
|
||||
<ExponentialEase EasingMode="EaseOut"
|
||||
Exponent="5" />
|
||||
</EasingDoubleKeyFrame.EasingFunction>
|
||||
</EasingDoubleKeyFrame>
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
|
|
@ -285,11 +347,11 @@
|
|||
</UserControl.Resources>
|
||||
|
||||
<Grid x:Name="UnitConverterRootGrid"
|
||||
HorizontalAlignment="Stretch"
|
||||
>
|
||||
HorizontalAlignment="Stretch">
|
||||
<!--TODO UNO: AutomationProperties.LandmarkType="Main"-->
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition x:Name="RowTopNav" Height="{StaticResource HamburgerHeightGridLength}"/>
|
||||
<RowDefinition x:Name="RowTopNav"
|
||||
Height="{StaticResource HamburgerHeightGridLength}" />
|
||||
<RowDefinition x:Name="RowDisplay1"
|
||||
Height="56*"
|
||||
MinHeight="56" />
|
||||
|
|
@ -305,13 +367,18 @@
|
|||
<RowDefinition x:Name="RowDltrUnits"
|
||||
Height="Auto"
|
||||
MinHeight="48" />
|
||||
<RowDefinition x:Name="RowNumPad" Height="272*"/>
|
||||
<RowDefinition x:Name="RowNumPad"
|
||||
Height="272*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition x:Name="GutterLeft" Width="0"/>
|
||||
<ColumnDefinition x:Name="ColumnLeft" Width="1*"/>
|
||||
<ColumnDefinition x:Name="ColumnRight" Width="0"/>
|
||||
<ColumnDefinition x:Name="GutterRight" Width="0"/>
|
||||
<ColumnDefinition x:Name="GutterLeft"
|
||||
Width="0" />
|
||||
<ColumnDefinition x:Name="ColumnLeft"
|
||||
Width="1*" />
|
||||
<ColumnDefinition x:Name="ColumnRight"
|
||||
Width="0" />
|
||||
<ColumnDefinition x:Name="GutterRight"
|
||||
Width="0" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<!-- End ConverterNumPad -->
|
||||
|
||||
|
|
@ -326,121 +393,185 @@
|
|||
Threshold="1" />
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="GutterTop.Height" Value="0.5*"/>
|
||||
<Setter Target="GutterBottom.Height" Value="0.5*"/>
|
||||
<Setter Target="GutterLeft.Width" Value="48"/>
|
||||
<Setter Target="GutterRight.Width" Value="48"/>
|
||||
<Setter Target="ColumnLeft.Width" Value="1*"/>
|
||||
<Setter Target="ColumnRight.Width" Value="1*"/>
|
||||
<Setter Target="RowDisplay1.Height" Value="4*"/>
|
||||
<Setter Target="RowUnit1.Height" Value="2*"/>
|
||||
<Setter Target="RowDisplay2.Height" Value="4*"/>
|
||||
<Setter Target="RowUnit2.Height" Value="2*"/>
|
||||
<Setter Target="RowDltrUnits.Height" Value="2*"/>
|
||||
<Setter Target="CurrencyLoadingGrid.(Grid.ColumnSpan)" Value="2"/>
|
||||
<Setter Target="ConverterNumPad.(Grid.Row)" Value="1"/>
|
||||
<Setter Target="ConverterNumPad.(Grid.RowSpan)" Value="5"/>
|
||||
<Setter Target="ConverterNumPad.(Grid.Column)" Value="2"/>
|
||||
<Setter Target="ConverterNumPad.(Grid.ColumnSpan)" Value="2"/>
|
||||
<Setter Target="SupplementaryResults.VerticalAlignment" Value="Top"/>
|
||||
<Setter Target="RowNumPad.MinHeight" Value="0"/>
|
||||
<Setter Target="RowNumPad.Height" Value="0"/>
|
||||
<Setter Target="GutterTop.Height"
|
||||
Value="0.5*" />
|
||||
<Setter Target="GutterBottom.Height"
|
||||
Value="0.5*" />
|
||||
<Setter Target="GutterLeft.Width"
|
||||
Value="48" />
|
||||
<Setter Target="GutterRight.Width"
|
||||
Value="48" />
|
||||
<Setter Target="ColumnLeft.Width"
|
||||
Value="1*" />
|
||||
<Setter Target="ColumnRight.Width"
|
||||
Value="1*" />
|
||||
<Setter Target="RowDisplay1.Height"
|
||||
Value="4*" />
|
||||
<Setter Target="RowUnit1.Height"
|
||||
Value="2*" />
|
||||
<Setter Target="RowDisplay2.Height"
|
||||
Value="4*" />
|
||||
<Setter Target="RowUnit2.Height"
|
||||
Value="2*" />
|
||||
<Setter Target="RowDltrUnits.Height"
|
||||
Value="2*" />
|
||||
<Setter Target="CurrencyLoadingGrid.(Grid.ColumnSpan)"
|
||||
Value="2" />
|
||||
<Setter Target="ConverterNumPad.(Grid.Row)"
|
||||
Value="1" />
|
||||
<Setter Target="ConverterNumPad.(Grid.RowSpan)"
|
||||
Value="5" />
|
||||
<Setter Target="ConverterNumPad.(Grid.Column)"
|
||||
Value="2" />
|
||||
<Setter Target="ConverterNumPad.(Grid.ColumnSpan)"
|
||||
Value="2" />
|
||||
<Setter Target="SupplementaryResults.VerticalAlignment"
|
||||
Value="Top" />
|
||||
<Setter Target="RowNumPad.MinHeight"
|
||||
Value="0" />
|
||||
<Setter Target="RowNumPad.Height"
|
||||
Value="0" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
<VisualStateGroup x:Name="Sizing">
|
||||
<VisualState x:Name="Wide">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="768" MinWindowWidth="1280"/>
|
||||
<AdaptiveTrigger MinWindowHeight="768"
|
||||
MinWindowWidth="1280" />
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="Value1.Style" Value="{ThemeResource ValueLargeStyle}"/>
|
||||
<Setter Target="Value2.Style" Value="{ThemeResource ValueLargeStyle}"/>
|
||||
<Setter Target="CurrencySymbol1Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
|
||||
<Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
|
||||
<Setter Target="Units1.Height" Value="44"/>
|
||||
<Setter Target="Units2.Height" Value="44"/>
|
||||
<Setter Target="ConverterNegateButton.FontSize" Value="24"/>
|
||||
<Setter Target="ClearEntryButtonPos0.FontSize" Value="24"/>
|
||||
<Setter Target="BackSpaceButtonSmall.FontSize" Value="24"/>
|
||||
<Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle46}"/>
|
||||
<Setter Target="Value1.Style"
|
||||
Value="{ThemeResource ValueLargeStyle}" />
|
||||
<Setter Target="Value2.Style"
|
||||
Value="{ThemeResource ValueLargeStyle}" />
|
||||
<Setter Target="CurrencySymbol1Block.Style"
|
||||
Value="{ThemeResource CurrencySymbolLargeStyle}" />
|
||||
<Setter Target="CurrencySymbol2Block.Style"
|
||||
Value="{ThemeResource CurrencySymbolLargeStyle}" />
|
||||
<Setter Target="Units1.Height"
|
||||
Value="44" />
|
||||
<Setter Target="Units2.Height"
|
||||
Value="44" />
|
||||
<Setter Target="ConverterNegateButton.FontSize"
|
||||
Value="24" />
|
||||
<Setter Target="ClearEntryButtonPos0.FontSize"
|
||||
Value="24" />
|
||||
<Setter Target="BackSpaceButtonSmall.FontSize"
|
||||
Value="24" />
|
||||
<Setter Target="NumberPad.ButtonStyle"
|
||||
Value="{StaticResource NumericButtonStyle46}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Portrait">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="1024" MinWindowWidth="640"/>
|
||||
<AdaptiveTrigger MinWindowHeight="1024"
|
||||
MinWindowWidth="640" />
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="SupplementaryResults.VerticalAlignment" Value="Top"/>
|
||||
<Setter Target="Value1.Style" Value="{ThemeResource ValueLargeStyle}"/>
|
||||
<Setter Target="Value2.Style" Value="{ThemeResource ValueLargeStyle}"/>
|
||||
<Setter Target="CurrencySymbol1Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
|
||||
<Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
|
||||
<Setter Target="Units1.Height" Value="44"/>
|
||||
<Setter Target="Units2.Height" Value="44"/>
|
||||
<Setter Target="ConverterNegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
|
||||
<Setter Target="ClearEntryButtonPos0.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
|
||||
<Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
|
||||
<Setter Target="SupplementaryResults.VerticalAlignment"
|
||||
Value="Top" />
|
||||
<Setter Target="Value1.Style"
|
||||
Value="{ThemeResource ValueLargeStyle}" />
|
||||
<Setter Target="Value2.Style"
|
||||
Value="{ThemeResource ValueLargeStyle}" />
|
||||
<Setter Target="CurrencySymbol1Block.Style"
|
||||
Value="{ThemeResource CurrencySymbolLargeStyle}" />
|
||||
<Setter Target="CurrencySymbol2Block.Style"
|
||||
Value="{ThemeResource CurrencySymbolLargeStyle}" />
|
||||
<Setter Target="Units1.Height"
|
||||
Value="44" />
|
||||
<Setter Target="Units2.Height"
|
||||
Value="44" />
|
||||
<Setter Target="ConverterNegateButton.FontSize"
|
||||
Value="{StaticResource CalcStandardOperatorCaptionSize}" />
|
||||
<Setter Target="ClearEntryButtonPos0.FontSize"
|
||||
Value="{StaticResource CalcStandardOperatorCaptionSize}" />
|
||||
<Setter Target="NumberPad.ButtonStyle"
|
||||
Value="{StaticResource NumericButtonStyle34}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Wide640">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="640"/>
|
||||
<AdaptiveTrigger MinWindowHeight="0"
|
||||
MinWindowWidth="640" />
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="Value1.Style" Value="{ThemeResource ValueLargeStyle}"/>
|
||||
<Setter Target="Value2.Style" Value="{ThemeResource ValueLargeStyle}"/>
|
||||
<Setter Target="CurrencySymbol1Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
|
||||
<Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
|
||||
<Setter Target="Units1.Height" Value="44"/>
|
||||
<Setter Target="Units2.Height" Value="44"/>
|
||||
<Setter Target="ConverterNegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
|
||||
<Setter Target="ClearEntryButtonPos0.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
|
||||
<Setter Target="BackSpaceButtonSmall.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
|
||||
<Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
|
||||
<Setter Target="Value1.Style"
|
||||
Value="{ThemeResource ValueLargeStyle}" />
|
||||
<Setter Target="Value2.Style"
|
||||
Value="{ThemeResource ValueLargeStyle}" />
|
||||
<Setter Target="CurrencySymbol1Block.Style"
|
||||
Value="{ThemeResource CurrencySymbolLargeStyle}" />
|
||||
<Setter Target="CurrencySymbol2Block.Style"
|
||||
Value="{ThemeResource CurrencySymbolLargeStyle}" />
|
||||
<Setter Target="Units1.Height"
|
||||
Value="44" />
|
||||
<Setter Target="Units2.Height"
|
||||
Value="44" />
|
||||
<Setter Target="ConverterNegateButton.FontSize"
|
||||
Value="{StaticResource CalcStandardOperatorCaptionSize}" />
|
||||
<Setter Target="ClearEntryButtonPos0.FontSize"
|
||||
Value="{StaticResource CalcStandardOperatorCaptionSize}" />
|
||||
<Setter Target="BackSpaceButtonSmall.FontSize"
|
||||
Value="{StaticResource CalcStandardOperatorCaptionSize}" />
|
||||
<Setter Target="NumberPad.ButtonStyle"
|
||||
Value="{StaticResource NumericButtonStyle34}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="MinSizeLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}" MinWindowWidth="{StaticResource AppMinWindowWidth}"/>
|
||||
<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
|
||||
MinWindowWidth="{StaticResource AppMinWindowWidth}" />
|
||||
</VisualState.StateTriggers>
|
||||
</VisualState>
|
||||
<VisualState x:Name="DefaultLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="0"/>
|
||||
<AdaptiveTrigger MinWindowHeight="0"
|
||||
MinWindowWidth="0" />
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="ClearEntryButtonPos0.Margin" Value="1"/>
|
||||
<Setter Target="BackSpaceButtonSmall.Margin" Value="1"/>
|
||||
<Setter Target="ConverterNegateButton.Margin" Value="1"/>
|
||||
<Setter Target="ClearEntryButtonPos0.Margin"
|
||||
Value="1" />
|
||||
<Setter Target="BackSpaceButtonSmall.Margin"
|
||||
Value="1" />
|
||||
<Setter Target="ConverterNegateButton.Margin"
|
||||
Value="1" />
|
||||
|
||||
<Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle18}"/>
|
||||
<Setter Target="NumberPad.ButtonStyle"
|
||||
Value="{StaticResource NumericButtonStyle18}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
<VisualStateGroup x:Name="CurrencyTimestampStates">
|
||||
<VisualState x:Name="DefaultTimestamp">
|
||||
<VisualState.Setters>
|
||||
<Setter Target="CurrencyTimestampTextBlock.Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
|
||||
<Setter Target="CurrencyTimestampTextBlock.FontWeight" Value="Normal"/>
|
||||
<Setter Target="CurrencyTimestampTextBlock.Foreground"
|
||||
Value="{ThemeResource SystemControlPageTextBaseHighBrush}" />
|
||||
<Setter Target="CurrencyTimestampTextBlock.FontWeight"
|
||||
Value="Normal" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="WeekOldTimestamp">
|
||||
<VisualState.Setters>
|
||||
<Setter Target="CurrencyTimestampTextBlock.Foreground" Value="{ThemeResource AppControlPageTextRedColorBrush}"/>
|
||||
<Setter Target="CurrencyTimestampTextBlock.FontWeight" Value="SemiBold"/>
|
||||
<Setter Target="CurrencyTimestampTextBlock.Foreground"
|
||||
Value="{ThemeResource AppControlPageTextRedColorBrush}" />
|
||||
<Setter Target="CurrencyTimestampTextBlock.FontWeight"
|
||||
Value="SemiBold" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
<VisualStateGroup x:Name="CurrencySecondaryStatusStates">
|
||||
<VisualState x:Name="ChargesMayApplyCurrencyStatus">
|
||||
<VisualState.Setters>
|
||||
<Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextBaseHighColorBrush}"/>
|
||||
<Setter Target="CurrencySecondaryStatus.Foreground"
|
||||
Value="{ThemeResource AppControlPageTextBaseHighColorBrush}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="FailedCurrencyStatus">
|
||||
<VisualState.Setters>
|
||||
<Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextRedColorBrush}"/>
|
||||
<Setter Target="CurrencySecondaryStatus.Foreground"
|
||||
Value="{ThemeResource AppControlPageTextRedColorBrush}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
|
|
@ -448,10 +579,14 @@
|
|||
<VisualState x:Name="CurrencySymbolLeftState" />
|
||||
<VisualState x:Name="CurrencySymbolRightState">
|
||||
<VisualState.Setters>
|
||||
<Setter Target="CurrencySymbol1Block.Padding" Value="0,0,12,0"/>
|
||||
<Setter Target="CurrencySymbol2Block.Padding" Value="0,0,12,0"/>
|
||||
<Setter Target="CurrencySymbol1Block.(Grid.Column)" Value="2"/>
|
||||
<Setter Target="CurrencySymbol2Block.(Grid.Column)" Value="2"/>
|
||||
<Setter Target="CurrencySymbol1Block.Padding"
|
||||
Value="0,0,12,0" />
|
||||
<Setter Target="CurrencySymbol2Block.Padding"
|
||||
Value="0,0,12,0" />
|
||||
<Setter Target="CurrencySymbol1Block.(Grid.Column)"
|
||||
Value="2" />
|
||||
<Setter Target="CurrencySymbol2Block.(Grid.Column)"
|
||||
Value="2" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
|
|
@ -632,7 +767,8 @@
|
|||
x:Uid="RefreshButtonText"
|
||||
Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
|
||||
Click="CurrencyRefreshButton_Click" />
|
||||
<TextBlock Margin="3,7,0,0" Style="{ThemeResource CaptionTextBlockStyle}">
|
||||
<TextBlock Margin="3,7,0,0"
|
||||
Style="{ThemeResource CaptionTextBlockStyle}">
|
||||
<Run x:Name="CurrencySecondaryStatus"
|
||||
FontWeight="SemiBold"
|
||||
Text="" />
|
||||
|
|
@ -668,13 +804,15 @@
|
|||
<CompositeTransform />
|
||||
</Grid.RenderTransform>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition x:Name="GutterTop" Height="0"/>
|
||||
<RowDefinition x:Name="GutterTop"
|
||||
Height="0" />
|
||||
<RowDefinition Height="1*" />
|
||||
<RowDefinition Height="1*" />
|
||||
<RowDefinition Height="1*" />
|
||||
<RowDefinition Height="1*" />
|
||||
<RowDefinition Height="1*" />
|
||||
<RowDefinition x:Name="GutterBottom" Height="0"/>
|
||||
<RowDefinition x:Name="GutterBottom"
|
||||
Height="0" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="0.25*" />
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<Application Id="App"
|
||||
Executable="CalculatorApp.exe" EntryPoint="CalculatorApp.App">
|
||||
<uap:VisualElements
|
||||
DisplayName="Calculator"
|
||||
DisplayName="Uno Calc"
|
||||
Square150x150Logo="Assets\Square150x150Logo.png"
|
||||
Square44x44Logo="Assets\Square44x44Logo.png"
|
||||
Description="Windows Calculator"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>Uno Calculator</string>
|
||||
<string>Uno Calc</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>uno.platform.calculator</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue