Added pictures, changed colors, fixed creation of events.

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
--- a/EventMaker/EventMaker/Assets/LockScreenLogo.scale-200.png
+++ b/EventMaker/EventMaker/Assets/LockScreenLogo.scale-200.png
diff --git a/EventMaker/EventMaker/Assets/SplashScreen.scale-200.png b/EventMaker/EventMaker/Assets/SplashScreen.scale-200.png
index 023e7f1..838a417 100644
--- a/EventMaker/EventMaker/Assets/SplashScreen.scale-200.png
+++ b/EventMaker/EventMaker/Assets/SplashScreen.scale-200.png
diff --git a/EventMaker/EventMaker/Assets/Square150x150Logo.scale-200.png b/EventMaker/EventMaker/Assets/Square150x150Logo.scale-200.png
index af49fec..f38a480 100644
--- a/EventMaker/EventMaker/Assets/Square150x150Logo.scale-200.png
+++ b/EventMaker/EventMaker/Assets/Square150x150Logo.scale-200.png
diff --git a/EventMaker/EventMaker/Assets/Square44x44Logo.scale-200.png b/EventMaker/EventMaker/Assets/Square44x44Logo.scale-200.png
index ce342a2..e95d388 100644
--- a/EventMaker/EventMaker/Assets/Square44x44Logo.scale-200.png
+++ b/EventMaker/EventMaker/Assets/Square44x44Logo.scale-200.png
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
--- a/EventMaker/EventMaker/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/EventMaker/EventMaker/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/EventMaker/EventMaker/Assets/StoreLogo.png b/EventMaker/EventMaker/Assets/StoreLogo.png
index 7385b56..f61e77e 100644
--- a/EventMaker/EventMaker/Assets/StoreLogo.png
+++ b/EventMaker/EventMaker/Assets/StoreLogo.png
diff --git a/EventMaker/EventMaker/Assets/Wide310x150Logo.scale-200.png b/EventMaker/EventMaker/Assets/Wide310x150Logo.scale-200.png
index 288995b..8e7fd4d 100644
--- a/EventMaker/EventMaker/Assets/Wide310x150Logo.scale-200.png
+++ b/EventMaker/EventMaker/Assets/Wide310x150Logo.scale-200.png
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<Event>();
             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<Event>();
         }
         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 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  IgnorableNamespaces="uap mp">
-
-  <Identity
-    Name="f247422f-81c6-4fd4-82da-72b8ed9681a2"
-    Publisher="CN=Marcin"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="f247422f-81c6-4fd4-82da-72b8ed9681a2" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+  <Identity Name="MarcinZelent.EventMaker" Publisher="CN=Marcin" Version="1.0.0.0" />
+  <mp:PhoneIdentity PhoneProductId="f247422f-81c6-4fd4-82da-72b8ed9681a2" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
-    <DisplayName>EventMaker</DisplayName>
-    <PublisherDisplayName>Marcin</PublisherDisplayName>
+    <DisplayName>Event Maker</DisplayName>
+    <PublisherDisplayName>Marcin Zelent</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
-
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
   </Dependencies>
-
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="x-generate" />
   </Resources>
-
   <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="EventMaker.App">
-      <uap:VisualElements
-        DisplayName="EventMaker"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="EventMaker"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="EventMaker.App">
+      <uap:VisualElements DisplayName="Event Maker" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="EventMaker" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#106EBE" />
       </uap:VisualElements>
     </Application>
   </Applications>
-
   <Capabilities>
     <Capability Name="internetClient" />
   </Capabilities>
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());