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

Merge branch 'release/r' into develmaster

Browse Source
This commit is contained in:
stubbfel
2013-07-25 11:08:52 +02:00
parent bf9a612de5 6f5496a006
commit bcceaaaa53
34 changed files with 92 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs
View File

@@ -7,11 +7,9 @@
//----------------------------------------------------------------------
namespace CampusAppWP8.Feed.Lecture
{
using System;
using CampusAppWP8.Model;
using CampusAppWP8.Model.Lecture;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
using CampusAppWP8.Model;
/// <summary>
/// Class for the feed of the Lecture

2
CampusAppWP8/CampusAppWP8/App.xaml
View File

@@ -23,7 +23,7 @@
<Application.ApplicationLifetimeObjects>
<!--Erforderliches Objekt, das Lebensdauerereignisse der Anwendung behandelt-->
<shell:PhoneApplicationService
<shell:PhoneApplicationService
Launching="Application_Launching" Closing="Application_Closing"
Activated="Application_Activated" Deactivated="Application_Deactivated"/>
</Application.ApplicationLifetimeObjects>

18
CampusAppWP8/CampusAppWP8/App.xaml.cs
View File

@@ -1,13 +1,12 @@
using System;
using CampusAppWP8.Resources;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
using System;
using System.Diagnostics;
using System.Resources;
using System.IO.IsolatedStorage;
using System.Windows;
using System.Windows.Markup;
using System.Windows.Navigation;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
using CampusAppWP8.Resources;
using System.IO.IsolatedStorage;
namespace CampusAppWP8
@@ -84,10 +83,11 @@ namespace CampusAppWP8
public static T LoadFromIsolatedStorage<T>(string key)
{
IsolatedStorageSettings isolatedStore = IsolatedStorageSettings.ApplicationSettings;
if(isolatedStore.Contains(key)) {
if (isolatedStore.Contains(key))
{
object value = isolatedStore[key];
return (T)value;
return (T)value;
}
return default(T);
}

4
CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs
View File

@@ -7,13 +7,11 @@
//----------------------------------------------------------------------using System;
namespace CampusAppWP8.Feed.Departments
{
using System;
using System.IO;
using CampusAppWP8.Model;
using CampusAppWP8.Model.Departments;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
/// <summary>
/// Feed object to handle favorite department feeds.
/// </summary>

2
CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs
View File

@@ -71,8 +71,6 @@ namespace CampusAppWP8.Feed.Link
return this.CheckIsUpToDate(lastModified);
}
/// <summary>
/// Check if the model or file is up-to-date.
/// </summary>

2
CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
View File

@@ -12,7 +12,6 @@ namespace CampusAppWP8.Feed.Mensa
using CampusAppWP8.Model;
using CampusAppWP8.Model.Mensa;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
/// <summary>
/// This Class is for MensaFeeds
@@ -88,7 +87,6 @@ namespace CampusAppWP8.Feed.Mensa
return true;
}
#endregion
#endregion

1
CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs
View File

@@ -7,7 +7,6 @@
//----------------------------------------------------------------------
namespace CampusAppWP8.Feed.Openinghours
{
using System;
using System.IO;
using CampusAppWP8.Model;
using CampusAppWP8.Model.Openinghours;

4
CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs
View File

@@ -83,7 +83,7 @@ namespace CampusAppWP8.Model.Lecture
public LectureModule Modul { get; set; }
/// <summary>
/// Gets or sets LectureTitel
/// Gets or sets LectureTitle
/// </summary>
[XmlElement("titel")]
public string Title { get; set; }
@@ -196,7 +196,7 @@ namespace CampusAppWP8.Model.Lecture
string result = string.Empty;
foreach (LectureLecturer tmpLecturer in this.Lecturer)
{
result += StringManager.AddNewLine(tmpLecturer.ToString());
result += StringManager.AddNewLine(tmpLecturer.ToString());
}
this.LecturerString = StringManager.RemvoveNewLine(result);

1
CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs
View File

@@ -62,6 +62,5 @@ namespace CampusAppWP8.Model.Lecture
/// </summary>
[XmlElement("enddatum")]
public string EndDate { get; set; }
}
}

56
CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
View File

