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 #54 from nventive/dev/dr/DateCalc2

Browse source 
Restore the Date calculator
This commit is contained in:
David 2019-05-24 22:12:32 -04:00 • committed by GitHub
commit 973ba9737f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator.Droid/Calculator.Droid.csproj
View file

@ -63,7 +63,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="1.45.0-dev.1550" /> <PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" /> <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />

2
src/Calculator.Shared/Common/LocalizationSettings.cs
View file

@ -137,7 +137,7 @@ namespace CalculatorApp
m_currencyTrailingDigits = NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits; m_currencyTrailingDigits = NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits;
m_currencySymbolPrecedence = ~(NumberFormatInfo.CurrentInfo.CurrencyPositivePattern) & 1; m_currencySymbolPrecedence = ~(NumberFormatInfo.CurrentInfo.CurrencyPositivePattern) & 1;
m_resolvedName = CultureInfo.CurrentCulture.Name; m_resolvedName = CultureInfo.CurrentCulture.Name;
m_calendarIdentifier = ""; // new Windows.Globalization.Calendar().GetCalendarSystem(); m_calendarIdentifier = new Windows.Globalization.Calendar().GetCalendarSystem();
m_firstDayOfWeek = (Windows.Globalization.DayOfWeek)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek; m_firstDayOfWeek = (Windows.Globalization.DayOfWeek)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek;
#endif #endif
} }

6
src/Calculator.Shared/Views/DateCalculator.xaml
View file

@ -581,19 +581,19 @@
Margin="0,0,0,0" Margin="0,0,0,0"
Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" /> Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" />
<!--TOOD UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
<TextBlock x:Name="DateDiffAllUnitsResultLabel" <TextBlock x:Name="DateDiffAllUnitsResultLabel"
Grid.Row="8" Grid.Row="8"
Style="{ThemeResource SubtitleTextBlockStyle}" Style="{ThemeResource SubtitleTextBlockStyle}"
FontWeight="SemiBold" FontWeight="SemiBold"
AutomationProperties.LiveSetting="Polite" AutomationProperties.LiveSetting="Polite"
AutomationProperties.Name="{Binding StrDateDiffResultAutomationName}" AutomationProperties.Name="{Binding StrDateDiffResultAutomationName}"
ContextFlyout="{StaticResource ResultsContextMenu}"
Text="{Binding StrDateDiffResult}" /> Text="{Binding StrDateDiffResult}" />
<!--TODO UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
<TextBlock Grid.Row="10" <TextBlock Grid.Row="10"
Style="{ThemeResource BaseTextBlockStyle}" Style="{ThemeResource BaseTextBlockStyle}"
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
ContextFlyout="{StaticResource ResultsContextMenu}"
Text="{Binding StrDateDiffResultInDays, Mode=OneWay}" Text="{Binding StrDateDiffResultInDays, Mode=OneWay}"
Visibility="{Binding IsDiffInDays, Converter={StaticResource BooleanToVisibilityNegationConverter}}" /> Visibility="{Binding IsDiffInDays, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
</Grid> </Grid>
@ -741,13 +741,13 @@
Grid.Row="8" Grid.Row="8"
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" /> Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" />
<!--TODO UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
<TextBlock x:Name="DateResultLabel" <TextBlock x:Name="DateResultLabel"
Grid.Row="9" Grid.Row="9"
Style="{ThemeResource SubtitleTextBlockStyle}" Style="{ThemeResource SubtitleTextBlockStyle}"
FontWeight="SemiBold" FontWeight="SemiBold"
AutomationProperties.LiveSetting="Polite" AutomationProperties.LiveSetting="Polite"
AutomationProperties.Name="{Binding StrDateResultAutomationName}" AutomationProperties.Name="{Binding StrDateResultAutomationName}"
ContextFlyout="{StaticResource ResultsContextMenu}"
Text="{Binding StrDateResult}" /> Text="{Binding StrDateResult}" />
</Grid> </Grid>
</Grid> </Grid>

2
src/Calculator.UWP/Calculator.UWP.csproj
View file

@ -9,7 +9,7 @@
<Version>4.3.1</Version> <Version>4.3.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Uno.UI"> <PackageReference Include="Uno.UI">
<Version>1.45.0-dev.1550</Version> <Version>1.45.0-dev.1560</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

2
src/Calculator.Wasm/Calculator.Wasm.csproj
View file

@ -43,7 +43,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UI" Version="1.45.0-dev.1550" /> <PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.281" /> <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.281" />
<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.276" /> <DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.276" />
</ItemGroup> </ItemGroup>

2
src/Calculator.iOS/Calculator.iOS.csproj
View file

@ -190,7 +190,7 @@
<BundleResource Include="Resources\Fonts\winjs-symbols.ttf" /> <BundleResource Include="Resources\Fonts\winjs-symbols.ttf" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="1.45.0-dev.1550" /> <PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup> </ItemGroup>