fix minor issues with android

teticio · Dec 2, 2024 · ee91d21 · ee91d21
1 parent 2f67cac
commit ee91d21
Show file tree

Hide file tree

Showing 4 changed files with 152 additions and 108 deletions.
diff --git a/app.json b/app.json
@@ -13,7 +13,7 @@
     "backgroundColor": "#000000",
     "android": {
       "package": "online.deejai.www",
-      "versionCode": 14,
+      "versionCode": 17,
       "permissions": [
         "INTERNET"
       ]
@@ -28,6 +28,18 @@
       "eas": {
         "projectId": "3027f7dd-4a29-4e62-a343-9f473cf94d36"
       }
-    }
+    },
+    "plugins": [
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "compileSdkVersion": 34,
+            "targetSdkVersion": 34,
+            "buildToolsVersion": "34.0.0"
+          }
+        }
+      ]
+    ]
   }
 }
diff --git a/package.json b/package.json
@@ -24,20 +24,23 @@
     "buffer": "^6.0.3",
     "electron-is-dev": "^2.0.0",
     "electron-squirrel-startup": "^1.0.0",
-    "expo": "~48.0.18",
+    "expo": "~48.0.21",
+    "expo-build-properties": "~0.6.0",
     "expo-crypto": "^12.6.0",
     "expo-dev-client": "~2.2.1",
     "expo-linking": "~4.0.1",
     "expo-random": "^13.4.0",
+    "expo-splash-screen": "~0.18.2",
     "expo-standard-web-crypto": "^1.7.0",
+    "expo-status-bar": "~1.4.4",
     "history": "^5.3.0",
     "localStorage": "^1.0.4",
     "react": "18.2.0",
     "react-app-rewired": "^2.2.1",
     "react-bootstrap": "^2.7.4",
     "react-dom": "18.2.0",
     "react-icons": "^4.9.0",
-    "react-native": "0.71.8",
+    "react-native": "0.71.14",
     "react-native-elements": "^3.4.3",
     "react-native-gesture-handler": "~2.10.2",
     "react-native-paper": "^5.8.0",
@@ -66,7 +69,7 @@
     "workbox-streams": "^6.6.0"
   },
   "scripts": {
-    "start": "react-app-rewired start",
+    "start": "expo start --dev-client",
     "build": "react-app-rewired build",
     "test": "react-app-rewired test",
     "eject": "react-scripts eject",

diff --git a/src/components/Platform.native.js b/src/components/Platform.native.js
@@ -41,7 +41,7 @@ export function Text(props) {
       {...props}
       style={{
         color: props.className === 'link' ? colors.accent :
-          props.className === 'text-muted' || props.className === 'link-muted' ? colors.disabled :
+          props.className === 'text-muted' || props.className === 'link-muted' ? colors.primary :
             colors.primary,
         ...props.style,
       }}
@@ -58,7 +58,7 @@ export function Small(props) {
       style={{
         fontSize: 12,
         color: props.className === 'link' ? colors.accent :
-          props.className === 'text-muted' || props.className === 'link-muted' ? colors.disabled :
+          props.className === 'text-muted' || props.className === 'link-muted' ? colors.primary :
             colors.primary,
         ...props.style,
       }}
@@ -180,7 +180,7 @@ export function FaIcon(props) {
         name={props.name}
         size={Number(props.size ? props.size : 15)}
         color={props.className === 'link' ? colors.accent :
-          props.className === 'text-muted' || props.className === 'link-muted' ? colors.disabled :
+          props.className === 'text-muted' || props.className === 'link-muted' ? colors.primary :
             colors.primary}
       ></FA_ICON >
     </Text>
@@ -232,7 +232,7 @@ export function MdIcon(props) {
         name={props.name}
         size={Number(props.size ? props.size : 15)}
         color={props.className === 'link' ? colors.accent :
-          props.className === 'text-muted' || props.className === 'link-muted' ? colors.disabled :
+          props.className === 'text-muted' || props.className === 'link-muted' ? colors.primary :
             colors.primary}
       ></MD_ICON >
     </Text>
@@ -428,7 +428,6 @@ export function IFrame(props) {
         ...props.style
       }}
       {...props}
-      androidLayerType='software'
       source={props.srcdoc ? {
         'html': props.srcdoc
       } : {