Merge pull request #20 from JWWon/develop

Ready for beta test

android/app/build.gradle

@@ -104,8 +104,8 @@ android {
         applicationId "com.woodongdang.client.android"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 27
-        versionName "0.4.12"
+        versionCode 38
+        versionName "1.0.3"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -156,7 +156,6 @@ dependencies {
     implementation project(':amazon-cognito-identity-js')
     implementation project(':@JWWon_react-native-universal-pedometer')
     implementation project(':react-native-view-shot')
-    implementation project(':react-native-background-timer')
     implementation project(':react-native-maps')
     implementation project(':react-native-geolocation-service')
     implementation project(':react-native-image-picker')

android/app/src/main/java/com/woodongdang/client/android/MainApplication.java

@@ -9,7 +9,6 @@
 import com.amazonaws.RNAWSCognitoPackage;
 import com.emesonsantana.BMDPedometer.BMDPedometer;
 import fr.greweb.reactnativeviewshot.RNViewShotPackage;
-import com.ocetnik.timer.BackgroundTimerPackage;
 import com.agontuk.RNFusedLocation.RNFusedLocationPackage;
 import com.imagepicker.ImagePickerPackage;
 import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
@@ -38,7 +37,6 @@ protected List<ReactPackage> getPackages() {
             new RNAWSCognitoPackage(),
             new BMDPedometer(),
             new RNViewShotPackage(),
-            new BackgroundTimerPackage(),
             new MapsPackage(),
             new RNFusedLocationPackage(),
             new ImagePickerPackage(),

android/settings.gradle

@@ -9,8 +9,6 @@ include ':@JWWon_react-native-universal-pedometer'
 project(':@JWWon_react-native-universal-pedometer').projectDir = new File(rootProject.projectDir, '../node_modules/@JWWon/react-native-universal-pedometer/android')
 include ':react-native-view-shot'
 project(':react-native-view-shot').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-view-shot/android')
-include ':react-native-background-timer'
-project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
 include ':react-native-maps'
 project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
 include ':react-native-geolocation-service'

ios/Podfile

@@ -38,19 +38,13 @@ target 'WddClient' do
   pod 'GoogleMaps'
   pod 'Google-Maps-iOS-Utils'
 
-  # react-native-background-timer dependencies
-  pod 'react-native-background-timer', path: '../node_modules/react-native-background-timer'
-
   # react-native-webview dependencies
+  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
 
   pod 'RNViewShot', :path => '../node_modules/react-native-view-shot'
 
   pod 'RNAWSCognito', :path => '../node_modules/amazon-cognito-identity-js'
 
-
-  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
-
-
   # target 'WddClientTests' do
   #   inherit! :search_paths
   #   # Pods for testing

ios/Podfile.lock

@@ -30,8 +30,6 @@ PODS:
   - JKBigInteger2 (0.0.5)
   - React (0.59.2):
     - React/Core (= 0.59.2)
-  - react-native-background-timer (2.1.1):
-    - React
   - react-native-google-maps (0.23.0):
     - Google-Maps-iOS-Utils (= 2.1.0)
     - GoogleMaps (= 2.5.0)
@@ -106,7 +104,6 @@ DEPENDENCIES:
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - Google-Maps-iOS-Utils
   - GoogleMaps
-  - react-native-background-timer (from `../node_modules/react-native-background-timer`)
   - react-native-google-maps (from `../node_modules/react-native-maps`)
   - react-native-maps (from `../node_modules/react-native-maps`)
   - react-native-webview (from `../node_modules/react-native-webview`)
@@ -143,8 +140,6 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
   React:
     :path: "../node_modules/react-native"
-  react-native-background-timer:
-    :path: "../node_modules/react-native-background-timer"
   react-native-google-maps:
     :path: "../node_modules/react-native-maps"
   react-native-maps:
@@ -167,14 +162,13 @@ SPEC CHECKSUMS:
   GoogleMaps: c087b8e5dfe87ca6ebf59adb9b4894a4146bec4f
   JKBigInteger2: e91672035c42328c48b7dd015b66812ddf40ca9b
   React: 1d605e098d69bdf08960787f3446f0a9dc2e2ccf
-  react-native-background-timer: bb7a98c8e97fc7c290de2d423dd09ddb73dcbcbb
   react-native-google-maps: b946d62e25dc66097921ed82520e45b0b081768a
   react-native-maps: 066c2afcc89e18726377bcc685315f989ca22449
   react-native-webview: a42108b827082f8f0333529b0772102031d5960d
   RNAWSCognito: 5f4859d05c2a20dafc8a1bbb15ffc6cc92fa4d0d
   RNViewShot: fdf9a64f0621ebc4e7c3392a10d2ffb70a7faee4
   yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd
 
-PODFILE CHECKSUM: 8be493e1ae17705de94ca9cec3cc7d26fe843e02
+PODFILE CHECKSUM: ea7286e178a44276c8d1993127085af9365306df
 
 COCOAPODS: 1.5.3

ios/WddClient.xcodeproj/project.pbxproj

@@ -1235,6 +1235,7 @@
 			name = LaunchScreen.xib;
 			path = WddClient;
 			sourceTree = "<group>";
+			usesTabs = 0;
 		};
 /* End PBXVariantGroup section */
 

ios/WddClient.xcodeproj/xcshareddata/xcschemes/WddClient.xcscheme

@@ -80,7 +80,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

ios/WddClient/Base.lproj/LaunchScreen.xib

@@ -1,34 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_9" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="img_splash" translatesAutoresizingMaskIntoConstraints="NO" id="vgt-D8-3bB">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                <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>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <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"/>
+            </constraints>
             <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <modalPageSheetSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <viewLayoutGuide key="safeArea" id="imr-Jg-vSi"/>
-            <point key="canvasLocation" x="547.20000000000005" y="454.43349753694582"/>
+            <point key="canvasLocation" x="546.37681159420299" y="456.02678571428567"/>
         </view>
     </objects>
     <resources>
-        <image name="img_splash" width="1000" height="1779"/>
+        <image name="LogoText" width="156" height="27"/>
     </resources>
 </document>

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

@@ -2,15 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "img_splash.jpg",
+      "filename" : "logo_text_white.png",
       "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>0.4.12</string>
+	<string>1.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>27</string>
+	<string>38</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -51,21 +51,19 @@
 		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>사진 촬영을 위해 사용자의 카메라에 접근합니다.</string>
+	<string>산책 중 카메라 촬영을 위해 권한이 필요합니다.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>위치 기반 서비스를 위해 사용자의 GPS에 접근합니다.</string>
+	<string>현 위치로 장소를 검색하고, 산책 경로를 기록하기 위해 권한이 필요합니다.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>산책 기록을 위해 백그라운드에서 실행중일 때에도 사용자의 GPS에 접근합니다.</string>
+	<string>백그라운드에서 산책 중 위치를 저장해 산책 경로를 기록하기 위해 권한이 필요합니다.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>위치 기반 서비스를 위해 사용자의 GPS에 접근합니다.</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>영상 촬영을 위해 사용자의 마이크에 접근합니다.</string>
+	<string>앱이 실행중일 때 현 위치로 장소를 검색하고, 산책 경로를 기록하기 위해 권한이 필요합니다.</string>
 	<key>NSMotionUsageDescription</key>
-	<string>정확한 걸음 수 측정을 위해 권한이 필요합니다.</string>
+	<string>산책 중 걸음 수 측정을 위해 권한이 필요합니다.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>사용자에 앨범에 사진을 저장합니다.</string>
+	<string>산책 기록을 앨범에 저장하기 위해 권한이 필요합니다.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>사진 선택을 위해 사용자의 앨범에 접근합니다.</string>
+	<string>앨범에서 사진을 선택해 저장하기 위해 권한이 필요합니다.</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>fonts/NanumSquareRoundR.ttf</string>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "WddClient",
-  "version": "0.4.12",
+  "version": "1.0.3",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -22,7 +22,6 @@
     "react": "16.8.3",
     "react-native": "^0.59.2",
     "react-native-actionsheet": "^2.4.2",
-    "react-native-background-timer": "^2.1.1",
     "react-native-datepicker": "^1.7.2",
     "react-native-extra-dimensions-android": "^1.2.5",
     "react-native-geolocation-service": "^2.0.0",
@@ -45,7 +44,6 @@
     "@types/node": "^11.13.0",
     "@types/react": "^16.8.8",
     "@types/react-native": "^0.57.41",
-    "@types/react-native-background-timer": "^2.0.0",
     "@types/react-native-datepicker": "^1.7.0",
     "@types/react-native-snap-carousel": "^3.7.1",
     "@types/react-navigation": "^3.0.6",

src/components/base/withLoading.tsx

@@ -4,6 +4,7 @@ import { color, font } from 'src/theme';
 
 export interface LoadingProps {
   toggleLoading: () => {};
+  hideLoading: () => {};
 }
 
 interface State {
@@ -25,6 +26,10 @@ export default function withLoading<P extends LoadingProps>(
       if (this.state.showLoading) this.spinning();
     };
 
+    hideLoading = () => {
+      this.setState({ showLoading: false });
+    };
+
     spinning = () => {
       Animated.loop(
         Animated.timing(this.state.spin, {
@@ -47,6 +52,7 @@ export default function withLoading<P extends LoadingProps>(
           <WrappedComponent
             {...this.props}
             toggleLoading={this.toggleLoading}
+            hideLoading={this.hideLoading}
           />
           <Modal
             visible={this.state.showLoading}

src/components/module/Feed/Feed.tsx

@@ -93,7 +93,7 @@ class Feed extends PureComponent<Props, State> {
                 this.setState({ showAnimation: false });
               }
             });
-          }, 1600);
+          }, 800);
         }
       });
     } else {

src/components/module/Selector/Selector.tsx

@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { PureComponent } from 'react';
 import { Text, View } from 'react-native';
 import LabelWrapper from 'src/components/container/LabelWrapper';
 import { HandleChangeSelector } from './index';
@@ -23,7 +23,7 @@ interface State {
   selected: string;
 }
 
-class Selector extends Component<Props, State> {
+class Selector extends PureComponent<Props, State> {
   state: State = { selected: this.props.value || '' };
 
   handleSelect = (value: string) => {

src/components/module/TextInput/TextInput.styles.ts

@@ -7,22 +7,36 @@ export const texts = StyleSheet.create({
     fontSize: font.size.small,
     marginTop: 9,
   },
+  unit: {
+    color: '#242424',
+    fontSize: font.size.medium,
+  },
 });
 
 export const inputs = StyleSheet.create({
   text: {
-    // outer size
+    flex: 1,
+    // font styles
+    color: color.black33,
+    fontSize: font.size.medium,
+  },
+  focused: { borderColor: color.blue },
+  unFocused: { borderColor: color.grayEF },
+});
+
+export const views = StyleSheet.create({
+  inputWrapper: {
     height: 49,
-    // inner size
-    alignItems: 'center',
+    flexDirection: 'row',
     paddingHorizontal: 12,
-    // border styles
     borderWidth: 1,
     borderRadius: 5,
-    // font styles
-    color: color.black33,
-    fontSize: font.size.medium,
   },
   focused: { borderColor: color.blue },
   unFocused: { borderColor: color.grayEF },
+  unitWrapper: {
+    height: '100%',
+    paddingRight: 8,
+    justifyContent: 'center',
+  },
 });