diff --git a/CampusAppWP8/CampusAppWP8/Assets/ApplicationIcon.png b/CampusAppWP8/CampusAppWP8/Assets/ApplicationIcon.png index 57d8a936..0e84de9d 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/ApplicationIcon.png and b/CampusAppWP8/CampusAppWP8/Assets/ApplicationIcon.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/BTULogoKompaktversiondeutschPNGSW.png b/CampusAppWP8/CampusAppWP8/Assets/BTULogoKompaktversiondeutschPNGSW.png new file mode 100644 index 00000000..89c8372c Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/BTULogoKompaktversiondeutschPNGSW.png differ diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 6f288cb6..f095f044 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -159,6 +159,9 @@ ShowPad.xaml + + Impressum.xaml + True True @@ -391,6 +394,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml index 079dc40c..66745420 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml @@ -6,7 +6,7 @@ xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit" + xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit" xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml new file mode 100644 index 00000000..cba5a15d --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + Name: BTU Campus-App + Version: 1.0 + Kontakt: + + + + + + + + + + + Email: + + + + Website: + + + + Facebook: + + + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml.cs new file mode 100644 index 00000000..539a75dd --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Navigation; +using Microsoft.Phone.Controls; +using Microsoft.Phone.Shell; + +namespace CampusAppWP8.Pages.Setting +{ + public partial class Impressum : PhoneApplicationPage + { + public Impressum() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml index d7048791..c92da838 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml @@ -275,6 +275,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index d351d030..8e0c4389 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -56,6 +56,7 @@ namespace CampusAppWP8.Pages ApplicationBarMenuItem menuItem2 = ApplicationBar.MenuItems[1] as ApplicationBarMenuItem; ApplicationBarMenuItem menuItem3 = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem; ApplicationBarMenuItem menuItem4 = ApplicationBar.MenuItems[3] as ApplicationBarMenuItem; + ApplicationBarMenuItem menuItem5 = ApplicationBar.MenuItems[4] as ApplicationBarMenuItem; if (menuItem1 != null) { @@ -77,6 +78,11 @@ namespace CampusAppWP8.Pages menuItem4.Text = AppResources.App_ScanNfc; } + if (menuItem5 != null) + { + menuItem5.Text = AppResources.Setting_ImpressumTitle; + } + else { ApplicationBar.MenuItems.RemoveAt(ApplicationBar.MenuItems.Count - 1); @@ -273,8 +279,18 @@ namespace CampusAppWP8.Pages /// some EventArgs private void ApplicationBarMenuItem4_Click(object sender, EventArgs e) { - /* Uri url = new Uri("/Pages/Dev/NFC.xaml", UriKind.Relative); - NavigationService.Navigate(url);*/ + this.device.StopSubscribingForMessage(this.ndefId); + this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); + } + + /// Event handler. Called by ApplicationBarMenuItem5 for click events. + /// Stubbfel, 14.10.2013. + /// Caller of the function. + /// Event information. + private void ApplicationBarMenuItem5_Click(object sender, EventArgs e) + { + Uri url = new Uri("/Pages/Setting/Impressum.xaml", UriKind.Relative); + NavigationService.Navigate(url); } /// diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml index fc444e49..65151051 100644 --- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml +++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml @@ -1,7 +1,7 @@  - + Assets\ApplicationIcon.png diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 5f37747a..cffc9cee 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -969,6 +969,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die App-Info ähnelt. + /// + public static string Setting_ImpressumTitle { + get { + return ResourceManager.GetString("Setting_ImpressumTitle", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag-StandardFunktion ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 319fbe43..e5c2b654 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -485,4 +485,7 @@ BTU-Tag-StandardFunktion + + App-Info + \ No newline at end of file