Merge pull request #92 from jinios/feature/search-location

Feature/search location

MartHoliday/MartHoliday.xcodeproj/project.pbxproj

@@ -18,6 +18,8 @@
 		FD0202902146559B0083BE22 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC2A941212458F400A1E2FF /* Extensions.swift */; };
 		FD0202912146565C0083BE22 /* MartHolidayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD0202612146517B0083BE22 /* MartHolidayTests.swift */; };
 		FD0371D82208121800B2055F /* DistanceSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD0371D72208121800B2055F /* DistanceSearch.swift */; };
+		FD086D7F22A3B54600030929 /* DistanceSlider.xib in Resources */ = {isa = PBXBuildFile; fileRef = FD086D7E22A3B54600030929 /* DistanceSlider.xib */; };
+		FD086D8122A3B59200030929 /* DistanceSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD086D8022A3B59200030929 /* DistanceSlider.swift */; };
 		FD11EAE321203A4C003EB3E9 /* BranchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD11EAE221203A4C003EB3E9 /* BranchTableViewCell.swift */; };
 		FD15A11021F38DBB00B7276A /* LocationSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD15A10F21F38DBB00B7276A /* LocationSearchViewController.swift */; };
 		FD1B4F212126BB8B00946311 /* SlideBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD1B4F202126BB8B00946311 /* SlideBackgroundView.swift */; };
@@ -104,9 +106,12 @@
 		FDEECC32214D002700F6FF09 /* NanumSquareRoundOTFR.otf in Resources */ = {isa = PBXBuildFile; fileRef = FDAF601D21273E880006B68A /* NanumSquareRoundOTFR.otf */; };
 		FDEECC33214D0C6500F6FF09 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FDB4BE28211D6BAE00D3B264 /* Assets.xcassets */; };
 		FDEEE8E82163B5BD00E63733 /* NoMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDEEE8E72163B5BD00E63733 /* NoMapView.swift */; };
+		FDF492C722B4E59100827025 /* MarkerInfoWindowView.xib in Resources */ = {isa = PBXBuildFile; fileRef = FDF492C622B4E59100827025 /* MarkerInfoWindowView.xib */; };
+		FDF492C922B4E59C00827025 /* MarkerInfoWindowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF492C822B4E59C00827025 /* MarkerInfoWindowView.swift */; };
 		FDF8ABC2215B722800DA74C9 /* FavoriteBranch.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF8ABC1215B722800DA74C9 /* FavoriteBranch.swift */; };
 		FDF8ABC4215B76B400DA74C9 /* MainTableViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF8ABC3215B76B400DA74C9 /* MainTableViewHeader.swift */; };
 		FDF8ABC6215B76FC00DA74C9 /* MainTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF8ABC5215B76FC00DA74C9 /* MainTableViewCell.swift */; };
+		FDFF1CD522E455520045220F /* TickMarkSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDFF1CD422E455520045220F /* TickMarkSlider.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -165,6 +170,8 @@
 		FD0202612146517B0083BE22 /* MartHolidayTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MartHolidayTests.swift; sourceTree = "<group>"; };
 		FD0202632146517B0083BE22 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		FD0371D72208121800B2055F /* DistanceSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DistanceSearch.swift; sourceTree = "<group>"; };
+		FD086D7E22A3B54600030929 /* DistanceSlider.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DistanceSlider.xib; sourceTree = "<group>"; };
+		FD086D8022A3B59200030929 /* DistanceSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DistanceSlider.swift; path = View/DistanceSlider.swift; sourceTree = "<group>"; };
 		FD11EAE221203A4C003EB3E9 /* BranchTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BranchTableViewCell.swift; sourceTree = "<group>"; };
 		FD15A10F21F38DBB00B7276A /* LocationSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationSearchViewController.swift; sourceTree = "<group>"; };
 		FD1B4F202126BB8B00946311 /* SlideBackgroundView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SlideBackgroundView.swift; sourceTree = "<group>"; };
@@ -242,10 +249,13 @@
 		FDE2542D21627303008B25C8 /* NoMapView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NoMapView.xib; sourceTree = "<group>"; };
 		FDEECC2C214CD3BD00F6FF09 /* MartHolidayTodayExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MartHolidayTodayExtension.entitlements; sourceTree = "<group>"; };
 		FDEEE8E72163B5BD00E63733 /* NoMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoMapView.swift; sourceTree = "<group>"; };
+		FDF492C622B4E59100827025 /* MarkerInfoWindowView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MarkerInfoWindowView.xib; sourceTree = "<group>"; };
+		FDF492C822B4E59C00827025 /* MarkerInfoWindowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerInfoWindowView.swift; sourceTree = "<group>"; };
 		FDF8ABC1215B722800DA74C9 /* FavoriteBranch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoriteBranch.swift; sourceTree = "<group>"; };
 		FDF8ABC3215B76B400DA74C9 /* MainTableViewHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTableViewHeader.swift; sourceTree = "<group>"; };
 		FDF8ABC5215B76FC00DA74C9 /* MainTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTableViewCell.swift; sourceTree = "<group>"; };
 		FDFB0344212E7AF10092411E /* MartHoliday.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MartHoliday.entitlements; sourceTree = "<group>"; };
+		FDFF1CD422E455520045220F /* TickMarkSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TickMarkSlider.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -321,6 +331,9 @@
 				FDC19BA9215D2D54007D9A95 /* NoDataView.swift */,
 				FDEEE8E72163B5BD00E63733 /* NoMapView.swift */,
 				FD5359FD225F8BDB00AB48BE /* MartMapView.swift */,
