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

Merge branch 'release/#120' into develmaster

Browse Source
This commit is contained in:
Christian Fiedler
2013-07-22 13:48:53 +02:00
parent de91ac2d76 0072df1186
commit d167dbfb9e
13 changed files with 80 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
CampusAppWP8/CampusAppWP8/Assets/icons/DarkTheme/update_159.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
CampusAppWP8/CampusAppWP8/Assets/icons/LightTheme/update_159.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

10
CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
View File

@@ -98,6 +98,7 @@
</Compile>
<Compile Include="Feed\Departments\DepartmentFavoriteFeed.cs" />
<Compile Include="Const.cs" />
<Compile Include="Resources\Icons.Designer.cs" />
<Compile Include="Utility\Lui\Button\EmailButton.cs" />
<Compile Include="Feed\Link\CommonLinkFeed.cs" />
<Compile Include="Feed\Link\ClubLinkFeed.cs" />
@@ -204,11 +205,6 @@
<DesignTime>True</DesignTime>
<DependentUpon>Constants.resx</DependentUpon>
</Compile>
<Compile Include="Resources\Icons.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Icons.resx</DependentUpon>
</Compile>
<Compile Include="ThemelizedIcons.cs" />
<Compile Include="Utility\Api.cs" />
<Compile Include="Utility\ApiEventHandler.cs" />
@@ -338,6 +334,7 @@
<Content Include="Assets\Icons\DarkTheme\favorite_159.png" />
<Content Include="Assets\Icons\DarkTheme\info_159.png" />
<Content Include="Assets\Icons\DarkTheme\phone_159.png" />
<Content Include="Assets\Icons\DarkTheme\update_159.png" />
<Content Include="Assets\Icons\LightTheme\add_159.png" />
<Content Include="Assets\Icons\LightTheme\btulogo_159.png" />
<Content Include="Assets\Icons\LightTheme\campus_159.png" />
@@ -366,6 +363,7 @@
<Content Include="Assets\Icons\DarkTheme\student_council_159.png" />
<Content Include="Assets\Icons\LightTheme\student_council_159.png" />
<Content Include="Assets\Icons\DarkTheme\webmail_159.png" />
<Content Include="Assets\Icons\LightTheme\update_159.png" />
<Content Include="Assets\Icons\LightTheme\webmail_159.png" />
<Content Include="Assets\testmap.png" />
<Content Include="Assets\Tiles\FlipCycleTileLarge.png">
@@ -404,8 +402,6 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Icons.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Icons.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>

5
CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml
View File

@@ -43,4 +43,9 @@
</ListBox.ItemTemplate>
</ListBox>
</Grid>
<phone:PhoneApplicationPage.ApplicationBar>
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="False" Mode="Minimized" Opacity="1.0" >
</shell:ApplicationBar>
</phone:PhoneApplicationPage.ApplicationBar>
</phone:PhoneApplicationPage>

20
CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
View File

