diff --git a/front/apps/mobile/app.config.ts b/front/app.config.ts similarity index 80% rename from front/apps/mobile/app.config.ts rename to front/app.config.ts index fa9c1206..dcbbdf0d 100644 --- a/front/apps/mobile/app.config.ts +++ b/front/app.config.ts @@ -18,19 +18,17 @@ * along with Kyoo. If not, see . */ -// import "ts-node/register"; // Add this to import TypeScript files import type { ExpoConfig } from "expo/config"; -import { withAndroidManifest } from "expo/config-plugins"; const IS_DEV = process.env.APP_VARIANT === "development"; // Defined outside the config because dark splashscreen needs to be platform specific. const splash = { - image: "./assets/icon.png", + image: "./public/icon-256x256.png", resizeMode: "contain", backgroundColor: "#eff1f5", dark: { - image: "./assets/icon.png", + image: "./public/icon-256x256.png", resizeMode: "contain", backgroundColor: "#1e1e2e", }, @@ -41,8 +39,11 @@ const config: ExpoConfig = { slug: "kyoo", scheme: "kyoo", version: "1.0.0", + sdkVersion: "52.0.0", + newArchEnabled: true, + platforms: ["ios", "android"], orientation: "default", - icon: "./assets/icon.png", + icon: "./public/icon-256x256.png", userInterfaceStyle: "automatic", splash, assetBundlePatterns: ["**/*"], @@ -52,7 +53,7 @@ const config: ExpoConfig = { android: { package: IS_DEV ? "dev.zoriya.kyoo.dev" : "dev.zoriya.kyoo", adaptiveIcon: { - foregroundImage: "./assets/icon.png", + foregroundImage: "./public/icon-256x256.png", backgroundColor: "#eff1f5", }, splash, @@ -64,12 +65,13 @@ const config: ExpoConfig = { runtimeVersion: { policy: "sdkVersion", }, - extra: { - eas: { - projectId: "55de6b52-c649-4a15-9a45-569ff5ed036c", - }, - }, + // extra: { + // eas: { + // projectId: "55de6b52-c649-4a15-9a45-569ff5ed036c", + // }, + // }, plugins: [ + "vxrn/expo-plugin", [ "expo-build-properties", { @@ -79,12 +81,12 @@ const config: ExpoConfig = { }, ], "expo-localization", - [ - "react-native-video", - { - enableNotificationControls: true, - }, - ], + // [ + // "react-native-video", + // { + // enableNotificationControls: true, + // }, + // ], ], }; diff --git a/front/app.json b/front/app.json deleted file mode 100644 index a44d4a05..00000000 --- a/front/app.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "expo": { - "name": "app", - "slug": "app", - "sdkVersion": "52.0.0", - "newArchEnabled": true, - "platforms": ["ios", "android"], - "plugins": ["vxrn/expo-plugin"], - "icon": "./public/icon-256x256.png", - "splash": { - "image": "./public/icon-256x256.png", - "resizeMode": "contain", - "backgroundColor": "#000000" - }, - "ios": {} - } -} diff --git a/front/bun.lock b/front/bun.lock index ff67608b..c2ff76b6 100755 --- a/front/bun.lock +++ b/front/bun.lock @@ -4,6 +4,8 @@ "": { "dependencies": { "expo": "~52.0.17", + "expo-build-properties": "^0.13.1", + "expo-localization": "^16.0.0", "one": "1.1.385", "react": "^18.3.1", "react-native": "0.76.4", @@ -14,7 +16,7 @@ }, "devDependencies": { "@biomejs/biome": "1.9.4", - "typescript": "^5.7.2", + "typescript": "5.7.2", "vite": "^6", }, }, @@ -700,6 +702,8 @@ "aggregate-error": ["aggregate-error@3.1.0", "", { "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" } }, "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="], + "ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="], + "anser": ["anser@1.4.10", "", {}, "sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww=="], "ansi-escapes": ["ansi-escapes@4.3.2", "", { "dependencies": { "type-fest": "^0.21.3" } }, "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="], @@ -988,6 +992,8 @@ "expo-asset": ["expo-asset@11.0.1", "", { "dependencies": { "@expo/image-utils": "^0.6.0", "expo-constants": "~17.0.0", "invariant": "^2.2.4", "md5-file": "^3.2.3" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-WatvD7JVC89EsllXFYcS/rji3ajVzE2B/USo0TqedsETixwyVCQfrrvCdCPQyuKghrxVNEj8bQ/Qbea/RZLYjg=="], + "expo-build-properties": ["expo-build-properties@0.13.1", "", { "dependencies": { "ajv": "^8.11.0", "semver": "^7.6.0" }, "peerDependencies": { "expo": "*" } }, "sha512-7tDlAM0PPkXC0B00C6/FG19sMzwxZNyiDfn22AWVbBxWxZE1/3RqxPgT3MlPVNfvy+wJw7jt/qbAb0S06wFYVg=="], + "expo-constants": ["expo-constants@17.0.3", "", { "dependencies": { "@expo/config": "~10.0.4", "@expo/env": "~0.4.0" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-lnbcX2sAu8SucHXEXxSkhiEpqH+jGrf+TF+MO6sHWIESjwOUVVYlT8qYdjR9xbxWmqFtrI4KV44FkeJf2DaFjQ=="], "expo-file-system": ["expo-file-system@18.0.6", "", { "dependencies": { "web-streams-polyfill": "^3.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-gGEwIJCXV3/wpIJ/wRyhmieLOSAY7HeFFjb+wEfHs04aE63JYR+rXXV4b7rBpEh1ZgNV9U91zfet/iQG7J8HBQ=="], @@ -998,6 +1004,8 @@ "expo-linking": ["expo-linking@6.3.1", "", { "dependencies": { "expo-constants": "~16.0.0", "invariant": "^2.2.4" } }, "sha512-xuZCntSBGWCD/95iZ+mTUGTwHdy8Sx+immCqbUBxdvZ2TN61P02kKg7SaLS8A4a/hLrSCwrg5tMMwu5wfKr35g=="], + "expo-localization": ["expo-localization@16.0.0", "", { "dependencies": { "rtl-detect": "^1.0.2" }, "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-PaWDUs6sNaEbFwQc6QKsTfYCg9GDo3bBl+cWnoG0G7pn1A623CcMwWyV7jD5jpqz0s1gHmwSRjR3vKOqhouRWg=="], + "expo-modules-autolinking": ["expo-modules-autolinking@2.0.4", "", { "dependencies": { "@expo/spawn-async": "^1.7.2", "chalk": "^4.1.0", "commander": "^7.2.0", "fast-glob": "^3.2.5", "find-up": "^5.0.0", "fs-extra": "^9.1.0", "require-from-string": "^2.0.2", "resolve-from": "^5.0.0" }, "bin": { "expo-modules-autolinking": "bin/expo-modules-autolinking.js" } }, "sha512-e0p+19NhmD50U7s7BV7kWIypWmTNC9n/VlJKlXS05hM/zX7pe6JKmXyb+BFnXJq3SLBalLCUY0tu2gEUF3XeVg=="], "expo-modules-core": ["expo-modules-core@2.1.2", "", { "dependencies": { "invariant": "^2.2.4" } }, "sha512-0OhMU5S8zf9c/CRh1MwiXfOInI9wzz6yiIh5RuR/9J7N6xHRum68hInsPbaSc1UQpo08ZZLM4MPsbpoNRUoqIg=="], @@ -1012,6 +1020,8 @@ "fast-loops": ["fast-loops@1.1.4", "", {}, "sha512-8dbd3XWoKCTms18ize6JmQF1SFnnfj5s0B7rRry22EofgMu7B6LKHVh+XfFqFGsqnbH54xgeO83PzpKI+ODhlg=="], + "fast-uri": ["fast-uri@3.0.4", "", {}, "sha512-G3iTQw1DizJQ5eEqj1CbFCWhq+pzum7qepkxU7rS1FGZDqjYKcrguo9XDRbV7EgPnn8CgaPigTq+NEjyioeYZQ=="], + "fastq": ["fastq@1.18.0", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw=="], "fb-watchman": ["fb-watchman@2.0.2", "", { "dependencies": { "bser": "2.1.1" } }, "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="], @@ -1232,6 +1242,8 @@ "json-parse-better-errors": ["json-parse-better-errors@1.0.2", "", {}, "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="], + "json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="], + "json5": ["json5@2.2.3", "", { "bin": { "json5": "lib/cli.js" } }, "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="], "jsonfile": ["jsonfile@6.1.0", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="], @@ -1610,6 +1622,8 @@ "rollup-plugin-node-externals": ["rollup-plugin-node-externals@7.1.3", "", { "peerDependencies": { "rollup": "^3.0.0 || ^4.0.0" } }, "sha512-RM+7tJAejAoRsCf93TptTSdqUhRA8S78DleihMiu54Kac+uLkd9VIegLPhGnaW3ehZTXh56+R301mFH6j2A7vw=="], + "rtl-detect": ["rtl-detect@1.1.2", "", {}, "sha512-PGMBq03+TTG/p/cRB7HCLKJ1MgDIi07+QU1faSjiYRfmY5UsAttV9Hs08jDAHVwcOwmVLcSJkpwyfXszVjWfIQ=="], + "run-parallel": ["run-parallel@1.2.0", "", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="], "safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="], diff --git a/front/package.json b/front/package.json index 4c02d710..e38ffa20 100644 --- a/front/package.json +++ b/front/package.json @@ -14,6 +14,8 @@ }, "dependencies": { "expo": "~52.0.17", + "expo-build-properties": "^0.13.1", + "expo-localization": "^16.0.0", "one": "1.1.385", "react": "^18.3.1", "react-native": "0.76.4",