From bda60de4f5c057794a931f798d3a2b0176716fe2 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbfel@tutcottbus.de>
Date: Mon, 15 Jul 2013 17:21:36 +0200
Subject: [PATCH] reafactor #100

---
 .../Model/Lecture/LecturePageModel.cs         |  7 +++
 .../Pages/Lecture/LecturePage.xaml            | 32 ++++++------
 .../Pages/Lecture/ResultPage.xaml             | 50 +++++++++++--------
 .../Pages/Lecture/ResultPage.xaml.cs          |  2 +-
 .../CampusAppWP8/Styles/ListButton.xaml       | 21 ++++++--
 5 files changed, 69 insertions(+), 43 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
index f54559f5..c0446795 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
@@ -162,6 +162,13 @@ namespace CampusAppWP8.Model.Lecture
             this.numberList.Add(new ListPickerItemModel() { Text = "2", Value = "2" });
             this.numberList.Add(new ListPickerItemModel() { Text = "3", Value = "3" });
             this.numberList.Add(new ListPickerItemModel() { Text = "4", Value = "4" });
+            this.numberList.Add(new ListPickerItemModel() { Text = "5", Value = "5" });
+            this.numberList.Add(new ListPickerItemModel() { Text = "5", Value = "6" });
+            this.numberList.Add(new ListPickerItemModel() { Text = "7", Value = "7" });
+            this.numberList.Add(new ListPickerItemModel() { Text = "8", Value = "8" });
+            this.numberList.Add(new ListPickerItemModel() { Text = "9", Value = "9" });
+            this.numberList.Add(new ListPickerItemModel() { Text = "10", Value = "10" });
+
         }
 
         /// <summary>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
index ac2f05cb..d67c3cee 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
@@ -77,7 +77,7 @@
                     <StackPanel >
                         <!-- Listpicket of degree-->
                         <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Degree, Source={StaticResource LocalizedStrings}}"/>
-                        <toolkit:ListPicker Name="Degree">
+                        <toolkit:ListPicker Name="Degree" ExpansionMode="FullScreenOnly">
                             <toolkit:ListPicker.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel>
@@ -87,9 +87,9 @@
                             </toolkit:ListPicker.ItemTemplate>
                             <toolkit:ListPicker.FullModeItemTemplate>
                                 <DataTemplate>
-                                    <StackPanel>
-                                        <TextBlock Text="{Binding Text}"/>
-                                    </StackPanel>
+                                    <Border BorderBrush="{StaticResource PhoneAccentBrush}" BorderThickness="12,0,0,0" Margin="0,0,0,6">
+                                        <TextBlock Text="{Binding Text}"  Style="{StaticResource PhoneTextGroupHeaderStyle}" TextWrapping="Wrap"/>
+                                    </Border>
                                 </DataTemplate>
                             </toolkit:ListPicker.FullModeItemTemplate>
                         </toolkit:ListPicker>
@@ -100,7 +100,7 @@
                         <!-- Listpicket of semesters(from to) -->
                         <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Term, Source={StaticResource LocalizedStrings}}"/>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <toolkit:ListPicker Width="60" Name="From" >
+                            <toolkit:ListPicker Width="60" Name="From"  ExpansionMode="FullScreenOnly">
                                 <toolkit:ListPicker.ItemTemplate>
                                     <DataTemplate>
                                         <StackPanel>
@@ -110,14 +110,14 @@
                                 </toolkit:ListPicker.ItemTemplate>
                                 <toolkit:ListPicker.FullModeItemTemplate>
                                     <DataTemplate>
-                                        <StackPanel>
-                                            <TextBlock Text="{Binding Text}"/>
-                                        </StackPanel>
+                                        <Border BorderBrush="{StaticResource PhoneAccentBrush}" BorderThickness="12,0,0,0" Margin="0,0,0,6">
+                                            <TextBlock Text="{Binding Text}"  Style="{StaticResource PhoneTextGroupHeaderStyle}" TextWrapping="Wrap"/>
+                                        </Border>
                                     </DataTemplate>
                                 </toolkit:ListPicker.FullModeItemTemplate>
                             </toolkit:ListPicker>
                             <TextBlock Text="bis" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            <toolkit:ListPicker Width="60" Name="To">