@@ -7,11 +7,14 @@
//-----------------------------------------------------------------------------
namespace CampusAppWP8.Pages.Events
{
using System;
using System.Linq;
using System.Windows.Navigation;
using CampusAppWP8.Feed.Events;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
/// <summary>
/// Overview page of all events.
@@ -30,6 +33,12 @@ namespace CampusAppWP8.Pages.Events
{
this.InitializeComponent();
ApplicationBarIconButton updateBtn = new ApplicationBarIconButton();
updateBtn.IconUri = new Uri(Icons.Update, UriKind.Relative);
updateBtn.Text = AppResources.UpdateBtn;
updateBtn.Click += new EventHandler(this.EventForceUpdate_Click);
ApplicationBar.Buttons.Add(updateBtn);
if (EventIndexPage.eventFeed == null)
{
EventIndexPage.eventFeed = new EventFeed(false);
@@ -66,5 +75,16 @@ namespace CampusAppWP8.Pages.Events
{
this.EventList.ItemsSource = EventIndexPage.eventFeed.Model.Channel[0].Item;
}
/// <summary>
/// On clicking the update button in the ApplicationBar.
/// Force a data update from the web.
/// </summary>
/// <param name="sender">button object</param>
/// <param name="e">event args</param>
private void EventForceUpdate_Click(object sender, EventArgs e)
{
EventIndexPage.eventFeed.ForceWebUpdate();
}
}
}

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

@@ -55,7 +55,7 @@
</Grid>
<phone:PhoneApplicationPage.ApplicationBar>
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="False" Mode="Minimized" Opacity="1.0" >
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="False" Mode="Default" Opacity="1.0" >
</shell:ApplicationBar>
</phone:PhoneApplicationPage.ApplicationBar>
</phone:PhoneApplicationPage>

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

@@ -44,4 +44,8 @@
</ListBox>
</Grid>
<phone:PhoneApplicationPage.ApplicationBar>
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="False" Mode="Minimized" Opacity="1.0" >
</shell:ApplicationBar>
</phone:PhoneApplicationPage.ApplicationBar>
</phone:PhoneApplicationPage>

22
CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
View File

@@ -7,11 +7,12 @@
//-----------------------------------------------------------------------------
namespace CampusAppWP8.Pages.News
{
using System.Linq;
using System;
using System.Windows.Navigation;
using CampusAppWP8.Feed.News;
using CampusAppWP8.Utility;
using CampusAppWP8.Resources;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
/// <summary>
/// Overview page of all news.
@@ -30,6 +31,12 @@ namespace CampusAppWP8.Pages.News
{
this.InitializeComponent();
ApplicationBarIconButton updateBtn = new ApplicationBarIconButton();
updateBtn.IconUri = new Uri(Icons.Update, UriKind.Relative);
updateBtn.Text = AppResources.UpdateBtn;
updateBtn.Click += new EventHandler(this.NewsForceUpdate_Click);
ApplicationBar.Buttons.Add(updateBtn);
if (NewsIndexPage.newsFeed == null)
{
NewsIndexPage.newsFeed = new NewsFeed(false);
@@ -66,5 +73,16 @@ namespace CampusAppWP8.Pages.News
{
this.NewsList.ItemsSource = NewsIndexPage.newsFeed.Model.Channel[0].Item;
}
/// <summary>
/// On clicking the update button in the ApplicationBar.
/// Force a data update from the web.
/// </summary>
/// <param name="sender">button object</param>
/// <param name="e">event args</param>
private void NewsForceUpdate_Click(object sender, EventArgs e)
{
NewsIndexPage.newsFeed.ForceWebUpdate();
}
}
}

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

@@ -54,7 +54,7 @@
</Grid>
<phone:PhoneApplicationPage.ApplicationBar>
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="False" Mode="Minimized" Opacity="1.0" >
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="False" Mode="Default" Opacity="1.0" >
</shell:ApplicationBar>
</phone:PhoneApplicationPage.ApplicationBar>
</phone:PhoneApplicationPage>

9
CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs generated
View File

@@ -645,6 +645,15 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Aktualisieren ähnelt.
/// </summary>
public static string UpdateBtn {
get {
return ResourceManager.GetString("UpdateBtn", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Willkommen zur BTU-CampusApp WP8 ähnelt.
/// </summary>

3
CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
View File

@@ -317,4 +317,7 @@
<data name="LinkApp_CommonLinks" xml:space="preserve">
<value>allg. Links</value>
</data>
<data name="UpdateBtn" xml:space="preserve">
<value>Aktualisieren</value>
</data>
</root>

11
CampusAppWP8/CampusAppWP8/Resources/Icons.Designer.cs generated
View File

@@ -255,6 +255,17 @@ namespace CampusAppWP8.Resources
}
}
/// <summary>
/// Gets the uri string of the update icon.
/// </summary>
public static string Update
{
get
{
return Themerize("Update");
}
}
/// <summary>
/// Return the theme depending string of a icon.
/// </summary>

3
CampusAppWP8/CampusAppWP8/Resources/Icons.resx
View File

@@ -165,6 +165,9 @@
<data name="StudentCouncil" xml:space="preserve">
<value>student_council_159.png</value>
</data>
<data name="Update" xml:space="preserve">
<value>update_159.png</value>
</data>
<data name="WebMail" xml:space="preserve">
<value>webmail_159.png</value>
</data>