diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CampusMapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CampusMapModel.cs index 20a4012b..7b9bfb8f 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CampusMapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CampusMapModel.cs @@ -1,26 +1,51 @@ -using CampusAppWP8.Model.GeoDb; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 26.09.2013 +//---------------------------------------------------------------------- namespace CampusAppWP8.Model.Campusmap { + using System.Collections.Generic; + using CampusAppWP8.Model.GeoDb; + + /// + /// Class for the CampusMapModel + /// public class CampusMapModel : MapModel { + #region constructor - public string CampusId { get; protected set; } - - public CampusMapModel(List placeList,string campusId) + /// + /// Initializes a new instance of the class. + /// + /// list of places + /// id of the campus + public CampusMapModel(List placeList, string campusId) { this.CampusId = campusId; this.LoadSpatials(placeList); this.IsReady = true; } + #endregion + + #region property + + /// + /// Gets or sets the campusId + /// + public string CampusId { get; protected set; } + + #endregion + + #region method + /// Loads the spatial./. /// Stubbfel, 19.08.2013. + /// list of places protected override void LoadSpatials(List placeList) { List campusPlaces = new List(); @@ -32,9 +57,11 @@ namespace CampusAppWP8.Model.Campusmap { campusPlaces.Add(place); } - } + this.Spatial.AddPlaces(campusPlaces); - } + } + + #endregion } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/ClickAblePlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/ClickAblePlacePinModel.cs index bb47a8fa..8267acd1 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/ClickAblePlacePinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/ClickAblePlacePinModel.cs @@ -1,12 +1,19 @@ -using CampusAppWP8.Model.GeoDb; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 26.09.2013 +//---------------------------------------------------------------------- namespace CampusAppWP8.Model.Campusmap { + using System.Collections.Generic; + using CampusAppWP8.Model.GeoDb; + + /// + /// abstract class for click abel bins + /// public abstract class ClickAblePlacePinModel : MapPinModel { #region property diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs index b2e1f64c..e8343a76 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs @@ -11,7 +11,9 @@ namespace CampusAppWP8.Model.Campusmap /// Stubbfel, 27.08.2013. public class HiddenPinPlaceModel : MapPinModel { - + /// + /// Initializes a new instance of the class. + /// public HiddenPinPlaceModel() { this.Tag = MapPinModel.HiddenPlacePinString; diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlacePinModel.cs index ad43714a..7c4384fc 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlacePinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlacePinModel.cs @@ -1,18 +1,23 @@ -using CampusAppWP8.Resources; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 27.08.2013 +//---------------------------------------------------------------------- namespace CampusAppWP8.Model.Campusmap { + using CampusAppWP8.Resources; + + /// Search pin place model. + /// Stubbfel, 27.08.2013. public class InfoPlacePinModel : ClickAblePlacePinModel { #region Constructor /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// Stubbfel, 27.08.2013. public InfoPlacePinModel() diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs index 8fc2d54b..e8143bfc 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs @@ -22,7 +22,9 @@ namespace CampusAppWP8.Model.Campusmap { #region Constructors - + /// + /// Initializes a new instance of the class. + /// public MapModel() { this.IsReady = false; @@ -31,6 +33,7 @@ namespace CampusAppWP8.Model.Campusmap /// /// Initializes a new instance of the class. /// + /// list of places public MapModel(List placeList) { this.IsReady = false; @@ -56,6 +59,9 @@ namespace CampusAppWP8.Model.Campusmap #endregion #region Property + /// + /// Gets or sets a value indicating whether the map is ready or not + /// public bool IsReady { get; protected set; } /// @@ -257,6 +263,7 @@ namespace CampusAppWP8.Model.Campusmap /// Loads the spatial./ /// Stubbfel, 19.08.2013. + /// list of places protected virtual void LoadSpatials(List placeList) { this.Spatial = new SpsModel(); @@ -299,6 +306,7 @@ namespace CampusAppWP8.Model.Campusmap pin = new HiddenPinPlaceModel(); break; } + pinImg.Tag = pin.Tag; return pin; } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs index 3b894d1a..46ee4028 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs @@ -17,15 +17,24 @@ namespace CampusAppWP8.Model.Campusmap { #region Member + /// + /// String for info pins + /// private static string infoPlacePinString = MapPinModel.PinTypeToString(PinType.InfoPlace); - + /// + /// String for hidden pins + /// private static string hiddenPlacePinString = MapPinModel.PinTypeToString(PinType.Hidden); - + /// + /// String for search pins + /// private static string searchPlacePinString = MapPinModel.PinTypeToString(PinType.SearchPlace); - + /// + /// String for current position pins + /// private static string currendPositionPlacePinString = MapPinModel.PinTypeToString(PinType.CurrentPosition); /// @@ -66,6 +75,38 @@ namespace CampusAppWP8.Model.Campusmap #region Property + /// + /// Gets the string of current position pins + /// + public static string CurrendPositionPlacePinString + { + get { return MapPinModel.currendPositionPlacePinString; } + } + + /// + /// Gets the string of search pins + /// + public static string SearchPlacePinString + { + get { return MapPinModel.searchPlacePinString; } + } + + /// + /// Gets the string of hidden pins + /// + public static string HiddenPlacePinString + { + get { return MapPinModel.hiddenPlacePinString; } + } + + /// + /// Gets the string of info pins + /// + public static string InfoPlacePinString + { + get { return MapPinModel.infoPlacePinString; } + } + /// /// Gets or sets the ImageSource of the pin /// @@ -81,6 +122,9 @@ namespace CampusAppWP8.Model.Campusmap /// public double ImageHeight { get; set; } + /// + /// Gets or sets the ZIndex of the pin + /// public int ZIndex { get; set; } /// @@ -131,30 +175,20 @@ namespace CampusAppWP8.Model.Campusmap } } + /// + /// Gets or sets the tag of the pin + /// public object Tag { get; set; } - public static string CurrendPositionPlacePinString - { - get { return MapPinModel.currendPositionPlacePinString; } - } - public static string SearchPlacePinString - { - get { return MapPinModel.searchPlacePinString; } - } - - public static string HiddenPlacePinString - { - get { return MapPinModel.hiddenPlacePinString; } - } - - public static string InfoPlacePinString - { - get { return MapPinModel.infoPlacePinString; } - } #endregion #region Method + /// + /// Method convert PinType to a string + /// + /// type of the Pin + /// PinType as string public static string PinTypeToString(PinType type) { string result = null; @@ -162,21 +196,22 @@ namespace CampusAppWP8.Model.Campusmap switch (type) { case PinType.CurrentPosition: - result = "CurrentPositionPin"; + result = MapPinModel.currendPositionPlacePinString; break; case PinType.Hidden: - result = "HiddenPin"; + result = MapPinModel.hiddenPlacePinString; break; case PinType.InfoPlace: - result = "InfoPin"; + result = MapPinModel.infoPlacePinString; break; case PinType.SearchPlace: - result = "SearchPlacePin"; + result = MapPinModel.searchPlacePinString; break; default: result = string.Empty; break; } + return result; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs index 8fef3500..63b8f00d 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs @@ -8,8 +8,6 @@ namespace CampusAppWP8.Model.Campusmap { - using System.Collections.Generic; - using CampusAppWP8.Model.GeoDb; using CampusAppWP8.Resources; /// Search pin place model. diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index f0170ebe..bc33f12e 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -15,7 +15,9 @@ namespace CampusAppWP8.Pages.Campusmap using System.Runtime.InteropServices.WindowsRuntime; using System.Threading; using System.Windows; + using System.Windows.Controls; using System.Windows.Navigation; + using CampusAppWP8.File.Places; using CampusAppWP8.Model.Campusmap; using CampusAppWP8.Model.GeoDb; using CampusAppWP8.Resources; @@ -25,9 +27,6 @@ namespace CampusAppWP8.Pages.Campusmap using Microsoft.Phone.Controls; using Microsoft.Phone.Shell; using Windows.Networking.Proximity; - using CampusAppWP8.File.Places; - using System.Windows.Controls; - using System.ComponentModel; /// Class for the campusMap page. /// Stubbfel, 19.08.2013. @@ -56,6 +55,16 @@ namespace CampusAppWP8.Pages.Campusmap /// private bool qrcodeScan = false; + /// + /// Variable for the last query + /// + private string lastQuery; + + /// + /// Flag which indicates the map show information of all buildings + /// + private bool buildInfoEnable; + #endregion #region Constructor @@ -66,7 +75,6 @@ namespace CampusAppWP8.Pages.Campusmap { this.InitializeComponent(); - ApplicationBarMenuItem menuItem1 = ApplicationBar.MenuItems[0] as ApplicationBarMenuItem; ApplicationBarMenuItem menuItem2 = ApplicationBar.MenuItems[1] as ApplicationBarMenuItem; ApplicationBarMenuItem menuItem3 = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem; @@ -81,7 +89,6 @@ namespace CampusAppWP8.Pages.Campusmap menuItem2.Text = AppResources.CampusMapApp_ScanNfc; } - if (menuItem3 != null) { menuItem3.Text = AppResources.CampusMapApp_EnableBuildInfo; @@ -100,11 +107,16 @@ namespace CampusAppWP8.Pages.Campusmap #region Events + /// + /// Delegate for LoadingPlace events + /// + /// the events args public delegate void LoadingPlace(string args); + /// + /// Event for loading places + /// public event LoadingPlace OnLoadingPlace; - private string lastQuery; - private bool buildInfoEnable; #endregion #region Method @@ -155,12 +167,21 @@ namespace CampusAppWP8.Pages.Campusmap #region private + /// + /// Method set the lastQuery and register to OnLoadingPlace-Event + /// + /// the query string + /// the event callback private void SetLastQuery(string query, Action action) { this.lastQuery = query; this.OnLoadingPlace = new CampusMapPage.LoadingPlace(action); } + /// + /// Method shows certain places as hidden Pin + /// + /// the query string private void ShowPlacesByQueryAsHiddenPin(string query) { if (!this.IsMapReady()) @@ -173,9 +194,12 @@ namespace CampusAppWP8.Pages.Campusmap } } + /// + /// Method shows certain places as search Pin + /// + /// the query string private void ShowPlacesByQueryAsSearchPin(string query) { - if (!this.IsMapReady()) { this.SetLastQuery(query, this.ShowPlacesByQueryAsSearchPin); @@ -187,21 +211,37 @@ namespace CampusAppWP8.Pages.Campusmap { allPlaces = true; } + this.ShowPlacesByQuery(query, MapPinModel.PinType.SearchPlace, allPlaces); } - } + /// + /// Method show all places, which match with the query as a pin + /// + /// the query string + /// the type of the pin + /// if its true then send query to the place file otherwise to the CampusMapModel private void ShowPlacesByQuery(string query, MapPinModel.PinType pintype, bool allPlaces) { this.AddPins(this.SearchPlaces(query, allPlaces), pintype); } - private void showPlacesByPlaceId(string placeId, MapPinModel.PinType pintype, bool allPlaces) + /// + /// Method show all places by placeId + /// + /// the placeId + /// the type of the pin + /// if its true then send query to the place file otherwise to the CampusMapModel + private void ShowPlacesByPlaceId(string placeId, MapPinModel.PinType pintype, bool allPlaces) { this.AddPinsByPids(new List() { placeId }, pintype, false, allPlaces); } + /// + /// Method shows places by placeId from place file as search Pin + /// + /// the placeId private void ShowAllPlacesByPlaceIdAsSearchPin(string placeId) { if (!this.IsMapReady()) @@ -210,10 +250,14 @@ namespace CampusAppWP8.Pages.Campusmap } else { - this.showPlacesByPlaceId(placeId, MapPinModel.PinType.SearchPlace, true); + this.ShowPlacesByPlaceId(placeId, MapPinModel.PinType.SearchPlace, true); } } + /// + /// Method shows places by placeId from CampusMapModel as search Pin + /// + /// the placeId private void ShowPlacesByPlaceIdAsSearchPin(string placeId) { if (!this.IsMapReady()) @@ -222,15 +266,19 @@ namespace CampusAppWP8.Pages.Campusmap } else { - this.showPlacesByPlaceId(placeId, MapPinModel.PinType.SearchPlace, false); + this.ShowPlacesByPlaceId(placeId, MapPinModel.PinType.SearchPlace, false); } } - private void ShowAllCampusBuilding(string placeId) + /// + /// Method show all buildings of a campus + /// + /// the id of the campus + private void ShowAllCampusBuilding(string campusId) { if (!this.IsMapReady()) { - this.SetLastQuery(placeId, ShowAllCampusBuilding); + this.SetLastQuery(campusId, this.ShowAllCampusBuilding); } else { @@ -238,14 +286,23 @@ namespace CampusAppWP8.Pages.Campusmap } } + /// + /// Method check if the map loading is finish + /// + /// true, if the map is ready to use, otherwise false private bool IsMapReady() { - if (this.campusMap == null || !campusMap.IsReady) + if (this.campusMap == null || !this.campusMap.IsReady) { return false; } + return true; } + + /// + /// Method will be execute if the place file is ready + /// private void FileIsReady() { this.campusMap = new CBMainMapModel(this.file.Model.Places.ToList()); @@ -257,7 +314,7 @@ namespace CampusAppWP8.Pages.Campusmap } } - /// Button click method. + /// TextSearch click method. /// Stubbfel, 19.08.2013. /// caller object. /// some EventArgs. @@ -274,12 +331,17 @@ namespace CampusAppWP8.Pages.Campusmap this.ShowPlacesByQueryAsSearchPin(query); } + /// + /// Method insert or remove the buildings pins + /// + /// caller object. + /// some EventArgs. private void ShowBuildingsInformation(object sender, EventArgs e) { string menuText; if (!this.buildInfoEnable) { - this.ShowAllCampusBuilding(""); + this.ShowAllCampusBuilding(string.Empty); this.buildInfoEnable = true; menuText = AppResources.CampusMapApp_DisableBuildInfo; } @@ -294,9 +356,12 @@ namespace CampusAppWP8.Pages.Campusmap item.Text = menuText; } + /// + /// Method clear the Map + /// + /// (optional) tags of the UIElement private void ClearMap(List removeTags = null) { - if (removeTags == null) { MapCanvas.Children.Clear(); @@ -319,14 +384,15 @@ namespace CampusAppWP8.Pages.Campusmap } } } - } + /// /// Method adds pin to the map by given list of placeId /// /// list of placeId /// type of pin /// (optional) if its true, clear canvas before adding + /// (optional) if its true, load place from place file, otherwise from CampusMapModel private void AddPinsByPids(List pidList, MapPinModel.PinType pinType, bool clearCanvas = true, bool allPlaces = false) { // clear canvas @@ -453,6 +519,7 @@ namespace CampusAppWP8.Pages.Campusmap /// Searches for the first places. /// Stubbfel, 19.08.2013. /// The query. + /// (optional) if its true, search places in place file, otherwise in CampusMapModel /// The found places. private List SearchPlaces(string query, bool allPlaces = false) { @@ -480,7 +547,6 @@ namespace CampusAppWP8.Pages.Campusmap this.informationsNames.Add(Constants.PisInformationName_ShortName); } - return spatial.GetPlacesByInformation(query, true, this.informationsNames); } @@ -497,6 +563,7 @@ namespace CampusAppWP8.Pages.Campusmap { continue; } + GeoCoordinate coor = place.GeoRefPoint; if (coor != null) { @@ -661,7 +728,6 @@ namespace CampusAppWP8.Pages.Campusmap foreach (PlaceModel place in places) { - if (place.ParentId.Equals(this.campusMap.CampusId) && this.HasRooms(place.PlaceId)) { MessageBoxResult msgResult = MessageBoxes.ShowPlaceInfoOkCancelMessageBox(AppResources.MsgBox_ShowRoomList); @@ -691,6 +757,7 @@ namespace CampusAppWP8.Pages.Campusmap return true; } } + return false; } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs index fe532e6d..023cde77 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs @@ -19,10 +19,10 @@ namespace CampusAppWP8.Pages.Dev using System.Windows; using System.Windows.Media.Imaging; using CampusAppWP8.Resources; + using CampusAppWP8.Utility; using Microsoft.Devices; using Microsoft.Phone.Controls; using ZXing; - using CampusAppWP8.Utility; /// /// QR Code scanner. @@ -36,20 +36,23 @@ namespace CampusAppWP8.Pages.Dev /// Thread for transfer the preview image to the reader. private Thread captureThread = null; - + /// For ending the thread. private volatile bool captureThreadExit = false; - + /// QR reader object. private IBarcodeReader barcodeReader = null; - + /// Bitmap for transfer the camera image to the reader. private WriteableBitmap bit = null; /// true if this object is in autofocus. private bool isInAutofocus = false; - private string ResultAppStoreKey; + /// + /// Variable for the storage key of the result + /// + private string resultAppStoreKey; #endregion @@ -78,13 +81,14 @@ namespace CampusAppWP8.Pages.Dev { if (NavigationContext.QueryString.ContainsKey(Constants.ParamQRResultKey)) { - this.ResultAppStoreKey = NavigationContext.QueryString[Constants.ParamQRResultKey]; + this.resultAppStoreKey = NavigationContext.QueryString[Constants.ParamQRResultKey]; } + this.cam = new PhotoCamera(CameraType.Primary); this.cam.Initialized += new EventHandler(this.Cam_Initialized); this.cam.AutoFocusCompleted += new EventHandler(this.Cam_AutoFocusCompl); this.bit = new WriteableBitmap((int)this.cam.PreviewResolution.Width, (int)this.cam.PreviewResolution.Height); - + this.camViewBrush.SetSource(this.cam); } else @@ -95,7 +99,7 @@ namespace CampusAppWP8.Pages.Dev }); } } - + /// /// Is called when this page will not be the current page of a frame. /// @@ -106,7 +110,7 @@ namespace CampusAppWP8.Pages.Dev { this.captureThreadExit = true; this.captureThread.Join(); - + this.cam.Dispose(); this.bit = null; @@ -123,23 +127,23 @@ namespace CampusAppWP8.Pages.Dev switch (e.Orientation) { - case PageOrientation.Landscape: - this.camViewBrushTransform.Rotation = 0; + case PageOrientation.Landscape: + this.camViewBrushTransform.Rotation = 0; break; - case PageOrientation.LandscapeLeft: - this.camViewBrushTransform.Rotation = 0; + case PageOrientation.LandscapeLeft: + this.camViewBrushTransform.Rotation = 0; break; - case PageOrientation.LandscapeRight: - this.camViewBrushTransform.Rotation = 180; + case PageOrientation.LandscapeRight: + this.camViewBrushTransform.Rotation = 180; break; - case PageOrientation.Portrait: - this.camViewBrushTransform.Rotation = 90; + case PageOrientation.Portrait: + this.camViewBrushTransform.Rotation = 90; break; - case PageOrientation.PortraitUp: - this.camViewBrushTransform.Rotation = 90; + case PageOrientation.PortraitUp: + this.camViewBrushTransform.Rotation = 90; break; - case PageOrientation.PortraitDown: - this.camViewBrushTransform.Rotation = 270; + case PageOrientation.PortraitDown: + this.camViewBrushTransform.Rotation = 270; break; } } @@ -187,11 +191,11 @@ namespace CampusAppWP8.Pages.Dev if (this.cam.IsFocusAtPointSupported == true) { Point pos = e.GetPosition(this.camView); - + this.cam.FocusAtPoint( - pos.Y / this.camView.ActualHeight, + pos.Y / this.camView.ActualHeight, 1.0 - (pos.X / this.camView.ActualWidth)); - + this.isInAutofocus = true; } else if (this.cam.IsFocusSupported == true) @@ -212,17 +216,16 @@ namespace CampusAppWP8.Pages.Dev Array.Copy(img, this.bit.Pixels, img.Length); var result = this.barcodeReader.Decode(this.bit); - + if (result != null) { Dispatcher.BeginInvoke(delegate { - if (this.ResultAppStoreKey != null) + if (this.resultAppStoreKey != null) { - if (NavigationService.CanGoBack) { - App.SaveToIsolatedStorage(this.ResultAppStoreKey, result.Text); + App.SaveToIsolatedStorage(this.resultAppStoreKey, result.Text); NavigationService.GoBack(); } else @@ -258,7 +261,7 @@ namespace CampusAppWP8.Pages.Dev this.OnCaptureImage(buffer, (int)resolution.Width, (int)resolution.Height); } - + System.Threading.Thread.Sleep(1000); } } diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml index 052f573c..fc444e49 100644 --- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml +++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml @@ -1,7 +1,7 @@  - + Assets\ApplicationIcon.png @@ -26,7 +26,7 @@ Assets\Tiles\kachel_small.png 0 Assets\Tiles\kachel_medium.png - BTU-CampusAp + BTU-CampusApp diff --git a/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs b/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs index 0e4d8707..a25d83e2 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs @@ -1,20 +1,30 @@ -using CampusAppWP8.Resources; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Navigation; +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 26.09.2013 +//---------------------------------------------------------------------- namespace CampusAppWP8.Utility { - public class AppUriMapper : UriMapperBase - { - private string tempUri; + using System; + using System.Windows.Navigation; + using CampusAppWP8.Resources; - public override Uri MapUri(Uri uri) + /// + /// Class map Uri to AppPages + /// + public class AppUriMapper : UriMapperBase + { + /// + /// Method overrides MapUri from UriMapperBase + /// + /// the url + /// the mapped url + public override Uri MapUri(Uri uri) { - tempUri = uri.ToString(); + string tempUri = uri.ToString(); // Look for a URI from the lens picker. if (tempUri.Contains("ViewfinderLaunch"))