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

Merge pull request #72 from nventive/dev/madi/xhange-app-name

Browse source 
Change name to Uno Calc
This commit is contained in:
MaximeDionNventiveCom 2019-05-27 15:34:28 -04:00 • committed by GitHub
commit 135500d6c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 1007 additions and 872 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Calculator.Droid/Properties/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <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" /> <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> </manifest>

2
src/Calculator.Droid/Resources/values/Strings.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="Hello">Hello World, Click Me!</string> <string name="Hello">Hello World, Click Me!</string>
<string name="ApplicationName">Calculator</string> <string name="ApplicationName">Uno Calc</string>
</resources> </resources>

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

File diff suppressed because it is too large Load diff

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

@ -125,14 +125,11 @@
</StackPanel> </StackPanel>
<!-- Title Bar --> <!-- Title Bar -->
<!--
-->
<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"

168
src/Calculator.Shared/Views/NumberPad.xaml
View file

@ -1,13 +1,13 @@
<UserControl x:Class="CalculatorApp.NumberPad" <UserControl x:Class="CalculatorApp.NumberPad"
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: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.Views" xmlns:local="using:CalculatorApp.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:Name="ControlRoot" x:Name="ControlRoot"
mc:Ignorable=""> mc:Ignorable="">
<Grid x:Name="Root"> <Grid x:Name="Root">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -16,7 +16,7 @@
<RowDefinition Height="1*" /> <RowDefinition Height="1*" />
<RowDefinition Height="1*" /> <RowDefinition Height="1*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" /> <ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" /> <ColumnDefinition Width="1*" />
@ -29,85 +29,85 @@
<VisualState x:Name="ErrorLayout"> <VisualState x:Name="ErrorLayout">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="decimalSeparatorButton.IsEnabled" <Setter Target="decimalSeparatorButton.IsEnabled"
Value="false" /> Value="false" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<controls:CalculatorButton x:Name="num0Button" <controls:CalculatorButton x:Name="num0Button"
x:Uid="num0Button" x:Uid="num0Button"
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num0Button" AutomationProperties.AutomationId="num0Button"
ButtonId="Zero" /> ButtonId="Zero" />
<controls:CalculatorButton x:Name="num1Button" <controls:CalculatorButton x:Name="num1Button"
x:Uid="num1Button" x:Uid="num1Button"
Grid.Row="2" Grid.Row="2"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num1Button" AutomationProperties.AutomationId="num1Button"
ButtonId="One" /> ButtonId="One" />
<controls:CalculatorButton x:Name="num2Button" <controls:CalculatorButton x:Name="num2Button"
x:Uid="num2Button" x:Uid="num2Button"
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num2Button" AutomationProperties.AutomationId="num2Button"
ButtonId="Two" /> ButtonId="Two" />
<controls:CalculatorButton x:Name="num3Button" <controls:CalculatorButton x:Name="num3Button"
x:Uid="num3Button" x:Uid="num3Button"
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num3Button" AutomationProperties.AutomationId="num3Button"
ButtonId="Three" /> ButtonId="Three" />
<controls:CalculatorButton x:Name="num4Button" <controls:CalculatorButton x:Name="num4Button"
x:Uid="num4Button" x:Uid="num4Button"
Grid.Row="1" Grid.Row="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num4Button" AutomationProperties.AutomationId="num4Button"
ButtonId="Four" /> ButtonId="Four" />
<controls:CalculatorButton x:Name="num5Button" <controls:CalculatorButton x:Name="num5Button"
x:Uid="num5Button" x:Uid="num5Button"
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num5Button" AutomationProperties.AutomationId="num5Button"
ButtonId="Five" /> ButtonId="Five" />
<controls:CalculatorButton x:Name="num6Button" <controls:CalculatorButton x:Name="num6Button"
x:Uid="num6Button" x:Uid="num6Button"
Grid.Row="1" Grid.Row="1"
Grid.Column="2" Grid.Column="2"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num6Button" AutomationProperties.AutomationId="num6Button"
ButtonId="Six" /> ButtonId="Six" />
<controls:CalculatorButton x:Name="num7Button" <controls:CalculatorButton x:Name="num7Button"
x:Uid="num7Button" x:Uid="num7Button"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num7Button" AutomationProperties.AutomationId="num7Button"
ButtonId="Seven" /> ButtonId="Seven" />
<controls:CalculatorButton x:Name="num8Button" <controls:CalculatorButton x:Name="num8Button"
x:Uid="num8Button" x:Uid="num8Button"
Grid.Column="1" Grid.Column="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num8Button" AutomationProperties.AutomationId="num8Button"
ButtonId="Eight" /> ButtonId="Eight" />
<controls:CalculatorButton x:Name="num9Button" <controls:CalculatorButton x:Name="num9Button"
x:Uid="num9Button" x:Uid="num9Button"
Grid.Column="2" Grid.Column="2"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num9Button" AutomationProperties.AutomationId="num9Button"
ButtonId="Nine" /> ButtonId="Nine" />
<!-- <!--
This is the only button in all of the app that should ever have a explicit reference to KeyboardShortcutManager in Xaml This is the only button in all of the app that should ever have a explicit reference to KeyboardShortcutManager in Xaml
@ -117,14 +117,14 @@
string coming from the RESW file string coming from the RESW file
--> -->
<controls:CalculatorButton x:Name="decimalSeparatorButton" <controls:CalculatorButton x:Name="decimalSeparatorButton"
x:Uid="decimalSeparatorButton" x:Uid="decimalSeparatorButton"
Grid.Row="4" Grid.Row="4"
Grid.Column="2" Grid.Column="2"
Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}" Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}"
Background="{ThemeResource AppBackgroundAltMediumLowBrush}" Background="{ThemeResource AppBackgroundAltMediumLowBrush}"
AutomationProperties.AutomationId="decimalSeparatorButton" AutomationProperties.AutomationId="decimalSeparatorButton"
ButtonId="Decimal" ButtonId="Decimal"
IsEnabled="{Binding IsDecimalEnabled}" /> IsEnabled="{Binding IsDecimalEnabled}" />
<!-- UNO TODO common:KeyboardShortcutManager.Character="."--> <!-- UNO TODO common:KeyboardShortcutManager.Character="."-->
</Grid> </Grid>
</UserControl> </UserControl>

980
src/Calculator.Shared/Views/UnitConverter.xaml
View file

File diff suppressed because it is too large Load diff

2
src/Calculator.UWP/Package.appxmanifest
View file

@ -31,7 +31,7 @@
<Application Id="App" <Application Id="App"
Executable="CalculatorApp.exe" EntryPoint="CalculatorApp.App"> Executable="CalculatorApp.exe" EntryPoint="CalculatorApp.App">
<uap:VisualElements <uap:VisualElements
DisplayName="Calculator" DisplayName="Uno Calc"
Square150x150Logo="Assets\Square150x150Logo.png" Square150x150Logo="Assets\Square150x150Logo.png"
Square44x44Logo="Assets\Square44x44Logo.png" Square44x44Logo="Assets\Square44x44Logo.png"
Description="Windows Calculator" Description="Windows Calculator"

2
src/Calculator.iOS/Info.plist
View file

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>Uno Calculator</string> <string>Uno Calc</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>uno.platform.calculator</string> <string>uno.platform.calculator</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>