icon

artimenring-iOS/Artimenring/Base.lproj/LaunchScreen.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,6 +13,9 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sk_launch.png" translatesAutoresizingMaskIntoConstraints="NO" id="Cce-Bs-hwh">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright@artimen inc. All rights reserved" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="DCK-Y2-mO1">
                     <rect key="frame" x="0.0" y="619" width="375" height="21"/>
                     <constraints>
@@ -24,9 +25,6 @@
                     <color key="textColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch-img" translatesAutoresizingMaskIntoConstraints="NO" id="Cce-Bs-hwh">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                </imageView>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
@@ -43,6 +41,6 @@
         </view>
     </objects>
     <resources>
-        <image name="launch-img" width="750" height="1333"/>
+        <image name="sk_launch.png" width="375" height="666.75"/>
     </resources>
 </document>

artimenring-iOS/Artimenring/Classes/StoryBoard/Base.lproj/Login.storyboard

@@ -33,17 +33,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kido_icon" translatesAutoresizingMaskIntoConstraints="NO" id="919-Kb-hB2">
-                                <rect key="frame" x="117.5" y="118" width="140" height="70"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="70" id="pn7-ae-mje"/>
-                                    <constraint firstAttribute="width" constant="140" id="y0t-et-yKm"/>
-                                </constraints>
+                                <rect key="frame" x="81" y="118" width="213.5" height="38.5"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hQR-8o-VGB">
-                                <rect key="frame" x="117.5" y="118" width="140" height="70"/>
+                                <rect key="frame" x="81" y="118" width="213.5" height="38.5"/>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l1Z-Uu-CG7">
-                                <rect key="frame" x="38" y="242" width="299" height="54"/>
+                                <rect key="frame" x="38" y="210.5" width="299" height="54"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c3d-Zp-Ptp">
                                         <rect key="frame" x="0.0" y="0.0" width="299" height="54"/>
@@ -121,7 +117,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GQ2-5V-u5J">
-                                <rect key="frame" x="38" y="316" width="299" height="54"/>
+                                <rect key="frame" x="38" y="284.5" width="299" height="54"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1K5-KD-Wyr">
                                         <rect key="frame" x="0.0" y="0.0" width="299" height="54"/>
@@ -158,7 +154,7 @@
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U3E-U6-yfi">
-                                <rect key="frame" x="45" y="388" width="62" height="22"/>
+                                <rect key="frame" x="45" y="356.5" width="62" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="Vzb-zl-Gn4"/>
                                 </constraints>
@@ -171,7 +167,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EvG-Qm-rfL">
-                                <rect key="frame" x="268" y="388" width="62" height="22"/>
+                                <rect key="frame" x="268" y="356.5" width="62" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="vw2-vf-vUm"/>
                                 </constraints>
@@ -247,7 +243,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cxW-EU-jwg">
-                                <rect key="frame" x="40" y="460" width="295" height="44"/>
+                                <rect key="frame" x="40" y="428.5" width="295" height="44"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="V5j-Z8-gJC">
                                         <rect key="frame" x="0.0" y="0.0" width="295" height="44"/>
@@ -843,17 +839,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kido_icon" translatesAutoresizingMaskIntoConstraints="NO" id="7Ug-aU-9El">
-                                <rect key="frame" x="117.5" y="118" width="140" height="70"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="70" id="cjc-YD-IDh"/>
-                                    <constraint firstAttribute="width" constant="140" id="gLP-uK-isw"/>
-                                </constraints>
+                                <rect key="frame" x="81" y="118" width="213.5" height="38.5"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="r7t-Ch-F8L">
-                                <rect key="frame" x="117.5" y="118" width="140" height="70"/>
+                                <rect key="frame" x="81" y="118" width="213.5" height="38.5"/>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FA0-Iw-VP9">
-                                <rect key="frame" x="38" y="242" width="299" height="54"/>
+                                <rect key="frame" x="38" y="210.5" width="299" height="54"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dgx-qS-42i">
                                         <rect key="frame" x="0.0" y="0.0" width="299" height="54"/>
