fix: create android/app directory before generating debug keystore

The keytool command fails without the directory existing first.
Add mkdir -p before the keytool genkeypair command.

.gitea/workflows/build-apk.yml

@@ -42,12 +42,8 @@ jobs:
           "$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
@@ -56,7 +52,6 @@ jobs:
       - 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 \
@@ -64,12 +59,11 @@ jobs:
             -dname "CN=Android Debug,O=Android,C=US"
 
       - name: Build release APK
-        run: |
+        working-directory: carry-your-live/android
-          cd carry-your-live/android
+        run: ./gradlew assembleRelease
-          ./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
+          path: carry-your-live/android/app/build/outputs/apk/release/*.apk

.gitignore

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

.opencode/architekt.md

@@ -1,17 +0,0 @@
-# Architekt Agent
-
-## Role
-System architecture design, technical strategy, and scalability planning.
-
-## Responsibilities
-- High-level system design
-- Technology stack selection
-- Performance optimization
-- Architecture documentation
-- Trade-off analysis
-
-## Key Metrics
-- System scalability
-- Performance benchmarks
-- Technical debt ratio
-- Architecture compliance

.opencode/config.json

@@ -1,13 +0,0 @@
-{
-  "agents": {
-    "manager": ".opencode/manager.md",
-    "architekt": ".opencode/architekt.md",
-    "software_engineer": ".opencode/software_engineer.md",
-    "hardware_engineer": ".opencode/hardware_engineer.md",
-    "tester": ".opencode/tester.md",
-    "docs": ".opencode/docs.md",
-    "deployment": ".opencode/deployment.md",
-    "vla": ".opencode/vla.md"
-  },
-  "subagent_depth": 999999
-}

.opencode/deployment.md

@@ -1,17 +0,0 @@
-# Deployment Agent
-
-## Role
-CI/CD, infrastructure, and release management.
-
-## Responsibilities
-- CI/CD pipeline management
-- Infrastructure as code
-- Release orchestration
-- Environment management
-- Monitoring and alerting
-
-## Key Metrics
-- Deployment frequency
-- Lead time for changes
-- Mean time to recovery
-- Change success rate

.opencode/docs.md

@@ -1,17 +0,0 @@
-# Docs Agent
-
-## Role
-Technical documentation, API docs, and knowledge management.
-
-## Responsibilities
-- API documentation
-- User guides
-- Architecture docs
-- Change logs
-- Knowledge base maintenance
-
-## Key Metrics
-- Documentation completeness
-- Update frequency
-- User satisfaction
-- Searchability

.opencode/hardware_engineer.md

@@ -1,17 +0,0 @@
-# Hardware Engineer Agent
-
-## Role
-Hardware integration, device management, and embedded systems.
-
-## Responsibilities
-- Hardware selection and integration
-- Device driver development
-- Embedded firmware
-- Prototyping and testing
-- Hardware-software interface
-
-## Key Metrics
-- Hardware compatibility rate
-- Power consumption
-- Latency measurements
-- Component reliability

.opencode/manager.md

@@ -1,17 +0,0 @@
-# Manager Agent
-
-## Role
-Project management, task coordination, prioritization, and team oversight.
-
-## Responsibilities
-- Task decomposition and assignment
-- Progress tracking and status reporting
-- Risk identification and mitigation
-- Resource allocation
-- Stakeholder communication
-
-## Key Metrics
-- Sprint velocity
-- Task completion rate
-- Blockers resolved
-- Timeline adherence

.opencode/project-summary.md

@@ -1,98 +0,0 @@
-# Carry Your Live - Project Summary
-
-## Overview
-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.
-
-## Core Features
-- **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
-
-## Tech Stack
-| Layer | Technology |
-|-------|------------|
-| Framework | Expo (React Native) |
-| Language | TypeScript |
-| Navigation | Expo Router (file-based) |
-| Database | WatermelonDB + SQLite |
-| State | WatermelonDB (reactive queries, no Redux needed) |
-| 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 | Gradle (local APK) |
-| CI/CD | Gitea Actions |
-
-## Project Structure
-```
-carry-your-live/
-├ app/
-│   ├── _layout.tsx              # Root layout + DatabaseProvider
-│   ├── (tabs)/
-│   │   ├── _layout.tsx          # Bottom tab navigator
-│   │   ├── index.tsx            # Tasks screen
-│   │   ├── calendar.tsx         # Calendar screen
-│   │   └── settings.tsx         # Settings screen
-│   └── add-task.tsx             # Add Task screen
-├ src/
-│   ├── components/              # Reusable UI components
-│   ├── database/
-│   │   ├── schema.ts            # WatermelonDB schema
-│   │   ├── index.ts             # Database instance + collections
-│   │   └── sync.ts              # Custom API sync adapter
-│   ├── models/
-│   │   ├── Task.ts
-│   │   ├── Category.ts
-│   │   └── Subtask.ts
-│   ├── hooks/
-│   │   ├── useDatabase.tsx      # Database context & providers
-│   │   └── useTasks.tsx         # Task queries with reactive state
-│   ├── constants/
-│   │   └── index.ts             # Categories, priorities, colors
-│   └── types/
-│       └── index.ts             # TypeScript interfaces
-```
-
-## Data Models
-- **Task**: id, title, description, categoryId, priority, completed, dueDate, dueTime, createdAt, updatedAt, subtasks
-- **Category**: id, name, color, order
-- **Subtask**: id, taskId, title, completed, order, createdAt, updatedAt
-
-## Default Categories
-| Name | Color | Order |
-|------|-------|-------|
-| Work | #E53935 (Red) | 0 |
-| Personal | #43A047 (Green) | 1 |
-| School | #1E88E5 (Blue) | 2 |
-| Shopping | #FB8C00 (Orange) | 3 |
-| Health | #8E24AA (Purple) | 4 |
-| Finance | #FDD835 (Yellow) | 5 |
-
-## Priority Colors
-| Priority | Color |
-|----------|-------|
-| None | #9E9E9E |
-| Low | #43A047 |
-| Medium | #FB8C00 |
-| High | #E53935 |
-| Critical | #B71C1C |
-
-## Sync API
-Custom API at `http://localhost:3000/api` (configurable in `src/database/sync.ts`):
-- **Pull**: GET /sync?since={timestamp} - returns categories, tasks, subtasks, timestamp
-- **Push**: POST /sync/push - body with changes { categories, tasks, subtasks } + lastPulledAt
-
-## Getting Started
-```bash
-npm install
-npx expo start
-# Platform-specific:
-npx expo start --ios
-npx expo start --android
-npx expo start --web
-```
-
-## Build Commands
-- `cd android && ./gradlew assembleDebug` - Debug APK
-- `cd android && ./gradlew assembleRelease` - Release APK
-- `npm run desktop` - Electron desktop app

.opencode/software_engineer.md

@@ -1,17 +0,0 @@
-# Software Engineer Agent
-
-## Role
-Code implementation, feature development, and software quality.
-
-## Responsibilities
-- Feature implementation
-- Code reviews
-- Bug fixing
-- Refactoring
-- Unit testing
-
-## Key Metrics
-- Code quality score
-- Test coverage
-- Pull request throughput
-- Bug resolution time

.opencode/tester.md

@@ -1,17 +0,0 @@
-# Tester Agent
-
-## Role
-Quality assurance, test automation, and test strategy.
-
-## Responsibilities
-- Test case design
-- Automated test execution
-- Regression testing
-- Performance testing
-- Test coverage analysis
-
-## Key Metrics
-- Test pass rate
-- Defect detection rate
-- Test execution time
-- Bug leakage

.opencode/vla.md

@@ -1,17 +0,0 @@
-# VLA Agent
-
-## Role
-Vision-Language-Action models and multimodal understanding.
-
-## Responsibilities
-- VLA model development
-- Multimodal perception
-- Action prediction
-- Policy learning
-- Sim-to-real transfer
-
-## Key Metrics
-- Task success rate
-- Sample efficiency
-- Generalization ability
-- Simulation-to-real transfer rate

carry-your-live/.gitignore

@@ -41,3 +41,4 @@ yarn-error.*
 
 # generated native folders
 /ios
+/android

carry-your-live/android/.gitignore

@@ -1,19 +0,0 @@
-# OSX
-#
-.DS_Store
-
-# Android/IntelliJ
-#
-build/
-.idea
-.gradle
-local.properties
-*.iml
-*.hprof
-.cxx/
-
-# generated inline modules
-app/src/main/java/inline/
-
-# Bundle artifacts
-*.jsbundle

carry-your-live/android/app/build.gradle

@@ -1,182 +0,0 @@
-apply plugin: "com.android.application"
-apply plugin: "org.jetbrains.kotlin.android"
-apply plugin: "com.facebook.react"
-
-def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
-
-/**
- * This is the configuration block to customize your React Native Android app.
- * By default you don't need to apply any configuration, just uncomment the lines you need.
- */
-react {
-    entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim())
-    reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
-    hermesCommand = new File(["node", "--print", "require.resolve('hermes-compiler/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/hermesc/%OS-BIN%/hermesc"
-    codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
-
-    enableBundleCompression = (findProperty('android.enableBundleCompression') ?: false).toBoolean()
-    // Use Expo CLI to bundle the app, this ensures the Metro config
-    // works correctly with Expo projects.
-    cliFile = new File(["node", "--print", "require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })"].execute(null, rootDir).text.trim())
-    bundleCommand = "export:embed"
-
-    /* Folders */
-     //   The root of your project, i.e. where "package.json" lives. Default is '../..'
-    // root = file("../../")
-    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
-    // reactNativeDir = file("../../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
-    // codegenDir = file("../../node_modules/@react-native/codegen")
-
-    /* Variants */
-    //   The list of variants to that are debuggable. For those we're going to
-    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
-    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    // debuggableVariants = ["liteDebug", "prodDebug"]
-
-    /* Bundling */
-    //   A list containing the node command and its flags. Default is just 'node'.
-    // nodeExecutableAndArgs = ["node"]
-
-    //
-    //   The path to the CLI configuration file. Default is empty.
-    // bundleConfig = file(../rn-cli.config.js)
-    //
-    //   The name of the generated asset file containing your JS bundle
-    // bundleAssetName = "MyApplication.android.bundle"
-    //
-    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    // entryFile = file("../js/MyApplication.android.js")
-    //
-    //   A list of extra flags to pass to the 'bundle' commands.
-    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
-    // extraPackagerArgs = []
-
-    /* Hermes Commands */
-    //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    //
-    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-    // hermesFlags = ["-O", "-output-source-map"]
-
-    /* Autolinking */
-    autolinkLibrariesWithApp()
-}
-
-/**
- * Set this to true in release builds to optimize the app using [R8](https://developer.android.com/topic/performance/app-optimization/enable-app-optimization).
- */
-def enableMinifyInReleaseBuilds = (findProperty('android.enableMinifyInReleaseBuilds') ?: false).toBoolean()
-
-/**
- * The preferred build flavor of JavaScriptCore (JSC)
- *
- * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
- *
- * The international variant includes ICU i18n library and necessary data
- * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US. Note that
- * this variant is about 6MiB larger per architecture than default.
- */
-def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
-
-android {
-    ndkVersion = rootProject.ext.ndkVersion
-
-    buildToolsVersion = rootProject.ext.buildToolsVersion
-    compileSdk = rootProject.ext.compileSdkVersion
-
-    namespace = 'com.anonymous.carryyourlive'
-    defaultConfig {
-        applicationId = 'com.anonymous.carryyourlive'
-        minSdkVersion = rootProject.ext.minSdkVersion
-        targetSdkVersion = rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0.0"
-
-        buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
-    }
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-    }
-    buildTypes {
-        debug {
-            signingConfig = signingConfigs.debug
-        }
-        release {
-            // Caution! In production, you need to generate your own keystore file.
-            // see https://reactnative.dev/docs/signed-apk-android.
-            signingConfig = signingConfigs.debug
-            def enableShrinkResources = findProperty('android.enableShrinkResourcesInReleaseBuilds') ?: 'false'
-            shrinkResources = enableShrinkResources.toBoolean()
-            minifyEnabled enableMinifyInReleaseBuilds
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            def enablePngCrunchInRelease = findProperty('android.enablePngCrunchInReleaseBuilds') ?: 'true'
-            crunchPngs = enablePngCrunchInRelease.toBoolean()
-        }
-    }
-    packagingOptions {
-        jniLibs {
-            def enableLegacyPackaging = findProperty('expo.useLegacyPackaging') ?: 'false'
-            useLegacyPackaging = enableLegacyPackaging.toBoolean()
-        }
-    }
-    androidResources {
-        ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~'
-    }
-}
-
-// Apply static values from `gradle.properties` to the `android.packagingOptions`
-// Accepts values in comma delimited lists, example:
-// android.packagingOptions.pickFirsts=/LICENSE,**/picasa.ini
-["pickFirsts", "excludes", "merges", "doNotStrip"].each { prop ->
-    // Split option: 'foo,bar' -> ['foo', 'bar']
-    def options = (findProperty("android.packagingOptions.$prop") ?: "").split(",");
-    // Trim all elements in place.
-    for (i in 0..<options.size()) options[i] = options[i].trim();
-    // `[] - ""` is essentially `[""].filter(Boolean)` removing all empty strings.
-    options -= ""
-
-    if (options.length > 0) {
-        println "android.packagingOptions.$prop += $options ($options.length)"
-        // Ex: android.packagingOptions.pickFirsts += '**/SCCS/**'
-        options.each {
-            android.packagingOptions[prop] += it
-        }
-    }
-}
-
-dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-
-    def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true";
-    def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true";
-    def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true";
-
-    if (isGifEnabled) {
-        // For animated gif support
-        implementation("com.facebook.fresco:animated-gif:${expoLibs.versions.fresco.get()}")
-    }
-
-    if (isWebpEnabled) {
-        // For webp support
-        implementation("com.facebook.fresco:webpsupport:${expoLibs.versions.fresco.get()}")
-        if (isWebpAnimatedEnabled) {
-            // Animated webp support
-            implementation("com.facebook.fresco:animated-webp:${expoLibs.versions.fresco.get()}")
-        }
-    }
-
-    if (hermesEnabled.toBoolean()) {
-        implementation("com.facebook.react:hermes-android")
-    } else {
-        implementation jscFlavor
-    }
-}

