Merge pull request #15 from JWWon/change-walk-complete

Change walk complete
JWWon · Apr 3, 2019 · 060638d · 060638d
2 parents 864da76 + f21afc4
commit 060638d
Show file tree

Hide file tree

Showing 224 changed files with 10,658 additions and 8,404 deletions.
diff --git a/.flowconfig b/.flowconfig
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -17,8 +17,21 @@
 2. `~$ cd wdd-client`
 3. `~/wdd-client$ npm install`
 4. `~/wdd-client$ cd ios && pod install && cd ..`
-5. `~/wdd-client& npm run dev`
-6. 서비스 실행
+5. `android/Gradle Scripts(android-react-native-maps)` 에 다음 추가
+
+```
+{
+  dependencies {
+    ...,
+    implementation "com.android.support:support-media-compat:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+  }
+}
+```
+
+6. `~/wdd-client& npm run dev`
+7. 서비스 실행
 
 - Android
   1. 에뮬레이터 혹은 안드로이드 디바이스 연결

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -91,50 +91,57 @@ def enableSeparateBuildPerCPUArchitecture = false
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
  */
-def enableProguardInReleaseBuilds = false
+def enableProguardInReleaseBuilds = true
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion '28.0.3'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         applicationId "com.woodongdang.client.android"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 10
-        versionName "0.1.5"
+        versionCode 14
+        versionName "0.3.2"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
     }
     signingConfigs {
         release {
-            storeFile file(MYAPP_RELEASE_STORE_FILE)
-            storePassword MYAPP_RELEASE_STORE_PASSWORD
-            keyAlias MYAPP_RELEASE_KEY_ALIAS
-            keyPassword MYAPP_RELEASE_KEY_PASSWORD
+            if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
+                storeFile file(MYAPP_RELEASE_STORE_FILE)
+                storePassword MYAPP_RELEASE_STORE_PASSWORD
+                keyAlias MYAPP_RELEASE_KEY_ALIAS
+                keyPassword MYAPP_RELEASE_KEY_PASSWORD
+            }
+
         }
     }
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86", "arm64-v8a"
+            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     buildTypes {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
         }
     }
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3]
+            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
@@ -145,13 +152,11 @@ android {
 }
 
 dependencies {
-    implementation project(':react-native-linear-gradient')
-    implementation project(':react-native-background-timer')
     implementation project(':@JWWon_react-native-universal-pedometer')
+    implementation project(':react-native-view-shot')
+    implementation project(':react-native-webview')
+    implementation project(':react-native-background-timer')
     implementation project(':react-native-maps')
-    implementation 'com.google.android.gms:play-services-base:16.1.0'
-    implementation 'com.google.android.gms:play-services-location:16.0.0'
-    implementation 'com.google.android.gms:play-services-maps:16.1.0'
     implementation project(':react-native-geolocation-service')
     implementation project(':react-native-image-picker')
     implementation project(':amazon-cognito-identity-js')
@@ -161,11 +166,16 @@ dependencies {
     implementation "com.android.support:support-media-compat:${rootProject.ext.supportLibVersion}"
     implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules
+    // For animated GIF support
+    implementation 'com.facebook.fresco:animated-gif:1.10.0'
+    // For WebP support, including animated WebP
+    implementation 'com.facebook.fresco:animated-webp:1.10.0'
+    implementation 'com.facebook.fresco:webpsupport:1.10.0'
 }
 
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
     from configurations.compile
     into 'libs'
-}
+}
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/react_native_config" />
+</manifest>
diff --git a/android/app/src/debug/res/xml/react_native_config.xml b/android/app/src/debug/res/xml/react_native_config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+  <domain-config cleartextTrafficPermitted="true">
+    <domain includeSubdomains="false">localhost</domain>
+    <domain includeSubdomains="false">10.0.2.2</domain>
+    <domain includeSubdomains="false">10.0.3.2</domain>
+  </domain-config>
+</network-security-config>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,29 +1,33 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.woodongdang.client.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission tools:node="remove" android:name="android.permission.READ_PHONE_STATE" />
 
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
+      android:usesCleartextTraffic="true"
       android:theme="@style/AppTheme">
       <meta-data
