From 425347f5431d4f06f62987922b827953802909d3 Mon Sep 17 00:00:00 2001 From: David Oliver Date: Sun, 26 May 2019 07:21:21 -0400 Subject: [PATCH 1/4] History flyout - comment out raise of never-subscribed event --- src/Calculator.Shared/Views/Calculator.xaml.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Calculator.Shared/Views/Calculator.xaml.cs b/src/Calculator.Shared/Views/Calculator.xaml.cs index bddf99f0..67812635 100644 --- a/src/Calculator.Shared/Views/Calculator.xaml.cs +++ b/src/Calculator.Shared/Views/Calculator.xaml.cs @@ -85,7 +85,7 @@ namespace CalculatorApp string m_openHistoryFlyoutAutomationName; string m_closeHistoryFlyoutAutomationName; - public ICommand HistoryButtonPressed; + public ICommand HistoryButtonPressed; Windows.UI.Xaml.Controls.PivotItem m_pivotItem; bool m_IsDigit = false; @@ -598,7 +598,8 @@ namespace CalculatorApp HistoryButton.Focus(FocusState.Programmatic); } - FullscreenFlyoutClosed(); + // UNO TODO + //FullscreenFlyoutClosed(); } public void CloseHistoryFlyout() @@ -692,7 +693,8 @@ namespace CalculatorApp MemoryButton.Focus(FocusState.Programmatic); } - FullscreenFlyoutClosed(); + // UNO TODO + //FullscreenFlyoutClosed(); } Memory GetMemory() From a7839d2ffe2f0e64ee01e5c8e50079dd22874071 Mon Sep 17 00:00:00 2001 From: David Oliver Date: Sun, 26 May 2019 23:17:52 -0400 Subject: [PATCH 2/4] Workaround ThemeDictionaries not supported Fixes error causing HistoryList item template not to be applied. --- src/Calculator.Shared/Views/HistoryList.xaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Calculator.Shared/Views/HistoryList.xaml b/src/Calculator.Shared/Views/HistoryList.xaml index 3c7b6580..46021e44 100644 --- a/src/Calculator.Shared/Views/HistoryList.xaml +++ b/src/Calculator.Shared/Views/HistoryList.xaml @@ -1,6 +1,7 @@  + mc:Ignorable="d xamarin"> @@ -41,6 +42,12 @@ + + + + From 7467460deb0f8746deacb2cb719b56ba1e44b2d2 Mon Sep 17 00:00:00 2001 From: David Oliver Date: Sun, 26 May 2019 23:20:48 -0400 Subject: [PATCH 3/4] Remove AboutFlyout workaround Conflicts with Xaml localization resolution changes. --- src/Calculator.Shared/Views/MainPage.xaml | 9 +++---- src/Calculator.Shared/Views/MainPage.xaml.cs | 27 ++++++++------------ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/Calculator.Shared/Views/MainPage.xaml b/src/Calculator.Shared/Views/MainPage.xaml index 2fba9c78..264156d5 100644 --- a/src/Calculator.Shared/Views/MainPage.xaml +++ b/src/Calculator.Shared/Views/MainPage.xaml @@ -170,10 +170,9 @@ - - - + + + - + diff --git a/src/Calculator.Shared/Views/MainPage.xaml.cs b/src/Calculator.Shared/Views/MainPage.xaml.cs index e9a112c7..9977fbc4 100644 --- a/src/Calculator.Shared/Views/MainPage.xaml.cs +++ b/src/Calculator.Shared/Views/MainPage.xaml.cs @@ -62,22 +62,15 @@ namespace CalculatorApp double sizeInInches = 0.0; - // UNO TODO - //if (SUCCEEDED(GetIntegratedDisplaySize(&sizeInInches))) - //{ - // if (sizeInInches < 7.0) // If device's display size (diagonal length) is less than 7 inches then keep the calc always in Portrait mode only - // { - // DisplayInformation.AutoRotationPreferences = DisplayOrientations.Portrait | DisplayOrientations.PortraitFlipped; - // } - //} - - //UNO_TODO /Workaround to have both the Text localisation and the glyph working on all platforms - var resourceLoader = Windows.ApplicationModel.Resources.ResourceLoader.GetForCurrentView(); - if (AboutText != null) - { - AboutText.Text = resourceLoader.GetString("AboutButton/Content"); - } - } + // UNO TODO + //if (SUCCEEDED(GetIntegratedDisplaySize(&sizeInInches))) + //{ + // if (sizeInInches < 7.0) // If device's display size (diagonal length) is less than 7 inches then keep the calc always in Portrait mode only + // { + // DisplayInformation.AutoRotationPreferences = DisplayOrientations.Portrait | DisplayOrientations.PortraitFlipped; + // } + //} + } protected override void OnNavigatedTo(NavigationEventArgs e) @@ -508,7 +501,7 @@ namespace CalculatorApp this.FindName("AboutPage"); } - AboutButton.ContextFlyout.ShowAt(AboutButton); + FlyoutBase.ShowAttachedFlyout(AboutButton); } void UnregisterEventHandlers() From dbbd879090ffd1e7fb2db851af746ed36e8e9695 Mon Sep 17 00:00:00 2001 From: David Oliver Date: Mon, 27 May 2019 11:02:41 -0400 Subject: [PATCH 4/4] Update to latest Uno --- 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 9181501b..d57e2c20 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 0860f29b..4f2c9088 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.1560 + 1.45.0-dev.1595 diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/src/Calculator.Wasm/Calculator.Wasm.csproj index 450406ca..43b5980b 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 0a2b0695..353e5528 100644 --- a/src/Calculator.iOS/Calculator.iOS.csproj +++ b/src/Calculator.iOS/Calculator.iOS.csproj @@ -208,7 +208,7 @@ 12.0.2 - +