carry-your-live/android/app/proguard-rules.pro

@@ -1,14 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# react-native-reanimated
--keep class com.swmansion.reanimated.** { *; }
--keep class com.facebook.react.turbomodule.** { *; }
-
-# Add any project specific keep options here:

carry-your-live/android/app/src/debug/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:usesCleartextTraffic" />
-</manifest>

carry-your-live/android/app/src/debugOptimized/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:usesCleartextTraffic" />
-</manifest>

carry-your-live/android/app/src/main/AndroidManifest.xml

@@ -1,36 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:replace="android:maxSdkVersion"/>
-  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-  <uses-permission android:name="android.permission.VIBRATE"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:replace="android:maxSdkVersion"/>
-  <queries>
-    <intent>
-      <action android:name="android.intent.action.VIEW"/>
-      <category android:name="android.intent.category.BROWSABLE"/>
-      <data android:scheme="https"/>
-    </intent>
-  </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true" android:enableOnBackInvokedCallback="false" android:usesCleartextTraffic="true">
-    <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/notification_icon_color"/>
-    <meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/notification_icon"/>
-    <meta-data android:name="expo.modules.notifications.default_notification_color" android:resource="@color/notification_icon_color"/>
-    <meta-data android:name="expo.modules.notifications.default_notification_icon" android:resource="@drawable/notification_icon"/>
-    <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
-    <meta-data android:name="expo.modules.updates.ENABLE_BSDIFF_PATCH_SUPPORT" android:value="true"/>
-    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
-    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
-    <activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode|smallestScreenSize|assetsPaths" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="exp+carry-your-live"/>
-      </intent-filter>
-    </activity>
-  </application>
-</manifest>

carry-your-live/android/app/src/main/java/com/anonymous/carryyourlive/MainActivity.kt

@@ -1,61 +0,0 @@
-package com.anonymous.carryyourlive
-
-import android.os.Build
-import android.os.Bundle
-
-import com.facebook.react.ReactActivity
-import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
-import com.facebook.react.defaults.DefaultReactActivityDelegate
-
-import expo.modules.ReactActivityDelegateWrapper
-
-class MainActivity : ReactActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    // Set the theme to AppTheme BEFORE onCreate to support
-    // coloring the background, status bar, and navigation bar.
-    // This is required for expo-splash-screen.
-    setTheme(R.style.AppTheme);
-    super.onCreate(null)
-  }
-
-  /**
-   * Returns the name of the main component registered from JavaScript. This is used to schedule
-   * rendering of the component.
-   */
-  override fun getMainComponentName(): String = "main"
-
-  /**
-   * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
-   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
-   */
-  override fun createReactActivityDelegate(): ReactActivityDelegate {
-    return ReactActivityDelegateWrapper(
-          this,
-          BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
-          object : DefaultReactActivityDelegate(
-              this,
-              mainComponentName,
-              fabricEnabled
-          ){})
-  }
-
-  /**
-    * Align the back button behavior with Android S
-    * where moving root activities to background instead of finishing activities.
-    * @see <a href="https://developer.android.com/reference/android/app/Activity#onBackPressed()">onBackPressed</a>
-    */
-  override fun invokeDefaultOnBackPressed() {
-      if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
-          if (!moveTaskToBack(false)) {
-              // For non-root activities, use the default implementation to finish them.
-              super.invokeDefaultOnBackPressed()
-          }
-          return
-      }
-
-      // Use the default back button implementation on Android S
-      // because it's doing more than [Activity.moveTaskToBack] in fact.
-      super.invokeDefaultOnBackPressed()
-  }
-}

carry-your-live/android/app/src/main/java/com/anonymous/carryyourlive/MainApplication.kt

@@ -1,45 +0,0 @@
-package com.anonymous.carryyourlive
-
-import android.app.Application
-import android.content.res.Configuration
-
-import com.facebook.react.PackageList
-import com.facebook.react.ReactApplication
-import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
-import com.facebook.react.ReactPackage
-import com.facebook.react.ReactHost
-import com.facebook.react.common.ReleaseLevel
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
-
-import expo.modules.ApplicationLifecycleDispatcher
-import expo.modules.ExpoReactHostFactory
-
-class MainApplication : Application(), ReactApplication {
-
-  override val reactHost: ReactHost by lazy {
-    ExpoReactHostFactory.getDefaultReactHost(
-      context = applicationContext,
-      packageList =
-        PackageList(this).packages.apply {
-          // Packages that cannot be autolinked yet can be added manually here, for example:
-          // add(MyReactNativePackage())
-        }
-    )
-  }
-
-  override fun onCreate() {
-    super.onCreate()
-    DefaultNewArchitectureEntryPoint.releaseLevel = try {
-      ReleaseLevel.valueOf(BuildConfig.REACT_NATIVE_RELEASE_LEVEL.uppercase())
-    } catch (e: IllegalArgumentException) {
-      ReleaseLevel.STABLE
-    }
-    loadReactNative(this)
-    ApplicationLifecycleDispatcher.onApplicationCreate(this)
-  }
-
-  override fun onConfigurationChanged(newConfig: Configuration) {
-    super.onConfigurationChanged(newConfig)
-    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
-  }
-}

carry-your-live/android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,6 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@color/splashscreen_background"/>
-  <item>
-    <bitmap android:gravity="center" android:src="@drawable/splashscreen_logo"/>
-  </item>
-</layer-list>

carry-your-live/android/app/src/main/res/drawable/rn_edit_text_material.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetTop="@dimen/abc_edit_text_inset_top_material"
-       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
-       >
-
-    <selector>
-        <!--
-          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
-          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
-          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
-
-          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-
-          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
-        -->
-        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
-    </selector>
-
-</inset>

carry-your-live/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
-</adaptive-icon>

carry-your-live/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
-</adaptive-icon>

carry-your-live/android/app/src/main/res/values-night/colors.xml

@@ -1,3 +0,0 @@
-<resources>
-  <color name="appBackground">#121212</color>
-</resources>

carry-your-live/android/app/src/main/res/values/colors.xml

@@ -1,7 +0,0 @@
-<resources>
-  <color name="splashscreen_background">#FFFFFF</color>
-  <color name="iconBackground">#E6F4FE</color>
-  <color name="colorPrimary">#023c69</color>
-  <color name="notification_icon_color">#1E88E5</color>
-  <color name="appBackground">#121212</color>
-</resources>

carry-your-live/android/app/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-  <string name="app_name">carry-your-live</string>
-</resources>

carry-your-live/android/app/src/main/res/values/styles.xml

@@ -1,12 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-    <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-    <item name="android:navigationBarColor">@android:color/transparent</item>
-    <item name="android:windowBackground">@color/appBackground</item>
-  </style>
-  <style name="Theme.App.SplashScreen" parent="AppTheme">
-    <item name="android:windowBackground">@drawable/splashscreen_logo</item>
-  </style>
-</resources>

carry-your-live/android/build.gradle

@@ -1,37 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-  repositories {
-    google()
-    mavenCentral()
-  }
-  dependencies {
-    classpath('com.android.tools.build:gradle')
-    classpath('com.facebook.react:react-native-gradle-plugin')
-    classpath('org.jetbrains.kotlin:kotlin-gradle-plugin')
-  }
-}
-
-allprojects {
-  repositories {
-    google()
-    mavenCentral()
-        maven { url = 'https://www.jitpack.io' }
-  }
-}
-
-apply plugin: "expo-root-project"
-apply plugin: "com.facebook.react.rootproject"
-
-subprojects {
-  plugins.withId("com.android.library") {
-    extensions.configure(com.android.build.api.dsl.LibraryExtension) {
-      ndkVersion = rootProject.ext.ndkVersion
-    }
-  }
-  plugins.withId("com.android.application") {
-    extensions.configure(com.android.build.api.dsl.ApplicationExtension) {
-      ndkVersion = rootProject.ext.ndkVersion
-    }
-  }
-}

carry-your-live/android/gradle.properties

@@ -1,66 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# 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.workers.max=2
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-org.gradle.parallel=true
-
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which packages are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-
-# Enable AAPT2 PNG crunching
-android.enablePngCrunchInReleaseBuilds=true
-
-# Use this property to specify which architecture you want to build.
-# You can also override it from the CLI using
-# ./gradlew <task> -PreactNativeArchitectures=x86_64
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
-
-# Use this property to enable support to the new architecture.
-# This will allow you to use TurboModules and the Fabric render in
-# your application. You should enable this flag either if you want
-# to write custom TurboModules/Fabric components OR use libraries that
-# are providing them. React Native 0.82+ always runs with the New
-# Architecture, so this flag is no longer honored and was removed.
-
-# Use this property to enable or disable the Hermes JS engine.
-# If set to false, you will be using JSC instead.
-hermesEnabled=true
-
-# Enable edge-to-edge display support.
-# This allows your app to draw behind system bars for an immersive UI.
-# Note: Only works with ReactActivity and should not be used with custom Activity.
-edgeToEdgeEnabled=true
-
-# Enable GIF support in React Native images (~200 B increase)
-expo.gif.enabled=true
-# Enable webp support in React Native images (~85 KB increase)
-expo.webp.enabled=true
-# Enable animated webp support (~3.4 MB increase)
-# Disabled by default because iOS doesn't support animated webp
-expo.webp.animated=false
-
-# Enable network inspector
-EX_DEV_CLIENT_NETWORK_INSPECTOR=true
-
-# Use legacy packaging to compress native libraries in the resulting APK.
-expo.useLegacyPackaging=false
-
-expo.inlineModules.watchedDirectories=[]
-# Enabled parallel sync for Gradle 9.4+
-org.gradle.tooling.parallel=true

carry-your-live/android/gradle/gradle-daemon-jvm.properties

@@ -1,2 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainVersion=17

carry-your-live/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

carry-your-live/android/gradlew

@@ -1,248 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

carry-your-live/android/gradlew.bat

@@ -1,93 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

carry-your-live/android/settings.gradle

@@ -1,39 +0,0 @@
-pluginManagement {
-  def reactNativeGradlePlugin = new File(
-    providers.exec {
-      workingDir(rootDir)
-      commandLine("node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')] })")
-    }.standardOutput.asText.get().trim()
-  ).getParentFile().absolutePath
-  includeBuild(reactNativeGradlePlugin)
-  
-  def expoPluginsPath = new File(
-    providers.exec {
-      workingDir(rootDir)
-      commandLine("node", "--print", "require.resolve('expo-modules-autolinking/package.json', { paths: [require.resolve('expo/package.json')] })")
-    }.standardOutput.asText.get().trim(),
-    "../android/expo-gradle-plugin"
-  ).absolutePath
-  includeBuild(expoPluginsPath)
-}
-
-plugins {
-  id("com.facebook.react.settings")
-  id("expo-autolinking-settings")
-}
-
-extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
-  if (System.getenv('EXPO_USE_COMMUNITY_AUTOLINKING') == '1') {
-    ex.autolinkLibrariesFromCommand()
-  } else {
-    ex.autolinkLibrariesFromCommand(expoAutolinking.rnConfigCommand)
-  }
-}
-expoAutolinking.useExpoModules()
-
-rootProject.name = 'carry-your-live'
-
-expoAutolinking.useExpoVersionCatalog()
-
-include ':app'
-includeBuild(expoAutolinking.reactNativeGradlePlugin)

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

