Merge branch 'dev' of https://gitea.techmos.org/tech08mag/carry-your-live into dev

Reviewed-on: #13

.expo/dev/logs/export.log

@@ -0,0 +1,38 @@
+{"_e":"root:init","_t":1787490823136,"format":"v0-jsonl","version":"57.0.12"}
+{"_e":"env:mode","_t":1787490823267,"nodeEnv":"production","babelEnv":"production","mode":"production"}
+{"_e":"env:load","_t":1787490823269,"mode":"production","files":[],"env":{}}
+{"_e":"devserver:start","_t":1787490823283,"mode":"production","web":true,"baseUrl":"","asyncRoutes":false,"routerRoot":"../../../app","serverComponents":false,"serverActions":false,"serverRendering":false,"apiRoutes":false,"exporting":true}
+{"_e":"metro:config","_t":1787490823513,"serverRoot":"../../..","projectRoot":"../../..","exporting":true,"flags":{"autolinkingModuleResolution":false,"serverActions":false,"serverComponents":false,"reactCompiler":false,"optimizeGraph":false,"treeshaking":false,"logbox":false}}
+{"_e":"metro:instantiate","_t":1787490823624,"atlas":false,"workers":10,"host":null,"port":null}
+{"_e":"metro:bundling:started","_t":1787490824135,"id":"1","platform":"web","environment":null,"entry":"node_modules/expo-router/entry.js"}
+{"_e":"root:init","_t":1787490834893,"format":"v0-jsonl","version":"57.0.12"}
+{"_e":"env:mode","_t":1787490834983,"nodeEnv":"production","babelEnv":"production","mode":"production"}
+{"_e":"env:load","_t":1787490834985,"mode":"production","files":[],"env":{}}
+{"_e":"devserver:start","_t":1787490834998,"mode":"production","web":true,"baseUrl":"","asyncRoutes":false,"routerRoot":"../../../app","serverComponents":false,"serverActions":false,"serverRendering":false,"apiRoutes":false,"exporting":true}
+{"_e":"metro:config","_t":1787490835165,"serverRoot":"../../..","projectRoot":"../../..","exporting":true,"flags":{"autolinkingModuleResolution":false,"serverActions":false,"serverComponents":false,"reactCompiler":false,"optimizeGraph":false,"treeshaking":false,"logbox":false}}
+{"_e":"metro:instantiate","_t":1787490835236,"atlas":false,"workers":10,"host":null,"port":null}
+{"_e":"metro:bundling:started","_t":1787490835782,"id":"1","platform":"web","environment":null,"entry":"node_modules/expo-router/entry.js"}
+{"_e":"root:init","_t":1787490897618,"format":"v0-jsonl","version":"57.0.12"}
+{"_e":"env:mode","_t":1787490897716,"nodeEnv":"production","babelEnv":"production","mode":"production"}
+{"_e":"env:load","_t":1787490897718,"mode":"production","files":[],"env":{}}
+{"_e":"devserver:start","_t":1787490897732,"mode":"production","web":true,"baseUrl":"","asyncRoutes":false,"routerRoot":"../../../app","serverComponents":false,"serverActions":false,"serverRendering":false,"apiRoutes":false,"exporting":true}
+{"_e":"metro:config","_t":1787490897904,"serverRoot":"../../..","projectRoot":"../../..","exporting":true,"flags":{"autolinkingModuleResolution":false,"serverActions":false,"serverComponents":false,"reactCompiler":false,"optimizeGraph":false,"treeshaking":false,"logbox":false}}
+{"_e":"metro:instantiate","_t":1787490897978,"atlas":false,"workers":10,"host":null,"port":null}
+{"_e":"metro:bundling:started","_t":1787490898645,"id":"1","platform":"web","environment":null,"entry":"node_modules/expo-router/entry.js"}
+{"_e":"metro:bundling:done","_t":1787490904477,"id":"1","total":743,"ms":5831.675237}
+{"_e":"root:init","_t":1787490907952,"format":"v0-jsonl","version":"57.0.12"}
+{"_e":"env:mode","_t":1787490908055,"nodeEnv":"production","babelEnv":"production","mode":"production"}
+{"_e":"env:load","_t":1787490908056,"mode":"production","files":[],"env":{}}
+{"_e":"devserver:start","_t":1787490908069,"mode":"production","web":true,"baseUrl":"","asyncRoutes":false,"routerRoot":"../../../app","serverComponents":false,"serverActions":false,"serverRendering":false,"apiRoutes":false,"exporting":true}
+{"_e":"metro:config","_t":1787490908244,"serverRoot":"../../..","projectRoot":"../../..","exporting":true,"flags":{"autolinkingModuleResolution":false,"serverActions":false,"serverComponents":false,"reactCompiler":false,"optimizeGraph":false,"treeshaking":false,"logbox":false}}
+{"_e":"metro:instantiate","_t":1787490908323,"atlas":false,"workers":10,"host":null,"port":null}
+{"_e":"metro:bundling:started","_t":1787490908955,"id":"1","platform":"web","environment":null,"entry":"node_modules/expo-router/entry.js"}
+{"_e":"metro:bundling:done","_t":1787490909421,"id":"1","total":731,"ms":465.745099}
+{"_e":"root:init","_t":1787490971753,"format":"v0-jsonl","version":"57.0.12"}
+{"_e":"env:mode","_t":1787490972145,"nodeEnv":"production","babelEnv":"production","mode":"production"}
+{"_e":"env:load","_t":1787490972146,"mode":"production","files":[],"env":{}}
+{"_e":"devserver:start","_t":1787490972158,"mode":"production","web":true,"baseUrl":"","asyncRoutes":false,"routerRoot":"../../../app","serverComponents":false,"serverActions":false,"serverRendering":false,"apiRoutes":false,"exporting":true}
+{"_e":"metro:config","_t":1787490972351,"serverRoot":"../../..","projectRoot":"../../..","exporting":true,"flags":{"autolinkingModuleResolution":false,"serverActions":false,"serverComponents":false,"reactCompiler":false,"optimizeGraph":false,"treeshaking":false,"logbox":false}}
+{"_e":"metro:instantiate","_t":1787490972454,"atlas":false,"workers":10,"host":null,"port":null}
+{"_e":"metro:bundling:started","_t":1787490973074,"id":"1","platform":"web","environment":null,"entry":"node_modules/expo-router/entry.js"}
+{"_e":"metro:bundling:done","_t":1787490973517,"id":"1","total":743,"ms":441.956684}

.gitea/workflows/build-apk.yml

@@ -29,16 +29,25 @@ jobs:
 
       - name: Install Android SDK
         run: |
