Merge branch 'pagesdraft2' into HEAD

Conflicts:
	CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml

CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj

@@ -218,6 +218,28 @@
     <Content Include="Assets\ApplicationIcon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Assets\icons\campus_159_dark.png" />
+    <Content Include="Assets\icons\campus_159_light.png" />
+    <Content Include="Assets\icons\departments_159_dark.png" />
+    <Content Include="Assets\icons\departments_159_light.png" />
+    <Content Include="Assets\icons\homework_159_dark.png" />
+    <Content Include="Assets\icons\homework_159_light.png" />
+    <Content Include="Assets\icons\link_159_dark.png" />
+    <Content Include="Assets\icons\link_159_light.png" />
+    <Content Include="Assets\icons\lectures_159_dark.png" />
+    <Content Include="Assets\icons\lectures_159_light.png" />
+    <Content Include="Assets\icons\mensa_159_dark.png" />
+    <Content Include="Assets\icons\mensa_159_light.png" />
+    <Content Include="Assets\icons\news_159_dark.png" />
+    <Content Include="Assets\icons\news_159_light.png" />
+    <Content Include="Assets\icons\openhours_159_dark.png" />
+    <Content Include="Assets\icons\openhours_159_light.png" />
+    <Content Include="Assets\icons\schedule_159_dark.png" />
+    <Content Include="Assets\icons\schedule_159_light.png" />
+    <Content Include="Assets\icons\student_council_159_dark.png" />
+    <Content Include="Assets\icons\student_council_159_light.png" />
+    <Content Include="Assets\icons\webmail_159_dark.png" />
+    <Content Include="Assets\icons\webmail_159_light.png" />
     <Content Include="Assets\Tiles\FlipCycleTileLarge.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml

@@ -13,7 +13,7 @@
       <Capability Name="ID_CAP_ISV_CAMERA" />
     </Capabilities>
     <Tasks>
-      <DefaultTask Name="_default" NavigationPage="pages/Lecture/LecturePage.xaml" />
+      <DefaultTask Name="_default" NavigationPage="pages/StartPage.xaml" />
     </Tasks>
     <Tokens>
       <PrimaryToken TokenID="CampusAppWP8Token" TaskName="_default">

CampusAppWP8/CampusAppWP8/pages/StartPage.xaml

@@ -44,21 +44,24 @@
             <!-- Row 0 -->
             <Button Name="TimeTableAppButton" Grid.Row="0" Grid.Column="0" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkTimetable" Source="/Assets/icons/schedule_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightTimetable" Source="/Assets/icons/schedule_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.TimeTableApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
 
             <Button Name="LectureAppButton" Grid.Row="0" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkLectures" Source="/Assets/icons/lectures_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightLectures" Source="/Assets/icons/lectures_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
 
             <Button Name="NewsAppButton" Grid.Row="0" Grid.Column="2" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100"/>
+                    <Image x:Name="ImgDarkNews" Source="/Assets/icons/news_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightNews" Source="/Assets/icons/news_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.NewsApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
@@ -66,21 +69,24 @@
             <!-- Row 1 -->
             <Button Name="MensaAppButton" Grid.Row="1" Grid.Column="0" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkMensa" Source="/Assets/icons/mensa_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightMensa" Source="/Assets/icons/mensa_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
 
             <Button Name="CampusMapAppButton" Grid.Row="1" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkCampus" Source="/Assets/icons/campus_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightCampus" Source="/Assets/icons/campus_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.CampusMapApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
 
             <Button Name="HomeworkAppButton" Grid.Row="1" Grid.Column="2" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkHomework" Source="/Assets/icons/homework_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightHomework" Source="/Assets/icons/homework_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.HomeworkApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
