first commit

android/app/build.gradle

@@ -110,6 +110,11 @@ android {
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
+<<<<<<< HEAD
+=======
+    implementation project(':react-native-vector-icons')
+    implementation project(':react-native-fs')
+>>>>>>> dabur-store-dna
 
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
@@ -117,3 +122,9 @@ dependencies {
         implementation jscFlavor
     }
 }
+<<<<<<< HEAD
+=======
+
+apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")
+
+>>>>>>> dabur-store-dna

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
+<<<<<<< HEAD
+=======
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+>>>>>>> dabur-store-dna
 
     <application
       android:name=".MainApplication"

android/app/src/main/res/values/strings.xml

@@ -1,3 +1,7 @@
 <resources>
+<<<<<<< HEAD
     <string name="app_name">PerformicsStoreDNA</string>
+=======
+    <string name="app_name">Performics Store DNA</string>
+>>>>>>> dabur-store-dna
 </resources>