-          mkdir -p "$ANDROID_HOME/cmdline-tools"
+          if [ -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then
-          wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip
+            echo "Android SDK already present in cache"
-          unzip -q /tmp/cmdtools.zip -d "$ANDROID_HOME/cmdline-tools"
+          else
-          mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest"
+            rm -rf "$ANDROID_HOME/cmdline-tools"
-          yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null
+            mkdir -p "$ANDROID_HOME/cmdline-tools"
+            wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip
+            unzip -q /tmp/cmdtools.zip -d "$ANDROID_HOME/cmdline-tools"
+            mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest"
+          fi
+          printf 'y\n' | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null
           "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
             "platform-tools" \
             "platforms;android-35" \
+            "platforms;android-36" \
             "build-tools;35.0.0" \
+            "build-tools;36.0.0" \
             "ndk;27.1.12297006"
+          mkdir -p carry-your-live/android/app
+          echo "sdk.dir=$ANDROID_HOME" > carry-your-live/android/app/local.properties
 
       - name: Install JS dependencies
         working-directory: carry-your-live
@@ -46,6 +55,7 @@ jobs:
 
       - name: Generate debug keystore (signs the release APK)
         run: |
+          mkdir -p carry-your-live/android/app
           keytool -genkeypair -v \
             -keystore carry-your-live/android/app/debug.keystore \
             -alias androiddebugkey -storepass android -keypass android \
@@ -53,11 +63,12 @@ jobs:
             -dname "CN=Android Debug,O=Android,C=US"
 
       - name: Build release APK
-        working-directory: carry-your-live/android
+        run: |
-        run: ./gradlew assembleRelease
+          cd carry-your-live/android
+          ./gradlew assembleRelease
 
       - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
           name: carry-your-live-release
-          path: carry-your-live/android/app/build/outputs/apk/release/*.apk
+          path: carry-your-live/android/app/build/outputs/release/app-release.apk

.gitea/workflows/build-deb.yml

@@ -0,0 +1,36 @@
+name: Build Desktop (deb)
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install JS dependencies
+        working-directory: carry-your-live
+        run: npm ci
+
+      - name: Export web bundle
+        working-directory: carry-your-live
+        run: npx expo export --platform web
+
+      - name: Build deb package
+        working-directory: carry-your-live
+        run: npx electron-builder --linux deb --config electron-builder.config.js
+
+      - name: Upload deb
+        uses: actions/upload-artifact@v4
+        with:
+          name: carry-your-live-desktop-deb
+          path: carry-your-live/desktop-build/*.deb

.gitea/workflows/release.yml

@@ -11,7 +11,6 @@ permissions:
 jobs:
   release:
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' && startsWith(github.event.head_commit.message, 'Merge pull request')
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules/
+dist/

ROADMAP.md

@@ -0,0 +1,157 @@
+# Carry Your Live — Roadmap & Feature List
+
+Status as of Aug 2026. Based on code audit of frontend (`carry-your-live/`), backend (`backend/`), and `API_SPEC.md`.
+
+## Legend
+- ✅ Implemented
+- 🟡 Partial / stubbed
+- ❌ Missing
+
+---
+
+## Current State (Feature List)
+
+### Core Task Management
+- ✅ Tasks CRUD with title, description, category, priority, due date/time, all-day
+- ✅ Nested subtasks (sub-subtask trees), convert task↔subtask, re-parent, reorder
+- ✅ Categories/tags with colors (task color derives from category)
+- ✅ Priorities (None → Critical) with badges
+- ✅ Repeating/recurring tasks: repeat profiles, series IDs, this/future/all delete scopes, undo-complete
+- ✅ Overdue / due-today highlighting
+
+### Screens & Navigation
+- ✅ Tabs: Todo, Calendar, Stats, Settings (+ Add Task, Day View, Task Detail, Subtask Detail stack screens)
+- ✅ Category filter chips, swipe actions, long-press multi-select, drag-to-reorder
+- ✅ Quick-add bar, calendar date strip, analog clock widget
+- ✅ Stats screen (client-side `useStats`)
+
+### Sync & Accounts
+- ✅ Offline-first WatermelonDB (schema v21) + full sync engine (tombstones, LWW)
+- ✅ Backend: Express + Drizzle + Postgres — auth (register/login/me/forgot/reset), sync pull/push, tasks, subtasks, categories, repeat profiles, user settings, user search
+- ✅ Login/register/sign-out UI (`SyncModal`)
+
+### Social
+- ✅ Friends: request/accept/decline/remove, user search, full backend routes
+- ✅ Assignee field on tasks/subtasks (schema v7)
+
+### Settings (wired up)
+- ✅ Default tag, sort order, show-completed, calendar days-ahead, accent color picker, server URL override
+
+---
+
+## Gaps (what's broken or stubbed)
+
+| Item | Status | Where |
+|---|---|---|
+| Light mode / theme toggle | ❌ Dark-only, hard-coded palette; backend has `darkMode` column unused | `src/theme.tsx:92` |
+| Notifications toggle | 🟡 Stored but never read; toggling off doesn't disable reminders | `settings.tsx:148`, `src/services/notifications.ts` |
+| Global reminder preference | 🟡 Stored but never applied when scheduling | `src/theme.tsx:180` |
+| Forgot/reset password UI | 🟡 Backend done, no client UI | `backend/src/routes/auth.ts:149` |
+| Pull-to-refresh | 🟡 Reloads local queries only, doesn't trigger server sync | `TaskList.tsx:129` |
+| Client settings sync | 🟡 All settings AsyncStorage-only; `PATCH /users/me/settings` never called | — |
+| Reminder enum mismatch | 🟡 Spec uses minutes (`'15'`,`'30'`…), client uses `'5m'`,`'1h'` style | `API_SPEC.md` vs client |
+| Webhooks / rate-limit headers | 🟡 In spec, not built | `API_SPEC.md` |
+
+---
+
+## Roadmap (by release)
+
+> Last released: **v1.0.0** (2026-08-05). The `Unreleased` changelog section already contains the friends feature, assignee field, and various fixes.
+
+---
+
+### v1.1.0 — Friends & Assignees (staged; ship current `Unreleased` + stub fixes)
+
+Ships what's already merged plus fixes to half-wired features so nothing in the release is a dead toggle.
+
+- 📦 Release existing `Unreleased` changes: friends feature, assignee field (schema v7), QuickAddBar on overview, sync fixes for repeat/reminders
+- Fix notifications toggle so it's actually respected (`src/services/notifications.ts`); wire up `rescheduleAllReminders()`
+- Apply global reminder preference when scheduling task reminders
+- Make pull-to-refresh run a real server sync cycle (`TaskList.tsx:129`)
+- Add forgot/reset password UI (backend routes already exist: `backend/src/routes/auth.ts:149`)
+- Unify reminder offset enums between client, `API_SPEC.md`, and backend
+
+**Theme:** "Everything you can toggle does something."
+
+---
+
+### v1.2.0 — Theming & Findability
+
+- Light mode + follow-system-theme option; theme-mode setting synced via `/users/me/settings` (backend `darkMode` column already exists)
+- Sync all client settings to `PATCH /users/me/settings` instead of AsyncStorage-only
+- Task search: filter-by-text in list + global search screen
+- Friend-request badges/indicators in main UI (polling-based)
+- Resolve API error-format drift between spec and auth routes
+
+**Theme:** "Look good, find anything."
+
+---
+
+### v1.3.0 — Stats & Insights
+
+- Persisted stats snapshots for history/trends over time (current stats are per-local-data only)
+- Productivity trends: completion rates by category/priority, streaks
+- Export stats (CSV/image share)
+
+**Theme:** "Show me how I'm doing."
+
+---
+
+### v1.4.0 — Quick Capture & Calendar UX
+
+Client-side only; no backend changes required.
+
+- Natural language quick-add ("pay rent tomorrow 5pm !finance" → parsed fields) in QuickAddBar
+- Snooze/postpone gesture on overdue tasks
+- Drag-and-drop rescheduling between days in calendar
+- Month grid view alongside the date strip
+- "Today at a glance" dashboard combining overdue, today, and stats
+- Time estimates + daily planned-vs-free-time indicator
+
+**Theme:** "Capture in seconds."
+
+---
+
+### v1.5.0 — Power Tools & Personalization
+
+- Task templates / saved routines (builds on repeat profiles)
+- Soft-archive with search (archive instead of delete)
+- Full local JSON export/import backup
+- Attachments/links/photos on tasks
+- Location-based reminders (expo-location)
+- Markdown support in descriptions
+- Deep links (`carryyourlive://task/<id>`) for shortcuts and notifications
+- Undo toast for all destructive actions (extend existing complete-undo)
+- Biometric lock / privacy blur on app switch
+- Haptics settings + reduced-motion mode
+- Custom app icon / theme presets beyond accent color
+- Onboarding flow + sample data seeding
+- Android home-screen widget / week agenda widget
+- import calendar from other apps
+
+**Theme:** "Make it yours, make it fast."
+
+---
+
+### v2.0.0 — Collaboration
+
+Breaking-ish social features; requires backend schema changes.
+
+- Real task assignment delivery: shared-list or assignment mechanism (rows are currently strictly user-scoped — assigneeId goes nowhere)
+- Shared lists / collaborative categories with permissions
+- Server push notifications (FCM/APNs): cross-device reminders, friend requests, assignments
+- Comments/activity feed on assigned tasks
+- Shared category templates ("family shopping list")
+- Reactions/acknowledgments on assignments
+
+**Theme:** "Carry it together."
+
+---
+
+### v2.1.0 — Platform & Ops
+
+- Webhooks (`POST /webhooks/sync`) + documented rate limiting per `API_SPEC.md`
+- Account management: email field, account deletion
+- Release hardening: OTA update flow validation, EAS builds for iOS/Android
+
+**Theme:** "Production-grade."

backend/package-lock.json

@@ -8,6 +8,7 @@
       "name": "carry-your-live-backend",
       "version": "1.0.0",
       "dependencies": {
+        "@types/node-fetch": "^2.6.13",
         "bcryptjs": "^3.0.3",
         "cors": "^2.8.5",
         "dotenv": "^16.4.5",
@@ -15,6 +16,7 @@
         "express": "^4.21.0",
         "express-rate-limit": "^8.6.2",
         "jsonwebtoken": "^9.0.2",
+        "node-fetch": "^3.3.2",
         "pg": "^8.13.0",
         "zod": "^3.23.8"
       },
@@ -1015,12 +1017,21 @@
       "version": "22.20.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.1.tgz",
       "integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
       }
     },
+    "node_modules/@types/node-fetch": {
+      "version": "2.6.13",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.13.tgz",
+      "integrity": "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^4.0.4"
+      }
+    },
     "node_modules/@types/pg": {
       "version": "8.20.4",
       "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.20.4.tgz",
@@ -1099,6 +1110,12 @@
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "license": "MIT"
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
     "node_modules/bcryptjs": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-3.0.3.tgz",
@@ -1198,6 +1215,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -1251,6 +1280,15 @@
         "url": "https://opencollective.com/express"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/debug": {
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
@@ -1268,6 +1306,15 @@
         }
       }
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -1504,6 +1551,21 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
@@ -1651,6 +1713,29 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
     "node_modules/finalhandler": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
@@ -1684,6 +1769,34 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/form-data": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
+      "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.4",
+        "mime-types": "^2.1.35"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "license": "MIT",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -1800,6 +1913,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/hasown": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
@@ -2037,6 +2165,44 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "license": "MIT",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -2977,7 +3143,6 @@
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/unpipe": {
@@ -3007,6 +3172,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

backend/package.json

@@ -13,6 +13,7 @@
     "db:studio": "drizzle-kit studio"
   },
   "dependencies": {
+    "@types/node-fetch": "^2.6.13",
     "bcryptjs": "^3.0.3",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
@@ -20,6 +21,7 @@
     "express": "^4.21.0",
     "express-rate-limit": "^8.6.2",
     "jsonwebtoken": "^9.0.2",
+    "node-fetch": "^3.3.2",
     "pg": "^8.13.0",
     "zod": "^3.23.8"
   },

backend/src/db/schema.ts

@@ -10,6 +10,8 @@ export const users = pgTable('users', {
   passwordHash: text('password_hash').notNull(),
   resetToken: text('reset_token'),
   resetTokenExpiry: bigint('reset_token_expiry', { mode: 'number' }),
+  expoPushToken: text('expo_push_token'),
+  pushTokenUpdatedAt: bigint('push_token_updated_at', { mode: 'number' }),
   createdAt: bigint('created_at', { mode: 'number' }).notNull().default(sql`EXTRACT(EPOCH FROM NOW()) * 1000`),
 });
 
@@ -86,6 +88,7 @@ export const subtasks = pgTable('subtasks', {
   taskId: text('task_id').notNull().references(() => tasks.id, { onDelete: 'cascade' }),
   parentSubtaskId: text('parent_subtask_id').references((): AnyPgColumn => subtasks.id, { onDelete: 'cascade' }),
   categoryId: text('category_id').references(() => categories.id, { onDelete: 'set null' }),
+  tags: text('tags').notNull().default(''),
   title: text('title').notNull(),
   description: text('description').notNull().default(''),
   priority: text('priority', { enum: ['none', 'low', 'medium', 'high', 'critical'] }).notNull().default('none'),

backend/src/index.ts

@@ -9,6 +9,7 @@ import userRoutes from './routes/users';
 import friendRoutes from './routes/friends';
 import repeatProfileRoutes from './routes/repeatProfiles';
 import syncRoutes from './routes/sync';
+import pushNotificationRoutes from './routes/pushNotifications';
 import { errorHandler, notFoundHandler } from './middleware/errorHandler';
 
 const app = express();
@@ -34,6 +35,7 @@ app.use('/api/users', userRoutes);
 app.use('/api/repeat-profiles', repeatProfileRoutes);
 app.use('/api/sync', syncRoutes);
 app.use('/api/friends', friendRoutes);
+app.use('/api/push', pushNotificationRoutes);
 
 // 404 handler
 app.use(notFoundHandler);

backend/src/routes/pushNotifications.ts

@@ -0,0 +1,97 @@
+import { Router, Request, Response } from 'express';
+import { asyncHandler } from '../utils/asyncHandler';
+import { db } from '../db';
+import { users } from '../db/schema';
+import { eq } from 'drizzle-orm';
+import { AppError } from '../middleware/errorHandler';
+import { z } from 'zod';
+import { sendPushNotification, isExpoPushToken, createTaskReminderPayload } from '../services/pushNotifications';
+
+const router = Router();
+
+const registerPushTokenSchema = z.object({
+  pushToken: z.string().min(1),
+});
+
+router.post('/push-token', asyncHandler(async (req: Request, res: Response) => {
+  if (!req.user) {
+    throw new AppError('UNAUTHORIZED', 'Authentication required', 401);
+  }
+
+  const data = registerPushTokenSchema.parse(req.body);
+
+  if (!isExpoPushToken(data.pushToken)) {
+    throw new AppError('INVALID_PUSH_TOKEN', 'Invalid Expo push token format', 400);
+  }
+
+  await db
+    .update(users)
+    .set({
+      expoPushToken: data.pushToken,
+      pushTokenUpdatedAt: Date.now(),
+    })
+    .where(eq(users.id, req.user.userId));
+
+  res.json({ success: true });
+}));
+
+router.delete('/push-token', asyncHandler(async (req: Request, res: Response) => {
+  if (!req.user) {
+    throw new AppError('UNAUTHORIZED', 'Authentication required', 401);
+  }
+
+  await db
+    .update(users)
+    .set({
+      expoPushToken: null,
+      pushTokenUpdatedAt: Date.now(),
+    })
+    .where(eq(users.id, req.user.userId));
+
+  res.json({ success: true });
+}));
+
+router.post('/test', asyncHandler(async (req: Request, res: Response) => {
+  if (!req.user) {
+    throw new AppError('UNAUTHORIZED', 'Authentication required', 401);
+  }
+
+  const user = await db.select().from(users).where(eq(users.id, req.user.userId)).limit(1);
+  if (user.length === 0 || !user[0].expoPushToken) {
+    throw new AppError('NO_PUSH_TOKEN', 'No push token registered', 400);
+  }
+
+  const ticket = await sendPushNotification({
+    to: user[0].expoPushToken!,
+    title: 'Test Notification',
+    body: 'Push notifications are working!',
+    data: { type: 'test' },
+    sound: 'default',
+  });
+
+  res.json({ success: true, ticket });
+}));
+
+router.post('/send-reminder', asyncHandler(async (req: Request, res: Response) => {
+  if (!req.user) {
+    throw new AppError('UNAUTHORIZED', 'Authentication required', 401);
+  }
+
+  const { taskId, taskTitle, dueTime, repeat } = req.body;
+  if (!taskId || !taskTitle || !dueTime) {
+    throw new AppError('INVALID_PAYLOAD', 'Missing required fields', 400);
+  }
+
+  const user = await db.select().from(users).where(eq(users.id, req.user.userId)).limit(1);
+  if (user.length === 0 || !user[0].expoPushToken) {
+    throw new AppError('NO_PUSH_TOKEN', 'No push token registered', 400);
+  }
+
+  const ticket = await sendPushNotification(
+    createTaskReminderPayload(user[0].expoPushToken!, taskTitle, dueTime, taskId, repeat)
+  );
+
+  res.json({ success: true, ticket });
+}));
+
+export default router;

backend/src/routes/subtasks.ts

@@ -83,6 +83,7 @@ router.post('/task/:taskId', asyncHandler(async (req: Request, res: Response) =>
     taskId: req.params.taskId,
     parentSubtaskId,
     categoryId: data.categoryId ?? null,
+    tags: data.tags ?? '',
     title: data.title,
     description: data.description ?? '',
     priority: data.priority ?? 'none',

backend/src/routes/sync.ts

@@ -17,60 +17,47 @@ router.get('/', asyncHandler(async (req: Request, res: Response) => {
 
   const sinceDate = since;
 
-  // Fetch categories changed since timestamp
+  // Fetch all changed entities in parallel
-  const changedCategories = await db
+  const [changedCategories, changedTasks, changedSubtasks, changedRepeatProfiles, changedFriendships, changedTombstones] = await Promise.all([
-    .select()
+    db
-    .from(categories)
+      .select()
-    .where(and(eq(categories.userId, userId), gte(categories.updatedAt, sinceDate)))
+      .from(categories)
-    .orderBy(asc(categories.updatedAt));
+      .where(and(eq(categories.userId, userId), gte(categories.updatedAt, sinceDate)))
+      .orderBy(asc(categories.updatedAt)),
 
-  // Fetch tasks changed since timestamp
+    db
-  const changedTasks = await db
+      .select()
-    .select()
+      .from(tasks)
-    .from(tasks)
+      .where(and(eq(tasks.userId, userId), gte(tasks.updatedAt, sinceDate)))
-    .where(and(eq(tasks.userId, userId), gte(tasks.updatedAt, sinceDate)))
+      .orderBy(asc(tasks.updatedAt)),
-    .orderBy(asc(tasks.updatedAt));
 
-  // Fetch subtasks changed since timestamp
+    db
-  let changedSubtasks: any[] = [];
-  if (changedTasks.length > 0) {
-    changedSubtasks = await db
       .select()
       .from(subtasks)
       .where(and(eq(subtasks.userId, userId), gte(subtasks.updatedAt, sinceDate)))
-      .orderBy(asc(subtasks.updatedAt));
+      .orderBy(asc(subtasks.updatedAt)),
-  } else {
+
-    // Also fetch subtasks for tasks that might have been deleted
+    db
-    changedSubtasks = await db
       .select()
-      .from(subtasks)
+      .from(repeatProfiles)
-      .where(and(eq(subtasks.userId, userId), gte(subtasks.updatedAt, sinceDate)))
+      .where(and(eq(repeatProfiles.userId, userId), gte(repeatProfiles.updatedAt, sinceDate)))
-      .orderBy(asc(subtasks.updatedAt));
+      .orderBy(asc(repeatProfiles.updatedAt)),
-  }
 
-  // Fetch repeat profiles changed since timestamp
+    db
-  const changedRepeatProfiles = await db
+      .select()
-    .select()
+      .from(friendships)
-    .from(repeatProfiles)
+      .where(and(
-    .where(and(eq(repeatProfiles.userId, userId), gte(repeatProfiles.updatedAt, sinceDate)))
+        or(eq(friendships.userId, userId), eq(friendships.friendId, userId)),
-    .orderBy(asc(repeatProfiles.updatedAt));
+        gte(friendships.updatedAt, sinceDate)
+      ))
+      .orderBy(asc(friendships.updatedAt)),
 
-  // Fetch friendships changed since timestamp
+    db
-  const changedFriendships = await db
+      .select()
-    .select()
+      .from(tombstones)
-    .from(friendships)
+      .where(and(eq(tombstones.userId, userId), gte(tombstones.updatedAt, sinceDate)))
-    .where(and(
+      .orderBy(asc(tombstones.updatedAt)),
-      or(eq(friendships.userId, userId), eq(friendships.friendId, userId)),
+  ]);
-      gte(friendships.updatedAt, sinceDate)
-    ))
-    .orderBy(asc(friendships.updatedAt));
-
-  // Fetch tombstones (deletions) changed since timestamp
-  const changedTombstones = await db
-    .select()
-    .from(tombstones)
-    .where(and(eq(tombstones.userId, userId), gte(tombstones.updatedAt, sinceDate)))
-    .orderBy(asc(tombstones.updatedAt));
 
   const timestamp = Date.now();
 
@@ -292,6 +279,7 @@ router.post('/push', asyncHandler(async (req: Request, res: Response) => {
                 taskId: sub.taskId,
                 parentSubtaskId: sub.parentSubtaskId ?? null,
                 categoryId: sub.categoryId ?? null,
+                tags: sub.tags ?? '',
                 title: sub.title,
                 description: sub.description ?? '',
                 priority: sub.priority ?? 'none',

backend/src/routes/tasks.ts

@@ -161,6 +161,7 @@ router.post('/', asyncHandler(async (req: Request, res: Response) => {
       taskId,
       title: st.title,
       categoryId: (st as any).categoryId ?? null,
+      tags: (st as any).tags ?? '',
       completed: false,
       order: index,
       createdAt: now,

backend/src/services/pushNotifications.ts

@@ -0,0 +1,153 @@
+import fetch from 'node-fetch';
+
+const EXPO_PUSH_URL = 'https://exp.host/--/api/v2/push/send';
+
+export interface PushNotificationPayload {
+  to: string;
+  title: string;
+  body: string;
+  data?: Record<string, any>;
+  sound?: string;
+  badge?: number;
+  priority?: 'default' | 'normal' | 'high';
+  channelId?: string;
+}
+
+export interface PushTicket {
+  id: string;
+  status: 'ok' | 'error';
+  message?: string;
+  details?: {
+    error?: string;
+  };
+}
+
+export interface PushReceipt {
+  status: 'ok' | 'error';
+  message?: string;
+  details?: {
+    error?: string;
+  };
+}
+
+interface ExpoPushResponse {
+  data?: PushTicket[] | Record<string, PushReceipt>;
+}
+
+export async function sendPushNotification(payload: PushNotificationPayload): Promise<PushTicket> {
+  const response = await fetch(EXPO_PUSH_URL, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      Accept: 'application/json',
+    },
+    body: JSON.stringify(payload),
+  });
+
+  const result = (await response.json()) as ExpoPushResponse;
+  if (result.data && Array.isArray(result.data)) {
+    return result.data[0] ?? { id: '', status: 'error', message: 'No ticket returned' };
+  }
+  return { id: '', status: 'error', message: 'No ticket returned' };
+}
+
+export async function sendPushNotifications(payloads: PushNotificationPayload[]): Promise<PushTicket[]> {
+  const chunks: PushNotificationPayload[][] = [];
+  for (let i = 0; i < payloads.length; i += 100) {
+    chunks.push(payloads.slice(i, i + 100));
+  }
+
+  const tickets: PushTicket[] = [];
+  for (const chunk of chunks) {
+    const response = await fetch(EXPO_PUSH_URL, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+      body: JSON.stringify(chunk),
+    });
+    const result = (await response.json()) as ExpoPushResponse;
+    if (result.data && Array.isArray(result.data)) {
+      tickets.push(...result.data);
+    }
+  }
+  return tickets;
+}
+
+export async function getPushReceipts(ticketIds: string[]): Promise<PushReceipt[]> {
+  if (ticketIds.length === 0) return [];
+
+  const response = await fetch(`${EXPO_PUSH_URL}/receipts`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      Accept: 'application/json',
+    },
+    body: JSON.stringify({ ids: ticketIds }),
+  });
+
+  const result = (await response.json()) as ExpoPushResponse;
+  const receipts: PushReceipt[] = [];
+  if (result.data && !Array.isArray(result.data)) {
+    for (const id of ticketIds) {
+      receipts.push(result.data[id] ?? { status: 'error', message: 'No receipt found' });
+    }
+  }
+  return receipts;
+}
+
+export function isExpoPushToken(token: string): boolean {
+  return token.startsWith('ExponentPushToken[') || token.startsWith('ExpoPushToken[');
+}
+
+export function createTaskReminderPayload(
+  pushToken: string,
+  taskTitle: string,
+  dueTime: string,
+  taskId: string,
+  repeat?: string
+): PushNotificationPayload {
+  return {
+    to: pushToken,
+    title: taskTitle,
+    body: `Due ${dueTime}${repeat && repeat !== 'none' ? ' · repeating' : ''}`,
+    data: { type: 'task_reminder', taskId },
+    sound: 'default',
+    priority: 'high',
+    channelId: 'task-reminders',
+  };
+}
+
+export function createFriendRequestPayload(
+  pushToken: string,
+  fromUsername: string,
+  friendshipId: string
+): PushNotificationPayload {
+  return {
+    to: pushToken,
+    title: 'New Friend Request',
+    body: `${fromUsername} wants to be your friend`,
+    data: { type: 'friend_request', friendshipId },
+    sound: 'default',
+    priority: 'high',
+    channelId: 'friend-requests',
+  };
+}
+
+export function createTaskAssignmentPayload(
+  pushToken: string,
+  taskTitle: string,
+  fromUsername: string,
+  taskId: string
+): PushNotificationPayload {
+  return {
+    to: pushToken,
+    title: 'Task Assigned',
+    body: `${fromUsername} assigned you "${taskTitle}"`,
+    data: { type: 'task_assignment', taskId },
+    sound: 'default',
+    priority: 'high',
+    channelId: 'task-assignments',
+  };
+}

backend/src/utils/validation.ts

@@ -75,6 +75,7 @@ export const subtaskCreateSchema = z.object({
   title: z.string().min(1).max(100),
   description: z.string().max(1000).optional(),
   categoryId: z.string().max(100).nullable().optional().transform((v) => (v === '' ? null : v)),
+  tags: z.string().max(500).optional(),
   priority: z.enum(['none', 'low', 'medium', 'high', 'critical']).optional(),
   dueDate: z.number().int().min(0).optional(),
   dueTime: z.string().regex(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().or(z.literal('')).transform(v => v ?? ''),
@@ -95,6 +96,7 @@ export const subtaskUpdateSchema = z.object({
   title: z.string().min(1).max(100).optional(),
   description: z.string().max(1000).optional(),
   categoryId: z.string().max(100).nullable().optional().transform((v) => (v === '' ? null : v)),
+  tags: z.string().max(500).optional(),
   priority: z.enum(['none', 'low', 'medium', 'high', 'critical']).optional(),
   completed: z.boolean().optional(),
   dueDate: z.number().int().min(0).optional(),

carry-your-live/.gitignore

@@ -7,6 +7,9 @@ node_modules/
 .expo/
 dist/
 web-build/
+
+# Electron
+desktop-build/
 expo-env.d.ts
 
 # Native

carry-your-live/app/(tabs)/_layout.tsx

@@ -1,6 +1,7 @@
 import { Tabs } from 'expo-router';
 import React from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
 import { TabBarIcon } from '@/components/TabBarIcon';
 import { useSettings } from '@/theme';
 import { setLastVisitedTab } from '@/utils/tabHistory';
@@ -13,19 +14,19 @@ export default function TabLayout() {
     <Tabs
       screenOptions={{
         tabBarActiveTintColor: theme.accent,
-        tabBarInactiveTintColor: theme.text,
+        tabBarInactiveTintColor: theme.textSecondary,
         tabBarStyle: {
           backgroundColor: theme.tabBarBg,
-          borderTopWidth: 1,
+          borderTopWidth: 0,
-          borderTopColor: theme.border,
+          height: 84 + insets.bottom,
-          height: 68 + insets.bottom,
           paddingBottom: insets.bottom,
-          paddingTop: 6,
+          paddingTop: 12,
-          elevation: 8,
+          paddingHorizontal: 16,
+          elevation: 0,
           shadowColor: '#000',
-          shadowOffset: { width: 0, height: -2 },
+          shadowOffset: { width: 0, height: -4 },
-          shadowOpacity: 0.08,
+          shadowOpacity: 0.12,
-          shadowRadius: 8,
+          shadowRadius: 20,
         },
         tabBarItemStyle: {
           paddingVertical: 0,
@@ -33,10 +34,54 @@ export default function TabLayout() {
         tabBarLabelStyle: {
           fontSize: 11,
           fontWeight: '700',
+          marginTop: 4,
         },
         headerShown: false,
         sceneStyle: { backgroundColor: theme.background },
       }}
+      tabBar={(props) => {
+        return (
+          <View
+          style={[
+            styles.tabBarContainer,
+            {
+              backgroundColor: theme.tabBarBg,
+              paddingBottom: Math.max(props.insets.bottom, 8),
+              shadowColor: '#000',
+              shadowOffset: { width: 0, height: -4 },
+              shadowOpacity: 0.12,
+              shadowRadius: 20,
+              elevation: 8,
+            },
+          ]}
+          >
+            {props.navigation.getState().routes.map((route) => {
+              const focused = props.navigation.getState().index === props.navigation.getState().routes.indexOf(route);
+              return (
+                <TouchableOpacity
+                  key={route.name}
+                  style={[
+                    styles.tabItem,
+                    focused && styles.tabItemActive,
+                    { backgroundColor: focused ? theme.accentSoft : 'transparent' },
+                  ]}
+                  onPress={() => props.navigation.navigate(route.name as never)}
+                  accessibilityRole="button"
+                  accessibilityLabel={route.name === 'index' ? 'ToDo' : route.name.charAt(0).toUpperCase() + route.name.slice(1)}
+                  accessibilityState={{ selected: focused }}
+                >
+                  <TabBarIcon
+                    name={route.name === 'index' ? 'checklist' : route.name === 'calendar' ? 'calendar' : route.name === 'stats' ? 'stats' : 'gear'}
+                    focused={focused}
+                    color={focused ? theme.accent : theme.textSecondary}
+                    size={24}
+                  />
+                </TouchableOpacity>
+              );
+            })}
+          </View>
+        );
+      }}
       screenListeners={({ route }) => ({
         focus: () => {
           if (route.name !== 'settings') {
@@ -45,42 +90,35 @@ export default function TabLayout() {
         },
       })}
     >
-      <Tabs.Screen
+      <Tabs.Screen name="index" />
-        name="index"
+      <Tabs.Screen name="calendar" />
-        options={{
+      <Tabs.Screen name="stats" />
-          title: 'ToDo',
+      <Tabs.Screen name="settings" />
-          tabBarIcon: ({ color, focused }) => (
-            <TabBarIcon name="checklist" focused={focused} color={color} size={26} />
-          ),
-        }}
-      />
-      <Tabs.Screen
-        name="calendar"
-        options={{
-          title: 'Calendar',
-          tabBarIcon: ({ color, focused }) => (
-            <TabBarIcon name="calendar" focused={focused} color={color} size={26} />
-          ),
-        }}
-      />
-      <Tabs.Screen
-        name="stats"
-        options={{
-          title: 'Stats',
-          tabBarIcon: ({ color, focused }) => (
-            <TabBarIcon name="stats" focused={focused} color={color} size={26} />
-          ),
-        }}
-      />
-      <Tabs.Screen
-        name="settings"
-        options={{
-          title: 'Settings',
-          tabBarIcon: ({ color, focused }) => (
-            <TabBarIcon name="gear" focused={focused} color={color} size={26} />
-          ),
-        }}
-      />
     </Tabs>
   );
 }
+
+const styles = StyleSheet.create({
+  tabBarContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-around',
+    paddingTop: 10,
+    paddingHorizontal: 16,
+  },
+  tabItem: {
+    flex: 1,
+    alignItems: 'center',
+    paddingVertical: 8,
+    paddingHorizontal: 8,
+    borderRadius: 16,
+    minWidth: 70,
+  },
+  tabItemActive: {
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.1,
+    shadowRadius: 8,
+    elevation: 4,
+  },
+});

carry-your-live/app/(tabs)/calendar.tsx

@@ -1,5 +1,5 @@
-import React, { useMemo, useRef, useState, useCallback } from 'react';
+import React, { useMemo, useRef, useState, useCallback, useEffect } from 'react';
-import { View, Text, StyleSheet, SafeAreaView, ScrollView, TouchableOpacity, Animated, Dimensions, BackHandler, KeyboardAvoidingView } from 'react-native';
+import { View, Text, StyleSheet, SafeAreaView, ScrollView, TouchableOpacity, Animated, Dimensions, KeyboardAvoidingView } from 'react-native';
 import { useRouter, useFocusEffect } from 'expo-router';
 import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import { Header } from '@/components/Header';
@@ -8,17 +8,21 @@ import { useSubtasks } from '@/hooks/useSubtasks';
 import { useTaskModals } from '@/hooks/useTaskModals';
 import { useSettings } from '@/theme';
 import { useCategories } from '@/hooks/useDatabase';
-import { toggleTaskComplete } from '@/utils/taskActions';
+import { useICalImport } from '@/hooks/useICalImport';
+import { confirmAndToggleTaskComplete, toggleSubtaskComplete } from '@/utils/taskActions';
 import { QuickAddBar } from '@/components/QuickAddBar';
 import { OptionPickerModal } from '@/components/OptionPickerModal';
+import { TaskItem } from '@/components/TaskItem';
+import { SubtaskItem } from '@/components/SubtaskItem';
 import Task from '@/models/Task';
 import { format, addMonths, addDays, startOfMonth, isSameDay, isSameMonth, isToday } from 'date-fns';
-import Svg, { Path, Circle } from 'react-native-svg';
+import Svg, { Path } from 'react-native-svg';
-import { desaturate } from '@/theme';
 import type { ThemeColors } from '@/theme';
+import type { TaskData, SubtaskData } from '@/types';
 
 const WIDTH = Dimensions.get('window').width;
 const GERMAN_WEEKDAYS = ['mo', 'di', 'mi', 'do', 'fr', 'sa', 'so'];
+const PRIORITY_RANK: Record<string, number> = { none: 0, low: 1, medium: 2, high: 3, critical: 4 };
 const MONTH_NAMES = [
   'January', 'February', 'March', 'April', 'May', 'June',
   'July', 'August', 'September', 'October', 'November', 'December',
@@ -26,8 +30,16 @@ const MONTH_NAMES = [
 
 export default function CalendarScreen() {
   const router = useRouter();
-  const { theme } = useSettings();
+  const { theme, sortBy } = useSettings();
+  const styles = React.useMemo(() => createStyles(theme), [theme]);
   const categories = useCategories();
+  const categoryColors = useMemo(() => {
+    const map = new Map<string, string>();
+    for (const c of categories) {
+      map.set(c.id, c.color);
+    }
+    return map;
+  }, [categories]);
   const { modals, openTaskEdit } = useTaskModals();
 
   const [visibleMonth, setVisibleMonth] = useState(() => new Date());
@@ -37,28 +49,50 @@ export default function CalendarScreen() {
   const { map: subtasksByTask, refresh: refreshSubtasks } = useSubtasks();
 
   const visibleMonthRef = useRef(visibleMonth);
-  visibleMonthRef.current = visibleMonth;
   const selectedDateRef = useRef(selectedDate);
-  selectedDateRef.current = selectedDate;
+  const translateX = useRef<Animated.Value>(new Animated.Value(0));
+  const animatingRef = useRef(false);
+  const gridWidthRef = useRef<number>(WIDTH);
+
+  useEffect(() => {
+    visibleMonthRef.current = visibleMonth;
+  }, [visibleMonth]);
+
+  useEffect(() => {
+    selectedDateRef.current = selectedDate;
+  }, [selectedDate]);
 
   const { tasks: selectedDayTasks, refresh: refreshDayTasks } = useTasksByDate(selectedDate);
   const monthTasks = useTasksInMonth(visibleMonth);
   const refreshMonthTasks = monthTasks.refresh;
 
+  const sortedDayTasks = useMemo(() => {
+    const sorted = [...selectedDayTasks];
+    switch (sortBy) {
+      case 'date':
+        sorted.sort((a, b) => (a.dueDate || Number.MAX_SAFE_INTEGER) - (b.dueDate || Number.MAX_SAFE_INTEGER));
+        break;
+      case 'priority':
+        sorted.sort((a, b) => PRIORITY_RANK[b.priority] - PRIORITY_RANK[a.priority]);
+        break;
+      case 'alpha':
+        sorted.sort((a, b) => a.title.localeCompare(b.title));
+        break;
+      case 'created':
+        sorted.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+        break;
+    }
+    return sorted;
+  }, [selectedDayTasks, sortBy]);
+
   useFocusEffect(
     useCallback(() => {
-      const sub = BackHandler.addEventListener('hardwareBackPress', () => true);
       refreshDayTasks();
       refreshMonthTasks();
       refreshSubtasks();
-      return () => sub.remove();
     }, [refreshDayTasks, refreshMonthTasks, refreshSubtasks])
   );
 
-  const translateX = useRef(new Animated.Value(0)).current;
-  const animatingRef = useRef(false);
-  const gridWidthRef = useRef<number>(WIDTH);
-
   const weeks = useMemo(() => {
     const first = startOfMonth(visibleMonth);
     const offset = (first.getDay() + 6) % 7; // week starts Monday
@@ -78,16 +112,16 @@ export default function CalendarScreen() {
       }
       if (!animate) {
         setVisibleMonth(next);
-        translateX.setValue(0);
+        translateX.current.setValue(0);
         return;
       }
       animatingRef.current = true;
       const w = gridWidthRef.current || WIDTH;
       const target = dir === 1 ? -w : w;
-      Animated.timing(translateX, { toValue: target, duration: 220, useNativeDriver: false }).start(() => {
+      Animated.timing(translateX.current, { toValue: target, duration: 220, useNativeDriver: false }).start(() => {
         setVisibleMonth(next);
-        translateX.setValue(-target);
+        translateX.current.setValue(-target);
-        Animated.timing(translateX, { toValue: 0, duration: 180, useNativeDriver: false }).start(() => {
+        Animated.timing(translateX.current, { toValue: 0, duration: 180, useNativeDriver: false }).start(() => {
           animatingRef.current = false;
         });
       });
@@ -113,21 +147,23 @@ export default function CalendarScreen() {
         .activeOffsetX([-16, 16])
         .minDistance(6)
         .runOnJS(true)
+        // eslint-disable-next-line react-hooks/refs
         .onUpdate((e) => {
-          if (!animatingRef.current) translateX.setValue(e.translationX);
+          if (!animatingRef.current) translateX.current.setValue(e.translationX);
         })
+        // eslint-disable-next-line react-hooks/refs
         .onEnd((e) => {
           if (animatingRef.current) return;
           const w = gridWidthRef.current || WIDTH;
           const dx = e.translationX;
           if (dx <= -w / 4) {
-            translateX.stopAnimation();
+            translateX.current.stopAnimation();
             transitionTo(1, false);
           } else if (dx >= w / 4) {
-            translateX.stopAnimation();
+            translateX.current.stopAnimation();
             transitionTo(-1, false);
           } else {
-            Animated.spring(translateX, { toValue: 0, useNativeDriver: false }).start();
+            Animated.spring(translateX.current, { toValue: 0, useNativeDriver: false }).start();
           }
         }),
     [translateX, transitionTo]
@@ -152,7 +188,29 @@ export default function CalendarScreen() {
   }, [currentYear]);
 
   const handleToggleComplete = useCallback(async (taskId: string) => {
-    await toggleTaskComplete(taskId);
+    await confirmAndToggleTaskComplete(taskId, () => {
+      refreshDayTasks();
+      refreshMonthTasks();
+      refreshSubtasks();
+    });
+  }, [refreshDayTasks, refreshMonthTasks, refreshSubtasks]);
+
+  const [expandedTasks, setExpandedTasks] = useState<Set<string>>(new Set());
+
+  const toggleExpand = useCallback((taskId: string) => {
+    setExpandedTasks((prev) => {
+      const next = new Set(prev);
+      if (next.has(taskId)) {
+        next.delete(taskId);
+      } else {
+        next.add(taskId);
+      }
+      return next;
+    });
+  }, []);
+
+  const handleSubtaskToggle = useCallback(async (subtaskId: string) => {
+    await toggleSubtaskComplete(subtaskId);
     refreshDayTasks();
     refreshMonthTasks();
     refreshSubtasks();
@@ -169,7 +227,8 @@ export default function CalendarScreen() {
             onLayout={(e) => {
               gridWidthRef.current = e.nativeEvent.layout.width;
             }}
-            style={[styles.calendarArea, { transform: [{ translateX }] }]}
+            // eslint-disable-next-line react-hooks/refs
+            style={[styles.calendarArea, { transform: [{ translateX: translateX.current }] }]}
           >
               <View style={styles.monthRow}>
                 <TouchableOpacity
@@ -221,7 +280,7 @@ export default function CalendarScreen() {
                       key={day.toISOString()}
                       day={day}
                       label={cellTitle(byDayOf(monthTasks.byDay, day))}
-                      dotColor={cellColor(byDayOf(monthTasks.byDay, day), categories)}
+                      dotColor={cellColor(byDayOf(monthTasks.byDay, day), categories, theme)}
                       selected={isSameDay(day, selectedDate)}
                       today={isToday(day)}
                       inMonth={isSameMonth(day, visibleMonth)}
@@ -236,78 +295,41 @@ export default function CalendarScreen() {
 
         <View style={styles.panelHeader}>
               <Text style={[styles.panelDate, { color: theme.text }]}>{format(selectedDate, 'EEEE, MMMM d')}</Text>
-              {selectedDayTasks.length > 0 && (
+              {sortedDayTasks.length > 0 && (
                 <Text style={[styles.panelCount, { color: theme.textFaint }]}>
-                  {selectedDayTasks.length} event{selectedDayTasks.length === 1 ? '' : 's'}
+                  {sortedDayTasks.length} event{sortedDayTasks.length === 1 ? '' : 's'}
                 </Text>
               )}
             </View>
 
-            {selectedDayTasks.length === 0 ? (
+            {sortedDayTasks.length === 0 ? (
               <View style={styles.emptyState}>
                 <Text style={[styles.emptyText, { color: theme.textSecondary }]}>No events on this day</Text>
                 <Text style={[styles.emptySubtext, { color: theme.textMuted }]}>Tap a date or use the bar below</Text>
               </View>
             ) : (
-              selectedDayTasks.map((task) => (
+              sortedDayTasks.map((task) => {
-                <View key={task.id} style={[styles.eventCard, { backgroundColor: theme.card, borderColor: theme.border }]}>
+                const isExpanded = expandedTasks.has(task.id);
-                  <View style={styles.eventRow}>
+                const itemSubtasks = subtasksByTask.get(task.id) ?? [];
-                    <TouchableOpacity
+                return (
-                      style={styles.checkCircle}
+                  <View key={task.id} style={styles.eventCard}>
-                      onPress={() => handleToggleComplete(task.id)}
+                    <CalendarTaskRow
-                      activeOpacity={0.7}
+                      task={task}
-                    >
+                      expanded={isExpanded}
-                      <Svg width={30} height={30} viewBox="0 0 24 24">
+                      subtasks={itemSubtasks}
-                        {task.completed ? (
+                      categoryColor={categoryColors.get(task.categoryId)}
-                          <>
+                      onToggle={() => handleToggleComplete(task.id)}
-                            <Circle cx={12} cy={12} r={10} fill={theme.accent} />
+                      onPress={(id) =>
-                            <Path d="M7 12l3 3 7-7" stroke="#FFFFFF" strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
+                        expandedTasks.has(id)
-                          </>
+                          ? router.push({ pathname: '/task-detail', params: { id } })
-                        ) : (
+                          : toggleExpand(id)
-                          <Circle cx={12} cy={12} r={10} stroke={theme.textSecondary} strokeWidth={2.5} fill="none" />
+                      }
-                        )}
+                      onMenuOpen={(id) => openTaskEdit(id)}
-                      </Svg>
+                      onSubtaskToggle={handleSubtaskToggle}
-                    </TouchableOpacity>
+                    />
-
-                    <TouchableOpacity
-                      style={styles.eventTitleTouch}
-                      onPress={() => router.push({ pathname: '/task-detail', params: { id: task.id } })}
-                      activeOpacity={0.7}
-                    >
-                      <Text
-                        style={[styles.eventTitle, { color: theme.text }, task.completed && styles.eventCompleted]}
-                        numberOfLines={1}
-                      >
-                        {task.title}
-                      </Text>
-                    </TouchableOpacity>
-
-                    <TouchableOpacity style={styles.menuButton} onPress={() => openTaskEdit(task.id)} activeOpacity={0.7} accessibilityRole="button" accessibilityLabel={`Edit ${task.title}`}>
-                      <Svg width={20} height={20} viewBox="0 0 24 24">
-                        <Path d="M9 6l6 6-6 6" stroke={theme.textSecondary} strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
-                      </Svg>
-                    </TouchableOpacity>
                   </View>
-
+                );
-                  {(subtasksByTask.get(task.id) ?? []).length > 0 && (
+              })
-                    <View style={styles.bullets}>
-                      {(subtasksByTask.get(task.id) ?? []).map((sub) => (
-                        <View key={sub.id} style={styles.bulletRow}>
-                          <Svg width={5} height={5} viewBox="0 0 6 6" style={styles.bulletDot as any}>
-                            <Circle cx={3} cy={3} r={3} fill={theme.textMuted} />
-                          </Svg>
-                          <Text
-                            style={[styles.bulletText, { color: theme.textFaint }, sub.completed && styles.bulletCompleted]}
-                            numberOfLines={1}
-                          >
-                            {sub.title}
-                          </Text>
-                        </View>
-                      ))}
-                    </View>
-                  )}
-                </View>
-              ))
             )}
           </ScrollView>
 
@@ -343,16 +365,69 @@ function byDayOf(byDay: Record<number, Task[]>, day: Date): Task[] {
   return byDay[day.getDate()] ?? [];
 }
 
+interface CalendarTaskRowProps {
+  task: Task;
+  expanded: boolean;
+  subtasks: SubtaskData[];
+  categoryColor?: string;
+  onToggle: (taskId: string) => void | Promise<void>;
+  onPress: (taskId: string) => void;
+  onMenuOpen: (taskId: string) => void;
+  onSubtaskToggle: (subtaskId: string) => void | Promise<void>;
+}
+
+const CalendarTaskRow = React.memo(function CalendarTaskRow({
+  task,
+  expanded,
+  subtasks,
+  categoryColor,
+  onToggle,
+  onPress,
+  onMenuOpen,
+  onSubtaskToggle,
+}: CalendarTaskRowProps) {
+  const { theme } = useSettings();
+  const styles = React.useMemo(() => createStyles(theme), [theme]);
+  const sortedSubtasks = useMemo(
+    () => subtasks.slice().sort((a, b) => a.order - b.order),
+    [subtasks]
+  );
+  return (
+    <View>
+      <TaskItem
+        task={task as unknown as TaskData}
+        onToggle={() => onToggle(task.id)}
+        onPress={() => onPress(task.id)}
+        onMenuOpen={() => onMenuOpen(task.id)}
+        expanded={expanded}
+        categoryColor={categoryColor}
+      />
+      {expanded && sortedSubtasks.length > 0 && (
+        <View style={styles.subtaskList}>
+          {sortedSubtasks.map((sub) => (
+            <SubtaskItem
+              key={sub.id}
+              subtask={sub}
+              depth={1}
+              categoryColor={categoryColor}
+              onToggle={() => onSubtaskToggle(sub.id)}
+            />
+          ))}
+        </View>
+      )}
+    </View>
+  );
+});
+
 function cellTitle(tasks: Task[]): string | null {
   if (tasks.length === 0) return null;
   if (tasks.length === 1) return tasks[0].title;
   return `${tasks[0].title} +${tasks.length - 1}`;
 }
 
-function cellColor(tasks: Task[], categories: { id: string; color: string }[]): string {
+function cellColor(tasks: Task[], categories: { id: string; color: string }[], theme: ThemeColors): string {
-  if (tasks.length === 0) return '#8E8E8E';
+  if (tasks.length === 0) return theme.textMuted;
-  const cat = categories.find((c) => c.id === tasks[0].categoryId);
+  return theme.accent;
-  return cat ? desaturate(cat.color, 0.3) : '#8E8E8E';
 }
 
 interface DayCellProps {
@@ -367,6 +442,7 @@ interface DayCellProps {
 }
 
 const DayCell = React.memo(function DayCell({ day, label, dotColor, selected, today, inMonth, theme, onPress }: DayCellProps) {
+  const styles = React.useMemo(() => createStyles(theme), [theme]);
   return (
     <TouchableOpacity
       style={[styles.dayCell, selected && { backgroundColor: theme.accentSoft, borderColor: theme.accentBorder }]}
@@ -397,7 +473,7 @@ const DayCell = React.memo(function DayCell({ day, label, dotColor, selected, to
   );
 });
 
-const styles = StyleSheet.create({
+const createStyles = (theme: ThemeColors) => StyleSheet.create({
   container: {
     flex: 1,
   },
@@ -485,7 +561,7 @@ const styles = StyleSheet.create({
     fontWeight: '600',
   },
   dayNumberSelected: {
-    color: '#FFFFFF',
+    color: theme.text,
   },
   chip: {
     marginTop: 3,
@@ -536,55 +612,10 @@ const styles = StyleSheet.create({
   eventCard: {
     marginHorizontal: 16,
     marginTop: 6,
-    borderRadius: 16,
-    borderWidth: 1,
-    paddingHorizontal: 14,
-    paddingVertical: 12,
   },
-  eventRow: {
+  subtaskList: {
-    flexDirection: 'row',
+    paddingLeft: 8,
-    alignItems: 'center',
+    paddingRight: 4,
-  },
+    paddingTop: 4,
-  checkCircle: {
-    width: 30,
-    marginRight: 12,
-  },
-  eventTitleTouch: {
-    flex: 1,
-  },
-  eventTitle: {
-    fontSize: 15,
-    fontWeight: '500',
-  },
-  eventCompleted: {
-    textDecorationLine: 'line-through',
-    color: '#9E9E9E',
-  },
-  menuButton: {
-    padding: 4,
-    marginLeft: 6,
-  },
-  bullets: {
-    marginTop: 8,
-    paddingTop: 8,
-    borderTopWidth: 1,
-    borderTopColor: 'rgba(255,255,255,0.06)',
-    gap: 6,
-  },
-  bulletRow: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: 8,
-  },
-  bulletDot: {
-    marginLeft: 8,
-  },
-  bulletText: {
-    flex: 1,
-    fontSize: 13,
-  },
-  bulletCompleted: {
-    textDecorationLine: 'line-through',
-    color: '#6E6E6E',
   },
 });

carry-your-live/app/(tabs)/index.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { View, Text, StyleSheet, SafeAreaView, BackHandler, KeyboardAvoidingView, TouchableOpacity } from 'react-native';
+import { View, Text, StyleSheet, SafeAreaView, KeyboardAvoidingView, TouchableOpacity, BackHandler } from 'react-native';
 import { useFocusEffect } from 'expo-router';
 import { Header } from '@/components/Header';
 import { CategoryFilter } from '@/components/CategoryFilter';
@@ -18,7 +18,7 @@ export default function TasksScreen() {
 
   useFocusEffect(
     useCallback(() => {
-      const sub = BackHandler.addEventListener('hardwareBackPress', () => true);
+      const sub = BackHandler.addEventListener('hardwareBackPress', () => false);
       return () => sub.remove();
     }, [])
   );

carry-your-live/app/(tabs)/settings.tsx

@@ -15,6 +15,8 @@ import { useCategories } from '@/hooks/useDatabase';
 import { getAuthUser, getAuthToken } from '@/services/auth';
 import { checkForUpdates, getCurrentAppVersion } from '@/services/updates';
 import { getLastSyncTime } from '@/database/sync';
+import { rescheduleAllReminders } from '@/services/notifications';
+import { collections } from '@/database';
 import Category from '@/models/Category';
 import Svg, { Path } from 'react-native-svg';
 import ColorWheel from '@/components/ColorWheel';
@@ -22,9 +24,10 @@ import { getLastVisitedTab, tabHref } from '@/utils/tabHistory';
 
 export default function SettingsScreen() {
   const router = useRouter();
-  const { theme, notifications, setNotifications, defaultCategoryId, setDefaultCategoryId, sortBy, setSortBy, reminderPreference, setReminderPreference, apiUrl, accentColor, setAccentColor, todoAheadDays, setTodoAheadDays, showCompleted, setShowCompleted } = useSettings();
+  const { theme, notifications, setNotifications, defaultCategoryId, setDefaultCategoryId, sortBy, setSortBy, reminderPreference, setReminderPreference, tagReminderPreferences, setTagReminderPreferences, apiUrl, accentColor, setAccentColor, todoAheadDays, setTodoAheadDays, showCompleted, setShowCompleted, deleteBySwipe, setDeleteBySwipe } = useSettings();
   const categories = useCategories();
   const [picker, setPicker] = useState<null | 'category' | 'sort' | 'reminder' | 'todoAhead'>(null);
+  const [reminderTagPicker, setReminderTagPicker] = useState<Category | null>(null);
   const [editingCategory, setEditingCategory] = useState<Category | null | 'new'>(null);
   const [syncVisible, setSyncVisible] = useState(false);
   const [friendsVisible, setFriendsVisible] = useState(false);
@@ -95,6 +98,14 @@ export default function SettingsScreen() {
   const defaultCategoryLabel = defaultCategory?.name ?? 'None';
   const reminderLabel = REMINDER_OPTIONS.find((o) => o.value === reminderPreference)?.label ?? 'No reminder';
 
+  const tagReminderLabel = (categoryId: string) => {
+    const selected = tagReminderPreferences[categoryId] ?? [];
+    if (selected.length === 0) return `Default (${reminderLabel})`;
+    return selected
+      .map((v) => REMINDER_OPTIONS.find((o) => o.value === v)?.label ?? v)
+      .join(', ');
+  };
+
   const openCustomAccent = () => {
     setDraftAccent(accentColor);
     setCustomAccentVisible(true);
@@ -108,6 +119,20 @@ export default function SettingsScreen() {
     setReminderPreference((Array.isArray(value) ? value[0] : value) as typeof reminderPreference);
   };
 
+  const handleTagReminderPreference = async (categoryId: string, value: string | string[]) => {
+    const selected = (Array.isArray(value) ? value : [value]).filter(
+      (v): v is typeof reminderPreference => v !== 'none'
+    );
+    setTagReminderPreferences({ ...tagReminderPreferences, [categoryId]: selected });
+    if (!notifications) return;
+    try {
+      const tasks = await collections.tasks.query().fetch();
+      await rescheduleAllReminders(tasks, notifications, reminderPreference);
+    } catch {
+      // ignore reschedule failures
+    }
+  };
+
   const handleTodoAheadDays = (value: string | string[]) => {
     setTodoAheadDays(parseInt(Array.isArray(value) ? value[0] : value, 10));
   };
@@ -119,12 +144,12 @@ export default function SettingsScreen() {
     <SafeAreaView style={[styles.container, { backgroundColor: theme.background }]}>
       <Header title="Settings" showLogo={false} />
       <ScrollView contentContainerStyle={styles.content} showsVerticalScrollIndicator={false}>
-        <Text style={[styles.sectionTitle, { color: theme.textMuted }]}>Categories</Text>
+        <Text style={[styles.sectionTitle, { color: theme.textMuted }]}>Tags</Text>
         {categories.map((category) => (
           <ListItem
             key={category.id}
             title={category.name}
-            subtitle={category.id === defaultCategoryId ? 'Default category' : undefined}
+            subtitle={category.id === defaultCategoryId ? 'Default tag' : undefined}
             leftElement={
               <View style={[styles.categoryDot, { backgroundColor: category.color }]} />
             }
@@ -142,7 +167,7 @@ export default function SettingsScreen() {
               <Path d="M12 5v14M5 12h14" stroke={theme.accentText} strokeWidth={2} strokeLinecap="round" />
             </Svg>
           </View>
-          <Text style={[styles.addCategoryText, { color: theme.accent }]}>Add Category</Text>
+          <Text style={[styles.addCategoryText, { color: theme.accent }]}>Add Tag</Text>
         </TouchableOpacity>
         <Text style={[styles.sectionTitle, { color: theme.textMuted }]}>Notifications</Text>
         <ListItem
@@ -163,9 +188,21 @@ export default function SettingsScreen() {
           onPress={() => notifications && setPicker('reminder')}
           showChevron
         />
+        {categories.map((category) => (
+          <ListItem
+            key={`tag-reminder-${category.id}`}
+            title={category.name}
+            subtitle={notifications ? tagReminderLabel(category.id) : 'Enable notifications first'}
+            leftElement={
+              <View style={[styles.categoryDot, { backgroundColor: category.color }]} />
+            }
+            onPress={() => notifications && setReminderTagPicker(category)}
+            showChevron
+          />
+        ))}
         <Text style={[styles.sectionTitle, { color: theme.textMuted }]}>Tasks</Text>
         <ListItem
-          title="Default Category"
+          title="Default Tag"
           subtitle={defaultCategoryLabel}
           onPress={() => setPicker('category')}
           showChevron
@@ -188,6 +225,19 @@ export default function SettingsScreen() {
             />
           }
         />
+        <ListItem
+          title="Delete by Swiping"
+          subtitle="Swipe right to delete task"
+          rightElement={
+            <Switch
+              value={deleteBySwipe}
+              onValueChange={setDeleteBySwipe}
+              thumbColor="#FFFFFF"
+              trackColor={{ false: theme.borderStrong, true: theme.accent }}
+            />
+          }
+          showChevron
+        />
         <ListItem
           title="Show Calendar Tasks"
           subtitle={todoAheadDays === 0 ? 'Only today' : `Up to ${todoAheadDays} days ahead`}
@@ -269,8 +319,8 @@ export default function SettingsScreen() {
 
       <OptionPickerModal
         visible={picker === 'category'}
-        title="Default Category"
+        title="Default Tag"
-        options={[{ value: '', label: 'None', color: '#9E9E9E' }, ...categories.map((c) => ({ value: c.id, label: c.name, color: c.color }))]}
+        options={[{ value: '', label: 'None', color: theme.textMuted }, ...categories.map((c) => ({ value: c.id, label: c.name, color: c.color }))]}
         selectedValue={defaultCategoryId}
         onSelect={handleDefaultCategory}
         onClose={() => setPicker(null)}
@@ -294,6 +344,19 @@ export default function SettingsScreen() {
         onClose={() => setPicker(null)}
       />
 
+      {categories.map((category) => (
+        <OptionPickerModal
+          key={`tag-reminder-picker-${category.id}`}
+          visible={reminderTagPicker?.id === category.id}
+          title={`Reminders · ${category.name}`}
+          options={REMINDER_OPTIONS.filter((o) => o.value !== 'none')}
+          selectedValue={tagReminderPreferences[category.id] ?? []}
+          multiSelect
+          onSelect={(value) => handleTagReminderPreference(category.id, value)}
+          onClose={() => setReminderTagPicker(null)}
+        />
+      ))}
+
       <OptionPickerModal
         visible={picker === 'todoAhead'}
         title="Calendar Tasks in Todo"

carry-your-live/app/(tabs)/stats.tsx

@@ -1,9 +1,9 @@
 import React, { useCallback } from 'react';
-import { View, Text, StyleSheet, SafeAreaView, ScrollView, BackHandler } from 'react-native';
+import { View, Text, StyleSheet, SafeAreaView, ScrollView } from 'react-native';
 import { useFocusEffect } from 'expo-router';
 import { Header } from '@/components/Header';
 import { useStats } from '@/hooks/useStats';
-import { useSettings } from '@/theme';
+import { useSettings, type ThemeColors } from '@/theme';
 
 export default function StatsScreen() {
   const { theme } = useSettings();
@@ -11,8 +11,7 @@ export default function StatsScreen() {
 
   useFocusEffect(
     useCallback(() => {
-      const sub = BackHandler.addEventListener('hardwareBackPress', () => true);
+      return () => {};
-      return () => sub.remove();
     }, [])
   );
 
@@ -77,7 +76,7 @@ export default function StatsScreen() {
         </View>
 
         <View style={[styles.card, { backgroundColor: theme.card }]}>
-          <Text style={[styles.cardTitle, { color: theme.textMuted }]}>By category</Text>
+          <Text style={[styles.cardTitle, { color: theme.textMuted }]}>By tags</Text>
           {stats.byCategory.length === 0 ? (
             <Text style={[styles.emptyText, { color: theme.textFaint }]}>No completed tasks yet</Text>
           ) : (
@@ -98,7 +97,7 @@ export default function StatsScreen() {
           ) : (
             stats.byPriority.map((p) => (
               <View key={p.priority} style={styles.row}>
-                <View style={[styles.dot, { backgroundColor: priorityColor(p.priority) }]} />
+                <View style={[styles.dot, { backgroundColor: priorityColor(theme, p.priority) }]} />
                 <Text style={[styles.rowLabel, { color: theme.text }]}>{p.label}</Text>
                 <Text style={[styles.rowValue, { color: theme.textMuted }]}>{p.count}</Text>
               </View>
@@ -112,16 +111,17 @@ export default function StatsScreen() {
 
 const BASE_HEIGHT = 90;
 
-function priorityColor(priority: string): string {
+function priorityColor(theme: ThemeColors, priority: string): string {
   switch (priority) {
+    case 'critical':
+      return theme.dangerStrong;
     case 'high':
-      return '#EF5350';
+      return theme.warning;
-    case 'medium':
-      return '#FFA726';
     case 'low':
-      return '#66BB6A';
+    case 'medium':
+      return theme.success;
     default:
-      return '#9E9E9E';
+      return theme.textMuted;
   }
 }
 

carry-your-live/app/_layout.tsx

@@ -8,11 +8,46 @@ import { UpdateNotifier } from '@/components/UpdateNotifier';
 import { Linking } from 'react-native';
 import { useEffect } from 'react';
 import { requestQuickAddFocus } from '@/utils/quickAddFocus';
+import { registerForPushNotificationsAsync, setupNotificationChannels, addNotificationResponseReceivedListener, removeNotificationSubscription } from '@/services/pushNotifications';
+import * as Notifications from 'expo-notifications';
+import { Platform } from 'react-native';
+
+Notifications.setNotificationHandler({
+  handleNotification: async () => ({
+    shouldShowAlert: true,
+    shouldPlaySound: true,
+    shouldSetBadge: true,
+    shouldShowBanner: true,
+    shouldShowList: true,
+  }),
+});
 
 function RootNavigator() {
   const router = useRouter();
 
   useEffect(() => {
+    setupNotificationChannels();
+    registerForPushNotificationsAsync().catch(() => {});
+
+    const responseListener = addNotificationResponseReceivedListener((response) => {
+      const data = response.notification.request.content.data as Record<string, any> | undefined;
+      if (!data) return;
+
+      switch (data.type) {
+        case 'task_reminder':
+        case 'task_assignment':
+          if (data.taskId) {
+            router.push({ pathname: '/task-detail', params: { id: data.taskId } });
+          }
+          break;
+        case 'friend_request':
+          if (data.friendshipId) {
+            router.push({ pathname: '/(tabs)/settings' });
+          }
+          break;
+      }
+    });
+
     const handleUrl = (url: string | null) => {
       if (!url || !url.includes('://quick-add')) return;
       router.replace('/(tabs)');
@@ -21,8 +56,10 @@ function RootNavigator() {
 
     Linking.getInitialURL().then(handleUrl).catch(() => {});
     const subscription = Linking.addEventListener('url', ({ url }) => handleUrl(url));
+
     return () => {
       subscription.remove();
+      removeNotificationSubscription(responseListener);
     };
   }, [router]);
 

carry-your-live/app/add-task.tsx

@@ -1,5 +1,5 @@
-import React, { useMemo } from 'react';
+import React, { useMemo, useRef } from 'react';
-import { View, Text, StyleSheet, SafeAreaView, ScrollView, KeyboardAvoidingView, Platform } from 'react-native';
+import { View, Text, StyleSheet, SafeAreaView, ScrollView, KeyboardAvoidingView, Platform, Keyboard } from 'react-native';
 import { Header } from '@/components/Header';
 import { CategorySelector } from '@/components/CategorySelector';
 import { TaskNameInput } from '@/components/TaskNameInput';
@@ -20,6 +20,7 @@ import { database, collections } from '@/database';
 import { TaskFormData, tagsToString } from '@/types';
 import { useSettings } from '@/theme';
 import { scheduleTaskReminder } from '@/services/notifications';
+import { ReminderPreference } from '@/types';
 import { useFriends } from '@/hooks/useFriends';
 
 const taskSchema = z.object({
@@ -48,12 +49,14 @@ export default function AddTaskScreen() {
   const { theme } = useSettings();
   const { date: dateParam } = useLocalSearchParams<{ date?: string }>();
   const { friends } = useFriends();
+  const { notifications: notificationsEnabled, reminderPreference } = useSettings();
   const initialCategory = defaultCategoryId || '';
   const initialDate = useMemo(() => {
     if (!dateParam) return null;
     const parsed = new Date(Array.isArray(dateParam) ? dateParam[0] : dateParam);
     return Number.isNaN(parsed.getTime()) ? null : parsed;
   }, [dateParam]);
+  const scrollViewRef = useRef<ScrollView>(null);
 
   const methods = useForm<TaskFormData>({
     resolver: zodResolver(taskSchema),
@@ -104,6 +107,9 @@ export default function AddTaskScreen() {
   const onSubmit = async (data: TaskFormData) => {
     if (!isReady) return;
 
+    Keyboard.dismiss();
+    scrollViewRef.current?.scrollTo({ y: 0, animated: true });
+
     const now = new Date();
     const dueDateTimestamp = data.dueDate ? data.dueDate.getTime() : 0;
     const seriesId = data.repeat !== 'none'
@@ -160,7 +166,7 @@ export default function AddTaskScreen() {
       }
     });
 
-    await scheduleTaskReminder(createdTask);
+    await scheduleTaskReminder(createdTask, notificationsEnabled, reminderPreference);
 
     router.back();
   };
@@ -179,12 +185,16 @@ export default function AddTaskScreen() {
       <FormProvider {...methods}>
         <KeyboardAvoidingView
           style={styles.keyboardAvoiding}
-          behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+          behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+          keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 0}
         >
           <ScrollView
+            ref={scrollViewRef}
             contentContainerStyle={styles.scrollContent}
             showsVerticalScrollIndicator={false}
             keyboardShouldPersistTaps="handled"
+            keyboardDismissMode="interactive"
+            automaticallyAdjustContentInsets={false}
           >
             <CategorySelector
               value={tags}
@@ -263,7 +273,7 @@ const styles = StyleSheet.create({
   scrollContent: {
     paddingHorizontal: 16,
     paddingTop: 12,
-    paddingBottom: 120,
+    paddingBottom: 100,
     gap: 20,
   },
 });

carry-your-live/app/day-view.tsx

@@ -1,18 +1,19 @@
 import React, { useCallback, useMemo } from 'react';
 import { View, Text, StyleSheet, SafeAreaView, ScrollView, TouchableOpacity, KeyboardAvoidingView, BackHandler } from 'react-native';
 import { useRouter, useLocalSearchParams, useFocusEffect } from 'expo-router';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Header } from '@/components/Header';
 import { useTasksByDate } from '@/hooks/useTasks';
 import { useSubtasks } from '@/hooks/useSubtasks';
 import { useTaskModals } from '@/hooks/useTaskModals';
 import { useSettings } from '@/theme';
 import { useCategories } from '@/hooks/useDatabase';
-import { toggleTaskComplete, toggleSubtaskComplete } from '@/utils/taskActions';
+import { confirmAndToggleTaskComplete, toggleSubtaskComplete } from '@/utils/taskActions';
 import { QuickAddBar } from '@/components/QuickAddBar';
 import { SubtaskData } from '@/types';
 import { format, startOfDay } from 'date-fns';
 import Svg, { Path, Circle } from 'react-native-svg';
-import { desaturate } from '@/theme';
+import { desaturate, type ThemeColors } from '@/theme';
 
 function isDayMatch(timestamp: number, day: Date): boolean {
   const d = new Date(timestamp);
@@ -22,6 +23,8 @@ function isDayMatch(timestamp: number, day: Date): boolean {
 export default function DayViewScreen() {
   const router = useRouter();
   const { theme } = useSettings();
+  const insets = useSafeAreaInsets();
+  const styles = useMemo(() => createStyles(theme), [theme]);
   const categories = useCategories();
   const { modals, openTaskEdit } = useTaskModals();
   const { date: dateParam } = useLocalSearchParams<{ date?: string }>();
@@ -37,11 +40,14 @@ export default function DayViewScreen() {
 
   useFocusEffect(
     useCallback(() => {
-      const sub = BackHandler.addEventListener('hardwareBackPress', () => false);
+      const sub = BackHandler.addEventListener('hardwareBackPress', () => {
+        router.back();
+        return true;
+      });
       refreshSubtasks();
       refresh();
       return () => sub.remove();
-    }, [refreshSubtasks, refresh])
+    }, [router, refreshSubtasks, refresh])
   );
 
   const subtasksOnDay = useMemo(() => {
@@ -54,9 +60,10 @@ export default function DayViewScreen() {
   }, [subtasksByTask, day]);
 
   const handleToggleComplete = useCallback(async (taskId: string) => {
-    await toggleTaskComplete(taskId);
+    await confirmAndToggleTaskComplete(taskId, () => {
-    refresh();
+      refresh();
-    refreshSubtasks();
+      refreshSubtasks();
+    });
   }, [refresh, refreshSubtasks]);
 
   const handleToggleSubtask = useCallback(async (subtaskId: string) => {
@@ -65,8 +72,8 @@ export default function DayViewScreen() {
   }, [refreshSubtasks]);
 
   return (
-    <SafeAreaView style={[styles.container, { backgroundColor: theme.background }]}>
+    <SafeAreaView style={[styles.container, { backgroundColor: theme.background, paddingBottom: insets.bottom }]}>
-      <Header title={format(day, 'EEEE, MMM d')} showLogo={false} />
+      <Header title={format(day, 'EEEE, MMM d')} showLogo={false} rightAction="Back" />
       <KeyboardAvoidingView style={styles.kbAvoid} behavior="padding">
         <ScrollView style={styles.scrollBody} contentContainerStyle={styles.scrollContent} showsVerticalScrollIndicator={false}>
           {loading ? (
@@ -205,7 +212,7 @@ export default function DayViewScreen() {
   );
 }
 
-const styles = StyleSheet.create({
+const createStyles = (theme: ThemeColors) => StyleSheet.create({
   container: {
     flex: 1,
   },
@@ -252,7 +259,7 @@ const styles = StyleSheet.create({
   },
   eventCompleted: {
     textDecorationLine: 'line-through',
-    color: '#9E9E9E',
+    color: theme.textMuted,
   },
   eventSub: {
     fontSize: 13,

carry-your-live/app/subtask-detail.tsx

@@ -15,7 +15,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { useDatabase } from '@/hooks/useDatabase';
 import { collections } from '@/database';
-import { SubtaskFormData, Reminder, parseReminders, toRemindersString } from '@/types';
+import { SubtaskFormData, Reminder, parseReminders, toRemindersString, parseTaskTags, tagsToString } from '@/types';
 import { useSettings } from '@/theme';
 import { updateSubtask, deleteSubtask } from '@/utils/taskActions';
 import { CategorySelector } from '@/components/CategorySelector';
@@ -25,7 +25,7 @@ import Svg, { Path } from 'react-native-svg';
 const subtaskSchema = z.object({
   title: z.string().trim().min(1, 'Subtask name is required').max(100),
   description: z.string().max(1000).optional(),
-  categoryId: z.string().optional(),
+  tags: z.array(z.string()).optional(),
   priority: z.enum(['none', 'low', 'medium', 'high', 'critical']),
   dueDate: z.date().nullable().optional(),
   dueTime: z.string().optional(),
@@ -53,7 +53,7 @@ export default function SubtaskDetailScreen() {
     defaultValues: {
       title: '',
       description: '',
-      categoryId: '',
+      tags: [],
       priority: 'none',
       dueDate: null,
       dueTime: '',
@@ -71,7 +71,7 @@ export default function SubtaskDetailScreen() {
   const { handleSubmit, watch, setValue, control, reset, formState: { errors } } = methods;
 
   const priority = watch('priority');
-  const categoryId = watch('categoryId');
+  const tags = watch('tags') ?? [];
   const repeat = watch('repeat');
   const repeatInterval = watch('repeatInterval') ?? 1;
   const repeatDays = watch('repeatDays') ?? [];
@@ -90,7 +90,7 @@ export default function SubtaskDetailScreen() {
         reset({
           title: subtask.title,
           description: subtask.description,
-          categoryId: subtask.categoryId || '',
+          tags: parseTaskTags(subtask.tags, subtask.categoryId),
           priority: subtask.priority,
           dueDate: subtask.dueDate ? new Date(subtask.dueDate) : null,
           dueTime: subtask.dueTime,
@@ -125,7 +125,8 @@ export default function SubtaskDetailScreen() {
     await updateSubtask(id, {
       title: data.title,
       description: data.description || '',
-      categoryId: data.categoryId || '',
+      categoryId: (data.tags && data.tags[0]) || '',
+      tags: tagsToString(data.tags || []),
       priority: data.priority,
       dueDate: data.dueDate ? data.dueDate.getTime() : 0,
       dueTime: data.dueTime || '',
@@ -186,6 +187,7 @@ export default function SubtaskDetailScreen() {
             contentContainerStyle={styles.scrollContent}
             showsVerticalScrollIndicator={false}
             keyboardShouldPersistTaps="handled"
+            keyboardDismissMode="interactive"
           >
             <Controller
               control={control}
@@ -200,8 +202,8 @@ export default function SubtaskDetailScreen() {
               )}
             />
             <CategorySelector
-              value={categoryId ? [categoryId] : []}
+              value={tags}
-              onChange={(value) => setValue('categoryId', value[0] ?? '')}
+              onChange={(value) => setValue('tags', value)}
             />
             <PrioritySelector
               value={priority}

carry-your-live/app/task-detail.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
+import React, { useRef } from 'react';
-import { View, Text, StyleSheet, SafeAreaView, ScrollView, KeyboardAvoidingView, Platform, TouchableOpacity } from 'react-native';
+import { View, Text, StyleSheet, SafeAreaView, ScrollView, KeyboardAvoidingView, Platform, TouchableOpacity, Keyboard } from 'react-native';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { Header } from '@/components/Header';
 import { CategorySelector } from '@/components/CategorySelector';
@@ -23,6 +23,7 @@ import { TaskFormData, parseTaskTags, tagsToString } from '@/types';
 import { useSettings } from '@/theme';
 import { deleteTaskOccurrences } from '@/utils/taskActions';
 import { scheduleTaskReminder } from '@/services/notifications';
+import { ReminderPreference } from '@/types';
 import { recordTombstonesInBatch } from '@/database/tombstones';
 import { useFriends } from '@/hooks/useFriends';
 import Svg, { Path, Circle } from 'react-native-svg';
@@ -79,8 +80,10 @@ export default function TaskDetailScreen() {
   const router = useRouter();
   const { theme } = useSettings();
   const { friends } = useFriends();
+  const { notifications: notificationsEnabled, reminderPreference } = useSettings();
   const [loaded, setLoaded] = React.useState(false);
   const [notFound, setNotFound] = React.useState(false);
+  const scrollViewRef = useRef<ScrollView>(null);
 
   const methods = useForm<TaskFormData>({
     resolver: zodResolver(taskSchema),
@@ -126,6 +129,8 @@ export default function TaskDetailScreen() {
         const subtasks = await collections.subtasks.query(Q.where('task_id', id)).fetch();
 
         if (!mounted) return;
+        const remindersValue = task.reminders || (task.reminder && task.reminder !== 'none' ? task.reminder : '');
+
         reset({
           title: task.title,
           description: task.description,
@@ -140,6 +145,7 @@ export default function TaskDetailScreen() {
           repeatInterval: task.repeatInterval || 1,
           repeatDays: (task.repeatDays || '').split(',').map(Number).filter((d) => !Number.isNaN(d)),
           reminder: (task.reminder || 'none') as TaskFormData['reminder'],
+          reminders: remindersValue,
           assigneeId: task.assigneeId ?? null,
           subtasks: subtasks.map((s) => ({ title: s.title, _key: s.id })),
         });
@@ -155,6 +161,9 @@ export default function TaskDetailScreen() {
   const onSubmit = async (data: TaskFormData) => {
     if (!id || !isReady) return;
 
+    Keyboard.dismiss();
+    scrollViewRef.current?.scrollTo({ y: 0, animated: true });
+
     const now = new Date();
     const dueDateTimestamp = data.dueDate ? data.dueDate.getTime() : 0;
 
@@ -179,6 +188,7 @@ export default function TaskDetailScreen() {
         t.repeatInterval = data.repeatInterval || 1;
         t.repeatDays = (data.repeatDays || []).join(',');
         t.reminder = data.reminder || 'none';
+        t.reminders = data.reminders || '';
         t.assigneeId = data.assigneeId ?? null;
         if (data.repeat !== 'none' && !t.seriesId) {
           t.seriesId = `series_${Math.random().toString(36).slice(2, 10)}${Date.now().toString(36)}`;
@@ -207,6 +217,7 @@ export default function TaskDetailScreen() {
         await collections.subtasks.create((s) => {
           s.taskId = task.id;
           s.categoryId = task.categoryId || '';
+          s.tags = task.tags || '';
           s.title = trimmed;
           s.description = '';
           s.priority = 'none';
@@ -247,7 +258,7 @@ export default function TaskDetailScreen() {
       }
     });
 
-    await scheduleTaskReminder(savedTask);
+    await scheduleTaskReminder(savedTask, notificationsEnabled, reminderPreference);
 
     router.back();
   };
@@ -287,12 +298,15 @@ export default function TaskDetailScreen() {
       <FormProvider {...methods}>
         <KeyboardAvoidingView
           style={styles.keyboardAvoiding}
-          behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+          behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+          keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 0}
         >
           <ScrollView
+            ref={scrollViewRef}
             contentContainerStyle={styles.scrollContent}
             showsVerticalScrollIndicator={false}
             keyboardShouldPersistTaps="handled"
+            keyboardDismissMode="interactive"
           >
             <CategorySelector
               value={tags}
@@ -431,7 +445,7 @@ const styles = StyleSheet.create({
   scrollContent: {
     paddingHorizontal: 12,
     paddingTop: 8,
-    paddingBottom: 80,
+    paddingBottom: 60,
     gap: 12,
   },
   section: {

carry-your-live/electron-builder.config.js

@@ -0,0 +1,46 @@
+module.exports = {
+  appId: 'com.carryyourlive.desktop',
+  productName: 'Carry Your Live',
+  copyright: 'Copyright © 2026',
+
+  directories: {
+    output: 'desktop-build',
+    buildResources: 'build',
+  },
+
+  // Override the entry point in the packaged app (repo keeps expo-router/entry
+  // as `main` so `expo start` keeps working).
+  extraMetadata: {
+    main: 'electron/main.js',
+  },
+
+  // The Electron shell needs zero runtime dependencies: main/preload use Node
+  // built-ins only, and the renderer is fully bundled by Metro into dist/.
+  // Returning false tells electron-builder that node_modules are handled
+  // externally — i.e. don't bundle production deps (expo, react-native, ...)
+  // into the package. This keeps the deb ~100x smaller.
+  // NOTE: do not set npmRebuild:false here — installAppDependencies()
+  // short-circuits on it *before* evaluating beforeBuild, which would
+  // re-enable bundling of node_modules.
+  beforeBuild: async () => false,
+  // Sanity check validates the ORIGINAL package.json `main` (expo-router/entry)
+  // against the asar, which no longer exists once deps are excluded.
+  // The real entry point is set via extraMetadata.main above.
+  disableSanityCheckAsar: true,
+
+  files: ['dist/**/*', 'electron/**/*', 'assets/icon.png', 'package.json'],
+
+  // Icons are generated from build/icon.png (1024x1024) for each platform.
+  mac: {
+    category: 'public.app-category.productivity',
+    target: ['dmg', 'zip'],
+  },
+  win: {
+    target: ['nsis'],
+  },
+  linux: {
+    category: 'Productivity',
+    maintainer: 'carry-your-live',
+    target: ['deb', 'AppImage'],
+  },
+}

