From af575c24f8575e2158d6f1c336d1bf1259ecdc69 Mon Sep 17 00:00:00 2001 From: Carl de Billy Date: Mon, 27 May 2019 11:05:07 -0400 Subject: [PATCH 1/4] Turn on the "xamlName" output in DOM --- src/Calculator.Wasm/Program.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Calculator.Wasm/Program.cs b/src/Calculator.Wasm/Program.cs index f6e3e9b9..122fbaa8 100644 --- a/src/Calculator.Wasm/Program.cs +++ b/src/Calculator.Wasm/Program.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging; using System; using Uno.Extensions; using Windows.UI.Xaml; +using Uno.UI; namespace WindowsCalculator.Wasm { @@ -14,7 +15,10 @@ namespace WindowsCalculator.Wasm { Console.WriteLine("Program.Main"); - Windows.UI.Xaml.Application.Start(_ => _app = new App()); + FeatureConfiguration.UIElement.AssignDOMXamlName = true; + + + Windows.UI.Xaml.Application.Start(_ => _app = new App()); } } } From 24115abec9278cb718664ea8794b16e9246c75db Mon Sep 17 00:00:00 2001 From: Carl de Billy Date: Mon, 27 May 2019 12:31:46 -0400 Subject: [PATCH 2/4] Patch because ApplicationDataContainer is not implemented in Uno --- .../ViewModels/HistoryViewModel.cs | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/src/Calculator.Shared/ViewModels/HistoryViewModel.cs b/src/Calculator.Shared/ViewModels/HistoryViewModel.cs index bef2f5bc..df165690 100644 --- a/src/Calculator.Shared/ViewModels/HistoryViewModel.cs +++ b/src/Calculator.Shared/ViewModels/HistoryViewModel.cs @@ -252,28 +252,43 @@ namespace CalculatorApp ApplicationDataContainer GetHistoryContainer(CalculationManager.CALCULATOR_MODE cMode) { - ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings; - ApplicationDataContainer historyContainer; + //ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings; + //ApplicationDataContainer historyContainer; - // naming container based on mode - string historyContainerKey = GetHistoryContainerKey(cMode); + //// naming container based on mode + //string historyContainerKey = GetHistoryContainerKey(cMode); - if (localSettings.Containers.ContainsKey(historyContainerKey)) - { - historyContainer = localSettings.Containers[historyContainerKey]; - } - else - { - // create container for adding data - historyContainer = localSettings.CreateContainer(historyContainerKey, ApplicationDataCreateDisposition.Always); - int initialHistoryVectorLength = 0; - historyContainer.Values.Add(HistoryVectorLengthKey, initialHistoryVectorLength); - } + //if (localSettings.Containers.ContainsKey(historyContainerKey)) + //{ + // historyContainer = localSettings.Containers[historyContainerKey]; + //} + //else + //{ + // // create container for adding data + // historyContainer = localSettings.CreateContainer(historyContainerKey, ApplicationDataCreateDisposition.Always); + // int initialHistoryVectorLength = 0; + // historyContainer.Values.Add(HistoryVectorLengthKey, initialHistoryVectorLength); + //} - return historyContainer; - } + //return historyContainer; - void ClearHistoryContainer(CalculationManager.CALCULATOR_MODE cMode) + ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings; + ApplicationDataContainer historyContainer = localSettings; + + // naming container based on mode + string historyContainerKey = GetHistoryContainerKey(cMode); + + if (!historyContainer.Values.ContainsKey(HistoryVectorLengthKey)) + { + int initialHistoryVectorLength = 0; + historyContainer.Values.Add(HistoryVectorLengthKey, initialHistoryVectorLength); + } + + return historyContainer; + + } + + void ClearHistoryContainer(CalculationManager.CALCULATOR_MODE cMode) { ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings; localSettings.DeleteContainer(GetHistoryContainerKey(cMode)); From d488f901126617a586aaa48c0c5fbe58a26f1ac5 Mon Sep 17 00:00:00 2001 From: Carl de Billy Date: Mon, 27 May 2019 14:29:22 -0400 Subject: [PATCH 3/4] Updated to latest Uno.UI --- src/Calculator.Droid/Calculator.Droid.csproj | 2 +- src/Calculator.UWP/Calculator.UWP.csproj | 2 +- src/Calculator.Wasm/Calculator.Wasm.csproj | 2 +- src/Calculator.iOS/Calculator.iOS.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Calculator.Droid/Calculator.Droid.csproj b/src/Calculator.Droid/Calculator.Droid.csproj index d57e2c20..46dae396 100644 --- a/src/Calculator.Droid/Calculator.Droid.csproj +++ b/src/Calculator.Droid/Calculator.Droid.csproj @@ -66,7 +66,7 @@ 12.0.2 - + diff --git a/src/Calculator.UWP/Calculator.UWP.csproj b/src/Calculator.UWP/Calculator.UWP.csproj index 4f2c9088..c8177c3e 100644 --- a/src/Calculator.UWP/Calculator.UWP.csproj +++ b/src/Calculator.UWP/Calculator.UWP.csproj @@ -9,7 +9,7 @@ 4.3.1 - 1.45.0-dev.1595 + 1.45.0-dev.1608 diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/src/Calculator.Wasm/Calculator.Wasm.csproj index 43b5980b..3bd280a2 100644 --- a/src/Calculator.Wasm/Calculator.Wasm.csproj +++ b/src/Calculator.Wasm/Calculator.Wasm.csproj @@ -44,7 +44,7 @@ - + diff --git a/src/Calculator.iOS/Calculator.iOS.csproj b/src/Calculator.iOS/Calculator.iOS.csproj index 353e5528..d8a009e4 100644 --- a/src/Calculator.iOS/Calculator.iOS.csproj +++ b/src/Calculator.iOS/Calculator.iOS.csproj @@ -208,7 +208,7 @@ 12.0.2 - + From 45e6a7519aca2b1a4c5577939d9787cda5ecb428 Mon Sep 17 00:00:00 2001 From: Carl de Billy Date: Mon, 27 May 2019 15:20:43 -0400 Subject: [PATCH 4/4] Update src/Calculator.Shared/ViewModels/HistoryViewModel.cs Co-Authored-By: David --- src/Calculator.Shared/ViewModels/HistoryViewModel.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Calculator.Shared/ViewModels/HistoryViewModel.cs b/src/Calculator.Shared/ViewModels/HistoryViewModel.cs index df165690..c7e99e72 100644 --- a/src/Calculator.Shared/ViewModels/HistoryViewModel.cs +++ b/src/Calculator.Shared/ViewModels/HistoryViewModel.cs @@ -252,6 +252,7 @@ namespace CalculatorApp ApplicationDataContainer GetHistoryContainer(CalculationManager.CALCULATOR_MODE cMode) { + // TODO UNO //ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings; //ApplicationDataContainer historyContainer;