-          android:name="com.google.android.maps.v2.API_KEY"
-          android:value="AIzaSyBugUSlx5wJxfVlbvz_9gKnrUYTNC2ZFkM"/>
+          android:name="com.google.android.geo.API_KEY"
+          android:value="AIzaSyBz25fWMWpBBOZaGmDglmHsHWnnl6iQY_c"/>
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:launchMode="singleTask"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustResize">
+        android:screenOrientation="portrait"
+        android:windowSoftInputMode="adjustResize|stateAlwaysHidden">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />

diff --git a/android/app/src/main/java/com/woodongdang/client/android/MainApplication.java b/android/app/src/main/java/com/woodongdang/client/android/MainApplication.java
@@ -4,9 +4,10 @@
 
 import com.airbnb.android.react.maps.MapsPackage;
 import com.facebook.react.ReactApplication;
-import com.BV.LinearGradient.LinearGradientPackage;
-import com.ocetnik.timer.BackgroundTimerPackage;
 import com.emesonsantana.BMDPedometer.BMDPedometer;
+import fr.greweb.reactnativeviewshot.RNViewShotPackage;
+import com.reactnativecommunity.webview.RNCWebViewPackage;
+import com.ocetnik.timer.BackgroundTimerPackage;
 import com.agontuk.RNFusedLocation.RNFusedLocationPackage;
 import com.imagepicker.ImagePickerPackage;
 import com.amazonaws.RNAWSCognitoPackage;
@@ -31,9 +32,10 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-            new LinearGradientPackage(),
-            new BackgroundTimerPackage(),
             new BMDPedometer(),
+            new RNViewShotPackage(),
+            new RNCWebViewPackage(),
+            new BackgroundTimerPackage(),
             new MapsPackage(),
             new RNFusedLocationPackage(),
             new ImagePickerPackage(),

diff --git a/android/build.gradle b/android/build.gradle
@@ -2,10 +2,10 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.2"
+        buildToolsVersion = "28.0.3"
         minSdkVersion = 16
         compileSdkVersion = 28
-        targetSdkVersion = 27
+        targetSdkVersion = 28
         supportLibVersion = "28.0.0"
         googlePlayServicesVersion = "15.0.1"
         androidMapsUtilsVersion = "0.5+"
@@ -15,7 +15,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -33,10 +33,4 @@ allprojects {
             url "$rootDir/../node_modules/react-native/android"
         }
     }
-}
-
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.7'
-    distributionUrl = distributionUrl.replace("bin", "all")
-}
+}
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -17,7 +17,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-MYAPP_RELEASE_STORE_FILE=woodongdang.keystore
-MYAPP_RELEASE_KEY_ALIAS=woodongdang
-MYAPP_RELEASE_STORE_PASSWORD=dnjswldns96
-MYAPP_RELEASE_KEY_PASSWORD=dnjswldns96
+MYAPP_RELEASE_STORE_FILE=woodongdang-release.keystore
+MYAPP_RELEASE_KEY_ALIAS=woodongdang-key
+MYAPP_RELEASE_STORE_PASSWORD=dlfrnvkfdbr1!
+MYAPP_RELEASE_KEY_PASSWORD=dlfrnvkfdbr1!
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,10 +1,12 @@
 rootProject.name = 'WddClient'
-include ':react-native-linear-gradient'
-project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
-include ':react-native-background-timer'
-project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
 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-webview'
+project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/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'

diff --git a/index.js b/index.js
@@ -1,5 +1,3 @@
-/** @format */
-
 import { AppRegistry } from 'react-native';
 import App from './src/App';
 import { name as appName } from './app.json';

diff --git a/ios/Podfile b/ios/Podfile
@@ -41,8 +41,10 @@ target 'WddClient' do
   # react-native-background-timer dependencies
   pod 'react-native-background-timer', path: '../node_modules/react-native-background-timer'
 
-  # react-native-linear-gradient dependencies
-  pod 'BVLinearGradient', path: '../node_modules/react-native-linear-gradient'
+  # react-native-webview dependencies
+  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
+
+  pod 'RNViewShot', :path => '../node_modules/react-native-view-shot'
 
   # target 'WddClientTests' do
   #   inherit! :search_paths