Skip to content

Commit 136a6e2

Browse files
merlosmerlos
committed
* removed warnings
* updated icon
1 parent 679583f commit 136a6e2

28 files changed

+105
-53
lines changed

‎OpenGpxTracker.xcodeproj/project.pbxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
attributes = {
295295
LastSwiftMigration = 0700;
296296
LastSwiftUpdateCheck = 0700;
297-
LastUpgradeCheck = 0600;
297+
LastUpgradeCheck = 0730;
298298
ORGANIZATIONNAME = TransitBox;
299299
TargetAttributes = {
300300
898EECD419C49B5800B4B207 = {
@@ -489,6 +489,7 @@
489489
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
490490
COPY_PHASE_STRIP = NO;
491491
ENABLE_STRICT_OBJC_MSGSEND = YES;
492+
ENABLE_TESTABILITY = YES;
492493
GCC_C_LANGUAGE_STANDARD = gnu99;
493494
GCC_DYNAMIC_NO_PIC = NO;
494495
GCC_OPTIMIZATION_LEVEL = 0;
@@ -594,6 +595,7 @@
594595
);
595596
INFOPLIST_FILE = OpenGpxTrackerTests/Info.plist;
596597
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
598+
PRODUCT_BUNDLE_IDENTIFIER = "org.transitbox.$(PRODUCT_NAME:rfc1034identifier)";
597599
PRODUCT_NAME = "$(TARGET_NAME)";
598600
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OpenGpxTracker.app/OpenGpxTracker";
599601
};
@@ -609,6 +611,7 @@
609611
);
610612
INFOPLIST_FILE = OpenGpxTrackerTests/Info.plist;
611613
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
614+
PRODUCT_BUNDLE_IDENTIFIER = "org.transitbox.$(PRODUCT_NAME:rfc1034identifier)";
612615
PRODUCT_NAME = "$(TARGET_NAME)";
613616
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OpenGpxTracker.app/OpenGpxTracker";
614617
};

‎OpenGpxTracker.xcodeproj/xcuserdata/merlos.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
endingColumnNumber = "9223372036854775807"
1616
startingLineNumber = "493"
1717
endingLineNumber = "493"
18-
landmarkName = "addPinAtTappedLocation(_:)"
18+
landmarkName = "locationManager(_:didUpdateToLocation:fromLocation:)"
1919
landmarkType = "5">
2020
</BreakpointContent>
2121
</BreakpointProxy>
@@ -30,9 +30,7 @@
3030
startingColumnNumber = "9223372036854775807"
3131
endingColumnNumber = "9223372036854775807"
3232
startingLineNumber = "743"
33-
endingLineNumber = "743"
34-
landmarkName = "mapView(_:didAddAnnotationViews:)"
35-
landmarkType = "5">
33+
endingLineNumber = "743">
3634
</BreakpointContent>
3735
</BreakpointProxy>
3836
<BreakpointProxy
@@ -46,9 +44,7 @@
4644
startingColumnNumber = "9223372036854775807"
4745
endingColumnNumber = "9223372036854775807"
4846
startingLineNumber = "742"
49-
endingLineNumber = "742"
50-
landmarkName = "mapView(_:didAddAnnotationViews:)"
51-
landmarkType = "5">
47+
endingLineNumber = "742">
5248
</BreakpointContent>
5349
</BreakpointProxy>
5450
<BreakpointProxy
@@ -62,9 +58,7 @@
6258
startingColumnNumber = "9223372036854775807"
6359
endingColumnNumber = "9223372036854775807"
6460
startingLineNumber = "742"
65-
endingLineNumber = "742"
66-
landmarkName = "mapView(_:didAddAnnotationViews:)"
67-
landmarkType = "5">
61+
endingLineNumber = "742">
6862
</BreakpointContent>
6963
</BreakpointProxy>
7064
</Breakpoints>

