From e6bd2c3df292b86f6a94a8be1aca529d0002124c Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 25 Nov 2013 13:30:53 +0100 Subject: [PATCH] add mensasetting --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 1 + .../CampusAppWP8/Model/Setting/AppSettings.cs | 20 ++++++++++++++ .../Pages/Setting/AppSettingPage.xaml | 2 +- .../Pages/Setting/AppSettingPage.xaml.cs | 26 +++++++++++++++++++ .../Pages/Setting/FunctionSettingPage.xaml | 4 ++- .../Pages/Setting/FunctionSettingPage.xaml.cs | 4 +++ .../Pages/Setting/MensaSetting.cs | 24 +++++++++++++++++ .../Resources/AppResources.Designer.cs | 9 +++++++ .../CampusAppWP8/Resources/AppResources.resx | 3 +++ .../CampusAppWP8/Resources/Constants.resx | 6 +++++ .../Resources/Constants1.Designer.cs | 18 +++++++++++++ CampusAppWP8/CampusAppWP8/Settings.cs | 5 ++++ 12 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Pages/Setting/MensaSetting.cs diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 7f9fa3ca..95ef43d0 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -140,6 +140,7 @@ FunctionSettingPage.xaml + Appointment.xaml diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs index 4b062399..a6edb8a2 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs @@ -8,14 +8,34 @@ //----------------------------------------------------------------------- namespace CampusAppWP8.Model.Setting { + using CampusAppWP8.Pages.Setting; using CampusAppWP8.Resources; /// Model for settings of the app. /// Stubbfel, 15.10.2013. public class AppSettings { + #region member + private static MensaSetting mensaSetting = new MensaSetting(); + #endregion #region Property + public MensaSetting MensaSetting + { + get + { + return AppSettings.mensaSetting; + } + + set + { + if (value != AppSettings.mensaSetting) + { + AppSettings.mensaSetting = value; + } + } + } + /// Gets or sets a value indicating whether the GeoWatch-Flag. /// true if geo watch enable, false if not. public bool GeoWatchEnable diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml index 4a95b0de..b0a5ca68 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml @@ -28,7 +28,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs index cc241977..ce8e6b74 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs @@ -10,6 +10,7 @@ namespace CampusAppWP8.Pages.Setting { using System.Windows.Navigation; using Microsoft.Phone.Controls; + using CampusAppWP8.Resources; /// Class for the AppSettingPage. /// Stubbfel, 15.10.2013. @@ -31,6 +32,25 @@ namespace CampusAppWP8.Pages.Setting #region Method + /// Override the OnNavigatedTo method. + /// Stubbfel, 15.10.2013. + /// + protected override void OnNavigatedTo(NavigationEventArgs e) + { + base.OnNavigatedTo(e); + + string functionIndex; + + if (NavigationMode.New != e.NavigationMode && NavigationContext.QueryString.TryGetValue(Constants.Param_FunctionSetting_Index, out functionIndex)) + { + int oldIndex = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_GeneralSettingPageIndex); + this.GeneralSettingPivot.SelectedIndex = oldIndex; + + + + } + } + /// Override the OnNavigatedFrom method. /// Stubbfel, 15.10.2013. /// @@ -40,7 +60,13 @@ namespace CampusAppWP8.Pages.Setting { Settings.AppSetting.GeoWatchEnable = GeoWatchToggle.IsChecked.Value; Settings.AppSetting.OnlyWifi = OnlyWiFiToggle.IsChecked.Value; + App.SaveToIsolatedStorage(Constants.IsolatedStorage_GeneralSettingPageIndex, 0); } + else + { + App.SaveToIsolatedStorage(Constants.IsolatedStorage_FunctionSettingPageIndex, this.GeneralSettingPivot.SelectedIndex); + } + } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml index 76b584f7..703441f0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml @@ -43,7 +43,9 @@ - + + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs index 98cedb3f..a04c770a 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs @@ -29,6 +29,8 @@ namespace CampusAppWP8.Pages.Setting this.TagHandler.ItemsSource = this.taghandlerModel.List; int tagselIndex = this.taghandlerModel.GetIndexOrDefault(Settings.AppSetting.TagDefaultHandler.ToString()); this.TagHandler.SelectedIndex = tagselIndex; + + this.AtomMensaToggle.IsChecked = Settings.AppSetting.MensaSetting.AtomMensaSelection; } #endregion @@ -63,6 +65,8 @@ namespace CampusAppWP8.Pages.Setting protected override void OnNavigatedFrom(NavigationEventArgs e) { Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value); + Settings.AppSetting.MensaSetting.AtomMensaSelection = this.AtomMensaToggle.IsChecked.Value; + if (NavigationMode.Back == e.NavigationMode) { App.SaveToIsolatedStorage(Constants.IsolatedStorage_FunctionSettingPageIndex, null); diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/MensaSetting.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/MensaSetting.cs new file mode 100644 index 00000000..7dc25dac --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/MensaSetting.cs @@ -0,0 +1,24 @@ +using CampusAppWP8.Resources; + +namespace CampusAppWP8.Pages.Setting +{ + public class MensaSetting + { + #region Property + + public bool AtomMensaSelection + { + get + { + return App.LoadFromAppState(Constants.AppSetting_MensaSetting_AtomMensaSelection); + } + + set + { + App.SaveToAppState(Constants.AppSetting_MensaSetting_AtomMensaSelection, value); + } + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 815f21df..b90c5f67 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -1221,6 +1221,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die autom. Mensaauswahl ähnelt. + /// + public static string Setting_AtomMensaSelection { + get { + return ResourceManager.GetString("Setting_AtomMensaSelection", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Funktionseinstellungen ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index ab6e45d6..28f3bd7b 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -632,6 +632,9 @@ Räume + + autom. Mensaauswahl + Funktionseinstellungen diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index bf2c4707..44fe75b6 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -624,6 +624,9 @@ /Pages/Setting/Impressum.xaml + + AtomMensaSelection + Mensafunction @@ -636,6 +639,9 @@ FunctionSettingPageIndex + + GeneralSettingPageIndex + FunctionSettingIndex diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index e40dccbf..fb4eb158 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -150,6 +150,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die AtomMensaSelection ähnelt. + /// + public static string AppSetting_MensaSetting_AtomMensaSelection { + get { + return ResourceManager.GetString("AppSetting_MensaSetting_AtomMensaSelection", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die OnlyWifi ähnelt. /// @@ -528,6 +537,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die GeneralSettingPageIndex ähnelt. + /// + public static string IsolatedStorage_GeneralSettingPageIndex { + get { + return ResourceManager.GetString("IsolatedStorage_GeneralSettingPageIndex", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die LectureAppointment ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Settings.cs b/CampusAppWP8/CampusAppWP8/Settings.cs index a02b99fb..06754711 100644 --- a/CampusAppWP8/CampusAppWP8/Settings.cs +++ b/CampusAppWP8/CampusAppWP8/Settings.cs @@ -69,6 +69,11 @@ namespace CampusAppWP8 } } + #endregion + + #region method + + #endregion } }