+				FDF492C822B4E59C00827025 /* MarkerInfoWindowView.swift */,
+				FDF492C622B4E59100827025 /* MarkerInfoWindowView.xib */,
+				FDFF1CD422E455520045220F /* TickMarkSlider.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -452,6 +465,8 @@
 				FD9F40A2211ECB26007D7F1B /* Utility */,
 				FDAF601A21273D9F0006B68A /* fonts */,
 				FDB4BE25211D6BAD00D3B264 /* Main.storyboard */,
+				FD086D7E22A3B54600030929 /* DistanceSlider.xib */,
+				FD086D8022A3B59200030929 /* DistanceSlider.swift */,
 				FDE2542D21627303008B25C8 /* NoMapView.xib */,
 				FD80CE282161241D00C16150 /* DetailHeaderView.xib */,
 				FD4850F521287AFE0064747A /* SlideMenuCellView.xib */,
@@ -519,7 +534,7 @@
 				FD3B64262121BEAA003C1332 /* Embed Frameworks */,
 				FD3B642A2121C316003C1332 /* ShellScript */,
 				FD859869214BE9FA00C1A3E2 /* Embed App Extensions */,
-				29CE85A4F13D65ACAAEA4B3F /* [CP] Embed Pods Frameworks */,
+				FC6236A145B51B361DF6CBE0 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -617,8 +632,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				FD66C2812158F6F800B4F823 /* MainHeaderView.xib in Resources */,
+				FD086D7F22A3B54600030929 /* DistanceSlider.xib in Resources */,
 				FDAF602221273E880006B68A /* NanumSquareRoundOTFEB.otf in Resources */,
 				FDAF602021273E880006B68A /* NanumSquareRoundOTFB.otf in Resources */,
+				FDF492C722B4E59100827025 /* MarkerInfoWindowView.xib in Resources */,
 				FD2B746E218A395F00A2BC9E /* SlideMenuView.xib in Resources */,
 				FDAF602121273E880006B68A /* NanumSquareRoundOTFR.otf in Resources */,
 				FDB26C5B2170711400313A02 /* InfoPlist.strings in Resources */,
@@ -655,25 +672,25 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		29CE85A4F13D65ACAAEA4B3F /* [CP] Embed Pods Frameworks */ = {
+		A2941B5A4530CD89F3490E62 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-MartHoliday/Pods-MartHoliday-frameworks.sh",
-				"${PODS_ROOT}/NMapsMap/framework/NMapsMap.framework",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NMapsMap.framework",
+				"$(DERIVED_FILE_DIR)/Pods-MartHolidayTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MartHoliday/Pods-MartHoliday-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A2941B5A4530CD89F3490E62 /* [CP] Check Pods Manifest.lock */ = {
+		D58D45C640227BDC65F7A689 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -684,29 +701,29 @@
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-MartHolidayTests-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-MartHolidayTodayExtension-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D58D45C640227BDC65F7A689 /* [CP] Check Pods Manifest.lock */ = {
+		FC6236A145B51B361DF6CBE0 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
+				"${SRCROOT}/Pods/Target Support Files/Pods-MartHoliday/Pods-MartHoliday-frameworks.sh",
+				"${PODS_ROOT}/NMapsMap/framework/NMapsMap.framework",
 			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-MartHolidayTodayExtension-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NMapsMap.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MartHoliday/Pods-MartHoliday-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		FD3B642A2121C316003C1332 /* ShellScript */ = {
@@ -769,6 +786,7 @@
 				FDBF9A4821240911001C2DAA /* DataStorage.swift in Sources */,
 				FD1B4F212126BB8B00946311 /* SlideBackgroundView.swift in Sources */,
 				FD9F40A0211EC5EA007D7F1B /* Mart.swift in Sources */,
+				FD086D8122A3B59200030929 /* DistanceSlider.swift in Sources */,
 				FD80CE2B21612BAE00C16150 /* HolidayHeaderView.swift in Sources */,
 				FD7087DF216B427700A2A16F /* FavoriteData.swift in Sources */,
 				FDB4BE24211D6BAD00D3B264 /* MartSelectViewController.swift in Sources */,
@@ -791,6 +809,7 @@
 				FD5359FE225F8BDB00AB48BE /* MartMapView.swift in Sources */,
 				FD9F409C211EBFAF007D7F1B /* BranchRawData.swift in Sources */,
 				FDC5A7422167CD50009F0B0C /* TodayExtensionTableViewCell.swift in Sources */,
+				FDFF1CD522E455520045220F /* TickMarkSlider.swift in Sources */,
 				FDF8ABC6215B76FC00DA74C9 /* MainTableViewCell.swift in Sources */,
 				FDB3AD67216F94FD002209A2 /* StorageAPI.swift in Sources */,
 				FD91364E216EF70B001A21DF /* AppInfoViewController.swift in Sources */,
@@ -808,6 +827,7 @@
 				FD1CC4E1211DF76300B21E09 /* DetailViewController.swift in Sources */,
 				FD0371D82208121800B2055F /* DistanceSearch.swift in Sources */,
 				FD93878E225A39420082CC71 /* APIResponse.swift in Sources */,
+				FDF492C922B4E59C00827025 /* MarkerInfoWindowView.swift in Sources */,
 				FD15A11021F38DBB00B7276A /* LocationSearchViewController.swift in Sources */,
 				FDB3AD69216FBA7F002209A2 /* NetworkManager.swift in Sources */,
 				FD11EAE321203A4C003EB3E9 /* BranchTableViewCell.swift in Sources */,

MartHoliday/MartHoliday/Assets.xcassets/distanceMinus.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "minus.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "minus (1).png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MartHoliday/MartHoliday/Assets.xcassets/distancePlus.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "plus.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "plus (1).png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MartHoliday/MartHoliday/Assets.xcassets/focus.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "focus.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "focus (1).png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MartHoliday/MartHoliday/Assets.xcassets/target.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "target (2).png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}