‎OpenGpxTracker.xcodeproj/xcuserdata/merlos.xcuserdatad/xcschemes/OpenGpxTracker.xcscheme

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "0730"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,17 +62,21 @@
6262
ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
75-
<BuildableProductRunnable>
78+
<BuildableProductRunnable
79+
runnableDebuggingMode = "0">
7680
<BuildableReference
7781
BuildableIdentifier = "primary"
7882
BlueprintIdentifier = "898EECD419C49B5800B4B207"
@@ -85,12 +89,13 @@
8589
</AdditionalOptions>
8690
</LaunchAction>
8791
<ProfileAction
92+
buildConfiguration = "Release"
8893
shouldUseLaunchSchemeArgsEnv = "YES"
8994
savedToolIdentifier = ""
9095
useCustomWorkingDirectory = "NO"
91-
buildConfiguration = "Release"
9296
debugDocumentVersioning = "YES">
93-
<BuildableProductRunnable>
97+
<BuildableProductRunnable
98+
runnableDebuggingMode = "0">
9499
<BuildableReference
95100
BuildableIdentifier = "primary"
96101
BlueprintIdentifier = "898EECD419C49B5800B4B207"

‎OpenGpxTracker/AboutViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class AboutViewController: UIViewController, UIWebViewDelegate {
3030
self.title = "About"
3131

3232
//Add the done button
33-
let shareItem = UIBarButtonItem(title: "Done", style: UIBarButtonItemStyle.Plain, target: self, action: "closeViewController")
33+
let shareItem = UIBarButtonItem(title: "Done", style: UIBarButtonItemStyle.Plain, target: self, action: #selector(AboutViewController.closeViewController))
3434
self.navigationItem.rightBarButtonItems = [shareItem]
3535

3636
//Add the Webview

‎OpenGpxTracker/GPXFilesTableViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class GPXFilesTableViewController: UITableViewController, UINavigationBarDelegat
3636

3737
self.title = "Your GPX Files"
3838

39-
let shareItem = UIBarButtonItem(title: "Done", style: UIBarButtonItemStyle.Plain, target: self, action: "closeGPXFilesTableViewController")
39+
let shareItem = UIBarButtonItem(title: "Done", style: UIBarButtonItemStyle.Plain, target: self, action: #selector(GPXFilesTableViewController.closeGPXFilesTableViewController))
4040

4141
self.navigationItem.rightBarButtonItems = [shareItem]
4242

‎OpenGpxTracker/GPXMapView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class GPXMapView: MKMapView {
4646
var currentTrackDistance = 0.00 // in meters
4747
var currentSegmentDistance = 0.00 //in meters
4848

49-
var tileServer: GPXTileServer = .MapQuest {
49+
var tileServer: GPXTileServer = .Apple {
5050
willSet {
5151
// Info about how to use other tile servers:
5252
//http://www.glimsoft.com/01/31/how-to-use-openstreetmap-on-ios-7-in-7-lines-of-code/

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
{
22
"images" : [
33
{
4-
"idiom" : "iphone",
54
"size" : "29x29",
5+
"idiom" : "iphone",
6+
"filename" : "[email protected]",
67
"scale" : "2x"
78
},
89
{
9-
"idiom" : "iphone",
1010
"size" : "29x29",
11+
"idiom" : "iphone",
12+
"filename" : "[email protected]",
1113
"scale" : "3x"
1214
},
1315
{
14-
"idiom" : "iphone",
1516
"size" : "40x40",
17+
"idiom" : "iphone",
18+
"filename" : "[email protected]",
1619
"scale" : "2x"
1720
},
1821
{
19-
"idiom" : "iphone",
2022
"size" : "40x40",
23+
"idiom" : "iphone",
24+
"filename" : "[email protected]",
2125
"scale" : "3x"
2226
},
2327
{
@@ -33,35 +37,45 @@
3337
"scale" : "3x"
3438
},
3539
{
36-
"idiom" : "ipad",
3740
"size" : "29x29",
41+
"idiom" : "ipad",
42+
"filename" : "Icon-Small.png",
3843
"scale" : "1x"
3944
},
4045
{
41-
"idiom" : "ipad",
4246
"size" : "29x29",
47+
"idiom" : "ipad",
48+
"filename" : "[email protected]",
4349
"scale" : "2x"
4450
},
4551
{
46-
"idiom" : "ipad",
4752
"size" : "40x40",
53+
"idiom" : "ipad",
54+
"filename" : "Icon-Small-40.png",
4855
"scale" : "1x"
4956
},
5057
{
51-
"idiom" : "ipad",
5258
"size" : "40x40",
59+
"idiom" : "ipad",
60+
"filename" : "[email protected]",
5361
"scale" : "2x"
5462
},
5563
{
5664
"size" : "76x76",
5765
"idiom" : "ipad",
58-
"filename" : "icon76.png",
66+
"filename" : "Icon-76.png",
5967
"scale" : "1x"
6068
},
6169
{
6270
"size" : "76x76",
6371
"idiom" : "ipad",
64-
"filename" : "icon152.png",
72+
"filename" : "[email protected]",
73+
"scale" : "2x"
74+
},
75+
{
76+
"size" : "83.5x83.5",
77+
"idiom" : "ipad",
78+
"filename" : "[email protected]",
6579
"scale" : "2x"
6680
}
6781
],

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/Icon-76.png

1.35 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/[email protected]

2.57 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/[email protected]

2.87 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png

789 Bytes
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/[email protected]

1.39 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/[email protected]

1.39 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/[email protected]

1.99 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/Icon-Small.png

619 Bytes
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/[email protected]

1.06 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/[email protected]

1.06 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/[email protected]

1.49 KB
Loading

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/icon152.png

-2.53 KB
Binary file not shown.

‎OpenGpxTracker/Images.xcassets/AppIcon.appiconset/icon76.png

-1.28 KB
Binary file not shown.

‎OpenGpxTracker/MapViewDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class MapViewDelegate: NSObject, MKMapViewDelegate, UIAlertViewDelegate {
9797
func mapView(mapView: MKMapView, didAddAnnotationViews views: [MKAnnotationView]) {
9898
var i = 0
9999
for object in views {
100-
i++
100+
i += 1
101101
let aV = object as MKAnnotationView
102102
if aV.annotation!.isKindOfClass(MKUserLocation) { continue }
103103

‎OpenGpxTracker/PreferencesTableViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class PreferencesTableViewController: UITableViewController, UINavigationBarDele
3333

3434
self.title = "Map Tile Server"
3535

36-
let shareItem = UIBarButtonItem(title: "Done", style: UIBarButtonItemStyle.Plain, target: self, action: "closePreferencesTableViewController")
36+
let shareItem = UIBarButtonItem(title: "Done", style: UIBarButtonItemStyle.Plain, target: self, action: #selector(PreferencesTableViewController.closePreferencesTableViewController))
3737

3838
self.navigationItem.rightBarButtonItems = [shareItem]
3939

‎OpenGpxTracker/StopWatch.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class StopWatch: NSObject {
4141
print("StopWatch: started")
4242
self.status = .Started
4343
self.startedTime = NSDate.timeIntervalSinceReferenceDate()
44-
timer = NSTimer.scheduledTimerWithTimeInterval(timeInterval, target: self, selector: "updateElapsedTime", userInfo: nil, repeats: true)
44+
timer = NSTimer.scheduledTimerWithTimeInterval(timeInterval, target: self, selector: #selector(StopWatch.updateElapsedTime), userInfo: nil, repeats: true)
4545
}
4646

4747
func stop() {

‎OpenGpxTracker/ViewController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ class ViewController: UIViewController,
223223
map?.zoomEnabled = true
224224
map?.rotateEnabled = true
225225
map?.addGestureRecognizer(
226-
UILongPressGestureRecognizer(target: self, action: "addPinAtTappedLocation:")
226+
UILongPressGestureRecognizer(target: self, action: #selector(ViewController.addPinAtTappedLocation(_:)))
227227
)
228-
let panGesture = UIPanGestureRecognizer(target: self, action: "stopFollowingUser:")
228+
let panGesture = UIPanGestureRecognizer(target: self, action: #selector(ViewController.stopFollowingUser(_:)))
229229
panGesture.delegate = self
230230
map?.addGestureRecognizer(panGesture)
231231

@@ -283,7 +283,7 @@ class ViewController: UIViewController,
283283
}
284284

285285
func addNotificationObservers() {
286-
NSNotificationCenter.defaultCenter().addObserver(self, selector: "didEnterBackground",
286+
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(ViewController.didEnterBackground),
287287
name: UIApplicationDidEnterBackgroundNotification, object: nil)
288288
}
289289

‎OpenGpxTrackerTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>org.transitbox.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎Pods/Pods.xcodeproj/xcuserdata/merlos.xcuserdatad/xcschemes/Pods-TBXML.xcscheme

Lines changed: 17 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)