From a0cb4eb566f10e558e132b7b22d6b3ee5ba3ba57 Mon Sep 17 00:00:00 2001
From: Nicolas Champagne <nicolas.champagne@nventive.com>
Date: Mon, 27 May 2019 11:55:08 -0400
Subject: [PATCH] Fixed android margins, and prog numpad not displaying

---
 .../ViewModels/StandardCalculatorViewModel.cs          |  4 +++-
 .../Views/CalculatorProgrammerDisplayPanel.xaml        |  3 ++-
 .../Views/CalculatorProgrammerOperators.xaml           | 10 +++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs b/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
index abe58f16..c5e5d501 100644
--- a/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
+++ b/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
@@ -268,7 +268,9 @@ namespace CalculatorApp.ViewModel
             }
         }
 
-        public bool IsBinaryBitFlippingEnabled
+		public bool IsBitFlipCheckedOppositeValue => !IsBitFlipChecked;
+
+		public bool IsBinaryBitFlippingEnabled
         {
             get
             {
diff --git a/src/Calculator.Shared/Views/CalculatorProgrammerDisplayPanel.xaml b/src/Calculator.Shared/Views/CalculatorProgrammerDisplayPanel.xaml
index 7f41713e..4d1585b5 100644
--- a/src/Calculator.Shared/Views/CalculatorProgrammerDisplayPanel.xaml
+++ b/src/Calculator.Shared/Views/CalculatorProgrammerDisplayPanel.xaml
@@ -75,7 +75,8 @@
 									 Style="{StaticResource ProgKeypadRadioButtonStyle}"
 									 AutomationProperties.AutomationId="fullKeypad"
 									 Content="&#xe75f;"
-									 IsChecked="{x:Bind Model.IsBitFlipChecked, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}" />
+									 Visibility="Visible"
+									 IsChecked="{x:Bind Model.IsBitFlipCheckedOppositeValue}" />
 
 			<RadioButton x:Name="bitFlip"
 									 x:Uid="bitFlip"
diff --git a/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml b/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
index c194bf2a..5be3fa3f 100644
--- a/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
@@ -5,9 +5,11 @@
 			 xmlns:controls="using:CalculatorApp.Controls"
 			 xmlns:designdata="using:CalculatorApp.DesignData"
 			 xmlns:local="using:CalculatorApp.Views"
+			 xmlns:android="http://nventive.com/android"
+			 xmlns:not_android="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 x:Name="ControlRoot"
-			 mc:Ignorable="">
+			 mc:Ignorable="android">
 
 	<UserControl.Resources>
 		<!-- Programmer mode display radio button -->
@@ -112,7 +114,8 @@
 
 								<TextBlock x:Name="ContentPresenter"
 										   Grid.Column="2"
-										   Margin="0,2,4,-2"
+										   not_android:Margin="0,2,4,-2"
+										   android:Margin="4,0,0,0"
 										   HorizontalAlignment="Left"
 										   VerticalAlignment="Center"
 										   Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
@@ -158,7 +161,8 @@
 
 								<TextBlock x:Name="CheckedContentPresenter"
 										   Grid.Column="2"
-										   Margin="0,2,4,-2"
+										   not_android:Margin="0,2,4,-2"
+										   android:Margin="4,0,0,0"
 										   HorizontalAlignment="Left"
 										   VerticalAlignment="Center"
 										   Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}"