carry-your-live/electron/main.js

@@ -1,7 +1,9 @@
 /* global __dirname */
-const { app, BrowserWindow } = require('electron')
+const { app, BrowserWindow, ipcMain } = require('electron')
 const path = require('path')
 
+const DEV_SERVER_URL = process.env.ELECTRON_START_URL
+
 function createWindow() {
   const win = new BrowserWindow({
     width: 1200,
@@ -11,24 +13,39 @@ function createWindow() {
     webPreferences: {
       nodeIntegration: false,
       contextIsolation: true,
+      sandbox: true,
       webSecurity: true,
+      preload: path.join(__dirname, 'preload.js'),
     },
     icon: path.join(__dirname, '../assets/icon.png'),
     titleBarStyle: 'default',
     show: false,
   })
 
-  win.loadFile(path.join(__dirname, '../dist/index.html'))
+  if (DEV_SERVER_URL) {
+    win.loadURL(DEV_SERVER_URL)
+  } else {
+    win.loadFile(path.join(__dirname, '../dist/index.html'))
+  }
 
   win.once('ready-to-show', () => {
     win.show()
   })
 
-  win.on('closed', () => {
+  // In dev, reload instead of quitting when the renderer crashes / navigates away
-    app.quit()
+  win.webContents.on('didFailLoad', (_event, code, desc) => {
+    console.error(`[electron] failed to load: ${code} ${desc}`)
   })
+
+  return win
 }
 
+ipcMain.handle('app:get-info', () => ({
+  version: app.getVersion(),
+  name: app.getName(),
+  platform: process.platform,
+}))
+
 app.whenReady().then(createWindow)
 
 app.on('window-all-closed', () => {

carry-your-live/electron/preload.js

@@ -0,0 +1,6 @@
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('electron', {
+  isElectron: true,
+  getAppInfo: () => ipcRenderer.invoke('app:get-info'),
+})

carry-your-live/nginx.conf

@@ -1,21 +0,0 @@
-server {
-    listen 8081;
-    server_name localhost;
-    root /usr/share/nginx/html;
-    index index.html;
-
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-
-    location /api {
-        proxy_pass http://backend:3000;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-}

carry-your-live/package.json

@@ -2,6 +2,7 @@
   "name": "carry-your-live",
   "version": "1.0.0",
   "main": "expo-router/entry",
+  "homepage": "https://gitea.techmos.org/tech08mag/carry-your-live",
   "dependencies": {
     "@hookform/resolvers": "^3.3.4",
     "@nozbe/watermelondb": "^0.28.1-0",
@@ -9,8 +10,10 @@
     "@react-native-community/datetimepicker": "9.1.0",
     "date-fns": "^3.6.0",
     "expo": "~57.0.10",
+    "expo-blur": "~57.0.2",
     "expo-constants": "~57.0.9",
     "expo-dev-client": "~57.0.1",
+    "expo-device": "^57.0.1",
     "expo-linking": "~57.0.5",
     "expo-notifications": "~57.0.8",
     "expo-router": "~57.0.10",
@@ -33,6 +36,9 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@types/react": "~19.2.2",
+    "babel-preset-expo": "~57.0.0",
+    "electron": "^41.7.1",
+    "electron-builder": "^26.15.3",
     "eslint": "^9.0.0",
     "eslint-config-expo": "~57.0.1",
     "patch-package": "^8.0.1",
@@ -47,6 +53,11 @@
     "lint": "expo lint",
     "typecheck": "tsc --noEmit",
     "format": "prettier --write \"**/*.{ts,tsx,json,md}\"",
+    "export:web": "expo export --platform web",
+    "desktop": "electron electron/main.js",
+    "desktop:dev": "ELECTRON_START_URL=http://localhost:8081 electron electron/main.js",
+    "desktop:dist": "npm run export:web && electron-builder --config electron-builder.config.js",
+    "desktop:dir": "npm run export:web && electron-builder --dir --config electron-builder.config.js",
     "build:ios": "eas build --platform ios",
     "build:android": "eas build --platform android",
     "build:web": "eas build --platform web",

carry-your-live/src/components/CategoryEditorModal.tsx

@@ -1,12 +1,12 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
-import { Modal, View, Text, StyleSheet, TextInput, TouchableOpacity, ScrollView, KeyboardAvoidingView, Platform, Pressable } from 'react-native';
+import { Modal, View, Text, StyleSheet, TextInput, TouchableOpacity, ScrollView, KeyboardAvoidingView, Platform, Pressable, useWindowDimensions } from 'react-native';
 import Category from '@/models/Category';
 import { useSettings } from '@/theme';
 import { CATEGORY_COLORS } from '@/constants';
 import { createCategory, updateCategory, deleteCategory } from '@/utils/categoryActions';
 import { confirmAction } from '@/utils/confirm';
-import ColorPickerInput from '@/components/ColorPickerInput';
+import ColorWheel from '@/components/ColorWheel';
-import Svg, { Path } from 'react-native-svg';
+import Svg, { Path, Circle } from 'react-native-svg';
 
 interface CategoryEditorModalProps {
   visible: boolean;
@@ -20,6 +20,7 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
   const [name, setName] = useState('');
   const [color, setColor] = useState(CATEGORY_COLORS[0]);
   const [prevVisible, setPrevVisible] = useState(visible);
+  const { height: screenHeight } = useWindowDimensions();
 
   if (prevVisible !== visible) {
     setPrevVisible(visible);
@@ -45,8 +46,8 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
   const handleDelete = () => {
     if (!category || !canDelete) return;
     confirmAction({
-      title: 'Delete Category',
+      title: 'Delete Tag',
-      message: `Tasks in "${category.name}" will be moved to another category.`,
+      message: `Tasks in "${category.name}" will be moved to another tag.`,
       confirmLabel: 'Delete',
       destructive: true,
       onConfirm: async () => {
@@ -60,7 +61,8 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
     <Modal visible={visible} transparent animationType="fade" onRequestClose={onClose}>
       <KeyboardAvoidingView
         style={styles.fill}
-        behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        keyboardVerticalOffset={0}
       >
         <Pressable
           style={styles.overlay}
@@ -74,14 +76,16 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
             <ScrollView
               showsVerticalScrollIndicator={false}
               keyboardShouldPersistTaps="handled"
+              contentContainerStyle={styles.scrollContent}
             >
               <View style={styles.header}>
                 <Text style={[styles.title, { color: theme.text }]}>
-                  {category ? 'Edit Category' : 'New Category'}
+                  {category ? 'Edit Tag' : 'New Tag'}
                 </Text>
-                <TouchableOpacity onPress={onClose} style={styles.closeButton} hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }} accessibilityRole="button" accessibilityLabel="Close category editor">
+                <TouchableOpacity onPress={onClose} style={styles.closeButton} hitSlop={{ top: 12, bottom: 12, left: 12, right: 12 }} accessibilityRole="button" accessibilityLabel="Close tag editor">
-                  <Svg width={18} height={18} viewBox="0 0 24 24">
+                  <Svg width={22} height={22} viewBox="0 0 24 24">
-                    <Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.2} strokeLinecap="round" />
+                    <Circle cx={12} cy={12} r={10} fill={theme.cardAlt} />
+                    <Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.5} strokeLinecap="round" />
                   </Svg>
                 </TouchableOpacity>
               </View>
@@ -92,7 +96,7 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
                   styles.input,
                   { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
                 ]}
-                placeholder="Category name"
+                placeholder="Tag name"
                 placeholderTextColor={theme.textMuted}
                 value={name}
                 onChangeText={setName}
@@ -125,7 +129,7 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
                   </TouchableOpacity>
                 ))}
               </View>
-              <ColorPickerInput value={color} onChange={setColor} />
+              <ColorWheel color={color} onChange={setColor} />
 
               <View style={styles.actions}>
                 {category && (
@@ -171,10 +175,18 @@ const styles = StyleSheet.create({
   sheet: {
     width: '100%',
     maxWidth: 380,
-    maxHeight: '100%',
+    maxHeight: '90%',
     borderRadius: 16,
     padding: 20,
     gap: 8,
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 8 },
+    shadowOpacity: 0.25,
+    shadowRadius: 16,
+    elevation: 12,
+  },
+  scrollContent: {
+    minHeight: 200,
   },
   header: {
     flexDirection: 'row',
@@ -188,6 +200,8 @@ const styles = StyleSheet.create({
   },
   closeButton: {
     padding: 4,
+    borderRadius: 12,
+    backgroundColor: 'transparent',
   },
   label: {
     fontSize: 13,

carry-your-live/src/components/CategoryFilter.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
+import React, { useState } from 'react';
-import { View, Text, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
+import { Text, StyleSheet, ScrollView, TouchableOpacity, Animated } from 'react-native';
 import { useRouter } from 'expo-router';
 import { useUniqueCategories } from '@/hooks/useDatabase';
 import { useSettings, ThemeColors } from '@/theme';
@@ -17,6 +17,7 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
 
   const selectedSet = new Set(selected);
   const isAnythingSelected = selected.length > 0;
+  const [scaleAnim] = useState(new Animated.Value(1));
 
   const toggle = (id: string) => {
     const next = new Set(selectedSet);
@@ -28,6 +29,15 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
     onSelect(Array.from(next));
   };
 
+  const animatePress = (id: string, isPressing: boolean) => {
+    Animated.spring(scaleAnim, {
+      toValue: isPressing ? 0.92 : 1,
+      friction: 8,
+      tension: 100,
+      useNativeDriver: true,
+    }).start();
+  };
+
   return (
     <ScrollView
       horizontal
@@ -38,10 +48,14 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
       <CategoryButton
         id="all"
         name="All"
-        color="#9E9E9E"
+        color={theme.textMuted}
         selected={!isAnythingSelected}
         onPress={() => onSelect([])}
+        onPressIn={() => animatePress('all', true)}
+        onPressOut={() => animatePress('all', false)}
         theme={theme}
+        isAllCategory={true}
+        scaleAnim={scaleAnim}
       />
       {categories.map((category) => (
         <CategoryButton
@@ -51,7 +65,10 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
           color={category.color}
           selected={selectedSet.has(category.id)}
           onPress={() => toggle(category.id)}
+          onPressIn={() => animatePress(category.id, true)}
+          onPressOut={() => animatePress(category.id, false)}
           theme={theme}
+          scaleAnim={scaleAnim}
         />
       ))}
       <TouchableOpacity
@@ -59,7 +76,7 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
         onPress={() => router.push('/settings')}
         activeOpacity={0.7}
         accessibilityRole="button"
-        accessibilityLabel="Manage categories"
+        accessibilityLabel="Manage tags"
         hitSlop={{ top: 8, bottom: 8, left: 4, right: 4 }}
       >
         <Svg width={14} height={14} viewBox="0 0 24 24">
@@ -80,34 +97,43 @@ interface CategoryButtonProps {
   color: string;
   selected: boolean;
   onPress: () => void;
+  onPressIn: () => void;
+  onPressOut: () => void;
   theme: ThemeColors;
+  isAllCategory?: boolean;
+  scaleAnim: Animated.Value;
 }
 
-function CategoryButton({ name, color, selected, onPress, theme }: CategoryButtonProps) {
+function CategoryButton({ color, selected, onPress, onPressIn, onPressOut, theme, isAllCategory, scaleAnim }: CategoryButtonProps) {
+  const animatedStyle = {
+    transform: [{ scale: scaleAnim }],
+    shadowColor: selected ? theme.accent : '#000',
+    shadowOffset: { width: 0, height: selected ? 4 : 2 },
+    shadowOpacity: selected ? 0.25 : 0.1,
+    shadowRadius: selected ? 8 : 4,
+    elevation: selected ? 6 : 2,
+  };
+
   return (
     <TouchableOpacity
       style={[
         styles.button,
-        { backgroundColor: theme.card, borderColor: theme.borderStrong },
+        { backgroundColor: color },
-        selected && { borderColor: theme.accent, backgroundColor: theme.accentSoft },
+        selected && styles.buttonSelected,
+        animatedStyle,
       ]}
       onPress={onPress}
-      activeOpacity={0.8}
+      onPressIn={onPressIn}
-      hitSlop={{ top: 6, bottom: 6, left: 4, right: 4 }}
+      onPressOut={onPressOut}
+      activeOpacity={1}
+      hitSlop={{ top: 10, bottom: 10, left: 8, right: 8 }}
     >
-      <View
+      {isAllCategory ? (
-        style={[
+        <Svg width={20} height={20} viewBox="0 0 24 24">
-          styles.colorDot,
+          <Circle cx={12} cy={12} r={9} stroke="#FFFFFF" strokeWidth={2.5} fill="none" opacity={0.9} />
-          { backgroundColor: color },
+          <Path d="M6 12l4 4 8-8" stroke="#FFFFFF" strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" opacity={0.9} />
-        ]}
+        </Svg>
-      />
+      ) : null}
-      <Text style={[
-        styles.buttonText,
-        { color: theme.textSecondary },
-        selected && { color: theme.text, fontWeight: '600' },
-      ]}>
-        {name}
-      </Text>
     </TouchableOpacity>
   );
 }
@@ -122,24 +148,27 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   button: {
-    flexDirection: 'row',
+    width: 44,
+    height: 44,
+    borderRadius: 22,
+    borderWidth: 2,
+    borderColor: 'transparent',
     alignItems: 'center',
-    paddingHorizontal: 12,
-    paddingVertical: 10,
-    borderRadius: 18,
-    borderWidth: 1.5,
-    minHeight: 38,
     justifyContent: 'center',
-    gap: 8,
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
   },
-  colorDot: {
+  buttonSelected: {
-    width: 8,
+    borderColor: '#FFFFFF',
-    height: 8,
+    borderWidth: 3,
-    borderRadius: 4,
+    shadowColor: '#000',
-  },
+    shadowOffset: { width: 0, height: 4 },
-  buttonText: {
+    shadowOpacity: 0.25,
-    fontSize: 12,
+    shadowRadius: 8,
-    fontWeight: '500',
+    elevation: 6,
   },
   manageButton: {
     alignSelf: 'center',

carry-your-live/src/components/CategorySelector.tsx

@@ -68,7 +68,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
           <Path d="M9 18l6-6-6-6" stroke={theme.textSecondary} strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
         </Svg>
       </TouchableOpacity>
-      {error && <Text style={[styles.errorText, { color: '#E53935' }]}>{error}</Text>}
+      {error && <Text style={[styles.errorText, { color: theme.dangerStrong }]}>{error}</Text>}
 
       <Modal visible={showModal} transparent animationType="fade" onRequestClose={() => setShowModal(false)}>
         <KeyboardAvoidingView

carry-your-live/src/components/ColorPickerInput.native.tsx

@@ -26,9 +26,12 @@ export default function NativeColorPickerInput({ value, onChange }: ColorPickerI
 
   return (
     <View style={styles.row}>
-      <View style={[styles.preview, { backgroundColor: valid ? value : theme.borderStrong, borderColor: theme.borderStrong }]} />
+      <View style={[
-      <View style={[styles.inputWrap, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong }]}>
+        styles.preview,
-        <Text style={[styles.hash, { color: theme.textMuted }]}>#</Text>
+        { backgroundColor: valid ? value : theme.accentSoft, borderColor: theme.accent },
+      ]} />
+      <View style={styles.inputWrap}>
+        <Text style={styles.hash}>#{/**/}</Text>
         <TextInput
           style={[styles.input, { color: theme.text }]}
           value={hex}
@@ -40,7 +43,7 @@ export default function NativeColorPickerInput({ value, onChange }: ColorPickerI
           maxLength={6}
         />
       </View>
-      <Text style={[styles.hint, { color: theme.textMuted }]}>Hex code</Text>
+      <Text style={styles.hint}>{/**/}Hex code</Text>
     </View>
   );
 }

carry-your-live/src/components/ColorPickerInput.web.tsx

@@ -28,13 +28,13 @@ export default function WebColorPickerInput({ value, onChange }: ColorPickerInpu
           width: 44,
           height: 44,
           padding: 0,
-          border: `1px solid ${theme.borderStrong}`,
+          border: `1px solid ${theme.accent}`,
           borderRadius: 12,
           backgroundColor: 'transparent',
           cursor: 'pointer',
         },
       })}
-      <Text style={[styles.hexText, { color: theme.textSecondary }]}>{normalized}</Text>
+      <Text style={[styles.hexText, { color: theme.accent }]}>{normalized}</Text>
     </View>
   );
 }

carry-your-live/src/components/DateTimePicker.tsx

@@ -49,7 +49,7 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
               styles.pickerButton,
               { backgroundColor: theme.inputBg, borderColor: theme.borderStrong },
               field.value && { borderColor: theme.accent, backgroundColor: theme.accentSoft },
-              fieldName === 'endTime' && endTimeInvalid && { borderColor: '#E53935', backgroundColor: theme.accentSoft },
+              fieldName === 'endTime' && endTimeInvalid && { borderColor: theme.dangerStrong, backgroundColor: theme.accentSoft },
             ]}
             onPress={onPress}
             activeOpacity={0.8}
@@ -150,6 +150,28 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
             );
           }}
         />
+        <TouchableOpacity
+          style={[styles.calendarButton, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong }]}
+          onPress={() => setPicker('date')}
+          activeOpacity={0.8}
+          accessibilityLabel="Open calendar"
+          hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
+        >
+          <Svg width={22} height={22} viewBox="0 0 24 24">
+            <Path
+              d="M8 2v4M16 2v4M3 10h18M3 18h18"
+              stroke={theme.textSecondary}
+              strokeWidth={1.8}
+              strokeLinecap="round"
+            />
+            <Path
+              d="M10 2H14a2 2 0 0 1 2 2v16a2 2 0 0 1-2 2H10a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2z"
+              stroke={theme.textSecondary}
+              strokeWidth={1.8}
+              fill="none"
+            />
+          </Svg>
+        </TouchableOpacity>
       </View>
       <Controller
         control={control}
@@ -181,12 +203,12 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
           </View>
 
           {endTimeInvalid && (
-            <View style={[styles.warningRow, { backgroundColor: theme.accentSoft, borderColor: '#E53935' }]}>
+            <View style={[styles.warningRow, { backgroundColor: theme.accentSoft, borderColor: theme.dangerStrong }]}>
               <Svg width={14} height={14} viewBox="0 0 24 24">
-                <Circle cx={12} cy={12} r={10} stroke="#EF5350" strokeWidth={1.8} fill="none" />
+                <Circle cx={12} cy={12} r={10} stroke={theme.dangerStrong} strokeWidth={1.8} fill="none" />
-                <Path d="M12 8v5M12 16.5v.5" stroke="#E53935" strokeWidth={1.8} strokeLinecap="round" />
+                <Path d="M12 8v5M12 16.5v.5" stroke={theme.dangerStrong} strokeWidth={1.8} strokeLinecap="round" />
               </Svg>
-              <Text style={[styles.warningText, { color: '#E53935' }]}>
+              <Text style={[styles.warningText, { color: theme.dangerStrong }]}>
                 {endTime === startTime
                   ? 'The end time is the same as the start time.'
                   : 'The end time is before the start time.'}
@@ -299,6 +321,14 @@ const styles = StyleSheet.create({
     borderRadius: 10,
     borderWidth: 1,
   },
+  calendarButton: {
+    width: 52,
+    height: 52,
+    borderRadius: 12,
+    borderWidth: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
   warningText: {
     fontSize: 13,
     fontWeight: '500',

carry-your-live/src/components/DescriptionInput.tsx

@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { View, Text, StyleSheet, TextInput , TextInputProps } from 'react-native';
-import { useSettings } from '@/theme';
+import { useSettings, type ThemeColors } from '@/theme';
 
 interface DescriptionInputProps extends TextInputProps {
   error?: string;
@@ -8,6 +8,7 @@ interface DescriptionInputProps extends TextInputProps {
 
 export function DescriptionInput({ error, ...props }: DescriptionInputProps) {
   const { theme } = useSettings();
+  const styles = useMemo(() => createStyles(theme), [theme]);
 
   return (
     <View style={styles.container}>
@@ -35,7 +36,7 @@ export function DescriptionInput({ error, ...props }: DescriptionInputProps) {
   );
 }
 
-const styles = StyleSheet.create({
+const createStyles = (theme: ThemeColors) => StyleSheet.create({
   container: {
     gap: 5,
   },
@@ -51,7 +52,7 @@ const styles = StyleSheet.create({
     fontSize: 14,
   },
   inputError: {
-    borderColor: '#E53935',
+    borderColor: theme.dangerStrong,
     borderWidth: 1.5,
   },
   charCount: {
@@ -61,7 +62,7 @@ const styles = StyleSheet.create({
   },
   errorText: {
     fontSize: 11,
-    color: '#E53935',
+    color: theme.dangerStrong,
     marginLeft: 4,
   },
 });

carry-your-live/src/components/FloatingActionButton.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { StyleSheet, TouchableOpacity, Animated, Easing } from 'react-native';
+import { StyleSheet, TouchableOpacity, Animated, Easing, View, Text } from 'react-native';
 import { useRouter } from 'expo-router';
 import Svg, { Path } from 'react-native-svg';
 import { useSettings } from '@/theme';
@@ -70,7 +70,7 @@ export function FloatingActionButton() {
         >
           <Svg width={24} height={24} viewBox="0 0 24 24">
             <Path
-              d="M12 5v14M5 12h14"
+              d="M12 19V5M12 5l-5 5M12 5l5 5"
               stroke={theme.accentText}
               strokeWidth={2.5}
               strokeLinecap="round"
@@ -79,6 +79,9 @@ export function FloatingActionButton() {
           </Svg>
         </Animated.View>
       </TouchableOpacity>
+      <View style={styles.labelContainer}>
+        <Text style={[styles.label, { color: theme.accentText }]}>Add a Task</Text>
+      </View>
     </Animated.View>
   );
 }
@@ -92,6 +95,7 @@ const styles = StyleSheet.create({
     shadowOpacity: 0.3,
     shadowRadius: 12,
     elevation: 6,
+    alignItems: 'flex-end',
   },
   button: {
     width: 56,
@@ -100,4 +104,16 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center',
   },
+  labelContainer: {
+    marginTop: 8,
+    paddingHorizontal: 12,
+    paddingVertical: 4,
+    borderRadius: 12,
+    backgroundColor: 'rgba(0,0,0,0.6)',
+  },
+  label: {
+    fontSize: 12,
+    fontWeight: '600',
+    textAlign: 'center',
+  },
 });

carry-your-live/src/components/ForgotPasswordModal.tsx

@@ -0,0 +1,279 @@
+import React, { useState } from 'react';
+import {
+  Modal,
+  View,
+  Text,
+  StyleSheet,
+  TextInput,
+  TouchableOpacity,
+  KeyboardAvoidingView,
+  ActivityIndicator,
+  Alert,
+} from 'react-native';
+import { useSettings } from '@/theme';
+import { forgotPassword, resetPassword } from '@/services/auth';
+
+interface ForgotPasswordModalProps {
+  visible: boolean;
+  onClose: () => void;
+}
+
+type ForgotPasswordStep = 'enterUsername' | 'enterResetCode';
+
+export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalProps) {
+  const { theme } = useSettings();
+  const [step, setStep] = useState<ForgotPasswordStep>('enterUsername');
+  const [username, setUsername] = useState('');
+  const [resetToken, setResetToken] = useState('');
+  const [newPassword, setNewPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [busy, setBusy] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  if (!visible) return null;
+
+  const handleRequestReset = async () => {
+    if (busy) return;
+    if (!username.trim()) {
+      setError('Username is required');
+      return;
+    }
+    setBusy(true);
+    setError(null);
+    try {
+      const result = await forgotPassword(username.trim());
+      if (result.success) {
+        if (result.resetToken) {
+          Alert.alert('Reset Token (Dev Mode)', `Your reset token is: ${result.resetToken}\n\nEnter this token on the next screen.`, [
+            { text: 'OK', onPress: () => setStep('enterResetCode') },
+          ]);
+        } else {
+          Alert.alert('Reset Email Sent', 'If the account exists, a password reset link has been sent.', [
+            { text: 'OK', onPress: () => setStep('enterResetCode') },
+          ]);
+        }
+      } else {
+        setError('Failed to request password reset');
+      }
+    } catch (err: any) {
+      setError(err?.message ?? 'Failed to request password reset');
+    } finally {
+      setBusy(false);
+    }
+  };
+
+  const handleResetPassword = async () => {
+    if (busy) return;
+    if (!resetToken.trim()) {
+      setError('Reset token is required');
+      return;
+    }
+    if (newPassword.length < 8) {
+      setError('Password must be at least 8 characters');
+      return;
+    }
+    if (newPassword !== confirmPassword) {
+      setError('Passwords do not match');
+      return;
+    }
+    setBusy(true);
+    setError(null);
+    try {
+      const result = await resetPassword(resetToken.trim(), newPassword);
+      if (result.success) {
+        Alert.alert('Password Reset', 'Your password has been reset successfully.', [
+          { text: 'OK', onPress: onClose },
+        ]);
+      } else {
+        setError('Failed to reset password');
+      }
+    } catch (err: any) {
+      setError(err?.message ?? 'Failed to reset password. Token may be invalid or expired.');
+    } finally {
+      setBusy(false);
+    }
+  };
+
+  const handleBack = () => {
+    if (step === 'enterResetCode') {
+      setStep('enterUsername');
+      setResetToken('');
+      setNewPassword('');
+      setConfirmPassword('');
+      setError(null);
+    } else {
+      onClose();
+    }
+  };
+
+  const renderEnterUsername = () => (
+    <View style={styles.body}>
+      <Text style={[styles.subtitle, { color: theme.textSecondary }]}>
+        Enter your username to receive a password reset link.
+      </Text>
+      <TextInput
+        style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
+        placeholder="Username"
+        placeholderTextColor={theme.textMuted}
+        value={username}
+        onChangeText={setUsername}
+        autoCapitalize="none"
+        autoCorrect={false}
+      />
+      {error && <Text style={[styles.errorText, { color: theme.dangerStrong }]}>{error}</Text>}
+      <TouchableOpacity
+        style={[styles.primaryButton, { backgroundColor: theme.accent }]}
+        onPress={handleRequestReset}
+        disabled={busy}
+        activeOpacity={0.8}
+      >
+        {busy ? (
+          <ActivityIndicator color={theme.accentText} />
+        ) : (
+          <Text style={[styles.primaryButtonText, { color: theme.accentText }]}>Send Reset Link</Text>
+        )}
+      </TouchableOpacity>
+    </View>
+  );
+
+  const renderEnterResetCode = () => (
+    <View style={styles.body}>
+      <Text style={[styles.subtitle, { color: theme.textSecondary }]}>
+        Enter the reset token and your new password.
+      </Text>
+      <TextInput
+        style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
+        placeholder="Reset Token"
+        placeholderTextColor={theme.textMuted}
+        value={resetToken}
+        onChangeText={setResetToken}
+        autoCapitalize="none"
+        autoCorrect={false}
+      />
+      <TextInput
+        style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
+        placeholder="New Password (min 8 chars)"
+        placeholderTextColor={theme.textMuted}
+        value={newPassword}
+        onChangeText={setNewPassword}
+        secureTextEntry
+      />
+      <TextInput
+        style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
+        placeholder="Confirm New Password"
+        placeholderTextColor={theme.textMuted}
+        value={confirmPassword}
+        onChangeText={setConfirmPassword}
+        secureTextEntry
+      />
+      {error && <Text style={[styles.errorText, { color: theme.dangerStrong }]}>{error}</Text>}
+      <TouchableOpacity
+        style={[styles.primaryButton, { backgroundColor: theme.accent }]}
+        onPress={handleResetPassword}
+        disabled={busy}
+        activeOpacity={0.8}
+      >
+        {busy ? (
+          <ActivityIndicator color={theme.accentText} />
+        ) : (
+          <Text style={[styles.primaryButtonText, { color: theme.accentText }]}>Reset Password</Text>
+        )}
+      </TouchableOpacity>
+    </View>
+  );
+
+  return (
+    <Modal visible={visible} transparent animationType="fade" onRequestClose={handleBack}>
+      <KeyboardAvoidingView
+        style={styles.overlay}
+        behavior="padding"
+      >
+        <TouchableOpacity style={styles.backdrop} activeOpacity={1} onPress={handleBack} />
+        <View style={[styles.sheet, { backgroundColor: theme.sheetBg }]}>
+          <View style={[styles.handle, { backgroundColor: theme.borderStrong }]} />
+          <Text style={[styles.title, { color: theme.text }]}>Reset Password</Text>
+
+          {step === 'enterUsername' ? renderEnterUsername() : renderEnterResetCode()}
+
+          <TouchableOpacity
+            style={[styles.secondaryButton, { borderColor: theme.borderStrong }]}
+            onPress={handleBack}
+            activeOpacity={0.7}
+          >
+            <Text style={[styles.secondaryButtonText, { color: theme.textSecondary }]}>Cancel</Text>
+          </TouchableOpacity>
+        </View>
+      </KeyboardAvoidingView>
+    </Modal>
+  );
+}
+
+const styles = StyleSheet.create({
+  overlay: {
+    flex: 1,
+    justifyContent: 'flex-end',
+  },
+  backdrop: {
+    flex: 1,
+    backgroundColor: 'rgba(0,0,0,0.4)',
+  },
+  sheet: {
+    borderTopLeftRadius: 24,
+    borderTopRightRadius: 24,
+    paddingTop: 8,
+    paddingHorizontal: 20,
+    paddingBottom: 32,
+  },
+  handle: {
+    width: 40,
+    height: 4,
+    borderRadius: 2,
+    alignSelf: 'center',
+    marginBottom: 12,
+  },
+  title: {
+    fontSize: 18,
+    fontWeight: '700',
+    textAlign: 'center',
+    marginBottom: 16,
+  },
+  body: {
+    gap: 12,
+    marginBottom: 16,
+  },
+  subtitle: {
+    fontSize: 14,
+  },
+  input: {
+    borderRadius: 12,
+    borderWidth: 1,
+    paddingHorizontal: 14,
+    paddingVertical: 12,
+    fontSize: 15,
+  },
+  primaryButton: {
+    paddingVertical: 14,
+    borderRadius: 12,
+    alignItems: 'center',
+    justifyContent: 'center',
+    minHeight: 50,
+  },
+  primaryButtonText: {
+    fontSize: 15,
+    fontWeight: '700',
+  },
+  secondaryButton: {
+    paddingVertical: 12,
+    borderRadius: 12,
+    borderWidth: 1,
+    alignItems: 'center',
+  },
+  secondaryButtonText: {
+    fontSize: 15,
+    fontWeight: '600',
+  },
+  errorText: {
+    fontSize: 13,
+    fontWeight: '500',
+  },
+});

carry-your-live/src/components/QuickAddBar.tsx

@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useMemo, useRef } from 'react';
-import { View, StyleSheet, TextInput, TouchableOpacity, Keyboard, Text } from 'react-native';
+import { View, StyleSheet, TextInput, TouchableOpacity, Keyboard, Text, Platform } from 'react-native';
+import { BlurView } from 'expo-blur';
 import { database, collections } from '@/database';
 import { useCategories } from '@/hooks/useDatabase';
 import { useSettings } from '@/theme';
@@ -13,6 +14,21 @@ interface QuickAddBarProps {
   placeholder?: string;
 }
 
+const BlurContainer = ({ children, style, theme }: { children: React.ReactNode; style: any; theme: any }) => {
+  if (Platform.OS === 'web') {
+    return (
+      <View style={[style, { backgroundColor: theme.card, borderWidth: 1, borderColor: theme.border }]}>
+        {children}
+      </View>
+    );
+  }
+  return (
+    <BlurView style={style} intensity={80} tint="dark">
+      {children}
+    </BlurView>
+  );
+};
+
 export function QuickAddBar({ dueDate = 0, placeholder }: QuickAddBarProps) {
   const { theme, defaultCategoryId } = useSettings();
   const categories = useCategories();
@@ -25,7 +41,7 @@ export function QuickAddBar({ dueDate = 0, placeholder }: QuickAddBarProps) {
     () => categories.filter((c) => c.name.toLowerCase() !== 'calendar'),
     [categories]
   );
-  const categoryColor = visibleCategories.find((c) => c.id === categoryId)?.color ?? '#9E9E9E';
+  const categoryColor = visibleCategories.find((c) => c.id === categoryId)?.color ?? theme.textMuted;
 
   useEffect(() => {
     return subscribeToQuickAdd(() => {
@@ -66,58 +82,57 @@ export function QuickAddBar({ dueDate = 0, placeholder }: QuickAddBarProps) {
 
   return (
     <View style={styles.wrapper}>
-      <View style={[styles.bar, { backgroundColor: theme.card, borderColor: theme.border }]}>
+      <BlurContainer theme={theme} style={styles.blurContainer}>
-        <TouchableOpacity
+        <View style={[styles.bar, { backgroundColor: 'rgba(255,255,255,0.05)', borderColor: 'rgba(255,255,255,0.1)' }]}>
-          style={[styles.categoryButton, { borderColor: theme.borderStrong, backgroundColor: theme.cardAlt }]}
+          <TouchableOpacity
-          onPress={() => setCategoryPickerVisible(true)}
+            style={[styles.categoryButton, { borderColor: theme.borderStrong, backgroundColor: theme.cardAlt }]}
-          activeOpacity={0.7}
+            onPress={() => setCategoryPickerVisible(true)}
-          accessibilityLabel="Select category"
+            activeOpacity={0.7}
-        >
+            accessibilityLabel="Select tags"
-          <View style={[styles.categoryButtonDot, { backgroundColor: categoryColor }]} />
+          >
-          <Svg width={12} height={12} viewBox="0 0 24 24">
+            <View style={[styles.categoryButtonDot, { backgroundColor: categoryColor }]} />
-            <Path d="M6 9l6 6 6-6" stroke={theme.textSecondary} strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
+            <Svg width={12} height={12} viewBox="0 0 24 24">
-          </Svg>
+              <Path d="M6 9l6 6 6-6" stroke={theme.textSecondary} strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
-        </TouchableOpacity>
+            </Svg>
-        <TextInput
+          </TouchableOpacity>
-          ref={inputRef}
+          <TextInput
-          style={[styles.input, { color: theme.text }]}
+            ref={inputRef}
-          placeholder={placeholder ?? 'Add a task'}
+            style={[styles.input, { color: theme.text }]}
-          placeholderTextColor={theme.textMuted}
+            placeholder={placeholder ?? 'Add a task'}
-          value={title}
+            placeholderTextColor={theme.textMuted}
-          onChangeText={setTitle}
+            value={title}
-          onSubmitEditing={handleAdd}
+            onChangeText={setTitle}
-          returnKeyType="done"
+            onSubmitEditing={handleAdd}
-          accessibilityLabel="Quick add task"
+            returnKeyType="done"
-          accessibilityHint="Enter a task name and press the add button"
+            accessibilityLabel="Quick add task"
-        />
+            accessibilityHint="Enter a task name and press the add button"
-        <TouchableOpacity
+          />
-          style={[styles.submit, { backgroundColor: theme.accent }, title.trim() ? {} : styles.submitDisabled]}
+          <TouchableOpacity
-          onPress={title.trim() ? handleAdd : undefined}
+            style={[styles.submit, { backgroundColor: theme.accent }, title.trim() ? {} : styles.submitDisabled]}
-          disabled={!title.trim()}
+            onPress={title.trim() ? handleAdd : undefined}
-          activeOpacity={0.8}
+            disabled={!title.trim()}
-          accessibilityLabel="Add task"
+            activeOpacity={0.8}
-          accessibilityHint="Adds the entered task to the list"
+            accessibilityLabel="Add task"
-          accessibilityState={{ disabled: !title.trim() }}
+            accessibilityHint="Adds the entered task to the list"
-        >
+            accessibilityState={{ disabled: !title.trim() }}
-          <View style={styles.submitLabelRow}>
+          >
-            <Text style={[styles.submitText, { color: theme.accentText }]}>Add a Task</Text>
+            <Svg width={20} height={20} viewBox="0 0 24 24">
-            <Svg width={18} height={18} viewBox="0 0 24 24">
               <Path
-                d="M12 5v14M12 5l-5 5M12 5l5 5"
+                d="M12 19V5M12 5l-5 5M12 5l5 5"
                 stroke={theme.accentText}
                 strokeWidth={2.5}
                 strokeLinecap="round"
                 strokeLinejoin="round"
               />
             </Svg>
-          </View>
+          </TouchableOpacity>
-        </TouchableOpacity>
+        </View>
-      </View>
+      </BlurContainer>
 
       <OptionPickerModal
         visible={categoryPickerVisible}
-        title="Select Category"
+        title="Select Tags"
-        options={[{ value: '', label: 'None', color: '#9E9E9E' }, ...visibleCategories.map((c) => ({ value: c.id, label: c.name, color: c.color }))]}
+        options={[{ value: '', label: 'None', color: theme.textMuted }, ...visibleCategories.map((c) => ({ value: c.id, label: c.name, color: c.color }))]}
         selectedValue={categoryId}
         onSelect={(value) => setCategoryId(Array.isArray(value) ? value[0] : value)}
         onClose={() => setCategoryPickerVisible(false)}
@@ -130,6 +145,11 @@ const styles = StyleSheet.create({
   wrapper: {
     paddingHorizontal: 8,
     paddingTop: 4,
+    paddingBottom: 8,
+  },
+  blurContainer: {
+    borderRadius: 14,
+    overflow: 'hidden',
   },
   bar: {
     flexDirection: 'row',
@@ -145,6 +165,7 @@ const styles = StyleSheet.create({
     shadowOpacity: 0.10,
     shadowRadius: 6,
     elevation: 6,
+    minHeight: 56,
   },
   categoryButton: {
     flexDirection: 'row',

carry-your-live/src/components/SyncModal.tsx

@@ -12,6 +12,8 @@ import {
 import { useSettings } from '@/theme';
 import { AuthUser, getAuthToken, getAuthUser, login, register, signOutAuth } from '@/services/auth';
 import { runSyncGuarded, startAutoSync, stopAutoSync, getLastSyncTime, SyncResult } from '@/database/sync';
+import { ForgotPasswordModal } from './ForgotPasswordModal';
+import { registerForPushNotificationsAsync, unregisterForPushNotificationsAsync } from '@/services/pushNotifications';
 
 interface SyncModalProps {
   visible: boolean;
@@ -34,6 +36,7 @@ export function SyncModal({ visible, onClose }: SyncModalProps) {
   const [lastSync, setLastSync] = useState<number | null>(null);
   const [result, setResult] = useState<SyncResult | null>(null);
   const [prevVisible, setPrevVisible] = useState(visible);
+  const [showForgotPassword, setShowForgotPassword] = useState(false);
 
   if (prevVisible !== visible) {
     setPrevVisible(visible);
@@ -83,6 +86,7 @@ export function SyncModal({ visible, onClose }: SyncModalProps) {
         : await login(username.trim(), password);
       setUser(authedUser);
       startAutoSync();
+      registerForPushNotificationsAsync().catch(() => {});
     } catch (err: any) {
       setError(err?.message ?? 'Sign in failed');
     } finally {
@@ -115,6 +119,7 @@ export function SyncModal({ visible, onClose }: SyncModalProps) {
   const handleSignOut = async () => {
     await signOutAuth();
     stopAutoSync();
+    unregisterForPushNotificationsAsync().catch(() => {});
     setUser(null);
     setError(null);
     setStatus('idle');
@@ -159,7 +164,7 @@ export function SyncModal({ visible, onClose }: SyncModalProps) {
               </TouchableOpacity>
 
               {status === 'success' && result && (
-                <Text style={[styles.successText, { color: '#43A047' }]}>
+                <Text style={[styles.successText, { color: theme.successStrong }]}>
                   Synced! {result.pushed.tasks + result.pulled.tasks} tasks,{' '}
                   {result.pushed.categories + result.pulled.categories} categories,{' '}
                   {result.pushed.subtasks + result.pulled.subtasks} subtasks,{' '}
@@ -168,7 +173,7 @@ export function SyncModal({ visible, onClose }: SyncModalProps) {
                 </Text>
               )}
               {status === 'error' && error && (
-                <Text style={[styles.errorText, { color: '#E53935' }]}>{error}</Text>
+                <Text style={[styles.errorText, { color: theme.dangerStrong }]}>{error}</Text>
               )}
 
               <TouchableOpacity
@@ -176,7 +181,7 @@ export function SyncModal({ visible, onClose }: SyncModalProps) {
                 onPress={handleSignOut}
                 activeOpacity={0.7}
               >
-                <Text style={[styles.secondaryButtonText, { color: '#E53935' }]}>Sign Out</Text>
+                <Text style={[styles.secondaryButtonText, { color: theme.dangerStrong }]}>Sign Out</Text>
               </TouchableOpacity>
             </View>
           ) : (
@@ -234,7 +239,17 @@ export function SyncModal({ visible, onClose }: SyncModalProps) {
                 secureTextEntry
               />
 
-              {error && <Text style={[styles.errorText, { color: '#E53935' }]}>{error}</Text>}
+              {mode === 'login' && (
+                <TouchableOpacity
+                  style={styles.forgotPasswordLink}
+                  onPress={() => setShowForgotPassword(true)}
+                  activeOpacity={0.7}
+                >
+                  <Text style={[styles.forgotPasswordText, { color: theme.accent }]}>Forgot Password?</Text>
+                </TouchableOpacity>
+              )}
+
+              {error && <Text style={[styles.errorText, { color: theme.dangerStrong }]}>{error}</Text>}
 
               <TouchableOpacity
                 style={[styles.primaryButton, { backgroundColor: theme.accent }]}
@@ -253,6 +268,8 @@ export function SyncModal({ visible, onClose }: SyncModalProps) {
             </View>
           )}
 
+          <ForgotPasswordModal visible={showForgotPassword} onClose={() => setShowForgotPassword(false)} />
+
           <TouchableOpacity
             style={[styles.secondaryButton, { borderColor: theme.borderStrong }]}
             onPress={onClose}
@@ -374,4 +391,13 @@ const styles = StyleSheet.create({
     fontSize: 13,
     fontWeight: '500',
   },
+  forgotPasswordLink: {
+    alignSelf: 'flex-end',
+    marginTop: -4,
+    marginBottom: 8,
+  },
+  forgotPasswordText: {
+    fontSize: 13,
+    fontWeight: '500',
+  },
 });

carry-your-live/src/components/SyncStatus.tsx

@@ -66,14 +66,14 @@ export default function SyncStatus({ compact = false }: SyncStatusProps) {
       case 'success':
         return (
           <Svg width={16} height={16} viewBox="0 0 24 24">
-            <Path d="M5 12l5 5 9-10" stroke="#66BB6A" strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
+            <Path d="M5 12l5 5 9-10" stroke={theme.success} strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
           </Svg>
         );
       case 'error':
         return (
           <Svg width={16} height={16} viewBox="0 0 24 24">
-            <Circle cx={12} cy={12} r={10} stroke="#EF5350" strokeWidth={2} fill="none" />
+            <Circle cx={12} cy={12} r={10} stroke={theme.danger} strokeWidth={2} fill="none" />
-            <Path d="M12 8v4M12 16h.01" stroke="#EF5350" strokeWidth={2} strokeLinecap="round" />
+            <Path d="M12 8v4M12 16h.01" stroke={theme.danger} strokeWidth={2} strokeLinecap="round" />
           </Svg>
         );
       default:
@@ -128,7 +128,7 @@ export default function SyncStatus({ compact = false }: SyncStatusProps) {
       </View>
       {error && (
         <View style={styles.error}>
-          <Text style={[styles.errorText, { color: '#E53935' }]}>{error}</Text>
+          <Text style={[styles.errorText, { color: theme.dangerStrong }]}>{error}</Text>
         </View>
       )}
       <Text style={[styles.lastSync, { color: theme.textFaint }]}>

carry-your-live/src/components/TaskItem.tsx

@@ -3,7 +3,8 @@ import { View, Text, StyleSheet, TouchableOpacity, Animated, Platform, Dimension
 import { Swipeable, Gesture, GestureDetector, PanGestureHandler } from 'react-native-gesture-handler';
 import { TaskData, SubtaskData, Priority, Repeat, Reminder } from '@/types';
 import { PRIORITY_COLORS } from '@/constants';
-import { useSettings } from '@/theme';
+import { useSettings, mixHex } from '@/theme';
+import type { ThemeColors } from '@/theme';
 import Svg, { Path, Circle } from 'react-native-svg';
 
 export type TaskLike = {
@@ -46,7 +47,8 @@ interface TaskItemProps {
 }
 
 export const TaskItem = React.memo(function TaskItem({ task, onToggle, onDelete, onPress, onLongPress, onMenuOpen, selected, selectionMode, completedSection, draggable, hovered, onDragStart, onDragUpdate, onDragEnd, onReorderStart, onReorderUpdate, onReorderEnd, expanded, indented, depth = 0, categoryColor, categoryColors }: TaskItemProps) {
-  const { theme } = useSettings();
+  const { theme, deleteBySwipe } = useSettings();
+  const styles = React.useMemo(() => createStyles(theme), [theme]);
   const [opacityAnim] = React.useState(new Animated.Value(task.completed ? 0.5 : 1));
   const [dragTranslateX] = React.useState(new Animated.Value(0));
   const [dragTranslateY] = React.useState(new Animated.Value(0));
@@ -174,7 +176,9 @@ const renderLeftActions = (progress: Animated.AnimatedInterpolation<number>) =>
       renderRightActions={renderRightActions}
       renderLeftActions={renderLeftActions}
       onSwipeableRightOpen={() => {
-        onDelete?.();
+        if (deleteBySwipe) {
+          onDelete?.();
+        }
         swipeableRef.current?.close();
       }}
       onSwipeableLeftOpen={() => {
@@ -216,16 +220,9 @@ const renderLeftActions = (progress: Animated.AnimatedInterpolation<number>) =>
 <View style={styles.content}>
               <View style={styles.titleRow}>
                 <View style={styles.categoryDotSlot}>
-                  {(categoryColors ?? (categoryColor ? [categoryColor] : [])).slice(0, 3).map((color, i) => (
+                  {categoryColor && (
-                    <View
+                    <View style={[styles.categoryDot, { backgroundColor: categoryColor }]} />
-                      key={`${color}-${i}`}
+                  )}
-                      style={[
-                        styles.categoryDot,
-                        { backgroundColor: color },
-                        i > 0 && { marginLeft: -6 },
-                      ]}
-                    />
-                  ))}
                 </View>
                 <TouchableOpacity
                   style={styles.checkCircle}
@@ -242,7 +239,7 @@ const renderLeftActions = (progress: Animated.AnimatedInterpolation<number>) =>
                         <Path d="M7 12l3 3 7-7" stroke="#FFFFFF" strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
                       </>
                     ) : (
-                      <Circle cx={12} cy={12} r={10} stroke={isOverdue ? '#FF8A80' : theme.textSecondary} strokeWidth={2.5} fill="none" />
+                      <Circle cx={12} cy={12} r={10} stroke={isOverdue ? theme.danger : theme.textSecondary} strokeWidth={2.5} fill="none" />
                     )}
                   </Svg>
                 </TouchableOpacity>
@@ -403,7 +400,7 @@ function formatTime12(time: string): string {
   return `${h}:${String(minutes).padStart(2, '0')} ${period}`;
 }
 
-const styles = StyleSheet.create({
+const createStyles = (theme: ThemeColors) => StyleSheet.create({
   container: {
     flexDirection: 'row',
     alignItems: 'center',
@@ -426,10 +423,10 @@ const styles = StyleSheet.create({
     marginBottom: 4,
   },
   taskOverdue: {
-    borderColor: '#573431',
+    borderColor: theme.dangerBorder,
   },
   taskDueToday: {
-    borderColor: '#2C4766',
+    borderColor: mixHex(theme.info, theme.background, 0.55),
   },
   taskSelected: {
     shadowColor: '#000',
@@ -438,8 +435,8 @@ const styles = StyleSheet.create({
     elevation: 2,
   },
   taskHovered: {
-    borderColor: '#2C4766',
+    borderColor: mixHex(theme.info, theme.background, 0.55),
-    backgroundColor: 'rgba(44, 71, 102, 0.15)',
+    backgroundColor: mixHex(theme.info, theme.background, 0.85),
   },
   dragLifted: {
     zIndex: 100,
@@ -476,9 +473,9 @@ const styles = StyleSheet.create({
     marginRight: 8,
   },
   categoryDot: {
-    width: 10,
+    width: 12,
-    height: 10,
+    height: 12,
-    borderRadius: 5,
+    borderRadius: 6,
   },
   title: {
     fontSize: 17,
@@ -488,7 +485,7 @@ const styles = StyleSheet.create({
   },
   titleCompleted: {
     textDecorationLine: 'line-through',
-    color: '#9E9E9E',
+    color: theme.textMuted,
   },
   repeatIcon: {
     marginLeft: 8,
@@ -512,7 +509,7 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
   },
   titleOverdue: {
-    color: '#E57373',
+    color: theme.danger,
   },
   priorityBadge: {
     paddingHorizontal: 6,
@@ -530,14 +527,14 @@ const styles = StyleSheet.create({
     width: 20,
     height: 20,
     borderRadius: 10,
-    backgroundColor: '#43302E',
+    backgroundColor: theme.dangerSoft,
     alignItems: 'center',
     justifyContent: 'center',
   },
   assigneeText: {
     fontSize: 9,
     fontWeight: '700',
-    color: '#FF9C8F',
+    color: theme.danger,
   },
   dueRow: {
     flexDirection: 'row',
@@ -548,11 +545,11 @@ const styles = StyleSheet.create({
     fontSize: 13,
   },
   dueTextOverdue: {
-    color: '#E57373',
+    color: theme.danger,
     fontWeight: '600',
   },
   dueTextDueToday: {
-    color: '#64B5F6',
+    color: theme.info,
     fontWeight: '600',
   },
   menuButton: {
@@ -567,12 +564,12 @@ const styles = StyleSheet.create({
     paddingHorizontal: 6,
     paddingVertical: 2,
     borderRadius: 8,
-    backgroundColor: 'rgba(100, 181, 246, 0.15)',
+    backgroundColor: mixHex(theme.info, theme.background, 0.85),
   },
   allDayText: {
     fontSize: 11,
     fontWeight: '600',
-    color: '#64B5F6',
+    color: theme.info,
   },
   checkCircle: {
     width: 30,
@@ -589,12 +586,12 @@ const styles = StyleSheet.create({
     gap: 4,
   },
   swipeDelete: {
-    backgroundColor: '#B8504A',
+    backgroundColor: theme.dangerStrong,
     borderTopRightRadius: 16,
     borderBottomRightRadius: 16,
   },
   swipeComplete: {
-    backgroundColor: '#3D7A4A',
+    backgroundColor: theme.successStrong,
     borderTopLeftRadius: 16,
     borderBottomLeftRadius: 16,
   },

carry-your-live/src/components/TaskList.tsx

@@ -10,8 +10,9 @@ import { SubtaskItem } from './SubtaskItem';
 import { TaskData, SubtaskData, parseTaskTags } from '@/types';
 import Task from '@/models/Task';
 import { useSettings } from '@/theme';
+import { runSyncGuarded } from '@/database/sync';
 import {
-  toggleTaskComplete,
+  confirmAndToggleTaskComplete,
   deleteTask,
   setTaskCompleted,
   convertTaskToSubtask,
@@ -126,8 +127,13 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
     }, [refreshTasks, refreshSubtasks])
   );
 
-  const onRefresh = useCallback(() => {
+  const onRefresh = useCallback(async () => {
     setRefreshing(true);
+    try {
+      await runSyncGuarded();
+    } catch (error) {
+      if (__DEV__) console.warn('Sync failed:', error);
+    }
     refreshTasks();
     refreshSubtasks();
     setTimeout(() => setRefreshing(false), 600);
@@ -162,8 +168,7 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
   }, [onSelectionChange]);
 
   const handleToggle = useCallback(async (taskId: string) => {
-    await toggleTaskComplete(taskId);
+    await confirmAndToggleTaskComplete(taskId, () => refreshTasks());
-    refreshTasks();
   }, [refreshTasks]);
 
   const toggleExpand = useCallback(async (taskId: string) => {
@@ -329,8 +334,8 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
     }
   }, [findHoverTarget]);
 
-  const handleSubtaskDragStart = useCallback(async (subtaskId: string, parentTaskId: string) => {
+  const handleSubtaskDragStart = useCallback(async (subtaskId: string, parentTaskId: string, parentSubtaskId?: string) => {
-    subtaskDragRef.current = { subtaskId, parentTaskId, ...(await measureAll()) };
+    subtaskDragRef.current = { subtaskId, parentTaskId, parentSubtaskId, ...(await measureAll()) };
   }, [measureAll]);
 
   const handleSubtaskDragUpdate = useCallback((absoluteY: number) => {
@@ -356,7 +361,7 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
     }
   }, [findHoverTarget, calculateDropPosition, updateHoverTarget]);
 
-  const handleSubtaskDragEnd = useCallback(async (absoluteY: number) => {
+const handleSubtaskDragEnd = useCallback(async (absoluteY: number) => {
     const state = subtaskDragRef.current;
     subtaskDragRef.current = null;
     setHoverTaskId(null);
@@ -366,16 +371,15 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
     const target = findHoverTarget(absoluteY, state.subtaskId, state.positions, state.subPositions);
     if (target === state.subtaskId) return;
 
-    if (target) {
+    // Only allow dropping on tasks (not subtasks) to match task behavior
-      if (state.subPositions[target]) {
+    // Check if target exists in main task positions, not subtask positions
-        await setSubtaskParent(state.subtaskId, target);
+    const isTaskTarget = state.positions && target in state.positions;
-      } else if (target !== state.parentTaskId) {
+    if (target && isTaskTarget) {
-        await moveSubtaskToTask(state.subtaskId, target);
+      // Move subtask to target task - makes it a subtask of that task
-      }
+      // If no target or target is a subtask: do nothing (matches task behavior)
-    } else {
+      await moveSubtaskToTask(state.subtaskId, target);
-      await convertSubtaskToTask(state.subtaskId);
     }
-  }, [findHoverTarget]);
+  }, [findHoverTarget, moveSubtaskToTask]);
 
   const renderItem = useCallback(
     ({ item, index }: { item: Task; index: number }) => {
@@ -511,8 +515,8 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
           </TouchableOpacity>
           <Text style={[styles.selectionCount, { color: theme.text }]}>{selectedIds.size} selected</Text>
           <View style={styles.selectionActions}>
-            <SelectionButton label="Complete" color="#43A047" onPress={handleBulkComplete} />
+            <SelectionButton label="Complete" color={theme.successStrong} onPress={handleBulkComplete} />
-            <SelectionButton label="Delete" color="#E53935" onPress={handleBulkDelete} />
+            <SelectionButton label="Delete" color={theme.dangerStrong} onPress={handleBulkDelete} />
           </View>
         </View>
       )}

carry-your-live/src/components/TaskNameInput.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, Text, StyleSheet, TextInput , TextInputProps } from 'react-native';
-import { useSettings } from '@/theme';
+import { useSettings, type ThemeColors } from '@/theme';
 
 interface TaskNameInputProps extends TextInputProps {
   error?: string;
@@ -8,6 +8,7 @@ interface TaskNameInputProps extends TextInputProps {
 
 export function TaskNameInput({ error, ...props }: TaskNameInputProps) {
   const { theme } = useSettings();
+  const styles = React.useMemo(() => createStyles(theme), [theme]);
 
   return (
     <View style={styles.container}>
@@ -34,7 +35,7 @@ export function TaskNameInput({ error, ...props }: TaskNameInputProps) {
   );
 }
 
-const styles = StyleSheet.create({
+const createStyles = (theme: ThemeColors) => StyleSheet.create({
   container: {
     gap: 5,
   },
@@ -47,7 +48,7 @@ const styles = StyleSheet.create({
     fontWeight: '600',
   },
   required: {
-    color: '#E53935',
+    color: theme.dangerStrong,
     fontSize: 13,
     fontWeight: '600',
   },
@@ -59,12 +60,12 @@ const styles = StyleSheet.create({
     fontSize: 15,
   },
   inputError: {
-    borderColor: '#E53935',
+    borderColor: theme.dangerStrong,
     borderWidth: 1.5,
   },
   errorText: {
     fontSize: 11,
-    color: '#E53935',
+    color: theme.dangerStrong,
     marginLeft: 4,
   },
 });

carry-your-live/src/components/TaskOverflowMenu.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { View, Text, StyleSheet, Modal, TouchableOpacity } from 'react-native';
 import { useSettings } from '@/theme';
+import type { ThemeColors } from '@/theme';
 import { TaskData, SubtaskData } from '@/types';
 import Svg, { Path } from 'react-native-svg';
 
@@ -40,6 +41,7 @@ export function TaskOverflowMenu({
   onAddSubtask,
 }: TaskOverflowMenuProps) {
   const { theme } = useSettings();
+  const styles = React.useMemo(() => createStyles(theme), [theme]);
 
   if (!task) return null;
 
@@ -67,7 +69,7 @@ export function TaskOverflowMenu({
   if (!subtask) {
     actions.push({
       key: 'category',
-      label: 'Change Category',
+      label: 'Change Tags',
       icon: <Svg width={20} height={20} viewBox="0 0 24 24"><Circle2 /></Svg>,
       onPress: onChangeCategory ?? (() => {}),
     });
@@ -84,7 +86,7 @@ export function TaskOverflowMenu({
       key: 'delete',
       label: 'Delete',
       destructive: true,
-      icon: <Svg width={20} height={20} viewBox="0 0 24 24"><Path d="M4 7h16M9 7V4h6v3M6 7l1 13h10l1-13" stroke="#E57373" strokeWidth={2.2} strokeLinecap="round" strokeLinejoin="round" fill="none" /></Svg>,
+      icon: <Svg width={20} height={20} viewBox="0 0 24 24"><Path d="M4 7h16M9 7V4h6v3M6 7l1 13h10l1-13" stroke={theme.danger} strokeWidth={2.2} strokeLinecap="round" strokeLinejoin="round" fill="none" /></Svg>,
       onPress: onDelete,
     },
   );
@@ -144,7 +146,7 @@ function Circle2() {
   );
 }
 
-const styles = StyleSheet.create({
+const createStyles = (theme: ThemeColors) => StyleSheet.create({
   overlay: {
     flex: 1,
     justifyContent: 'flex-end',
@@ -185,7 +187,7 @@ const styles = StyleSheet.create({
     fontWeight: '500',
   },
   destructiveText: {
-    color: '#E53935',
+    color: theme.dangerStrong,
     fontWeight: '600',
   },
 });

carry-your-live/src/database/schema.ts

@@ -1,7 +1,7 @@
 import { appSchema, tableSchema } from '@nozbe/watermelondb';
 
 export const schema = appSchema({
-  version: 20,
+  version: 21,
   tables: [
     tableSchema({
       name: 'categories',
@@ -45,9 +45,8 @@ export const schema = appSchema({
       columns: [
         { name: 'task_id', type: 'string', isIndexed: true },
         { name: 'parent_subtask_id', type: 'string', isIndexed: true, isOptional: true },
-        { name: 'category_id', type: 'string', isOptional: true },
-        { name: 'tags', type: 'string', isOptional: true },
         { name: 'category_id', type: 'string', isIndexed: true, isOptional: true },
+        { name: 'tags', type: 'string', isOptional: true },
         { name: 'title', type: 'string' },
         { name: 'description', type: 'string', isOptional: true },
         { name: 'priority', type: 'string', isOptional: true },

carry-your-live/src/database/sync.ts

@@ -11,8 +11,10 @@ import RepeatProfile from '@/models/RepeatProfile';
 import Friendship from '@/models/Friendship';
 import { TombstoneEntity } from '@/models/Tombstone';
 import { fetchPendingTombstones, removeTombstonesInBatch } from './tombstones';
+import { useOnline } from '@/hooks/useOnline';
 
 const LAST_PULLED_AT_KEY = 'sync:lastPulledAt';
+const LAST_PUSHED_AT_KEY = 'sync:lastPushedAt';
 const LAST_RUN_AT_KEY = 'sync:lastRunAt';
 
 export interface SyncResult {
@@ -55,6 +57,24 @@ async function setLastPulledAt(timestamp: number): Promise<void> {
   }
 }
 
+async function getLastPushedAt(): Promise<number> {
+  try {
+    const raw = await AsyncStorage.getItem(LAST_PUSHED_AT_KEY);
+    const value = raw ? Number(raw) : 0;
+    return Number.isFinite(value) ? value : 0;
+  } catch {
+    return 0;
+  }
+}
+
+async function setLastPushedAt(timestamp: number): Promise<void> {
+  try {
+    await AsyncStorage.setItem(LAST_PUSHED_AT_KEY, String(timestamp));
+  } catch {
+    // ignore
+  }
+}
+
 export async function getLastSyncTime(): Promise<number | null> {
   try {
     const raw = await AsyncStorage.getItem(LAST_RUN_AT_KEY);
@@ -75,6 +95,21 @@ export async function runSync(): Promise<SyncResult> {
     throw new Error('NOT_SIGNED_IN');
   }
 
+  // If offline, mark timestamps and return early - changes will sync on next foreground launch
+  const isCurrentlyOnline = await useOnline();
+  if (!isCurrentlyOnline) {
+    const now = Date.now();
+    await setLastPulledAt(now);
+    await setLastPushedAt(now);
+    const result: SyncResult = {
+      pushed: { categories: 0, tasks: 0, subtasks: 0, repeatProfiles: 0, friendships: 0 },
+      pulled: { categories: 0, tasks: 0, subtasks: 0, repeatProfiles: 0, friendships: 0 },
+      conflicts: 0,
+      timestamp: now,
+    };
+    return result;
+  }
+
   const result: SyncResult = {
     pushed: { categories: 0, tasks: 0, subtasks: 0, repeatProfiles: 0, friendships: 0 },
     pulled: { categories: 0, tasks: 0, subtasks: 0, repeatProfiles: 0, friendships: 0 },
@@ -89,9 +124,23 @@ export async function runSync(): Promise<SyncResult> {
 
   await pruneSyncedTombstones(conflicts, pushedDeletions);
 
-  const lastPulledAt = await getLastPulledAt();
+  // Update last pushed timestamp to avoid re-pushing same changes
-  const response = await apiFetch(`/sync?since=${lastPulledAt}`);
+  await setLastPushedAt(Date.now());
-  const data = await response.json();
+
+  // Use current time as pull cutoff to avoid re-pulling what we just pushed
+  const pullSince = Date.now();
+  let data: any;
+  try {
+    const response = await apiFetch(`/sync?since=${pullSince}`);
+    data = await response.json();
+  } catch (error: any) {
+    if (error.offline) {
+      result.timestamp = Date.now();
+      await setLastPulledAt(Date.now());
+      return result;
+    }
+    throw error;
+  }
 
   const pulledCounts = await applyServerChanges(data);
   result.pulled = pulledCounts;
@@ -103,13 +152,13 @@ export async function runSync(): Promise<SyncResult> {
 }
 
 async function pushChanges(): Promise<{ conflicts: PushConflict[]; pushedDeletions: { entity: TombstoneEntity; id: string }[] }> {
-  const lastPulledAt = await getLastPulledAt();
+  const lastPushedAt = await getLastPushedAt();
 
   const [tasks, subtasks, repeatProfiles, friendships] = await Promise.all([
-    collections.tasks.query(Q.where('updated_at', Q.gt(lastPulledAt))).fetch(),
+    collections.tasks.query(Q.where('updated_at', Q.gt(lastPushedAt))).fetch(),
-    collections.subtasks.query(Q.where('updated_at', Q.gt(lastPulledAt))).fetch(),
+    collections.subtasks.query(Q.where('updated_at', Q.gt(lastPushedAt))).fetch(),
-    collections.repeatProfiles.query(Q.where('updated_at', Q.gt(lastPulledAt))).fetch(),
+    collections.repeatProfiles.query(Q.where('updated_at', Q.gt(lastPushedAt))).fetch(),
-    collections.friendships.query(Q.where('updated_at', Q.gt(lastPulledAt))).fetch(),
+    collections.friendships.query(Q.where('updated_at', Q.gt(lastPushedAt))).fetch(),
   ]);
 
   const taskPayload = (t: Task) => ({
@@ -194,12 +243,12 @@ async function pushChanges(): Promise<{ conflicts: PushConflict[]; pushedDeletio
   if (referencedCategoryIds.size > 0) {
     categoryQuery = collections.categories.query(
       Q.or(
-        Q.where('updated_at', Q.gt(lastPulledAt)),
+        Q.where('updated_at', Q.gt(lastPushedAt)),
         Q.where('id', Q.oneOf(Array.from(referencedCategoryIds)))
       )
     );
   } else {
-    categoryQuery = collections.categories.query(Q.where('updated_at', Q.gt(lastPulledAt)));
+    categoryQuery = collections.categories.query(Q.where('updated_at', Q.gt(lastPushedAt)));
   }
   const categories = await categoryQuery.fetch();
 
@@ -231,7 +280,7 @@ async function pushChanges(): Promise<{ conflicts: PushConflict[]; pushedDeletio
     updatedAt: f.updatedAt.getTime(),
   }));
 
-  const pendingTombstones = await fetchPendingTombstones(lastPulledAt);
+  const pendingTombstones = await fetchPendingTombstones(lastPushedAt);
   const changedDeletions = pendingTombstones.map((t) => ({
     entity: t.entity,
     id: t.entityId,
@@ -260,7 +309,7 @@ async function pushChanges(): Promise<{ conflicts: PushConflict[]; pushedDeletio
         friendships: changedFriendships,
       },
       deleted: changedDeletions,
-      lastPulledAt,
+      lastPulledAt: await getLastPulledAt(),
     }),
   });
 
@@ -563,6 +612,7 @@ async function upsertSubtask(row: ServerRow, force: boolean): Promise<boolean> {
     s.taskId = String(row.taskId ?? s.taskId);
     s.parentSubtaskId = row.parentSubtaskId == null ? null : String(row.parentSubtaskId);
     s.categoryId = row.categoryId ? String(row.categoryId) : s.categoryId;
+    s.tags = row.tags != null ? String(row.tags) : s.tags;
     s.title = String(row.title ?? s.title);
     s.description = String(row.description ?? s.description);
     s.priority = row.priority ?? s.priority;

carry-your-live/src/hooks/useDatabase.tsx

@@ -46,12 +46,6 @@ export function DatabaseProvider({ children }: { children: ReactNode }) {
             for (const task of tasksToUpdate) {
               await task.update((t) => { t.categoryId = keep.id; });
             }
-            // Reassign subtasks too (they're linked via task_id, so we update their parent tasks)
-            const subtasksToUpdate = await collections.subtasks.query(Q.where('task_id', dup.id)).fetch();
-            for (const sub of subtasksToUpdate) {
-              const parentTask = await collections.tasks.find(sub.taskId);
-              await parentTask.update((t) => { t.categoryId = keep.id; });
-            }
             // Delete duplicate category
             await dup.destroyPermanently();
           }

carry-your-live/src/hooks/useICalImport.ts

@@ -0,0 +1,194 @@
+import { useDatabase } from './useDatabase';
+import { Q } from '@nozbe/watermelondb';
+import { useEffect, useState, useCallback } from 'react';
+import Task from '../models/Task';
+import parseICal from '../utils/icalParser';
+import { startOfMonth, endOfMonth, addMonths, format } from 'date-fns';
+
+function mapICalEventToTask(event: {
+  title: string;
+  description?: string;
+  start: Date;
+  end?: Date;
+  allDay?: boolean;
+  rrule?: string;
+  uid?: string;
+  priority?: number;
+}): {
+  title: string;
+  description: string;
+  dueDate: number;
+  dueTime: string;
+  endTime: string;
+  allDay: boolean;
+  repeat: string;
+  repeatInterval: number;
+  repeatDays: string;
+  seriesId: string;
+  reminder: string;
+  reminders: string;
+  categoryId: string;
+  tags: string;
+  priority: string;
+  completed: boolean;
+  completedAt: number | null;
+} {
+  const defaultCategoryId = 'cat_default'; // will be resolved later
+  const now = Date.now();
+
+  let dueDate = event.start.getTime();
+  let dueTime = '00:00';
+  let endTime = '00:00';
+  let allDay = event.allDay === true || !event.end;
+
+  if (event.allDay) {
+    dueDate = new Date(event.start.getFullYear(), event.start.getMonth(), event.start.getDate()).getTime();
+    dueTime = '00:00';
+    endTime = '23:59';
+  } else {
+    dueDate = event.start.getTime();
+    dueTime = `${event.start.getHours().toString().padStart(2, '0')}:${event.start.getMinutes().toString().padStart(2, '0')}`;
+    if (event.end) {
+      endTime = `${event.end.getHours().toString().padStart(2, '0')}:${event.end.getMinutes().toString().padStart(2, '0')}`;
+    }
+  }
+
+  let repeat = 'none';
+  let repeatInterval = 1;
+  let repeatDays = '';
+  let seriesId = event.uid || `${dueDate}-${Math.random().toString(36).substring(2, 9)}`;
+  let reminder = 'none';
+  let reminders = '';
+
+  if (event.rrule) {
+    repeat = 'custom';
+    // Simple RRULE parsing - extract FREQ and INTERVAL
+    const freqMatch = event.rrule.match(/FREQ=([^;:]+)/i);
+    if (freqMatch) {
+      const freq = freqMatch[1].toLowerCase();
+      if (freq === 'daily') {
+        repeat = 'daily';
+        repeatInterval = 1;
+      } else if (freq === 'weekly') {
+        repeat = 'weekly';
+        repeatInterval = 1;
+      } else if (freq === 'monthly') {
+        repeat = 'monthly';
+        repeatInterval = 1;
+      }
+    }
+    // Extract INTERVAL
+    const intervalMatch = event.rrule.match(/INTERVAL=(\d+)/i);
+    if (intervalMatch) {
+      repeatInterval = parseInt(intervalMatch[1], 10);
+    }
+    // Extract BYDAY for weekly/Monthly
+    const bydayMatch = event.rrule.match(/BYDAY=([^;,]+)/i);
+    if (bydayMatch) {
+      repeatDays = bydayMatch[1].replace(/,/g, ',');
+    }
+  }
+
+  // Map priority (iCal priority: -2=low, 0=normal, 2=high, 3-4=highest, 5=urgent)
+  let priorityValue: string = 'medium';
+  if (event.priority !== undefined) {
+    const p = event.priority;
+    if (p <= -2) priorityValue = 'low';
+    else if (p === 0) priorityValue = 'medium';
+    else if (p === 2) priorityValue = 'high';
+    else if (p >= 5) priorityValue = 'urgent';
+    else priorityValue = 'medium';
+  }
+
+  return {
+    title: event.title,
+    description: event.description || '',
+    dueDate,
+    dueTime,
+    endTime,
+    allDay,
+    repeat,
+    repeatInterval,
+    repeatDays,
+    seriesId,
+    reminder,
+    reminders,
+    categoryId: defaultCategoryId,
+    tags: '',
+    priority: priorityValue,
+    completed: false,
+    completedAt: null,
+  };
+}
+
+export function useICalImport() {
+  const { collections } = useDatabase();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const importICal = useCallback(async (icalContent: string) => {
+    setLoading(true);
+    setError(null);
+
+    try {
+      const events = parseICal(icalContent);
+
+      if (events.length === 0) {
+        throw new Error('No events found in the iCal data');
+      }
+
+      const taskData = events.map(mapICalEventToTask);
+
+      // Insert tasks into WatermelonDB
+      const subscription = collections.tasks
+        .query()
+        .splice(
+          0,
+          0,
+          ...taskData.map((td) => ({
+            title: td.title,
+            description: td.description,
+            category_id: td.categoryId,
+            tags: td.tags,
+            priority: td.priority,
+            completed: td.completed,
+            completed_at: td.completedAt,
+            due_date: td.dueDate,
+            due_time: td.dueTime,
+            end_time: td.endTime,
+            all_day: td.allDay,
+            repeat: td.repeat,
+            repeat_interval: td.repeatInterval,
+            repeat_days: td.repeatDays,
+            color: '#9E9E9E',
+            series_id: td.seriesId,
+            order: 0,
+            reminder: td.reminder,
+            reminders: td.reminders,
+            assignee_id: null,
+            created_at: now,
+            updated_at: now,
+          }))
+        );
+
+      // Observe the changes
+      subscription.subscribe({
+        next: (result) => {
+          // Tasks have been imported
+        },
+        error: (err) => {
+          console.error('Import error:', err);
+          setError(err.message);
+        },
+      });
+
+      setLoading(false);
+    } catch (err: any) {
+      console.error('ICal import failed:', err);
+      setError(err.message || 'Import failed');
+      setLoading(false);
+    }
+  }, [collections]);
+
+  return { importICal, loading, error };
+}

carry-your-live/src/hooks/useOnline.ts

@@ -0,0 +1,17 @@
+import { useEffect, useState } from 'react';
+
+export function useOnline(): boolean {
+  const [isOnline, setIsOnline] = useState(navigator.onLine);
+
+  useEffect(() => {
+    const handler = () => setIsOnline(navigator.onLine);
+    window.addEventListener('online', handler);
+    window.addEventListener('offline', handler);
+    return () => {
+      window.removeEventListener('online', handler);
+      window.removeEventListener('offline', handler);
+    };
+  }, []);
+
+  return isOnline;
+}

carry-your-live/src/hooks/useTaskModals.tsx

@@ -9,7 +9,6 @@ import { TaskOverflowMenu } from '@/components/TaskOverflowMenu';
 import { TaskDeleteModal } from '@/components/TaskDeleteModal';
 import { OptionPickerModal } from '@/components/OptionPickerModal';
 import {
-  toggleTaskComplete,
   deleteTaskOccurrences,
   duplicateTask,
   setTaskCategory,
@@ -20,6 +19,7 @@ import {
   setSubtaskPriority,
   createSubtask,
   TaskDeleteScope,
+  confirmAndToggleTaskComplete,
 } from '@/utils/taskActions';
 
 const PRIORITY_OPTIONS = Object.entries(PRIORITY_LABELS).map(([value, label]) => ({ value, label }));
@@ -179,8 +179,7 @@ export function useTaskModals() {
   }, []);
 
   const handleToggleComplete = useCallback(async (taskId: string) => {
-    await toggleTaskComplete(taskId);
+    await confirmAndToggleTaskComplete(taskId, () => refreshRef.current());
-    refreshRef.current();
   }, []);
 
   const handleSubtaskToggle = useCallback(async (subtask: SubtaskData) => {
@@ -303,7 +302,7 @@ export function useTaskModals() {
 
         <OptionPickerModal
           visible={picker?.type === 'category'}
-          title="Change Category"
+          title="Change Tags"
           options={[{ value: '', label: 'None', color: '#9E9E9E' }, ...categories.map((c) => ({ value: c.id, label: c.name, color: c.color }))]}
           selectedValue={menuTask?.categoryId}
           onSelect={handleSingleCategory}

carry-your-live/src/services/auth.ts

@@ -96,11 +96,22 @@ export async function apiFetch(path: string, options: RequestInit = {}): Promise
   }
   const response = await fetch(`${apiBaseUrl}${path}`, { ...options, headers });
   if (!response.ok) {
+    const text = await response.text();
+    // If it's a 401 or network error, try to get a fresh token and retry once
+    if (response.status === 404 || response.status === 0) {
+      // Not found or network error - don't throw, return the response for caller to handle
+      const error = new Error(text || `Request failed (${response.status})`);
+      (error as any).status = response.status;
+      (error as any).offline = true;
+      throw error;
+    }
     let message = `Request failed (${response.status})`;
     let details: any = null;
     try {
-      const body = await response.json();
+      const body = JSON.parse(text);
-      if (body && typeof body.message === 'string') {
+      if (body && typeof body.error?.message === 'string') {
+        message = body.error.message;
+      } else if (body && typeof body.message === 'string') {
         message = body.message;
       }
       if (body && body.error && body.error.details) {
@@ -136,3 +147,38 @@ export async function register(username: string, password: string): Promise<Auth
   await setAuth(data.token, data.user);
   return data.user as AuthUser;
 }
+
+export async function forgotPassword(username: string): Promise<{ success: boolean; resetToken?: string }> {
+  const response = await apiFetch('/auth/forgot-password', {
+    method: 'POST',
+    body: JSON.stringify({ username }),
+  });
+  const data = await response.json();
+  return data;
+}
+
+export async function resetPassword(token: string, password: string): Promise<{ success: boolean }> {
+  const response = await apiFetch('/auth/reset-password', {
+    method: 'POST',
+    body: JSON.stringify({ token, password }),
+  });
+  const data = await response.json();
+  return data;
+}
+
+export async function registerPushToken(pushToken: string): Promise<{ success: boolean }> {
+  const response = await apiFetch('/push/push-token', {
+    method: 'POST',
+    body: JSON.stringify({ pushToken }),
+  });
+  const data = await response.json();
+  return data;
+}
+
+export async function unregisterPushToken(): Promise<{ success: boolean }> {
+  const response = await apiFetch('/push/push-token', {
+    method: 'DELETE',
+  });
+  const data = await response.json();
+  return data;
+}

carry-your-live/src/services/notifications.ts

@@ -1,9 +1,19 @@
 import { Platform } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { Reminder, reminderToMinutes, parseReminders } from '@/types';
+import { Reminder, reminderToMinutes, parseReminders, ReminderPreference, parseTaskTags } from '@/types';
+import { TagReminderPreferences, TAG_REMINDER_PREFERENCES_KEY } from '@/theme';
 
 const ID_MAP_KEY = 'notifications:taskIdToNotificationIds';
 
+async function loadTagPreferences(): Promise<TagReminderPreferences> {
+  try {
+    const raw = await AsyncStorage.getItem(TAG_REMINDER_PREFERENCES_KEY);
+    return raw ? (JSON.parse(raw) as TagReminderPreferences) : {};
+  } catch {
+    return {};
+  }
+}
+
 async function readIdMap(): Promise<Record<string, string[]>> {
   try {
     const raw = await AsyncStorage.getItem(ID_MAP_KEY);
@@ -30,11 +40,67 @@ function getNotificationsModule(): any {
   }
 }
 
-export async function scheduleTaskReminder(task: any): Promise<void> {
+function reminderPreferenceToReminder(pref: ReminderPreference): Reminder {
+  switch (pref) {
+    case 'none':
+      return 'none';
+    case 'at_time':
+      return 'at_time';
+    case '15':
+      return '15';
+    case '30':
+      return '30';
+    case '60':
+      return '60';
+    case '120':
+      return '120';
+    case '1440':
+      return '1440';
+    default:
+      return 'none';
+  }
+}
+
+function getRemindersForTask(
+  task: any,
+  globalPreference: ReminderPreference,
+  tagPreferences: TagReminderPreferences = {}
+): Reminder[] {
+  const taskReminders: Reminder[] = task.reminders
+    ? parseReminders(task.reminders)
+    : task.reminder && task.reminder !== 'none'
+      ? [task.reminder as Reminder]
+      : [];
+
+  if (taskReminders.length > 0) {
+    return taskReminders;
+  }
+
+  const tagReminders: Reminder[] = [];
+  for (const tagId of parseTaskTags(task.tags, task.categoryId)) {
+    for (const pref of tagPreferences[tagId] ?? []) {
+      if (pref === 'none') continue;
+      if (!tagReminders.includes(pref)) tagReminders.push(pref);
+    }
+  }
+  if (tagReminders.length > 0) {
+    return tagReminders;
+  }
+
+  const globalReminder = reminderPreferenceToReminder(globalPreference);
+  if (globalReminder !== 'none') {
+    return [globalReminder];
+  }
+
+  return [];
+}
+
+export async function scheduleTaskReminder(task: any, notificationsEnabled: boolean = true, globalReminderPreference: ReminderPreference = '15'): Promise<void> {
   const notifications = await getNotificationsModule();
   const dueDate = task.dueDate ? new Date(task.dueDate) : null;
 
   if (!notifications) return;
+  if (!notificationsEnabled) return;
 
   const idMap = await readIdMap();
 
@@ -51,11 +117,8 @@ export async function scheduleTaskReminder(task: any): Promise<void> {
   await writeIdMap(idMap);
 
   // Determine the set of reminders to schedule
-  const reminders: Reminder[] = task.reminders
+  const tagPreferences = await loadTagPreferences();
-    ? parseReminders(task.reminders)
+  const reminders = getRemindersForTask(task, globalReminderPreference, tagPreferences);
-    : task.reminder && task.reminder !== 'none'
-      ? [task.reminder as Reminder]
-      : [];
 
   if (reminders.length === 0 || !dueDate || !task.dueTime) return;
 
@@ -132,7 +195,7 @@ export async function requestNotificationPermission(): Promise<boolean> {
   }
 }
 
-export async function rescheduleAllReminders(tasks: any[]): Promise<void> {
+export async function cancelAllReminders(): Promise<void> {
   const notifications = await getNotificationsModule();
   if (!notifications) return;
   try {
@@ -141,15 +204,29 @@ export async function rescheduleAllReminders(tasks: any[]): Promise<void> {
     // ignore
   }
   const idMap: Record<string, string[]> = {};
+  await writeIdMap(idMap);
+}
+
+export async function rescheduleAllReminders(tasks: any[], notificationsEnabled: boolean = true, globalReminderPreference: ReminderPreference = '15'): Promise<void> {
+  if (!notificationsEnabled) {
+    await cancelAllReminders();
+    return;
+  }
+
+  const notifications = await getNotificationsModule();
+  if (!notifications) return;
+  try {
+    await notifications.cancelAllScheduledNotificationsAsync();
+  } catch {
+    // ignore
+  }
+  const idMap: Record<string, string[]> = {};
+  const tagPreferences = await loadTagPreferences();
 
   for (const task of tasks) {
     const dueDate = task.dueDate ? new Date(task.dueDate) : null;
 
-    const reminders: Reminder[] = task.reminders
+    const reminders = getRemindersForTask(task, globalReminderPreference, tagPreferences);
-      ? parseReminders(task.reminders)
-      : task.reminder && task.reminder !== 'none'
-        ? [task.reminder as Reminder]
-        : [];
 
     if (reminders.length === 0 || !dueDate || !task.dueTime) continue;
 

carry-your-live/src/services/pushNotifications.ts

@@ -0,0 +1,139 @@
+import { Platform } from 'react-native';
+import * as Device from 'expo-device';
+import * as Notifications from 'expo-notifications';
+import Constants from 'expo-constants';
+import { registerPushToken, unregisterPushToken } from './auth';
+
+export async function registerForPushNotificationsAsync(): Promise<string | null> {
+  if (!Device.isDevice) {
+    if (__DEV__) console.warn('Push notifications require a physical device');
+    return null;
+  }
+
+  const { status: existingStatus } = await Notifications.getPermissionsAsync();
+  let finalStatus = existingStatus;
+  if (existingStatus !== 'granted') {
+    const { status } = await Notifications.requestPermissionsAsync({
+      ios: {
+        allowAlert: true,
+        allowBadge: true,
+        allowSound: true,
+        allowCriticalAlerts: true,
+      },
+    });
+    finalStatus = status;
+  }
+  if (finalStatus !== 'granted') {
+    if (__DEV__) console.warn('Push notification permission not granted');
+    return null;
+  }
+
+  try {
+    const projectId = (Constants.expoConfig as any)?.extra?.eas?.projectId ?? (Constants.expoConfig as any)?.projectId;
+    const tokenData = await Notifications.getExpoPushTokenAsync({
+      projectId,
+    });
+    const pushToken = tokenData.data;
+
+    await registerPushToken(pushToken);
+    if (__DEV__) console.log('Push token registered:', pushToken);
+    return pushToken;
+  } catch (error) {
+    if (__DEV__) console.error('Failed to get push token:', error);
+    return null;
+  }
+}
+
+export async function unregisterForPushNotificationsAsync(): Promise<void> {
+  await unregisterPushToken();
+}
+
+export function setupNotificationChannels(): void {
+  if (Platform.OS === 'android') {
+    Notifications.setNotificationChannelAsync('task-reminders', {
+      name: 'Task Reminders',
+      importance: Notifications.AndroidImportance.HIGH,
+      vibrationPattern: [0, 250, 250, 250],
+      lightColor: '#EF5350',
+      sound: 'default',
+      enableVibrate: true,
+      enableLights: true,
+    });
+
+    Notifications.setNotificationChannelAsync('friend-requests', {
+      name: 'Friend Requests',
+      importance: Notifications.AndroidImportance.HIGH,
+      vibrationPattern: [0, 250, 250, 250],
+      lightColor: '#29B6F6',
+      sound: 'default',
+      enableVibrate: true,
+    });
+
+    Notifications.setNotificationChannelAsync('task-assignments', {
+      name: 'Task Assignments',
+      importance: Notifications.AndroidImportance.HIGH,
+      vibrationPattern: [0, 250, 250, 250],
+      lightColor: '#66BB6A',
+      sound: 'default',
+      enableVibrate: true,
+    });
+
+    Notifications.setNotificationChannelAsync('default', {
+      name: 'Default',
+      importance: Notifications.AndroidImportance.DEFAULT,
+      sound: 'default',
+    });
+  }
+}
+
+export function addNotificationReceivedListener(
+  listener: (notification: Notifications.Notification) => void
+): Notifications.EventSubscription {
+  return Notifications.addNotificationReceivedListener(listener);
+}
+
+export function addNotificationResponseReceivedListener(
+  listener: (response: Notifications.NotificationResponse) => void
+): Notifications.EventSubscription {
+  return Notifications.addNotificationResponseReceivedListener(listener);
+}
+
+export function removeNotificationSubscription(subscription: Notifications.EventSubscription): void {
+  subscription.remove();
+}
+
+export async function getBadgeCount(): Promise<number> {
+  try {
+    return await Notifications.getBadgeCountAsync();
+  } catch {
+    return 0;
+  }
+}
+
+export async function setBadgeCount(count: number): Promise<void> {
+  try {
+    await Notifications.setBadgeCountAsync(count);
+  } catch {
+    // ignore
+  }
+}
+
+export function handleNotificationResponse(response: Notifications.NotificationResponse): void {
+  const data = response.notification.request.content.data as Record<string, any> | undefined;
+  if (!data) return;
+
+  switch (data.type) {
+    case 'task_reminder':
+    case 'task_assignment':
+      if (data.taskId) {
+        // Navigation will be handled by the app router
+        console.log('Navigate to task:', data.taskId);
+      }
+      break;
+    case 'friend_request':
+      if (data.friendshipId) {
+        console.log('Navigate to friend request:', data.friendshipId);
+      }
+      break;
+  }
+}

carry-your-live/src/theme.tsx

@@ -11,18 +11,22 @@ export const SORT_OPTIONS: { value: SortBy; label: string }[] = [
   { value: 'created', label: 'Creation Date' },
 ];
 
-export type ReminderPreference = 'none' | 'atTime' | '5m' | '15m' | '30m' | '1h' | '1d';
+export type ReminderPreference = 'none' | 'at_time' | '15' | '30' | '60' | '120' | '1440';
 
 export const REMINDER_OPTIONS: { value: ReminderPreference; label: string }[] = [
   { value: 'none', label: 'No reminder' },
-  { value: 'atTime', label: 'At due time' },
+  { value: 'at_time', label: 'At due time' },
-  { value: '5m', label: '5 minutes before' },
+  { value: '15', label: '15 minutes before' },
-  { value: '15m', label: '15 minutes before' },
+  { value: '30', label: '30 minutes before' },
-  { value: '30m', label: '30 minutes before' },
+  { value: '60', label: '1 hour before' },
-  { value: '1h', label: '1 hour before' },
+  { value: '120', label: '2 hours before' },
-  { value: '1d', label: '1 day before' },
+  { value: '1440', label: '1 day before' },
 ];
 
+export type TagReminderPreferences = Record<string, ReminderPreference[]>;
+
+export const TAG_REMINDER_PREFERENCES_KEY = 'settings:tagReminderPreferences';
+
 export interface ThemeColors {
   background: string;
   card: string;
@@ -42,6 +46,14 @@ export interface ThemeColors {
   overlay: string;
   sheetBg: string;
   tabBarBg: string;
+  danger: string;
+  dangerStrong: string;
+  dangerSoft: string;
+  dangerBorder: string;
+  success: string;
+  successStrong: string;
+  warning: string;
+  info: string;
 }
 
 export const DEFAULT_ACCENT = '#EF5350';
@@ -110,6 +122,14 @@ export function colors(accent: string = DEFAULT_ACCENT): ThemeColors {
     overlay: 'rgba(0,0,0,0.6)',
     sheetBg: '#26282D',
     tabBarBg: '#16171A',
+    danger: '#E57373',
+    dangerStrong: '#E53935',
+    dangerSoft: '#43302E',
+    dangerBorder: '#573431',
+    success: '#66BB6A',
+    successStrong: '#43A047',
+    warning: '#FFA726',
+    info: '#64B5F6',
   };
 }
 
@@ -122,6 +142,8 @@ interface SettingsContextType {
   setSortBy: (value: SortBy) => void;
   reminderPreference: ReminderPreference;
   setReminderPreference: (value: ReminderPreference) => void;
+  tagReminderPreferences: TagReminderPreferences;
+  setTagReminderPreferences: (value: TagReminderPreferences) => void;
   apiUrl: string;
   setApiUrl: (value: string) => void;
   accentColor: string;
@@ -130,6 +152,8 @@ interface SettingsContextType {
   setTodoAheadDays: (value: number) => void;
   showCompleted: boolean;
   setShowCompleted: (value: boolean) => void;
+  deleteBySwipe: boolean;
+  setDeleteBySwipe: (value: boolean) => void;
   theme: ThemeColors;
 }
 
@@ -140,9 +164,11 @@ const STORAGE_KEYS = {
   defaultCategoryId: 'settings:defaultCategoryId',
   sortBy: 'settings:sortBy',
   reminderPreference: 'settings:reminderPreference',
+  tagReminderPreferences: TAG_REMINDER_PREFERENCES_KEY,
   accentColor: 'settings:accentColor',
   todoAheadDays: 'settings:todoAheadDays',
   showCompleted: 'settings:showCompleted',
+  deleteBySwipe: 'settings:deleteBySwipe',
 };
 
 const SettingsContext = createContext<SettingsContextType | null>(null);
@@ -179,12 +205,17 @@ export function SettingsProvider({ children }: { children: ReactNode }) {
   const [sortBy, setSortBy] = useStoredSetting<SortBy>(STORAGE_KEYS.sortBy, 'date');
   const [reminderPreference, setReminderPreference] = useStoredSetting<ReminderPreference>(
     STORAGE_KEYS.reminderPreference,
-    '15m',
+    '15',
+  );
+  const [tagReminderPreferences, setTagReminderPreferences] = useStoredSetting<TagReminderPreferences>(
+    STORAGE_KEYS.tagReminderPreferences,
+    {},
   );
   const [apiUrl, setApiUrl] = useStoredSetting<string>(API_URL_KEY, DEFAULT_API_BASE_URL);
   const [accentColor, setAccentColor] = useStoredSetting<string>(STORAGE_KEYS.accentColor, DEFAULT_ACCENT);
   const [todoAheadDays, setTodoAheadDays] = useStoredSetting<number>(STORAGE_KEYS.todoAheadDays, DEFAULT_TODO_AHEAD_DAYS);
   const [showCompleted, setShowCompleted] = useStoredSetting<boolean>(STORAGE_KEYS.showCompleted, false);
+  const [deleteBySwipe, setDeleteBySwipe] = useStoredSetting<boolean>(STORAGE_KEYS.deleteBySwipe, false);
 
   const theme = useMemo(() => colors(accentColor), [accentColor]);
 
@@ -198,6 +229,8 @@ export function SettingsProvider({ children }: { children: ReactNode }) {
       setSortBy,
       reminderPreference,
       setReminderPreference,
+      tagReminderPreferences,
+      setTagReminderPreferences,
       apiUrl,
       setApiUrl,
       accentColor,
@@ -206,6 +239,8 @@ export function SettingsProvider({ children }: { children: ReactNode }) {
       setTodoAheadDays,
       showCompleted,
       setShowCompleted,
+      deleteBySwipe,
+      setDeleteBySwipe,
       theme,
     }),
     [
@@ -217,6 +252,8 @@ export function SettingsProvider({ children }: { children: ReactNode }) {
       setSortBy,
       reminderPreference,
       setReminderPreference,
+      tagReminderPreferences,
+      setTagReminderPreferences,
       apiUrl,
       setApiUrl,
       accentColor,
@@ -225,7 +262,6 @@ export function SettingsProvider({ children }: { children: ReactNode }) {
       setTodoAheadDays,
       showCompleted,
       setShowCompleted,
-      theme,
     ]
   );
 

carry-your-live/src/types/index.ts

@@ -1,5 +1,7 @@
 export type Priority = 'none' | 'low' | 'medium' | 'high' | 'critical';
 
+export type { ReminderPreference } from '../theme';
+
 export type Repeat = 'none' | 'daily' | 'weekly' | 'monthly' | 'custom';
 
 export const REPEAT_OPTIONS: { value: Repeat; label: string }[] = [
@@ -193,6 +195,7 @@ export interface TaskFormData {
 export interface SubtaskFormData {
   title: string;
   description?: string;
+  tags?: string[];
   categoryId?: string;
   priority: Priority;
   dueDate: Date | null;

carry-your-live/src/utils/icalParser.ts

@@ -0,0 +1,156 @@
+function parseICal(content: string): Array<{
+  title: string;
+  description?: string;
+  start: Date;
+  end?: Date;
+  allDay?: boolean;
+  rrule?: string;
+  uid?: string;
+  priority?: number;
+}> {
+  const events: Array<{
+    title: string;
+    description?: string;
+    start: Date;
+    end?: Date;
+    allDay?: boolean;
+    rrule?: string;
+    uid?: string;
+    priority?: number;
+  }> = [];
+
+  const lines = content.split('\n');
+  let i = 0;
+
+  while (i < lines.length) {
+    const line = lines[i].trim();
+    if (!line) {
+      i++;
+      continue;
+    }
+
+    if (line.startsWith('BEGIN:VEVENT')) {
+      const event: {
+        title: string;
+        description?: string;
+        start: Date;
+        end?: Date;
+        allDay?: boolean;
+        rrule?: string;
+        uid?: string;
+        priority?: number;
+      } = {
+        title: '',
+        start: new Date(0),
+      };
+
+      i++;
+      let inEvent = true;
+
+      while (i < lines.length && inEvent) {
+        const line = lines[i].trim();
+        i++;
+
+        if (line === 'END:VEVENT') {
+          inEvent = false;
+          continue;
+        }
+
+        if (line.startsWith('END:')) {
+          inEvent = false;
+          continue;
+        }
+
+        if (line.startsWith('SUMMARY:')) {
+          event.title = line.substring(8).trim();
+        } else if (line.startsWith('DESCRIPTION:')) {
+          event.description = line.substring(12).trim();
+        } else if (line.startsWith('DTSTART:')) {
+          const dateStr = line.substring(8).trim();
+          event.start = parseICalDateTime(dateStr);
+        } else if (line.startsWith('DTEND:')) {
+          const dateStr = line.substring(6).trim();
+          event.end = parseICalDateTime(dateStr);
+        } else if (line.startsWith('DTSTAMP:')) {
+          // ignore, we use start date
+        } else if (line.startsWith('UID:')) {
+          event.uid = line.substring(4).trim();
+        } else if (line.startsWith('PRIORITY:')) {
+          event.priority = parseInt(line.substring(9).trim(), 10);
+        } else if (line.startsWith('ALL-DAY:')) {
+          event.allDay = line.substring(10).trim().toLowerCase() === 'true';
+        } else if (line.startsWith('RRULE:')) {
+          event.rrule = line.substring(6).trim();
+        } else if (line.startsWith('BEGIN:VALARM')) {
+          // skip alarms
+          i++;
+          let inAlarm = true;
+          while (i < lines.length && inAlarm) {
+            const alarmLine = lines[i].trim();
+            i++;
+            if (alarmLine === 'END:VALARM') {
+              inAlarm = false;
+            }
+          }
+        } else {
+          // skip unrecognized lines
+        }
+      }
+
+      if (event.title) {
+        events.push(event);
+      }
+    } else {
+      i++;
+    }
+  }
+
+  return events;
+}
+
+function parseICalDateTime(dateStr: string): Date {
+  // Handle various iCal date/time formats
+  // Format 1: YYYYMMDDTHHMMSSZ (UTC)
+  // Format 2: YYYYMMDDTHHMMSS (local)
+  // Format 3: YYYYMMDD (date only)
+  // Format 4: TZID:... (with timezone)
+
+  let datePart = '';
+  let timePart = '';
+  let hasTime = false;
+
+  // Check for Z (UTC) indicator
+  const hasZ = dateStr.endsWith('Z');
+  const cleanStr = hasZ ? dateStr.slice(0, -1) : dateStr;
+
+  // Try to split at T
+  const tIndex = cleanStr.indexOf('T');
+  if (tIndex !== -1) {
+    datePart = cleanStr.substring(0, tIndex);
+    timePart = cleanStr.substring(tIndex + 1);
+    hasTime = true;
+  } else {
+    datePart = cleanStr;
+  }
+
+  // Parse date (YYYYMMDD)
+  if (datePart.length >= 8) {
+    const year = parseInt(datePart.substring(0, 4), 10);
+    const month = parseInt(datePart.substring(4, 6), 10) - 1; // 0-indexed
+    const day = parseInt(datePart.substring(6, 8), 10);
+    const date = new Date(year, month, day);
+
+    if (hasTime && timePart) {
+      const hour = parseInt(timePart.substring(0, 2), 10);
+      const minute = parseInt(timePart.substring(2, 4), 10);
+      date.setHours(hour, minute, 0, 0);
+    }
+
+    return date;
+  }
+
+  // Fallback: try Date.parse
+  return new Date(dateStr);
+}
+
+export default parseICal;

carry-your-live/src/utils/taskActions.ts

@@ -1,6 +1,7 @@
 import { database, collections } from '@/database';
 import { Q } from '@nozbe/watermelondb';
-import { Priority, Repeat, Reminder, SubtaskData, tagsToString } from '@/types';
+import { Alert } from 'react-native';
+import { Priority, Repeat, Reminder, SubtaskData, tagsToString, parseTaskTags } from '@/types';
 import { scheduleTaskReminder, cancelTaskReminder } from '@/services/notifications';
 import { recordTombstonesInBatch } from '@/database/tombstones';
 
@@ -10,6 +11,7 @@ function mapSubtaskRow(s: any, taskId?: string): SubtaskData {
     taskId: s.taskId ?? taskId ?? '',
     parentSubtaskId: s.parentSubtaskId || null,
     categoryId: s.categoryId || '',
+    tags: s.tags || '',
     title: s.title,
     description: s.description || '',
     priority: (s.priority || 'none') as Priority,
@@ -216,6 +218,51 @@ export async function toggleTaskComplete(taskId: string): Promise<string | null>
   return nextOccurrence ? nextOccurrence.id : null;
 }
 
+export async function countOpenSubtasks(taskId: string): Promise<number> {
+  const open = await collections.subtasks.query(
+    Q.where('task_id', taskId),
+    Q.where('completed', false)
+  ).fetch();
+  return open.length;
+}
+
+export async function confirmAndToggleTaskComplete(
+  taskId: string,
+  onCompleted?: () => void
+): Promise<void> {
+  let task: any;
+  try {
+    task = await collections.tasks.find(taskId);
+  } catch {
+    return;
+  }
+
+  const finish = async () => {
+    await toggleTaskComplete(taskId);
+    onCompleted?.();
+  };
+
+  if (task.completed) {
+    await finish();
+    return;
+  }
+
+  const openCount = await countOpenSubtasks(taskId);
+  if (openCount === 0) {
+    await finish();
+    return;
+  }
+
+  Alert.alert(
+    'Unfinished subtasks',
+    `"${task.title}" still has ${openCount} open subtask${openCount === 1 ? '' : 's'}. Mark it as done anyway?`,
+    [
+      { text: 'Cancel', style: 'cancel' },
+      { text: 'Mark done anyway', style: 'destructive', onPress: finish },
+    ]
+  );
+}
+
 export async function toggleSubtaskComplete(subtaskId: string): Promise<void> {
   await database.write(async () => {
     const subtask = await collections.subtasks.find(subtaskId);
@@ -237,6 +284,7 @@ export interface SubtaskUpdateData {
   title: string;
   description?: string;
   categoryId?: string;
+  tags?: string;
   priority: Priority;
   dueDate: number;
   dueTime?: string;
@@ -256,6 +304,7 @@ export async function updateSubtask(subtaskId: string, data: SubtaskUpdateData):
       s.title = data.title.trim();
       s.description = data.description || '';
       if (data.categoryId !== undefined) s.categoryId = data.categoryId;
+      if (data.tags !== undefined) s.tags = data.tags;
       s.priority = data.priority;
       s.dueDate = data.dueDate;
       s.dueTime = data.dueTime || '';
@@ -318,6 +367,7 @@ export async function duplicateSubtask(subtaskId: string): Promise<void> {
     clone = await collections.subtasks.create((s) => {
       s.taskId = subtask.taskId;
       s.categoryId = subtask.categoryId || '';
+      s.tags = subtask.tags || '';
       s.title = subtask.title;
       s.description = subtask.description;
       s.priority = subtask.priority;
@@ -472,12 +522,13 @@ export async function convertSubtaskToTask(subtaskId: string): Promise<void> {
     const subtask = await collections.subtasks.find(subtaskId);
     const parent = await collections.tasks.find(subtask.taskId);
     const now = new Date();
+    const subTags = parseTaskTags(subtask.tags, subtask.categoryId);
 
     const task = await collections.tasks.create((t) => {
       t.title = subtask.title;
       t.description = subtask.description || '';
-      t.categoryId = subtask.categoryId || parent.categoryId || '';
+      t.categoryId = subTags[0] || parent.categoryId || '';
-      t.tags = tagsToString([subtask.categoryId || parent.categoryId].filter(Boolean));
+      t.tags = tagsToString(subTags.length > 0 ? subTags : (parent.categoryId ? [parent.categoryId] : []));
       t.priority = subtask.priority;
       t.completed = subtask.completed;
       t.dueDate = subtask.dueDate;
@@ -650,6 +701,8 @@ async function createNextOccurrence(task: any, seriesId: string): Promise<any> {
       s.taskId = next.id;
       s.title = subtask.title;
       s.description = subtask.description;
+      s.categoryId = subtask.categoryId || '';
+      s.tags = subtask.tags || '';
       s.priority = subtask.priority;
       s.completed = false;
       s.dueDate = subtask.dueDate;
@@ -751,10 +804,24 @@ export async function reorderTasks(taskIds: string[]): Promise<void> {
   });
 }
 
+export async function reorderSubtasks(subtaskIds: string[]): Promise<void> {
+  await database.write(async () => {
+    const now = new Date();
+    for (let i = 0; i < subtaskIds.length; i++) {
+      const subtask = await collections.subtasks.find(subtaskIds[i]);
+      await subtask.update((s) => {
+        s.order = i;
+        s.updatedAt = now;
+      });
+    }
+  });
+}
+
 export interface CreateSubtaskData {
   taskId: string;
   parentSubtaskId?: string | null;
   categoryId?: string;
+  tags?: string;
   title: string;
   description?: string;
   priority?: Priority;
@@ -782,6 +849,7 @@ export async function createSubtask(data: CreateSubtaskData): Promise<string> {
       s.taskId = data.taskId;
       s.parentSubtaskId = data.parentSubtaskId || null;
       s.categoryId = data.categoryId || '';
+      s.tags = data.tags || '';
       s.title = data.title.trim();
       s.description = data.description || '';
       s.priority = data.priority || 'none';

creds.txt

@@ -1,6 +1,2 @@
-tech
+tech08mag
-osuhhgoshghgjs
+7BXtaqyvwVB15W
-
-
-test
-SFGHDHTHHDHRERTHEH

eslint.config.js

@@ -0,0 +1,10 @@
+// https://docs.expo.dev/guides/using-eslint/
+const { defineConfig } = require('eslint/config');
+const expoConfig = require("eslint-config-expo/flat");
+
+module.exports = defineConfig([
+  expoConfig,
+  {
+    ignores: ["dist/*"],
+  }
+]);

package.json

@@ -1,4 +1,9 @@
 {
+  "name": "carry-your-live",
+  "version": "1.0.0",
+  "description": "Carry Your Live - Desktop App",
+  "main": "expo-router/entry",
+  "homepage": "https://gitea.techmos.org/tech08mag/carry-your-live",
   "dependencies": {
     "@hookform/resolvers": "^5.7.1",
     "@nozbe/watermelondb": "^0.28.0",
@@ -14,9 +19,36 @@
     "react-native-reanimated": "^4.5.3",
     "react-native-safe-area-context": "^5.8.1",
     "react-native-screens": "^4.26.2",
+    "react-native-web": "^0.21.2",
     "zod": "^4.4.3"
   },
   "devDependencies": {
+    "electron": "^41.7.1",
+    "electron-builder": "^26.15.3",
+    "eslint": "^9.0.0",
+    "eslint-config-expo": "~57.0.1",
+    "patch-package": "^8.0.1",
     "typescript": "~6.0.3"
-  }
+  },
+  "scripts": {
+    "start": "expo start",
+    "android": "expo run:android",
+    "ios": "expo run:ios",
+    "web": "expo start --web",
+    "lint": "expo lint",
+    "typecheck": "tsc --noEmit",
+    "format": "prettier --write \"**/*.{ts,tsx,json,md}\"",
+    "export:web": "expo export --platform web",
+    "desktop": "electron electron/main.js",
+    "desktop:dev": "ELECTRON_START_URL=http://localhost:8081 electron electron/main.js",
+    "desktop:dist": "npm run export:web && electron-builder",
+    "desktop:dir": "npm run export:web && electron-builder --dir",
+    "build:ios": "eas build --platform ios",
+    "build:android": "eas build --platform android",
+    "build:web": "eas build --platform web",
+    "submit:ios": "eas submit --platform ios",
+    "submit:android": "eas submit --platform android",
+    "postinstall": "patch-package"
+  },
+  "private": true
 }

todo.md

@@ -1,34 +0,0 @@
-- [x] Tasks should be renamed to ToDo
-- [x] top of ToDo page should say ToDo instead of TODO
-- [ ] Calendar rework
-- [x] when task with subtasks marked as done it hides the whole task and the subtask are gone and can't be seen anymore (subtask should be visible after completion)
-- [x] when dragging task to become subtask user should hold the task and not tap
-	because now it's very hard to scroll through tasks without randomly creating subtasks
-- [ ] when creating new task there is a huge gap between the create task box and the keyboard
-- [ ] after creating task keyboard should automatically be hidden again
-	now it's hard to get rid of the keyboard without clicking on other tasks
-- [ ] ToDo page button for category: hitbox very weird hard to click
-	when clicked should be framed in accent color and not get bigger like the all 
-	category now
-- [ ] category all button doesn't have the correct spacing between the dot and the text
-- [ ] no way to tell what category the task has -> should be a colored dot in the left of the task box replacing the nine random dots that don't anything
-- [ ] task from the calendar page should only show up in the ToDo page if it is that day or x days in advance (x can be set in settings)
-- [ ] clicking the three dots should open the "add new task" window instead of the window with the limited options it opens currently
-- [ ] swiping task for deleting or completing
-- [x] no category required by creating task
-- [ ] calendar task arrow not centered
-- [X] page names (up top) are not centered 
-- [X] tick icon in the top left needs to be removed/ replaced/ given a function
-- [ ] settings -> categories -> new / change category window needs to be centered and fully visible 
-	exit window button not visible or not existent 
-	user should be able to click outside of the window to close it 
-- [ ] pressing the go back button android:
-	in settings go to previous page task/ calendar/ stats
-	in other (task/ calendar/ stats) stay on that page
-	at the moment calendar and stats go to tasks 
-- [ ] ToDo -> select category -> scroll to the right most -> button to go to categories in settings
-- [x] accent color should be changeable 
-- [ ] bottom page buttons need to be reworked looking ass currently.
-- [ ] add a task button should say "Add a Task" and (the button to add have an arrow pointing upwards instead of a cross) could look better 
-- [ ] space between add task button and bottom bar should be zero of the task below should be blurred currently task visible between the two looks weird 
-- [ ] Stats page rework (when time is right)