diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/phone_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/phone_159.png new file mode 100644 index 00000000..f469f816 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/phone_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png new file mode 100644 index 00000000..731f36f8 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 4e29b502..3fdb572d 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -96,6 +96,7 @@ App.xaml + @@ -114,6 +115,8 @@ + + CampusMapPage.xaml @@ -157,6 +160,9 @@ NewsPage.xaml + + OpeninghoursPage.xaml + StartPage.xaml @@ -244,6 +250,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -268,6 +278,7 @@ PreserveNewest + @@ -284,6 +295,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs new file mode 100644 index 00000000..8200ca78 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs @@ -0,0 +1,74 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Feed.Openinghours +{ + using System; + using System.Collections.ObjectModel; + using CampusAppWP8.Model.Openinghours; + using CampusAppWP8.Utility; + + /// + /// This Class is for MesaFeeds + /// + public class OpeninghoursFeed : XmlFeed + { + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + public OpeninghoursFeed() + : base(URLList.OpeninghoursFeedURL, FileList.OpeninghoursXmlFile) + { + } + + #endregion + + #region Method + + #region Protected + + /// + /// Method implement CheckIsModelUpToDate()-Method . + /// + /// true, if model is up-to-date, otherwise false + protected override bool CheckIsModelUpToDate() + { + DateTime lastModified = this.Model.CreateTime; + return this.CheckIsUpToDate(lastModified); + } + + /// + /// Method implement CheckIsFileUpToDate()-Method . + /// + /// true, if file is up-to-date, otherwise false + protected override bool CheckIsFileUpToDate() + { + DateTime lastModified = FileManager.GetFileInfo(FileName).LastWriteTime; + return this.CheckIsUpToDate(lastModified); + } + + #endregion + + #region Private + + /// + /// Check if the model or file is up-to-date. + /// + /// Date of the last modification + /// true, if is up-to-date, otherwise false + private bool CheckIsUpToDate(DateTime lastModified) + { + return true; + } + + #endregion + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs new file mode 100644 index 00000000..8acc2b0a --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs @@ -0,0 +1,581 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Openinghours +{ + using System.Globalization; + using System.Windows; + using System.Xml.Serialization; + + /// + /// Model for menu + /// + public class OpeninghoursInstitutionModel + { + #region Member + + /// + /// German version of the institution title. + /// + private string titleDE = string.Empty; + + /// + /// English version of the institution title. + /// + private string titleEN = string.Empty; + + /// + /// Opening hours on monday. + /// + private string dayMonday = string.Empty; + + /// + /// Opening hours on tuesday. + /// + private string dayTuesday = string.Empty; + + /// + /// Opening hours on wednesday. + /// + private string dayWednesday = string.Empty; + + /// + /// Opening hours on thursday. + /// + private string dayThursday = string.Empty; + + /// + /// Opening hours on friday. + /// + private string dayFriday = string.Empty; + + /// + /// Opening hours on saturday. + /// + private string daySaturday = string.Empty; + + /// + /// Opening hours on sunday. + /// + private string daySunday = string.Empty; + + /// + /// Email address of the institution. + /// + private string infoEmail = string.Empty; + + /// + /// Phone number of the institution. + /// + private string infoPhone = string.Empty; + + /// + /// Building name where the institution is located. + /// + private string infoBuilding = string.Empty; + + /// + /// Room where the institution is located. + /// + private string infoRoom = string.Empty; + + /// + /// German version of the comment. + /// + private string commentDE = string.Empty; + + /// + /// English version of the comment. + /// + private string commentEN = string.Empty; + + #endregion + + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + public OpeninghoursInstitutionModel() + { + } + + #endregion + + #region Property + + /// + /// Gets or sets the german title of the institution. + /// + [XmlAttribute("title_de")] + public string Title_DE + { + get + { + return this.titleDE; + } + + set + { + this.titleDE = value; + } + } + + /// + /// Gets or sets the english title of the institution. + /// + [XmlAttribute("title_en")] + public string Title_EN + { + get + { + return this.titleEN; + } + + set + { + this.titleEN = value; + } + } + + /// + /// Gets or sets the open hours on monday. + /// + [XmlAttribute("monday")] + public string Monday + { + get + { + return this.dayMonday; + } + + set + { + this.dayMonday = this.FixOpeninghoursString(value); + } + } + + /// + /// Gets or sets the open hours on tuesday. + /// + [XmlAttribute("tuesday")] + public string Tuesday + { + get + { + return this.dayTuesday; + } + + set + { + this.dayTuesday = this.FixOpeninghoursString(value); + } + } + + /// + /// Gets or sets the open hours on wednesday. + /// + [XmlAttribute("wednesday")] + public string Wednesday + { + get + { + return this.dayWednesday; + } + + set + { + this.dayWednesday = this.FixOpeninghoursString(value); + } + } + + /// + /// Gets or sets the open hours on thursday. + /// + [XmlAttribute("thursday")] + public string Thursday + { + get + { + return this.dayThursday; + } + + set + { + this.dayThursday = this.FixOpeninghoursString(value); + } + } + + /// + /// Gets or sets the open hours on friday. + /// + [XmlAttribute("friday")] + public string Friday + { + get + { + return this.dayFriday; + } + + set + { + this.dayFriday = this.FixOpeninghoursString(value); + } + } + + /// + /// Gets or sets the open hours on saturday. + /// + [XmlAttribute("saturday")] + public string Saturday + { + get + { + return this.daySaturday; + } + + set + { + this.daySaturday = this.FixOpeninghoursString(value); + } + } + + /// + /// Gets or sets the open hours on sunday. + /// + [XmlAttribute("sunday")] + public string Sunday + { + get + { + return this.daySunday; + } + + set + { + this.daySunday = this.FixOpeninghoursString(value); + } + } + + /// + /// Gets or sets the email address of the institution. + /// + [XmlAttribute("email")] + public string EMail + { + get + { + return this.infoEmail; + } + + set + { + this.infoEmail = value; + } + } + + /// + /// Gets or sets the phone number of the institution. + /// + [XmlAttribute("phone")] + public string Phone + { + get + { + return this.infoPhone; + } + + set + { + this.infoPhone = value; + } + } + + /// + /// Gets or sets the building where the institution is located. + /// + [XmlAttribute("location_building")] + public string Building + { + get + { + return this.infoBuilding; + } + + set + { + this.infoBuilding = value; + } + } + + /// + /// Gets or sets the room where the institution is located. + /// + [XmlAttribute("location_room")] + public string Room + { + get + { + return this.infoRoom; + } + + set + { + this.infoRoom = value; + } + } + + /// + /// Gets or sets the german comment. + /// + [XmlAttribute("comment_de")] + public string Comment_DE + { + get + { + return this.commentDE; + } + + set + { + this.commentDE = value; + } + } + + /// + /// Gets or sets the english comment. + /// + [XmlAttribute("comment_en")] + public string Comment_EN + { + get + { + return this.commentEN; + } + + set + { + this.commentEN = value; + } + } + + /// + /// Gets the localized title. If the phone is set to german language, + /// the german title will be returned otherwise the english title. + /// + public string Title + { + get + { + if (CultureInfo.CurrentUICulture.Name.StartsWith("de")) + { + return this.titleDE; + } + else + { + return this.titleEN; + } + } + } + + /// + /// Gets the localized comment. if the phone is set to german language, + /// the german comment will be returned otherwise the english comment. + /// + public string Comment + { + get + { + if (CultureInfo.CurrentUICulture.Name.StartsWith("de")) + { + return this.commentDE; + } + else + { + return this.commentEN; + } + } + } + + /// + /// Gets a string containing the email address and the institution + /// title separated by ':'. + /// + public string EMailTitle + { + get + { + return this.EMail + ":" + this.Title; + } + } + + /// + /// Gets a string containing the phone number and the institution + /// title separated by ':'. + /// + public string PhoneTitle + { + get + { + return this.Phone + ":" + this.Title; + } + } + + /// + /// Gets the visibility state of the monday TextBlock. + /// + public Visibility VisibleMonday + { + get + { + return ((this.dayMonday == string.Empty) || (this.dayMonday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the tuesday TextBlock. + /// + public Visibility VisibleTuesday + { + get + { + return ((this.dayTuesday == string.Empty) || (this.dayTuesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the wednesday TextBlock. + /// + public Visibility VisibleWednesday + { + get + { + return ((this.dayWednesday == string.Empty) || (this.dayWednesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the thursday TextBlock. + /// + public Visibility VisibleThursday + { + get + { + return ((this.dayThursday == string.Empty) || (this.dayThursday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the friday TextBlock. + /// + public Visibility VisibleFriday + { + get + { + return ((this.dayFriday == string.Empty) || (this.dayFriday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the saturday TextBlock. + /// + public Visibility VisibleSaturday + { + get + { + return ((this.daySaturday == string.Empty) || (this.daySaturday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the sunday TextBlock. + /// + public Visibility VisibleSunday + { + get + { + return ((this.daySunday == string.Empty) || (this.daySunday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the comment. + /// + public Visibility VisibleComment + { + get + { + return ((this.Comment == string.Empty) || (this.Comment.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the email address. + /// + public Visibility VisibleEMail + { + get + { + return ((this.infoEmail == string.Empty) || (this.infoEmail.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the phone number. + /// + public Visibility VisiblePhone + { + get + { + return ((this.infoPhone == string.Empty) || (this.infoPhone.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the room. + /// + public Visibility VisibleRoom + { + get + { + return ((this.infoRoom == string.Empty) || (this.infoRoom.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the building. + /// + public Visibility VisibleBuilding + { + get + { + return ((this.infoBuilding == string.Empty) || (this.infoBuilding.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + #endregion + + #region Method + + /// + /// Removes unwanted chars in a string. + /// + /// input string + /// fixed string + private string FixOpeninghoursString(string str) + { + string retValue = string.Empty; + + retValue = str.Replace(" | ", "\n"); + + return retValue; + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs new file mode 100644 index 00000000..77d3a16a --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs @@ -0,0 +1,79 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Openinghours +{ + using System; + using System.Collections.ObjectModel; + using System.Xml.Serialization; + + /// + /// Model for opening hours. + /// + [XmlRoot("root")] + public class OpeninghoursModel + { + #region Member + + /// + /// Time when the model was created. + /// + private readonly DateTime createTime; + + /// + /// Gets or sets feed information item list. + /// + [XmlArray("data")] + [XmlArrayItem("institution")] + public ObservableCollection institutions { get; set; } + + #endregion + + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + public OpeninghoursModel() + { + this.createTime = DateTime.Now; + } + + #endregion + + #region Property + + /// + /// Gets the creation time of the model. + /// + public DateTime CreateTime + { + get + { + return this.createTime; + } + } + + /// + /// Gets the Institutions. + /// + public ObservableCollection Institutions + { + get + { + return this.institutions; + } + } + + #endregion + + #region Method + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml new file mode 100644 index 00000000..e3c11807 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs new file mode 100644 index 00000000..6c577d86 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs @@ -0,0 +1,196 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Pages.Openinghours +{ + using System.Linq; + using System.Windows; + using System.Windows.Controls; + using System.Windows.Navigation; + using CampusAppWP8.Feed.Openinghours; + using CampusAppWP8.Utility; + using Microsoft.Phone.Controls; + using Microsoft.Phone.Tasks; + + /// + /// Opening hours page. + /// + public partial class OpeninghoursPage : PhoneApplicationPage + { + #region Members + + /// + /// Opening hours feed object. + /// + private OpeninghoursFeed feed = null; + + /// + /// last visible UI element. + /// + private UIElement lastOpenUIElem = null; + + #endregion + + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + public OpeninghoursPage() + { + this.InitializeComponent(); + this.InitializeFeed(); + } + + #endregion + + #region Method + + #region protected + + /// + /// Override the OnNavigatedTo method. + /// + /// Arguments of navigation + protected override void OnNavigatedTo(NavigationEventArgs e) + { + base.OnNavigatedTo(e); + if (this.feed == null) + { + this.InitializeFeed(); + } + + if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) + { + this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + } + + this.feed.LoadFeed(); + } + + // protected + #endregion + + #region private + + /// + /// Initialize the opening hours feed. + /// + private void InitializeFeed() + { + this.feed = new OpeninghoursFeed(); + this.feed.EventHandler.FeedIsReadyEvent += new FeedEventHandler.FeedReadyHandler(this.FeedIsReady); + } + + /// + /// Will be execute if the feed is ready. + /// + private void FeedIsReady() + { + this.SetupInstitutionList(); + this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + } + + /// + /// Setup the institution list. + /// + private void SetupInstitutionList() + { + this.InstitutionPanel.ItemsSource = this.feed.Model.Institutions; + } + + /// + /// Called on clicking on a institution. + /// + /// button object + /// event args + private void InstitutionBtn_Click(object sender, RoutedEventArgs e) + { + if (this.lastOpenUIElem != null) + { + this.lastOpenUIElem.Visibility = Visibility.Collapsed; + } + + FrameworkElement btn = sender as FrameworkElement; + StackPanel parent = btn.Parent as StackPanel; + + if (parent.Children.Count() >= 2) + { + if (this.lastOpenUIElem != parent.Children[1]) + { + this.lastOpenUIElem = parent.Children[1]; + this.lastOpenUIElem.Visibility = Visibility.Visible; + } + else + { + this.lastOpenUIElem = null; + } + } + } + + /// + /// Called on clicking on a mail button. + /// + /// button object + /// event args + private void EMailBtn_Click(object sender, RoutedEventArgs e) + { + FrameworkElement tempUIElem = sender as FrameworkElement; + + string[] info = tempUIElem.Tag.ToString().Split(':'); + + if ((info.Count() > 0) && (info[0] != null)) + { + EmailComposeTask emailTask = new EmailComposeTask(); + emailTask.To = "mailto:" + info[0]; + emailTask.Show(); + } + } + + /// + /// Called on clicking on a phone button. + /// + /// button object + /// event args + private void PhoneBtn_Click(object sender, RoutedEventArgs e) + { + FrameworkElement tempUIElem = sender as FrameworkElement; + PhoneCallTask phoneCallTask = new PhoneCallTask(); + + string[] info = tempUIElem.Tag.ToString().Split(':'); + + if ((info.Count() > 0) && (info[0] != null)) + { + phoneCallTask.PhoneNumber = info[0]; + } + + if ((info.Count() > 1) && (info[1] != null)) + { + phoneCallTask.DisplayName = info[1]; + } + + phoneCallTask.Show(); + } + + /// + /// Called on clicking on a location button. + /// + /// button object + /// event args + private void LocationBtn_Click(object sender, RoutedEventArgs e) + { + FrameworkElement tempUIElem = sender as FrameworkElement; + + // TODO: open campusmap + } + + // private + #endregion + // Method + #endregion + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml index f4b319d3..7eaa8266 100644 --- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml +++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml @@ -11,6 +11,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index de8c1c1f..c7b511b2 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -87,6 +87,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Gebäude ähnelt. + /// + public static string Building { + get { + return ResourceManager.GetString("Building", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Campusplan ähnelt. /// @@ -150,6 +159,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Hinweis ähnelt. + /// + public static string Hint { + get { + return ResourceManager.GetString("Hint", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Hausaufgaben ähnelt. /// @@ -447,6 +465,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Raum ähnelt. + /// + public static string Room { + get { + return ResourceManager.GetString("Room", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Beispielwert für die Laufzeiteigenschaft ähnelt. /// @@ -474,6 +501,24 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Samstag ähnelt. + /// + public static string Time_Day_Saturday { + get { + return ResourceManager.GetString("Time_Day_Saturday", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Sonntag ähnelt. + /// + public static string Time_Day_Sunday { + get { + return ResourceManager.GetString("Time_Day_Sunday", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Donnerstag ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 5881da70..4aa62828 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -272,4 +272,19 @@ Studiengangauswahl + + Gebäude + + + Hinweis + + + Raum + + + Samstag + + + Sonntag + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index 9db1581b..c4881720 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -231,6 +231,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die /Pages/Openinghours/OpeninghoursPage.xaml ähnelt. + /// + internal static string PathOpeninghours_OpeninghoursPage { + get { + return ResourceManager.GetString("PathOpeninghours_OpeninghoursPage", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die http://www.zv.tu-cottbus.de/LSFveranst/LSF4 ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index 8c2fcc88..9011849e 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -186,4 +186,7 @@ /Pages/News/NewsIndexPage.xaml + + /Pages/Openinghours/OpeninghoursPage.xaml + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.Designer.cs index 7d222138..a50f46eb 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.Designer.cs @@ -8,10 +8,11 @@ // //------------------------------------------------------------------------------ -namespace CampusAppWP8.Resources { +namespace CampusAppWP8.Resources +{ using System; using System.Windows; - + /// /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. /// @@ -22,40 +23,50 @@ namespace CampusAppWP8.Resources { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Icons { - + public class Icons + { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Icons() { + internal Icons() + { } - + /// /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CampusAppWP8.Resources.Icons", typeof(Icons).Assembly); + public static global::System.Resources.ResourceManager ResourceManager + { + get + { + if (object.ReferenceEquals(resourceMan, null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CampusAppWP8.Resources.Icons", + +typeof(Icons).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { + public static global::System.Globalization.CultureInfo Culture + { + get + { return resourceCulture; } - set { + set + { resourceCulture = value; } } @@ -86,109 +97,144 @@ namespace CampusAppWP8.Resources { /// /// Sucht eine lokalisierte Zeichenfolge, die campus_159.png ähnelt. /// - public static string Campus { - get { + public static string Campus + { + get + { return Themerize("Campus"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die departments_159.png ähnelt. /// - public static string Departments { - get { + public static string Departments + { + get + { return Themerize("Departments"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die homework_159.png ähnelt. /// - public static string Homework { - get { + public static string Homework + { + get + { return Themerize("Homework"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die lectures_159.png ähnelt. /// - public static string Lectures { - get { + public static string Lectures + { + get + { return Themerize("Lectures"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die link_159.png ähnelt. /// - public static string Link { - get { + public static string Link + { + get + { return Themerize("Link"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die mensa_159.png ähnelt. /// - public static string Mensa { - get { + public static string Mensa + { + get + { return Themerize("Mensa"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die news_159.png ähnelt. /// - public static string News { - get { + public static string News + { + get + { return Themerize("News"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die openhours_159.png ähnelt. /// - public static string Openhours { - get { + public static string Openhours + { + get + { return Themerize("Openhours"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die schedule_159.png ähnelt. /// - public static string Schedule { - get { + public static string Schedule + { + get + { return Themerize("Schedule"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die search_159.png ähnelt. /// - public static string Search { - get { + public static string Search + { + get + { return Themerize("Search"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die student_council_159.png ähnelt. /// - public static string StudentCouncil { - get { + public static string StudentCouncil + { + get + { return Themerize("StudentCouncil"); } } - + /// /// Sucht eine lokalisierte Zeichenfolge, die webmail_159.png ähnelt. /// - public static string WebMail { - get { + public static string WebMail + { + get + { return Themerize("WebMail"); } } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die phone_159.png ähnelt. + /// + public static string Phone + { + get + { + return Themerize("Phone"); + } + } } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx index 4bba35c2..919f1551 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx @@ -141,6 +141,9 @@ openhours_159.png + + phone_159.png + schedule_159.png diff --git a/CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs b/CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs index a591a883..28f871bf 100644 --- a/CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs +++ b/CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs @@ -1,14 +1,33 @@ -using CampusAppWP8.Resources; - +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//---------------------------------------------------------------------- namespace CampusAppWP8 { + using CampusAppWP8.Resources; + /// - /// Bietet Zugriff auf Zeichenfolgenressourcen. + /// Theme icons. /// public class ThemelizedIcons { + /// + /// Resource object. + /// private static Icons themelized = new Icons(); - public Icons ThemelizedIcon { get { return themelized; } } + /// + /// Gets the resource object. + /// + public Icons ThemelizedIcon + { + get + { + return themelized; + } + } } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml index b3b9e6cd..91009353 100644 --- a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml +++ b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml @@ -108,7 +108,7 @@ -