Merge pull request #334 from unoplatform/dev/jela/uno-update7

fix: Support for NumberKeyPad
unoplatform · Nov 16, 2020 · 0bf7a0b · 0bf7a0b
2 parents 8e83d81 + 28ee03d
commit 0bf7a0b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/src/Calculator.Droid/Calculator.Droid.csproj b/src/Calculator.Droid/Calculator.Droid.csproj
@@ -93,7 +93,7 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.2</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="3.2.0-dev.377" />
+    <PackageReference Include="Uno.UI" Version="3.3.0-dev.99" />
     <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" />

diff --git a/src/Calculator.Shared/App.xaml.cs b/src/Calculator.Shared/App.xaml.cs
@@ -158,7 +158,7 @@ static void ConfigureFilters(ILoggerFactory factory)
 				)
 				.AddConsole(LogLevel.Trace);
 #else
-#if !__WASM__
+#if !__WASM__ && !HAS_UNO_SKIA
 			factory
 				.AddConsole(LogLevel.Error);
 #endif

diff --git a/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs b/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
@@ -1187,6 +1187,16 @@ int GetNumberBase()
 			{ VirtualKey.Number7, Command.Command7 },
 			{ VirtualKey.Number8, Command.Command8 },
 			{ VirtualKey.Number9, Command.Command9 },
+			{ VirtualKey.NumberPad0, Command.Command0 },
+			{ VirtualKey.NumberPad1, Command.Command1 },
+			{ VirtualKey.NumberPad2, Command.Command2 },
+			{ VirtualKey.NumberPad3, Command.Command3 },
+			{ VirtualKey.NumberPad4, Command.Command4 },
+			{ VirtualKey.NumberPad5, Command.Command5 },
+			{ VirtualKey.NumberPad6, Command.Command6 },
+			{ VirtualKey.NumberPad7, Command.Command7 },
+			{ VirtualKey.NumberPad8, Command.Command8 },
+			{ VirtualKey.NumberPad9, Command.Command9 },
 			{ VirtualKey.A, Command.CommandA },
 			{ VirtualKey.B, Command.CommandB },
 			{ VirtualKey.C, Command.CommandC },

diff --git a/src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj b/src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="Uno.SourceGenerationTasks" Version="3.0.0-dev.18" />
-    <PackageReference Include="Uno.UI.Skia.Gtk" Version="3.2.0-dev.377" />
+    <PackageReference Include="Uno.UI.Skia.Gtk" Version="3.3.0-dev.99" />
 		<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" />

diff --git a/src/Calculator.UWP/Calculator.UWP.csproj b/src/Calculator.UWP/Calculator.UWP.csproj
@@ -15,7 +15,7 @@
       <Version>4.3.1</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI">
-      <Version>3.2.0-dev.377</Version>
+      <Version>3.3.0-dev.99</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>

diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/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.2.0-dev.377" />
+		<PackageReference Include="Uno.UI.WebAssembly" Version="3.3.0-dev.99" />
 		<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.33" />
-		<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.5.0-dev.57" />
-		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.5.0-dev.57" />
+		<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.82" />
+		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.82" />
 	</ItemGroup>
 	<ItemGroup>
 		<MonoRuntimeMixedModeExcludedAssembly Include="Newtonsoft.Json" />

diff --git a/src/Calculator.iOS/Calculator.iOS.csproj b/src/Calculator.iOS/Calculator.iOS.csproj
@@ -215,7 +215,7 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.2</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="3.2.0-dev.377" />
+    <PackageReference Include="Uno.UI" Version="3.3.0-dev.99" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
   </ItemGroup>

diff --git a/src/Calculator.macOS/Calculator.macOS.csproj b/src/Calculator.macOS/Calculator.macOS.csproj
@@ -73,7 +73,7 @@
     <Reference Include="System.Memory" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="3.2.0-dev.377" />
+    <PackageReference Include="Uno.UI" Version="3.3.0-dev.99" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
     <PackageReference Include="Newtonsoft.Json">