Mini changes

foRsxs · Dec 15, 2019 · cc91f38 · cc91f38
1 parent 41bc2e7
commit cc91f38
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 210 deletions.
diff --git a/_docs/README.md b/_docs/README.md
@@ -23,11 +23,8 @@ mkdir -p android/app/src/main/assets && rm -rf android/app/build && npx react-na
 mkdir -p android/app/src/main/assets && rm -rf android/app/build && npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res && cd android && ./gradlew assembleRelease && cd ../
 
 If ERROR when run dev-mode, need clean all build android:
-cd android && ./gradlew clean
+cd android && ./gradlew clean && cd ../
 
 Run: react-native run-android --variant=release
 
-Создание билда для ios
-react-native bundle --entry-file index.js --platform ios --dev false --bundle-output ios/main.jsbundle --assets-dest ios
-
 react-native run-ios --configuration Release
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -151,14 +151,9 @@ android {
 }
 
 dependencies {
-    compile(project(':react-native-device-info')) {
-        exclude group: 'com.google.android.gms'
-    }    
-    implementation (project(':react-native-camera')){
-        exclude group: 'com.google.android.gms', module: 'play-services-vision'
-    }
+    implementation project(':react-native-device-info')
+    implementation project(':react-native-camera')
     implementation project(':@react-native-community_async-storage')
-    implementation project(':@react-native-community_netinfo')
     implementation project(':react-native-webview')
     implementation project(':react-native-linear-gradient')
     implementation project(':react-native-gesture-handler')

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -5,18 +5,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
 
-    <!-- Optional - Add the necessary permissions (Choose one of those) -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <!-- End optional permissions -->
-
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"

diff --git a/android/app/src/main/assets/index.android.bundle b/android/app/src/main/assets/index.android.bundle
diff --git a/android/app/src/main/java/com/izzisoftware/diagnosticcenter/MainApplication.java b/android/app/src/main/java/com/izzisoftware/diagnosticcenter/MainApplication.java
@@ -1,20 +1,17 @@
 package com.izzisoftware.diagnosticcenter;
 
 import android.app.Application;
-
 import com.facebook.react.ReactApplication;
 import com.learnium.RNDeviceInfo.RNDeviceInfo;
 import org.reactnative.camera.RNCameraPackage;
 import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
-import com.reactnativecommunity.netinfo.NetInfoPackage;
 import com.reactnativecommunity.webview.RNCWebViewPackage;
 import com.BV.LinearGradient.LinearGradientPackage;
 import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
-
 import com.RNFetchBlob.RNFetchBlobPackage;
 import com.geektime.rnonesignalandroid.ReactNativeOneSignalPackage;
 import com.rnfingerprint.FingerprintAuthPackage;
@@ -41,7 +38,6 @@ protected List<ReactPackage> getPackages() {
         new RNDeviceInfo(),
         new RNCameraPackage(),
         new AsyncStoragePackage(),
-        new NetInfoPackage(),
         new RNCWebViewPackage(),
         new LinearGradientPackage(),
         new RNGestureHandlerPackage(),

diff --git a/android/build.gradle b/android/build.gradle
@@ -7,8 +7,6 @@ buildscript {
         compileSdkVersion = 28
         targetSdkVersion = 28
         supportLibVersion = "28.0.0"
-        androidXCore = "1.0.2"
-        firebaseIidVersion = "19.0.1"
     }
     repositories {
         google()

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -5,8 +5,6 @@ include ':react-native-camera'
 project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')
 include ':@react-native-community_async-storage'
 project(':@react-native-community_async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
-include ':@react-native-community_netinfo'
-project(':@react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
 include ':react-native-webview'
 project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
 include ':react-native-linear-gradient'