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

add new offline map , zindex, new icon

Browse Source
This commit is contained in:
stubbfel
2013-09-25 13:25:13 +02:00
parent 5c1891459b
commit dd709f8937
17 changed files with 1062 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/placeinfo_159.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/placeinfo_159.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

2
CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
View File

@@ -451,6 +451,7 @@
<Content Include="Assets\Icons\DarkTheme\lecture_159.png" />
<Content Include="Assets\Icons\DarkTheme\person_159.png" />
<Content Include="Assets\Icons\DarkTheme\phone_159.png" />
<Content Include="Assets\Icons\DarkTheme\placeinfo_159.png" />
<Content Include="Assets\Icons\DarkTheme\practise_159.png" />
<Content Include="Assets\Icons\DarkTheme\search_place_159.png" />
<Content Include="Assets\Icons\DarkTheme\seminar_159.png" />
@@ -483,6 +484,7 @@
<Content Include="Assets\Icons\DarkTheme\schedule_159.png" />
<Content Include="Assets\Icons\LightTheme\person_159.png" />
<Content Include="Assets\Icons\LightTheme\phone_159.png" />
<Content Include="Assets\Icons\LightTheme\placeinfo_159.png" />
<Content Include="Assets\Icons\LightTheme\practise_159.png" />
<Content Include="Assets\Icons\LightTheme\schedule_159.png" />
<Content Include="Assets\Icons\DarkTheme\search_159.png" />

1181
CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml
View File

File diff suppressed because it is too large Load Diff

1
CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs
View File

@@ -27,6 +27,7 @@ namespace CampusAppWP8.Model.Campusmap
this.PinImageOffsetX = -25;
this.PinImageOffsetY = -34;
this.Tag = MapPinModel.CurrendPositionPlacePinString;
this.ZIndex = 2;
}
#endregion

1
CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs
View File

@@ -15,6 +15,7 @@ namespace CampusAppWP8.Model.Campusmap
public HiddenPinPlaceModel()
{
this.Tag = MapPinModel.HiddenPlacePinString;
this.ZIndex = 0;
}
}
}

3
CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlacePinModel.cs
View File

@@ -17,12 +17,13 @@ namespace CampusAppWP8.Model.Campusmap
/// <remarks>Stubbfel, 27.08.2013.</remarks>
public InfoPlacePinModel()
{
this.ImageSource = Icons.Info;
this.ImageSource = Icons.PlaceInfo;
this.ImageWidth = 60;
this.ImageHeight = 60;
this.PinImageOffsetX = -25;
this.PinImageOffsetY = -27;
this.Tag = MapPinModel.PinTypeToString(PinType.InfoPlace);
this.ZIndex = 1;
}
#endregion

1
CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs
View File

@@ -205,6 +205,7 @@ namespace CampusAppWP8.Model.Campusmap
Canvas.SetTop(pinImg, pin.Position.Y);
Canvas.SetLeft(pinImg, pin.Position.X);
Canvas.SetZIndex(pinImg, pin.ZIndex);
return pinImg;
}

2
CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs
View File

@@ -81,6 +81,8 @@ namespace CampusAppWP8.Model.Campusmap
/// </summary>
public double ImageHeight { get; set; }
public int ZIndex { get; set; }
/// <summary>
/// Gets or sets the ImageOffsetX of the pin
/// </summary>

1
CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs
View File

@@ -30,6 +30,7 @@ namespace CampusAppWP8.Model.Campusmap
this.PinImageOffsetX = -25;
this.PinImageOffsetY = -27;
this.Tag = MapPinModel.SearchPlacePinString;
this.ZIndex = 3;
}
#endregion

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

