diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/AppAccentColorListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/AppAccentColorListPickerItemListModel.cs index 0abc5a61..45d8364c 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/AppAccentColorListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/AppAccentColorListPickerItemListModel.cs @@ -8,9 +8,8 @@ //----------------------------------------------------------------------- namespace CampusAppWP8.Model.Utility { - - using CampusAppWPortalLib8.Resources; using System.Windows.Media; + using CampusAppWP8.Resources; /// A data Model for the application accent color list picker item list. /// Stubbfel, 26.11.2013. @@ -20,22 +19,22 @@ namespace CampusAppWP8.Model.Utility #region member /// The faculty 1 color. - private static readonly SolidColorBrush faculty1Color = (SolidColorBrush)App.Current.Resources["FacultyBrush1"]; + private static readonly SolidColorBrush Faculty1Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty1]; /// The faculty 2 color. - private static readonly SolidColorBrush faculty2Color = (SolidColorBrush)App.Current.Resources["FacultyBrush2"]; + private static readonly SolidColorBrush Faculty2Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty2]; /// The faculty 3 color. - private static readonly SolidColorBrush faculty3Color = (SolidColorBrush)App.Current.Resources["FacultyBrush3"]; + private static readonly SolidColorBrush Faculty3Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty3]; /// The faculty 4 color. - private static readonly SolidColorBrush faculty4Color = (SolidColorBrush)App.Current.Resources["FacultyBrush4"]; + private static readonly SolidColorBrush Faculty4Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty4]; /// The faculty 5 color. - private static readonly SolidColorBrush faculty5Color = (SolidColorBrush)App.Current.Resources["FacultyBrush5"]; + private static readonly SolidColorBrush Faculty5Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty5]; /// The faculty. - private readonly string faculty = AppResources.Faculty; + private readonly string faculty = CampusAppWPortalLib8.Resources.AppResources.Faculty; #endregion @@ -55,16 +54,23 @@ namespace CampusAppWP8.Model.Utility #region Method + /// Gets index or default. + /// Stubbfel, 27.11.2013. + /// The value. + /// The index or default. public override int GetIndexOrDefault(SolidColorBrush value) { int index = 0; foreach (ColorListPickerItemModel brush in this.List) { - if (brush.Value.Color.Equals(value.Color)) { + if (brush.Value.Color.Equals(value.Color)) + { break; } + index++; } + return index; } @@ -73,11 +79,11 @@ namespace CampusAppWP8.Model.Utility protected override void LoadList() { this.AddItem(new ColorListPickerItemModel(new SolidColorBrush(Settings.AppSetting.DisplaySetting.PhoneAccentColor), CampusAppWP8.Resources.AppResources.AccentColor)); - this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.faculty1Color, this.faculty + " 1")); - this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.faculty2Color, this.faculty + " 2")); - this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.faculty3Color, faculty + " 3")); - this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.faculty4Color, faculty + " 4")); - this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.faculty5Color, faculty + " 5")); + this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.Faculty1Color, this.faculty + " 1")); + this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.Faculty2Color, this.faculty + " 2")); + this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.Faculty3Color, this.faculty + " 3")); + this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.Faculty4Color, this.faculty + " 4")); + this.AddItem(new ColorListPickerItemModel(AppAccentColorListPickerItemListModel.Faculty5Color, this.faculty + " 5")); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs index 8f91ea67..09efc36f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs @@ -9,19 +9,19 @@ namespace CampusAppWP8.Pages.Setting { using System; - using System.Windows.Navigation; - using CampusAppWP8.Resources; - using Microsoft.Phone.Controls; - using CampusAppWP8.Model.Utility; using System.Windows.Media; + using System.Windows.Navigation; + using CampusAppWP8.Model.Utility; + using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using Microsoft.Phone.Controls; /// Class for the AppSettingPage. /// Stubbfel, 15.10.2013. /// + /// public partial class AppSettingPage : PhoneApplicationPage, IRefreshingPage { - #region member /// List of colors of the application accents. @@ -56,6 +56,7 @@ namespace CampusAppWP8.Pages.Setting #endregion #region protected + /// Override the OnNavigatedTo method. /// Stubbfel, 15.10.2013. /// @@ -90,6 +91,7 @@ namespace CampusAppWP8.Pages.Setting #endregion #region private + /// Loads the settings. /// Stubbfel, 25.11.2013. private void LoadSettings() @@ -117,18 +119,19 @@ namespace CampusAppWP8.Pages.Setting this.LoadSettings(); } - /// - /// Event handler. Called by AccentColorPicker for selection changed events. - /// + /// Event handler. Called by AccentColorPicker for selection changed events. /// Stubbfel, 26.11.2013. /// Source of the event. /// Selection changed event information. private void AccentColorPicker_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) { - int selectedIndex = this.AccentColorPicker.SelectedIndex; - Color newColor = this.appAccentColors.List[selectedIndex].Value.Color; - Utilities.SwitchAccentColor(newColor); - Settings.AppSetting.DisplaySetting.AppAccentColor = newColor; + if (e.AddedItems.Count == 1 && e.RemovedItems.Count == 1) + { + int selectedIndex = this.AccentColorPicker.SelectedIndex; + Color newColor = this.appAccentColors.List[selectedIndex].Value.Color; + Utilities.SwitchAccentColor(newColor); + Settings.AppSetting.DisplaySetting.AppAccentColor = newColor; + } } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index f72cd6ad..d4bcab11 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -684,4 +684,40 @@ PhoneAccentColor + + FacultyBrush1 + + + FacultyBrush2 + + + FacultyBrush3 + + + FacultyBrush4 + + + FacultyBrush5 + + + PhoneAccentBrush + + + FacultyColor1 + + + FacultyColor2 + + + FacultyColor3 + + + FacultyColor4 + + + FacultyColor5 + + + PhoneAccentColor + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index 95ec9c9d..cd451231 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -204,6 +204,60 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush1 ähnelt. + /// + public static string Brush_Faculty1 { + get { + return ResourceManager.GetString("Brush_Faculty1", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush2 ähnelt. + /// + public static string Brush_Faculty2 { + get { + return ResourceManager.GetString("Brush_Faculty2", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush3 ähnelt. + /// + public static string Brush_Faculty3 { + get { + return ResourceManager.GetString("Brush_Faculty3", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush4 ähnelt. + /// + public static string Brush_Faculty4 { + get { + return ResourceManager.GetString("Brush_Faculty4", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush5 ähnelt. + /// + public static string Brush_Faculty5 { + get { + return ResourceManager.GetString("Brush_Faculty5", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die PhoneAccentBrush ähnelt. + /// + public static string Brush_PhoneAccent { + get { + return ResourceManager.GetString("Brush_PhoneAccent", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die BTU-CampusApp ähnelt. /// @@ -222,6 +276,60 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyColor1 ähnelt. + /// + public static string Color_Faculty1 { + get { + return ResourceManager.GetString("Color_Faculty1", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyColor2 ähnelt. + /// + public static string Color_Faculty2 { + get { + return ResourceManager.GetString("Color_Faculty2", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyColor3 ähnelt. + /// + public static string Color_Faculty3 { + get { + return ResourceManager.GetString("Color_Faculty3", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyColor4 ähnelt. + /// + public static string Color_Faculty4 { + get { + return ResourceManager.GetString("Color_Faculty4", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die FacultyColor5 ähnelt. + /// + public static string Color_Faculty5 { + get { + return ResourceManager.GetString("Color_Faculty5", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die PhoneAccentColor ähnelt. + /// + public static string Color_PhoneAccent { + get { + return ResourceManager.GetString("Color_PhoneAccent", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die 8 ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs index 01d58121..ba9a0eb1 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs @@ -467,8 +467,8 @@ namespace CampusAppWP8.Utility /// The new color. public static void SwitchAccentColor(Color newColor) { - Utilities.SwitchColor("PhoneAccentColor", newColor); - ((SolidColorBrush)App.Current.Resources["PhoneAccentBrush"]).Color = newColor; + Utilities.SwitchColor(Constants.Color_PhoneAccent, newColor); + ((SolidColorBrush)App.Current.Resources[Constants.Brush_PhoneAccent]).Color = newColor; } #endregion }