@@ -887,7 +879,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="m9w-8v-R5T">
-                                <rect key="frame" x="38" y="316" width="299" height="54"/>
+                                <rect key="frame" x="38" y="284.5" width="299" height="54"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kop-Yr-ZYE">
                                         <rect key="frame" x="0.0" y="0.0" width="299" height="54"/>
@@ -924,7 +916,7 @@
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kfG-qQ-Dm9">
-                                <rect key="frame" x="45" y="388" width="62" height="22"/>
+                                <rect key="frame" x="45" y="356.5" width="62" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="7e7-Zq-vu8"/>
                                 </constraints>
@@ -937,7 +929,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hnR-tw-NMe">
-                                <rect key="frame" x="268" y="388" width="62" height="22"/>
+                                <rect key="frame" x="268" y="356.5" width="62" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="Wp4-Ro-1ld"/>
                                 </constraints>
@@ -1013,7 +1005,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FLq-wD-SEy">
-                                <rect key="frame" x="40" y="460" width="295" height="44"/>
+                                <rect key="frame" x="40" y="428.5" width="295" height="44"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eH7-vu-ofB">
                                         <rect key="frame" x="0.0" y="0.0" width="295" height="44"/>
@@ -1344,7 +1336,7 @@
         <image name="icon_key" width="20" height="20"/>
         <image name="icon_phone" width="22" height="22"/>
         <image name="icon_verificonation_code" width="20" height="20"/>
-        <image name="kido_icon" width="240" height="115"/>
+        <image name="kido_icon" width="213.5" height="38.5"/>
         <image name="login_pulldown" width="20" height="20"/>
         <image name="sign_facebook" width="48" height="48"/>
         <image name="time_repeat_nor" width="24" height="24"/>

artimenring-iOS/Artimenring/Images.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

artimenring-iOS/Artimenring/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -2,73 +2,73 @@
   "images" : [
     {
       "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
       "filename" : "2208.png",
+      "idiom" : "iphone",
       "minimum-system-version" : "8.0",
       "orientation" : "portrait",
-      "scale" : "3x"
+      "scale" : "3x",
+      "subtype" : "736h"
     },
     {
       "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
       "filename" : "2208-1.png",
+      "idiom" : "iphone",
       "minimum-system-version" : "8.0",
       "orientation" : "landscape",
-      "scale" : "3x"
+      "scale" : "3x",
+      "subtype" : "736h"
     },
     {
       "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "667h",
       "filename" : "1334.png",
+      "idiom" : "iphone",
       "minimum-system-version" : "8.0",
       "orientation" : "portrait",
-      "scale" : "2x"
+      "scale" : "2x",
+      "subtype" : "667h"
     },
     {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "960-1.png",
       "extent" : "full-screen",
+      "filename" : "960-1.png",
+      "idiom" : "iphone",
       "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {
       "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "retina4",
       "filename" : "1136-1.png",
+      "idiom" : "iphone",
       "minimum-system-version" : "7.0",
       "orientation" : "portrait",
-      "scale" : "2x"
+      "scale" : "2x",
+      "subtype" : "retina4"
     },
     {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "480.png",
       "extent" : "full-screen",
+      "filename" : "480.png",
+      "idiom" : "iphone",
+      "orientation" : "portrait",
       "scale" : "1x"
     },
     {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "960.png",
       "extent" : "full-screen",
+      "filename" : "960.png",
+      "idiom" : "iphone",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "1136.png",
       "extent" : "full-screen",
-      "subtype" : "retina4",
-      "scale" : "2x"
+      "filename" : "1136.png",
+      "idiom" : "iphone",
+      "orientation" : "portrait",
+      "scale" : "2x",
+      "subtype" : "retina4"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

artimenring-iOS/Artimenring/Images.xcassets/Login/login_bg.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/launch/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

artimenring-iOS/Artimenring/Images.xcassets/Login/kido_logo.imageset/Contents.json → artimenring-iOS/Artimenring/Images.xcassets/sk_launch_img.imageset/Contents.json

@@ -5,18 +5,17 @@
       "scale" : "1x"
     },
     {
+      "filename" : "sk_launch_img.png",
       "idiom" : "universal",
-      "filename" : "kido_logo@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "kido_logo@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

artimenring-iOS/Overseas Watch.xcodeproj/project.pbxproj

@@ -306,6 +306,7 @@
 		7B6439E31B4BA2E6008D319B /* SKDropDown.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B6439E21B4BA2E6008D319B /* SKDropDown.m */; };
 		7B7FA6731B96C5E400DF0B8D /* WebViewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B7FA6721B96C5E400DF0B8D /* WebViewViewController.m */; };
 		7BECF0D51B54DE5700FBC7BF /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BECF0D41B54DE5700FBC7BF /* AVFoundation.framework */; };