@@ -68,6 +68,7 @@ namespace CampusAppWP8.Pages.Campusmap
ApplicationBarMenuItem menuItem1 = ApplicationBar.MenuItems[0] as ApplicationBarMenuItem;
ApplicationBarMenuItem menuItem2 = ApplicationBar.MenuItems[1] as ApplicationBarMenuItem;
ApplicationBarMenuItem menuItem3 = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem;
if (menuItem1 != null)
{
@@ -79,6 +80,12 @@ namespace CampusAppWP8.Pages.Campusmap
menuItem2.Text = AppResources.CampusMapApp_ScanNfc;
}
if (menuItem3 != null)
{
menuItem3.Text = AppResources.CampusMapApp_EnableBuildInfo;
}
if (this.file == null)
{
this.file = new PlacesFile();
@@ -268,16 +275,22 @@ namespace CampusAppWP8.Pages.Campusmap
private void ShowBuildingsInformation(object sender, EventArgs e)
{
string menuText;
if (!this.buildInfoEnable)
{
this.ShowAllCampusBuilding("");
this.buildInfoEnable = true;
menuText = AppResources.CampusMapApp_DisableBuildInfo;
}
else
{
this.ClearMap(new List<string>() { MapPinModel.InfoPlacePinString });
this.buildInfoEnable = false;
menuText = AppResources.CampusMapApp_EnableBuildInfo;
}
ApplicationBarMenuItem item = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem;
item.Text = menuText;
}
private void ClearMap(List<string> removeTags = null)
@@ -359,15 +372,6 @@ namespace CampusAppWP8.Pages.Campusmap
}
}
/// <summary>Button click method.</summary>
/// <remarks>Stubbfel, 19.08.2013.</remarks>
/// <param name="sender">caller object.</param>
/// <param name="e"> some EventArgs.</param>
private void Button_Click(object sender, RoutedEventArgs e)
{
// this.AddPin(double.Parse(XPoint.Text), double.Parse(YPoint.Text));
}
/// <summary>
/// Method start a NFCScan
/// </summary>
@@ -590,6 +594,7 @@ namespace CampusAppWP8.Pages.Campusmap
}
else
{
this.ClearMap(new List<string>() { MapPinModel.CurrendPositionPlacePinString });
this.SetPinToPosition(lat, log, MapPinModel.PinType.CurrentPosition, scroll);
}
}
@@ -638,6 +643,14 @@ namespace CampusAppWP8.Pages.Campusmap
msgText += shortDesc;
msgText = Wp8StringManager.AddNewLine(msgText);
}
string access = place.GetInformationsValue(Constants.PisInformationName_Accesbility);
if (access != null)
{
msgText += AppResources.PlaceLabel_Accessbility + ": ";
msgText += access;
msgText = Wp8StringManager.AddNewLine(msgText);
}
}
MessageBoxes.ShowMainModelInfoMessageBox(msgText);
@@ -647,7 +660,7 @@ namespace CampusAppWP8.Pages.Campusmap
if (place.ParentId.Equals(this.campusMap.CampusId) && this.HasRooms(place.PlaceId))
{
MessageBoxResult msgResult = MessageBoxes.ShowPlaceInfoOkCancelMessageBox("Für " + place.GetInformationsValue((Constants.PisInformationName_Name)) + " gibt es eine Raumübersicht. Soll diese angezeigt werden");
MessageBoxResult msgResult = MessageBoxes.ShowPlaceInfoOkCancelMessageBox(AppResources.MsgBox_ShowRoomList);
if (msgResult.Equals(MessageBoxResult.OK))
{
string urlString = Constants.PathCampusmap_RoomListPage;

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

@@ -141,6 +141,24 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Gebäudeinfos ausblenden ähnelt.
/// </summary>
public static string CampusMapApp_DisableBuildInfo {
get {
return ResourceManager.GetString("CampusMapApp_DisableBuildInfo", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Gebäudeinfos einblenden ähnelt.
/// </summary>
public static string CampusMapApp_EnableBuildInfo {
get {
return ResourceManager.GetString("CampusMapApp_EnableBuildInfo", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Info via NFC ähnelt.
/// </summary>
@@ -627,6 +645,15 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Für dieses Gebäude gibt es eine Raumübersicht. Soll diese angezeigt werden? ähnelt.
/// </summary>
public static string MsgBox_ShowRoomList {
get {
return ResourceManager.GetString("MsgBox_ShowRoomList", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die News ähnelt.
/// </summary>
@@ -735,6 +762,15 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Barrierefreiheit ähnelt.
/// </summary>
public static string PlaceLabel_Accessbility {
get {
return ResourceManager.GetString("PlaceLabel_Accessbility", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Name ähnelt.
/// </summary>

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

@@ -452,4 +452,16 @@
<data name="ScarNfc_Search" xml:space="preserve">
<value>Bitte halten Sie das Handy vor dem NFC-Tag</value>
</data>
<data name="PlaceLabel_Accessbility" xml:space="preserve">
<value>Barrierefreiheit</value>
</data>
<data name="CampusMapApp_DisableBuildInfo" xml:space="preserve">
<value>Gebäudeinfos ausblenden</value>
</data>
<data name="CampusMapApp_EnableBuildInfo" xml:space="preserve">
<value>Gebäudeinfos einblenden</value>
</data>
<data name="MsgBox_ShowRoomList" xml:space="preserve">
<value>Für dieses Gebäude gibt es eine Raumübersicht. Soll diese angezeigt werden?</value>
</data>
</root>

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

@@ -534,4 +534,7 @@
<data name="PisInformationName_Layer" xml:space="preserve">
<value>Ebene</value>
</data>
<data name="PisInformationName_Accesbility" xml:space="preserve">
<value>Barrierefreiheit</value>
</data>
</root>

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

@@ -960,6 +960,15 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Barrierefreiheit ähnelt.
/// </summary>
public static string PisInformationName_Accesbility {
get {
return ResourceManager.GetString("PisInformationName_Accesbility", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Ebene ähnelt.
/// </summary>

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

@@ -308,6 +308,17 @@ namespace CampusAppWP8.Resources
}
}
/// <summary>
/// Gets the uri string of the PlaceInfo icon.
/// </summary>
public static string PlaceInfo
{
get
{
return Themerize("placeinfo_159.png");
}
}
/// <summary>
/// Gets the uri string of the Practise icon.
/// </summary>

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

@@ -195,6 +195,9 @@
<data name="Pig" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="PlaceInfo" xml:space="preserve">
<value>placeinfo_159.png</value>
</data>
<data name="Practise" xml:space="preserve">
<value>practise_159.png</value>
</data>