Various fixes

.github/workflows/test.yml

@@ -2,9 +2,9 @@ name: Tests
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main]
   push:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   test:
@@ -21,8 +21,8 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
-          cache: 'pnpm'
+          node-version: "20"
+          cache: "pnpm"
 
       - name: Authenticate NPM registry
         run: echo -e "//npm.pkg.github.com/:_authToken=${{ secrets.NPM_TOKEN }}\n@capawesome-team:registry=https://npm.pkg.github.com/" > ~/.npmrc
@@ -45,7 +45,8 @@ jobs:
       - name: Generate coverage
         run: pnpm run test:coverage
 
-      - name: Upload coverage
-        uses: codecov/codecov-action@v4
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: ZaparooProject/zaparoo-app

android/app/capacitor.build.gradle

@@ -18,8 +18,8 @@ dependencies {
     implementation project(':capacitor-preferences')
     implementation project(':capacitor-status-bar')
     implementation project(':capawesome-team-capacitor-nfc')
+    implementation project(':capawesome-capacitor-android-edge-to-edge-support')
     implementation project(':revenuecat-purchases-capacitor')
-    implementation project(':capacitor-plugin-safe-area')
 
 }
 

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

@@ -13,6 +13,13 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:background">@null</item>
+        <item name="android:fitsSystemWindows">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
 

android/capacitor.settings.gradle

@@ -29,8 +29,8 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/.pnpm/@c
 include ':capawesome-team-capacitor-nfc'
 project(':capawesome-team-capacitor-nfc').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome-team/capacitor-nfc/android')
 
+include ':capawesome-capacitor-android-edge-to-edge-support'
+project(':capawesome-capacitor-android-edge-to-edge-support').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome/capacitor-android-edge-to-edge-support/android')
+
 include ':revenuecat-purchases-capacitor'
 project(':revenuecat-purchases-capacitor').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@revenuecat/purchases-capacitor/android')
-
-include ':capacitor-plugin-safe-area'
-project(':capacitor-plugin-safe-area').projectDir = new File('../node_modules/.pnpm/[email protected]_@[email protected]/node_modules/capacitor-plugin-safe-area/android')

capacitor.config.ts

@@ -28,6 +28,9 @@ const config: CapacitorConfig = {
     FirebaseAuthentication: {
       skipNativeAuth: false,
       providers: ["google.com"]
+    },
+    EdgeToEdge: {
+      backgroundColor: '#111928'
     }
   }
 };

ios/App/Podfile

@@ -21,7 +21,6 @@ def capacitor_pods
   pod 'CapacitorStatusBar', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/status-bar'
   pod 'CapawesomeTeamCapacitorNfc', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome-team/capacitor-nfc'
   pod 'RevenuecatPurchasesCapacitor', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@revenuecat/purchases-capacitor'
-  pod 'CapacitorPluginSafeArea', :path => '../../node_modules/.pnpm/[email protected]_@[email protected]/node_modules/capacitor-plugin-safe-area'
 end
 
 target 'App' do

package.json

@@ -5,11 +5,11 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build && pnpm exec cap sync",
+    "build": "tsc --noEmit -p tsconfig.build.json && vite build && pnpm exec cap sync",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 3",
     "eslist": "pnpm run lint",
     "preview": "vite preview",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --noEmit -p tsconfig.test.json",
     "test": "vitest",
     "test:coverage": "vitest --coverage",
     "test:ui": "vitest --ui"
@@ -27,17 +27,18 @@
     "@capacitor/preferences": "^7.0.1",
     "@capacitor/status-bar": "^7.0.1",
     "@capawesome-team/capacitor-nfc": "7.2.0",
+    "@capawesome/capacitor-android-edge-to-edge-support": "^7.2.3",
     "@radix-ui/react-dialog": "^1.1.14",
     "@radix-ui/react-label": "^2.1.7",
     "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-tabs": "^1.1.13",
     "@revenuecat/purchases-capacitor": "^10.3.7",
     "@tailwindcss/postcss": "^4.1.11",
     "@tailwindcss/vite": "^4.1.11",
     "@tanstack/react-query": "^5.81.5",
     "@tanstack/react-router": "^1.125.6",
     "@uidotdev/usehooks": "^2.4.1",
     "axios": "1.10.0",
-    "capacitor-plugin-safe-area": "^4.0.0",
     "class-variance-authority": "^0.7.1",
     "classnames": "^2.5.1",
     "clsx": "^2.1.1",
@@ -57,7 +58,6 @@
     "use-debounce": "^10.0.5",
     "uuid": "^11.1.0",
     "vaul": "^1.1.2",
-    "websocket-heartbeat-js": "^1.1.3",
     "zustand": "^5.0.6"
   },
   "devDependencies": {
@@ -95,7 +95,7 @@
     "prettier": "^3.6.2",
     "prettier-plugin-tailwindcss": "^0.6.13",
     "tailwindcss": "^4.1.11",
-    "tdd-guard-vitest": "^0.1.3",
+    "tdd-guard-vitest": "^0.1.5",
     "tw-animate-css": "^1.3.5",
     "typescript": "^5.8.3",
     "vite": "7.0.3",