diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs index ac1bc700..d6d91181 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs @@ -140,6 +140,15 @@ namespace CampusAppWP8 /// private void LoadSettings() { + if (Debugger.IsAttached) + { + Settings.AppSetting.DevMode = true; + } + else + { + Settings.AppSetting.DevMode = false; + } + this.UserSettingsLoaded(); if (Settings.AppSetting.GeoWatchEnable) { diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs index b162e5d6..a4c33940 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs @@ -34,6 +34,14 @@ namespace CampusAppWP8.Feed.Mensa #endregion + #region Property + + /// Gets or sets the title. + /// The title. + public string Title { get; protected set; } + + #endregion + #region Method #region public diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs index b8b1743c..682d33a6 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs @@ -20,6 +20,7 @@ namespace CampusAppWP8.Feed.Mensa public MensaFeedCBMain() : base(Constants.FileMensa_Shedule_CBMain, Constants.UrlMensa_Week_CBMain) { + this.Title = AppResources.Campus_CBMain; } } } diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs index 29aaddff..6edfe0c6 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs @@ -20,6 +20,7 @@ namespace CampusAppWP8.Feed.Mensa public MensaFeedCBNorth() : base(Constants.FileMensa_Shedule_CBNorth, Constants.UrlMensa_Week_CBNorth) { + this.Title = AppResources.Campus_CBNorth; } } } diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs index 05a03dbc..46796322 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs @@ -20,6 +20,7 @@ namespace CampusAppWP8.Feed.Mensa public MensaFeedCBSouth() : base(Constants.FileMensa_Shedule_CBSouth, Constants.UrlMensa_Week_CBSouth) { + this.Title = AppResources.Campus_CBSouth; } } } diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs index 0f2f157a..e524160f 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs @@ -20,6 +20,7 @@ namespace CampusAppWP8.Feed.Mensa public MensaFeedSBFMain() : base(Constants.FileMensa_Shedule_SBFMain, Constants.UrlMensa_Week_SBFMain) { + this.Title = AppResources.Campus_SFBMain; } } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs index 7c7e2df1..5f9d0e92 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs @@ -46,5 +46,20 @@ namespace CampusAppWP8.Model.Setting App.SaveToAppState(Constants.AppSetting_InitApp, value); } } + + /// Gets or sets a value indicating whether the development mode. + /// true if development mode, false if not. + public bool DevMode + { + get + { + return App.LoadFromAppState(Constants.AppSetting_DevMode); + } + + set + { + App.SaveToAppState(Constants.AppSetting_DevMode, value); + } + } } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs index 88ea0d39..c7a826da 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs @@ -16,7 +16,7 @@ namespace CampusAppWP8.Model.Utility #region Constructor /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// public CampusListPickerItemListModel() : base() diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml index b663f264..2cbda005 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml @@ -59,8 +59,13 @@ - + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 4f85b351..caf02add 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -8,6 +8,7 @@ namespace CampusAppWP8.Pages.Mensa { using System; + using System.Threading; using System.Windows; using System.Windows.Navigation; using CampusAppWP8.Feed.GeoApi; @@ -15,7 +16,7 @@ namespace CampusAppWP8.Pages.Mensa using CampusAppWP8.Resources; using CampusAppWP8.Utility.Lui.MessageBoxes; using Microsoft.Phone.Controls; - using System.Threading; + using Microsoft.Phone.Shell; /// /// Class for the MensaPage @@ -64,6 +65,24 @@ namespace CampusAppWP8.Pages.Mensa public MensaPage() { this.InitializeComponent(); + ApplicationBarMenuItem menuItem1 = ApplicationBar.MenuItems[0] as ApplicationBarMenuItem; + ApplicationBarMenuItem menuItem2 = ApplicationBar.MenuItems[1] as ApplicationBarMenuItem; + ApplicationBarMenuItem menuItem3 = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem; + + if (menuItem1 != null) + { + menuItem1.Text = AppResources.Campus_CBMain; + } + + if (menuItem2 != null) + { + menuItem2.Text = AppResources.Campus_CBSouth; + } + + if (menuItem3 != null) + { + menuItem3.Text = AppResources.Campus_SFBMain; + } } #endregion @@ -89,10 +108,14 @@ namespace CampusAppWP8.Pages.Mensa /// Arguments of navigation protected override void OnNavigatedFrom(NavigationEventArgs e) { - this.feed.SaveData(this.refreshed); + if (this.feed != null) + { + this.feed.SaveData(this.refreshed); + } } #endregion + #region private /// @@ -115,8 +138,11 @@ namespace CampusAppWP8.Pages.Mensa /// private void SpsApiIsFail() { - MessageBoxResult result = MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorCampusLoc); - this.InitializeFeed(Settings.UserProfil.DefaultCampus); + if (this.Dispatcher != null) + { + this.Dispatcher.BeginInvoke(new Action(() => MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorCampusLoc))); + this.Dispatcher.BeginInvoke(new Action(() => this.InitializeFeed(Settings.UserProfil.DefaultCampus))); + } } /// @@ -161,7 +187,7 @@ namespace CampusAppWP8.Pages.Mensa { if (Settings.AppSetting.GeoWatchEnable) { - Thread thread = new Thread(new ThreadStart( this.DeterminCurrentCampusAndLoadFeed)); + Thread thread = new Thread(new ThreadStart(this.DeterminCurrentCampusAndLoadFeed)); thread.Start(); } else @@ -202,6 +228,7 @@ namespace CampusAppWP8.Pages.Mensa /// private void SetupMensaPivot() { + this.MensaPivot.Title = AppResources.MensaApp_Title + " (" + this.feed.Title + ")"; this.MensaPivot.ItemsSource = this.feed.Model.Menus; this.MensaPivot.SelectedIndex = this.selectedIndex; } @@ -252,6 +279,36 @@ namespace CampusAppWP8.Pages.Mensa this.refreshed = true; } + /// Event handler. Called by ApplicationBarMenuItem for click events. + /// Stubbfel, 26.08.2013. + /// button object. + /// Event information. + private void ApplicationBarMenuItem_Click(object sender, EventArgs e) + { + this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN); + } + + /// Event handler. Called by ApplicationBarMenuItem2 for click events. + /// Stubbfel, 26.08.2013. + /// button object. + /// Event information. + private void ApplicationBarMenuItem2_Click(object sender, EventArgs e) + { + this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_SOUTH); + } + + /// Event handler. Called by ApplicationBarMenuItem3 for click events. + /// Stubbfel, 26.08.2013. + /// button object. + /// Event information. + private void ApplicationBarMenuItem3_Click(object sender, EventArgs e) + { + this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.SFB_MAIN); + } + #endregion #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index 4bbdc8da..33bc484c 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -44,14 +44,22 @@ namespace CampusAppWP8.Pages menuItem2.Text = AppResources.Setting_ApplAppBarTitle; } - if (menuItem3 != null) + if (Settings.AppSetting.DevMode) { - menuItem3.Text = "Nfc"; - } + if (menuItem3 != null) + { + menuItem3.Text = "Nfc"; + } - if (menuItem4 != null) + if (menuItem4 != null) + { + menuItem4.Text = "QR-Reader"; + } + } + else { - menuItem4.Text = "QR-Reader"; + ApplicationBar.MenuItems.RemoveAt(ApplicationBar.MenuItems.Count - 1); + ApplicationBar.MenuItems.RemoveAt(ApplicationBar.MenuItems.Count - 1); } if (!Settings.AppSetting.InitApp) diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index ad0aba17..038352db 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -60,6 +60,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die DevMode ähnelt. + /// + public static string AppSetting_DevMode { + get { + return ResourceManager.GetString("AppSetting_DevMode", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die AppSetting.GeoWatchEnable ähnelt. /// @@ -790,16 +799,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 ähnelt. - /// - public static string UrlMensa_Week { - get { - return ResourceManager.GetString("UrlMensa_Week", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusBTU&v=1 ähnelt. /// public static string UrlMensa_Week_CBMain { get { @@ -808,7 +808,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusBTU&v=1 ähnelt. /// public static string UrlMensa_Week_CBNorth { get { @@ -817,7 +817,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusHL&v=1 ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusHL&v=1 ähnelt. /// public static string UrlMensa_Week_CBSouth { get { @@ -826,7 +826,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=Senftenberg&v=1 ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=Senftenberg&v=1 ähnelt. /// public static string UrlMensa_Week_SBFMain { get { diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index d6ba8703..d80c68d3 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -255,9 +255,6 @@ EventsFeed.xml - - http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 - OpeninghoursFeed.xml @@ -382,16 +379,16 @@ MensaFeed_SFBMain.xml - http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 + http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusBTU&v=1 - http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 + http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusBTU&v=1 - http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusHL&v=1 + http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusHL&v=1 - http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=Senftenberg&v=1 + http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=Senftenberg&v=1 3 @@ -417,4 +414,7 @@ /Assets/campusmap.png + + DevMode + \ No newline at end of file