Skip to content

Master #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NourDT wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Master #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4241ae
Swift 2, UIkit
NourDT Nov 1, 2015
8672b13
ported to work with ios9
NourDT Nov 2, 2015
d549ea0
Update README.md
NourDT Nov 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion HeatMapApp/BeaconsHeatmap.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,20 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
146292D21BE6731000084733 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E29DD3001B2B525C00179474 /* Charts.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A52C5C371BAC5CA400594CDD;
remoteInfo = "Charts-TV";
};
146292D41BE6731000084733 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E29DD3001B2B525C00179474 /* Charts.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 06AEE7A21BDC3F8B009875AE;
remoteInfo = ChartsTests;
};
E21616121B2B534B0071908E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E29DD3001B2B525C00179474 /* Charts.xcodeproj */;
Expand Down Expand Up @@ -707,6 +721,8 @@
isa = PBXGroup;
children = (
E29DD3051B2B525C00179474 /* Charts.framework */,
146292D31BE6731000084733 /* Charts.framework */,
146292D51BE6731000084733 /* ChartsTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -1829,12 +1845,13 @@
FA75B5E71A718DE500CA6DA8 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0610;
ORGANIZATIONNAME = "Citrusbyte LLC";
TargetAttributes = {
FA75B5EE1A718DE500CA6DA8 = {
CreatedOnToolsVersion = 6.1.1;
DevelopmentTeam = VKR5MNDXK9;
DevelopmentTeam = 693TQM7ZPK;
};
FA75B6071A718DE500CA6DA8 = {
CreatedOnToolsVersion = 6.1.1;
Expand Down Expand Up @@ -1868,6 +1885,20 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
146292D31BE6731000084733 /* Charts.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Charts.framework;
remoteRef = 146292D21BE6731000084733 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
146292D51BE6731000084733 /* ChartsTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = ChartsTests.xctest;
remoteRef = 146292D41BE6731000084733 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
E29DD3051B2B525C00179474 /* Charts.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
Expand Down Expand Up @@ -2164,11 +2195,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = BeaconsHeatmap/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "BeaconsHeatmap/BeaconsHeatmap-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand All @@ -2179,11 +2212,14 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = BeaconsHeatmap/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "BeaconsHeatmap/BeaconsHeatmap-Bridging-Header.h";
};
name = Release;
Expand Down
44 changes: 44 additions & 0 deletions ...p/BeaconsHeatmap.xcodeproj/project.xcworkspace/xcshareddata/BeaconsHeatmap.xcscmblueprint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "CADED171714B8A2E2C216718E291DF8139CF0186",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"CADED171714B8A2E2C216718E291DF8139CF0186" : 0,
"9025163822AAEA7A2D8AC9210D0874A56F62B462" : 0,
"0E77FB9618B0A7E05C2EE27348151B7941044E77" : 0,
"0D47F9118801513CFF1019D3260A8450871FFE19" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D883B6B9-57A7-4F99-B339-AC27B803571F",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"CADED171714B8A2E2C216718E291DF8139CF0186" : "beacons-positioning\/",
"9025163822AAEA7A2D8AC9210D0874A56F62B462" : "beacons-positioning\/HeatMapApp\/libs\/ios-charts\/",
"0E77FB9618B0A7E05C2EE27348151B7941044E77" : "beacons-positioning\/HeatMapApp\/libs\/SIOSocket\/",
"0D47F9118801513CFF1019D3260A8450871FFE19" : "beacons-positioning\/HeatMapApp\/libs\/LFHeatMap\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "BeaconsHeatmap",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "HeatMapApp\/BeaconsHeatmap.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/gpolak\/LFHeatMap.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0D47F9118801513CFF1019D3260A8450871FFE19"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:MegaBits\/SIOSocket.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0E77FB9618B0A7E05C2EE27348151B7941044E77"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:danielgindi\/ios-charts.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9025163822AAEA7A2D8AC9210D0874A56F62B462"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/NourDT\/beacons-positioning.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CADED171714B8A2E2C216718E291DF8139CF0186"
}
]
}
8 changes: 6 additions & 2 deletions HeatMapApp/BeaconsHeatmap/Base.lproj/LaunchScreen.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
Expand All @@ -13,17 +14,20 @@
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 Citrusbyte LLC. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BeaconsHeatmap" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<animations/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
Expand Down
Loading