@@ -8,21 +8,17 @@ import { useSubtasks } from '@/hooks/useSubtasks';
 import { useTaskModals } from '@/hooks/useTaskModals';
 import { useSettings } from '@/theme';
 import { useCategories } from '@/hooks/useDatabase';
-import { useICalImport } from '@/hooks/useICalImport';
+import { confirmAndToggleTaskComplete } from '@/utils/taskActions';
-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 } from 'react-native-svg';
+import Svg, { Path, Circle } 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',
@@ -30,16 +26,9 @@ const MONTH_NAMES = [
 
 export default function CalendarScreen() {
   const router = useRouter();
-  const { theme, sortBy } = useSettings();
+  const { theme } = 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());
@@ -66,25 +55,6 @@ export default function CalendarScreen() {
   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(() => {
       refreshDayTasks();
@@ -195,45 +165,9 @@ export default function CalendarScreen() {
     });
   }, [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();
-  }, [refreshDayTasks, refreshMonthTasks, refreshSubtasks]);
-
   return (
     <SafeAreaView style={[styles.container, { backgroundColor: theme.background }]}>
-      <Header
+      <Header title="Calendar" showLogo={false} />
-        title="Calendar"
-        showLogo={false}
-        rightAction={
-          <TouchableOpacity
-            onPress={() => router.back()}
-            style={styles.backButton}
-            accessible={true}
-            accessibilityLabel="Back"
-          >
-            <Svg width={20} height={20} viewBox="0 0 24 24">
-              <Path d="M15 18l-6-6 6-6" stroke="currentColor" strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
-            </Svg>
-          </TouchableOpacity>
-        }
-      />
 
       <KeyboardAvoidingView style={styles.kbAvoid} behavior="padding">
       <ScrollView style={styles.scrollBody} showsVerticalScrollIndicator={false} contentContainerStyle={styles.scrollContent}>
@@ -310,41 +244,78 @@ export default function CalendarScreen() {
 
         <View style={styles.panelHeader}>
               <Text style={[styles.panelDate, { color: theme.text }]}>{format(selectedDate, 'EEEE, MMMM d')}</Text>
-              {sortedDayTasks.length > 0 && (
+              {selectedDayTasks.length > 0 && (
                 <Text style={[styles.panelCount, { color: theme.textFaint }]}>
-                  {sortedDayTasks.length} event{sortedDayTasks.length === 1 ? '' : 's'}
+                  {selectedDayTasks.length} event{selectedDayTasks.length === 1 ? '' : 's'}
                 </Text>
               )}
             </View>
 
-            {sortedDayTasks.length === 0 ? (
+            {selectedDayTasks.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>
             ) : (
-              sortedDayTasks.map((task) => {
+              selectedDayTasks.map((task) => (
-                const isExpanded = expandedTasks.has(task.id);
+                <View key={task.id} style={[styles.eventCard, { backgroundColor: theme.card, borderColor: theme.border }]}>
-                const itemSubtasks = subtasksByTask.get(task.id) ?? [];
+                  <View style={styles.eventRow}>
-                return (
+                    <TouchableOpacity
-                  <View key={task.id} style={styles.eventCard}>
+                      style={styles.checkCircle}
-                    <CalendarTaskRow
+                      onPress={() => handleToggleComplete(task.id)}
-                      task={task}
+                      activeOpacity={0.7}
-                      expanded={isExpanded}
+                    >
-                      subtasks={itemSubtasks}
+                      <Svg width={30} height={30} viewBox="0 0 24 24">
-                      categoryColor={categoryColors.get(task.categoryId)}
+                        {task.completed ? (
-                      onToggle={() => handleToggleComplete(task.id)}
+                          <>
-                      onPress={(id) =>
+                            <Circle cx={12} cy={12} r={10} fill={theme.accent} />
-                        expandedTasks.has(id)
+                            <Path d="M7 12l3 3 7-7" stroke="#FFFFFF" strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
-                          ? 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)}
+                        )}
-                      onSubtaskToggle={handleSubtaskToggle}
+                      </Svg>
-                    />
+                    </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>
 
@@ -380,60 +351,6 @@ 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;
@@ -442,7 +359,8 @@ function cellTitle(tasks: Task[]): string | null {
 
 function cellColor(tasks: Task[], categories: { id: string; color: string }[], theme: ThemeColors): string {
   if (tasks.length === 0) return theme.textMuted;
-  return theme.accent;
+  const cat = categories.find((c) => c.id === tasks[0].categoryId);
+  return cat ? desaturate(cat.color, 0.3) : theme.textMuted;
 }
 
 interface DayCellProps {
@@ -624,16 +542,58 @@ const createStyles = (theme: ThemeColors) => StyleSheet.create({
   emptySubtext: {
     fontSize: 13,
   },
-  backButton: {
-    padding: 8,
-  },
   eventCard: {
     marginHorizontal: 16,
     marginTop: 6,
+    borderRadius: 16,
+    borderWidth: 1,
+    paddingHorizontal: 14,
+    paddingVertical: 12,
   },
-  subtaskList: {
+  eventRow: {
-    paddingLeft: 8,
+    flexDirection: 'row',
-    paddingRight: 4,
+    alignItems: 'center',
-    paddingTop: 4,
+  },
+  checkCircle: {
+    width: 30,
+    marginRight: 12,
+  },
+  eventTitleTouch: {
+    flex: 1,
+  },
+  eventTitle: {
+    fontSize: 15,
+    fontWeight: '500',
+  },
+  eventCompleted: {
+    textDecorationLine: 'line-through',
+    color: theme.textMuted,
+  },
+  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: theme.textMuted,
   },
 });

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

@@ -15,8 +15,6 @@ 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';
@@ -24,10 +22,9 @@ import { getLastVisitedTab, tabHref } from '@/utils/tabHistory';
 
 export default function SettingsScreen() {
   const router = useRouter();
-  const { theme, notifications, setNotifications, defaultCategoryId, setDefaultCategoryId, sortBy, setSortBy, reminderPreference, setReminderPreference, tagReminderPreferences, setTagReminderPreferences, apiUrl, accentColor, setAccentColor, accentOpacity, setAccentOpacity, todoAheadDays, setTodoAheadDays, showCompleted, setShowCompleted, deleteBySwipe, setDeleteBySwipe } = useSettings();
+  const { theme, notifications, setNotifications, defaultCategoryId, setDefaultCategoryId, sortBy, setSortBy, reminderPreference, setReminderPreference, apiUrl, accentColor, setAccentColor, todoAheadDays, setTodoAheadDays, showCompleted, setShowCompleted } = 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);
@@ -35,7 +32,6 @@ export default function SettingsScreen() {
   const [serverUrlVisible, setServerUrlVisible] = useState(false);
   const [customAccentVisible, setCustomAccentVisible] = useState(false);
   const [draftAccent, setDraftAccent] = useState(accentColor);
-  const [draftAccentOpacity, setDraftAccentOpacity] = useState(accentOpacity);
   const [syncSubtitle, setSyncSubtitle] = useState('Checking...');
   const [updateSubtitle, setUpdateSubtitle] = useState('Tap to check');
 
@@ -99,14 +95,6 @@ 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);
@@ -120,20 +108,6 @@ 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));
   };
@@ -189,18 +163,6 @@ 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 Tag"
@@ -226,19 +188,6 @@ 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`}
@@ -345,19 +294,6 @@ 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"
@@ -394,18 +330,18 @@ export default function SettingsScreen() {
                 </Svg>
               </TouchableOpacity>
             </View>
-            <ColorWheel color={draftAccent} opacity={draftAccentOpacity} onChange={(color, opacity) => { setDraftAccent(color); setDraftAccentOpacity(opacity); }} />
+            <ColorWheel color={draftAccent} onChange={setDraftAccent} />
             <View style={styles.accentModalActions}>
               <TouchableOpacity
                 style={[styles.accentModalButton, { borderColor: theme.borderStrong }]}
-                onPress={() => { setDraftAccent(DEFAULT_ACCENT); setDraftAccentOpacity(DEFAULT_ACCENT_OPACITY); setAccentColor(DEFAULT_ACCENT); setAccentOpacity(DEFAULT_ACCENT_OPACITY); }}
+                onPress={() => { setDraftAccent(DEFAULT_ACCENT); setAccentColor(DEFAULT_ACCENT); }}
                 activeOpacity={0.7}
               >
                 <Text style={[styles.accentModalButtonText, { color: theme.textSecondary }]}>Reset</Text>
               </TouchableOpacity>
               <TouchableOpacity
                 style={[styles.accentModalButton, styles.accentModalButtonPrimary, { backgroundColor: theme.accent }]}
-                onPress={() => { setAccentColor(draftAccent); setAccentOpacity(draftAccentOpacity); setCustomAccentVisible(false); }}
+                onPress={() => { setAccentColor(draftAccent); setCustomAccentVisible(false); }}
                 activeOpacity={0.8}
               >
                 <Text style={[styles.accentModalButtonText, { color: theme.accentText }]}>Apply</Text>

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

@@ -194,7 +194,6 @@ export default function AddTaskScreen() {
             showsVerticalScrollIndicator={false}
             keyboardShouldPersistTaps="handled"
             keyboardDismissMode="interactive"
-            automaticallyAdjustContentInsets={false}
           >
             <CategorySelector
               value={tags}

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

@@ -40,14 +40,11 @@ export default function DayViewScreen() {
 
   useFocusEffect(
     useCallback(() => {
-      const sub = BackHandler.addEventListener('hardwareBackPress', () => {
+      const sub = BackHandler.addEventListener('hardwareBackPress', () => false);
-        router.back();
-        return true;
-      });
       refreshSubtasks();
       refresh();
       return () => sub.remove();
-    }, [router, refreshSubtasks, refresh])
+    }, [refreshSubtasks, refresh])
   );
 
   const subtasksOnDay = useMemo(() => {
@@ -73,7 +70,7 @@ export default function DayViewScreen() {
 
   return (
     <SafeAreaView style={[styles.container, { backgroundColor: theme.background, paddingBottom: insets.bottom }]}>
-      <Header title={format(day, 'EEEE, MMM d')} showLogo={false} rightAction="Back" />
+      <Header title={format(day, 'EEEE, MMM d')} showLogo={false} />
       <KeyboardAvoidingView style={styles.kbAvoid} behavior="padding">
         <ScrollView style={styles.scrollBody} contentContainerStyle={styles.scrollContent} showsVerticalScrollIndicator={false}>
           {loading ? (

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

@@ -187,7 +187,6 @@ export default function SubtaskDetailScreen() {
             contentContainerStyle={styles.scrollContent}
             showsVerticalScrollIndicator={false}
             keyboardShouldPersistTaps="handled"
-            keyboardDismissMode="interactive"
           >
             <Controller
               control={control}

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

@@ -49,9 +49,9 @@ export function AnalogClock({ value, is24Hour = false, onChange }: AnalogClockPr
       let hour: number;
       if (is24Hour) {
         const inner = distance < INNER_NUM_RADIUS + 14;
-        hour = inner ? base + 12 : base === 0 ? 12 : base;
+        hour = inner ? base + 12 : (base === 0 ? 12 : base);
       } else {
-        hour = isPM ? base + 12 : base === 0 ? 0 : base;
+        hour = isPM ? base + 12 : (base === 0 ? 0 : base);
       }
       emit(hour, minutes);
       setMode('minute');
@@ -135,8 +135,7 @@ export function AnalogClock({ value, is24Hour = false, onChange }: AnalogClockPr
         );
       });
 
-  const minuteDots =
+  const minuteDots = mode === 'minute'
-    mode === 'minute'
     ? Array.from({ length: 12 }, (_, i) => {
         const angle = (i * 30 * Math.PI) / 180;
         const x = CENTER + RADIUS * 0.82 * Math.sin(angle);
@@ -182,7 +181,7 @@ export function AnalogClock({ value, is24Hour = false, onChange }: AnalogClockPr
         </TouchableOpacity>
         {!is24Hour && (
           <View style={styles.periodGroup}>
-            {(['AM', 'PM'] as const).map(period => {
+            {(['AM', 'PM'] as const).map((period) => {
               const active = isPM === (period === 'PM');
               return (
                 <TouchableOpacity
@@ -216,15 +215,15 @@ export function AnalogClock({ value, is24Hour = false, onChange }: AnalogClockPr
         style={styles.clockSurface}
         onStartShouldSetResponder={() => true}
         onMoveShouldSetResponder={() => true}
-        onResponderGrant={e => {
+        onResponderGrant={(e) => {
           movedRef.current = false;
           onLocation(e, false);
         }}
-        onResponderMove={e => {
+        onResponderMove={(e) => {
           movedRef.current = true;
           onLocation(e, true);
         }}
-        onResponderRelease={e => {
+        onResponderRelease={(e) => {
           if (!movedRef.current) {
             onLocation(e, false);
           }

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

@@ -1,15 +1,5 @@
 import React from 'react';
-import {
+import { View, Text, TouchableOpacity, StyleSheet, Modal, FlatList, ActivityIndicator, TextInput, KeyboardAvoidingView } from 'react-native';
-  View,
-  Text,
-  TouchableOpacity,
-  StyleSheet,
-  Modal,
-  FlatList,
-  ActivityIndicator,
-  TextInput,
-  KeyboardAvoidingView,
-} from 'react-native';
 import { useSettings } from '@/theme';
 import { useFriends } from '@/hooks/useFriends';
 
@@ -92,14 +82,19 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
         <Text style={[styles.selectorIcon, { color: theme.accentStrong }]}>👤</Text>
         <View style={styles.selectorContent}>
           <Text style={[styles.selectorLabel, { color: theme.textMuted }]}>Assignee</Text>
-          <Text style={[styles.selectorValue, { color: value ? theme.text : theme.textMuted }]}>
+          <Text
+            style={[
+              styles.selectorValue,
+              { color: value ? theme.text : theme.textMuted },
+            ]}
+          >
             {selectedFriend ? selectedFriend.username : 'Unassigned'}
           </Text>
         </View>
         {value && !disabled && (
           <TouchableOpacity
             style={styles.clearButton}
-            onPress={e => {
+            onPress={(e) => {
               e.stopPropagation();
               handleClear();
             }}
@@ -110,12 +105,7 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
         )}
       </TouchableOpacity>
 
-      <Modal
+      <Modal visible={showModal} transparent animationType="fade" onRequestClose={() => setShowModal(false)}>
-        visible={showModal}
-        transparent
-        animationType="fade"
-        onRequestClose={() => setShowModal(false)}
-      >
         <KeyboardAvoidingView
           style={[styles.modalOverlay, { backgroundColor: 'rgba(0,0,0,0.5)' }]}
           behavior="padding"
@@ -123,10 +113,7 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
           <View style={[styles.modalSheet, { backgroundColor: theme.sheetBg }]}>
             <View style={styles.modalHeader}>
               <Text style={[styles.modalTitle, { color: theme.text }]}>Assign Task</Text>
-              <TouchableOpacity
+              <TouchableOpacity onPress={() => setShowModal(false)} hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}>
-                onPress={() => setShowModal(false)}
-                hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
-              >
                 <Text style={[styles.closeText, { color: theme.textMuted }]}>✕</Text>
               </TouchableOpacity>
             </View>
@@ -135,10 +122,7 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
               <TouchableOpacity
                 style={[
                   styles.optionRow,
-                  {
+                  { backgroundColor: selectedFriend ? theme.accentSoft : 'transparent', borderColor: selectedFriend ? theme.accent : 'transparent' },
-                    backgroundColor: selectedFriend ? theme.accentSoft : 'transparent',
-                    borderColor: selectedFriend ? theme.accent : 'transparent',
-                  },
                 ]}
                 onPress={() => handleClear()}
               >
@@ -159,9 +143,7 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
                   <ActivityIndicator color={theme.accent} size="large" />
                 </View>
               ) : friends.length === 0 ? (
-                <Text style={[styles.emptyText, { color: theme.textFaint }]}>
+                <Text style={[styles.emptyText, { color: theme.textFaint }]}>No friends yet. Add friends to assign tasks.</Text>
-                  No friends yet. Add friends to assign tasks.
-                </Text>
               ) : (
                 <FlatList
                   data={friends}
@@ -170,19 +152,14 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
                     <TouchableOpacity
                       style={[
                         styles.optionRow,
-                        {
+                        { backgroundColor: value === item.id ? theme.accentSoft : 'transparent', borderColor: value === item.id ? theme.accent : 'transparent' },
-                          backgroundColor: value === item.id ? theme.accentSoft : 'transparent',
-                          borderColor: value === item.id ? theme.accent : 'transparent',
-                        },
                       ]}
                       onPress={() => handleSelectFriend(item.id)}
                     >
                       <View style={styles.optionIcon}>
                         <Text style={styles.optionIconText}>👤</Text>
                       </View>
-                      <Text style={[styles.optionText, { color: theme.text }]}>
+                      <Text style={[styles.optionText, { color: theme.text }]}>{item.username}</Text>
-                        {item.username}
-                      </Text>
                       {value === item.id && (
                         <Text style={[styles.checkmark, { color: theme.accentStrong }]}>✓</Text>
                       )}
@@ -195,14 +172,7 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
             <View style={styles.modalSection}>
               <View style={styles.searchContainer}>
                 <TextInput
-                  style={[
+                  style={[styles.searchInput, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
-                    styles.searchInput,
-                    {
-                      backgroundColor: theme.inputBg,
-                      borderColor: theme.borderStrong,
-                      color: theme.text,
-                    },
-                  ]}
                   placeholder="Search users by username"
                   placeholderTextColor={theme.textMuted}
                   value={searchQuery}
@@ -227,21 +197,15 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
                       <View style={styles.optionIcon}>
                         <Text style={styles.optionIconText}>➕</Text>
                       </View>
-                      <Text style={[styles.optionText, { color: theme.text }]}>
+                      <Text style={[styles.optionText, { color: theme.text }]}>{item.username}</Text>
-                        {item.username}
+                      <Text style={[styles.optionSubtext, { color: theme.textMuted }]}>Add as friend & assign</Text>
-                      </Text>
-                      <Text style={[styles.optionSubtext, { color: theme.textMuted }]}>
-                        Add as friend & assign
-                      </Text>
                     </TouchableOpacity>
                   )}
                 />
               ) : searchQuery.length >= 2 && searchResults.length === 0 && !searching ? (
                 <Text style={[styles.emptyText, { color: theme.textFaint }]}>No users found</Text>
               ) : searchQuery.length < 2 ? (
-                <Text style={[styles.emptyText, { color: theme.textFaint }]}>
+                <Text style={[styles.emptyText, { color: theme.textFaint }]}>Type at least 2 characters to search</Text>
-                  Type at least 2 characters to search
-                </Text>
               ) : null}
             </View>
           </View>

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

@@ -1,23 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import {
+import { Modal, View, Text, StyleSheet, TextInput, TouchableOpacity, ScrollView, KeyboardAvoidingView, Platform, Pressable, useWindowDimensions } from 'react-native';
-  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 ColorWheel from '@/components/ColorWheel';
+import ColorPickerInput from '@/components/ColorPickerInput';
 import Svg, { Path, Circle } from 'react-native-svg';
 
 interface CategoryEditorModalProps {
@@ -27,12 +15,7 @@ interface CategoryEditorModalProps {
   onClose: () => void;
 }
 
-export function CategoryEditorModal({
+export function CategoryEditorModal({ visible, category, categoryCount, onClose }: CategoryEditorModalProps) {
-  visible,
-  category,
-  categoryCount,
-  onClose,
-}: CategoryEditorModalProps) {
   const { theme } = useSettings();
   const [name, setName] = useState('');
   const [color, setColor] = useState(CATEGORY_COLORS[0]);
@@ -81,8 +64,15 @@ export function CategoryEditorModal({
         behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
         keyboardVerticalOffset={0}
       >
-        <Pressable style={styles.overlay} onPress={onClose} accessibilityRole="none">
+        <Pressable
-          <Pressable style={[styles.sheet, { backgroundColor: theme.sheetBg }]} onPress={() => {}}>
+          style={styles.overlay}
+          onPress={onClose}
+          accessibilityRole="none"
+        >
+          <Pressable
+            style={[styles.sheet, { backgroundColor: theme.sheetBg }]}
+            onPress={() => {}}
+          >
             <ScrollView
               showsVerticalScrollIndicator={false}
               keyboardShouldPersistTaps="handled"
@@ -92,21 +82,10 @@ export function CategoryEditorModal({
                 <Text style={[styles.title, { color: theme.text }]}>
                   {category ? 'Edit Tag' : 'New Tag'}
                 </Text>
-                <TouchableOpacity
+                <TouchableOpacity onPress={onClose} style={styles.closeButton} hitSlop={{ top: 12, bottom: 12, left: 12, right: 12 }} accessibilityRole="button" accessibilityLabel="Close tag editor">
-                  onPress={onClose}
-                  style={styles.closeButton}
-                  hitSlop={{ top: 12, bottom: 12, left: 12, right: 12 }}
-                  accessibilityRole="button"
-                  accessibilityLabel="Close tag editor"
-                >
                   <Svg width={22} height={22} viewBox="0 0 24 24">
                     <Circle cx={12} cy={12} r={10} fill={theme.cardAlt} />
-                    <Path
+                    <Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.5} strokeLinecap="round" />
-                      d="M18 6L6 18M6 6l12 12"
-                      stroke={theme.textSecondary}
-                      strokeWidth={2.5}
-                      strokeLinecap="round"
-                    />
                   </Svg>
                 </TouchableOpacity>
               </View>
@@ -115,11 +94,7 @@ export function CategoryEditorModal({
               <TextInput
                 style={[
                   styles.input,
-                  {
+                  { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
-                    backgroundColor: theme.inputBg,
-                    borderColor: theme.borderStrong,
-                    color: theme.text,
-                  },
                 ]}
                 placeholder="Tag name"
                 placeholderTextColor={theme.textMuted}
@@ -132,7 +107,7 @@ export function CategoryEditorModal({
 
               <Text style={[styles.label, { color: theme.textSecondary }]}>Color</Text>
               <View style={styles.colorGrid}>
-                {CATEGORY_COLORS.map(c => (
+                {CATEGORY_COLORS.map((c) => (
                   <TouchableOpacity
                     key={c}
                     style={[
@@ -148,20 +123,13 @@ export function CategoryEditorModal({
                   >
                     {color === c && (
                       <Svg width={16} height={16} viewBox="0 0 24 24">
-                        <Path
+                        <Path d="M5 12l5 5 9-10" stroke="#FFFFFF" strokeWidth={3} strokeLinecap="round" strokeLinejoin="round" fill="none" />
-                          d="M5 12l5 5 9-10"
-                          stroke="#FFFFFF"
-                          strokeWidth={3}
-                          strokeLinecap="round"
-                          strokeLinejoin="round"
-                          fill="none"
-                        />
                       </Svg>
                     )}
                   </TouchableOpacity>
                 ))}
               </View>
-              <ColorWheel color={color} onChange={setColor} />
+              <ColorPickerInput value={color} onChange={setColor} />
 
               <View style={styles.actions}>
                 {category && (
@@ -171,22 +139,13 @@ export function CategoryEditorModal({
                     disabled={!canDelete}
                     activeOpacity={0.7}
                   >
-                    <Text
+                    <Text style={[styles.deleteButtonText, { color: canDelete ? theme.accent : theme.textMuted }]}>
-                      style={[
-                        styles.deleteButtonText,
-                        { color: canDelete ? theme.accent : theme.textMuted },
-                      ]}
-                    >
                       Delete
                     </Text>
                   </TouchableOpacity>
                 )}
                 <TouchableOpacity
-                  style={[
+                  style={[styles.saveButton, { backgroundColor: theme.accent }, !name.trim() && styles.saveButtonDisabled]}
-                    styles.saveButton,
-                    { backgroundColor: theme.accent },
-                    !name.trim() && styles.saveButtonDisabled,
-                  ]}
                   onPress={handleSave}
                   disabled={!name.trim()}
                   activeOpacity={0.8}

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

@@ -57,7 +57,7 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
         isAllCategory={true}
         scaleAnim={scaleAnim}
       />
-      {categories.map(category => (
+      {categories.map((category) => (
         <CategoryButton
           key={category.id}
           id={category.id}
@@ -72,10 +72,7 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
         />
       ))}
       <TouchableOpacity
-        style={[
+        style={[styles.manageButton, { borderColor: theme.borderStrong, backgroundColor: theme.cardAlt }]}
-          styles.manageButton,
-          { borderColor: theme.borderStrong, backgroundColor: theme.cardAlt },
-        ]}
         onPress={() => router.push('/settings')}
         activeOpacity={0.7}
         accessibilityRole="button"
@@ -83,22 +80,10 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
         hitSlop={{ top: 8, bottom: 8, left: 4, right: 4 }}
       >
         <Svg width={14} height={14} viewBox="0 0 24 24">
-          <Circle
+          <Circle cx={12} cy={12} r={9} stroke={theme.textSecondary} strokeWidth={2.2} fill="none" />
-            cx={12}
-            cy={12}
-            r={9}
-            stroke={theme.textSecondary}
-            strokeWidth={2.2}
-            fill="none"
-          />
           <Circle cx={12} cy={8.5} r={1.2} fill={theme.textSecondary} />
           <Circle cx={12} cy={15.5} r={1.2} fill={theme.textSecondary} />
-          <Path
+          <Path d="M7.8 6.2l1 1.7M16.2 16.1l1 1.7M7.8 17.8l1-1.7M16.2 7.9l1-1.7" stroke={theme.textSecondary} strokeWidth={1.8} strokeLinecap="round" />
-            d="M7.8 6.2l1 1.7M16.2 16.1l1 1.7M7.8 17.8l1-1.7M16.2 7.9l1-1.7"
-            stroke={theme.textSecondary}
-            strokeWidth={1.8}
-            strokeLinecap="round"
-          />
         </Svg>
         <Text style={[styles.manageLabel, { color: theme.textSecondary }]}>Manage</Text>
       </TouchableOpacity>
@@ -119,16 +104,7 @@ interface CategoryButtonProps {
   scaleAnim: Animated.Value;
 }
 
-function CategoryButton({
+function CategoryButton({ color, selected, onPress, onPressIn, onPressOut, theme, isAllCategory, scaleAnim }: CategoryButtonProps) {
-  color,
-  selected,
-  onPress,
-  onPressIn,
-  onPressOut,
-  theme,
-  isAllCategory,
-  scaleAnim,
-}: CategoryButtonProps) {
   const animatedStyle = {
     transform: [{ scale: scaleAnim }],
     shadowColor: selected ? theme.accent : '#000',
@@ -154,24 +130,8 @@ function CategoryButton({
     >
       {isAllCategory ? (
         <Svg width={20} height={20} viewBox="0 0 24 24">
-          <Circle
+          <Circle cx={12} cy={12} r={9} stroke="#FFFFFF" strokeWidth={2.5} fill="none" opacity={0.9} />
-            cx={12}
+          <Path d="M6 12l4 4 8-8" stroke="#FFFFFF" strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" opacity={0.9} />
-            cy={12}
-            r={9}
-            stroke="#FFFFFF"
-            strokeWidth={2.5}
-            fill="none"
-            opacity={0.9}
-          />
-          <Path
-            d="M6 12l4 4 8-8"
-            stroke="#FFFFFF"
-            strokeWidth={2.5}
-            strokeLinecap="round"
-            strokeLinejoin="round"
-            fill="none"
-            opacity={0.9}
-          />
         </Svg>
       ) : null}
     </TouchableOpacity>

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

@@ -1,14 +1,5 @@
 import React, { useState } from 'react';
-import {
+import { View, Text, StyleSheet, TouchableOpacity, ScrollView, Modal, Pressable, KeyboardAvoidingView } from 'react-native';
-  View,
-  Text,
-  StyleSheet,
-  TouchableOpacity,
-  ScrollView,
-  Modal,
-  Pressable,
-  KeyboardAvoidingView,
-} from 'react-native';
 import { useCategories } from '@/hooks/useDatabase';
 import { useSettings } from '@/theme';
 import Svg, { Path } from 'react-native-svg';
@@ -25,7 +16,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
   const [showModal, setShowModal] = useState(false);
 
   const selected = new Set(value);
-  const selectedCategories = categories.filter(c => selected.has(c.id));
+  const selectedCategories = categories.filter((c) => selected.has(c.id));
 
   const toggle = (id: string) => {
     const next = new Set(selected);
@@ -42,7 +33,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
       ? 'None'
       : selectedCategories
           .slice(0, 2)
-          .map(c => c.name)
+          .map((c) => c.name)
           .join(', ') + (selectedCategories.length > 2 ? ` +${selectedCategories.length - 2}` : '');
 
   return (
@@ -62,18 +53,10 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
         <View style={styles.selectorContent}>
           {selectedCategories.length > 0 ? (
             <View style={styles.chipRow}>
-              {selectedCategories.slice(0, 3).map(c => (
+              {selectedCategories.slice(0, 3).map((c) => (
-                <View
+                <View key={c.id} style={[styles.chip, { backgroundColor: theme.cardAlt, borderColor: theme.border }]}>
-                  key={c.id}
-                  style={[
-                    styles.chip,
-                    { backgroundColor: theme.cardAlt, borderColor: theme.border },
-                  ]}
-                >
                   <View style={[styles.colorCircle, { backgroundColor: c.color }]} />
-                  <Text style={[styles.chipText, { color: theme.textSecondary }]} numberOfLines={1}>
+                  <Text style={[styles.chipText, { color: theme.textSecondary }]} numberOfLines={1}>{c.name}</Text>
-                    {c.name}
-                  </Text>
                 </View>
               ))}
             </View>
@@ -82,24 +65,12 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
           )}
         </View>
         <Svg width={20} height={20} viewBox="0 0 24 24">
-          <Path
+          <Path d="M9 18l6-6-6-6" stroke={theme.textSecondary} strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
-            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: theme.dangerStrong }]}>{error}</Text>}
 
-      <Modal
+      <Modal visible={showModal} transparent animationType="fade" onRequestClose={() => setShowModal(false)}>
-        visible={showModal}
-        transparent
-        animationType="fade"
-        onRequestClose={() => setShowModal(false)}
-      >
         <KeyboardAvoidingView
           style={[styles.modalOverlay, { backgroundColor: 'rgba(0,0,0,0.5)' }]}
           behavior="padding"
@@ -110,10 +81,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
                 <Text style={[styles.modalTitle, { color: theme.text }]}>Select Tags</Text>
                 <View style={styles.modalHeaderRight}>
                   <TouchableOpacity
-                    onPress={() => {
+                    onPress={() => { onChange([]); setShowModal(false); }}
-                      onChange([]);
-                      setShowModal(false);
-                    }}
                     activeOpacity={0.7}
                     accessibilityRole="button"
                     accessibilityLabel="Clear all tags"
@@ -134,7 +102,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
                 <Text style={[styles.modalHint, { color: theme.textMuted }]}>
                   A task can have multiple tags. Selected: {selected.size}
                 </Text>
-                {categories.map(category => {
+                {categories.map((category) => {
                   const isSelected = selected.has(category.id);
                   return (
                     <TouchableOpacity
@@ -142,11 +110,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
                       style={[
                         styles.modalOption,
                         { backgroundColor: theme.card, borderColor: theme.borderStrong },
-                        isSelected && {
+                        isSelected && { borderColor: theme.accent, backgroundColor: theme.accentSoft, borderWidth: 2 },
-                          borderColor: theme.accent,
-                          backgroundColor: theme.accentSoft,
-                          borderWidth: 2,
-                        },
                       ]}
                       onPress={() => toggle(category.id)}
                       activeOpacity={0.8}
@@ -154,32 +118,17 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
                       accessibilityLabel={`Tag ${category.name}`}
                       accessibilityState={{ checked: isSelected }}
                     >
-                      <View
+                      <View style={[styles.colorCircle, { backgroundColor: category.color }, isSelected && styles.colorCircleSelected]} />
-                        style={[
+                      <Text style={[
-                          styles.colorCircle,
-                          { backgroundColor: category.color },
-                          isSelected && styles.colorCircleSelected,
-                        ]}
-                      />
-                      <Text
-                        style={[
                         styles.categoryName,
                         { color: theme.textSecondary },
                         isSelected && { color: theme.text, fontWeight: '600' },
-                        ]}
+                      ]}>
-                      >
                         {category.name}
                       </Text>
                       {isSelected && (
                         <Svg width={20} height={20} viewBox="0 0 24 24">
-                          <Path
+                          <Path d="M5 12l5 5 9-10" stroke={theme.accent} strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
-                            d="M5 12l5 5 9-10"
-                            stroke={theme.accent}
-                            strokeWidth={2.5}
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                            fill="none"
-                          />
                         </Svg>
                       )}
                     </TouchableOpacity>

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

@@ -20,23 +20,15 @@ export default function NativeColorPickerInput({ value, onChange }: ColorPickerI
   const valid = isValidHex(hex);
 
   const handleChange = (raw: string) => {
-    const cleaned = raw
+    const cleaned = raw.replace(/[^0-9a-fA-F]/g, '').slice(0, 6).toUpperCase();
-      .replace(/[^0-9a-fA-F]/g, '')
-      .slice(0, 6)
-      .toUpperCase();
     onChange(`#${cleaned}`);
   };
 
   return (
     <View style={styles.row}>
-      <View
+      <View style={[styles.preview, { backgroundColor: valid ? value : theme.borderStrong, borderColor: theme.borderStrong }]} />
-        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}
@@ -48,7 +40,7 @@ export default function NativeColorPickerInput({ value, onChange }: ColorPickerI
           maxLength={6}
         />
       </View>
-      <Text style={styles.hint}>{/**/}Hex code</Text>
+      <Text style={[styles.hint, { color: theme.textMuted }]}>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.accent}`,
+          border: `1px solid ${theme.borderStrong}`,
           borderRadius: 12,
           backgroundColor: 'transparent',
           cursor: 'pointer',
         },
       })}
-      <Text style={[styles.hexText, { color: theme.accent }]}>{normalized}</Text>
+      <Text style={[styles.hexText, { color: theme.textSecondary }]}>{normalized}</Text>
     </View>
   );
 }

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

@@ -33,48 +33,23 @@ function hsvToHex(h: number, s: number, v: number) {
   const c = v * s;
   const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
   const m = v - c;
-  let r = 0,
+  let r = 0, g = 0, b = 0;
-    g = 0,
+  if (h < 60) { r = c; g = x; b = 0; }
-    b = 0;
+  else if (h < 120) { r = x; g = c; b = 0; }
-  if (h < 60) {
+  else if (h < 180) { r = 0; g = c; b = x; }
-    r = c;
+  else if (h < 240) { r = 0; g = x; b = c; }
-    g = x;
+  else if (h < 300) { r = x; g = 0; b = c; }
-    b = 0;
+  else { r = c; g = 0; b = x; }
-  } else if (h < 120) {
+  const toHex = (n: number) => Math.round((n + m) * 255).toString(16).padStart(2, '0');
-    r = x;
-    g = c;
-    b = 0;
-  } else if (h < 180) {
-    r = 0;
-    g = c;
-    b = x;
-  } else if (h < 240) {
-    r = 0;
-    g = x;
-    b = c;
-  } else if (h < 300) {
-    r = x;
-    g = 0;
-    b = c;
-  } else {
-    r = c;
-    g = 0;
-    b = x;
-  }
-  const toHex = (n: number) =>
-    Math.round((n + m) * 255)
-      .toString(16)
-      .padStart(2, '0');
   return `#${toHex(r)}${toHex(g)}${toHex(b)}`.toUpperCase();
 }
 
 interface ColorWheelProps {
   color: string;
-  opacity: number;
+  onChange: (color: string) => void;
-  onChange: (color: string, opacity: number) => void;
 }
 
-export default function ColorWheel({ color, opacity, onChange }: ColorWheelProps) {
+export default function ColorWheel({ color, onChange }: ColorWheelProps) {
   const { theme } = useSettings();
   const initialHsv = useMemo(() => hexToHsv(color), [color]);
   const [hue, setHue] = useState(initialHsv.h);
@@ -91,8 +66,8 @@ export default function ColorWheel({ color, opacity, onChange }: ColorWheelProps
 
   useEffect(() => {
     const newColor = hsvToHex(hue, saturation, value);
-    onChange(newColor, opacity);
+    onChange(newColor);
-  }, [hue, saturation, value, opacity, onChange]);
+  }, [hue, saturation, value, onChange]);
 
   const updateFromWheel = (locationX: number, locationY: number) => {
     const center = WHEEL_SIZE / 2;
@@ -109,49 +84,35 @@ export default function ColorWheel({ color, opacity, onChange }: ColorWheelProps
     setValue(1 - distance / radius);
   };
 
-  const wheelPanResponder = React.useMemo(
+  const wheelPanResponder = React.useMemo(() => PanResponder.create({
-    () =>
-      PanResponder.create({
     onStartShouldSetPanResponder: () => true,
     onMoveShouldSetPanResponder: () => true,
-        onPanResponderGrant: event => {
+    onPanResponderGrant: (event) => {
       updateFromWheel(event.nativeEvent.locationX, event.nativeEvent.locationY);
     },
-        onPanResponderMove: event => {
+    onPanResponderMove: (event) => {
       updateFromWheel(event.nativeEvent.locationX, event.nativeEvent.locationY);
     },
-      }),
+  }), []);
-    []
-  );
 
   const setHueFromLocation = (locationX: number) => {
     setHue(Math.min(360, Math.max(0, (locationX / WHEEL_SIZE) * 360)));
   };
 
-  const huePanResponder = React.useMemo(
+  const huePanResponder = React.useMemo(() => PanResponder.create({
-    () =>
-      PanResponder.create({
     onStartShouldSetPanResponder: () => true,
     onMoveShouldSetPanResponder: () => true,
-        onPanResponderGrant: event => {
+    onPanResponderGrant: (event) => {
       setHueFromLocation(event.nativeEvent.locationX);
     },
-        onPanResponderMove: event => {
+    onPanResponderMove: (event) => {
       setHueFromLocation(event.nativeEvent.locationX);
     },
-      }),
+  }), []);
-    []
-  );
 
-  const thumbX =
+  const thumbX = ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.cos((hue - 180) * Math.PI / 180) + (WHEEL_SIZE / 2) - (THUMB_SIZE / 2);
-    ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.cos(((hue - 180) * Math.PI) / 180) +
+  const thumbY = ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.sin((hue - 180) * Math.PI / 180) + (WHEEL_SIZE / 2) - (THUMB_SIZE / 2);
-    WHEEL_SIZE / 2 -
+  const hueThumbX = (hue / 360) * WHEEL_SIZE - (THUMB_SIZE / 2);
-    THUMB_SIZE / 2;
-  const thumbY =
-    ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.sin(((hue - 180) * Math.PI) / 180) +
-    WHEEL_SIZE / 2 -
-    THUMB_SIZE / 2;
-  const hueThumbX = (hue / 360) * WHEEL_SIZE - THUMB_SIZE / 2;
 
   return (
     <View style={styles.container}>
@@ -219,9 +180,7 @@ export default function ColorWheel({ color, opacity, onChange }: ColorWheelProps
 
       <View style={styles.previewContainer}>
         <View style={[styles.preview, { backgroundColor: hsvToHex(hue, saturation, value) }]} />
-        <RNText style={[styles.previewText, { color: theme.text }]}>
+        <RNText style={[styles.previewText, { color: theme.text }]}>{hsvToHex(hue, saturation, value)}</RNText>
-          {hsvToHex(hue, saturation, value)}
-        </RNText>
       </View>
     </View>
   );

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

@@ -32,48 +32,23 @@ function hsvToHex(h: number, s: number, v: number) {
   const c = v * s;
   const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
   const m = v - c;
-  let r = 0,
+  let r = 0, g = 0, b = 0;
-    g = 0,
+  if (h < 60) { r = c; g = x; b = 0; }
-    b = 0;
+  else if (h < 120) { r = x; g = c; b = 0; }
-  if (h < 60) {
+  else if (h < 180) { r = 0; g = c; b = x; }
-    r = c;
+  else if (h < 240) { r = 0; g = x; b = c; }
-    g = x;
+  else if (h < 300) { r = x; g = 0; b = c; }
-    b = 0;
+  else { r = c; g = 0; b = x; }
-  } else if (h < 120) {
+  const toHex = (n: number) => Math.round((n + m) * 255).toString(16).padStart(2, '0');
-    r = x;
-    g = c;
-    b = 0;
-  } else if (h < 180) {
-    r = 0;
-    g = c;
-    b = x;
-  } else if (h < 240) {
-    r = 0;
-    g = x;
-    b = c;
-  } else if (h < 300) {
-    r = x;
-    g = 0;
-    b = c;
-  } else {
-    r = c;
-    g = 0;
-    b = x;
-  }
-  const toHex = (n: number) =>
-    Math.round((n + m) * 255)
-      .toString(16)
-      .padStart(2, '0');
   return `#${toHex(r)}${toHex(g)}${toHex(b)}`.toUpperCase();
 }
 
 interface ColorWheelProps {
   color: string;
-  opacity: number;
+  onChange: (color: string) => void;
-  onChange: (color: string, opacity: number) => void;
 }
 
-export default function ColorWheel({ color, opacity, onChange }: ColorWheelProps) {
+export default function ColorWheel({ color, onChange }: ColorWheelProps) {
   const { theme } = useSettings();
   const initialHsv = useMemo(() => hexToHsv(color), [color]);
   const [hue, setHue] = useState(initialHsv.h);
@@ -90,8 +65,8 @@ export default function ColorWheel({ color, opacity, onChange }: ColorWheelProps
 
   useEffect(() => {
     const newColor = hsvToHex(hue, saturation, value);
-    onChange(newColor, opacity);
+    onChange(newColor);
-  }, [hue, saturation, value, opacity, onChange]);
+  }, [hue, saturation, value, onChange]);
 
   const handleWheelMouseDown = (e: React.MouseEvent) => {
     const rect = e.currentTarget.getBoundingClientRect();
@@ -133,25 +108,15 @@ export default function ColorWheel({ color, opacity, onChange }: ColorWheelProps
     handleMove(e.nativeEvent);
   };
 
-  const thumbX =
+  const thumbX = ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.cos((hue - 180) * Math.PI / 180) + (WHEEL_SIZE / 2) - (THUMB_SIZE / 2);
-    ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.cos(((hue - 180) * Math.PI) / 180) +
+  const thumbY = ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.sin((hue - 180) * Math.PI / 180) + (WHEEL_SIZE / 2) - (THUMB_SIZE / 2);
-    WHEEL_SIZE / 2 -
+  const hueThumbX = (hue / 360) * WHEEL_SIZE - (THUMB_SIZE / 2);
-    THUMB_SIZE / 2;
-  const thumbY =
-    ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.sin(((hue - 180) * Math.PI) / 180) +
-    WHEEL_SIZE / 2 -
-    THUMB_SIZE / 2;
-  const hueThumbX = (hue / 360) * WHEEL_SIZE - THUMB_SIZE / 2;
   const currentColor = hsvToHex(hue, saturation, value);
 
   return (
     <View style={styles.container}>
       <View style={styles.wheelContainer}>
-        <Svg
+        <Svg width={WHEEL_SIZE} height={WHEEL_SIZE} {...({ onMouseDown: handleWheelMouseDown } as object)}>
-          width={WHEEL_SIZE}
-          height={WHEEL_SIZE}
-          {...({ onMouseDown: handleWheelMouseDown } as object)}
-        >
           <DefsElement>
             <LinearGradient id="satGradient" x1="0%" y1="0%" x2="100%" y2="0%">
               <Stop offset="0%" stopColor={`hsl(${hue}, 100%, 50%)`} stopOpacity={1} />

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

@@ -109,11 +109,7 @@ export default function WebDateTimeInput({
             >
               <Text style={[styles.clearButtonText, { color: mutedColor }]}>Clear</Text>
             </TouchableOpacity>
-            <TouchableOpacity
+            <TouchableOpacity style={[styles.doneButton, { backgroundColor: theme.accent }]} onPress={onDismiss} activeOpacity={0.8}>
-              style={[styles.doneButton, { backgroundColor: theme.accent }]}
-              onPress={onDismiss}
-              activeOpacity={0.8}
-            >
               <Text style={[styles.doneButtonText, { color: theme.accentText }]}>Done</Text>
             </TouchableOpacity>
           </View>

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

@@ -49,30 +49,14 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
               styles.pickerButton,
               { backgroundColor: theme.inputBg, borderColor: theme.borderStrong },
               field.value && { borderColor: theme.accent, backgroundColor: theme.accentSoft },
-              fieldName === 'endTime' &&
+              fieldName === 'endTime' && endTimeInvalid && { borderColor: theme.dangerStrong, backgroundColor: theme.accentSoft },
-                endTimeInvalid && {
-                  borderColor: theme.dangerStrong,
-                  backgroundColor: theme.accentSoft,
-                },
             ]}
             onPress={onPress}
             activeOpacity={0.8}
           >
             <Svg width={20} height={20} viewBox="0 0 24 24">
-              <Circle
+              <Circle cx={12} cy={12} r={10} stroke={field.value ? theme.accent : theme.textFaint} strokeWidth={1.8} fill="none" />
-                cx={12}
+              <Path d="M12 6v6l4 2" stroke={field.value ? theme.accent : theme.textFaint} strokeWidth={1.8} strokeLinecap="round" />
-                cy={12}
-                r={10}
-                stroke={field.value ? theme.accent : theme.textFaint}
-                strokeWidth={1.8}
-                fill="none"
-              />
-              <Path
-                d="M12 6v6l4 2"
-                stroke={field.value ? theme.accent : theme.textFaint}
-                strokeWidth={1.8}
-                strokeLinecap="round"
-              />
             </Svg>
             <Text
               style={[
@@ -98,12 +82,7 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
                 hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
               >
                 <Svg width={14} height={14} viewBox="0 0 24 24">
-                  <Path
+                  <Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.2} strokeLinecap="round" />
-                    d="M18 6L6 18M6 6l12 12"
-                    stroke={theme.textSecondary}
-                    strokeWidth={2.2}
-                    strokeLinecap="round"
-                  />
                 </Svg>
               </TouchableOpacity>
             ) : null}
@@ -163,12 +142,7 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
                     hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
                   >
                     <Svg width={14} height={14} viewBox="0 0 24 24">
-                      <Path
+                      <Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.2} strokeLinecap="round" />
-                        d="M18 6L6 18M6 6l12 12"
-                        stroke={theme.textSecondary}
-                        strokeWidth={2.2}
-                        strokeLinecap="round"
-                      />
                     </Svg>
                   </TouchableOpacity>
                 ) : null}
@@ -177,10 +151,7 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
           }}
         />
         <TouchableOpacity
-          style={[
+          style={[styles.calendarButton, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong }]}
-            styles.calendarButton,
-            { backgroundColor: theme.inputBg, borderColor: theme.borderStrong },
-          ]}
           onPress={() => setPicker('date')}
           activeOpacity={0.8}
           accessibilityLabel="Open calendar"
@@ -213,7 +184,7 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
               thumbColor={field.value ? theme.accent : theme.textMuted}
               ios_backgroundColor={theme.border}
               value={field.value ?? false}
-              onValueChange={value => {
+              onValueChange={(value) => {
                 field.onChange(value);
                 if (value) {
                   timeRef.current?.('');
@@ -232,27 +203,10 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
           </View>
 
           {endTimeInvalid && (
-            <View
+            <View style={[styles.warningRow, { backgroundColor: theme.accentSoft, borderColor: theme.dangerStrong }]}>
-              style={[
-                styles.warningRow,
-                { backgroundColor: theme.accentSoft, borderColor: theme.dangerStrong },
-              ]}
-            >
               <Svg width={14} height={14} viewBox="0 0 24 24">
-                <Circle
+                <Circle cx={12} cy={12} r={10} stroke={theme.dangerStrong} strokeWidth={1.8} fill="none" />
-                  cx={12}
+                <Path d="M12 8v5M12 16.5v.5" stroke={theme.dangerStrong} strokeWidth={1.8} strokeLinecap="round" />
-                  cy={12}
-                  r={10}
-                  stroke={theme.dangerStrong}
-                  strokeWidth={1.8}
-                  fill="none"
-                />
-                <Path
-                  d="M12 8v5M12 16.5v.5"
-                  stroke={theme.dangerStrong}
-                  strokeWidth={1.8}
-                  strokeLinecap="round"
-                />
               </Svg>
               <Text style={[styles.warningText, { color: theme.dangerStrong }]}>
                 {endTime === startTime
@@ -281,8 +235,12 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
       <WheelTimePicker
         visible={picker === 'time' || picker === 'endTime'}
         title={picker === 'endTime' ? 'End Time' : 'Start Time'}
-        initialTime={picker === 'endTime' ? endTime || startTime : startTime}
+        initialTime={
-        onConfirm={time => {
+          picker === 'endTime'
+            ? endTime || startTime
+            : startTime
+        }
+        onConfirm={(time) => {
           if (picker === 'endTime') {
             setEndTimeValue(time);
           } else {

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

@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { View, Text, StyleSheet, TextInput, TextInputProps } from 'react-native';
+import { View, Text, StyleSheet, TextInput , TextInputProps } from 'react-native';
 import { useSettings, type ThemeColors } from '@/theme';
 
 interface DescriptionInputProps extends TextInputProps {
@@ -36,8 +36,7 @@ export function DescriptionInput({ error, ...props }: DescriptionInputProps) {
   );
 }
 
-const createStyles = (theme: ThemeColors) =>
+const createStyles = (theme: ThemeColors) => StyleSheet.create({
-  StyleSheet.create({
   container: {
     gap: 5,
   },
@@ -66,4 +65,4 @@ const createStyles = (theme: ThemeColors) =>
     color: theme.dangerStrong,
     marginLeft: 4,
   },
-  });
+});

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

@@ -47,7 +47,12 @@ export function FloatingActionButton() {
   });
 
   return (
-    <Animated.View style={[styles.container, { transform: [{ scale: scaleAnim }] }]}>
+    <Animated.View
+      style={[
+        styles.container,
+        { transform: [{ scale: scaleAnim }] },
+      ]}
+    >
       <TouchableOpacity
         style={[styles.button, { backgroundColor: theme.accent, shadowColor: theme.accent }]}
         onPress={handlePress}

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

@@ -44,17 +44,13 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
       const result = await forgotPassword(username.trim());
       if (result.success) {
         if (result.resetToken) {
-          Alert.alert(
+          Alert.alert('Reset Token (Dev Mode)', `Your reset token is: ${result.resetToken}\n\nEnter this token on the next screen.`, [
-            'Reset Token (Dev Mode)',
+            { text: 'OK', onPress: () => setStep('enterResetCode') },
-            `Your reset token is: ${result.resetToken}\n\nEnter this token on the next screen.`,
+          ]);
-            [{ text: 'OK', onPress: () => setStep('enterResetCode') }]
-          );
         } else {
-          Alert.alert(
+          Alert.alert('Reset Email Sent', 'If the account exists, a password reset link has been sent.', [
-            'Reset Email Sent',
+            { text: 'OK', onPress: () => setStep('enterResetCode') },
-            'If the account exists, a password reset link has been sent.',
+          ]);
-            [{ text: 'OK', onPress: () => setStep('enterResetCode') }]
-          );
         }
       } else {
         setError('Failed to request password reset');
@@ -116,10 +112,7 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
         Enter your username to receive a password reset link.
       </Text>
       <TextInput
-        style={[
+        style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
-          styles.input,
-          { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
-        ]}
         placeholder="Username"
         placeholderTextColor={theme.textMuted}
         value={username}
@@ -137,9 +130,7 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
         {busy ? (
           <ActivityIndicator color={theme.accentText} />
         ) : (
-          <Text style={[styles.primaryButtonText, { color: theme.accentText }]}>
+          <Text style={[styles.primaryButtonText, { color: theme.accentText }]}>Send Reset Link</Text>
-            Send Reset Link
-          </Text>
         )}
       </TouchableOpacity>
     </View>
@@ -151,10 +142,7 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
         Enter the reset token and your new password.
       </Text>
       <TextInput
-        style={[
+        style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
-          styles.input,
-          { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
-        ]}
         placeholder="Reset Token"
         placeholderTextColor={theme.textMuted}
         value={resetToken}
@@ -163,10 +151,7 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
         autoCorrect={false}
       />
       <TextInput
-        style={[
+        style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
-          styles.input,
-          { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
-        ]}
         placeholder="New Password (min 8 chars)"
         placeholderTextColor={theme.textMuted}
         value={newPassword}
@@ -174,10 +159,7 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
         secureTextEntry
       />
       <TextInput
-        style={[
+        style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
-          styles.input,
-          { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
-        ]}
         placeholder="Confirm New Password"
         placeholderTextColor={theme.textMuted}
         value={confirmPassword}
@@ -194,9 +176,7 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
         {busy ? (
           <ActivityIndicator color={theme.accentText} />
         ) : (
-          <Text style={[styles.primaryButtonText, { color: theme.accentText }]}>
+          <Text style={[styles.primaryButtonText, { color: theme.accentText }]}>Reset Password</Text>
-            Reset Password
-          </Text>
         )}
       </TouchableOpacity>
     </View>
@@ -204,7 +184,10 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
 
   return (
     <Modal visible={visible} transparent animationType="fade" onRequestClose={handleBack}>
-      <KeyboardAvoidingView style={styles.overlay} behavior="padding">
+      <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 }]} />

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

@@ -13,10 +13,7 @@ interface FormButtonsProps {
 export function FormButtons({ onSubmit, submitLabel = 'Submit' }: FormButtonsProps) {
   const router = useRouter();
   const { theme } = useSettings();
-  const {
+  const { handleSubmit, formState: { isSubmitting } } = useFormContext();
-    handleSubmit,
-    formState: { isSubmitting },
-  } = useFormContext();
   const insets = useSafeAreaInsets();
 
   const cancel = () => {
@@ -28,21 +25,9 @@ export function FormButtons({ onSubmit, submitLabel = 'Submit' }: FormButtonsPro
   };
 
   return (
-    <View
+    <View style={[styles.container, { backgroundColor: theme.background, borderTopColor: theme.border, paddingBottom: insets.bottom + 12 }]}>
-      style={[
-        styles.container,
-        {
-          backgroundColor: theme.background,
-          borderTopColor: theme.border,
-          paddingBottom: insets.bottom + 12,
-        },
-      ]}
-    >
       <TouchableOpacity
-        style={[
+        style={[styles.cancelButton, { borderColor: theme.borderStrong, backgroundColor: theme.card }]}
-          styles.cancelButton,
-          { borderColor: theme.borderStrong, backgroundColor: theme.card },
-        ]}
         onPress={cancel}
         disabled={isSubmitting}
         activeOpacity={0.7}
@@ -53,11 +38,7 @@ export function FormButtons({ onSubmit, submitLabel = 'Submit' }: FormButtonsPro
         <Text style={[styles.cancelButtonText, { color: theme.textSecondary }]}>Cancel</Text>
       </TouchableOpacity>
       <TouchableOpacity
-        style={[
+        style={[styles.submitButton, { backgroundColor: theme.accent }, isSubmitting && styles.buttonDisabled]}
-          styles.submitButton,
-          { backgroundColor: theme.accent },
-          isSubmitting && styles.buttonDisabled,
-        ]}
         onPress={handleSubmit(onSubmit)}
         disabled={isSubmitting}
         activeOpacity={0.8}

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

@@ -21,23 +21,11 @@ interface FriendsModalProps {
 
 export function FriendsModal({ visible, onClose }: FriendsModalProps) {
   const { theme } = useSettings();
-  const {
+  const { friends, incoming, outgoing, loading, sendRequest, acceptRequest, declineRequest, removeFriend, searchUsers } = useFriends();
-    friends,
-    incoming,
-    outgoing,
-    loading,
-    sendRequest,
-    acceptRequest,
-    declineRequest,
-    removeFriend,
-    searchUsers,
-  } = useFriends();
   const [searchQuery, setSearchQuery] = useState('');
   const [searchResults, setSearchResults] = useState<{ id: string; username: string }[]>([]);
   const [searching, setSearching] = useState(false);
-  const [selectedTab, setSelectedTab] = useState<'friends' | 'incoming' | 'outgoing' | 'add'>(
+  const [selectedTab, setSelectedTab] = useState<'friends' | 'incoming' | 'outgoing' | 'add'>('friends');
-    'friends'
-  );
 
   const searchKey = `${selectedTab}:${searchQuery}`;
   const [prevSearchKey, setPrevSearchKey] = useState(searchKey);
@@ -53,11 +41,7 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
         setSearching(true);
         try {
           const results = await searchUsers(searchQuery);
-          setSearchResults(
+          setSearchResults(results.filter(r => !friends.some(f => f.id === r.id) && !outgoing.some(o => o.id === r.id)));
-            results.filter(
-              r => !friends.some(f => f.id === r.id) && !outgoing.some(o => o.id === r.id)
-            )
-          );
         } catch (err) {
           console.error('Search failed:', err);
         } finally {
@@ -87,17 +71,13 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
   const handleRemove = async (friendId: string) => {
     Alert.alert('Remove Friend', 'Are you sure you want to remove this friend?', [
       { text: 'Cancel', style: 'cancel' },
-      {
+      { text: 'Remove', style: 'destructive', onPress: async () => {
-        text: 'Remove',
-        style: 'destructive',
-        onPress: async () => {
         try {
           await removeFriend(friendId);
         } catch (err) {
           Alert.alert('Error', err instanceof Error ? err.message : 'Failed to remove friend');
         }
-        },
+      }},
-      },
     ]);
   };
 
@@ -118,7 +98,7 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
           </View>
 
           <View style={styles.tabs}>
-            {(['friends', 'incoming', 'outgoing', 'add'] as const).map(tab => (
+            {(['friends', 'incoming', 'outgoing', 'add'] as const).map((tab) => (
               <TouchableOpacity
                 key={tab}
                 style={[
@@ -136,14 +116,10 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
                 >
                   {tab.charAt(0).toUpperCase() + tab.slice(1)}
                   {tab === 'friends' && friends.length > 0 && (
-                    <Text style={[styles.badge, { color: theme.accentText }]}>
+                    <Text style={[styles.badge, { color: theme.accentText }]}>{friends.length}</Text>
-                      {friends.length}
-                    </Text>
                   )}
                   {tab === 'incoming' && incoming.length > 0 && (
-                    <Text style={[styles.badge, { color: theme.accentText }]}>
+                    <Text style={[styles.badge, { color: theme.accentText }]}>{incoming.length}</Text>
-                      {incoming.length}
-                    </Text>
                   )}
                 </Text>
               </TouchableOpacity>
@@ -159,9 +135,7 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
               ) : friends.length === 0 ? (
                 <View style={styles.empty}>
                   <Text style={[styles.emptyText, { color: theme.textMuted }]}>No friends yet</Text>
-                  <Text style={[styles.emptyHint, { color: theme.textFaint }]}>
+                  <Text style={[styles.emptyHint, { color: theme.textFaint }]}>{'Tap "Add" to find friends by username'}</Text>
-                    {'Tap "Add" to find friends by username'}
-                  </Text>
                 </View>
               ) : (
                 <FlatList
@@ -169,19 +143,12 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
                   keyExtractor={f => f.id}
                   renderItem={({ item }) => (
                     <View style={[styles.friendRow, { borderBottomColor: theme.border }]}>
-                      <Text style={[styles.friendName, { color: theme.text }]}>
+                      <Text style={[styles.friendName, { color: theme.text }]}>{item.username}</Text>
-                        {item.username}
-                      </Text>
                       <TouchableOpacity
-                        style={[
+                        style={[styles.removeBtn, { backgroundColor: theme.accentSoft, borderColor: theme.accent }]}
-                          styles.removeBtn,
-                          { backgroundColor: theme.accentSoft, borderColor: theme.accent },
-                        ]}
                         onPress={() => handleRemove(item.id)}
                       >
-                        <Text style={[styles.removeBtnText, { color: theme.accentStrong }]}>
+                        <Text style={[styles.removeBtnText, { color: theme.accentStrong }]}>Remove</Text>
-                          Remove
-                        </Text>
                       </TouchableOpacity>
                     </View>
                   )}
@@ -198,9 +165,7 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
                 </View>
               ) : incoming.length === 0 ? (
                 <View style={styles.empty}>
-                  <Text style={[styles.emptyText, { color: theme.textMuted }]}>
+                  <Text style={[styles.emptyText, { color: theme.textMuted }]}>No incoming requests</Text>
-                    No incoming requests
-                  </Text>
                 </View>
               ) : (
                 <FlatList
@@ -208,32 +173,19 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
                   keyExtractor={r => r.requestId}
                   renderItem={({ item }) => (
                     <View style={[styles.requestRow, { borderBottomColor: theme.border }]}>
-                      <Text style={[styles.friendName, { color: theme.text }]}>
+                      <Text style={[styles.friendName, { color: theme.text }]}>{item.username}</Text>
-                        {item.username}
-                      </Text>
                       <View style={styles.requestActions}>
                         <TouchableOpacity
                           style={[styles.actionBtn, { backgroundColor: theme.accent }]}
                           onPress={() => handleAccept(item.requestId)}
                         >
-                          <Text style={[styles.actionBtnText, { color: theme.accentText }]}>
+                          <Text style={[styles.actionBtnText, { color: theme.accentText }]}>Accept</Text>
-                            Accept
-                          </Text>
                         </TouchableOpacity>
                         <TouchableOpacity
-                          style={[
+                          style={[styles.actionBtn, { backgroundColor: 'transparent', borderColor: theme.borderStrong, borderWidth: 1 }]}
-                            styles.actionBtn,
-                            {
-                              backgroundColor: 'transparent',
-                              borderColor: theme.borderStrong,
-                              borderWidth: 1,
-                            },
-                          ]}
                           onPress={() => handleDecline(item.requestId)}
                         >
-                          <Text style={[styles.actionBtnText, { color: theme.textMuted }]}>
+                          <Text style={[styles.actionBtnText, { color: theme.textMuted }]}>Decline</Text>
-                            Decline
-                          </Text>
                         </TouchableOpacity>
                       </View>
                     </View>
@@ -251,9 +203,7 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
                 </View>
               ) : outgoing.length === 0 ? (
                 <View style={styles.empty}>
-                  <Text style={[styles.emptyText, { color: theme.textMuted }]}>
+                  <Text style={[styles.emptyText, { color: theme.textMuted }]}>No outgoing requests</Text>
-                    No outgoing requests
-                  </Text>
                 </View>
               ) : (
                 <FlatList
@@ -261,24 +211,13 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
                   keyExtractor={r => r.requestId}
                   renderItem={({ item }) => (
                     <View style={[styles.requestRow, { borderBottomColor: theme.border }]}>
-                      <Text style={[styles.friendName, { color: theme.textMuted }]}>
+                      <Text style={[styles.friendName, { color: theme.textMuted }]}>{item.username}</Text>
-                        {item.username}
-                      </Text>
                       <Text style={[styles.pendingText, { color: theme.textFaint }]}>Pending</Text>
                       <TouchableOpacity
-                        style={[
+                        style={[styles.cancelBtn, { backgroundColor: 'transparent', borderColor: theme.borderStrong, borderWidth: 1 }]}
-                          styles.cancelBtn,
-                          {
-                            backgroundColor: 'transparent',
-                            borderColor: theme.borderStrong,
-                            borderWidth: 1,
-                          },
-                        ]}
                         onPress={() => handleDecline(item.requestId)}
                       >
-                        <Text style={[styles.cancelBtnText, { color: theme.textMuted }]}>
+                        <Text style={[styles.cancelBtnText, { color: theme.textMuted }]}>Cancel</Text>
-                          Cancel
-                        </Text>
                       </TouchableOpacity>
                     </View>
                   )}
@@ -291,14 +230,7 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
             <View style={styles.content}>
               <View style={styles.searchContainer}>
                 <TextInput
-                  style={[
+                  style={[styles.searchInput, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
-                    styles.searchInput,
-                    {
-                      backgroundColor: theme.inputBg,
-                      borderColor: theme.borderStrong,
-                      color: theme.text,
-                    },
-                  ]}
                   placeholder="Search by username"
                   placeholderTextColor={theme.textMuted}
                   value={searchQuery}
@@ -321,24 +253,16 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
                   keyExtractor={u => u.id}
                   renderItem={({ item }) => (
                     <View style={[styles.friendRow, { borderBottomColor: theme.border }]}>
-                      <Text style={[styles.friendName, { color: theme.text }]}>
+                      <Text style={[styles.friendName, { color: theme.text }]}>{item.username}</Text>
-                        {item.username}
-                      </Text>
                       <TouchableOpacity
                         style={[styles.addBtn, { backgroundColor: theme.accent }]}
-                        onPress={() =>
+                        onPress={() => sendRequest(item.username)
-                          sendRequest(item.username)
                           .then(() => {
                             setSearchQuery('');
                             setSearchResults([]);
                             setSelectedTab('friends');
                           })
-                            .catch(err =>
+                          .catch(err => Alert.alert('Error', err instanceof Error ? err.message : 'Failed to send request'))
-                              Alert.alert(
-                                'Error',
-                                err instanceof Error ? err.message : 'Failed to send request'
-                              )
-                            )
                         }
                       >
                         <Text style={[styles.addBtnText, { color: theme.accentText }]}>Add</Text>
@@ -348,9 +272,7 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
                 />
               ) : searchQuery.length < 2 ? (
                 <View style={styles.empty}>
-                  <Text style={[styles.emptyHint, { color: theme.textFaint }]}>
+                  <Text style={[styles.emptyHint, { color: theme.textFaint }]}>Type at least 2 characters to search</Text>
-                    Type at least 2 characters to search
-                  </Text>
                 </View>
               ) : null}
             </View>

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

@@ -20,9 +20,7 @@ export function Header({ title, showLogo, rightAction }: HeaderProps) {
             <Text style={[styles.logoText, { color: theme.accentText }]}>✓</Text>
           </View>
         )}
-        <Text style={[styles.title, { color: theme.text }]} accessibilityRole="header">
+        <Text style={[styles.title, { color: theme.text }]} accessibilityRole="header">{title}</Text>
-          {title}
-        </Text>
         <View style={styles.spacer}>{rightAction}</View>
       </View>
     </View>

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

@@ -136,12 +136,7 @@ export function LegalModal({ visible, type, onClose }: LegalModalProps) {
           <Text style={[styles.title, { color: theme.text }]}>{title}</Text>
           <TouchableOpacity onPress={onClose} style={styles.closeButton} activeOpacity={0.7}>
             <Svg width={24} height={24} viewBox="0 0 24 24">
-              <Path
+              <Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.2} strokeLinecap="round" />
-                d="M18 6L6 18M6 6l12 12"
-                stroke={theme.textSecondary}
-                strokeWidth={2.2}
-                strokeLinecap="round"
-              />
             </Svg>
           </TouchableOpacity>
         </View>

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

@@ -1,69 +1,89 @@
 import React from 'react';
-import { View, Text, TouchableOpacity, StyleSheet, Switch } from 'react-native';
+import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
+import { useSettings } from '@/theme';
+import Svg, { Path } from 'react-native-svg';
 
-export const ListItem = ({ title, subtitle, onPress, leftIcon, rightIcon, disabled, leftElement, rightElement, showChevron }: {
+interface ListItemProps {
   title: string;
-  subtitle?: string | undefined;
+  subtitle?: string;
-  onPress?: () => void;
-  leftIcon?: React.ReactNode;
-  rightIcon?: React.ReactNode;
-  disabled?: boolean;
   leftElement?: React.ReactNode;
   rightElement?: React.ReactNode;
+  onPress?: () => void;
   showChevron?: boolean;
-}) => {
+}
+
+export function ListItem({ title, subtitle, leftElement, rightElement, onPress, showChevron }: ListItemProps) {
+  const { theme } = useSettings();
+  const isInteractive = onPress || showChevron;
+
   return (
-    <TouchableOpacity onPress={onPress} disabled={disabled} style={styles.item}>
+    <TouchableOpacity
-      <View style={styles.left}>
+      style={[
-        {leftElement}
+        styles.container,
-        {leftIcon}
+        { backgroundColor: theme.card, borderColor: theme.border },
+        isInteractive && styles.interactive,
+      ]}
+      onPress={onPress}
+      activeOpacity={0.7}
+      disabled={!isInteractive}
+      accessibilityRole={isInteractive ? 'button' : 'none'}
+      accessibilityLabel={title}
+      accessibilityHint={subtitle ? subtitle : undefined}
+      accessibilityState={{ disabled: !isInteractive }}
+    >
+      {leftElement && <View style={styles.leftElement}>{leftElement}</View>}
+      <View style={styles.leftContent}>
+        <Text style={[styles.title, { color: theme.text }]}>{title}</Text>
+        {subtitle && <Text style={[styles.subtitle, { color: theme.textMuted }]}>{subtitle}</Text>}
       </View>
-      <View style={styles.center}>
+      <View style={styles.rightContent}>
-        <Text style={styles.title}>{title}</Text>
-        {subtitle && <Text style={styles.subtitle}>{subtitle}</Text>}
-      </View>
-      <View style={styles.right}>
         {rightElement}
-        {rightIcon}
+        {showChevron && !rightElement && (
+          <Svg width={20} height={20} viewBox="0 0 24 24">
+            <Path
+              d="M9 18l6-6-6-6"
+              stroke={theme.textSecondary}
+              strokeWidth={2.5}
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              fill="none"
+            />
+          </Svg>
+        )}
       </View>
-      {showChevron && <Text style={styles.chevron}>▶</Text>}
     </TouchableOpacity>
   );
-};
+}
 
 const styles = StyleSheet.create({
-  item: {
+  container: {
-    padding: 16,
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'space-between',
-    backgroundColor: 'white',
+    paddingVertical: 14,
-    marginVertical: 4,
+    paddingHorizontal: 16,
-    borderRadius: 8,
+    borderRadius: 12,
+    borderWidth: 1,
+    marginBottom: 8,
   },
-  left: {
+  interactive: {},
+  leftElement: {
+    marginRight: 12,
+  },
+  leftContent: {
     flex: 1,
-  },
+    gap: 2,
-  center: {
-    flex: 3,
-    marginHorizontal: 12,
-  },
-  right: {
-    flex: 1,
-    textAlign: 'right',
   },
   title: {
     fontSize: 16,
     fontWeight: '500',
   },
   subtitle: {
-    fontSize: 12,
+    fontSize: 13,
-    color: '#757575',
-    marginTop: 2,
   },
-  chevron: {
+  rightContent: {
-    fontSize: 14,
+    flexDirection: 'row',
-    color: '#757575',
+    alignItems: 'center',
-    marginLeft: 4,
+    gap: 12,
   },
 });

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

@@ -47,7 +47,7 @@ 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, deleteBySwipe } = useSettings();
+  const { theme } = 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));
@@ -176,9 +176,7 @@ const renderLeftActions = (progress: Animated.AnimatedInterpolation<number>) =>
       renderRightActions={renderRightActions}
       renderLeftActions={renderLeftActions}
       onSwipeableRightOpen={() => {
-        if (deleteBySwipe) {
         onDelete?.();
-        }
         swipeableRef.current?.close();
       }}
       onSwipeableLeftOpen={() => {

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

@@ -66,7 +66,7 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
   const itemRefs = useRef<Map<string, View>>(new Map());
   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 subtaskDragRef = useRef<{ subtaskId: string; parentTaskId: string; positions: Record<string, { top: number; bottom: number }>; subPositions: Record<string, { top: number; bottom: number }> } | null>(null);
    const {
       modals,
       openTaskDelete,
@@ -334,8 +334,8 @@ export function TaskList({ categoryIds = [], showCompleted = false, onSelectionC
     }
   }, [findHoverTarget]);
 
-  const handleSubtaskDragStart = useCallback(async (subtaskId: string, parentTaskId: string, parentSubtaskId: string | null = null) => {
+  const handleSubtaskDragStart = useCallback(async (subtaskId: string, parentTaskId: string) => {
-    subtaskDragRef.current = { subtaskId, parentTaskId, parentSubtaskId, ...(await measureAll()) };
+    subtaskDragRef.current = { subtaskId, parentTaskId, ...(await measureAll()) };
   }, [measureAll]);
 
   const handleSubtaskDragUpdate = useCallback((absoluteY: number) => {
@@ -361,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);
@@ -371,15 +371,16 @@ const handleSubtaskDragEnd = useCallback(async (absoluteY: number) => {
     const target = findHoverTarget(absoluteY, state.subtaskId, state.positions, state.subPositions);
     if (target === state.subtaskId) return;
 
-    // Only allow dropping on tasks (not subtasks) to match task behavior
+    if (target) {
-    // Check if target exists in main task positions, not subtask positions
+      if (state.subPositions[target]) {
-    const isTaskTarget = state.positions != null && target != null && target in state.positions;
+        await setSubtaskParent(state.subtaskId, target);
-    if (target && isTaskTarget) {
+      } else if (target !== state.parentTaskId) {
-      // 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)
         await moveSubtaskToTask(state.subtaskId, target);
       }
-  }, [findHoverTarget, moveSubtaskToTask]);
+    } else {
+      await convertSubtaskToTask(state.subtaskId);
+    }
+  }, [findHoverTarget]);
 
   const renderItem = useCallback(
     ({ item, index }: { item: Task; index: number }) => {

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

@@ -1,194 +0,0 @@
-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 };
-}