From 1a23ae92dfe4e6589fbc50e56993b8b965e21bcb Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Fri, 10 Feb 2017 02:14:58 +0100 Subject: Added DeleteButton on each ListViewItem, added editing events functionality, improved UI, cleaned up project, fixed some bugs. --- EventMaker/EventMaker/App.xaml | 55 +++++++ EventMaker/EventMaker/App.xaml.cs | 12 +- EventMaker/EventMaker/Common/RelayArgCommand.cs | 69 --------- .../EventMaker/Converter/DateTimeConverter.cs | 12 -- EventMaker/EventMaker/EventMaker.csproj | 17 ++- EventMaker/EventMaker/Handler/EventHandler.cs | 32 ---- .../EventMaker/Model/EventCatalogSingleton.cs | 9 +- .../EventMaker/Persistency/PersistencyService.cs | 2 + EventMaker/EventMaker/View/CreateEventPage.xaml | 6 +- EventMaker/EventMaker/View/CreateEventPage.xaml.cs | 11 +- EventMaker/EventMaker/View/EditEventPage.xaml | 170 +++++++++++++++++++++ EventMaker/EventMaker/View/EditEventPage.xaml.cs | 26 ++++ EventMaker/EventMaker/View/EventItem.xaml | 15 ++ EventMaker/EventMaker/View/EventItem.xaml.cs | 27 ++++ EventMaker/EventMaker/View/EventPage.xaml | 152 ++++++++++++++++-- EventMaker/EventMaker/View/EventPage.xaml.cs | 13 +- EventMaker/EventMaker/ViewModel/EventViewModel.cs | 85 +++++------ 17 files changed, 519 insertions(+), 194 deletions(-) delete mode 100644 EventMaker/EventMaker/Common/RelayArgCommand.cs delete mode 100644 EventMaker/EventMaker/Converter/DateTimeConverter.cs delete mode 100644 EventMaker/EventMaker/Handler/EventHandler.cs create mode 100644 EventMaker/EventMaker/View/EditEventPage.xaml create mode 100644 EventMaker/EventMaker/View/EditEventPage.xaml.cs create mode 100644 EventMaker/EventMaker/View/EventItem.xaml create mode 100644 EventMaker/EventMaker/View/EventItem.xaml.cs diff --git a/EventMaker/EventMaker/App.xaml b/EventMaker/EventMaker/App.xaml index 5b48429..6881b63 100644 --- a/EventMaker/EventMaker/App.xaml +++ b/EventMaker/EventMaker/App.xaml @@ -3,5 +3,60 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" RequestedTheme="Light"> + + + diff --git a/EventMaker/EventMaker/App.xaml.cs b/EventMaker/EventMaker/App.xaml.cs index 9e69362..154099a 100644 --- a/EventMaker/EventMaker/App.xaml.cs +++ b/EventMaker/EventMaker/App.xaml.cs @@ -32,11 +32,12 @@ namespace EventMaker /// Details about the launch request and process. protected override void OnLaunched(LaunchActivatedEventArgs e) { -#if DEBUG - if (System.Diagnostics.Debugger.IsAttached) - { - DebugSettings.EnableFrameRateCounter = true; - } + //#if DEBUG + // if (System.Diagnostics.Debugger.IsAttached) + // { + // DebugSettings.EnableFrameRateCounter = true; + // } + //#endif ApplicationViewTitleBar titleBar = ApplicationView.GetForCurrentView().TitleBar; if (titleBar != null) @@ -44,7 +45,6 @@ namespace EventMaker titleBar.BackgroundColor = Color.FromArgb(255, 16, 110, 190); titleBar.ButtonBackgroundColor = Color.FromArgb(255, 16, 110, 190); } -#endif Frame rootFrame = Window.Current.Content as Frame; // Do not repeat app initialization when the Window already has content, diff --git a/EventMaker/EventMaker/Common/RelayArgCommand.cs b/EventMaker/EventMaker/Common/RelayArgCommand.cs deleted file mode