- fix android builds (#57)

chriscoderdr · Nov 14, 2024 · b4e9364 · b4e9364
1 parent dc6fe82
commit b4e9364
Show file tree

Hide file tree

Showing 32 changed files with 87 additions and 78 deletions.
diff --git a/apps/driver-app/android/app/src/main/AndroidManifest.xml b/apps/driver-app/android/app/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
       <data android:scheme="https"/>
     </intent>
   </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme">
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme"
+    android:usesCleartextTraffic="true">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>

diff --git a/apps/driver-app/android/app/src/main/res/xml/network_security_config.xml b/apps/driver-app/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">chriscoder.com</domain>
+        <domain includeSubdomains="true">localhost</domain>
+    </domain-config>
+</network-security-config>
diff --git a/apps/driver-app/android/gradle.properties b/apps/driver-app/android/gradle.properties
@@ -60,4 +60,4 @@ expo.useLegacyPackaging=false
 
 expoRNMapboxMapsImpl=mapbox
 expoRNMapboxMapsVersion=11.7.1
-MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiY2dvbWV6bWVuZGV6IiwiYSI6ImNtMndhbDAwZjAzMXQyanNkMHF2NjR3bmUifQ.f6E28fydW9bkhLBP7L_lCQ
+MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiY2hyaXNjb2RlciIsImEiOiJjbTNoYTIydHcwZTBvMm1xenh4dW94dG93In0.8EMOyKcu92ah1cH_FplG_w
diff --git a/apps/driver-app/app.json b/apps/driver-app/app.json
@@ -27,7 +27,8 @@
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/images/icon.png",
-        "backgroundColor": "#ffffff"
+        "backgroundColor": "#ffffff",
+        "usesCleartextTraffic": true
       },
       "permissions": [
         "ACCESS_FINE_LOCATION",

diff --git a/apps/driver-app/assets/images/adaptive-icon.png b/apps/driver-app/assets/images/adaptive-icon.png
diff --git a/apps/rider-app/android/app/src/main/AndroidManifest.xml b/apps/rider-app/android/app/src/main/AndroidManifest.xml
@@ -14,7 +14,9 @@
       <data android:scheme="https"/>
     </intent>
   </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme">
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme"
+    android:networkSecurityConfig="@xml/network_security_config"
+    android:usesCleartextTraffic="true">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>

diff --git a/apps/rider-app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/rider-app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/apps/rider-app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/apps/rider-app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/rider-app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/apps/rider-app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/apps/rider-app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/rider-app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/apps/rider-app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/apps/rider-app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/rider-app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/apps/rider-app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/apps/rider-app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/rider-app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/apps/rider-app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/apps/rider-app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/apps/rider-app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/apps/rider-app/android/app/src/main/res/xml/network_security_config.xml b/apps/rider-app/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">chriscoder.com</domain>
+    </domain-config>
+</network-security-config>
diff --git a/apps/rider-app/android/gradle.properties b/apps/rider-app/android/gradle.properties
@@ -60,4 +60,4 @@ expo.useLegacyPackaging=false
 
 expoRNMapboxMapsImpl=mapbox
 expoRNMapboxMapsVersion=11.7.1
-MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiY2dvbWV6bWVuZGV6IiwiYSI6ImNtMndhbDAwZjAzMXQyanNkMHF2NjR3bmUifQ.f6E28fydW9bkhLBP7L_lCQ
+MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiY2hyaXNjb2RlciIsImEiOiJjbTNoOHloejYwY3ZvMmlxb243cmJweXZpIn0.umZb2EzkDdtTChhm2sPcBw
diff --git a/apps/rider-app/app.json b/apps/rider-app/app.json
@@ -26,7 +26,8 @@
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/images/adaptive-icon.png",
-        "backgroundColor": "#ffffff"
+        "backgroundColor": "#ffffff",
+        "usesCleartextTraffic": true
       },
       "permissions": [
         "ACCESS_FINE_LOCATION",

diff --git a/apps/rider-app/assets/images/adaptive-icon.png b/apps/rider-app/assets/images/adaptive-icon.png
diff --git a/packages/morro-taxi-rn-components/lib/commonjs/components/permission-blocker/index.js b/packages/morro-taxi-rn-components/lib/commonjs/components/permission-blocker/index.js
diff --git a/packages/morro-taxi-rn-components/lib/commonjs/components/permission-blocker/index.js.map b/packages/morro-taxi-rn-components/lib/commonjs/components/permission-blocker/index.js.map