Merge pull request 'Fixed the artifact path from outputs/release/ to outputs/apk/release/ in the workflow' (#32) from dev into main

Reviewed-on: #32

.gitea/workflows/build-apk.yml

@@ -1,75 +0,0 @@
-name: Build APK
-
-on:
-  push:
-    branches: [main]
-  workflow_dispatch:
-
-env:
-  ANDROID_HOME: ${{ runner.tool_cache }}/android-sdk
-  ANDROID_SDK_ROOT: ${{ runner.tool_cache }}/android-sdk
-
-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: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Install Android SDK
-        run: |
-          if [ -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then
-            echo "Android SDK already present in cache"
-          else
-            rm -rf "$ANDROID_HOME/cmdline-tools"
-            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
-        run: npm ci
-
-      - name: Generate debug keystore (signs the release APK)
-        run: |
-          mkdir -p carry-your-live/android/app
-          rm -f carry-your-live/android/app/debug.keystore
-          keytool -genkeypair -v \
-            -keystore carry-your-live/android/app/debug.keystore \
-            -alias androiddebugkey -storepass android -keypass android \
-            -keyalg RSA -keysize 2048 -validity 10000 \
-            -dname "CN=Android Debug,O=Android,C=US"
-
-      - name: Build release APK
-        run: |
-          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/release/app-release.apk

.gitea/workflows/build-deb.yml

@@ -1,36 +0,0 @@
-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

@@ -1,15 +1,92 @@
-name: release
+name: Build and Release APK
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
+  workflow_dispatch:
+
+env:
+  ANDROID_HOME: ${{ runner.tool_cache }}/android-sdk
+  ANDROID_SDK_ROOT: ${{ runner.tool_cache }}/android-sdk
 
 permissions:
   contents: write
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      apk-path: ${{ steps.upload-apk.outputs.path }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Install Android SDK
+        run: |
+          if [ -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then
+            echo "Android SDK already present in cache"
+          else
+            rm -rf "$ANDROID_HOME/cmdline-tools"
+            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
+          # Accept all licenses by writing known license hashes
+          mkdir -p "$ANDROID_HOME/licenses"
+          echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+          echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"
+          echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" >> "$ANDROID_HOME/licenses/android-sdk-license"
+          "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
+            "platform-tools" \
+            "platforms;android-36" \
+            "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
+        run: |
+          for i in {1..3}; do
+            npm ci && break || sleep 10
+          done
+
+      - name: Generate debug keystore (signs the release APK)
+        run: |
+          mkdir -p carry-your-live/android/app
+          rm -f carry-your-live/android/app/debug.keystore
+          keytool -genkeypair -v \
+            -keystore carry-your-live/android/app/debug.keystore \
+            -alias androiddebugkey -storepass android -keypass android \
+            -keyalg RSA -keysize 2048 -validity 10000 \
+            -dname "CN=Android Debug,O=Android,C=US"
+
+      - name: Build release APK
+        run: |
+          cd carry-your-live/android
+          ./gradlew assembleRelease
+
+      - name: Upload APK
+        id: upload-apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: carry-your-live-release
+          path: carry-your-live/android/app/build/outputs/apk/release/app-release.apk
+
   release:
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -17,6 +94,12 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Download APK artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: carry-your-live-release
+          path: .
+
       - name: Compute next version
         id: version
         run: |
@@ -53,4 +136,5 @@ jobs:
           tag_name: ${{ steps.version.outputs.next }}
           name: ${{ steps.version.outputs.next }}
           body: ${{ steps.changelog.outputs.body }}
-          generate_release_notes: false
+          files: ./app-release.apk
+          generate_release_notes: false

.opencode/architekt.md

@@ -14,4 +14,15 @@ System architecture design, technical strategy, and scalability planning.
 - System scalability
 - Performance benchmarks
 - Technical debt ratio
-- Architecture compliance
+- Architecture compliance
+
+## Android Design Guidelines
+- Material Design elevation patterns (0-12dp shadows)
+- Tab bar height: 56dp (standard Android)
+- Status bar: dark style for light backgrounds, light style for dark
+- System back button: router.back() or goBack() with confirmation on home screen
+- Touch ripple: opacity scaling on press (44dp touch targets, 8dp border radius)
+- Safe area insets: account for bottom navigation bar (84px + system insets)
+- Theme: primary accent color with complementary supporting colors
+- Typography: Roboto-inspired font weights (600 for labels, 400/500 for body)
+- Scaling: 8dp grid system for spacing and margins

README.md

@@ -1,6 +1,40 @@
 # Carry Your Live - Mobile To-Do & Calendar App
 
-A minimalist, offline-first task management app built with Expo, React Native, and WatermelonDB. Features three primary screens: To-Do List, Add New Task, and Calendar with bottom navigation.
+A minimalist, offline-first task management app built with Expo, React Native, and WatermelonDB. Features multiple screens with bottom navigation, social features, and a full-featured backend API.
+
+## 📝 Recent Progress (v1.1.0 - Unreleased)
+
+### Added
+- **Friends feature**: Friend requests, accept/decline/remove, user search, full backend routes
+- **Assignee field on tasks**: Schema v7, model, types, forms, sync, task actions
+- **AssigneeSelector component** and assignee display in TaskItem
+- **QuickAddBar** on tasks overview (copied from calendar)
+- **Backend**: Mounted friends route, added assigneeId to task validation and sync
+
+### Changed
+- Due date prefilled from Calendar "+" button
+- 12-hour time formatting across task rows and pickers
+- Calendar strip scrolls to selected day when navigating months
+- Calendar completion toggle now handles repeating tasks and reminders
+- Task color strips now use the task's category color
+
+### Fixed
+- WheelTimePicker FlatList scroll clamping - all hours (0-23) and minutes (0-59) reachable
+- WheelTimePicker selection highlight background connecting selected item with colon separator
+- WheelTimePicker number alignment in scroll list
+- Tasks without a due date no longer get overdue styling
+- `useOverdueTasks` infinite re-subscription loop (Date.now in effect deps)
+- Web/Android crashes from decorator transform ordering (babel config)
+- FormButtons crash outside FormProvider; Cancel navigation fallback
+- Task repeat settings, reminders and series info now sync to backend
+
+### Removed
+- Task color picker (task color now comes from its category)
+- Drag lift popup from TaskItem (scale + shadow on drag)
+- Checkbox from task items
+- Selection bar overlapping QuickAddBar on tasks overview
+
+---
 
 ## Features
 
@@ -8,97 +42,145 @@ A minimalist, offline-first task management app built with Expo, React Native, a
 - **Offline-First Architecture**: Full CRUD operations work offline with WatermelonDB + SQLite
 - **Auto-Sync**: Background synchronization with custom Postgres API when online
 - **Cross-Platform**: iOS, Android, and Web from single codebase
+- **Desktop Support**: Electron wrapper for desktop app distribution
 
 ### Screens
 
-#### 1. To-Do List Screen
+#### 1. Tasks Screen (To-Do List)
 - **Header**: App logo + "TODO" title with rounded corners
 - **Category Filter**: Horizontal scrollable chips (Work, Personal, School, Shopping, Health, Finance, All)
   - Single selection with visual feedback (thicker border, shadow, scale animation)
   - Instant task filtering
-- **Task List**: Vertical scrolling with:
-  - Checkbox (empty/checked states with animation)
+- **QuickAddBar**: Quick task creation from list view
+- **Task List**: Virtualized FlatList with sections (Pending/Completed)
   - Task title (truncated with ellipsis)
   - Three-dot overflow menu (Edit, Delete, Duplicate, Mark Complete, Change Category, Change Priority)
   - Priority badges with colors
   - Due date/time with overdue/due-today highlighting
-  - Completed section (collapsible)
-- **Floating Action Button**: Bottom-right, opens Add Task screen with press animation
+  - Category color indicator strip
+  - Assignee display
+  - Swipe actions (left: delete, right: complete)
+  - Drag-to-reorder with visual drop indicators
+  - Long press → Selection mode (multi-delete, multi-complete, change category/priority)
+- **Floating Action Button**: Bottom-right, opens Add Task screen
 
-#### 2. Add New Task Screen
+#### 2. Calendar Screen
+- **Date Strip**: Horizontal scrollable days of current month
+  - Current day highlighted, scrolls to selected day on month change
+- **Month Label**: Centered (e.g., "JAN 2026")
+- **QuickAddBar**: Quick task creation for selected date
+- **Task List**: Tasks for selected day with category color, title, time, completion status
+- **Analog Clock Widget**: Decorative analog clock display
+- **Empty State**: "No tasks scheduled."
+- **Day View**: Detailed view for selected day (pushes to stack)
+
+#### 3. Stats Screen
+- Client-side statistics (`useStats` hook)
+- Task completion metrics
+- Category and priority breakdowns
+
+#### 4. Settings Screen
+- **Account**: Login/Register/Sign Out (SyncModal)
+- **Server URL Override**: Custom API endpoint configuration
+- **Appearance**: Accent color picker (dark mode toggle planned)
+- **Task Defaults**: Default category, sort order (Date, Priority, Alphabetically, Creation Date), show completed toggle
+- **Calendar**: Days ahead to display
+- **Reminders**: Global reminder preference (stored, wiring in progress)
+- **Notifications**: Toggle (stored, wiring in progress)
+- **Legal**: Privacy Policy, Terms of Service
+- **About**: Version info
+
+#### 5. Add New Task Screen
 - **Category Selector**: Horizontal row of colored circles (required)
 - **Task Name**: Single-line input, 100 char max (required)
-- **Subtasks**: Unlimited, add/remove individually
-- **Date & Time**: Date picker, time picker, calendar button
+- **Subtasks**: Unlimited, add/remove individually, nested subtask support
+- **Date & Time**: Date picker, time picker (WheelTimePicker), calendar button
 - **Priority**: Dropdown (None, Low, Medium, High, Critical) with color indicators
+- **Repeat Profile**: Recurring task configuration
+- **Reminder**: Reminder offset selector
+- **Assignee**: Assign task to friend
 - **Description**: Multi-line text area, 1000 char max
 - **Bottom Actions**: Submit (primary) / Cancel (secondary) fixed buttons
 
-#### 3. Calendar Screen
-- **Date Strip**: Horizontal scrollable days of current month
-- **Month Label**: Centered (e.g., "JAN 2026")
-- **Task List**: Tasks for selected day with category color, title, time, completion status
-- **Empty State**: "No tasks scheduled."
+#### 6. Task Detail Screen
+- Full task view with all fields
+- Subtask management (add, complete, reorder, convert to task)
+- Edit functionality
+- Repeat profile configuration
 
-#### 4. Settings Screen
-- Dark Mode toggle
-- Push Notifications toggle
-- Reminder Preferences
-- Default Category selector
-- Sort Tasks By (Date, Priority, Alphabetically, Creation Date)
-- Backup & Sync
-- Version, Privacy Policy, Terms of Service
+#### 7. Subtask Detail Screen
+- Nested subtask management
+- Convert subtask ↔ task
+- Re-parent subtasks
 
-### Task States
-- **Pending**: Empty checkbox, normal text
-- **Completed**: Checked checkbox, strikethrough, reduced opacity
-- **Overdue**: Red due date, warning indicator
-- **Due Today**: Blue highlight
-- **High Priority**: Priority badge
+#### 8. Sync Modal
+- Login/Register forms
+- Forgot/Reset password flow
+- Server URL configuration
+- Sync status display
 
-### Interactions
-- Tap task → Edit screen
-- Long press → Selection mode (multi-delete, multi-complete, change category/priority)
-- Swipe left → Delete
-- Swipe right → Complete
-- Pull down → Refresh
+### Task Features
+- **Nested Subtasks**: Unlimited depth, re-parenting, drag reorder
+- **Repeating Tasks**: Repeat profiles, series IDs, this/future/all delete scopes, undo-complete
+- **Categories/Tags**: 6 default categories with colors, custom category editor
+- **Priorities**: None, Low, Medium, High, Critical with color badges
+- **Due Dates/Times**: With all-day option
+- **Reminders**: Per-task reminder offsets
+- **Assignees**: Assign tasks to friends
+- **Overdue/Due Today**: Visual highlighting
+
+### Social Features
+- **Friends System**: Send/accept/decline/remove friend requests
+- **User Search**: Find users by username/email
+- **Task Assignment**: Assign tasks to friends (client-side, backend schema ready)
+
+---
 
 ## Tech Stack
 
 | Layer | Technology |
 |-------|------------|
-| Framework | Expo (React Native) |
-| Language | TypeScript |
+| Framework | Expo (React Native) / Expo Router v3 |
+| Language | TypeScript (strict mode) |
 | Navigation | Expo Router (file-based) |
-| Database | WatermelonDB + SQLite |
-| State | WatermelonDB (reactive queries, no Redux needed) |
+| Database | WatermelonDB + SQLite (expo-sqlite) |
+| State | WatermelonDB reactive queries (no Redux) |
 | Forms | React Hook Form + Zod validation |
-| UI Components | React Native Paper + Custom SVG icons |
-| Animations | React Native Reanimated |
-| Date/Time | @react-native-community/datetimepicker + date-fns |
-| Build | EAS Build / Gradle (local APK) |
+| UI Components | React Native Paper + Custom components |
+| Animations | React Native Reanimated v3 |
+| Date/Time | @react-native-community/datetimepicker + date-fns + WheelTimePicker |
+| Build | EAS Build / Gradle (local APK) / Electron Builder (desktop) |
 | CI/CD | Gitea Actions (`.gitea/workflows/build-apk.yml`) |
+| Backend | Node.js + Express + TypeScript |
+| Backend DB | PostgreSQL + Drizzle ORM |
+| Auth | JWT (access + refresh tokens) |
+| Validation | Zod (shared with frontend) |
+
+---
 
 ## Project Structure
 
 ```
 carry-your-live/
 ├── app/
-│   ├── _layout.tsx              # Root layout + DatabaseProvider
+│   ├── _layout.tsx              # Root layout + DatabaseProvider + AuthProvider
 │   ├── (tabs)/
 │   │   ├── _layout.tsx          # Bottom tab navigator
 │   │   ├── index.tsx            # Tasks screen
 │   │   ├── calendar.tsx         # Calendar screen
+│   │   ├── stats.tsx            # Stats screen
 │   │   └── settings.tsx         # Settings screen
-│   └── add-task.tsx             # Add Task screen
+│   ├── add-task.tsx             # Add Task screen
+│   ├── day-view.tsx             # Calendar day detail
+│   ├── task-detail.tsx          # Task view/edit
+│   └── subtask-detail.tsx       # Subtask view/edit
 ├── src/
-│   ├── components/              # Reusable UI components
+│   ├── components/              # Reusable UI components (30+)
 │   │   ├── Header.tsx
 │   │   ├── CategoryFilter.tsx
 │   │   ├── TaskList.tsx
 │   │   ├── TaskItem.tsx
 │   │   ├── FloatingActionButton.tsx
-│   │   ├── TabBarIcon.tsx
 │   │   ├── CategorySelector.tsx
 │   │   ├── TaskNameInput.tsx
 │   │   ├── SubtasksSection.tsx
@@ -106,24 +188,102 @@ carry-your-live/
 │   │   ├── PrioritySelector.tsx
 │   │   ├── DescriptionInput.tsx
 │   │   ├── FormButtons.tsx
-│   │   └── ListItem.tsx
+│   │   ├── ListItem.tsx
+│   │   ├── AnalogClock.tsx
+│   │   ├── AssigneeSelector.tsx
+│   │   ├── CategoryEditorModal.tsx
+│   │   ├── ColorPickerInput.tsx
+│   │   ├── ColorWheel.tsx
+│   │   ├── DateTimeInput.tsx
+│   │   ├── ForgotPasswordModal.tsx
+│   │   ├── FriendsModal.tsx
+│   │   ├── LegalModal.tsx
+│   │   ├── OptionPickerModal.tsx
+│   │   ├── QuickAddBar.tsx
+│   │   ├── ReminderSelector.tsx
+│   │   ├── RepeatSelector.tsx
+│   │   ├── ServerUrlModal.tsx
+│   │   ├── SubtaskItem.tsx
+│   │   ├── SyncModal.tsx
+│   │   ├── SyncStatus.tsx
+│   │   ├── TabBarIcon.tsx
+│   │   ├── TaskDeleteModal.tsx
+│   │   ├── TaskOverflowMenu.tsx
+│   │   ├── UpdateNotifier.tsx
+│   │   └── WheelTimePicker.tsx
+│   ├── constants/
+│   │   └── index.ts             # Categories, priorities, colors, reminder options
 │   ├── database/
-│   │   ├── schema.ts            # WatermelonDB schema
+│   │   ├── schema.ts            # WatermelonDB schema (v21)
 │   │   ├── index.ts             # Database instance + collections
-│   │   └── sync.ts              # Custom API sync adapter
-│   ├── models/
-│   │   ├── Task.ts
-│   │   ├── Category.ts
-│   │   └── Subtask.ts
+│   │   ├── sync.ts              # Custom API sync adapter (25KB)
+│   │   ├── migrations.ts        # Schema migrations
+│   │   ├── adapter.ts           # Platform-specific adapters
+│   │   └── tombstones.ts        # Deleted record tracking
 │   ├── hooks/
 │   │   ├── useDatabase.tsx      # Database context & providers
-│   │   └── useTasks.tsx         # Task queries with reactive state
-│   ├── constants/
-│   │   └── index.ts             # Categories, priorities, colors
-│   └── types/
-│       └── index.ts             # TypeScript interfaces
+│   │   ├── useTasks.tsx         # Task queries with reactive state
+│   │   ├── useCategories.tsx    # Category queries
+│   │   ├── useTasksByDate.tsx   # Calendar date queries
+│   │   ├── useFriends.tsx       # Friends state & actions
+│   │   ├── useAuth.tsx          # Authentication state
+│   │   └── useStats.tsx         # Statistics computation
+│   ├── models/
+│   │   ├── Task.ts              # Task model (assigneeId, repeat, reminders)
+│   │   ├── Category.ts
+│   │   ├── Subtask.ts
+│   │   ├── RepeatProfile.ts
+│   │   ├── Friendship.ts
+│   │   └── Tombstone.ts
+│   ├── services/
+│   │   ├── api.ts               # API client with auth
+│   │   ├── auth.ts              # Auth token management
+│   │   ├── friends.ts           # Friends API calls
+│   │   ├── notifications.ts     # Reminder scheduling (expo-notifications)
+│   │   ├── repeat.ts            # Repeat task generation
+│   │   └── taskActions.ts       # Task CRUD + sync operations
+│   ├── theme/
+│   │   ├── index.ts             # Theme context, colors, spacing
+│   │   └── theme.tsx            # Accent color picker, settings sync
+│   ├── types/
+│   │   └── index.ts             # TypeScript interfaces
+│   └── utils/
+│       ├── date.ts              # Date formatting utilities
+│       ├── format.ts            # General formatting
+│       └── validation.ts        # Zod schemas
+├── backend/                     # Backend API (separate package)
+│   ├── src/
+│   │   ├── index.ts             # Express app entry
+│   │   ├── db/
+│   │   │   ├── schema.ts        # Drizzle schema (Postgres)
+│   │   │   └── index.ts         # DB connection
+│   │   ├── routes/
+│   │   │   ├── auth.ts          # Register, login, me, forgot/reset password
+│   │   │   ├── categories.ts    # Category CRUD
+│   │   │   ├── tasks.ts         # Task CRUD + batch
+│   │   │   ├── subtasks.ts      # Subtask CRUD
+│   │   │   ├── sync.ts          # Pull/push sync endpoints
+│   │   │   ├── users.ts         # User profile & settings
+│   │   │   ├── friends.ts       # Friend requests, search, management
+│   │   │   ├── repeatProfiles.ts# Repeat profile CRUD
+│   │   │   └── pushNotifications.ts
+│   │   ├── middleware/
+│   │   │   ├── auth.ts          # JWT verification
+│   │   │   ├── errorHandler.ts
+│   │   │   └── validation.ts    # Zod validation middleware
+│   │   ├── services/
+│   │   └── utils/
+│   ├── drizzle.config.ts
+│   └── Dockerfile
+├── electron/                    # Desktop app entry
+├── android/                     # Native Android project
+├── assets/                      # Images, fonts
+├── patches/                     # patch-package fixes
+└── plugins/                     # Expo config plugins
 ```
 
+---
+
 ## Data Models
 
 ### Task
@@ -135,8 +295,14 @@ carry-your-live/
   categoryId: string;
   priority: 'none' | 'low' | 'medium' | 'high' | 'critical';
   completed: boolean;
-  dueDate: number;        // timestamp
-  dueTime: string;        // "HH:MM"
+  dueDate: number;        // timestamp (ms)
+  dueTime: string;        // "HH:MM" (24h stored, 12h displayed)
+  allDay: boolean;
+  assigneeId: string | null;
+  repeatProfileId: string | null;
+  seriesId: string | null;      // For repeating tasks
+  isTemplate: boolean;          // Series template
+  reminderOffset: string | null; // e.g., "5m", "1h", "1d"
   createdAt: Date;
   updatedAt: Date;
   subtasks: Subtask[];
@@ -150,6 +316,8 @@ carry-your-live/
   name: string;
   color: '#HEX';
   order: number;
+  createdAt: Date;
+  updatedAt: Date;
 }
 ```
 
@@ -158,14 +326,47 @@ carry-your-live/
 {
   id: string;
   taskId: string;
+  parentSubtaskId: string | null;  // For nesting
   title: string;
   completed: boolean;
   order: number;
+  assigneeId: string | null;
   createdAt: Date;
   updatedAt: Date;
 }
 ```
 
+### Repeat Profile
+```typescript
+{
+  id: string;
+  name: string;
+  frequency: 'daily' | 'weekly' | 'monthly' | 'yearly' | 'custom';
+  interval: number;
+  daysOfWeek: number[];      // 0-6 for weekly
+  dayOfMonth: number | null; // For monthly
+  monthOfYear: number | null; // For yearly
+  endDate: number | null;    // Timestamp
+  occurrences: number | null;
+  createdAt: Date;
+  updatedAt: Date;
+}
+```
+
+### Friendship
+```typescript
+{
+  id: string;
+  userId: string;        // Requester
+  friendId: string;      // Recipient
+  status: 'pending' | 'accepted' | 'declined' | 'blocked';
+  createdAt: Date;
+  updatedAt: Date;
+}
+```
+
+---
+
 ## Default Categories
 | Name | Color | Order |
 |------|-------|-------|
@@ -176,6 +377,8 @@ carry-your-live/
 | Health | #8E24AA (Purple) | 4 |
 | Finance | #FDD835 (Yellow) | 5 |
 
+---
+
 ## Priority Colors
 | Priority | Color |
 |----------|-------|
@@ -185,6 +388,8 @@ carry-your-live/
 | High | #E53935 |
 | Critical | #B71C1C |
 
+---
+
 ## Getting Started
 
 ### Prerequisites
@@ -192,15 +397,23 @@ carry-your-live/
 - npm or yarn
 - Expo CLI (`npm install -g expo-cli`)
 - iOS Simulator (Mac) / Android Studio for mobile testing
+- PostgreSQL 16+ (or Docker)
 
 ### Installation
 ```bash
 cd carry-your-live
 npm install
+
+cd ../backend
+npm install
 ```
 
 ### Development
+
+#### Frontend
 ```bash
+cd carry-your-live
+
 # Start Expo dev server
 npx expo start
 
@@ -210,6 +423,37 @@ npx expo start --android
 npx expo start --web
 ```
 
+#### Backend
+```bash
+cd backend
+
+# Start PostgreSQL (Docker)
+docker-compose up -d postgres
+
+# Configure environment
+cp .env.example .env
+# Edit .env with your settings
+
+# Run migrations
+npm run db:push
+
+# Start dev server
+npm run dev
+```
+
+Server runs at `http://localhost:3000` (health check: `GET /health`)
+
+#### Desktop (Electron)
+```bash
+cd carry-your-live
+
+# Development with live reload
+npm run desktop:dev
+
+# Production build
+npm run desktop:dist
+```
+
 ### Building
 
 #### EAS Build (cloud)
@@ -225,18 +469,16 @@ eas build --platform ios
 eas build --platform android
 eas build --platform web
 ```
-Profiles are defined in `eas.json` (`development`, `preview`, `production`; production auto-increments version code).
+Profiles defined in `eas.json` (`development`, `preview`, `production`; production auto-increments version code).
 
 #### Gradle (local Android APK)
-The native Android project lives in `carry-your-live/android/`. Requires JDK 17+ and the Android SDK (platform 35, build-tools 35.0.0, NDK 27.1).
-
 ```bash
 cd carry-your-live/android
 
 # Debug APK (unsigned)
 ./gradlew assembleDebug
 
-# Release APK (currently signed with the debug keystore)
+# Release APK (signed with debug keystore)
 ./gradlew assembleRelease
 ```
 Output:
@@ -244,24 +486,21 @@ Output:
 android/app/build/outputs/apk/debug/app-debug.apk
 android/app/build/outputs/apk/release/app-release.apk
 ```
-Key notes:
-- The debug keystore (`android/app/debug.keystore`) is generated by the CI pipeline and must exist for release builds — create it locally with the same command used in the pipeline (see below) if it's missing.
-- Release builds use `signingConfig signingConfigs.debug` until a production keystore is configured.
-- Versions are set in `android/app/build.gradle` (`versionCode`, `versionName`).
+
+---
 
 ## CI/CD Pipeline (Gitea Actions)
 
-`.gitea/workflows/build-apk.yml` builds a release APK on every push to `main` (also manually triggerable via workflow_dispatch):
+`.gitea/workflows/build-apk.yml` builds a release APK on every push to `main` (also manually triggerable via `workflow_dispatch`):
 
 1. **Checkout** and setup Node 22, JDK 17 (Temurin)
 2. **Android SDK**: installs cmdline-tools, licenses, platform-tools, `platforms;android-35`, `build-tools;35.0.0`, `ndk;27.1.12297006`
 3. **JS deps**: `npm ci` in `carry-your-live/`
-4. **Debug keystore**: generates `carry-your-live/android/app/debug.keystore` with `keytool` (alias `androiddebugkey`, passwords `android`)
+4. **Debug keystore**: generates `carry-your-live/android/app/debug.keystore` with `keytool`
 5. **Build**: `./gradlew assembleRelease` in `carry-your-live/android/`
-6. **Upload**: the APK is saved as the `carry-your-live-release` artifact (downloadable from the run's artifacts page)
-
-To run the build locally exactly as CI does:
+6. **Upload**: APK saved as `carry-your-live-release` artifact
 
+To run locally exactly as CI does:
 ```bash
 keytool -genkeypair -v \
   -keystore carry-your-live/android/app/debug.keystore \
@@ -271,48 +510,119 @@ keytool -genkeypair -v \
 cd carry-your-live/android && ./gradlew assembleRelease
 ```
 
-## Sync API Specification
+---
 
-The app expects a custom API at `http://localhost:3000/api` (configurable in `src/database/sync.ts`):
+## Backend API Specification
 
-### Pull Changes
-```
-GET /sync?since={timestamp}
-```
-Response:
-```json
-{
-  "categories": [{ "id", "name", "color", "order", "createdAt", "updatedAt" }],
-  "tasks": [{ "id", "title", "description", "categoryId", "priority", "completed", "dueDate", "dueTime", "createdAt", "updatedAt" }],
-  "subtasks": [{ "id", "taskId", "title", "completed", "order", "createdAt", "updatedAt" }],
-  "timestamp": 1234567890
-}
-```
+Server runs at `http://localhost:3000/api` (configurable in `src/services/api.ts` and `src/database/sync.ts`):
 
-### Push Changes
-```
-POST /sync/push
-```
-Body:
-```json
-{
-  "changes": {
-    "categories": [...],
-    "tasks": [...],
-    "subtasks": [...]
-  },
-  "lastPulledAt": 1234567890
-}
-```
+### Authentication
+- `POST /api/auth/register` - Register new user
+- `POST /api/auth/login` - Login (returns access + refresh tokens)
+- `POST /api/auth/refresh` - Refresh access token
+- `POST /api/auth/forgot-password` - Request password reset
+- `POST /api/auth/reset-password` - Reset password with token
+- `GET /api/auth/me` - Get current user
+
+### Categories
+- `GET /api/categories` - List categories
+- `POST /api/categories` - Create category
+- `PATCH /api/categories/:id` - Update category
+- `DELETE /api/categories/:id` - Delete category
+
+### Tasks
+- `GET /api/tasks` - List tasks (with filters: category, completed, due date range, assignee)
+- `GET /api/tasks/:id` - Get task with subtasks
+- `POST /api/tasks` - Create task
+- `PATCH /api/tasks/:id` - Update task
+- `DELETE /api/tasks/:id` - Delete task (scopes: this/future/all for repeating)
+- `POST /api/tasks/batch` - Batch operations
+
+### Subtasks
+- `GET /api/subtasks/task/:taskId` - List subtasks for task
+- `POST /api/subtasks/task/:taskId` - Create subtask
+- `PATCH /api/subtasks/:id` - Update subtask
+- `DELETE /api/subtasks/:id` - Delete subtask
+
+### Repeat Profiles
+- `GET /api/repeat-profiles` - List repeat profiles
+- `POST /api/repeat-profiles` - Create repeat profile
+- `PATCH /api/repeat-profiles/:id` - Update repeat profile
+- `DELETE /api/repeat-profiles/:id` - Delete repeat profile
+
+### Users
+- `GET /api/users/me` - Get user with settings
+- `PATCH /api/users/me/settings` - Update settings (darkMode, defaultCategoryId, sortOrder, etc.)
+- `GET /api/users/search` - Search users (for friends)
+
+### Friends
+- `GET /api/friends` - List accepted friends
+- `GET /api/friends/requests` - List pending requests (incoming/outgoing)
+- `POST /api/friends/request` - Send friend request
+- `PATCH /api/friends/request/:id/accept` - Accept request
+- `PATCH /api/friends/request/:id/decline` - Decline request
+- `DELETE /api/friends/:id` - Remove friend
+
+### Sync (Offline-first)
+- `GET /api/sync?since=<timestamp>` - Pull changes since timestamp
+- `POST /api/sync/push` - Push local changes
+
+---
+
+## Sync Protocol
+
+The sync endpoint uses a cursor-based approach with tombstones:
+
+1. **Pull**: Client sends `since` timestamp, server returns all changes since then
+   ```json
+   {
+     "categories": [...],
+     "tasks": [...],
+     "subtasks": [...],
+     "repeatProfiles": [...],
+     "friendships": [...],
+     "tombstones": [...],
+     "timestamp": 1234567890
+   }
+   ```
+
+2. **Push**: Client sends batched changes with `lastPulledAt`
+   ```json
+   {
+     "changes": {
+       "categories": [...],
+       "tasks": [...],
+       "subtasks": [...],
+       "repeatProfiles": [...],
+       "friendships": [...]
+     },
+     "tombstones": [...],
+     "lastPulledAt": 1234567890
+   }
+   ```
+
+3. **Conflict Resolution**: Last-write-wins based on `updatedAt` (customizable in `src/database/sync.ts`)
+
+---
 
 ## Configuration
 
-### Environment Variables
-Create `.env` file:
+### Frontend Environment Variables
+Create `.env` file in `carry-your-live/`:
 ```
 EXPO_PUBLIC_API_URL=http://your-api-url/api
 ```
 
+### Backend Environment Variables
+Create `.env` file in `backend/`:
+```
+DATABASE_URL=postgresql://user:pass@localhost:5432/carry_your_live
+JWT_SECRET=your-32-char-secret
+PORT=3000
+NODE_ENV=development
+FRONTEND_URL=http://localhost:8081
+```
+
 ### App Config
 Modify `app.json` for:
 - App name, slug, version
@@ -320,10 +630,12 @@ Modify `app.json` for:
 - Permissions (notifications, etc.)
 - Orientation, theme
 
+---
+
 ## Visual Style Guide
 
-- **Background**: White (#FFFFFF)
-- **Primary Accent**: #E53935 (Pink/Red)
+- **Background**: White (#FFFFFF) / Dark mode (planned)
+- **Primary Accent**: #E53935 (Pink/Red) - customizable
 - **Typography**: Black (#212121) primary, #757575 secondary, #9E9E9E tertiary
 - **Borders**: Thin (#E0E0E0), selected #E53935
 - **Radius**: 16-20px for cards/buttons/inputs
@@ -331,11 +643,13 @@ Modify `app.json` for:
 - **Shadows**: Minimal (elevation 1-3)
 - **Animations**: 150-250ms, cubic easing
 
+---
+
 ## Offline-First Architecture
 
 ```
 ┌─────────────┐     ┌──────────────┐     ┌─────────────┐
-│   Expo App  │────▶│ WatermelonDB │────▶│  Your API   │
+│   Expo App  │────▶│ WatermelonDB │────▶│  Backend    │
 │ (iOS/Android│     │  (SQLite)    │     │  (Postgres) │
 │    Web)     │◀───▶│  + Sync      │◀───▶│             │
 └─────────────┘     └──────────────┘     └─────────────┘
@@ -345,6 +659,79 @@ Modify `app.json` for:
 2. Reactive queries update UI instantly
 3. Background sync pushes/pulls changes
 4. Conflict resolution: last-write-wins (customizable)
+5. Tombstones track deletions for sync
+
+---
+
+## Current Implementation Status
+
+Based on code audit (August 2026):
+
+| Feature | Status | Notes |
+|---------|--------|-------|
+| Core CRUD (tasks, subtasks, categories) | ✅ Complete | |
+| Nested subtasks | ✅ Complete | Unlimited depth |
+| Repeating tasks | ✅ Complete | Profiles, series, this/future/all delete |
+| Categories & priorities | ✅ Complete | |
+| Calendar with date strip | ✅ Complete | Month nav, day detail |
+| Stats screen | ✅ Complete | Client-side only |
+| Settings screen | ✅ Complete | Most settings wired |
+| Friends system | ✅ Complete | Backend + UI |
+| Task assignees | ✅ Complete | Schema v7, UI, sync |
+| QuickAddBar | ✅ Complete | Tasks + Calendar |
+| Offline sync (WatermelonDB) | ✅ Complete | Schema v21, tombstones |
+| Backend API | ✅ Complete | Express + Drizzle + Postgres |
+| Auth (JWT) | ✅ Complete | Register, login, refresh, forgot/reset |
+| Dark mode / theme toggle | ❌ Missing | Backend column exists, UI not implemented |
+| Notifications toggle | 🟡 Partial | Stored but not respected |
+| Global reminder preference | 🟡 Partial | Stored but not applied |
+| Forgot/reset password UI | 🟡 Partial | Backend done, no client UI |
+| Pull-to-refresh → sync | 🟡 Partial | Reloads local only |
+| Client settings sync | 🟡 Partial | AsyncStorage only, not synced to backend |
+| Reminder enum mismatch | 🟡 Partial | Client uses '5m'/'1h', spec uses minutes |
+
+---
+
+## Roadmap Highlights
+
+### v1.1.0 — Friends & Assignees (Current Unreleased)
+- Ship existing Unreleased changes
+- Fix notifications toggle, wire up `rescheduleAllReminders()`
+- Apply global reminder preference
+- Make pull-to-refresh trigger real sync
+- Add forgot/reset password UI
+- Unify reminder offset enums
+
+### v1.2.0 — Theming & Findability
+- Light mode + follow-system-theme
+- Sync all settings to `PATCH /users/me/settings`
+- Task search (filter + global)
+- Friend request badges/indicators
+
+### v1.3.0 — Stats & Insights
+- Persisted stats snapshots
+- Productivity trends, streaks
+- Export stats (CSV/image)
+
+### v1.4.0 — Quick Capture & Calendar UX
+- Natural language quick-add
+- Drag-and-drop rescheduling in calendar
+- Month grid view
+- "Today at a glance" dashboard
+
+### v1.5.0 — Power Tools & Personalization
+- Task templates, soft-archive, attachments
+- Markdown support, deep links
+- Biometric lock, haptics, reduced motion
+- Android home-screen widget
+
+### v2.0.0 — Collaboration
+- Real task assignment delivery
+- Shared lists with permissions
+- Server push notifications (FCM/APNs)
+- Comments/activity feed
+
+---
 
 ## Contributing
 
@@ -353,6 +740,9 @@ Modify `app.json` for:
 3. Write components with React Hook Form + Zod
 4. Use WatermelonDB decorators for models
 5. Test offline scenarios
+6. Run `npm run lint` and `npm run typecheck` before committing
+
+---
 
 ## License
 

carry-your-live/android/gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx1536m -XX:MaxMetaspaceSize=384m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED
+org.gradle.jvmargs=-Xmx1536m -XX:MaxMetaspaceSize=1024m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED
 org.gradle.workers.max=2
 
 # When configured, Gradle will run in incubating parallel mode.

carry-your-live/android/settings.gradle

@@ -1,4 +1,7 @@
 pluginManagement {
+  repositories {
+    gradlePluginPortal()
+  }
   def reactNativeGradlePlugin = new File(
     providers.exec {
       workingDir(rootDir)

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

@@ -1,7 +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 { View, StyleSheet, TouchableOpacity, Animated, } from 'react-native';
 import { TabBarIcon } from '@/components/TabBarIcon';
 import { useSettings } from '@/theme';
 import { setLastVisitedTab } from '@/utils/tabHistory';
@@ -12,29 +12,30 @@ export default function TabLayout() {
 
   return (
     <Tabs
-      screenOptions={{
+screenOptions={{
         tabBarActiveTintColor: theme.accent,
         tabBarInactiveTintColor: theme.textSecondary,
         tabBarStyle: {
           backgroundColor: theme.tabBarBg,
           borderTopWidth: 0,
-          height: 84 + insets.bottom,
+          height: 56,
           paddingBottom: insets.bottom,
-          paddingTop: 12,
+          paddingTop: insets.top,
           paddingHorizontal: 16,
-          elevation: 0,
+          elevation: 4,
           shadowColor: '#000',
-          shadowOffset: { width: 0, height: -4 },
-          shadowOpacity: 0.12,
-          shadowRadius: 20,
+          shadowOffset: { width: 0, height: 2 },
+          shadowOpacity: 0.1,
+          shadowRadius: 8,
         },
         tabBarItemStyle: {
-          paddingVertical: 0,
+          paddingVertical: 6,
+          paddingHorizontal: 12,
         },
         tabBarLabelStyle: {
-          fontSize: 11,
-          fontWeight: '700',
-          marginTop: 4,
+          fontSize: 12,
+          fontWeight: '600',
+          marginTop: 2,
         },
         headerShown: false,
         sceneStyle: { backgroundColor: theme.background },
@@ -48,13 +49,13 @@ export default function TabLayout() {
               backgroundColor: theme.tabBarBg,
               paddingBottom: Math.max(props.insets.bottom, 8),
               shadowColor: '#000',
-              shadowOffset: { width: 0, height: -4 },
-              shadowOpacity: 0.12,
-              shadowRadius: 20,
-              elevation: 8,
+              shadowOffset: { width: 0, height: 4 },
+              shadowOpacity: 0.1,
+              shadowRadius: 8,
+              elevation: 4,
             },
           ]}
-          >
+        >
             {props.navigation.getState().routes.map((route) => {
               const focused = props.navigation.getState().index === props.navigation.getState().routes.indexOf(route);
               return (
@@ -62,13 +63,18 @@ export default function TabLayout() {
                   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 }}
+                >
+                <Animated.View
+                  style={[
+                    styles.rippleContainer,
+                    { opacity: focused ? 1 : 0.5 },
+                  ]}
                 >
                   <TabBarIcon
                     name={route.name === 'index' ? 'checklist' : route.name === 'calendar' ? 'calendar' : route.name === 'stats' ? 'stats' : 'gear'}
@@ -76,6 +82,7 @@ export default function TabLayout() {
                     color={focused ? theme.accent : theme.textSecondary}
                     size={24}
                   />
+                </Animated.View>
                 </TouchableOpacity>
               );
             })}
@@ -103,22 +110,23 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'space-around',
-    paddingTop: 10,
+    paddingTop: 6,
     paddingHorizontal: 16,
   },
   tabItem: {
     flex: 1,
     alignItems: 'center',
-    paddingVertical: 8,
-    paddingHorizontal: 8,
-    borderRadius: 16,
+    paddingVertical: 6,
+    paddingHorizontal: 12,
+    borderRadius: 8,
     minWidth: 70,
   },
-  tabItemActive: {
-    shadowColor: '#000',
-    shadowOffset: { width: 0, height: 2 },
-    shadowOpacity: 0.1,
-    shadowRadius: 8,
-    elevation: 4,
+  rippleContainer: {
+    width: 44,
+    height: 44,
+    borderRadius: 22,
+    alignItems: 'center',
+    justifyContent: 'center',
+    position: 'relative',
   },
 });

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

@@ -10,7 +10,7 @@ import { FriendsModal } from '@/components/FriendsModal';
 import { LegalModal } from '@/components/LegalModal';
 import { ServerUrlModal } from '@/components/ServerUrlModal';
 import SyncStatus from '@/components/SyncStatus';
-import { useSettings, SORT_OPTIONS, REMINDER_OPTIONS, ACCENT_PRESETS, DEFAULT_ACCENT } from '@/theme';
+import { useSettings, SORT_OPTIONS, REMINDER_OPTIONS, ACCENT_PRESETS, DEFAULT_ACCENT, DEFAULT_ACCENT_OPACITY } from '@/theme';
 import { useCategories } from '@/hooks/useDatabase';
 import { getAuthUser, getAuthToken } from '@/services/auth';
 import { checkForUpdates, getCurrentAppVersion } from '@/services/updates';
@@ -38,16 +38,19 @@ export default function SettingsScreen() {
   const [draftAccentOpacity, setDraftAccentOpacity] = useState(accentOpacity);
   const [syncSubtitle, setSyncSubtitle] = useState('Checking...');
   const [updateSubtitle, setUpdateSubtitle] = useState('Tap to check');
+  const [lastUpdateCheck, setLastUpdateCheck] = useState<string | null>(null);
 
   const handleCheckUpdates = async () => {
     setUpdateSubtitle('Checking...');
     const update = await checkForUpdates();
     if (!update) {
       setUpdateSubtitle('Up to date');
+      setLastUpdateCheck(new Date().toLocaleString());
       Alert.alert('Up to date', `You're running the latest version (${getCurrentAppVersion()}).`);
       return;
     }
     setUpdateSubtitle(`${update.version} available`);
+    setLastUpdateCheck(new Date().toLocaleString());
     const url = update.apkUrl ?? update.releaseUrl;
     Alert.alert('Update available', `Version ${update.version} is available for download.`, [
       { text: 'Later', style: 'cancel' },
@@ -60,6 +63,17 @@ export default function SettingsScreen() {
     ]);
   };
 
+  const checkForUpdatesOnLoad = async () => {
+    const update = await checkForUpdates();
+    if (!update) {
+      setUpdateSubtitle('Up to date');
+      setLastUpdateCheck(new Date().toLocaleString());
+      return;
+    }
+    setUpdateSubtitle(`${update.version} available`);
+    setLastUpdateCheck(new Date().toLocaleString());
+  };
+
   const refreshSyncStatus = async () => {
     const token = await getAuthToken();
     if (!token) {
@@ -84,6 +98,8 @@ export default function SettingsScreen() {
 
   useFocusEffect(
     useCallback(() => {
+      refreshSyncStatus();
+      checkForUpdatesOnLoad();
       const sub = BackHandler.addEventListener('hardwareBackPress', () => {
         const target = getLastVisitedTab();
         if (target && target !== 'settings') {
@@ -92,7 +108,7 @@ export default function SettingsScreen() {
         return true;
       });
       return () => sub.remove();
-    }, [router])
+    }, [refreshSyncStatus, router])
   );
 
   const defaultCategory = categories.find((c) => c.id === defaultCategoryId);
@@ -302,6 +318,10 @@ export default function SettingsScreen() {
           onPress={handleCheckUpdates}
           showChevron
         />
+        <ListItem
+          title="Last checked"
+          subtitle={lastUpdateCheck ?? 'Never'}
+        />
         <ListItem
           title="Version"
           subtitle={getCurrentAppVersion()}

carry-your-live/app/_layout.tsx

@@ -10,7 +10,6 @@ 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 () => ({
@@ -57,15 +56,24 @@ function RootNavigator() {
     Linking.getInitialURL().then(handleUrl).catch(() => {});
     const subscription = Linking.addEventListener('url', ({ url }) => handleUrl(url));
 
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === 'Escape') {
+        router.back();
+      }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+
     return () => {
       subscription.remove();
       removeNotificationSubscription(responseListener);
+      window.removeEventListener('keydown', handleKeyDown);
     };
   }, [router]);
 
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
-      <StatusBar style="light" />
+      <StatusBar style="dark" />
       <Stack screenOptions={{ headerShown: false }}>
         <Stack.Screen name="(tabs)" />
         <Stack.Screen name="add-task" />

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

@@ -161,7 +161,7 @@ export function CategoryEditorModal({
                   </TouchableOpacity>
                 ))}
               </View>
-              <ColorWheel color={color} onChange={setColor} />
+              <ColorWheel color={color} opacity={1} onChange={setColor} />
 
               <View style={styles.actions}>
                 {category && (

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

@@ -67,6 +67,7 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
   const subtaskRefs = useRef<Map<string, { ref: View; parentTaskId: string }>>(new Map());
   const dragStateRef = useRef<{ taskId: string; positions: Record<string, { top: number; bottom: number }>; subPositions: Record<string, { top: number; bottom: number }> } | null>(null);
   const subtaskDragRef = useRef<{ subtaskId: string; parentTaskId: string; parentSubtaskId: string | null; positions: Record<string, { top: number; bottom: number }>; subPositions: Record<string, { top: number; bottom: number }> } | null>(null);
+  const taskDragRef = useRef<{ taskId: string; positions: Record<string, { top: number; bottom: number }> } | null>(null);
    const {
       modals,
       openTaskDelete,
@@ -237,6 +238,22 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
     return { positions, subPositions };
   }, [measureItems]);
 
+  const findHoverTask = useCallback((absoluteY: number, draggedId: string, positions: Record<string, { top: number; bottom: number }>) => {
+    const entries = Object.entries(positions);
+    for (let i = entries.length - 1; i >= 0; i--) {
+      const [id, p] = entries[i];
+      if (id === draggedId) continue;
+      if (absoluteY >= p.top && absoluteY <= p.bottom) {
+        return id;
+      }
+    }
+    return null;
+  }, []);
+
+  const updateHoverTaskTarget = useCallback((target: string | null) => {
+    setHoverTaskId(target ?? null);
+  }, []);
+
   const findHoverTarget = useCallback((absoluteY: number, draggedId: string, positions: Record<string, { top: number; bottom: number }>, subPositions: Record<string, { top: number; bottom: number }>) => {
     const subEntries = Object.entries(subPositions);
     for (let i = subEntries.length - 1; i >= 0; i--) {
@@ -381,6 +398,49 @@ const handleSubtaskDragEnd = useCallback(async (absoluteY: number) => {
     }
   }, [findHoverTarget, moveSubtaskToTask]);
 
+  const handleTaskDragStart = useCallback(async (taskId: string) => {
+    const positions = await measureItems() as Record<string, { top: number; bottom: number }>;
+    taskDragRef.current = { taskId, positions };
+  }, [measureItems]);
+
+  const handleTaskDragUpdate = useCallback((absoluteY: number) => {
+    const state = taskDragRef.current;
+    if (!state) return;
+    const target = findHoverTask(absoluteY, state.taskId, state.positions);
+    updateHoverTaskTarget(target);
+    if (target) {
+      setDropIndicator({ targetId: target, position: 'below' });
+    } else {
+      const lastItem = Object.values(state.positions).reduce((max, p) => p.bottom > max.bottom ? p : max, { bottom: 0 });
+      if (absoluteY > lastItem.bottom) {
+        setDropIndicator({ targetId: null, position: 'below' });
+      } else {
+        setDropIndicator(null);
+      }
+    }
+  }, [findHoverTask, updateHoverTaskTarget]);
+
+  const handleTaskDragEnd = useCallback(async (absoluteY: number) => {
+    const state = taskDragRef.current;
+    taskDragRef.current = null;
+    setHoverTaskId(null);
+    setDropIndicator(null);
+    if (!state) return;
+
+    const target = findHoverTask(absoluteY, state.taskId, state.positions);
+    if (target === state.taskId) return;
+
+    // Set drop indicator based on target position
+    if (target) {
+      setDropIndicator({ targetId: target, position: 'below' });
+    } else {
+      const lastItem = Object.values(state.positions).reduce((max, p) => p.bottom > max.bottom ? p : max, { bottom: 0 });
+      if (absoluteY > lastItem.bottom) {
+        setDropIndicator({ targetId: null, position: 'below' });
+      }
+    }
+  }, [findHoverTask]);
+
   const renderItem = useCallback(
     ({ item, index }: { item: Task; index: number }) => {
       const isExpanded = expandedTasks.has(item.id);

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

@@ -220,5 +220,9 @@ export const migrations = schemaMigrations({
         }),
       ],
     },
+    {
+      toVersion: 21,
+      steps: [],
+    },
   ],
 });

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

@@ -11,7 +11,6 @@ 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';
@@ -96,7 +95,7 @@ export async function runSync(): Promise<SyncResult> {
   }
 
   // If offline, mark timestamps and return early - changes will sync on next foreground launch
-  const isCurrentlyOnline = await useOnline();
+  const isCurrentlyOnline = navigator.onLine;
   if (!isCurrentlyOnline) {
     const now = Date.now();
     await setLastPulledAt(now);

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

@@ -2,6 +2,7 @@ import { useDatabase } from './useDatabase';
 import { Q } from '@nozbe/watermelondb';
 import { useEffect, useState, useCallback } from 'react';
 import Task from '../models/Task';
+import { Priority, Repeat, Reminder } from '@/types';
 import parseICal from '../utils/icalParser';
 import { startOfMonth, endOfMonth, addMonths, format } from 'date-fns';
 
@@ -138,49 +139,34 @@ export function useICalImport() {
       }
 
       const taskData = events.map(mapICalEventToTask);
+      const now = Date.now();
 
       // 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);
-        },
-      });
+      await Promise.all(
+        taskData.map((td) =>
+          collections.tasks.create((t) => {
+            t.title = td.title;
+            t.description = td.description;
+            t.categoryId = td.categoryId;
+            t.priority = td.priority as Priority;
+            t.completed = td.completed;
+            t.completedAt = td.completedAt;
+            t.dueDate = td.dueDate;
+            t.dueTime = td.dueTime;
+            t.endTime = td.endTime;
+            t.allDay = td.allDay;
+            t.repeat = td.repeat as Repeat;
+            t.repeatInterval = td.repeatInterval;
+            t.repeatDays = td.repeatDays;
+            t.seriesId = td.seriesId;
+            t.reminder = td.reminder as Reminder;
+            t.reminders = td.reminders;
+            t.assigneeId = null;
+            t.createdAt = new Date(now);
+            t.updatedAt = new Date(now);
+          })
+        )
+      );
 
       setLoading(false);
     } catch (err: any) {
@@ -188,7 +174,7 @@ export function useICalImport() {
       setError(err.message || 'Import failed');
       setLoading(false);
     }
-  }, [collections]);
+  }, []);
 
   return { importICal, loading, error };
 }

carry-your-live/src/theme.tsx

@@ -154,6 +154,8 @@ interface SettingsContextType {
   setApiUrl: (value: string) => void;
   accentColor: string;
   setAccentColor: (value: string) => void;
+  accentOpacity: number;
+  setAccentOpacity: (value: number) => void;
   todoAheadDays: number;
   setTodoAheadDays: (value: number) => void;
   showCompleted: boolean;
@@ -243,6 +245,8 @@ export function SettingsProvider({ children }: { children: ReactNode }) {
       setApiUrl,
       accentColor,
       setAccentColor,
+      accentOpacity,
+      setAccentOpacity,
       todoAheadDays,
       setTodoAheadDays,
       showCompleted,

creds.txt

@@ -1,2 +0,0 @@
-tech08mag
-7BXtaqyvwVB15W

tsconfig.json

@@ -1,4 +1,37 @@
 {
-  "compilerOptions": {},
-  "extends": "expo/tsconfig.base"
+  "compilerOptions": {
+    "allowJs": true,
+    "esModuleInterop": true,
+    "jsx": "react-jsx",
+    "lib": ["DOM", "ESNext"],
+    "module": "preserve",
+    "moduleDetection": "force",
+    "moduleResolution": "bundler",
+    "customConditions": ["react-native"],
+    "noEmit": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "target": "ESNext",
+    "baseUrl": ".",
+    "deprecationDiagnostics": false,
+    "paths": {
+      "@/*": ["carry-your-live/src/*"],
+      "@/components/*": ["carry-your-live/src/components/*"],
+      "@/hooks/*": ["carry-your-live/src/hooks/*"],
+      "@/database/*": ["carry-your-live/src/database/*"],
+      "@/models/*": ["carry-your-live/src/models/*"],
+      "@/constants/*": ["carry-your-live/src/constants/*"],
+      "@/types/*": ["carry-your-live/src/types/*"],
+      "@/utils/*": ["carry-your-live/src/utils/*"]
+    }
+  },
+  "extends": "expo/tsconfig.base",
+  "exclude": [
+    "${configDir}/node_modules",
+    "${configDir}/babel.config.js",
+    "${configDir}/metro.config.js",
+    "${configDir}/jest.config.js",
+    "${configDir}/android",
+    "${configDir}/ios"
+  ]
 }