diff --git a/android/app/build.gradle b/android/app/build.gradle index cd91b28..dbe6565 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -146,13 +146,13 @@ dependencies { implementation project(':react-native-image-crop-picker') implementation project(':react-native-image-resizer') - implementation project(':react-native-device-info') +// implementation project(':react-native-device-info') implementation project(':react-native-vector-icons') implementation project(':@react-native-community_async-storage') implementation project(':react-native-navigation') implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.appcompat:appcompat:1.0.0' + implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" implementation "com.facebook.react:react-native:+" // From node_modules } diff --git a/android/app/src/main/java/com/timepill/MainApplication.java b/android/app/src/main/java/com/timepill/MainApplication.java index 78fbdfa..4a53eec 100644 --- a/android/app/src/main/java/com/timepill/MainApplication.java +++ b/android/app/src/main/java/com/timepill/MainApplication.java @@ -6,7 +6,7 @@ import com.facebook.react.ReactApplication; import com.RNFetchBlob.RNFetchBlobPackage; import com.reactnative.ivpusic.imagepicker.PickerPackage; import fr.bamlab.rnimageresizer.ImageResizerPackage; -import com.learnium.RNDeviceInfo.RNDeviceInfo; +//import com.learnium.RNDeviceInfo.RNDeviceInfo; import com.oblador.vectoricons.VectorIconsPackage; import com.reactnativecommunity.asyncstorage.AsyncStoragePackage; import com.facebook.react.ReactNativeHost; @@ -45,7 +45,7 @@ public class MainApplication extends NavigationApplication { return Arrays.asList( // eg. new VectorIconsPackage() new RNFetchBlobPackage(), - new RNDeviceInfo(), + //new RNDeviceInfo(), new VectorIconsPackage(), new AsyncStoragePackage(), new PickerPackage() diff --git a/android/gradle.properties b/android/gradle.properties index ccb748f..bef4b0e 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -17,5 +17,5 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +# android.useAndroidX=true +# android.enableJetifier=true \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index 4ec7cf7..c9fcc94 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -15,5 +15,5 @@ include ':app' include ':react-native-navigation' project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/lib/android/app/') -include ':react-native-device-info' -project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android') +//include ':react-native-device-info' +//project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')