stubbfel/win8phoneApp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
stubbfel
2013-11-27 10:12:11 +01:00
parent a2f1a7082d
commit 560fbaea95
5 changed files with 181 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
CampusAppWP8/CampusAppWP8/Model/Utility/AppAccentColorListPickerItemListModel.cs
View File

@@ -8,9 +8,8 @@
//-----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
{
using CampusAppWPortalLib8.Resources;
using System.Windows.Media;
using CampusAppWP8.Resources;
/// <summary> A data Model for the application accent color list picker item list. </summary>
/// <remarks> Stubbfel, 26.11.2013. </remarks>
@@ -20,22 +19,22 @@ namespace CampusAppWP8.Model.Utility
#region member
/// <summary> The faculty 1 color. </summary>
private static readonly SolidColorBrush faculty1Color = (SolidColorBrush)App.Current.Resources["FacultyBrush1"];
private static readonly SolidColorBrush Faculty1Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty1];
/// <summary> The faculty 2 color. </summary>
private static readonly SolidColorBrush faculty2Color = (SolidColorBrush)App.Current.Resources["FacultyBrush2"];
private static readonly SolidColorBrush Faculty2Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty2];
/// <summary> The faculty 3 color. </summary>
private static readonly SolidColorBrush faculty3Color = (SolidColorBrush)App.Current.Resources["FacultyBrush3"];
private static readonly SolidColorBrush Faculty3Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty3];
/// <summary> The faculty 4 color. </summary>
private static readonly SolidColorBrush faculty4Color = (SolidColorBrush)App.Current.Resources["FacultyBrush4"];
private static readonly SolidColorBrush Faculty4Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty4];
/// <summary> The faculty 5 color. </summary>
private static readonly SolidColorBrush faculty5Color = (SolidColorBrush)App.Current.Resources["FacultyBrush5"];
private static readonly SolidColorBrush Faculty5Color = (SolidColorBrush)App.Current.Resources[Constants.Brush_Faculty5];
/// <summary> The faculty. </summary>
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
/// <summary> Gets index or default. </summary>
/// <remarks> Stubbfel, 27.11.2013. </remarks>
/// <param name="value"> The value. </param>
/// <returns> The index or default. </returns>
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

27
CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
View File

@@ -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;
/// <summary> Class for the AppSettingPage. </summary>
/// <remarks> Stubbfel, 15.10.2013. </remarks>
/// <seealso cref="T:Microsoft.Phone.Controls.PhoneApplicationPage"/>
/// <seealso cref="T:CampusAppWP8.Pages.Setting.IRefreshingPage"/>
public partial class AppSettingPage : PhoneApplicationPage, IRefreshingPage
{
#region member
/// <summary> List of colors of the application accents. </summary>
@@ -56,6 +56,7 @@ namespace CampusAppWP8.Pages.Setting
#endregion
#region protected
/// <summary> Override the OnNavigatedTo method. </summary>
/// <remarks> Stubbfel, 15.10.2013. </remarks>
/// <seealso cref="M:System.Windows.Controls.Page.OnNavigatedTo(NavigationEventArgs)"/>
@@ -90,6 +91,7 @@ namespace CampusAppWP8.Pages.Setting
#endregion
#region private
/// <summary> Loads the settings. </summary>
/// <remarks> Stubbfel, 25.11.2013. </remarks>
private void LoadSettings()
@@ -117,18 +119,19 @@ namespace CampusAppWP8.Pages.Setting
this.LoadSettings();
}
/// <summary>
/// Event handler. Called by AccentColorPicker for selection changed events.
/// </summary>
/// <summary> Event handler. Called by AccentColorPicker for selection changed events. </summary>
/// <remarks> Stubbfel, 26.11.2013. </remarks>
/// <param name="sender"> Source of the event. </param>
/// <param name="e"> Selection changed event information. </param>
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

36
CampusAppWP8/CampusAppWP8/Resources/Constants.resx
View File

@@ -684,4 +684,40 @@
<data name="Setting_PhoneAccentColor" xml:space="preserve">
<value>PhoneAccentColor</value>
</data>
<data name="Brush_Faculty1" xml:space="preserve">
<value>FacultyBrush1</value>
</data>
<data name="Brush_Faculty2" xml:space="preserve">
<value>FacultyBrush2</value>
</data>
<data name="Brush_Faculty3" xml:space="preserve">
<value>FacultyBrush3</value>
</data>
<data name="Brush_Faculty4" xml:space="preserve">
<value>FacultyBrush4</value>
</data>
<data name="Brush_Faculty5" xml:space="preserve">
<value>FacultyBrush5</value>
</data>
<data name="Brush_PhoneAccent" xml:space="preserve">
<value>PhoneAccentBrush</value>
</data>
<data name="Color_Faculty1" xml:space="preserve">
<value>FacultyColor1</value>
</data>
<data name="Color_Faculty2" xml:space="preserve">
<value>FacultyColor2</value>
</data>
<data name="Color_Faculty3" xml:space="preserve">
<value>FacultyColor3</value>
</data>
<data name="Color_Faculty4" xml:space="preserve">
<value>FacultyColor4</value>
</data>
<data name="Color_Faculty5" xml:space="preserve">
<value>FacultyColor5</value>
</data>
<data name="Color_PhoneAccent" xml:space="preserve">
<value>PhoneAccentColor</value>
</data>
</root>

108
CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs generated
View File

@@ -204,6 +204,60 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush1 ähnelt.
/// </summary>
public static string Brush_Faculty1 {
get {
return ResourceManager.GetString("Brush_Faculty1", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush2 ähnelt.
/// </summary>
public static string Brush_Faculty2 {
get {
return ResourceManager.GetString("Brush_Faculty2", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush3 ähnelt.
/// </summary>
public static string Brush_Faculty3 {
get {
return ResourceManager.GetString("Brush_Faculty3", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush4 ähnelt.
/// </summary>
public static string Brush_Faculty4 {
get {
return ResourceManager.GetString("Brush_Faculty4", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyBrush5 ähnelt.
/// </summary>
public static string Brush_Faculty5 {
get {
return ResourceManager.GetString("Brush_Faculty5", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die PhoneAccentBrush ähnelt.
/// </summary>
public static string Brush_PhoneAccent {
get {
return ResourceManager.GetString("Brush_PhoneAccent", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die BTU-CampusApp ähnelt.
/// </summary>
@@ -222,6 +276,60 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyColor1 ähnelt.
/// </summary>
public static string Color_Faculty1 {
get {
return ResourceManager.GetString("Color_Faculty1", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyColor2 ähnelt.
/// </summary>
public static string Color_Faculty2 {
get {
return ResourceManager.GetString("Color_Faculty2", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyColor3 ähnelt.
/// </summary>
public static string Color_Faculty3 {
get {
return ResourceManager.GetString("Color_Faculty3", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyColor4 ähnelt.
/// </summary>
public static string Color_Faculty4 {
get {
return ResourceManager.GetString("Color_Faculty4", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FacultyColor5 ähnelt.
/// </summary>
public static string Color_Faculty5 {
get {
return ResourceManager.GetString("Color_Faculty5", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die PhoneAccentColor ähnelt.
/// </summary>
public static string Color_PhoneAccent {
get {
return ResourceManager.GetString("Color_PhoneAccent", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die 8 ähnelt.
/// </summary>

4
CampusAppWP8/CampusAppWP8/Utility/Utilities.cs
View File

@@ -467,8 +467,8 @@ namespace CampusAppWP8.Utility
/// <param name="newColor"> The new color. </param>
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
}