+                            <toolkit:ListPicker Width="60" Name="To" ExpansionMode="FullScreenOnly">
                                 <toolkit:ListPicker.ItemTemplate>
                                     <DataTemplate>
                                         <StackPanel>
@@ -127,9 +127,9 @@
                                 </toolkit:ListPicker.ItemTemplate>
                                 <toolkit:ListPicker.FullModeItemTemplate>
                                     <DataTemplate>
-                                        <StackPanel>
-                                            <TextBlock Text="{Binding Text}"/>
-                                        </StackPanel>
+                                        <Border BorderBrush="{StaticResource PhoneAccentBrush}" BorderThickness="12,0,0,0" Margin="0,0,0,6">
+                                            <TextBlock Text="{Binding Text}"  Style="{StaticResource PhoneTextGroupHeaderStyle}" TextWrapping="Wrap"/>
+                                        </Border>
                                     </DataTemplate>
                                 </toolkit:ListPicker.FullModeItemTemplate>
                                 
@@ -141,7 +141,7 @@
                     <StackPanel>
                         <!-- Listpicket of semster -->
                         <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Semester, Source={StaticResource LocalizedStrings}}"/>
-                        <toolkit:ListPicker Name="Semester">
+                        <toolkit:ListPicker Name="Semester" ExpansionMode="FullScreenOnly">
                             <toolkit:ListPicker.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel>
@@ -151,9 +151,9 @@
                             </toolkit:ListPicker.ItemTemplate>
                             <toolkit:ListPicker.FullModeItemTemplate>
                                 <DataTemplate>
-                                    <StackPanel>
-                                        <TextBlock Text="{Binding Text}"/>
-                                    </StackPanel>
+                                    <Border BorderBrush="{StaticResource PhoneAccentBrush}" BorderThickness="12,0,0,0" Margin="0,0,0,6">
+                                        <TextBlock Text="{Binding Text}"  Style="{StaticResource PhoneTextGroupHeaderStyle}" TextWrapping="Wrap"/>
+                                    </Border>
                                 </DataTemplate>
                             </toolkit:ListPicker.FullModeItemTemplate>
                         </toolkit:ListPicker>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
index c480700a..d4d8c4f4 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
@@ -6,6 +6,7 @@
     xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit"
     xmlns:lui="clr-namespace:CampusAppWP8.Utility.Lui.Button"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
@@ -35,29 +36,34 @@
             </ListBox.ItemContainerStyle>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <StackPanel>