@@ -21,34 +21,6 @@ namespace CampusAppWP8.Model.Lecture
{
#region Members
/// <summary>
/// List for the courses of the BTU
/// </summary>
/// <remarks>
/// need to be extend to full list
/// </remarks>
private List<ListPickerItemModel> courseList;
/// <summary>
/// List of the degrees
/// </summary>
private List<ListPickerItemModel> degreeList;
/// <summary>
/// List of the semester
/// </summary>
private List<ListPickerItemModel> semesterList;
/// <summary>
/// List for the number of semester (from)
/// </summary>
private List<ListPickerItemModel> fromNumberList;
/// <summary>
/// List for the number of semester (to)
/// </summary>
private List<ListPickerItemModel> toNumberList;
/// <summary>
/// Variable for the courseIndex
/// </summary>
@@ -79,6 +51,34 @@ namespace CampusAppWP8.Model.Lecture
[DataMember]
public int selectToIndex;
/// <summary>
/// List for the courses of the BTU
/// </summary>
/// <remarks>
/// need to be extend to full list
/// </remarks>
private List<ListPickerItemModel> courseList;
/// <summary>
/// List of the degrees
/// </summary>
private List<ListPickerItemModel> degreeList;
/// <summary>
/// List of the semester
/// </summary>
private List<ListPickerItemModel> semesterList;
/// <summary>
/// List for the number of semester (from)
/// </summary>
private List<ListPickerItemModel> fromNumberList;
/// <summary>
/// List for the number of semester (to)
/// </summary>
private List<ListPickerItemModel> toNumberList;
#endregion
#region Constructor

3
CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs
View File

@@ -43,6 +43,7 @@ namespace CampusAppWP8.Model.Utility
this.Value = value;
}
#endregion
#region Proberty
/// <summary>
@@ -62,7 +63,7 @@ namespace CampusAppWP8.Model.Utility
}
/// <summary>
/// Gets or sets the token, which indicate that tha paramterlist started
/// Gets the token, which indicate that the parameterList started
/// </summary>
public string ParamToken
{

14
CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
View File

@@ -1,15 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation;
using CampusAppWP8.Model.Campusmap;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
using System.Windows.Media;
using CampusAppWP8.Model.Campusmap;
using System.Windows.Media.Imaging;
using System.Windows;
using System.Windows.Navigation;
namespace CampusAppWP8.Pages.Campusmap
{

2
CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml
View File

@@ -66,7 +66,7 @@
<ColumnDefinition Width="64"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Image Width="32" Height="32" Grid.Row="0" Grid.Column="0" Source="{Binding Path=ThemelizedIcon.Departments, Source={StaticResource ThemelizedIcons}}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Name}" VerticalAlignment="Center"/>
</Grid>

2
CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml
View File

@@ -54,7 +54,7 @@
</Grid.ColumnDefinitions>
<Image Grid.Column="0" Grid.Row="0" Height="32" Width="32" Source="{Binding Path=ThemelizedIcon.Add, Source={StaticResource ThemelizedIcons}}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Grid.Column="1" Grid.Row="0" Text="{Binding Path=LocalizedResources.Add, Source={StaticResource LocalizedStrings}}" VerticalAlignment="Center"/>
</Grid>
</Grid>
</Button>
<!--info button-->
<Button x:Name="InfoBtn" BorderBrush="Transparent" Tag="{Binding Url}" Click="InfoBtn_Click" HorizontalContentAlignment="Left">

2
CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
View File

@@ -40,7 +40,7 @@
<RowDefinition Height="100" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TextBlock x:Name="EventHeadline" Text="{Binding Path=Title, Mode=OneWay}" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
<ScrollViewer x:Name="EventTextScroll" Grid.Row="1">
<TextBlock x:Name="EventText" Text="{Binding Path=Text, Mode=OneWay}" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />

2
CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
View File

@@ -132,7 +132,7 @@
</Border>
</DataTemplate>
</toolkit:ListPicker.FullModeItemTemplate>
</toolkit:ListPicker>
</StackPanel>
</StackPanel>

2
CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
View File

@@ -10,13 +10,11 @@ namespace CampusAppWP8.Pages.Lecture
using System;
using System.Collections.Generic;
using System.Windows;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using CampusAppWP8.Feed.Lecture;
using CampusAppWP8.Model.Lecture;
using CampusAppWP8.Model.Utility;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
using Microsoft.Phone.Controls;
/// <summary>

2
CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
View File

@@ -9,8 +9,6 @@ namespace CampusAppWP8.Pages.Lecture
{
using System;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation;
using CampusAppWP8.Model.Lecture;
using CampusAppWP8.Resources;

3
CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs
View File

@@ -7,10 +7,10 @@
//----------------------------------------------------------------------
namespace CampusAppWP8.Pages.Links
{
using System;
using System.Windows.Navigation;
using CampusAppWP8.Feed.Link;
using Microsoft.Phone.Controls;
using System;
/// <summary>
/// Class for the LinkPage
@@ -126,7 +126,6 @@ namespace CampusAppWP8.Pages.Links
{
this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed;
}
}
/// <summary>

6
CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
View File

@@ -19,13 +19,13 @@
<!--Pivotsteuerelement-->
<phone:Pivot Name="MensaPivot" Title="{Binding Path=LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}">
<phone:Pivot.HeaderTemplate>
<DataTemplate>
<StackPanel>
<TextBlock Text="{Binding Day}" />
<TextBlock Text="{Binding Day}" />
</StackPanel>
</DataTemplate>
</phone:Pivot.HeaderTemplate>
<phone:Pivot.ItemTemplate>
<DataTemplate>

2
CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
View File

@@ -64,6 +64,7 @@ namespace CampusAppWP8.Pages.Mensa
{
this.InitializeFeed();
}
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
this.feed.LoadData();
}
@@ -90,7 +91,6 @@ namespace CampusAppWP8.Pages.Mensa
this.CalcSelectedIndex();
}
/// <summary>
/// Method will be execute if the feed is ready
/// </summary>

2
CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
View File

@@ -42,7 +42,7 @@
</lui:NavigateButton>
</Border>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>

2
CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
View File

@@ -39,7 +39,7 @@
<RowDefinition Height="100" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TextBlock x:Name="NewsHeadline" Text="{Binding Path=Title, Mode=OneWay}" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
<ScrollViewer Grid.Row="1">
<TextBlock x:Name="NewsText" Text="{Binding Path=Text, Mode=OneWay}" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />

2
CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
View File

@@ -18,7 +18,7 @@ namespace CampusAppWP8.Pages.News
using CampusAppWP8.Utility;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
/// <summary>
/// EventPage, where every news fees has his own PivotItem.
/// </summary>

16
CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
View File

@@ -13,7 +13,7 @@ namespace CampusAppWP8.Pages.Openinghours
using CampusAppWP8.Model.Openinghours;
using CampusAppWP8.Resources;
using Microsoft.Phone.Controls;
/// <summary>
/// Opening hours page.
/// </summary>
@@ -65,12 +65,12 @@ namespace CampusAppWP8.Pages.Openinghours
protected override void OnNavigatedTo(NavigationEventArgs e)
{
base.OnNavigatedTo(e);
/*
if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back)
{
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
}
*/
/*
if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back)
{
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
}
*/
if (this.isNewInstance)
{
if ((this.feed == null) || (this.feed.GetModel() == null))
@@ -132,7 +132,7 @@ namespace CampusAppWP8.Pages.Openinghours
// private
#endregion
// Method
#endregion
}

2
CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml
View File

@@ -9,7 +9,7 @@
<Setter Property="BorderBrush" Value="{StaticResource PhoneContrastBackgroundBrush}"/>
<Setter Property="BorderThickness" Value="6,3,6,3"/>
<Setter Property="Margin" Value="-10"/>
<Setter Property="toolkit:TiltEffect.IsTiltEnabled" Value="True"/>
<Setter Property="toolkit:TiltEffect.IsTiltEnabled" Value="True"/>
</Style>
<Style x:Key="ListButtonNoneBorder" TargetType="Button">
<Setter Property="Background" Value="{x:Null}"/>

10
CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs
View File

@@ -22,12 +22,12 @@ namespace CampusAppWP8
/// <summary>
/// Gets the resource object.
/// </summary>
public Icons ThemelizedIcon
public Icons ThemelizedIcon
{
get
{
return themelized;
}
get
{
return themelized;
}
}
}
}