+		E40A12442B61078F00B4FD67 /* sk_launch.png in Resources */ = {isa = PBXBuildFile; fileRef = E40A12432B61078F00B4FD67 /* sk_launch.png */; };
 		E41B0DDE2B107BF200D54B95 /* DataManager+user.m in Sources */ = {isa = PBXBuildFile; fileRef = E41B0DDD2B107BF200D54B95 /* DataManager+user.m */; };
 		E43714602B4CE748003CA842 /* MainViewController+banner.m in Sources */ = {isa = PBXBuildFile; fileRef = E437145F2B4CE748003CA842 /* MainViewController+banner.m */; };
 		E43714632B4CECD6003CA842 /* MainViewController+map.m in Sources */ = {isa = PBXBuildFile; fileRef = E43714622B4CECD6003CA842 /* MainViewController+map.m */; };
@@ -994,6 +995,7 @@
 		C11F75CB876360968648EA7B /* Pods-Ojoy Champs.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ojoy Champs.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Ojoy Champs/Pods-Ojoy Champs.debug.xcconfig"; sourceTree = "<group>"; };
 		CC01265C94CF8502E59EDAC7 /* Pods-Ojoy Champs.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ojoy Champs.test.xcconfig"; path = "Pods/Target Support Files/Pods-Ojoy Champs/Pods-Ojoy Champs.test.xcconfig"; sourceTree = "<group>"; };
 		E143CF1A3006F6257962D165 /* Pods-Ojoy watch.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ojoy watch.test.xcconfig"; path = "Pods/Target Support Files/Pods-Ojoy watch/Pods-Ojoy watch.test.xcconfig"; sourceTree = "<group>"; };
+		E40A12432B61078F00B4FD67 /* sk_launch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sk_launch.png; sourceTree = "<group>"; };
 		E41B0DDC2B107BF200D54B95 /* DataManager+user.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "DataManager+user.h"; sourceTree = "<group>"; };
 		E41B0DDD2B107BF200D54B95 /* DataManager+user.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DataManager+user.m"; sourceTree = "<group>"; };
 		E437145E2B4CE748003CA842 /* MainViewController+banner.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MainViewController+banner.h"; sourceTree = "<group>"; };
@@ -2083,6 +2085,7 @@
 		28159BF71A3FC46C00A3E1A3 /* Resource */ = {
 			isa = PBXGroup;
 			children = (
+				E40A12432B61078F00B4FD67 /* sk_launch.png */,
 				276496D5219578FD00526E05 /* CountryCode.csv */,
 				27D1EB9021991CE800B55FF6 /* CountryCode.json */,
 				2784964E1B75E67F00680965 /* alarm_beep.mp3 */,
@@ -2778,6 +2781,7 @@
 				27A0ED111BA7ED9F009D291B /* chat_animation3.png in Resources */,
 				27A0ED1A1BA7ED9F009D291B /* chat_voice_record.png in Resources */,
 				271E1C8D206A26CD00680138 /* lottie_emoji_2.json in Resources */,
+				E40A12442B61078F00B4FD67 /* sk_launch.png in Resources */,
 				271E1C93206A26CD00680138 /* lottie_emoji_4.json in Resources */,
 				27D1EB9121991CE800B55FF6 /* CountryCode.json in Resources */,
 				279B90FB2108713A00C37262 /* Login.storyboard in Resources */,

artimenring-iOS/Overseas Watch.xcodeproj/xcshareddata/xcschemes/Ojoy watch.xcscheme

@@ -53,7 +53,7 @@
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"
             value = "disable"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>