Skip to content

Commit

Permalink
Merge pull request #5 from thehung111/master
Browse files Browse the repository at this point in the history 
update user agent to visearch
  • Loading branch information
@thehung111
thehung111 authored Dec 13, 2016
2 parents 85592c1 + dc83af3 commit c8090fe
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 10 deletions.
32 changes: 25 additions & 7 deletions Example/Example/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="iTA-9y-xAY">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="iTA-9y-xAY">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -17,14 +20,14 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="solutionTableViewCell" textLabel="ACE-gN-n2M" style="IBUITableViewCellStyleDefault" id="ZX9-s7-jMd">
<rect key="frame" x="0.0" y="92" width="375" height="44"/>
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZX9-s7-jMd" id="Kgh-et-BDQ">
<frame key="frameInset" width="342" height="43.5"/>
<rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ACE-gN-n2M">
<frame key="frameInset" minX="15" width="325" height="43.5"/>
<rect key="frame" x="15" y="0.0" width="325" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
Expand Down Expand Up @@ -62,13 +65,16 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="j13-FB-Nvs">
<rect key="frame" x="6" y="74" width="343" height="224.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Param Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZFE-fM-kZt">
<rect key="frame" x="0.0" y="0.0" width="343" height="20.5"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xM3-KO-fVP">
<rect key="frame" x="0.0" y="28.5" width="343" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="6Oq-Ht-ZGV"/>
</constraints>
Expand All @@ -80,24 +86,28 @@
</connections>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sq5-r0-IWV" customClass="SwiftHUEColorPicker" customModule="Example" customModuleProvider="target">
<rect key="frame" x="0.0" y="80.5" width="343" height="30"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="fEm-qE-cSX"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3zW-ab-BHs" userLabel="Saturation color picker" customClass="SwiftHUEColorPicker" customModule="Example" customModuleProvider="target">
<rect key="frame" x="0.0" y="118.5" width="343" height="30"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="zV8-lo-3o5"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="F6D-oa-M9W" userLabel="Brightness picker" customClass="SwiftHUEColorPicker" customModule="Example" customModuleProvider="target">
<rect key="frame" x="0.0" y="156.5" width="343" height="30"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="h0K-MD-fkv"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fGH-mN-3yL" userLabel="Alpha picker" customClass="SwiftHUEColorPicker" customModule="Example" customModuleProvider="target">
<rect key="frame" x="0.0" y="194.5" width="343" height="30"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="20D-MW-uOJ"/>
Expand All @@ -106,6 +116,7 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nN9-gx-msa" userLabel="colorView">
<rect key="frame" x="147.5" y="306.5" width="80" height="80"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="80" id="noV-UL-eEl"/>
Expand Down Expand Up @@ -160,8 +171,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="tpo-vq-AOW">
<rect key="frame" x="10" y="74" width="355" height="404"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M7v-Ct-vrF">
<rect key="frame" x="77.5" y="0.0" width="200" height="44"/>
<color key="backgroundColor" name="selectedMenuItemColor" catalog="System" colorSpace="catalog"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="6Oh-GO-NV8"/>
Expand All @@ -174,6 +187,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gH2-hi-aou">
<rect key="frame" x="77.5" y="52" width="200" height="44"/>
<color key="backgroundColor" name="selectedMenuItemColor" catalog="System" colorSpace="catalog"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="5Kr-dU-Dt3"/>
Expand All @@ -186,6 +200,7 @@
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="utC-XF-1La">
<rect key="frame" x="27.5" y="104" width="300" height="300"/>
<constraints>
<constraint firstAttribute="height" constant="300" id="I1D-J7-ncU"/>
<constraint firstAttribute="width" constant="300" id="e2k-PO-gEE"/>
Expand Down Expand Up @@ -240,8 +255,11 @@
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Yqt-lF-J11"/>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Yqt-lF-J11">
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Similarity xx%" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1mD-4p-GdO">
<rect key="frame" x="4" y="82" width="96" height="18"/>
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="8DA-vp-mnS"/>
Expand Down Expand Up @@ -298,6 +316,6 @@
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="hac-Th-cfj"/>
<segue reference="0lt-Uc-OHE"/>
</inferredMetricsTieBreakers>
</document>
2 changes: 1 addition & 1 deletion ViSearchSDK.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Pod::Spec.new do |s|


s.name = "ViSearchSDK"
s.version = "1.0.1"
s.version = "1.0.2"
s.summary = "A Visual Search API solution (Swift SDK)"

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion ViSearchSDK/ViSearchSDK/Classes/ViSearchClient.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ open class ViSearchClient: NSObject, URLSessionDelegate {
public var timeoutInterval : TimeInterval = 10 // how long to timeout request
public var requestSerialization: ViRequestSerialization

public var userAgent : String = "ViSenze-Swift-SDK/1.0.1"
public var userAgent : String = "visearch-swift-sdk/1.0.2"
private static let userAgentHeader : String = "X-Requested-With"


Expand Down
2 changes: 1 addition & 1 deletion ViSearchSDK/ViSearchSDK/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.1</string>
<string>1.0.2</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down

0 comments on commit c8090fe

Please sign in to comment.