6
CampusAppWP8/CampusAppWP8/Utility/File.cs
View File

@@ -108,7 +108,7 @@ namespace CampusAppWP8.Utility
if (this.Exist() == true)
{
IOTypeRead tempType = ioType;
if (tempType == IOTypeRead.INVALID)
{
tempType = this.readType;
@@ -117,7 +117,7 @@ namespace CampusAppWP8.Utility
if (tempType == IOTypeRead.ReadAsync)
{
// retValue = this.ReadAsync();
retValue = this.ReadSync();
retValue = this.ReadSync();
}
else if (tempType == IOTypeRead.ReadSync)
{
@@ -149,7 +149,7 @@ namespace CampusAppWP8.Utility
else if (tempType == IOTypeWrite.WriteSync)
{
// this.WriteSync(data);
this.WriteAsync(data);
this.WriteAsync(data);
}
}

6
CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs
View File

@@ -20,7 +20,7 @@ namespace CampusAppWP8.Utility
#region Member
/// <summary>
/// BaseAddress of the webclient
/// BaseAddress of the webClient
/// </summary>
private string baseAddress;
#endregion
@@ -40,7 +40,7 @@ namespace CampusAppWP8.Utility
/// <param name="apiBaseAddress">the url of the HttpRequest base address</param>
public HttpRequest(Uri apiBaseAddress)
{
baseAddress = apiBaseAddress.AbsoluteUri;
this.baseAddress = apiBaseAddress.AbsoluteUri;
}
#endregion
@@ -79,7 +79,7 @@ namespace CampusAppWP8.Utility
paramterStr += parameter.ToString();
}
string getUrlStr = baseAddress + seperator + paramterStr;
string getUrlStr = this.baseAddress + seperator + paramterStr;
return new Uri(getUrlStr, UriKind.Absolute);
}