@@ -88,21 +94,24 @@
             <!-- Row 2 -->
             <Button Name="DepartmentAppButton" Grid.Row="2" Grid.Column="0" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel  Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkDepartments" Source="/Assets/icons/departments_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightDepartments" Source="/Assets/icons/departments_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.DepartmentApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
 
             <Button  Name="EventAppButton" Grid.Row="2" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel  Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkEvents" Source="/Assets/icons/news_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightEvents" Source="/Assets/icons/news_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.EventApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
 
             <Button Name="MailAppButton" Grid.Row="2" Grid.Column="2" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100"/>
+                    <Image x:Name="ImgDarkWebmail" Source="/Assets/icons/webmail_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightWebmail" Source="/Assets/icons/webmail_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.MailApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
@@ -110,21 +119,24 @@
             <!-- Row 3 -->
             <Button Name="OpenHoursAppButton" Grid.Row="3" Grid.Column="0"  BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100"/>
+                    <Image x:Name="ImgDarkOpenhours" Source="/Assets/icons/openhours_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightOpenhours" Source="/Assets/icons/openhours_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.OpenHoursApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
 
             <Button Name="OSAAppButton" Grid.Row="3" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkStudentcouncil" Source="/Assets/icons/student_council_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightStudentcouncil" Source="/Assets/icons/student_council_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.OSAApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>
 
             <Button Name="LinkAppButton" Grid.Row="3" Grid.Column="2" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
-                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <Image x:Name="ImgDarkLink" Source="/Assets/icons/link_159_dark.png" Height="100" Visibility="Collapsed"/>
+                    <Image x:Name="ImgLightLink" Source="/Assets/icons/link_159_light.png" Height="100" Visibility="Visible"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.LinkApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </StackPanel>
             </Button>

CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs

@@ -16,6 +16,9 @@ namespace CampusAppWP8.Pages
         public StartPage()
         {
             InitializeComponent();
+
+            if ((Visibility)Application.Current.Resources["PhoneDarkThemeVisibility"] == Visibility.Visible)
+                this.SetIconThemeToDark();
         }
 
         private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)
@@ -49,5 +52,34 @@ namespace CampusAppWP8.Pages
 
             }
         }
+
+        private void SetIconThemeToDark()
+        {
+            this.ImgLightCampus.Visibility = Visibility.Collapsed;
+            this.ImgLightDepartments.Visibility = Visibility.Collapsed;
+            this.ImgLightEvents.Visibility = Visibility.Collapsed;
+            this.ImgLightHomework.Visibility = Visibility.Collapsed;
+            this.ImgLightLectures.Visibility = Visibility.Collapsed;
+            this.ImgLightLink.Visibility = Visibility.Collapsed;
+            this.ImgLightMensa.Visibility = Visibility.Collapsed;
+            this.ImgLightNews.Visibility = Visibility.Collapsed;
+            this.ImgLightOpenhours.Visibility = Visibility.Collapsed;
+            this.ImgLightStudentcouncil.Visibility = Visibility.Collapsed;
+            this.ImgLightTimetable.Visibility = Visibility.Collapsed;
+            this.ImgLightWebmail.Visibility = Visibility.Collapsed;
+
+            this.ImgDarkCampus.Visibility = Visibility.Visible;
+            this.ImgDarkDepartments.Visibility = Visibility.Visible;
+            this.ImgDarkEvents.Visibility = Visibility.Visible;
+            this.ImgDarkHomework.Visibility = Visibility.Visible;
+            this.ImgDarkLectures.Visibility = Visibility.Visible;
+            this.ImgDarkLink.Visibility = Visibility.Visible;
+            this.ImgDarkMensa.Visibility = Visibility.Visible;
+            this.ImgDarkNews.Visibility = Visibility.Visible;
+            this.ImgDarkOpenhours.Visibility = Visibility.Visible;
+            this.ImgDarkStudentcouncil.Visibility = Visibility.Visible;
+            this.ImgDarkTimetable.Visibility = Visibility.Visible;
+            this.ImgDarkWebmail.Visibility = Visibility.Visible;
+        }
     }
 }