Merge pull request #21 from JWWon/develop

Beta service after 댕댕런

android/app/build.gradle

@@ -104,8 +104,8 @@ android {
         applicationId "com.woodongdang.client.android"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 38
-        versionName "1.0.3"
+        versionCode 42
+        versionName "1.0.6"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

ios/WddClient/Base.lproj/LaunchScreen.xib

@@ -16,24 +16,25 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LogoText" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sDc-ms-Ldq" userLabel="LogoText">
-                    <rect key="frame" x="90" y="192.66666666666666" width="195" height="40.333333333333343"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Splash" translatesAutoresizingMaskIntoConstraints="NO" id="Vcg-Eh-844">
+                    <rect key="frame" x="6" y="0.0" width="363" height="812"/>
                 </imageView>
             </subviews>
-            <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="sDc-ms-Ldq" firstAttribute="top" secondItem="imr-Jg-vSi" secondAttribute="top" multiplier="0.285" constant="180" id="7Lm-XH-fXS"/>
-                <constraint firstItem="sDc-ms-Ldq" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="CMh-LM-kPP"/>
-                <constraint firstItem="sDc-ms-Ldq" firstAttribute="height" secondItem="iN0-l3-epB" secondAttribute="height" multiplier="0.05" id="Vgc-Sp-Eg4"/>
-                <constraint firstItem="sDc-ms-Ldq" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="0.52" id="eUJ-49-4fx"/>
+                <constraint firstAttribute="bottom" secondItem="Vcg-Eh-844" secondAttribute="bottom" id="Lyg-eS-c91"/>
+                <constraint firstItem="Vcg-Eh-844" firstAttribute="centerX" secondItem="imr-Jg-vSi" secondAttribute="centerX" id="QEj-2d-vIF"/>
+                <constraint firstItem="Vcg-Eh-844" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="gMU-Tq-Dnz"/>
+                <constraint firstItem="Vcg-Eh-844" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="0.968" id="waa-KO-ove"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <modalPageSheetSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <viewLayoutGuide key="safeArea" id="imr-Jg-vSi"/>
-            <point key="canvasLocation" x="546.37681159420299" y="456.02678571428567"/>
+            <point key="canvasLocation" x="544.79999999999995" y="455.9113300492611"/>
         </view>
     </objects>
     <resources>
-        <image name="LogoText" width="156" height="27"/>
+        <image name="Splash" width="1000" height="1779"/>
     </resources>
 </document>

ios/WddClient/Images.xcassets/LogoText.imageset/Contents.json → ios/WddClient/Images.xcassets/Splash.imageset/Contents.json

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "logo_text_white.png",
+      "filename" : "img_background.jpg",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "logo_text_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "logo_text_white@3x.png",
       "scale" : "3x"
     }
   ],

ios/WddClient/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>38</string>
+	<string>42</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "WddClient",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

src/components/module/Splash/Splash.tsx

@@ -1,29 +1,37 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { Dimensions, Image, StyleSheet, View } from 'react-native';
 import { color } from 'src/theme';
 
+interface Props {
+  children?: ReactNode;
+}
+
 const { width, height } = Dimensions.get('window');
 
 const styles = StyleSheet.create({
-  background: {
+  container: {
     flex: 1,
-    backgroundColor: color.blue,
-    alignItems: 'center',
+    backgroundColor: color.white,
   },
-  image: {
-    marginTop: height * 0.285,
-    width: width * 0.52,
-    height: height * 0.05,
+  background: {
+    ...StyleSheet.absoluteFillObject,
+    height,
+    width: width * 0.968,
+    left: width * 0.016,
+    right: width * 0.016,
+    top: 0,
+    bottom: 0,
     resizeMode: 'contain',
   },
 });
 
-const Splash: React.FC<{}> = () => (
-  <View style={styles.background}>
+const Splash: React.FC<Props> = ({ children }) => (
+  <View style={styles.container}>
     <Image
-      source={require('src/assets/icons/logo_text_white.png')}
-      style={styles.image}
+      source={require('src/assets/images/img_background.jpg')}
+      style={styles.background}
     />
+    {children && children}
   </View>
 );
 

src/pages/Map/Map/Map.tsx

@@ -76,7 +76,7 @@ class Map extends Component<Props, State> {
                     pick(previous, ['latitude', 'longitude']),
                     current
                   );
-                  if (pinInfo.addDistance > 0.0098) pushPin(pinInfo);
+                  if (pinInfo.addDistance > 0.005) pushPin(pinInfo);
                 }
               }
               // Default Actions

src/pages/Place/Detail/ReviewCard/ReviewCard.tsx

@@ -119,7 +119,7 @@ class ReviewCard extends PureComponent<Props, State> {
             </>
           )}
           <Text numberOfLines={2} style={styles.time}>
-            {moment(review.updatedAt).fromNow()}
+            {moment(review.createdAt).fromNow()}
           </Text>
           <TouchableOpacity
             style={styles.headerButton}

src/pages/Profile/Edit/Edit.tsx

@@ -167,7 +167,7 @@ class Edit extends PureComponent<Props, State> {
         const url = await uploadImage({
           table: 'dogs',
           label: user.email,
-          name: state.name,
+          name: `${state.name}_${moment().toISOString()}`,
           uri: state.thumbnail,
         })(toggleLoading);
         state.thumbnail = url;