From 5b59969351062e83153dee06090dc48a1c6c6397 Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Mon, 6 Feb 2017 14:58:40 +0100 Subject: Added pictures, changed colors, fixed creation of events. --- EventMaker/EventMaker/App.xaml.cs | 9 +++++ .../EventMaker/Assets/LockScreenLogo.scale-200.png | Bin 1430 -> 1101 bytes .../EventMaker/Assets/SplashScreen.scale-200.png | Bin 7700 -> 8979 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 2937 -> 4215 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 1647 -> 1555 bytes ...are44x44Logo.targetsize-24_altform-unplated.png | Bin 1255 -> 992 bytes EventMaker/EventMaker/Assets/StoreLogo.png | Bin 1451 -> 1106 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 3204 -> 4939 bytes .../EventMaker/Model/EventCatalogSingleton.cs | 3 +- EventMaker/EventMaker/Package.appxmanifest | 43 ++++++--------------- EventMaker/EventMaker/ViewModel/EventViewModel.cs | 2 +- 11 files changed, 22 insertions(+), 35 deletions(-) diff --git a/EventMaker/EventMaker/App.xaml.cs b/EventMaker/EventMaker/App.xaml.cs index 70e9070..9dbb3d6 100644 --- a/EventMaker/EventMaker/App.xaml.cs +++ b/EventMaker/EventMaker/App.xaml.cs @@ -1,7 +1,9 @@ using System; using Windows.ApplicationModel; using Windows.ApplicationModel.Activation; +using Windows.UI; using Windows.UI.Core; +using Windows.UI.ViewManagement; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Navigation; @@ -35,6 +37,13 @@ namespace EventMaker { DebugSettings.EnableFrameRateCounter = true; } + + ApplicationViewTitleBar titleBar = ApplicationView.GetForCurrentView().TitleBar; + if (titleBar != null) + { + titleBar.BackgroundColor = Color.FromArgb(255,16,110,190); + titleBar.ButtonBackgroundColor = Color.FromArgb(255, 16, 110, 190); + } #endif Frame rootFrame = Window.Current.Content as Frame; diff --git a/EventMaker/EventMaker/Assets/LockScreenLogo.scale-200.png b/EventMaker/EventMaker/Assets/LockScreenLogo.scale-200.png index 735f57a..76fd956 100644 Binary files a/EventMaker/EventMaker/Assets/LockScreenLogo.scale-200.png and b/EventMaker/EventMaker/Assets/LockScreenLogo.scale-200.png differ diff --git a/EventMaker/EventMaker/Assets/SplashScreen.scale-200.png b/EventMaker/EventMaker/Assets/SplashScreen.scale-200.png index 023e7f1..838a417 100644 Binary files a/EventMaker/EventMaker/Assets/SplashScreen.scale-200.png and b/EventMaker/EventMaker/Assets/SplashScreen.scale-200.png differ diff --git a/EventMaker/EventMaker/Assets/Square150x150Logo.scale-200.png b/EventMaker/EventMaker/Assets/Square150x150Logo.scale-200.png index af49fec..f38a480 100644 Binary files a/EventMaker/EventMaker/Assets/Square150x150Logo.scale-200.png and b/EventMaker/EventMaker/Assets/Square150x150Logo.scale-200.png differ diff --git a/EventMaker/EventMaker/Assets/Square44x44Logo.scale-200.png b/EventMaker/EventMaker/Assets/Square44x44Logo.scale-200.png index ce342a2..e95d388 100644 Binary files a/EventMaker/EventMaker/Assets/Square44x44Logo.scale-200.png and b/EventMaker/EventMaker/Assets/Square44x44Logo.scale-200.png differ diff --git a/EventMaker/EventMaker/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/EventMaker/EventMaker/Assets/Square44x44Logo.targetsize-24_altform-unplated.png index f6c02ce..0687945 100644 Binary files a/EventMaker/EventMaker/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/EventMaker/EventMaker/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/EventMaker/EventMaker/Assets/StoreLogo.png b/EventMaker/EventMaker/Assets/StoreLogo.png index 7385b56..f61e77e 100644 Binary files a/EventMaker/EventMaker/Assets/StoreLogo.png and b/EventMaker/EventMaker/Assets/StoreLogo.png differ diff --git a/EventMaker/EventMaker/Assets/Wide310x150Logo.scale-200.png b/EventMaker/EventMaker/Assets/Wide310x150Logo.scale-200.png index 288995b..8e7fd4d 100644 Binary files a/EventMaker/EventMaker/Assets/Wide310x150Logo.scale-200.png and b/EventMaker/EventMaker/Assets/Wide310x150Logo.scale-200.png differ diff --git a/EventMaker/EventMaker/Model/EventCatalogSingleton.cs b/EventMaker/EventMaker/Model/EventCatalogSingleton.cs index ffce7a4..b309870 100644 --- a/EventMaker/EventMaker/Model/EventCatalogSingleton.cs +++ b/EventMaker/EventMaker/Model/EventCatalogSingleton.cs @@ -8,7 +8,6 @@ namespace EventMaker.Model private EventCatalogSingleton() { - Events = new ObservableCollection(); LoadEventsAsync(); } public static EventCatalogSingleton Instance @@ -29,7 +28,7 @@ namespace EventMaker.Model } public async void LoadEventsAsync() { - Events = await Persistency.PersistencyService.LoadEventsFromJsonAsync(); + Events = await Persistency.PersistencyService.LoadEventsFromJsonAsync() ?? new ObservableCollection(); } public void Remove(Event eventToBeRemoved) { diff --git a/EventMaker/EventMaker/Package.appxmanifest b/EventMaker/EventMaker/Package.appxmanifest index 437eb5c..38122f1 100644 --- a/EventMaker/EventMaker/Package.appxmanifest +++ b/EventMaker/EventMaker/Package.appxmanifest @@ -1,48 +1,27 @@  - - - - - - - + + + - EventMaker - Marcin + Event Maker + Marcin Zelent Assets\StoreLogo.png - - - + - - - - - + + + + + - diff --git a/EventMaker/EventMaker/ViewModel/EventViewModel.cs b/EventMaker/EventMaker/ViewModel/EventViewModel.cs index 0638fd1..468191b 100644 --- a/EventMaker/EventMaker/ViewModel/EventViewModel.cs +++ b/EventMaker/EventMaker/ViewModel/EventViewModel.cs @@ -68,7 +68,7 @@ namespace EventMaker.ViewModel { EventCatalogSingleton = EventCatalogSingleton.Instance; EventHandler = new Handler.EventHandler(this); - CreateEventCommand = + CreateEventCommand = new RelayCommand(EventHandler.CreateEvent); DeleteEventCommand = new RelayCommand(EventHandler.DeleteEvent); DateTime dt = DateTime.Now; _date = new DateTimeOffset(dt.Year, dt.Month, dt.Day, 0, 0, 0, 0, new TimeSpan()); -- cgit v1.2.3