10
CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs
View File

@@ -56,10 +56,10 @@ namespace CampusAppWP8.Utility.Lui.Button
/// Gets or sets the Url
/// </summary>
public object SearchTerm
{
get { return (object)this.GetValue(SearchTermProperty); }
set { this.SetValue(SearchTermProperty, value); }
}
{
get { return (object)this.GetValue(SearchTermProperty); }
set { this.SetValue(SearchTermProperty, value); }
}
#endregion
@@ -75,7 +75,7 @@ namespace CampusAppWP8.Utility.Lui.Button
{
MapsTask mapsTask = new MapsTask();
mapsTask.Center = new GeoCoordinate(51.766788, 14.326681);
mapsTask.SearchTerm = this.SearchTerm as string;
mapsTask.SearchTerm = this.SearchTerm as string;
mapsTask.ZoomLevel = 15;
mapsTask.Show();
}

1
CampusAppWP8/CampusAppWP8/Utility/Lui/Button/UpdateButtonAppBar.cs
View File

@@ -8,7 +8,6 @@
namespace CampusAppWP8.Utility.Lui.Button
{
using System;
using System.Windows;
using CampusAppWP8.Resources;
using Microsoft.Phone.Shell;

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

@@ -39,7 +39,7 @@ namespace CampusAppWP8.Utility
/// Method add an Newline to a string
/// </summary>
/// <param name="str">input string</param>
/// <returns>input string + \n</returns>
/// <returns>input string + newline</returns>
public static string AddNewLine(string str)
{
return str.ToString() + "\n";
@@ -49,7 +49,7 @@ namespace CampusAppWP8.Utility
/// Method remove(TrimEND!) an Newline to a string
/// </summary>
/// <param name="str">input string</param>
/// <returns>input string - \n</returns
/// <returns>input string - newline</returns
public static string RemvoveNewLine(string str)
{
return str.TrimEnd('\n');

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

@@ -13,7 +13,7 @@ namespace CampusAppWP8.Utility
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
/// <summary>
/// Collection of utility functions.
/// </summary>
@@ -28,17 +28,17 @@ namespace CampusAppWP8.Utility
/// Compare Equality.
/// </summary>
Equal,
/// <summary>
/// Compare if less.
/// </summary>
Less,
/// <summary>
/// Compare equality or less.
/// </summary>
LessEqual,
/// <summary>
/// Compare greater.
/// </summary>
@@ -135,7 +135,7 @@ namespace CampusAppWP8.Utility
List<DependencyObject> l = Utilities.GetChild(rootObj, parentGridName);
Grid parentGrid = l[index] as Grid;
FrameworkElement elem = null;
foreach (FrameworkElement tempElem in parentGrid.Children)
{
if (tempElem.Name == elemName)

2
CampusAppWP8/CampusAppWP8/Utility/XmlManager.cs
View File

@@ -49,7 +49,7 @@ namespace CampusAppWP8.Utility
string retValue = string.Empty;
XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
ns.Add("", "");
ns.Add(string.Empty, string.Empty);
XmlSerializer serializer = new XmlSerializer(typeof(T));
TextWriter writer = new StringWriter();