unoplatform
/
calculator
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

chore: Update to latest uno for Skia fixes

This commit is contained in:
Jerome Laban 2020-10-06 09:13:30 -04:00
Родитель d4409c9a89
Коммит cc9c80b8c8
8 изменённых файлов: 13 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
README.md
Просмотреть файл

@ -1,14 +1,14 @@
# Uno Calculator
The Uno Calculator is a port of the [Windows Calculator](https://github.com/microsoft/calculator) to C# and to the [Uno Platform](https://platform.uno) for iOS, macOS, Android and WebAssembly.
The Uno Calculator is a port of the [Windows Calculator](https://github.com/microsoft/calculator) to C# and to the [Uno Platform](https://platform.uno) for iOS, macOS, Android, WebAssembly and Linux.
The app provides standard, scientific, and programmer calculator functionality, as well as a set of converters between various units of measurement and currencies.
The Uno Calculator will regularly follow with the Windows Calculator updates. You can get it from the [App Store](https://bit.ly/calc-ios), [Play Store](https://play.google.com/store/apps/details?id=uno.platform.calculator), [in your browser](https://calculator.platform.uno) and of course the original calculator on the [Microsoft Store](https://www.microsoft.com/store/apps/9WZDNCRFHVN5).
The Uno Calculator will regularly follow with the Windows Calculator updates. You can get it from the [App Store](https://bit.ly/calc-ios), [Play Store](https://play.google.com/store/apps/details?id=uno.platform.calculator), [in your browser](https://calculator.platform.uno), [Snap Store for Linux](https://snapcraft.io/uno-calculator) and of course the original calculator on the [Microsoft Store](https://www.microsoft.com/store/apps/9WZDNCRFHVN5).
[![Build Status](https://uno-platform.visualstudio.com/Uno%20Platform/_apis/build/status/Uno%20Platform/Calculator%20CI?branchName=uno)](https://uno-platform.visualstudio.com/Uno%20Platform/_build?definitionId=55&_a=summary)
![Calculator Screenshot](docs/Images/CalculatorScreenshot.png)
![Calculator Screenshot](docs/Images/CalculatorScreenshot.png)
## Features
- Standard Calculator functionality which offers basic operations and evaluates commands immediately as they are entered.

2
src/Calculator.Droid/Calculator.Droid.csproj
Просмотреть файл

@ -92,7 +92,7 @@
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.2</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="3.1.0-dev.472" />
<PackageReference Include="Uno.UI" Version="3.1.0-dev.628" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />

2
src/Calculator.Shared/Controls/SupplementaryItemsControl.cs
Просмотреть файл

@ -21,7 +21,7 @@ namespace CalculatorApp.Controls
}
protected override void PrepareContainerForItemOverride(DependencyObject element, Object item)
{
{
base.PrepareContainerForItemOverride(element, item);
var supplementaryResult = (SupplementaryResult)(item);

4
src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj
Просмотреть файл

@ -20,8 +20,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" Version="3.0.0-dev.14" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="3.1.0-dev.472" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="3.0.0-dev.16" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="3.1.0-dev.628" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />

2
src/Calculator.UWP/Calculator.UWP.csproj
Просмотреть файл

@ -15,7 +15,7 @@
<Version>4.3.1</Version>
</PackageReference>
<PackageReference Include="Uno.UI">
<Version>3.1.0-dev.472</Version>
<Version>3.1.0-dev.628</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup>

6
src/Calculator.Wasm/Calculator.Wasm.csproj
Просмотреть файл

@ -51,10 +51,10 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.1.0-dev.472" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.1.0-dev.628" />
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.33" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.5.0-dev.57" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.5.0-dev.57" />
</ItemGroup>
<ItemGroup>
<MonoRuntimeMixedModeExcludedAssembly Include="Newtonsoft.Json" />

2
src/Calculator.iOS/Calculator.iOS.csproj
Просмотреть файл

@ -214,7 +214,7 @@
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.2</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="3.1.0-dev.472" />
<PackageReference Include="Uno.UI" Version="3.1.0-dev.628" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup>

2
src/Calculator.macOS/Calculator.macOS.csproj
Просмотреть файл

@ -73,7 +73,7 @@
<Reference Include="System.Memory" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.UI" Version="3.1.0-dev.472" />
<PackageReference Include="Uno.UI" Version="3.1.0-dev.628" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json">