From 94ce3f1c6e0b3fe10095c5b47a4d33f3a86c787c Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 26 Aug 2013 18:35:18 +0200 Subject: [PATCH 01/10] add IsWifiAvailable --- .../CampusAppWP8/Model/Setting/AppSettings.cs | 15 +++++++++++++ .../Resources/Constants.Designer.cs | 9 ++++++++ .../CampusAppWP8/Resources/Constants.resx | 3 +++ .../CampusAppWP8/Utility/Utilities.cs | 22 +++++++++++++++---- 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs index f3df4c5d..29c582d4 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs @@ -76,5 +76,20 @@ namespace CampusAppWP8.Model.Setting App.SaveToAppState(Constants.AppSetting_UniNet, value); } } + + /// Gets or sets a value indicating whether this object is WiFi enable. + /// true if WiFi enable, false if not. + public bool WifiEnable + { + get + { + return App.LoadFromAppState(Constants.AppSetting_WifiEnable); + } + + set + { + App.SaveToAppState(Constants.AppSetting_WifiEnable, value); + } + } } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index b0390c1f..00bcf801 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -114,6 +114,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die WifiEnable ähnelt. + /// + public static string AppSetting_WifiEnable { + get { + return ResourceManager.GetString("AppSetting_WifiEnable", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die DepartmentFavoriteFeed.xml ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index f7928283..fa445bbf 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -426,4 +426,7 @@ 802.1X + + WifiEnable + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs index 8cb72693..37692a9d 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs @@ -12,14 +12,11 @@ namespace CampusAppWP8.Utility using System.Device.Location; using System.Globalization; using System.Linq; - using System.Runtime.InteropServices.WindowsRuntime; using System.Threading; using System.Windows; using System.Windows.Controls; using System.Windows.Media; using CampusAppWP8.Resources; - using CampusAppWP8.Utility.NDEF; - using Windows.Networking.Proximity; using Microsoft.Phone.Net.NetworkInformation; /// @@ -288,7 +285,7 @@ namespace CampusAppWP8.Utility } } - /// Query if the phon is in the uni network. Method compares only Networkname and Description! + /// Query if the phone is in the uni network. Method compares only Networkname and Description! /// Stubbfel, 26.08.2013. /// true if uni networkavailable, false if not. public static bool IsUniNetworkAvailable() @@ -306,5 +303,22 @@ namespace CampusAppWP8.Utility } return false; } + + /// Queries if a wifik is available. + /// Stubbfel, 26.08.2013. + /// true if a wifik is available, false if not. + public static bool IsWifiAvailable() + { + NetworkInterfaceList networkInterfaceList = new NetworkInterfaceList(); + foreach (NetworkInterfaceInfo networkInterfaceInfo in networkInterfaceList) + { + if (networkInterfaceInfo.InterfaceType == NetworkInterfaceType.Wireless80211 + && networkInterfaceInfo.InterfaceSubtype == NetworkInterfaceSubType.WiFi) + { + return true; + } + } + return false; + } } } \ No newline at end of file From 870b5314ab7b3e5296678d485c8f936920e41e86 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 10:13:59 +0200 Subject: [PATCH 02/10] add onlywifi option --- CampusAppWP8/CampusAppWP8/App.xaml.cs | 10 +++++++++- .../CampusAppWP8/Model/Setting/AppSettings.cs | 15 +++++++++++++++ .../Pages/Setting/AppSettingPage.xaml | 6 +++++- .../Pages/Setting/AppSettingPage.xaml.cs | 2 ++ .../Resources/AppResources.Designer.cs | 9 +++++++++ .../CampusAppWP8/Resources/AppResources.resx | 3 +++ .../CampusAppWP8/Resources/Constants.Designer.cs | 9 +++++++++ .../CampusAppWP8/Resources/Constants.resx | 3 +++ CampusAppWP8/CampusAppWP8/Utility/Utilities.cs | 6 ++++-- 9 files changed, 59 insertions(+), 4 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs index 12dd2832..55c47531 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs @@ -152,7 +152,15 @@ namespace CampusAppWP8 this.UserSettingsLoaded(); - Settings.AppSetting.UniNetwork = Utilities.IsUniNetworkAvailable(); + Settings.AppSetting.UniNetwork = Utilities.IsUniNetworkAvailable(); + if (!Settings.AppSetting.UniNetwork) + { + Settings.AppSetting.WifiEnable = Utilities.IsWifiAvailable(); + } + else + { + Settings.AppSetting.WifiEnable = true; + } if (Settings.AppSetting.GeoWatchEnable) { diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs index 29c582d4..65da2561 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs @@ -91,5 +91,20 @@ namespace CampusAppWP8.Model.Setting App.SaveToAppState(Constants.AppSetting_WifiEnable, value); } } + + /// Gets or sets a value indicating whether the only WiFi. + /// true if only wifi, false if not. + public bool OnlyWifi + { + get + { + return App.LoadFromAppState(Constants.AppSetting_OnlyWifi); + } + + set + { + App.SaveToAppState(Constants.AppSetting_OnlyWifi, value); + } + } } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml index 970f9b5d..82e30fd7 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml @@ -30,12 +30,16 @@ + - + + + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs index a7d851b7..a3406e04 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs @@ -22,6 +22,7 @@ namespace CampusAppWP8.Pages.Setting { this.InitializeComponent(); GeoWatchToggle.IsChecked = Settings.AppSetting.GeoWatchEnable; + OnlyWiFiToggle.IsChecked = Settings.AppSetting.OnlyWifi; } /// @@ -33,6 +34,7 @@ namespace CampusAppWP8.Pages.Setting if (NavigationMode.Back == e.NavigationMode) { Settings.AppSetting.GeoWatchEnable = GeoWatchToggle.IsChecked.Value; + Settings.AppSetting.OnlyWifi = OnlyWiFiToggle.IsChecked.Value; } } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 7b79160f..9d229538 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -771,6 +771,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Nur mit Wlan laden ähnelt. + /// + public static string Setting_AppOnlyWifi { + get { + return ResourceManager.GetString("Setting_AppOnlyWifi", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Mitarbeiter ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index db84d97c..0f2c1050 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -416,4 +416,7 @@ vorlesen + + Nur mit Wlan laden + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index 00bcf801..e8d7a953 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -87,6 +87,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die OnlyWifi ähnelt. + /// + public static string AppSetting_OnlyWifi { + get { + return ResourceManager.GetString("AppSetting_OnlyWifi", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die UniNet ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index fa445bbf..00beecb5 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -429,4 +429,7 @@ WifiEnable + + OnlyWifi + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs index 37692a9d..8cb44876 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs @@ -296,7 +296,8 @@ namespace CampusAppWP8.Utility if (networkInterfaceInfo.InterfaceType == NetworkInterfaceType.Wireless80211 && networkInterfaceInfo.InterfaceSubtype == NetworkInterfaceSubType.WiFi && networkInterfaceInfo.InterfaceName.Equals(Constants.AppSetting_UniNetworkName) - && networkInterfaceInfo.Description.Equals(Constants.AppSetting_UniNetworkDesc)) + && networkInterfaceInfo.Description.Equals(Constants.AppSetting_UniNetworkDesc) + && networkInterfaceInfo.InterfaceState == ConnectState.Connected) { return true; } @@ -313,7 +314,8 @@ namespace CampusAppWP8.Utility foreach (NetworkInterfaceInfo networkInterfaceInfo in networkInterfaceList) { if (networkInterfaceInfo.InterfaceType == NetworkInterfaceType.Wireless80211 - && networkInterfaceInfo.InterfaceSubtype == NetworkInterfaceSubType.WiFi) + && networkInterfaceInfo.InterfaceSubtype == NetworkInterfaceSubType.WiFi + && networkInterfaceInfo.InterfaceState == ConnectState.Connected) { return true; } From c1eadc24527b119e89a19b8d3a657118bee665fe Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 11:23:07 +0200 Subject: [PATCH 03/10] add getLoadmodus --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 3 +++ .../CampusAppWP8/Feed/Link/ClubLinkFeed.cs | 2 +- .../CampusAppWP8/Feed/Link/CommonLinkFeed.cs | 2 +- .../CampusAppWP8/Feed/Mensa/MensaFeed.cs | 2 +- .../Feed/StudentCouncil/StudentCouncilFeed.cs | 2 +- .../Departments/DepartmentIndexPage.xaml.cs | 4 +++- .../Pages/Events/EventIndexPage.xaml.cs | 18 +++++++++++++++++- .../Pages/Lecture/LecturePage.xaml.cs | 1 + .../CampusAppWP8/Pages/Links/LinkPage.xaml.cs | 5 +++-- .../CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs | 3 ++- .../Pages/News/NewsIndexPage.xaml.cs | 17 ++++++++++++++++- .../Openinghours/OpeninghoursPage.xaml.cs | 3 ++- .../StudentCouncil/StudentCouncilPage.xaml.cs | 3 ++- CampusAppWP8/CampusAppWP8/Utility/Utilities.cs | 16 ++++++++++++++++ 14 files changed, 69 insertions(+), 12 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 45ea5c51..b86cead6 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -483,6 +483,9 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/btu_account.svg b/work/images/functions/btu_account.svg new file mode 100644 index 00000000..5ed71b85 --- /dev/null +++ b/work/images/functions/btu_account.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/call.svg b/work/images/functions/call.svg new file mode 100644 index 00000000..68c65036 --- /dev/null +++ b/work/images/functions/call.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/campusplan.svg b/work/images/functions/campusplan.svg new file mode 100644 index 00000000..5841fa18 --- /dev/null +++ b/work/images/functions/campusplan.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/delete.svg b/work/images/functions/delete.svg new file mode 100644 index 00000000..4d0400e3 --- /dev/null +++ b/work/images/functions/delete.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/down.svg b/work/images/functions/down.svg new file mode 100644 index 00000000..eb59f205 --- /dev/null +++ b/work/images/functions/down.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/edit.svg b/work/images/functions/edit.svg new file mode 100644 index 00000000..a84e582c --- /dev/null +++ b/work/images/functions/edit.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/hausaufgaben.svg b/work/images/functions/hausaufgaben.svg new file mode 100644 index 00000000..048eefb7 --- /dev/null +++ b/work/images/functions/hausaufgaben.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/info.svg b/work/images/functions/info.svg new file mode 100644 index 00000000..5118ea82 --- /dev/null +++ b/work/images/functions/info.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/infopoint.svg b/work/images/functions/infopoint.svg new file mode 100644 index 00000000..18704fa8 --- /dev/null +++ b/work/images/functions/infopoint.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/lehrstuehle.svg b/work/images/functions/lehrstuehle.svg new file mode 100644 index 00000000..2f068e7b --- /dev/null +++ b/work/images/functions/lehrstuehle.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/links.svg b/work/images/functions/links.svg new file mode 100644 index 00000000..15065402 --- /dev/null +++ b/work/images/functions/links.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/mail.svg b/work/images/functions/mail.svg new file mode 100644 index 00000000..10a65f44 --- /dev/null +++ b/work/images/functions/mail.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/notenspiegel.svg b/work/images/functions/notenspiegel.svg new file mode 100644 index 00000000..4a45ea4b --- /dev/null +++ b/work/images/functions/notenspiegel.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/openinghours.svg b/work/images/functions/openinghours.svg new file mode 100644 index 00000000..18218aac --- /dev/null +++ b/work/images/functions/openinghours.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/personen.svg b/work/images/functions/personen.svg new file mode 100644 index 00000000..9c5523a0 --- /dev/null +++ b/work/images/functions/personen.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/reload.svg b/work/images/functions/reload.svg new file mode 100644 index 00000000..edcfd41a --- /dev/null +++ b/work/images/functions/reload.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/save.svg b/work/images/functions/save.svg new file mode 100644 index 00000000..8c0d6f36 --- /dev/null +++ b/work/images/functions/save.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/search.svg b/work/images/functions/search.svg new file mode 100644 index 00000000..963a1749 --- /dev/null +++ b/work/images/functions/search.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/stundenplan.svg b/work/images/functions/stundenplan.svg new file mode 100644 index 00000000..fffcabf0 --- /dev/null +++ b/work/images/functions/stundenplan.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/stundenplan_add.svg b/work/images/functions/stundenplan_add.svg new file mode 100644 index 00000000..a3c00599 --- /dev/null +++ b/work/images/functions/stundenplan_add.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/survey.svg b/work/images/functions/survey.svg new file mode 100644 index 00000000..a2d70400 --- /dev/null +++ b/work/images/functions/survey.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/termine.svg b/work/images/functions/termine.svg new file mode 100644 index 00000000..33b6b55a --- /dev/null +++ b/work/images/functions/termine.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/termine_add.svg b/work/images/functions/termine_add.svg new file mode 100644 index 00000000..69aa8b84 --- /dev/null +++ b/work/images/functions/termine_add.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/up.svg b/work/images/functions/up.svg new file mode 100644 index 00000000..fe378713 --- /dev/null +++ b/work/images/functions/up.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/vereine.svg b/work/images/functions/vereine.svg new file mode 100644 index 00000000..4b50684f --- /dev/null +++ b/work/images/functions/vereine.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/functions/vorlesungsverzeichnis.svg b/work/images/functions/vorlesungsverzeichnis.svg new file mode 100644 index 00000000..f292cc6f --- /dev/null +++ b/work/images/functions/vorlesungsverzeichnis.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/listicons/exams.svg b/work/images/listicons/exams.svg new file mode 100644 index 00000000..2fd7751e --- /dev/null +++ b/work/images/listicons/exams.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/listicons/info.svg b/work/images/listicons/info.svg new file mode 100644 index 00000000..2afde309 --- /dev/null +++ b/work/images/listicons/info.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/listicons/lab.svg b/work/images/listicons/lab.svg new file mode 100644 index 00000000..53706ac3 --- /dev/null +++ b/work/images/listicons/lab.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/listicons/lecture.svg b/work/images/listicons/lecture.svg new file mode 100644 index 00000000..3f4d981f --- /dev/null +++ b/work/images/listicons/lecture.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/listicons/practise.svg b/work/images/listicons/practise.svg new file mode 100644 index 00000000..e6f6db32 --- /dev/null +++ b/work/images/listicons/practise.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/listicons/seminar.svg b/work/images/listicons/seminar.svg new file mode 100644 index 00000000..63f03af2 --- /dev/null +++ b/work/images/listicons/seminar.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/optionbuttons/_readme.txt b/work/images/optionbuttons/_readme.txt new file mode 100644 index 00000000..871d2028 --- /dev/null +++ b/work/images/optionbuttons/_readme.txt @@ -0,0 +1 @@ +Die Icons in diesem Ordner haben die Standartfarbe weiss. Die Dateien sind also nicht leer. Man muss zunächst den Hintergrund ändern, um die Icons sehen zu können. \ No newline at end of file diff --git a/work/images/optionbuttons/add.svg b/work/images/optionbuttons/add.svg new file mode 100644 index 00000000..5bd9cfa2 --- /dev/null +++ b/work/images/optionbuttons/add.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/optionbuttons/add_contact.svg b/work/images/optionbuttons/add_contact.svg new file mode 100644 index 00000000..c67865d4 --- /dev/null +++ b/work/images/optionbuttons/add_contact.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/optionbuttons/add_small.svg b/work/images/optionbuttons/add_small.svg new file mode 100644 index 00000000..e50e5421 --- /dev/null +++ b/work/images/optionbuttons/add_small.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/optionbuttons/delete.svg b/work/images/optionbuttons/delete.svg new file mode 100644 index 00000000..2aeb6e04 --- /dev/null +++ b/work/images/optionbuttons/delete.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/optionbuttons/edit.svg b/work/images/optionbuttons/edit.svg new file mode 100644 index 00000000..e6c41722 --- /dev/null +++ b/work/images/optionbuttons/edit.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/optionbuttons/prefs.svg b/work/images/optionbuttons/prefs.svg new file mode 100644 index 00000000..23acbb94 --- /dev/null +++ b/work/images/optionbuttons/prefs.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/optionbuttons/save.svg b/work/images/optionbuttons/save.svg new file mode 100644 index 00000000..99b0fa28 --- /dev/null +++ b/work/images/optionbuttons/save.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/optionbuttons/search.svg b/work/images/optionbuttons/search.svg new file mode 100644 index 00000000..38062bf1 --- /dev/null +++ b/work/images/optionbuttons/search.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/others/beach_chair.svg b/work/images/others/beach_chair.svg new file mode 100644 index 00000000..37abbb92 --- /dev/null +++ b/work/images/others/beach_chair.svg @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/template5.svg b/work/images/template5.svg new file mode 100644 index 00000000..c99e4137 --- /dev/null +++ b/work/images/template5.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/work/images/template5_emotion.svg b/work/images/template5_emotion.svg new file mode 100644 index 00000000..356fc640 --- /dev/null +++ b/work/images/template5_emotion.svg @@ -0,0 +1,73 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/work/images/template5_listicons.svg b/work/images/template5_listicons.svg new file mode 100644 index 00000000..1208ec64 --- /dev/null +++ b/work/images/template5_listicons.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/work/images/template5_options.svg b/work/images/template5_options.svg new file mode 100644 index 00000000..dfb9c94f --- /dev/null +++ b/work/images/template5_options.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + From 9ab60b42b147e54ec67e9c534828fff764d1c9f3 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 12:27:33 +0200 Subject: [PATCH 05/10] change GoToMap-Button -> now it use the campusmap --- .../File/Campusmap/Offlinemap.xml | 8 +-- .../Pages/Campusmap/CampusMapPage.xaml.cs | 70 +++++++++++++------ .../Resources/Constants.Designer.cs | 9 +++ .../CampusAppWP8/Resources/Constants.resx | 3 + .../Utility/Lui/Button/GoToMapButton.cs | 13 ++-- 5 files changed, 74 insertions(+), 29 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml b/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml index 8d4a1592..aa72c656 100644 --- a/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml +++ b/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml @@ -50,7 +50,7 @@ Lehrgebäude Musikpädagogik - Informations, Kommunikations und Medienzentrum + Informations, Kommunikations und Medienzentrum (IKMZ) library @@ -81,7 +81,7 @@ Baustofflabor - Studentenwerk Frankfurt (Oder) + Studentenwerk Frankfurt (Oder) (SW) Zentralverwaltung Hubertstraße (ZVH) @@ -167,7 +167,7 @@ Garagenkomplex - Lehrgebäude 1C + Lehrgebäude 1C (LG1C) Lehrgebäude 3 @@ -210,7 +210,7 @@ entrance - Hauptgebäude + Hauptgebäude (HG) Zentralverwaltung diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index ddc82665..deaa55c5 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -42,9 +42,21 @@ namespace CampusAppWP8.Pages.Campusmap protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - MapCanvas.Children.Clear(); - this.AddPins(this.SearchPlaces("campus")); - this.ShowCurrentPositionDispatcher(); + if (e.NavigationMode == NavigationMode.New) + { + MapCanvas.Children.Clear(); + + string alias = "campus"; + bool scroll = true; + if (NavigationContext.QueryString.ContainsKey(Constants.ParamModelMap_SearchTermAlias)) + { + alias = NavigationContext.QueryString[Constants.ParamModelMap_SearchTermAlias]; + scroll = false; + } + + this.AddPins(this.SearchPlaces(alias)); + this.ShowCurrentPositionDispatcher(scroll); + } } /// Button click method. @@ -68,9 +80,9 @@ namespace CampusAppWP8.Pages.Campusmap { return; } - + MapCanvas.Children.Clear(); - this.AddPins(this.SearchPlaces(query)); + this.AddPins(this.SearchPlaces(query)); } /// Searches for the first places. @@ -85,30 +97,35 @@ namespace CampusAppWP8.Pages.Campusmap /// Adds the pins. /// Stubbfel, 19.08.2013. /// The places. - private void AddPins(List places) + /// (Optional) the scroll. + private void AddPins(List places, bool scroll = true) { foreach (PlaceModel place in places) { GeoCoordinate coor = place.GeoRefPoint; if (coor != null) { - this.AddPin(coor.Longitude, coor.Latitude); + this.AddPin(coor.Longitude, coor.Latitude, scroll); } } } /// Add Pin to an certain position. /// Stubbfel, 19.08.2013. - /// longitude parameter. - /// latitude parameter. - private void AddPin(double x, double y) + /// longitude parameter. + /// latitude parameter. + /// (Optional) the scroll. + private void AddPin(double x, double y, bool scroll = true) { Point scrollPoint = this.map.GetScrollPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y))); MapCanvas.Children.Add(this.map.AddPinFromRefPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y)))); MapScroller.UpdateLayout(); - MapScroller.ScrollToVerticalOffset(scrollPoint.Y); - MapScroller.ScrollToHorizontalOffset(scrollPoint.X); + if (scroll) + { + MapScroller.ScrollToVerticalOffset(scrollPoint.Y); + MapScroller.ScrollToHorizontalOffset(scrollPoint.X); + } // XPoint.Text = x.ToString(); // YPoint.Text = y.ToString(); @@ -125,43 +142,56 @@ namespace CampusAppWP8.Pages.Campusmap /// execute ShowCurrentPosition-Method via Dispatcher. /// Stubbfel, 19.08.2013. - private void ShowCurrentPositionDispatcher() + /// (Optional) the scroll. + private void ShowCurrentPositionDispatcher(bool scroll = true) { ProgressBar.Visibility = Visibility.Visible; - Thread thread = new Thread(new ThreadStart(this.ShowCurrentPosition)); + Thread thread = new Thread(delegate() { this.ShowCurrentPosition(scroll); }); thread.Start(); } /// Method add a pin on the at the position of the phone. /// Stubbfel, 19.08.2013. - private void ShowCurrentPosition() + /// (Optional) the scroll. + private void ShowCurrentPosition(bool scroll = true) { Utilities.DetermineAndStoreCurrentPositionForce(); if (this.Dispatcher != null) { - this.Dispatcher.BeginInvoke(new Action(() => this.SetPinToCurrentPosition())); + this.Dispatcher.BeginInvoke(new Action(() => this.SetPinToCurrentPosition(scroll))); } else { - this.SetPinToCurrentPosition(); + this.SetPinToCurrentPosition(scroll); } } /// Sets pin to current position. /// Stubbfel, 19.08.2013. - private void SetPinToCurrentPosition() + /// (Optional) the scroll. + private void SetPinToCurrentPosition(bool scroll = true) { string lat = App.LoadFromAppState(Constants.GeoWatch_CurrentPosition_Lat); string log = App.LoadFromAppState(Constants.GeoWatch_CurrentPosition_Long); + this.SetPinToPosition(lat, log, scroll); + } + + /// Sets pin to position. + /// Stubbfel, 27.08.2013. + /// The latitude. + /// The longitude. + /// (Optional) the scroll. + private void SetPinToPosition(string latitude, string longitude, bool scroll = true) + { double x; double y; - if (!double.TryParse(log, NumberStyles.Any, CultureInfo.InvariantCulture, out x) || !double.TryParse(lat, NumberStyles.Any, CultureInfo.InvariantCulture, out y)) + if (!double.TryParse(longitude, NumberStyles.Any, CultureInfo.InvariantCulture, out x) || !double.TryParse(latitude, NumberStyles.Any, CultureInfo.InvariantCulture, out y)) { return; } - this.AddPin(x, y); + this.AddPin(x, y, scroll); ProgressBar.Visibility = Visibility.Collapsed; } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index e8d7a953..0de55340 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -519,6 +519,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die SearchAlias ähnelt. + /// + public static string ParamModelMap_SearchTermAlias { + get { + return ResourceManager.GetString("ParamModelMap_SearchTermAlias", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die pivotindex ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index 00beecb5..ef601ff0 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -432,4 +432,7 @@ OnlyWifi + + SearchAlias + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs index e20930e2..19521cc9 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs @@ -73,11 +73,14 @@ namespace CampusAppWP8.Utility.Lui.Button /// protected override void OnClick() { - MapsTask mapsTask = new MapsTask(); - mapsTask.Center = new GeoCoordinate(51.766788, 14.326681); - mapsTask.SearchTerm = this.SearchTerm as string; - mapsTask.ZoomLevel = 15; - mapsTask.Show(); + string urlString = Constants.PathCampusmap_Campusmap; + if (this.SearchTerm != null) + { + urlString += "?" + Constants.ParamModelMap_SearchTermAlias + "=" + this.SearchTerm; + } + Uri url = new Uri(urlString as string, UriKind.Relative); + Page page = App.RootFrame.Content as Page; + page.NavigationService.Navigate(url); } #endregion } From 65f4303405d06b0c69e59310b122ab91f97085a5 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 12:30:26 +0200 Subject: [PATCH 06/10] rename WStore8 --- CampusAppWP8/CampusAppW8.sln | 2 +- CampusAppWP8/CampusAppWStore8/App.xaml | 20 - CampusAppWP8/CampusAppWStore8/App.xaml.cs | 90 - CampusAppWP8/CampusAppWStore8/Assets/Logo.png | Bin 801 -> 0 bytes .../CampusAppWStore8/Assets/SmallLogo.png | Bin 329 -> 0 bytes .../CampusAppWStore8/Assets/SplashScreen.png | Bin 2146 -> 0 bytes .../CampusAppWStore8/Assets/StoreLogo.png | Bin 429 -> 0 bytes .../CampusAppWStore8/CampusAppWStore8.csproj | 151 -- .../CampusAppWStore8_TemporaryKey.pfx | Bin 2512 -> 0 bytes .../Common/StandardStyles.xaml | 1829 ----------------- CampusAppWP8/CampusAppWStore8/MainPage.xaml | 13 - .../CampusAppWStore8/MainPage.xaml.cs | 38 - .../CampusAppWStore8/Package.appxmanifest | 42 - .../Properties/AssemblyInfo.cs | 29 - ...WStore8.csproj => CampusAppWStore8.csproj} | 0 15 files changed, 1 insertion(+), 2213 deletions(-) delete mode 100644 CampusAppWP8/CampusAppWStore8/App.xaml delete mode 100644 CampusAppWP8/CampusAppWStore8/App.xaml.cs delete mode 100644 CampusAppWP8/CampusAppWStore8/Assets/Logo.png delete mode 100644 CampusAppWP8/CampusAppWStore8/Assets/SmallLogo.png delete mode 100644 CampusAppWP8/CampusAppWStore8/Assets/SplashScreen.png delete mode 100644 CampusAppWP8/CampusAppWStore8/Assets/StoreLogo.png delete mode 100644 CampusAppWP8/CampusAppWStore8/CampusAppWStore8.csproj delete mode 100644 CampusAppWP8/CampusAppWStore8/CampusAppWStore8_TemporaryKey.pfx delete mode 100644 CampusAppWP8/CampusAppWStore8/Common/StandardStyles.xaml delete mode 100644 CampusAppWP8/CampusAppWStore8/MainPage.xaml delete mode 100644 CampusAppWP8/CampusAppWStore8/MainPage.xaml.cs delete mode 100644 CampusAppWP8/CampusAppWStore8/Package.appxmanifest delete mode 100644 CampusAppWP8/CampusAppWStore8/Properties/AssemblyInfo.cs rename CampusAppWP8/CampussAppWStore8/{CampussAppWStore8.csproj => CampusAppWStore8.csproj} (100%) diff --git a/CampusAppWP8/CampusAppW8.sln b/CampusAppWP8/CampusAppW8.sln index fec303b9..389dbe1c 100644 --- a/CampusAppWP8/CampusAppW8.sln +++ b/CampusAppWP8/CampusAppW8.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CampusAppWP8", "CampusAppWP8\CampusAppWP8.csproj", "{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CampussAppWStore8", "CampussAppWStore8\CampussAppWStore8.csproj", "{E49420AA-3023-42EF-8255-67B1F5E52B43}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CampusAppWStore8", "CampussAppWStore8\CampusAppWStore8.csproj", "{E49420AA-3023-42EF-8255-67B1F5E52B43}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CampusAppWPortalLib8", "CampusAppWPortalLib8\CampusAppWPortalLib8.csproj", "{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}" EndProject diff --git a/CampusAppWP8/CampusAppWStore8/App.xaml b/CampusAppWP8/CampusAppWStore8/App.xaml deleted file mode 100644 index 3b7b41dc..00000000 --- a/CampusAppWP8/CampusAppWStore8/App.xaml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - diff --git a/CampusAppWP8/CampusAppWStore8/App.xaml.cs b/CampusAppWP8/CampusAppWStore8/App.xaml.cs deleted file mode 100644 index ef95402d..00000000 --- a/CampusAppWP8/CampusAppWStore8/App.xaml.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -// Die Vorlage "Leere Anwendung" ist unter http://go.microsoft.com/fwlink/?LinkId=234227 dokumentiert. - -namespace CampusAppWStore8 -{ - /// - /// Stellt das anwendungsspezifische Verhalten bereit, um die Standardanwendungsklasse zu ergänzen. - /// - sealed partial class App : Application - { - /// - /// Initialisiert das Singletonanwendungsobjekt. Dies ist die erste Zeile von erstelltem Code - /// und daher das logische Äquivalent von main() bzw. WinMain() - /// - public App() - { - this.InitializeComponent(); - this.Suspending += OnSuspending; - } - - /// - /// Wird aufgerufen, wenn die Anwendung durch den Endbenutzer normal gestartet wird. Weitere Einstiegspunkte - /// werden verwendet, wenn die Anwendung zum Öffnen einer bestimmten Datei, zum Anzeigen - /// von Suchergebnissen usw. gestartet wird. - /// - /// Details über Startanforderung und -prozess. - protected override void OnLaunched(LaunchActivatedEventArgs args) - { - Frame rootFrame = Window.Current.Content as Frame; - - // App-Initialisierung nicht wiederholen, wenn das Fenster bereits Inhalte enthält. - // Nur sicherstellen, dass das Fenster aktiv ist. - if (rootFrame == null) - { - // Einen Rahmen erstellen, der als Navigationskontext fungiert und zum Parameter der ersten Seite navigieren - rootFrame = new Frame(); - - if (args.PreviousExecutionState == ApplicationExecutionState.Terminated) - { - //TODO: Zustand von zuvor angehaltener Anwendung laden - } - - // Den Rahmen im aktuellen Fenster platzieren - Window.Current.Content = rootFrame; - } - - if (rootFrame.Content == null) - { - // Wenn der Navigationsstapel nicht wiederhergestellt wird, zur ersten Seite navigieren - // und die neue Seite konfigurieren, indem die erforderlichen Informationen als Navigationsparameter - // übergeben werden - if (!rootFrame.Navigate(typeof(MainPage), args.Arguments)) - { - throw new Exception("Failed to create initial page"); - } - } - // Sicherstellen, dass das aktuelle Fenster aktiv ist - Window.Current.Activate(); - } - - /// - /// Wird aufgerufen, wenn die Ausführung der Anwendung angehalten wird. Der Anwendungszustand wird gespeichert, - /// ohne zu wissen, ob die Anwendung beendet oder fortgesetzt wird und die Speicherinhalte dabei - /// unbeschädigt bleiben. - /// - /// Die Quelle der Anhalteanforderung. - /// Details zur Anhalteanforderung. - private void OnSuspending(object sender, SuspendingEventArgs e) - { - var deferral = e.SuspendingOperation.GetDeferral(); - //TODO: Anwendungszustand speichern und alle Hintergrundaktivitäten beenden - deferral.Complete(); - } - } -} diff --git a/CampusAppWP8/CampusAppWStore8/Assets/Logo.png b/CampusAppWP8/CampusAppWStore8/Assets/Logo.png deleted file mode 100644 index e26771cb33a49bbef824aa333737181b0a5b09a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 801 zcmeAS@N?(olHy`uVBq!ia0y~yV3-EN9Bd2>3^t5~j~EyjBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFdg=EaSW-r_2%wgUu8#$hQvKeC6ZGdoyuYz>I5fd zD=cCVTGw#;WJV*C#^Im$BqU!l<@MGW@3y}Geb1#+jk-7IRhn$x_Gh!?@sCcc?j~@s zOgkVHAr!&no#2_ksne+1sJek=8nJ>RyH5AXyMu zC7zPUKdy?gnUnO4V8$neR!%tOJt2)L8_xD-?dqVQ-9w} za}*W2CRLc~EGl+wR>9xaS6bYwE^N5gpsl^?!-i=`rb>o#MR-3r)u+X~#33yiC?y&ms@MYs>e-SYhLYGz_i**Z^eOC zeJDbl>x$kiU|P+(E_=m+tVWR3!>ZrMukP;^h)56hyH*~bQ$N4;*Hq~Z&s@JIKT?a{ zabQ)W))oGV4O^8$p3ZsAtG6L*@vZq4+Dv*I&N-JpTFbHHfR(&xOoFL1t9ZoOfP<`I z#vuibS9wHZ5^5LiTHVXF?#YHzPvji#ZgXG_4~lRP**$H=12490zmNje#;q(`JDLth z35Ax$I2(ohwhT-?X6nEy9`V0F>tcP<*_P}EF1-y_?o&ChGl<3{usTj@E4ojhO{hc-m9E3cS|J`^!QH9JN2zXQG42fN#|}{%2nKyL~^3QpM0V= c*)#DloQf}5saF0GlnEF-UHx3vIVCg!0HVrD82|tP diff --git a/CampusAppWP8/CampusAppWStore8/Assets/SmallLogo.png b/CampusAppWP8/CampusAppWStore8/Assets/SmallLogo.png deleted file mode 100644 index 1eb0d9d528c42f132872e8af4dc563081b0b9aff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0y~yV2}f04mJh`25W{(JaZG%Q-e|yQz{EjrrIztFueA3aSW-r_2&9p&cg})< zN_`jqUu$CJOy9#VtocQuMc{C=T4kt*rmiv9bWc;>I+=CfyZ5GZ{|h_Q&fYNH_2m8Y zv-}n1`;4z_G~s!AP%z`kfqPxTE8ZVUt+;B@8nnLW&#J8!;z8zH?-Fdf4=6;!D>RBU|7yi!Z i!T#2rtM4)KFjRke>fjyo{0svF1B0ilpUXO@geCy9j)!aj diff --git a/CampusAppWP8/CampusAppWStore8/Assets/SplashScreen.png b/CampusAppWP8/CampusAppWStore8/Assets/SplashScreen.png deleted file mode 100644 index c951e031bdfa0d4ebe68d52647f14caf710ca471..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2146 zcmeAS@N?(olHy`uVBq!ia0y~yV9H@&VASDYV_;yYQ+HfYNX4x;cMbCnIf%FhT7NqB;zr=L39=VA znzVadSi&*wSlPY#mdh6&a*B_LIdE<%j6Ua!ACgRLMvY02qkm<&oJeCc+ zy9EzahasE+GZADj)ENd+($5d=%=>IpFUfp$?dxAZD|XIenRA#+dd}-#e-<)tWaBUs z$W^%Juz_(AFO0)*kZlp~5h)Hchb@ZN;GBfbvooC6nBM1ZNN9d+V}4XLmq$L^tb+|% zF-Vg@F2W>;v1->GHZ*1k=XRKaXy-MZrUE$)8P01Mn|NKMJD?nppu#N|=_Fo(9EDo~ z*-5-C(jdAaf%&4^ErD!>8w?lQB7~tdGmCVG*^yZh%m>*z%#KJY+;G^^38fXUfm{J| zy6=`w(~WFRyaHg`;htRNi|h)4+$7&MjS0*U+hIfknQc5Cgjv%m;;3 zLx!~FEr@f#1}Z=~*CMxcLd{@A7`S$G2G|QOvm=;6Q2^mYr$ZgJ?EzFex&W$M*8*yu zm`pCjI_^HGQ(4_-M}Ym`v>58HgAii`AW9i1Bw}DtDMF^tmr`NZI0>+wXo6zMR%$i`vTz_d~A7Q;cd0EKHV(h4^i{Cc+D zzOrrSx(wz=I&KVKM6%Zl^T=JFCAIFWaPH*G0u3TzHyYk0y*YP>8G<0!fZQgK(*SYWk*Mbor-K4Q;RXYgv(*t2 zP9TRnY+!_Qz<~!61RDVM704h^(1PfO1m+`B$edYFTV`c|0|I0mi=e_MyTi<3 zLt_Lpj02*N%!+UZrL`kc9cG~5a^BKuCXl0W%|{3%3)70M>cy2L7KLjM%D33=I~{zu z{O7M4`wiD?UoLAp`;I+6e$B<(@)LCR)Og=ls&Gjjk*fUv;;^$?iEA#j!SD}W8U1FA$H{D z@@ZnrL<7J6a80)8cxBOas6fz{F;GgmF{AHIkc1|Sw(G+r6~Q+#t3{Q21w5s)4LMpO zzEz7gJ9RAksLCUx7}x*AAmhl*swGmw?C;8%=U?_WU|Hj2Gec4%X^(4WhwulX1`&a{ z#ViUYNwLCGUwIY^Mt$YUR4_4E(&~`xA>4Rmf*Dh*A~y?@a~MY^Po$EHVM_0WLjn98 zoIGEf9we<$XJLPA#Ll+O_Q-->jXx7_uM7Puw@6aS*m%vX+P4ob{|@XwJ!My(%qqzV gj62z%=pSIPF6oWmoxSxF0|Nttr>mdKI;Vst06GV#)c^nh diff --git a/CampusAppWP8/CampusAppWStore8/CampusAppWStore8.csproj b/CampusAppWP8/CampusAppWStore8/CampusAppWStore8.csproj deleted file mode 100644 index f0653e0f..00000000 --- a/CampusAppWP8/CampusAppWStore8/CampusAppWStore8.csproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - AnyCPU - {88D81ECB-FF6A-4807-B23F-5DF9B790B7B3} - AppContainerExe - Properties - CampusAppWStore8 - CampusAppWStore8 - de-DE - 512 - {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - CampusAppWStore8_TemporaryKey.pfx - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE;NETFX_CORE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE;NETFX_CORE - prompt - 4 - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - ARM - false - prompt - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - x64 - false - prompt - true - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - x86 - false - prompt - true - - - - - - - App.xaml - - - MainPage.xaml - - - - - - Designer - - - - - - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - 11.0 - - - - \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWStore8/CampusAppWStore8_TemporaryKey.pfx b/CampusAppWP8/CampusAppWStore8/CampusAppWStore8_TemporaryKey.pfx deleted file mode 100644 index 14ee2fec47e2be23b8033b1a7fe3abeb76049f97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2512 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Maus - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CampusAppWP8/CampusAppWStore8/MainPage.xaml b/CampusAppWP8/CampusAppWStore8/MainPage.xaml deleted file mode 100644 index a7ce9f6e..00000000 --- a/CampusAppWP8/CampusAppWStore8/MainPage.xaml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/CampusAppWP8/CampusAppWStore8/MainPage.xaml.cs b/CampusAppWP8/CampusAppWStore8/MainPage.xaml.cs deleted file mode 100644 index 077f698c..00000000 --- a/CampusAppWP8/CampusAppWStore8/MainPage.xaml.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -// Die Elementvorlage "Leere Seite" ist unter http://go.microsoft.com/fwlink/?LinkId=234238 dokumentiert. - -namespace CampusAppWStore8 -{ - /// - /// Eine leere Seite, die eigenständig verwendet werden kann oder auf die innerhalb eines Rahmens navigiert werden kann. - /// - public sealed partial class MainPage : Page - { - public MainPage() - { - this.InitializeComponent(); - } - - /// - /// Wird aufgerufen, wenn diese Seite in einem Rahmen angezeigt werden soll. - /// - /// Ereignisdaten, die beschreiben, wie diese Seite erreicht wurde. Die - /// Parametereigenschaft wird normalerweise zum Konfigurieren der Seite verwendet. - protected override void OnNavigatedTo(NavigationEventArgs e) - { - } - } -} diff --git a/CampusAppWP8/CampusAppWStore8/Package.appxmanifest b/CampusAppWP8/CampusAppWStore8/Package.appxmanifest deleted file mode 100644 index 7ed76a39..00000000 --- a/CampusAppWP8/CampusAppWStore8/Package.appxmanifest +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - CampusAppWStore8 - stubbfel - Assets\StoreLogo.png - - - - 6.2.1 - 6.2.1 - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWStore8/Properties/AssemblyInfo.cs b/CampusAppWP8/CampusAppWStore8/Properties/AssemblyInfo.cs deleted file mode 100644 index 4f404c4e..00000000 --- a/CampusAppWP8/CampusAppWStore8/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Diese Attributwerte ändern, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("CampusAppWStore8")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CampusAppWStore8")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Es können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern -// mithilfe von '*' wie unten dargestellt übernommen werden: -// [Assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/CampusAppWP8/CampussAppWStore8/CampussAppWStore8.csproj b/CampusAppWP8/CampussAppWStore8/CampusAppWStore8.csproj similarity index 100% rename from CampusAppWP8/CampussAppWStore8/CampussAppWStore8.csproj rename to CampusAppWP8/CampussAppWStore8/CampusAppWStore8.csproj From 5dbf8b3b2c1b40d3c031d2bf01530855f5bb935f Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 12:57:13 +0200 Subject: [PATCH 07/10] update ignore --- CampusAppWP8/CampusAppWP8/Settings.StyleCop | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 CampusAppWP8/CampusAppWP8/Settings.StyleCop diff --git a/CampusAppWP8/CampusAppWP8/Settings.StyleCop b/CampusAppWP8/CampusAppWP8/Settings.StyleCop new file mode 100644 index 00000000..1b4199b4 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Settings.StyleCop @@ -0,0 +1,7 @@ + + + + Stubbfel + + + \ No newline at end of file From 504ec3a3e2074703cadc7600d85ce4909629b444 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 14:11:22 +0200 Subject: [PATCH 08/10] add searchplacepin, currentplacepin, hiddenpin --- .../Icons/DarkTheme/current_position_159.png | Bin 0 -> 8261 bytes .../Icons/DarkTheme/search_place_159.png | Bin 0 -> 8336 bytes .../Icons/LightTheme/current_position_159.png | Bin 0 -> 8261 bytes .../Icons/LightTheme/search_place_159.png | Bin 0 -> 8336 bytes CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 7 ++ .../Campusmap/CurrentPositionPinModel.cs | 29 +++++ .../Model/Campusmap/HiddenPinPlaceModel.cs | 15 +++ .../CampusAppWP8/Model/Campusmap/MapModel.cs | 102 ++++++++++++------ .../Model/Campusmap/MapPinModel.cs | 24 +++-- .../Model/Campusmap/SearchPlacePinModel.cs | 31 ++++++ .../Pages/Campusmap/CampusMapPage.xaml.cs | 27 +++-- CampusAppWP8/CampusAppWP8/Resources/Icons.cs | 22 ++++ .../CampusAppWP8/Resources/Icons.resx | 6 ++ .../Utility/Lui/Button/GoToMapButton.cs | 1 + 14 files changed, 214 insertions(+), 50 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/current_position_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_place_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/current_position_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_place_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs create mode 100644 CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs create mode 100644 CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/current_position_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/current_position_159.png new file mode 100644 index 0000000000000000000000000000000000000000..47ed68d2f6a9f58ab9b0bc56c1caf4bc036dff18 GIT binary patch literal 8261 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 o;u?JmdKI;Vst0H&ngkpKVy literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_place_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_place_159.png new file mode 100644 index 0000000000000000000000000000000000000000..2b8797caa0119e7275a0d9556fc7ada9cc9be9c4 GIT binary patch literal 8336 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/current_position_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/current_position_159.png new file mode 100644 index 0000000000000000000000000000000000000000..47ed68d2f6a9f58ab9b0bc56c1caf4bc036dff18 GIT binary patch literal 8261 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5a29w(7Bet#3xhBt!>lJ4}r;Fna-R}9C&vQ4QXFtHfGtI*|(6oVPrIVcCgXZH$jy-&$=g`Qd zQotaExux3<0_f3F`IFE;BUD{V}teks*4DqA25n zi3|$DsU0p18P*JI&WClmGDH|Kh@^QRv1GWR%V6Lcp60=@VLQWta{}C(7&v$s3<5h^ zH5pi{84^w?D_1bI%w!O8`xI{TQG1=hb1epjikX{icB)vqHb!&k7P5zj>&a=H^Ay(> zF-v4hoaLZ*sB)&HQKJd}gU@Fe7#2(v6@1YA`ESKJzIEr$ne}bsi`RX%pY6X=Qqtpp zPtUI|aA06~SW!-AK$!ao;)!p3#s zgq=5UK7I1!hSw3N=)_auwg1u&#UBX&oAa~I=Fj)95B5D$X*7y$bZ7bT;Lw>bK1*fJ zPvUGzy7R2x{m*vp|9@mJD;@Dn+8LoG@;Feau+L>y&u62hN}W!VG>@uY`k(UXzRquE zyZfdL8?x*et0(HNh)rhx=B+LeQF7qXcLs(}yYmlT(coZi$Y_3ezWo1t`@ilBR2dr5 zJSP=0FvPj2=!KlxY=4}Cfx%@#qt*sT=`RN*bPlk|9Av$7ko!-9S&Ng(kwZ=bPFyJs zGDQiRYnq%i+Rko})k@I6;vj2sATXnCasi*-q0k+CwgvpZ5;^7_)Y#L=$>Ml|LpV|K zRtIBJSA=pOhxp9aABqP(ScJM&6i#-C1S)w?H1#kH>IzW^^^pB!Tf}799^kJ-ZK7glHR-|Dw> zK5lT}g#^3tksJfPV~3qKTIg_2PCmU+X${ZnV^SN!)-dnx{F;1zV>ydZqw4`qGnR5E zg+w_=j|iU#zZ)Ja6l7FP1aEPgb27IC9#U7Dyuy2n+AhJLME}D8-DnmTud*=EVCA$RgPL=bUej)tQ>6h*=roUkR zQqIHMCfaNQnusv-zs_doG3wOJe@6TKQZpOTQaSii)@|WMM-242OOs)RkkiWUVmVb5UiD28z zqr!HZ=bVJiQPaYF8(ID1w?76t#~yZYUYa;Har(oSi90XaEWYa2>&D-cc`W9!%H!N) zxyKf(v8gGldHcTdeK#w}cjq$AW!65{KF80VIlJiWwV9@~Z4Iv*J)ix2_VwBKwv291H=cXr7%Oc-x+mqKCWf{3NA~Y&?v)kIaYgMo9Ub}m_;PRb*ll@lDyOw@< z!^dqWx2@bRx#8&zw%hBrnRA0@Uv^IyPv2SG{JEpM)4S=k z-gG;?+0w`Ep4j`utK@58?8B-{U+2!=Jp0hw6}Q*FGkcf$uKmvZGbZyj=S3P9UpRci z`9a{*i}u{}ry6A6UsLDr?BAHa^|`Wsvi`*IwbwUnUs}HEd*XX>yKiziwlTkF zbT2agjQN4>C$^vVKb$`=zV*Iyz4HH*|5g7lGAwUUWlU%8Y;S?Vr%gfn!|Igdc?T_X@;(lB$K12URY(eG1bBDgPE*D#=C!}LF z&B3R`&tl34M**!BVm+##gv(X?xGE3H9!gizzi4)`CP7Ql@s>(@cP`HZ8cA9R+&Psk*(EU!{$j7ClorZQuLj?E&Wycv$V3)Yf@V` z{X3f1yPFp=s`|R5@n@`=I zU_R&l{Qqx-4hcP+v~6jdcet)>#IwC?vMe{*6jt8mdMwJS-4@2S#%4#?Hm%&N{;S`H zPhVHJSFOr7yD{$IsiuQl8M9w=hjKk_t$lsx`rBCl2>rmX)iI>`XbIb}8-UvwOPpqWPw+n*MA$UmowxTU&VVhi!TL z^_%N${pn{lZtrg1=Dc(9ew!V8QkS1Rch=fIWJ$=EkY6EY?=Iclnt1(3-oR2DUt<2tuFSXX z`pzp?WiQ!=1odCje(lb8Tz=obx$nz$dCho3d*>W`q+H-q`Q+ty&imixc&%=g^;EBU z$bMPAOg3FsKg(&>r&(^ZgJ=DYPKw^;f5z_OwO9A5{1XyJxN28I!&9UDe*L)oI^fO3yPtclXQQ%8z3IuU(yI zX?u6?=c@egN56l)FLt-CNd51*)4Ok$tG`>j$A3@!7l*fwH=XacU$u|^cjw0YJM~!y z$`^dTc*p%aTWjv!Z8XPIw2uc^4L&|urdR>g(`UHly(3P(?PI4OK_c(m~PqN`nZ=gz!u z^UJ-=Y;kIt>ILQ}d+!%N%h;;@c8^{0`}hCqzL(ceNt9@Cisipp!5P3I&-KuGp@5yp zp>`+58jTkIR;M2z!PXBTL9U0+iZvP_xgP-_IUIr@4R}n!G}?|mDgR0H@5l20EAI9; zCQ3Z0w3{sOiFN*Yb9(^}k&Ic-xN4u3Tg^=u5*F?+lnGz1;kA5OrumVr(VJ2@51G$Y z<#6g+_d5Q?%a=d1+})3#`u6QxW^8Qi%1t_#7oPw6<;xfE&1q+M&6qm1R6|uYRsHm) z`bnujh2m^m-mh{E6ya!65OR{UDtmL|`>NHeyJydu_25t|cY>a1TBK1ATZ750WtWYN zjJ%$mnfdvxYqyx`nfdnrMW?0S4-;`c^z>*_%xmeNk9@Y=UYaQtF)jA?l`CJ)?=E{A z6&D@NeK0|wVjlan)W$_CKHPVUGk4<9=wjk)XMT2mK7aQ0b!)YBbZR_9ukx41x^M6P zaI}C?hr2DYX8)QsZ(6_Kub03KyEo)Vb*+lJ8-n?RjbQ`n}(7_4mnGf}EEzi>+%>TTYo#qw(EU z>s}`cL{4LEOHBCx@9&oT@BiN{-}hP8Rpe;=9gT}0dKc_?_k6Jimqc4-&F^n-?N_c^ z#kBk~r_O06-^&LKd@8#C-2FB0uD@{HtYrru793dU+&&}s_BLDp%U_;lC@9x_ygs$) z@|Bw|mu=iei?+(1-QS;P>zf@B8ftp<_1C)QM2QxCzqN9guU-3g;O6FZM}d~W zM)A{9Zcb-E+icms-8nk?c6j78QGtCHQ`WsMo;`bZde$s4w!5eXo~hWMs_X zV<;BfXE9}2rup`*TX&vO+7Px;ObA35eP%X|~D{i7R~ zg74)8udOm>9b5Rc+gP%V(dIn6`mWW7xuP_ztpwihtSjV{KVEp3lan(+g3V{iS3~0@ zmq3>3r?1x9e)=P@?{)1Zle?29PF(1Jil_CS%@7e5_UuQA=Zb7%AQ!=C~~ zSU0Die`n0InD0@{N2$EhXHTDo?!KEh!-IkMFhl!cMpswY(p~GeE7cTgIB}$;rR@t2 z2w>=10&4`D&B$mDJ@q=x* z^Q?8d9<_gz%Q>?7Hmj3Id1mHI>7`4TDxChbA77e;@Y@miAu!&y1$&$Qvb6*|8&fs%lrX6NmUClA zVRCR?-M{;%Hr4PP+#M95r|cwioO6@T|JN56yPM0~R1{RXySGcuaq->HmAaCF!67V6 ztmb2Pyv_cKkB{QJ7yX#ENMqjX!nYg3POG%=KRD0YTrqF{%db`P_QlW6{5p2*n54S@ zyeI7J?2Q6Ka-s_}r7ZfGx8LS%ZEan$V#SN3xVU@YmMmFvokQ{M_09VH4`(m=Ff&Pl zEn?c!(%5)G9=82=u3tCby?(uZ^kox9hKAHgOI6jS#Qtcp1UvL8Tg81$_`$gN=fYZ%votX*Zn0nEwkLUPF&C_sAAsx#hJTW1&X3Bn{*sEd-z;xU%C=O@-|rMZn--l{Id9R5wOxyPG6nZu zD10*CzW(1)^LrJK_uaY`b)nRDj@S83Iy>&>oj85Ed8zmGGX2yBuC0v@pEq~z-$jcw zLX!nGTJF60v}@O{`+NTVdcFDFe0zDl(~0ly-#K$;)}cdA5!>@(PakUKj=xg+_v^(7 z$Cmu2hup67v%kN)`}?+T^fr}MtGH~=-wqSmdhOceRLP*=;D_sWznk=K$K$^LzFuBc ztpY{QqTH;V!mhsj{`-IK_jh;i>*(wI^RO@}bR}KMTJ|iZ$a7M|^U59H?^P!rZsWCo zYVmG)ivaV(-3K2o*5I<}+g*NrU2Oi|uh*jAU3edOJO5h7<(%^?S8-WdT5d=?D|LSD z_ItZjEiEg#6_*sMFgl*Nv~9|9_*fx}Qxz zWTfTxef#88Jf(uzk8#bHExGpiVyWz(I{PWprX33QxBV)A^5jYX*xXCnhs+&6bS`?a zZvFc8l`of0=kmFpdT!#@%@)six83{V;jMDoNTQ7~c$rV*&f@1zg@qgKm6acd1O)|k zD{wIHTDQ4wzy00UU!QH=zWuyS-5-nlmo7222ne_u#_YAbb);nXq+QPnXS`=^c8u7N zz-aUH$z=TKd~Ejm(pdRVw^+`%M2H;y zP|eKD?EG(jqC~;&yW5@?DR&D*-pyOWy{)fi#_vTMr`EjWnK^T&{mm_z!N~>^cRp6W zd_Mb%W@wYb8H=hfFFsG5I`u(`Rjzht-;zfwVinzY_ohZZu+YnSdgf^2n^TY6n9o=F zTiK!LeQ)IPa7Q`ba9x^;!u20V3BaFN7A79nNR2Q z%C%d!UM+ofWu;=Q)U?1zI4{I zY>h6ij9J@Oty=Z!=Ka6#%JZB!d|W!CVy`zoue`A#(YfH|rKSH}14E`S%e)*F6&3dP zA%A^DP;|63n~qV&#(5x5g@?17nws8^-I#PVU&Zs2Le1m+uU%PLS$Xf@zvqwM8!;(W zGH>6{w9?Pd&aPKcRo$y|x@fzllS5$0+gDdtTieQ=pZ)ad(?eI!1??8o>|$CSwl*k# z|KD%NQzGk5Z`pP9=+SkD4jpRem$&%jj1wk#9eapUXwo}<%{(hca{l7o^ zpIf|pKKbG=-&JPwRXks3Wn~?i7-1VZP0`v~TCVcRME+$yGe0p$PTQ?~J9gHxw;Gz7 zmXC^dCfFEvoXruP_k7`k1q+TE^zg6sL5%T}ygm$&i$`+m#zYbE*IVmcSRy}aslJcFuv%;m0;sgEco!?;LTO5?%Cd4bAL%g|FX;%@88GQzPq!t zV0qD&*=ts5J$d%b$?{-H=Oxs$z|Jn&q!G7!3t$lWaj=?sE%-1emx-??ak`2yDx_Imy_-;DhkA)R!3>ie$e3+mw3RZ?^VS z_n65a{O3JixNTb)4_kA#`sCM3)f=xiCm2|KKh(;-XemBPSH8% zw@cPfojUdJj)e;uSsW$ax2K(`jL^}aV^b-#E%){}7T3W09oL?zw0sd46PuQvlG5Vt z_C`nHu)&49cX`v#&51l)IL9KAVM%^LH#^T^hy46}&ov!aSOPAac=-FbKY8-xaoOK8 zoAb-%?CbtKum1inb*<+6$F+QAor{|k4m2{eFIcteRi>lBro~(T3JD3_)7I3K3^Kj1 z$A97d_roiLmy2!GncX=p|BX`Y!sW}KPit&!oS}D##Xw#CI6DJxnOMlACHuAY_0Oxd z@cdlYxj|&&O#Ns7K&_zLSFe8c+OnWMamM*ipFht&Q@OwFaBkYKT6gz$4bMw9X_HcB z-}^9)pJCazFJI1V(F@GFKEd3&aPy{3RlJ8Ywr;GdNlt#OeD>_waGhNHzz42*Hs_tw z)77U;om$(vXodCLzE%ODGiT5Kt&NI`+L5w;?(e6Sa_8n+v)j$j=RCcszV$=zy;mPw zCN#Z!mv`-5V&58u1DkY~EMH#U=xZqNds*!2_3Pp@HNOl0WH>r&zaj^dj9tx)*KgkZ z*><-ua~9jllP9+ZFZbK(%V@k``-)AYgF?U=10StJ=D!k@JwvblxpyzF%3`|oF3$%= zJN?|tHnucPGwto|-C~-Xxks!@Zsk|w=jl9rd`{Wf*_ytWUk09ge>rk+()8o@RAlGp=U2p3 zEShfBJ54FSuI}Zfr7R2`&-BipnPd4m$z*l9?fiZF_8mzuun>MIy_Dy$$HdgiUk@H6 zoRLgWtI69g?GpH=r=>sjW@c_~?&h_X)z^1hD_tu3`L~YUHE^BAbw^KMU)$8}0f|p4 zf7IAbU!-waU|*ouw5LAnug}i9cBT7S(b=2-I5{~FeE!2aoA2hEzP`Sft5*5#xVo8H zuV_(V#$SFmh8-EPdVKAR?MzKYb$)g@&k}w1ev%63s#R(VHH)V#(zwjV&OZ4JUzqiW zHLAy)KJaR;k;vi}t+0{HTD0i)>a8^kADb{Z^nYuxl<6}*dGh4pXR=ydhhFW{^JDvw z_rfR5$>Z14)6*x5xH9fmRJ;6WrumVlMJL-5S(KW48yg!Z&6_6|5GtAyDR=eBd_fjZ zp^RTqV~)ZN`S}JIoFn@N8d}nS51!nRMI1>{(@(L)k(Z7<7&o?v`v@*-n9G(z-mXOzU5jKk9@tm4-djE9aOI`0MI|d%WgXct zrO3DCCcc;N2p-Q}vFeqW>&C9sn^9Y8G_IudmIZRibKx2{L>VH44JM)p o;u?JmdKI;Vst0H&ngkpKVy literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_place_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_place_159.png new file mode 100644 index 0000000000000000000000000000000000000000..2b8797caa0119e7275a0d9556fc7ada9cc9be9c4 GIT binary patch literal 8336 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index b86cead6..b2d262b0 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -105,6 +105,9 @@ + + + @@ -391,15 +394,18 @@ + + + @@ -422,6 +428,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs new file mode 100644 index 00000000..8bb3347d --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs @@ -0,0 +1,29 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 27.08.2013 +//---------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Campusmap +{ + using System.Windows; + using CampusAppWP8.Resources; + + /// Current position pin model. + /// Stubbfel, 27.08.2013. + public class CurrentPositionPinModel : MapPinModel + { + /// Initializes a new instance of the CurrentPositionPinModel class. + /// Stubbfel, 27.08.2013. + public CurrentPositionPinModel() + { + this.ImageSource = Icons.CurrentPosition; + this.ImageWidth = 60; + this.ImageHeight = 60; + this.PinImageOffsetX = -25; + this.PinImageOffsetY = -34; + } + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs new file mode 100644 index 00000000..e684b3d9 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs @@ -0,0 +1,15 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 13.08.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWP8.Model.Campusmap +{ + /// Hidden pin place model. + /// Stubbfel, 27.08.2013. + public class HiddenPinPlaceModel : MapPinModel + { + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs index 38e1ef38..49a5009d 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs @@ -114,60 +114,73 @@ namespace CampusAppWP8.Model.Campusmap return new Point(x, y); } - /// - /// Method create in image, which can show at a certain position - /// - /// the x- coordinate - /// the y-coordinate - /// image of the pin - public Image AddPin(double x, double y) + /// Method create in image, which can show at a certain position. + /// Stubbfel, 27.08.2013. + /// the x- coordinate. + /// the y-coordinate. + /// The type. + /// image of the pin. + public Image AddPin(double x, double y, MapPinModel.PinType type) { Point position = new Point(x, y); - return this.AddPin(position); + return this.AddPin(position, type); } /// - /// Method create in image, which can show at a certain position depend of the + /// Method create in image, which can show at a certain position depend of the + /// /// - /// the x-coordinate - /// the y-coordinate - /// image of the pin - public Image AddPinFromRefPoint(double x, double y) + /// Stubbfel, 27.08.2013. + /// the x-coordinate. + /// the y-coordinate. + /// The type. + /// image of the pin. + public Image AddPinFromRefPoint(double x, double y, MapPinModel.PinType type) { Point position = new Point(this.RefPoint.X + x, this.RefPoint.Y - y); - return this.AddPin(position); + return this.AddPin(position, type); } /// - /// Method create in image, which can show at a certain position depend of the + /// Method create in image, which can show at a certain position depend of the + /// /// - /// input point - /// image of the pin - public Image AddPinFromRefPoint(Point position) + /// Stubbfel, 27.08.2013. + /// input point. + /// The type. + /// image of the pin. + public Image AddPinFromRefPoint(Point position, MapPinModel.PinType type) { - return this.AddPinFromRefPoint(position.X, position.Y); + return this.AddPinFromRefPoint(position.X, position.Y, type); } - /// - /// Method create in image, which can show at a certain position - /// - /// input point - /// image of the pin - public Image AddPin(Point position) + /// Method create in image, which can show at a certain position. + /// Stubbfel, 27.08.2013. + /// input point. + /// The type. + /// image of the pin. + public Image AddPin(Point position, MapPinModel.PinType type) { - MapPinModel pin = new MapPinModel() { Position = position }; - Image pinImg = new Image() { Source = new BitmapImage(new Uri(pin.ImageSource, UriKind.Relative)), Width = pin.ImageWidth }; + MapPinModel pin = this.CreatePin(type); + pin.Position = position; + Image pinImg = new Image(); + if (pin.ImageSource != null) + { + pinImg.Source = new BitmapImage(new Uri(pin.ImageSource, UriKind.Relative)); + pinImg.Width = pin.ImageWidth; + pinImg.Height = pin.ImageHeight; + } + Canvas.SetTop(pinImg, pin.Position.Y); Canvas.SetLeft(pinImg, pin.Position.X); return pinImg; } - /// - /// Convert a coordinates to coordinates which address pixels - /// - /// the x-coordinate - /// the y-coordinate - /// Point in pixel-size + /// Convert a coordinates to coordinates which address pixels. + /// Stubbfel, 27.08.2013. + /// the x-coordinate. + /// the y-coordinate. + /// Point in pixel-size. public Point ConverToPixelPoint(double x, double y) { Point p = new Point { X = this.ScaleX * x, Y = this.ScaleY * y }; @@ -210,6 +223,29 @@ namespace CampusAppWP8.Model.Campusmap protected virtual void LoadSpatials() { } + + /// Creates a pin. + /// Stubbfel, 27.08.2013. + /// The type. + /// The new pin. + private MapPinModel CreatePin(MapPinModel.PinType type) + { + MapPinModel pin; + switch (type) + { + case MapPinModel.PinType.CurrentPosition: + pin = new CurrentPositionPinModel(); + break; + case MapPinModel.PinType.SearchPlace: + pin = new SearchPlacePinModel(); + break; + default: + pin = new HiddenPinPlaceModel(); + break; + } + + return pin; + } #endregion } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs index a46cacaa..37b1bc7a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs @@ -8,12 +8,11 @@ namespace CampusAppWP8.Model.Campusmap { using System.Windows; - using CampusAppWP8.Resources; /// /// This Class manage the properties of a MapPin /// - public class MapPinModel + public abstract class MapPinModel { #region Member @@ -30,15 +29,26 @@ namespace CampusAppWP8.Model.Campusmap /// public MapPinModel() { - this.ImageSource = Icons.Search; - this.ImageWidth = 60; - this.ImageHeight = 60; - this.PinImageOffsetX = -25; - this.PinImageOffsetY = -27; } #endregion + #region enums + /// Values that represent PinType. + /// Stubbfel, 27.08.2013. + public enum PinType + { + /// An enum constant representing the hidden option. + Hidden = 0, + + /// An enum constant representing the search place option. + SearchPlace = 1, + + /// An enum constant representing the current position option. + CurrentPosition = 2 + } + #endregion + #region Property /// diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs new file mode 100644 index 00000000..4cba699a --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs @@ -0,0 +1,31 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 27.08.2013 +//---------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Campusmap +{ + using System.Windows; + using CampusAppWP8.Resources; + + /// Search pin place model. + /// Stubbfel, 27.08.2013. + public class SearchPlacePinModel : MapPinModel + { + /// + /// Initializes a new instance of the class. + /// + /// Stubbfel, 27.08.2013. + public SearchPlacePinModel() + { + this.ImageSource = Icons.SearchPlace; + this.ImageWidth = 60; + this.ImageHeight = 60; + this.PinImageOffsetX = -25; + this.PinImageOffsetY = -27; + } + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index deaa55c5..c7c77f94 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -46,15 +46,19 @@ namespace CampusAppWP8.Pages.Campusmap { MapCanvas.Children.Clear(); - string alias = "campus"; bool scroll = true; + string alias = "campus"; if (NavigationContext.QueryString.ContainsKey(Constants.ParamModelMap_SearchTermAlias)) { alias = NavigationContext.QueryString[Constants.ParamModelMap_SearchTermAlias]; + this.AddPins(this.SearchPlaces(alias), MapPinModel.PinType.SearchPlace); scroll = false; } + else + { + this.AddPins(this.SearchPlaces(alias), MapPinModel.PinType.Hidden); + } - this.AddPins(this.SearchPlaces(alias)); this.ShowCurrentPositionDispatcher(scroll); } } @@ -82,7 +86,7 @@ namespace CampusAppWP8.Pages.Campusmap } MapCanvas.Children.Clear(); - this.AddPins(this.SearchPlaces(query)); + this.AddPins(this.SearchPlaces(query), MapPinModel.PinType.SearchPlace); } /// Searches for the first places. @@ -97,15 +101,16 @@ namespace CampusAppWP8.Pages.Campusmap /// Adds the pins. /// Stubbfel, 19.08.2013. /// The places. + /// The type. /// (Optional) the scroll. - private void AddPins(List places, bool scroll = true) + private void AddPins(List places, MapPinModel.PinType type, bool scroll = true) { foreach (PlaceModel place in places) { GeoCoordinate coor = place.GeoRefPoint; if (coor != null) { - this.AddPin(coor.Longitude, coor.Latitude, scroll); + this.AddPin(coor.Longitude, coor.Latitude, type, scroll); } } } @@ -114,11 +119,12 @@ namespace CampusAppWP8.Pages.Campusmap /// Stubbfel, 19.08.2013. /// longitude parameter. /// latitude parameter. + /// The type. /// (Optional) the scroll. - private void AddPin(double x, double y, bool scroll = true) + private void AddPin(double x, double y, MapPinModel.PinType type, bool scroll = true) { Point scrollPoint = this.map.GetScrollPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y))); - MapCanvas.Children.Add(this.map.AddPinFromRefPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y)))); + MapCanvas.Children.Add(this.map.AddPinFromRefPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y)), type)); MapScroller.UpdateLayout(); if (scroll) @@ -174,15 +180,16 @@ namespace CampusAppWP8.Pages.Campusmap { string lat = App.LoadFromAppState(Constants.GeoWatch_CurrentPosition_Lat); string log = App.LoadFromAppState(Constants.GeoWatch_CurrentPosition_Long); - this.SetPinToPosition(lat, log, scroll); + this.SetPinToPosition(lat, log, MapPinModel.PinType.CurrentPosition, scroll); } /// Sets pin to position. /// Stubbfel, 27.08.2013. /// The latitude. /// The longitude. + /// The type. /// (Optional) the scroll. - private void SetPinToPosition(string latitude, string longitude, bool scroll = true) + private void SetPinToPosition(string latitude, string longitude, MapPinModel.PinType type, bool scroll = true) { double x; double y; @@ -191,7 +198,7 @@ namespace CampusAppWP8.Pages.Campusmap return; } - this.AddPin(x, y, scroll); + this.AddPin(x, y, type, scroll); ProgressBar.Visibility = Visibility.Collapsed; } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs index 7d6a9c8a..4d91d96d 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs @@ -66,6 +66,17 @@ namespace CampusAppWP8.Resources } } + /// + /// Gets the uri string of the CurrentPosition icon. + /// + public static string CurrentPosition + { + get + { + return Themerize("current_position_159.png"); + } + } + /// /// Gets the uri string of the Delete icon. /// @@ -264,6 +275,17 @@ namespace CampusAppWP8.Resources } } + /// + /// Gets the uri string of the SearchPlace icon. + /// + public static string SearchPlace + { + get + { + return Themerize("search_place_159.png"); + } + } + /// /// Gets the uri string of the StudentCouncil icon. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx index f981d217..7cd96949 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx @@ -129,6 +129,9 @@ info_159.png + + current_position_159.png + delete_159.png @@ -183,6 +186,9 @@ search_159.png + + search_place_159.png + student_council_159.png diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs index 19521cc9..7247612e 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs @@ -78,6 +78,7 @@ namespace CampusAppWP8.Utility.Lui.Button { urlString += "?" + Constants.ParamModelMap_SearchTermAlias + "=" + this.SearchTerm; } + Uri url = new Uri(urlString as string, UriKind.Relative); Page page = App.RootFrame.Content as Page; page.NavigationService.Navigate(url); From 9c663b30cf0a355c28d4a5850f694ca34deab6c3 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 14:11:58 +0200 Subject: [PATCH 09/10] add enum to spelling list --- CampusAppWP8/CampusAppWP8/Settings.StyleCop | 1 + 1 file changed, 1 insertion(+) diff --git a/CampusAppWP8/CampusAppWP8/Settings.StyleCop b/CampusAppWP8/CampusAppWP8/Settings.StyleCop index 1b4199b4..ea0eb655 100644 --- a/CampusAppWP8/CampusAppWP8/Settings.StyleCop +++ b/CampusAppWP8/CampusAppWP8/Settings.StyleCop @@ -1,6 +1,7 @@ + enum Stubbfel From 11ea79325d8fa349570085c9d27b1150005c815b Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 27 Aug 2013 16:10:37 +0200 Subject: [PATCH 10/10] startpage is scrollable --- .../CampusAppWP8/Pages/StartPage.xaml | 216 ++++++++++-------- .../CampusAppWP8/Pages/StartPage.xaml.cs | 89 +++++--- .../CampusAppWP8/Styles/StartPageStyles.xaml | 2 + 3 files changed, 180 insertions(+), 127 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml index c1d2c3ee..df83d9b0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml @@ -23,117 +23,143 @@ - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - + - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - + - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index 33bc484c..8b57e6a7 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -86,45 +86,70 @@ namespace CampusAppWP8.Pages private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e) { // Switch the placement of the buttons based on an orientation change. - if (this.Orientation == PageOrientation.LandscapeLeft || this.Orientation == PageOrientation.LandscapeRight) + if (this.Orientation == PageOrientation.LandscapeLeft) { - OpenHoursAppButton.SetValue(Grid.RowProperty, 0); - OpenHoursAppButton.SetValue(Grid.ColumnProperty, 3); - OpenHoursAppButtonText.Text = AppResources.OpenHoursApp_Title; - - OSAAppButton.SetValue(Grid.RowProperty, 1); - OSAAppButton.SetValue(Grid.ColumnProperty, 3); - - LinkAppButton.SetValue(Grid.RowProperty, 2); - LinkAppButton.SetValue(Grid.ColumnProperty, 3); - - ContentPanel.Margin = new Thickness(12, -24, 0, 0); - - HomeworkAppButtonText.Text = AppResources.HomeworkApp_Title; - ContentPanel.RowDefinitions[3].Height = GridLength.Auto; - ContentPanel.ColumnDefinitions[3].Width = new GridLength(1, GridUnitType.Star); + this.ContentPanel.Margin = new Thickness(24, -24, 76, 0); + this.AppTitle.Margin = new Thickness(12, 17, 0, 28); + this.MoveGridToLandscape(); + } + else if (this.Orientation == PageOrientation.LandscapeRight) + { + this.ContentPanel.Margin = new Thickness(76, -24, 24, 0); + this.AppTitle.Margin = new Thickness(64, 17, 0, 28); + this.MoveGridToLandscape(); } else { - // If not in portrait, move buttonList content to visible row and column. - ContentPanel.Margin = new Thickness(12, 0, 12, 12); - OpenHoursAppButton.SetValue(Grid.RowProperty, 3); - OpenHoursAppButton.SetValue(Grid.ColumnProperty, 0); - OpenHoursAppButtonText.Text = AppResources.OpenHoursApp_Title2; - - OSAAppButton.SetValue(Grid.RowProperty, 3); - OSAAppButton.SetValue(Grid.ColumnProperty, 1); - - LinkAppButton.SetValue(Grid.RowProperty, 3); - LinkAppButton.SetValue(Grid.ColumnProperty, 2); - - HomeworkAppButtonText.Text = AppResources.HomeworkApp_Title2; - - ContentPanel.RowDefinitions[3].Height = new GridLength(1, GridUnitType.Star); - ContentPanel.ColumnDefinitions[3].Width = GridLength.Auto; + this.ContentPanel.Margin = new Thickness(12, 0, 12, 12); + this.AppTitle.Margin = new Thickness(12, 17, 0, 28); + this.MoveToPortrait(); } } + /// Move to Portrait format. + /// Stubbfel, 27.08.2013. + private void MoveToPortrait() + { + bool test = this.Row0.Children.Remove(this.OpenHoursAppButton); + if (!test) + { + return; + } + + this.Row3.Children.Add(this.OpenHoursAppButton); + this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 0); + + this.Row1.Children.Remove(this.OSAAppButton); + this.Row3.Children.Add(this.OSAAppButton); + this.OSAAppButton.SetValue(Grid.ColumnProperty, 1); + + this.Row2.Children.Remove(this.LinkAppButton); + this.Row3.Children.Add(this.LinkAppButton); + this.LinkAppButton.SetValue(Grid.ColumnProperty, 2); + } + + /// Move Grid to landscape format. + /// Stubbfel, 27.08.2013. + private void MoveGridToLandscape() + { + bool test = this.Row3.Children.Remove(this.OpenHoursAppButton); + if (!test) + { + return; + } + + this.Row0.Children.Add(this.OpenHoursAppButton); + this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 3); + + this.Row3.Children.Remove(this.OSAAppButton); + this.Row1.Children.Add(this.OSAAppButton); + this.OSAAppButton.SetValue(Grid.ColumnProperty, 3); + + this.Row3.Children.Remove(this.LinkAppButton); + this.Row2.Children.Add(this.LinkAppButton); + this.LinkAppButton.SetValue(Grid.ColumnProperty, 3); + } + /// /// Method Navigate to /// diff --git a/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml b/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml index 058047c0..1aec455a 100644 --- a/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml +++ b/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml @@ -16,6 +16,8 @@ + +