From 5eedf706048195b96dae4260f87d16de020e4824 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Wed, 24 Jul 2013 12:12:44 +0200 Subject: [PATCH 1/2] update gitzignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index cbb8760a..fdb60427 100644 --- a/.gitignore +++ b/.gitignore @@ -161,3 +161,6 @@ winphone/ *.srum Doxyfile screenshots/ +CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/sl3-wp/Microsoft.Phone.Controls.Toolkit.dll +CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/sl4-windowsphone71/Microsoft.Phone.Controls.Toolkit.dll +CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/wp8/Microsoft.Phone.Controls.Toolkit.dll From a366d0e9490597671c9c967ea9d4ce6a30314048 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Thu, 25 Jul 2013 11:08:08 +0200 Subject: [PATCH 2/2] formated classes --- .../CampusAppWP8/Api/Lecture/LectureApi.cs | 4 +- CampusAppWP8/CampusAppWP8/App.xaml | 2 +- CampusAppWP8/CampusAppWP8/App.xaml.cs | 18 +++--- .../Departments/DepartmentFavoriteFeed.cs | 4 +- .../CampusAppWP8/Feed/Link/CommonLinkFeed.cs | 2 - .../CampusAppWP8/Feed/Mensa/MensaFeed.cs | 2 - .../Feed/Openinghours/OpeninghoursFeed.cs | 1 - .../Model/Lecture/LectureActivity.cs | 4 +- .../CampusAppWP8/Model/Lecture/LectureDate.cs | 1 - .../Model/Lecture/LecturePageModel.cs | 56 +++++++++---------- .../Model/Utility/URLParamModel.cs | 3 +- .../Pages/Campusmap/CampusMapPage.xaml.cs | 14 +---- .../Departments/DepartmentIndexPage.xaml | 2 +- .../Pages/Departments/DepartmentPage.xaml | 2 +- .../CampusAppWP8/Pages/Events/EventPage.xaml | 2 +- .../Pages/Lecture/LecturePage.xaml | 2 +- .../Pages/Lecture/LecturePage.xaml.cs | 2 - .../Pages/Lecture/ResultPage.xaml.cs | 2 - .../CampusAppWP8/Pages/Links/LinkPage.xaml.cs | 3 +- .../CampusAppWP8/Pages/Mensa/MensaPage.xaml | 6 +- .../Pages/Mensa/MensaPage.xaml.cs | 2 +- .../Pages/News/NewsIndexPage.xaml | 2 +- .../CampusAppWP8/Pages/News/NewsPage.xaml | 2 +- .../CampusAppWP8/Pages/News/NewsPage.xaml.cs | 2 +- .../Openinghours/OpeninghoursPage.xaml.cs | 16 +++--- .../CampusAppWP8/Styles/ListButton.xaml | 2 +- CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs | 10 ++-- CampusAppWP8/CampusAppWP8/Utility/File.cs | 6 +- .../CampusAppWP8/Utility/HttpRequest.cs | 6 +- .../Utility/Lui/Button/GoToMapButton.cs | 10 ++-- .../Utility/Lui/Button/UpdateButtonAppBar.cs | 1 - .../CampusAppWP8/Utility/StringManager.cs | 4 +- .../CampusAppWP8/Utility/Utilities.cs | 10 ++-- .../CampusAppWP8/Utility/XmlManager.cs | 2 +- 34 files changed, 92 insertions(+), 115 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs index ddcf309d..da60d1a9 100644 --- a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs @@ -7,11 +7,9 @@ //---------------------------------------------------------------------- namespace CampusAppWP8.Feed.Lecture { - using System; + using CampusAppWP8.Model; using CampusAppWP8.Model.Lecture; using CampusAppWP8.Resources; - using CampusAppWP8.Utility; - using CampusAppWP8.Model; /// /// Class for the feed of the Lecture diff --git a/CampusAppWP8/CampusAppWP8/App.xaml b/CampusAppWP8/CampusAppWP8/App.xaml index 5358a12e..a4aef1d3 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml +++ b/CampusAppWP8/CampusAppWP8/App.xaml @@ -23,7 +23,7 @@ - diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs index e0f3e904..55788b88 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs @@ -1,13 +1,12 @@ -using System; +using CampusAppWP8.Resources; +using Microsoft.Phone.Controls; +using Microsoft.Phone.Shell; +using System; using System.Diagnostics; -using System.Resources; +using System.IO.IsolatedStorage; using System.Windows; using System.Windows.Markup; using System.Windows.Navigation; -using Microsoft.Phone.Controls; -using Microsoft.Phone.Shell; -using CampusAppWP8.Resources; -using System.IO.IsolatedStorage; namespace CampusAppWP8 @@ -84,10 +83,11 @@ namespace CampusAppWP8 public static T LoadFromIsolatedStorage(string key) { IsolatedStorageSettings isolatedStore = IsolatedStorageSettings.ApplicationSettings; - - if(isolatedStore.Contains(key)) { + + if (isolatedStore.Contains(key)) + { object value = isolatedStore[key]; - return (T)value; + return (T)value; } return default(T); } diff --git a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs index 053ad487..3d844c1a 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs @@ -7,13 +7,11 @@ //----------------------------------------------------------------------using System; namespace CampusAppWP8.Feed.Departments { - using System; using System.IO; using CampusAppWP8.Model; using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; - using CampusAppWP8.Utility; - + /// /// Feed object to handle favorite department feeds. /// diff --git a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs index 6b756de6..f63e2b37 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs @@ -71,8 +71,6 @@ namespace CampusAppWP8.Feed.Link return this.CheckIsUpToDate(lastModified); } - - /// /// Check if the model or file is up-to-date. /// diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs index 03b09f06..3188d297 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs @@ -12,7 +12,6 @@ namespace CampusAppWP8.Feed.Mensa using CampusAppWP8.Model; using CampusAppWP8.Model.Mensa; using CampusAppWP8.Resources; - using CampusAppWP8.Utility; /// /// This Class is for MensaFeeds @@ -88,7 +87,6 @@ namespace CampusAppWP8.Feed.Mensa return true; } - #endregion #endregion diff --git a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs index ae754db0..3a6f083c 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs @@ -7,7 +7,6 @@ //---------------------------------------------------------------------- namespace CampusAppWP8.Feed.Openinghours { - using System; using System.IO; using CampusAppWP8.Model; using CampusAppWP8.Model.Openinghours; diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs index 8f5b171e..f246118d 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs @@ -83,7 +83,7 @@ namespace CampusAppWP8.Model.Lecture public LectureModule Modul { get; set; } /// - /// Gets or sets LectureTitel + /// Gets or sets LectureTitle /// [XmlElement("titel")] public string Title { get; set; } @@ -196,7 +196,7 @@ namespace CampusAppWP8.Model.Lecture string result = string.Empty; foreach (LectureLecturer tmpLecturer in this.Lecturer) { - result += StringManager.AddNewLine(tmpLecturer.ToString()); + result += StringManager.AddNewLine(tmpLecturer.ToString()); } this.LecturerString = StringManager.RemvoveNewLine(result); diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs index b84ef789..701f9ef4 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs @@ -62,6 +62,5 @@ namespace CampusAppWP8.Model.Lecture /// [XmlElement("enddatum")] public string EndDate { get; set; } - } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs index 48253fb2..cca12fe5 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs @@ -21,34 +21,6 @@ namespace CampusAppWP8.Model.Lecture { #region Members - /// - /// List for the courses of the BTU - /// - /// - /// need to be extend to full list - /// - private List courseList; - - /// - /// List of the degrees - /// - private List degreeList; - - /// - /// List of the semester - /// - private List semesterList; - - /// - /// List for the number of semester (from) - /// - private List fromNumberList; - - /// - /// List for the number of semester (to) - /// - private List toNumberList; - /// /// Variable for the courseIndex /// @@ -79,6 +51,34 @@ namespace CampusAppWP8.Model.Lecture [DataMember] public int selectToIndex; + /// + /// List for the courses of the BTU + /// + /// + /// need to be extend to full list + /// + private List courseList; + + /// + /// List of the degrees + /// + private List degreeList; + + /// + /// List of the semester + /// + private List semesterList; + + /// + /// List for the number of semester (from) + /// + private List fromNumberList; + + /// + /// List for the number of semester (to) + /// + private List toNumberList; + #endregion #region Constructor diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs index 186f6d61..a439e875 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs @@ -43,6 +43,7 @@ namespace CampusAppWP8.Model.Utility this.Value = value; } #endregion + #region Proberty /// @@ -62,7 +63,7 @@ namespace CampusAppWP8.Model.Utility } /// - /// Gets or sets the token, which indicate that tha paramterlist started + /// Gets the token, which indicate that the parameterList started /// public string ParamToken { diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index 2c6d8535..9879233b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Navigation; +using CampusAppWP8.Model.Campusmap; using Microsoft.Phone.Controls; -using Microsoft.Phone.Shell; -using System.Windows.Media; -using CampusAppWP8.Model.Campusmap; -using System.Windows.Media.Imaging; +using System.Windows; +using System.Windows.Navigation; namespace CampusAppWP8.Pages.Campusmap { diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml index 8c1c6225..6ac7f84f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml @@ -66,7 +66,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml index 775f1c5d..d39e152b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml @@ -54,7 +54,7 @@ - +