-                        <lui:ToggleButton ToggleContentTag="{Binding Path=Constants.ToggleContent, Source={StaticResource Const}}" Style="{StaticResource ListButtonStyle}" >
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="auto"/>
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="auto"/>
-                                    <ColumnDefinition Width="auto"/>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-                                <TextBlock Text="{Binding Type}" Grid.Column="0" Grid.Row="0"/>
-                                <TextBlock Text=" : " Grid.Column="1" Grid.Row="0"/>
-                                <TextBlock Text="{Binding Title}" TextWrapping="Wrap" Grid.Column="2" Grid.Row="0"/>
-                            </Grid>
-                        </lui:ToggleButton>
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Visibility="Collapsed" Tag="{Binding Path=Constants.ToggleContent, Source={StaticResource Const}}">
-                            <lui:NavigateButton Name="Link"  Url="{Binding Path=Constants.PathLecture_ModulWebPage, Source={StaticResource Const}}" QuerryStringValue="{Binding Modul.Number}" QuerryStringName="{Binding Path=Constants.ParamModelLecture_ModulNumber, Source={StaticResource Const}}">
-                                <Image Source="{Binding Path=ThemelizedIcon.Link, Source={StaticResource ThemelizedIcons}}" Height="50"/>
-                            </lui:NavigateButton>
-                            <lui:NavigateButton Name="Details"  Content="Details"  Url="{Binding Path=Constants.PathLecture_ResultDetailPage, Source={StaticResource Const}}" QuerryStringValue="{Binding Id}" QuerryStringName="{Binding Path=Constants.ParamModelLecture_ActivityId, Source={StaticResource Const}}"/>
+                    <Border BorderBrush="{StaticResource PhoneContrastBackgroundBrush}" Style="{StaticResource ListButtonBorder}">
+                        <StackPanel>
+                            <lui:ToggleButton ToggleContentTag="{Binding Path=Constants.ToggleContent, Source={StaticResource Const}}" Style="{StaticResource ListButtonNoneBorder}" HorizontalContentAlignment="Left" >
+                                <Grid HorizontalAlignment="Left">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
+                                        <TextBlock Text="{Binding Type}" TextAlignment="Left" HorizontalAlignment="Left" />
+                                        <TextBlock Text=" : "/>
+                                    </StackPanel>
+                                    <TextBlock Text="{Binding Title}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="0"/>
+                                </Grid>
+                            </lui:ToggleButton>
+                            <StackPanel Tag="{Binding Path=Constants.ToggleContent, Source={StaticResource Const}}" Visibility="Collapsed">
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <lui:NavigateButton toolkit:TiltEffect.IsTiltEnabled="True" Name="Link" Url="{Binding Path=Constants.PathLecture_ModulWebPage, Source={StaticResource Const}}" QuerryStringValue="{Binding Modul.Number}" QuerryStringName="{Binding Path=Constants.ParamModelLecture_ModulNumber, Source={StaticResource Const}}">
+                                        <Image Source="{Binding Path=ThemelizedIcon.Link, Source={StaticResource ThemelizedIcons}}" Height="50"/>
+                                    </lui:NavigateButton>
+                                    <lui:NavigateButton toolkit:TiltEffect.IsTiltEnabled="True" Name="Details"  Content="Details"  Url="{Binding Path=Constants.PathLecture_ResultDetailPage, Source={StaticResource Const}}" QuerryStringValue="{Binding Id}" QuerryStringName="{Binding Path=Constants.ParamModelLecture_ActivityId, Source={StaticResource Const}}"/>
+                                </StackPanel>
+                            </StackPanel>
                         </StackPanel>
-                    </StackPanel>
+                    </Border>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
index 07e9eea7..bee3a329 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
@@ -43,7 +43,7 @@ namespace CampusAppWP8.Pages.Lecture
                 return;
             }
 
-            this.ResultList.ItemsSource = list.Activities;
+            this.ResultList.ItemsSource = list.Activities.OrderByDescending(o => o.Type).ThenBy(o => o.Title).ToList();
             base.OnNavigatedTo(e);            
         }
     }
diff --git a/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml b/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml
index d166dc93..959c2f6a 100644
--- a/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml
+++ b/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml
@@ -5,10 +5,23 @@
   xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit"
   mc:Ignorable="d">
     <Style x:Key="ListButtonStyle" TargetType="Button">
-        <Setter Property="Background" Value="{x:Null}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource PhoneAccentBrush}"/>
-        <Setter Property="BorderThickness" Value="6,1,6,1"/>
-        <Setter Property="Margin" Value="-11"/>
+        <Setter Property="Background" Value="{StaticResource PhoneBackgroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource PhoneContrastBackgroundBrush}"/>
+        <Setter Property="BorderThickness" Value="6,3,6,3"/>
+        <Setter Property="Margin" Value="-10"/>
        <Setter Property="toolkit:TiltEffect.IsTiltEnabled" Value="True"/>
     </Style>
+    <Style x:Key="ListButtonNoneBorder" TargetType="Button">
+        <Setter Property="Background" Value="{x:Null}"/>
+        <Setter Property="BorderBrush" Value="{x:Null}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Margin" Value="-10"/>
+        <Setter Property="toolkit:TiltEffect.IsTiltEnabled" Value="True"/>
+    </Style>
+    <Style x:Key="ListButtonBorder" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource PhoneBackgroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource PhoneContrastBackgroundBrush}"/>
+        <Setter Property="BorderThickness" Value="6,3,6,3"/>
+        <Setter Property="Margin" Value="0,0,0,3"/>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file