diff --git a/CampusAppWP8/CampusAppWP8/App.xaml b/CampusAppWP8/CampusAppWP8/App.xaml index 57460a46..5358a12e 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml +++ b/CampusAppWP8/CampusAppWP8/App.xaml @@ -11,6 +11,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 38b47a85..236bf0a0 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -310,6 +310,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + Designer MSBuild:Compile diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs index ca79f582..f54559f5 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs @@ -8,6 +8,7 @@ namespace CampusAppWP8.Model.Lecture { using System.Collections.Generic; + using System.Linq; using System.Runtime.Serialization; using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; @@ -233,6 +234,7 @@ namespace CampusAppWP8.Model.Lecture this.courseList.Add(new ListPickerItemModel() { Text = "Architektur.Studium.Generale", Value = "858" }); this.courseList.Add(new ListPickerItemModel() { Text = "Verarbeitungstechnologien der Werkstoffe", Value = "860" }); this.courseList.Add(new ListPickerItemModel() { Text = "Forensic Sciences and Engineering", Value = "871" }); + this.courseList = this.courseList.OrderBy(o => o.Text).ToList(); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml index c17b9ab7..ac2f05cb 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml @@ -13,7 +13,7 @@ SupportedOrientations="PortraitOrLandscape" Orientation="Portrait" mc:Ignorable="d" shell:SystemTray.IsVisible="True"> - + @@ -24,13 +24,12 @@ - - - - - + + + + - + @@ -55,7 +54,7 @@ - + @@ -66,9 +65,9 @@ - - - + + + @@ -93,7 +92,7 @@ - + @@ -133,6 +132,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 1c45ce5c..d7c1c526 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.18046 +// Laufzeitversion:4.0.30319.18051 // // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. @@ -60,15 +60,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Hinzufügen ähnelt. - /// - public static string Add { - get { - return ResourceManager.GetString("Add", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Hinzufügen ähnelt. /// @@ -141,33 +132,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Löschen ähnelt. - /// - public static string Delete { - get { - return ResourceManager.GetString("Delete", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Löschung ist fehlgeschlagen ähnelt. - /// - public static string DeleteFailed { - get { - return ResourceManager.GetString("DeleteFailed", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Löschung war erfolgreich ähnelt. - /// - public static string DeleteSucceeded { - get { - return ResourceManager.GetString("DeleteSucceeded", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Lehrstühle ähnelt. /// @@ -195,15 +159,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Favoriten ähnelt. - /// - public static string Favorites { - get { - return ResourceManager.GetString("Favorites", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Hinweis ähnelt. /// @@ -223,11 +178,11 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Details ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Haus- aufgaben ähnelt. /// - public static string Info { + public static string HomeworkApp_Title2 { get { - return ResourceManager.GetString("Info", resourceCulture); + return ResourceManager.GetString("HomeworkApp_Title2", resourceCulture); } } @@ -501,6 +456,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Öffnungs- zeiten ähnelt. + /// + public static string OpenHoursApp_Title2 { + get { + return ResourceManager.GetString("OpenHoursApp_Title2", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Fachschaften ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index a7e1812e..88f17191 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -149,8 +149,8 @@ Events - - Hausaufgaben + + Haus- aufgaben Vorlesungen @@ -167,8 +167,8 @@ News - - Öffnungszeiten + + Öffnungs- zeiten Fachschaften @@ -305,4 +305,10 @@ Löschung war erfolgreich + + Hausaufgaben + + + Öffnungszeiten + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml b/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml index b356d6a7..d166dc93 100644 --- a/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml +++ b/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml @@ -2,11 +2,13 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 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" mc:Ignorable="d"> \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml b/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml new file mode 100644 index 00000000..cce829f5 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml @@ -0,0 +1,28 @@ + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml index ee5f7207..a2857099 100644 --- a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml +++ b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml @@ -28,7 +28,7 @@ - + @@ -43,90 +43,94 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs index 292a3ea7..01e98248 100644 --- a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs @@ -39,26 +39,35 @@ namespace CampusAppWP8.Pages { OpenHoursAppButton.SetValue(Grid.RowProperty, 0); OpenHoursAppButton.SetValue(Grid.ColumnProperty, 3); + OpenHoursAppButtonText.Text = AppResources.OpenHoursApp_Title; OSAAppButton.SetValue(Grid.RowProperty, 1); OSAAppButton.SetValue(Grid.ColumnProperty, 3); LinkAppButton.SetValue(Grid.RowProperty, 2); LinkAppButton.SetValue(Grid.ColumnProperty, 3); + ContentPanel.Margin = new Thickness(12, -24, 0, 0); + + HomeworkAppButtonText.Text = AppResources.HomeworkApp_Title; } else { // If not in portrait, move buttonList content to visible row and column. + ContentPanel.Margin = new Thickness(12, 0, 12, 12); OpenHoursAppButton.SetValue(Grid.RowProperty, 3); OpenHoursAppButton.SetValue(Grid.ColumnProperty, 0); + OpenHoursAppButtonText.Text = AppResources.OpenHoursApp_Title2; OSAAppButton.SetValue(Grid.RowProperty, 3); OSAAppButton.SetValue(Grid.ColumnProperty, 1); LinkAppButton.SetValue(Grid.RowProperty, 3); LinkAppButton.SetValue(Grid.ColumnProperty, 2); + ContentPanel.Margin = new Thickness(12, 0, 0, 0); + + HomeworkAppButtonText.Text = AppResources.HomeworkApp_Title2; } }