From dcb4c750f803702290822be9a075daba015335d7 Mon Sep 17 00:00:00 2001 From: Jia Ming Cheah Date: Sun, 4 Nov 2018 15:47:10 +0800 Subject: [PATCH 01/13] Updated deprecated OnPlatform deprecated syntax --- NottCS/NottCS.UWP/NottCS.UWP.csproj | 2 +- .../IndexedEventTimeSlotPicker.xaml | 10 +- .../ViewCells/EventTimeSlotPickerCell.xaml | 20 +-- NottCS/NottCS/NottCS.csproj | 10 +- NottCS/NottCS/Views/ClubPage.xaml | 9 +- .../Views/CreateEventConfirmationPage.xaml | 20 +-- NottCS/NottCS/Views/CreateEventPage.xaml | 40 +----- .../Views/EventRegistrationFormsPage.xaml | 19 +-- .../NottCS/Views/EventRegistrationPage.xaml | 11 +- NottCS/NottCS/Views/HomePage.xaml | 128 ++---------------- NottCS/NottCS/Views/ReportIssuePage.xaml | 34 +---- .../Views/Tests/EventTimeSlotPickerTest.xaml | 10 +- 12 files changed, 44 insertions(+), 269 deletions(-) diff --git a/NottCS/NottCS.UWP/NottCS.UWP.csproj b/NottCS/NottCS.UWP/NottCS.UWP.csproj index 86d0f70..ecce47b 100644 --- a/NottCS/NottCS.UWP/NottCS.UWP.csproj +++ b/NottCS/NottCS.UWP/NottCS.UWP.csproj @@ -11,7 +11,7 @@ NottCS.UWP en-US UAP - 10.0.16299.0 + 10.0.17134.0 10.0.16299.0 14 true diff --git a/NottCS/NottCS/CustomControls/IndexedEventTimeSlotPicker.xaml b/NottCS/NottCS/CustomControls/IndexedEventTimeSlotPicker.xaml index a0a9785..6aa22c6 100644 --- a/NottCS/NottCS/CustomControls/IndexedEventTimeSlotPicker.xaml +++ b/NottCS/NottCS/CustomControls/IndexedEventTimeSlotPicker.xaml @@ -8,14 +8,8 @@ - - - - - - - + SeparatorVisibility="Default" + RowHeight="{x:OnPlatform iOS=80,Android=150,UWP=130}"> diff --git a/NottCS/NottCS/CustomControls/ViewCells/EventTimeSlotPickerCell.xaml b/NottCS/NottCS/CustomControls/ViewCells/EventTimeSlotPickerCell.xaml index 27f6254..118c79d 100644 --- a/NottCS/NottCS/CustomControls/ViewCells/EventTimeSlotPickerCell.xaml +++ b/NottCS/NottCS/CustomControls/ViewCells/EventTimeSlotPickerCell.xaml @@ -18,15 +18,7 @@ - - - - - - - - - +