Merge pull request 'refactor: update component styles and layouts' (#15) from dev into main
Reviewed-on: #15
This commit was merged in pull request #15.
This commit is contained in:
@@ -0,0 +1,17 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"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
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# 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
|
||||||
@@ -49,9 +49,9 @@ export function AnalogClock({ value, is24Hour = false, onChange }: AnalogClockPr
|
|||||||
let hour: number;
|
let hour: number;
|
||||||
if (is24Hour) {
|
if (is24Hour) {
|
||||||
const inner = distance < INNER_NUM_RADIUS + 14;
|
const inner = distance < INNER_NUM_RADIUS + 14;
|
||||||
hour = inner ? base + 12 : (base === 0 ? 12 : base);
|
hour = inner ? base + 12 : base === 0 ? 12 : base;
|
||||||
} else {
|
} else {
|
||||||
hour = isPM ? base + 12 : (base === 0 ? 0 : base);
|
hour = isPM ? base + 12 : base === 0 ? 0 : base;
|
||||||
}
|
}
|
||||||
emit(hour, minutes);
|
emit(hour, minutes);
|
||||||
setMode('minute');
|
setMode('minute');
|
||||||
@@ -135,7 +135,8 @@ export function AnalogClock({ value, is24Hour = false, onChange }: AnalogClockPr
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
const minuteDots = mode === 'minute'
|
const minuteDots =
|
||||||
|
mode === 'minute'
|
||||||
? Array.from({ length: 12 }, (_, i) => {
|
? Array.from({ length: 12 }, (_, i) => {
|
||||||
const angle = (i * 30 * Math.PI) / 180;
|
const angle = (i * 30 * Math.PI) / 180;
|
||||||
const x = CENTER + RADIUS * 0.82 * Math.sin(angle);
|
const x = CENTER + RADIUS * 0.82 * Math.sin(angle);
|
||||||
@@ -181,7 +182,7 @@ export function AnalogClock({ value, is24Hour = false, onChange }: AnalogClockPr
|
|||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
{!is24Hour && (
|
{!is24Hour && (
|
||||||
<View style={styles.periodGroup}>
|
<View style={styles.periodGroup}>
|
||||||
{(['AM', 'PM'] as const).map((period) => {
|
{(['AM', 'PM'] as const).map(period => {
|
||||||
const active = isPM === (period === 'PM');
|
const active = isPM === (period === 'PM');
|
||||||
return (
|
return (
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
@@ -215,15 +216,15 @@ export function AnalogClock({ value, is24Hour = false, onChange }: AnalogClockPr
|
|||||||
style={styles.clockSurface}
|
style={styles.clockSurface}
|
||||||
onStartShouldSetResponder={() => true}
|
onStartShouldSetResponder={() => true}
|
||||||
onMoveShouldSetResponder={() => true}
|
onMoveShouldSetResponder={() => true}
|
||||||
onResponderGrant={(e) => {
|
onResponderGrant={e => {
|
||||||
movedRef.current = false;
|
movedRef.current = false;
|
||||||
onLocation(e, false);
|
onLocation(e, false);
|
||||||
}}
|
}}
|
||||||
onResponderMove={(e) => {
|
onResponderMove={e => {
|
||||||
movedRef.current = true;
|
movedRef.current = true;
|
||||||
onLocation(e, true);
|
onLocation(e, true);
|
||||||
}}
|
}}
|
||||||
onResponderRelease={(e) => {
|
onResponderRelease={e => {
|
||||||
if (!movedRef.current) {
|
if (!movedRef.current) {
|
||||||
onLocation(e, false);
|
onLocation(e, false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,15 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { View, Text, TouchableOpacity, StyleSheet, Modal, FlatList, ActivityIndicator, TextInput, KeyboardAvoidingView } from 'react-native';
|
import {
|
||||||
|
View,
|
||||||
|
Text,
|
||||||
|
TouchableOpacity,
|
||||||
|
StyleSheet,
|
||||||
|
Modal,
|
||||||
|
FlatList,
|
||||||
|
ActivityIndicator,
|
||||||
|
TextInput,
|
||||||
|
KeyboardAvoidingView,
|
||||||
|
} from 'react-native';
|
||||||
import { useSettings } from '@/theme';
|
import { useSettings } from '@/theme';
|
||||||
import { useFriends } from '@/hooks/useFriends';
|
import { useFriends } from '@/hooks/useFriends';
|
||||||
|
|
||||||
@@ -82,19 +92,14 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
|
|||||||
<Text style={[styles.selectorIcon, { color: theme.accentStrong }]}>👤</Text>
|
<Text style={[styles.selectorIcon, { color: theme.accentStrong }]}>👤</Text>
|
||||||
<View style={styles.selectorContent}>
|
<View style={styles.selectorContent}>
|
||||||
<Text style={[styles.selectorLabel, { color: theme.textMuted }]}>Assignee</Text>
|
<Text style={[styles.selectorLabel, { color: theme.textMuted }]}>Assignee</Text>
|
||||||
<Text
|
<Text style={[styles.selectorValue, { color: value ? theme.text : theme.textMuted }]}>
|
||||||
style={[
|
|
||||||
styles.selectorValue,
|
|
||||||
{ color: value ? theme.text : theme.textMuted },
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
{selectedFriend ? selectedFriend.username : 'Unassigned'}
|
{selectedFriend ? selectedFriend.username : 'Unassigned'}
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
{value && !disabled && (
|
{value && !disabled && (
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={styles.clearButton}
|
style={styles.clearButton}
|
||||||
onPress={(e) => {
|
onPress={e => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
handleClear();
|
handleClear();
|
||||||
}}
|
}}
|
||||||
@@ -105,7 +110,12 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
|
|||||||
)}
|
)}
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
||||||
<Modal visible={showModal} transparent animationType="fade" onRequestClose={() => setShowModal(false)}>
|
<Modal
|
||||||
|
visible={showModal}
|
||||||
|
transparent
|
||||||
|
animationType="fade"
|
||||||
|
onRequestClose={() => setShowModal(false)}
|
||||||
|
>
|
||||||
<KeyboardAvoidingView
|
<KeyboardAvoidingView
|
||||||
style={[styles.modalOverlay, { backgroundColor: 'rgba(0,0,0,0.5)' }]}
|
style={[styles.modalOverlay, { backgroundColor: 'rgba(0,0,0,0.5)' }]}
|
||||||
behavior="padding"
|
behavior="padding"
|
||||||
@@ -113,7 +123,10 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
|
|||||||
<View style={[styles.modalSheet, { backgroundColor: theme.sheetBg }]}>
|
<View style={[styles.modalSheet, { backgroundColor: theme.sheetBg }]}>
|
||||||
<View style={styles.modalHeader}>
|
<View style={styles.modalHeader}>
|
||||||
<Text style={[styles.modalTitle, { color: theme.text }]}>Assign Task</Text>
|
<Text style={[styles.modalTitle, { color: theme.text }]}>Assign Task</Text>
|
||||||
<TouchableOpacity onPress={() => setShowModal(false)} hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}>
|
<TouchableOpacity
|
||||||
|
onPress={() => setShowModal(false)}
|
||||||
|
hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
|
||||||
|
>
|
||||||
<Text style={[styles.closeText, { color: theme.textMuted }]}>✕</Text>
|
<Text style={[styles.closeText, { color: theme.textMuted }]}>✕</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
@@ -122,7 +135,10 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
|
|||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[
|
style={[
|
||||||
styles.optionRow,
|
styles.optionRow,
|
||||||
{ backgroundColor: selectedFriend ? theme.accentSoft : 'transparent', borderColor: selectedFriend ? theme.accent : 'transparent' },
|
{
|
||||||
|
backgroundColor: selectedFriend ? theme.accentSoft : 'transparent',
|
||||||
|
borderColor: selectedFriend ? theme.accent : 'transparent',
|
||||||
|
},
|
||||||
]}
|
]}
|
||||||
onPress={() => handleClear()}
|
onPress={() => handleClear()}
|
||||||
>
|
>
|
||||||
@@ -143,7 +159,9 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
|
|||||||
<ActivityIndicator color={theme.accent} size="large" />
|
<ActivityIndicator color={theme.accent} size="large" />
|
||||||
</View>
|
</View>
|
||||||
) : friends.length === 0 ? (
|
) : friends.length === 0 ? (
|
||||||
<Text style={[styles.emptyText, { color: theme.textFaint }]}>No friends yet. Add friends to assign tasks.</Text>
|
<Text style={[styles.emptyText, { color: theme.textFaint }]}>
|
||||||
|
No friends yet. Add friends to assign tasks.
|
||||||
|
</Text>
|
||||||
) : (
|
) : (
|
||||||
<FlatList
|
<FlatList
|
||||||
data={friends}
|
data={friends}
|
||||||
@@ -152,14 +170,19 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
|
|||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[
|
style={[
|
||||||
styles.optionRow,
|
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)}
|
onPress={() => handleSelectFriend(item.id)}
|
||||||
>
|
>
|
||||||
<View style={styles.optionIcon}>
|
<View style={styles.optionIcon}>
|
||||||
<Text style={styles.optionIconText}>👤</Text>
|
<Text style={styles.optionIconText}>👤</Text>
|
||||||
</View>
|
</View>
|
||||||
<Text style={[styles.optionText, { color: theme.text }]}>{item.username}</Text>
|
<Text style={[styles.optionText, { color: theme.text }]}>
|
||||||
|
{item.username}
|
||||||
|
</Text>
|
||||||
{value === item.id && (
|
{value === item.id && (
|
||||||
<Text style={[styles.checkmark, { color: theme.accentStrong }]}>✓</Text>
|
<Text style={[styles.checkmark, { color: theme.accentStrong }]}>✓</Text>
|
||||||
)}
|
)}
|
||||||
@@ -172,7 +195,14 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
|
|||||||
<View style={styles.modalSection}>
|
<View style={styles.modalSection}>
|
||||||
<View style={styles.searchContainer}>
|
<View style={styles.searchContainer}>
|
||||||
<TextInput
|
<TextInput
|
||||||
style={[styles.searchInput, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
|
style={[
|
||||||
|
styles.searchInput,
|
||||||
|
{
|
||||||
|
backgroundColor: theme.inputBg,
|
||||||
|
borderColor: theme.borderStrong,
|
||||||
|
color: theme.text,
|
||||||
|
},
|
||||||
|
]}
|
||||||
placeholder="Search users by username"
|
placeholder="Search users by username"
|
||||||
placeholderTextColor={theme.textMuted}
|
placeholderTextColor={theme.textMuted}
|
||||||
value={searchQuery}
|
value={searchQuery}
|
||||||
@@ -197,15 +227,21 @@ export function AssigneeSelector({ value, onChange, disabled = false }: Assignee
|
|||||||
<View style={styles.optionIcon}>
|
<View style={styles.optionIcon}>
|
||||||
<Text style={styles.optionIconText}>➕</Text>
|
<Text style={styles.optionIconText}>➕</Text>
|
||||||
</View>
|
</View>
|
||||||
<Text style={[styles.optionText, { color: theme.text }]}>{item.username}</Text>
|
<Text style={[styles.optionText, { color: theme.text }]}>
|
||||||
<Text style={[styles.optionSubtext, { color: theme.textMuted }]}>Add as friend & assign</Text>
|
{item.username}
|
||||||
|
</Text>
|
||||||
|
<Text style={[styles.optionSubtext, { color: theme.textMuted }]}>
|
||||||
|
Add as friend & assign
|
||||||
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
) : searchQuery.length >= 2 && searchResults.length === 0 && !searching ? (
|
) : searchQuery.length >= 2 && searchResults.length === 0 && !searching ? (
|
||||||
<Text style={[styles.emptyText, { color: theme.textFaint }]}>No users found</Text>
|
<Text style={[styles.emptyText, { color: theme.textFaint }]}>No users found</Text>
|
||||||
) : searchQuery.length < 2 ? (
|
) : searchQuery.length < 2 ? (
|
||||||
<Text style={[styles.emptyText, { color: theme.textFaint }]}>Type at least 2 characters to search</Text>
|
<Text style={[styles.emptyText, { color: theme.textFaint }]}>
|
||||||
|
Type at least 2 characters to search
|
||||||
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
@@ -1,5 +1,17 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { Modal, View, Text, StyleSheet, TextInput, TouchableOpacity, ScrollView, KeyboardAvoidingView, Platform, Pressable, useWindowDimensions } from 'react-native';
|
import {
|
||||||
|
Modal,
|
||||||
|
View,
|
||||||
|
Text,
|
||||||
|
StyleSheet,
|
||||||
|
TextInput,
|
||||||
|
TouchableOpacity,
|
||||||
|
ScrollView,
|
||||||
|
KeyboardAvoidingView,
|
||||||
|
Platform,
|
||||||
|
Pressable,
|
||||||
|
useWindowDimensions,
|
||||||
|
} from 'react-native';
|
||||||
import Category from '@/models/Category';
|
import Category from '@/models/Category';
|
||||||
import { useSettings } from '@/theme';
|
import { useSettings } from '@/theme';
|
||||||
import { CATEGORY_COLORS } from '@/constants';
|
import { CATEGORY_COLORS } from '@/constants';
|
||||||
@@ -15,7 +27,12 @@ interface CategoryEditorModalProps {
|
|||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function CategoryEditorModal({ visible, category, categoryCount, onClose }: CategoryEditorModalProps) {
|
export function CategoryEditorModal({
|
||||||
|
visible,
|
||||||
|
category,
|
||||||
|
categoryCount,
|
||||||
|
onClose,
|
||||||
|
}: CategoryEditorModalProps) {
|
||||||
const { theme } = useSettings();
|
const { theme } = useSettings();
|
||||||
const [name, setName] = useState('');
|
const [name, setName] = useState('');
|
||||||
const [color, setColor] = useState(CATEGORY_COLORS[0]);
|
const [color, setColor] = useState(CATEGORY_COLORS[0]);
|
||||||
@@ -64,15 +81,8 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
|
|||||||
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
|
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
|
||||||
keyboardVerticalOffset={0}
|
keyboardVerticalOffset={0}
|
||||||
>
|
>
|
||||||
<Pressable
|
<Pressable style={styles.overlay} onPress={onClose} accessibilityRole="none">
|
||||||
style={styles.overlay}
|
<Pressable style={[styles.sheet, { backgroundColor: theme.sheetBg }]} onPress={() => {}}>
|
||||||
onPress={onClose}
|
|
||||||
accessibilityRole="none"
|
|
||||||
>
|
|
||||||
<Pressable
|
|
||||||
style={[styles.sheet, { backgroundColor: theme.sheetBg }]}
|
|
||||||
onPress={() => {}}
|
|
||||||
>
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
showsVerticalScrollIndicator={false}
|
showsVerticalScrollIndicator={false}
|
||||||
keyboardShouldPersistTaps="handled"
|
keyboardShouldPersistTaps="handled"
|
||||||
@@ -82,10 +92,21 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
|
|||||||
<Text style={[styles.title, { color: theme.text }]}>
|
<Text style={[styles.title, { color: theme.text }]}>
|
||||||
{category ? 'Edit Tag' : 'New Tag'}
|
{category ? 'Edit Tag' : 'New Tag'}
|
||||||
</Text>
|
</Text>
|
||||||
<TouchableOpacity onPress={onClose} style={styles.closeButton} hitSlop={{ top: 12, bottom: 12, left: 12, right: 12 }} accessibilityRole="button" accessibilityLabel="Close tag editor">
|
<TouchableOpacity
|
||||||
|
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">
|
<Svg width={22} height={22} viewBox="0 0 24 24">
|
||||||
<Circle cx={12} cy={12} r={10} fill={theme.cardAlt} />
|
<Circle cx={12} cy={12} r={10} fill={theme.cardAlt} />
|
||||||
<Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.5} strokeLinecap="round" />
|
<Path
|
||||||
|
d="M18 6L6 18M6 6l12 12"
|
||||||
|
stroke={theme.textSecondary}
|
||||||
|
strokeWidth={2.5}
|
||||||
|
strokeLinecap="round"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
@@ -94,7 +115,11 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
|
|||||||
<TextInput
|
<TextInput
|
||||||
style={[
|
style={[
|
||||||
styles.input,
|
styles.input,
|
||||||
{ backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
|
{
|
||||||
|
backgroundColor: theme.inputBg,
|
||||||
|
borderColor: theme.borderStrong,
|
||||||
|
color: theme.text,
|
||||||
|
},
|
||||||
]}
|
]}
|
||||||
placeholder="Tag name"
|
placeholder="Tag name"
|
||||||
placeholderTextColor={theme.textMuted}
|
placeholderTextColor={theme.textMuted}
|
||||||
@@ -107,7 +132,7 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
|
|||||||
|
|
||||||
<Text style={[styles.label, { color: theme.textSecondary }]}>Color</Text>
|
<Text style={[styles.label, { color: theme.textSecondary }]}>Color</Text>
|
||||||
<View style={styles.colorGrid}>
|
<View style={styles.colorGrid}>
|
||||||
{CATEGORY_COLORS.map((c) => (
|
{CATEGORY_COLORS.map(c => (
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
key={c}
|
key={c}
|
||||||
style={[
|
style={[
|
||||||
@@ -123,7 +148,14 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
|
|||||||
>
|
>
|
||||||
{color === c && (
|
{color === c && (
|
||||||
<Svg width={16} height={16} viewBox="0 0 24 24">
|
<Svg width={16} height={16} viewBox="0 0 24 24">
|
||||||
<Path d="M5 12l5 5 9-10" stroke="#FFFFFF" strokeWidth={3} strokeLinecap="round" strokeLinejoin="round" fill="none" />
|
<Path
|
||||||
|
d="M5 12l5 5 9-10"
|
||||||
|
stroke="#FFFFFF"
|
||||||
|
strokeWidth={3}
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
)}
|
)}
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
@@ -139,13 +171,22 @@ export function CategoryEditorModal({ visible, category, categoryCount, onClose
|
|||||||
disabled={!canDelete}
|
disabled={!canDelete}
|
||||||
activeOpacity={0.7}
|
activeOpacity={0.7}
|
||||||
>
|
>
|
||||||
<Text style={[styles.deleteButtonText, { color: canDelete ? theme.accent : theme.textMuted }]}>
|
<Text
|
||||||
|
style={[
|
||||||
|
styles.deleteButtonText,
|
||||||
|
{ color: canDelete ? theme.accent : theme.textMuted },
|
||||||
|
]}
|
||||||
|
>
|
||||||
Delete
|
Delete
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
)}
|
)}
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.saveButton, { backgroundColor: theme.accent }, !name.trim() && styles.saveButtonDisabled]}
|
style={[
|
||||||
|
styles.saveButton,
|
||||||
|
{ backgroundColor: theme.accent },
|
||||||
|
!name.trim() && styles.saveButtonDisabled,
|
||||||
|
]}
|
||||||
onPress={handleSave}
|
onPress={handleSave}
|
||||||
disabled={!name.trim()}
|
disabled={!name.trim()}
|
||||||
activeOpacity={0.8}
|
activeOpacity={0.8}
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
|
|||||||
isAllCategory={true}
|
isAllCategory={true}
|
||||||
scaleAnim={scaleAnim}
|
scaleAnim={scaleAnim}
|
||||||
/>
|
/>
|
||||||
{categories.map((category) => (
|
{categories.map(category => (
|
||||||
<CategoryButton
|
<CategoryButton
|
||||||
key={category.id}
|
key={category.id}
|
||||||
id={category.id}
|
id={category.id}
|
||||||
@@ -72,7 +72,10 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
|
|||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.manageButton, { borderColor: theme.borderStrong, backgroundColor: theme.cardAlt }]}
|
style={[
|
||||||
|
styles.manageButton,
|
||||||
|
{ borderColor: theme.borderStrong, backgroundColor: theme.cardAlt },
|
||||||
|
]}
|
||||||
onPress={() => router.push('/settings')}
|
onPress={() => router.push('/settings')}
|
||||||
activeOpacity={0.7}
|
activeOpacity={0.7}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
@@ -80,10 +83,22 @@ export function CategoryFilter({ selected, onSelect }: CategoryFilterProps) {
|
|||||||
hitSlop={{ top: 8, bottom: 8, left: 4, right: 4 }}
|
hitSlop={{ top: 8, bottom: 8, left: 4, right: 4 }}
|
||||||
>
|
>
|
||||||
<Svg width={14} height={14} viewBox="0 0 24 24">
|
<Svg width={14} height={14} viewBox="0 0 24 24">
|
||||||
<Circle cx={12} cy={12} r={9} stroke={theme.textSecondary} strokeWidth={2.2} fill="none" />
|
<Circle
|
||||||
|
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={8.5} r={1.2} fill={theme.textSecondary} />
|
||||||
<Circle cx={12} cy={15.5} r={1.2} fill={theme.textSecondary} />
|
<Circle cx={12} cy={15.5} r={1.2} fill={theme.textSecondary} />
|
||||||
<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" />
|
<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"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
<Text style={[styles.manageLabel, { color: theme.textSecondary }]}>Manage</Text>
|
<Text style={[styles.manageLabel, { color: theme.textSecondary }]}>Manage</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
@@ -104,7 +119,16 @@ interface CategoryButtonProps {
|
|||||||
scaleAnim: Animated.Value;
|
scaleAnim: Animated.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
function CategoryButton({ color, selected, onPress, onPressIn, onPressOut, theme, isAllCategory, scaleAnim }: CategoryButtonProps) {
|
function CategoryButton({
|
||||||
|
color,
|
||||||
|
selected,
|
||||||
|
onPress,
|
||||||
|
onPressIn,
|
||||||
|
onPressOut,
|
||||||
|
theme,
|
||||||
|
isAllCategory,
|
||||||
|
scaleAnim,
|
||||||
|
}: CategoryButtonProps) {
|
||||||
const animatedStyle = {
|
const animatedStyle = {
|
||||||
transform: [{ scale: scaleAnim }],
|
transform: [{ scale: scaleAnim }],
|
||||||
shadowColor: selected ? theme.accent : '#000',
|
shadowColor: selected ? theme.accent : '#000',
|
||||||
@@ -130,8 +154,24 @@ function CategoryButton({ color, selected, onPress, onPressIn, onPressOut, theme
|
|||||||
>
|
>
|
||||||
{isAllCategory ? (
|
{isAllCategory ? (
|
||||||
<Svg width={20} height={20} viewBox="0 0 24 24">
|
<Svg width={20} height={20} viewBox="0 0 24 24">
|
||||||
<Circle cx={12} cy={12} r={9} stroke="#FFFFFF" strokeWidth={2.5} fill="none" opacity={0.9} />
|
<Circle
|
||||||
<Path d="M6 12l4 4 8-8" stroke="#FFFFFF" strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" opacity={0.9} />
|
cx={12}
|
||||||
|
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>
|
</Svg>
|
||||||
) : null}
|
) : null}
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|||||||
@@ -1,5 +1,14 @@
|
|||||||
import React, { useState } from 'react';
|
import React, { useState } from 'react';
|
||||||
import { View, Text, StyleSheet, TouchableOpacity, ScrollView, Modal, Pressable, KeyboardAvoidingView } from 'react-native';
|
import {
|
||||||
|
View,
|
||||||
|
Text,
|
||||||
|
StyleSheet,
|
||||||
|
TouchableOpacity,
|
||||||
|
ScrollView,
|
||||||
|
Modal,
|
||||||
|
Pressable,
|
||||||
|
KeyboardAvoidingView,
|
||||||
|
} from 'react-native';
|
||||||
import { useCategories } from '@/hooks/useDatabase';
|
import { useCategories } from '@/hooks/useDatabase';
|
||||||
import { useSettings } from '@/theme';
|
import { useSettings } from '@/theme';
|
||||||
import Svg, { Path } from 'react-native-svg';
|
import Svg, { Path } from 'react-native-svg';
|
||||||
@@ -16,7 +25,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
|
|||||||
const [showModal, setShowModal] = useState(false);
|
const [showModal, setShowModal] = useState(false);
|
||||||
|
|
||||||
const selected = new Set(value);
|
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 toggle = (id: string) => {
|
||||||
const next = new Set(selected);
|
const next = new Set(selected);
|
||||||
@@ -33,7 +42,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
|
|||||||
? 'None'
|
? 'None'
|
||||||
: selectedCategories
|
: selectedCategories
|
||||||
.slice(0, 2)
|
.slice(0, 2)
|
||||||
.map((c) => c.name)
|
.map(c => c.name)
|
||||||
.join(', ') + (selectedCategories.length > 2 ? ` +${selectedCategories.length - 2}` : '');
|
.join(', ') + (selectedCategories.length > 2 ? ` +${selectedCategories.length - 2}` : '');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -53,10 +62,18 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
|
|||||||
<View style={styles.selectorContent}>
|
<View style={styles.selectorContent}>
|
||||||
{selectedCategories.length > 0 ? (
|
{selectedCategories.length > 0 ? (
|
||||||
<View style={styles.chipRow}>
|
<View style={styles.chipRow}>
|
||||||
{selectedCategories.slice(0, 3).map((c) => (
|
{selectedCategories.slice(0, 3).map(c => (
|
||||||
<View key={c.id} style={[styles.chip, { backgroundColor: theme.cardAlt, borderColor: theme.border }]}>
|
<View
|
||||||
|
key={c.id}
|
||||||
|
style={[
|
||||||
|
styles.chip,
|
||||||
|
{ backgroundColor: theme.cardAlt, borderColor: theme.border },
|
||||||
|
]}
|
||||||
|
>
|
||||||
<View style={[styles.colorCircle, { backgroundColor: c.color }]} />
|
<View style={[styles.colorCircle, { backgroundColor: c.color }]} />
|
||||||
<Text style={[styles.chipText, { color: theme.textSecondary }]} numberOfLines={1}>{c.name}</Text>
|
<Text style={[styles.chipText, { color: theme.textSecondary }]} numberOfLines={1}>
|
||||||
|
{c.name}
|
||||||
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
@@ -65,12 +82,24 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
|
|||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
<Svg width={20} height={20} viewBox="0 0 24 24">
|
<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" />
|
<Path
|
||||||
|
d="M9 18l6-6-6-6"
|
||||||
|
stroke={theme.textSecondary}
|
||||||
|
strokeWidth={2.5}
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
{error && <Text style={[styles.errorText, { color: theme.dangerStrong }]}>{error}</Text>}
|
{error && <Text style={[styles.errorText, { color: theme.dangerStrong }]}>{error}</Text>}
|
||||||
|
|
||||||
<Modal visible={showModal} transparent animationType="fade" onRequestClose={() => setShowModal(false)}>
|
<Modal
|
||||||
|
visible={showModal}
|
||||||
|
transparent
|
||||||
|
animationType="fade"
|
||||||
|
onRequestClose={() => setShowModal(false)}
|
||||||
|
>
|
||||||
<KeyboardAvoidingView
|
<KeyboardAvoidingView
|
||||||
style={[styles.modalOverlay, { backgroundColor: 'rgba(0,0,0,0.5)' }]}
|
style={[styles.modalOverlay, { backgroundColor: 'rgba(0,0,0,0.5)' }]}
|
||||||
behavior="padding"
|
behavior="padding"
|
||||||
@@ -81,7 +110,10 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
|
|||||||
<Text style={[styles.modalTitle, { color: theme.text }]}>Select Tags</Text>
|
<Text style={[styles.modalTitle, { color: theme.text }]}>Select Tags</Text>
|
||||||
<View style={styles.modalHeaderRight}>
|
<View style={styles.modalHeaderRight}>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
onPress={() => { onChange([]); setShowModal(false); }}
|
onPress={() => {
|
||||||
|
onChange([]);
|
||||||
|
setShowModal(false);
|
||||||
|
}}
|
||||||
activeOpacity={0.7}
|
activeOpacity={0.7}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel="Clear all tags"
|
accessibilityLabel="Clear all tags"
|
||||||
@@ -102,7 +134,7 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
|
|||||||
<Text style={[styles.modalHint, { color: theme.textMuted }]}>
|
<Text style={[styles.modalHint, { color: theme.textMuted }]}>
|
||||||
A task can have multiple tags. Selected: {selected.size}
|
A task can have multiple tags. Selected: {selected.size}
|
||||||
</Text>
|
</Text>
|
||||||
{categories.map((category) => {
|
{categories.map(category => {
|
||||||
const isSelected = selected.has(category.id);
|
const isSelected = selected.has(category.id);
|
||||||
return (
|
return (
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
@@ -110,7 +142,11 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
|
|||||||
style={[
|
style={[
|
||||||
styles.modalOption,
|
styles.modalOption,
|
||||||
{ backgroundColor: theme.card, borderColor: theme.borderStrong },
|
{ backgroundColor: theme.card, borderColor: theme.borderStrong },
|
||||||
isSelected && { borderColor: theme.accent, backgroundColor: theme.accentSoft, borderWidth: 2 },
|
isSelected && {
|
||||||
|
borderColor: theme.accent,
|
||||||
|
backgroundColor: theme.accentSoft,
|
||||||
|
borderWidth: 2,
|
||||||
|
},
|
||||||
]}
|
]}
|
||||||
onPress={() => toggle(category.id)}
|
onPress={() => toggle(category.id)}
|
||||||
activeOpacity={0.8}
|
activeOpacity={0.8}
|
||||||
@@ -118,17 +154,32 @@ export function CategorySelector({ value, onChange, error }: CategorySelectorPro
|
|||||||
accessibilityLabel={`Tag ${category.name}`}
|
accessibilityLabel={`Tag ${category.name}`}
|
||||||
accessibilityState={{ checked: isSelected }}
|
accessibilityState={{ checked: isSelected }}
|
||||||
>
|
>
|
||||||
<View style={[styles.colorCircle, { backgroundColor: category.color }, isSelected && styles.colorCircleSelected]} />
|
<View
|
||||||
<Text style={[
|
style={[
|
||||||
|
styles.colorCircle,
|
||||||
|
{ backgroundColor: category.color },
|
||||||
|
isSelected && styles.colorCircleSelected,
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
<Text
|
||||||
|
style={[
|
||||||
styles.categoryName,
|
styles.categoryName,
|
||||||
{ color: theme.textSecondary },
|
{ color: theme.textSecondary },
|
||||||
isSelected && { color: theme.text, fontWeight: '600' },
|
isSelected && { color: theme.text, fontWeight: '600' },
|
||||||
]}>
|
]}
|
||||||
|
>
|
||||||
{category.name}
|
{category.name}
|
||||||
</Text>
|
</Text>
|
||||||
{isSelected && (
|
{isSelected && (
|
||||||
<Svg width={20} height={20} viewBox="0 0 24 24">
|
<Svg width={20} height={20} viewBox="0 0 24 24">
|
||||||
<Path d="M5 12l5 5 9-10" stroke={theme.accent} strokeWidth={2.5} strokeLinecap="round" strokeLinejoin="round" fill="none" />
|
<Path
|
||||||
|
d="M5 12l5 5 9-10"
|
||||||
|
stroke={theme.accent}
|
||||||
|
strokeWidth={2.5}
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
)}
|
)}
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|||||||
@@ -20,16 +20,21 @@ export default function NativeColorPickerInput({ value, onChange }: ColorPickerI
|
|||||||
const valid = isValidHex(hex);
|
const valid = isValidHex(hex);
|
||||||
|
|
||||||
const handleChange = (raw: string) => {
|
const handleChange = (raw: string) => {
|
||||||
const cleaned = raw.replace(/[^0-9a-fA-F]/g, '').slice(0, 6).toUpperCase();
|
const cleaned = raw
|
||||||
|
.replace(/[^0-9a-fA-F]/g, '')
|
||||||
|
.slice(0, 6)
|
||||||
|
.toUpperCase();
|
||||||
onChange(`#${cleaned}`);
|
onChange(`#${cleaned}`);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.row}>
|
<View style={styles.row}>
|
||||||
<View style={[
|
<View
|
||||||
|
style={[
|
||||||
styles.preview,
|
styles.preview,
|
||||||
{ backgroundColor: valid ? value : theme.accentSoft, borderColor: theme.accent },
|
{ backgroundColor: valid ? value : theme.accentSoft, borderColor: theme.accent },
|
||||||
]} />
|
]}
|
||||||
|
/>
|
||||||
<View style={styles.inputWrap}>
|
<View style={styles.inputWrap}>
|
||||||
<Text style={styles.hash}>#{/**/}</Text>
|
<Text style={styles.hash}>#{/**/}</Text>
|
||||||
<TextInput
|
<TextInput
|
||||||
|
|||||||
@@ -33,14 +33,38 @@ function hsvToHex(h: number, s: number, v: number) {
|
|||||||
const c = v * s;
|
const c = v * s;
|
||||||
const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
|
const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
|
||||||
const m = v - c;
|
const m = v - c;
|
||||||
let r = 0, g = 0, b = 0;
|
let r = 0,
|
||||||
if (h < 60) { r = c; g = x; b = 0; }
|
g = 0,
|
||||||
else if (h < 120) { r = x; g = c; b = 0; }
|
b = 0;
|
||||||
else if (h < 180) { r = 0; g = c; b = x; }
|
if (h < 60) {
|
||||||
else if (h < 240) { r = 0; g = x; b = c; }
|
r = c;
|
||||||
else if (h < 300) { r = x; g = 0; b = c; }
|
g = x;
|
||||||
else { r = c; g = 0; b = x; }
|
b = 0;
|
||||||
const toHex = (n: number) => Math.round((n + m) * 255).toString(16).padStart(2, '0');
|
} else if (h < 120) {
|
||||||
|
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();
|
return `#${toHex(r)}${toHex(g)}${toHex(b)}`.toUpperCase();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,35 +108,49 @@ export default function ColorWheel({ color, onChange }: ColorWheelProps) {
|
|||||||
setValue(1 - distance / radius);
|
setValue(1 - distance / radius);
|
||||||
};
|
};
|
||||||
|
|
||||||
const wheelPanResponder = React.useMemo(() => PanResponder.create({
|
const wheelPanResponder = React.useMemo(
|
||||||
|
() =>
|
||||||
|
PanResponder.create({
|
||||||
onStartShouldSetPanResponder: () => true,
|
onStartShouldSetPanResponder: () => true,
|
||||||
onMoveShouldSetPanResponder: () => true,
|
onMoveShouldSetPanResponder: () => true,
|
||||||
onPanResponderGrant: (event) => {
|
onPanResponderGrant: event => {
|
||||||
updateFromWheel(event.nativeEvent.locationX, event.nativeEvent.locationY);
|
updateFromWheel(event.nativeEvent.locationX, event.nativeEvent.locationY);
|
||||||
},
|
},
|
||||||
onPanResponderMove: (event) => {
|
onPanResponderMove: event => {
|
||||||
updateFromWheel(event.nativeEvent.locationX, event.nativeEvent.locationY);
|
updateFromWheel(event.nativeEvent.locationX, event.nativeEvent.locationY);
|
||||||
},
|
},
|
||||||
}), []);
|
}),
|
||||||
|
[]
|
||||||
|
);
|
||||||
|
|
||||||
const setHueFromLocation = (locationX: number) => {
|
const setHueFromLocation = (locationX: number) => {
|
||||||
setHue(Math.min(360, Math.max(0, (locationX / WHEEL_SIZE) * 360)));
|
setHue(Math.min(360, Math.max(0, (locationX / WHEEL_SIZE) * 360)));
|
||||||
};
|
};
|
||||||
|
|
||||||
const huePanResponder = React.useMemo(() => PanResponder.create({
|
const huePanResponder = React.useMemo(
|
||||||
|
() =>
|
||||||
|
PanResponder.create({
|
||||||
onStartShouldSetPanResponder: () => true,
|
onStartShouldSetPanResponder: () => true,
|
||||||
onMoveShouldSetPanResponder: () => true,
|
onMoveShouldSetPanResponder: () => true,
|
||||||
onPanResponderGrant: (event) => {
|
onPanResponderGrant: event => {
|
||||||
setHueFromLocation(event.nativeEvent.locationX);
|
setHueFromLocation(event.nativeEvent.locationX);
|
||||||
},
|
},
|
||||||
onPanResponderMove: (event) => {
|
onPanResponderMove: event => {
|
||||||
setHueFromLocation(event.nativeEvent.locationX);
|
setHueFromLocation(event.nativeEvent.locationX);
|
||||||
},
|
},
|
||||||
}), []);
|
}),
|
||||||
|
[]
|
||||||
|
);
|
||||||
|
|
||||||
const thumbX = ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.cos((hue - 180) * Math.PI / 180) + (WHEEL_SIZE / 2) - (THUMB_SIZE / 2);
|
const thumbX =
|
||||||
const thumbY = ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.sin((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 hueThumbX = (hue / 360) * WHEEL_SIZE - (THUMB_SIZE / 2);
|
WHEEL_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 (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
@@ -180,7 +218,9 @@ export default function ColorWheel({ color, onChange }: ColorWheelProps) {
|
|||||||
|
|
||||||
<View style={styles.previewContainer}>
|
<View style={styles.previewContainer}>
|
||||||
<View style={[styles.preview, { backgroundColor: hsvToHex(hue, saturation, value) }]} />
|
<View style={[styles.preview, { backgroundColor: hsvToHex(hue, saturation, value) }]} />
|
||||||
<RNText style={[styles.previewText, { color: theme.text }]}>{hsvToHex(hue, saturation, value)}</RNText>
|
<RNText style={[styles.previewText, { color: theme.text }]}>
|
||||||
|
{hsvToHex(hue, saturation, value)}
|
||||||
|
</RNText>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -32,14 +32,38 @@ function hsvToHex(h: number, s: number, v: number) {
|
|||||||
const c = v * s;
|
const c = v * s;
|
||||||
const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
|
const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
|
||||||
const m = v - c;
|
const m = v - c;
|
||||||
let r = 0, g = 0, b = 0;
|
let r = 0,
|
||||||
if (h < 60) { r = c; g = x; b = 0; }
|
g = 0,
|
||||||
else if (h < 120) { r = x; g = c; b = 0; }
|
b = 0;
|
||||||
else if (h < 180) { r = 0; g = c; b = x; }
|
if (h < 60) {
|
||||||
else if (h < 240) { r = 0; g = x; b = c; }
|
r = c;
|
||||||
else if (h < 300) { r = x; g = 0; b = c; }
|
g = x;
|
||||||
else { r = c; g = 0; b = x; }
|
b = 0;
|
||||||
const toHex = (n: number) => Math.round((n + m) * 255).toString(16).padStart(2, '0');
|
} else if (h < 120) {
|
||||||
|
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();
|
return `#${toHex(r)}${toHex(g)}${toHex(b)}`.toUpperCase();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,15 +132,25 @@ export default function ColorWheel({ color, onChange }: ColorWheelProps) {
|
|||||||
handleMove(e.nativeEvent);
|
handleMove(e.nativeEvent);
|
||||||
};
|
};
|
||||||
|
|
||||||
const thumbX = ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.cos((hue - 180) * Math.PI / 180) + (WHEEL_SIZE / 2) - (THUMB_SIZE / 2);
|
const thumbX =
|
||||||
const thumbY = ((WHEEL_SIZE - THUMB_SIZE) / 2) * saturation * Math.sin((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 hueThumbX = (hue / 360) * WHEEL_SIZE - (THUMB_SIZE / 2);
|
WHEEL_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);
|
const currentColor = hsvToHex(hue, saturation, value);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<View style={styles.wheelContainer}>
|
<View style={styles.wheelContainer}>
|
||||||
<Svg width={WHEEL_SIZE} height={WHEEL_SIZE} {...({ onMouseDown: handleWheelMouseDown } as object)}>
|
<Svg
|
||||||
|
width={WHEEL_SIZE}
|
||||||
|
height={WHEEL_SIZE}
|
||||||
|
{...({ onMouseDown: handleWheelMouseDown } as object)}
|
||||||
|
>
|
||||||
<DefsElement>
|
<DefsElement>
|
||||||
<LinearGradient id="satGradient" x1="0%" y1="0%" x2="100%" y2="0%">
|
<LinearGradient id="satGradient" x1="0%" y1="0%" x2="100%" y2="0%">
|
||||||
<Stop offset="0%" stopColor={`hsl(${hue}, 100%, 50%)`} stopOpacity={1} />
|
<Stop offset="0%" stopColor={`hsl(${hue}, 100%, 50%)`} stopOpacity={1} />
|
||||||
|
|||||||
@@ -109,7 +109,11 @@ export default function WebDateTimeInput({
|
|||||||
>
|
>
|
||||||
<Text style={[styles.clearButtonText, { color: mutedColor }]}>Clear</Text>
|
<Text style={[styles.clearButtonText, { color: mutedColor }]}>Clear</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
<TouchableOpacity style={[styles.doneButton, { backgroundColor: theme.accent }]} onPress={onDismiss} activeOpacity={0.8}>
|
<TouchableOpacity
|
||||||
|
style={[styles.doneButton, { backgroundColor: theme.accent }]}
|
||||||
|
onPress={onDismiss}
|
||||||
|
activeOpacity={0.8}
|
||||||
|
>
|
||||||
<Text style={[styles.doneButtonText, { color: theme.accentText }]}>Done</Text>
|
<Text style={[styles.doneButtonText, { color: theme.accentText }]}>Done</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
@@ -49,14 +49,30 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
|
|||||||
styles.pickerButton,
|
styles.pickerButton,
|
||||||
{ backgroundColor: theme.inputBg, borderColor: theme.borderStrong },
|
{ backgroundColor: theme.inputBg, borderColor: theme.borderStrong },
|
||||||
field.value && { borderColor: theme.accent, backgroundColor: theme.accentSoft },
|
field.value && { borderColor: theme.accent, backgroundColor: theme.accentSoft },
|
||||||
fieldName === 'endTime' && endTimeInvalid && { borderColor: theme.dangerStrong, backgroundColor: theme.accentSoft },
|
fieldName === 'endTime' &&
|
||||||
|
endTimeInvalid && {
|
||||||
|
borderColor: theme.dangerStrong,
|
||||||
|
backgroundColor: theme.accentSoft,
|
||||||
|
},
|
||||||
]}
|
]}
|
||||||
onPress={onPress}
|
onPress={onPress}
|
||||||
activeOpacity={0.8}
|
activeOpacity={0.8}
|
||||||
>
|
>
|
||||||
<Svg width={20} height={20} viewBox="0 0 24 24">
|
<Svg width={20} height={20} viewBox="0 0 24 24">
|
||||||
<Circle cx={12} cy={12} r={10} stroke={field.value ? theme.accent : theme.textFaint} strokeWidth={1.8} fill="none" />
|
<Circle
|
||||||
<Path d="M12 6v6l4 2" stroke={field.value ? theme.accent : theme.textFaint} strokeWidth={1.8} strokeLinecap="round" />
|
cx={12}
|
||||||
|
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>
|
</Svg>
|
||||||
<Text
|
<Text
|
||||||
style={[
|
style={[
|
||||||
@@ -82,7 +98,12 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
|
|||||||
hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
|
hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
|
||||||
>
|
>
|
||||||
<Svg width={14} height={14} viewBox="0 0 24 24">
|
<Svg width={14} height={14} viewBox="0 0 24 24">
|
||||||
<Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.2} strokeLinecap="round" />
|
<Path
|
||||||
|
d="M18 6L6 18M6 6l12 12"
|
||||||
|
stroke={theme.textSecondary}
|
||||||
|
strokeWidth={2.2}
|
||||||
|
strokeLinecap="round"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
) : null}
|
) : null}
|
||||||
@@ -142,7 +163,12 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
|
|||||||
hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
|
hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
|
||||||
>
|
>
|
||||||
<Svg width={14} height={14} viewBox="0 0 24 24">
|
<Svg width={14} height={14} viewBox="0 0 24 24">
|
||||||
<Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.2} strokeLinecap="round" />
|
<Path
|
||||||
|
d="M18 6L6 18M6 6l12 12"
|
||||||
|
stroke={theme.textSecondary}
|
||||||
|
strokeWidth={2.2}
|
||||||
|
strokeLinecap="round"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
) : null}
|
) : null}
|
||||||
@@ -151,7 +177,10 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.calendarButton, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong }]}
|
style={[
|
||||||
|
styles.calendarButton,
|
||||||
|
{ backgroundColor: theme.inputBg, borderColor: theme.borderStrong },
|
||||||
|
]}
|
||||||
onPress={() => setPicker('date')}
|
onPress={() => setPicker('date')}
|
||||||
activeOpacity={0.8}
|
activeOpacity={0.8}
|
||||||
accessibilityLabel="Open calendar"
|
accessibilityLabel="Open calendar"
|
||||||
@@ -184,7 +213,7 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
|
|||||||
thumbColor={field.value ? theme.accent : theme.textMuted}
|
thumbColor={field.value ? theme.accent : theme.textMuted}
|
||||||
ios_backgroundColor={theme.border}
|
ios_backgroundColor={theme.border}
|
||||||
value={field.value ?? false}
|
value={field.value ?? false}
|
||||||
onValueChange={(value) => {
|
onValueChange={value => {
|
||||||
field.onChange(value);
|
field.onChange(value);
|
||||||
if (value) {
|
if (value) {
|
||||||
timeRef.current?.('');
|
timeRef.current?.('');
|
||||||
@@ -203,10 +232,27 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
|
|||||||
</View>
|
</View>
|
||||||
|
|
||||||
{endTimeInvalid && (
|
{endTimeInvalid && (
|
||||||
<View style={[styles.warningRow, { backgroundColor: theme.accentSoft, borderColor: theme.dangerStrong }]}>
|
<View
|
||||||
|
style={[
|
||||||
|
styles.warningRow,
|
||||||
|
{ backgroundColor: theme.accentSoft, borderColor: theme.dangerStrong },
|
||||||
|
]}
|
||||||
|
>
|
||||||
<Svg width={14} height={14} viewBox="0 0 24 24">
|
<Svg width={14} height={14} viewBox="0 0 24 24">
|
||||||
<Circle cx={12} cy={12} r={10} stroke={theme.dangerStrong} strokeWidth={1.8} fill="none" />
|
<Circle
|
||||||
<Path d="M12 8v5M12 16.5v.5" stroke={theme.dangerStrong} strokeWidth={1.8} strokeLinecap="round" />
|
cx={12}
|
||||||
|
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>
|
</Svg>
|
||||||
<Text style={[styles.warningText, { color: theme.dangerStrong }]}>
|
<Text style={[styles.warningText, { color: theme.dangerStrong }]}>
|
||||||
{endTime === startTime
|
{endTime === startTime
|
||||||
@@ -235,12 +281,8 @@ export function DateTimePickerComponent({ control }: DateTimePickerComponentProp
|
|||||||
<WheelTimePicker
|
<WheelTimePicker
|
||||||
visible={picker === 'time' || picker === 'endTime'}
|
visible={picker === 'time' || picker === 'endTime'}
|
||||||
title={picker === 'endTime' ? 'End Time' : 'Start Time'}
|
title={picker === 'endTime' ? 'End Time' : 'Start Time'}
|
||||||
initialTime={
|
initialTime={picker === 'endTime' ? endTime || startTime : startTime}
|
||||||
picker === 'endTime'
|
onConfirm={time => {
|
||||||
? endTime || startTime
|
|
||||||
: startTime
|
|
||||||
}
|
|
||||||
onConfirm={(time) => {
|
|
||||||
if (picker === 'endTime') {
|
if (picker === 'endTime') {
|
||||||
setEndTimeValue(time);
|
setEndTimeValue(time);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -36,7 +36,8 @@ export function DescriptionInput({ error, ...props }: DescriptionInputProps) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const createStyles = (theme: ThemeColors) => StyleSheet.create({
|
const createStyles = (theme: ThemeColors) =>
|
||||||
|
StyleSheet.create({
|
||||||
container: {
|
container: {
|
||||||
gap: 5,
|
gap: 5,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -47,12 +47,7 @@ export function FloatingActionButton() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Animated.View
|
<Animated.View style={[styles.container, { transform: [{ scale: scaleAnim }] }]}>
|
||||||
style={[
|
|
||||||
styles.container,
|
|
||||||
{ transform: [{ scale: scaleAnim }] },
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.button, { backgroundColor: theme.accent, shadowColor: theme.accent }]}
|
style={[styles.button, { backgroundColor: theme.accent, shadowColor: theme.accent }]}
|
||||||
onPress={handlePress}
|
onPress={handlePress}
|
||||||
|
|||||||
@@ -44,13 +44,17 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
|
|||||||
const result = await forgotPassword(username.trim());
|
const result = await forgotPassword(username.trim());
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
if (result.resetToken) {
|
if (result.resetToken) {
|
||||||
Alert.alert('Reset Token (Dev Mode)', `Your reset token is: ${result.resetToken}\n\nEnter this token on the next screen.`, [
|
Alert.alert(
|
||||||
{ text: 'OK', onPress: () => setStep('enterResetCode') },
|
'Reset Token (Dev Mode)',
|
||||||
]);
|
`Your reset token is: ${result.resetToken}\n\nEnter this token on the next screen.`,
|
||||||
|
[{ text: 'OK', onPress: () => setStep('enterResetCode') }]
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
Alert.alert('Reset Email Sent', 'If the account exists, a password reset link has been sent.', [
|
Alert.alert(
|
||||||
{ text: 'OK', onPress: () => setStep('enterResetCode') },
|
'Reset Email Sent',
|
||||||
]);
|
'If the account exists, a password reset link has been sent.',
|
||||||
|
[{ text: 'OK', onPress: () => setStep('enterResetCode') }]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
setError('Failed to request password reset');
|
setError('Failed to request password reset');
|
||||||
@@ -112,7 +116,10 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
|
|||||||
Enter your username to receive a password reset link.
|
Enter your username to receive a password reset link.
|
||||||
</Text>
|
</Text>
|
||||||
<TextInput
|
<TextInput
|
||||||
style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
|
style={[
|
||||||
|
styles.input,
|
||||||
|
{ backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
|
||||||
|
]}
|
||||||
placeholder="Username"
|
placeholder="Username"
|
||||||
placeholderTextColor={theme.textMuted}
|
placeholderTextColor={theme.textMuted}
|
||||||
value={username}
|
value={username}
|
||||||
@@ -130,7 +137,9 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
|
|||||||
{busy ? (
|
{busy ? (
|
||||||
<ActivityIndicator color={theme.accentText} />
|
<ActivityIndicator color={theme.accentText} />
|
||||||
) : (
|
) : (
|
||||||
<Text style={[styles.primaryButtonText, { color: theme.accentText }]}>Send Reset Link</Text>
|
<Text style={[styles.primaryButtonText, { color: theme.accentText }]}>
|
||||||
|
Send Reset Link
|
||||||
|
</Text>
|
||||||
)}
|
)}
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
@@ -142,7 +151,10 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
|
|||||||
Enter the reset token and your new password.
|
Enter the reset token and your new password.
|
||||||
</Text>
|
</Text>
|
||||||
<TextInput
|
<TextInput
|
||||||
style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
|
style={[
|
||||||
|
styles.input,
|
||||||
|
{ backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
|
||||||
|
]}
|
||||||
placeholder="Reset Token"
|
placeholder="Reset Token"
|
||||||
placeholderTextColor={theme.textMuted}
|
placeholderTextColor={theme.textMuted}
|
||||||
value={resetToken}
|
value={resetToken}
|
||||||
@@ -151,7 +163,10 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
|
|||||||
autoCorrect={false}
|
autoCorrect={false}
|
||||||
/>
|
/>
|
||||||
<TextInput
|
<TextInput
|
||||||
style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
|
style={[
|
||||||
|
styles.input,
|
||||||
|
{ backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
|
||||||
|
]}
|
||||||
placeholder="New Password (min 8 chars)"
|
placeholder="New Password (min 8 chars)"
|
||||||
placeholderTextColor={theme.textMuted}
|
placeholderTextColor={theme.textMuted}
|
||||||
value={newPassword}
|
value={newPassword}
|
||||||
@@ -159,7 +174,10 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
|
|||||||
secureTextEntry
|
secureTextEntry
|
||||||
/>
|
/>
|
||||||
<TextInput
|
<TextInput
|
||||||
style={[styles.input, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
|
style={[
|
||||||
|
styles.input,
|
||||||
|
{ backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text },
|
||||||
|
]}
|
||||||
placeholder="Confirm New Password"
|
placeholder="Confirm New Password"
|
||||||
placeholderTextColor={theme.textMuted}
|
placeholderTextColor={theme.textMuted}
|
||||||
value={confirmPassword}
|
value={confirmPassword}
|
||||||
@@ -176,7 +194,9 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
|
|||||||
{busy ? (
|
{busy ? (
|
||||||
<ActivityIndicator color={theme.accentText} />
|
<ActivityIndicator color={theme.accentText} />
|
||||||
) : (
|
) : (
|
||||||
<Text style={[styles.primaryButtonText, { color: theme.accentText }]}>Reset Password</Text>
|
<Text style={[styles.primaryButtonText, { color: theme.accentText }]}>
|
||||||
|
Reset Password
|
||||||
|
</Text>
|
||||||
)}
|
)}
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
@@ -184,10 +204,7 @@ export function ForgotPasswordModal({ visible, onClose }: ForgotPasswordModalPro
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal visible={visible} transparent animationType="fade" onRequestClose={handleBack}>
|
<Modal visible={visible} transparent animationType="fade" onRequestClose={handleBack}>
|
||||||
<KeyboardAvoidingView
|
<KeyboardAvoidingView style={styles.overlay} behavior="padding">
|
||||||
style={styles.overlay}
|
|
||||||
behavior="padding"
|
|
||||||
>
|
|
||||||
<TouchableOpacity style={styles.backdrop} activeOpacity={1} onPress={handleBack} />
|
<TouchableOpacity style={styles.backdrop} activeOpacity={1} onPress={handleBack} />
|
||||||
<View style={[styles.sheet, { backgroundColor: theme.sheetBg }]}>
|
<View style={[styles.sheet, { backgroundColor: theme.sheetBg }]}>
|
||||||
<View style={[styles.handle, { backgroundColor: theme.borderStrong }]} />
|
<View style={[styles.handle, { backgroundColor: theme.borderStrong }]} />
|
||||||
|
|||||||
@@ -13,7 +13,10 @@ interface FormButtonsProps {
|
|||||||
export function FormButtons({ onSubmit, submitLabel = 'Submit' }: FormButtonsProps) {
|
export function FormButtons({ onSubmit, submitLabel = 'Submit' }: FormButtonsProps) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { theme } = useSettings();
|
const { theme } = useSettings();
|
||||||
const { handleSubmit, formState: { isSubmitting } } = useFormContext();
|
const {
|
||||||
|
handleSubmit,
|
||||||
|
formState: { isSubmitting },
|
||||||
|
} = useFormContext();
|
||||||
const insets = useSafeAreaInsets();
|
const insets = useSafeAreaInsets();
|
||||||
|
|
||||||
const cancel = () => {
|
const cancel = () => {
|
||||||
@@ -25,9 +28,21 @@ export function FormButtons({ onSubmit, submitLabel = 'Submit' }: FormButtonsPro
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[styles.container, { backgroundColor: theme.background, borderTopColor: theme.border, paddingBottom: insets.bottom + 12 }]}>
|
<View
|
||||||
|
style={[
|
||||||
|
styles.container,
|
||||||
|
{
|
||||||
|
backgroundColor: theme.background,
|
||||||
|
borderTopColor: theme.border,
|
||||||
|
paddingBottom: insets.bottom + 12,
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.cancelButton, { borderColor: theme.borderStrong, backgroundColor: theme.card }]}
|
style={[
|
||||||
|
styles.cancelButton,
|
||||||
|
{ borderColor: theme.borderStrong, backgroundColor: theme.card },
|
||||||
|
]}
|
||||||
onPress={cancel}
|
onPress={cancel}
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
activeOpacity={0.7}
|
activeOpacity={0.7}
|
||||||
@@ -38,7 +53,11 @@ export function FormButtons({ onSubmit, submitLabel = 'Submit' }: FormButtonsPro
|
|||||||
<Text style={[styles.cancelButtonText, { color: theme.textSecondary }]}>Cancel</Text>
|
<Text style={[styles.cancelButtonText, { color: theme.textSecondary }]}>Cancel</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.submitButton, { backgroundColor: theme.accent }, isSubmitting && styles.buttonDisabled]}
|
style={[
|
||||||
|
styles.submitButton,
|
||||||
|
{ backgroundColor: theme.accent },
|
||||||
|
isSubmitting && styles.buttonDisabled,
|
||||||
|
]}
|
||||||
onPress={handleSubmit(onSubmit)}
|
onPress={handleSubmit(onSubmit)}
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
activeOpacity={0.8}
|
activeOpacity={0.8}
|
||||||
|
|||||||
@@ -21,11 +21,23 @@ interface FriendsModalProps {
|
|||||||
|
|
||||||
export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
||||||
const { theme } = useSettings();
|
const { theme } = useSettings();
|
||||||
const { friends, incoming, outgoing, loading, sendRequest, acceptRequest, declineRequest, removeFriend, searchUsers } = useFriends();
|
const {
|
||||||
|
friends,
|
||||||
|
incoming,
|
||||||
|
outgoing,
|
||||||
|
loading,
|
||||||
|
sendRequest,
|
||||||
|
acceptRequest,
|
||||||
|
declineRequest,
|
||||||
|
removeFriend,
|
||||||
|
searchUsers,
|
||||||
|
} = useFriends();
|
||||||
const [searchQuery, setSearchQuery] = useState('');
|
const [searchQuery, setSearchQuery] = useState('');
|
||||||
const [searchResults, setSearchResults] = useState<{ id: string; username: string }[]>([]);
|
const [searchResults, setSearchResults] = useState<{ id: string; username: string }[]>([]);
|
||||||
const [searching, setSearching] = useState(false);
|
const [searching, setSearching] = useState(false);
|
||||||
const [selectedTab, setSelectedTab] = useState<'friends' | 'incoming' | 'outgoing' | 'add'>('friends');
|
const [selectedTab, setSelectedTab] = useState<'friends' | 'incoming' | 'outgoing' | 'add'>(
|
||||||
|
'friends'
|
||||||
|
);
|
||||||
|
|
||||||
const searchKey = `${selectedTab}:${searchQuery}`;
|
const searchKey = `${selectedTab}:${searchQuery}`;
|
||||||
const [prevSearchKey, setPrevSearchKey] = useState(searchKey);
|
const [prevSearchKey, setPrevSearchKey] = useState(searchKey);
|
||||||
@@ -41,7 +53,11 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
setSearching(true);
|
setSearching(true);
|
||||||
try {
|
try {
|
||||||
const results = await searchUsers(searchQuery);
|
const results = await searchUsers(searchQuery);
|
||||||
setSearchResults(results.filter(r => !friends.some(f => f.id === r.id) && !outgoing.some(o => o.id === r.id)));
|
setSearchResults(
|
||||||
|
results.filter(
|
||||||
|
r => !friends.some(f => f.id === r.id) && !outgoing.some(o => o.id === r.id)
|
||||||
|
)
|
||||||
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Search failed:', err);
|
console.error('Search failed:', err);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -71,13 +87,17 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
const handleRemove = async (friendId: string) => {
|
const handleRemove = async (friendId: string) => {
|
||||||
Alert.alert('Remove Friend', 'Are you sure you want to remove this friend?', [
|
Alert.alert('Remove Friend', 'Are you sure you want to remove this friend?', [
|
||||||
{ text: 'Cancel', style: 'cancel' },
|
{ text: 'Cancel', style: 'cancel' },
|
||||||
{ text: 'Remove', style: 'destructive', onPress: async () => {
|
{
|
||||||
|
text: 'Remove',
|
||||||
|
style: 'destructive',
|
||||||
|
onPress: async () => {
|
||||||
try {
|
try {
|
||||||
await removeFriend(friendId);
|
await removeFriend(friendId);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
Alert.alert('Error', err instanceof Error ? err.message : 'Failed to remove friend');
|
Alert.alert('Error', err instanceof Error ? err.message : 'Failed to remove friend');
|
||||||
}
|
}
|
||||||
}},
|
},
|
||||||
|
},
|
||||||
]);
|
]);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -98,7 +118,7 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
</View>
|
</View>
|
||||||
|
|
||||||
<View style={styles.tabs}>
|
<View style={styles.tabs}>
|
||||||
{(['friends', 'incoming', 'outgoing', 'add'] as const).map((tab) => (
|
{(['friends', 'incoming', 'outgoing', 'add'] as const).map(tab => (
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
key={tab}
|
key={tab}
|
||||||
style={[
|
style={[
|
||||||
@@ -116,10 +136,14 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
>
|
>
|
||||||
{tab.charAt(0).toUpperCase() + tab.slice(1)}
|
{tab.charAt(0).toUpperCase() + tab.slice(1)}
|
||||||
{tab === 'friends' && friends.length > 0 && (
|
{tab === 'friends' && friends.length > 0 && (
|
||||||
<Text style={[styles.badge, { color: theme.accentText }]}>{friends.length}</Text>
|
<Text style={[styles.badge, { color: theme.accentText }]}>
|
||||||
|
{friends.length}
|
||||||
|
</Text>
|
||||||
)}
|
)}
|
||||||
{tab === 'incoming' && incoming.length > 0 && (
|
{tab === 'incoming' && incoming.length > 0 && (
|
||||||
<Text style={[styles.badge, { color: theme.accentText }]}>{incoming.length}</Text>
|
<Text style={[styles.badge, { color: theme.accentText }]}>
|
||||||
|
{incoming.length}
|
||||||
|
</Text>
|
||||||
)}
|
)}
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
@@ -135,7 +159,9 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
) : friends.length === 0 ? (
|
) : friends.length === 0 ? (
|
||||||
<View style={styles.empty}>
|
<View style={styles.empty}>
|
||||||
<Text style={[styles.emptyText, { color: theme.textMuted }]}>No friends yet</Text>
|
<Text style={[styles.emptyText, { color: theme.textMuted }]}>No friends yet</Text>
|
||||||
<Text style={[styles.emptyHint, { color: theme.textFaint }]}>{'Tap "Add" to find friends by username'}</Text>
|
<Text style={[styles.emptyHint, { color: theme.textFaint }]}>
|
||||||
|
{'Tap "Add" to find friends by username'}
|
||||||
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
) : (
|
) : (
|
||||||
<FlatList
|
<FlatList
|
||||||
@@ -143,12 +169,19 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
keyExtractor={f => f.id}
|
keyExtractor={f => f.id}
|
||||||
renderItem={({ item }) => (
|
renderItem={({ item }) => (
|
||||||
<View style={[styles.friendRow, { borderBottomColor: theme.border }]}>
|
<View style={[styles.friendRow, { borderBottomColor: theme.border }]}>
|
||||||
<Text style={[styles.friendName, { color: theme.text }]}>{item.username}</Text>
|
<Text style={[styles.friendName, { color: theme.text }]}>
|
||||||
|
{item.username}
|
||||||
|
</Text>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.removeBtn, { backgroundColor: theme.accentSoft, borderColor: theme.accent }]}
|
style={[
|
||||||
|
styles.removeBtn,
|
||||||
|
{ backgroundColor: theme.accentSoft, borderColor: theme.accent },
|
||||||
|
]}
|
||||||
onPress={() => handleRemove(item.id)}
|
onPress={() => handleRemove(item.id)}
|
||||||
>
|
>
|
||||||
<Text style={[styles.removeBtnText, { color: theme.accentStrong }]}>Remove</Text>
|
<Text style={[styles.removeBtnText, { color: theme.accentStrong }]}>
|
||||||
|
Remove
|
||||||
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
@@ -165,7 +198,9 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
</View>
|
</View>
|
||||||
) : incoming.length === 0 ? (
|
) : incoming.length === 0 ? (
|
||||||
<View style={styles.empty}>
|
<View style={styles.empty}>
|
||||||
<Text style={[styles.emptyText, { color: theme.textMuted }]}>No incoming requests</Text>
|
<Text style={[styles.emptyText, { color: theme.textMuted }]}>
|
||||||
|
No incoming requests
|
||||||
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
) : (
|
) : (
|
||||||
<FlatList
|
<FlatList
|
||||||
@@ -173,19 +208,32 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
keyExtractor={r => r.requestId}
|
keyExtractor={r => r.requestId}
|
||||||
renderItem={({ item }) => (
|
renderItem={({ item }) => (
|
||||||
<View style={[styles.requestRow, { borderBottomColor: theme.border }]}>
|
<View style={[styles.requestRow, { borderBottomColor: theme.border }]}>
|
||||||
<Text style={[styles.friendName, { color: theme.text }]}>{item.username}</Text>
|
<Text style={[styles.friendName, { color: theme.text }]}>
|
||||||
|
{item.username}
|
||||||
|
</Text>
|
||||||
<View style={styles.requestActions}>
|
<View style={styles.requestActions}>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.actionBtn, { backgroundColor: theme.accent }]}
|
style={[styles.actionBtn, { backgroundColor: theme.accent }]}
|
||||||
onPress={() => handleAccept(item.requestId)}
|
onPress={() => handleAccept(item.requestId)}
|
||||||
>
|
>
|
||||||
<Text style={[styles.actionBtnText, { color: theme.accentText }]}>Accept</Text>
|
<Text style={[styles.actionBtnText, { color: theme.accentText }]}>
|
||||||
|
Accept
|
||||||
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.actionBtn, { backgroundColor: 'transparent', borderColor: theme.borderStrong, borderWidth: 1 }]}
|
style={[
|
||||||
|
styles.actionBtn,
|
||||||
|
{
|
||||||
|
backgroundColor: 'transparent',
|
||||||
|
borderColor: theme.borderStrong,
|
||||||
|
borderWidth: 1,
|
||||||
|
},
|
||||||
|
]}
|
||||||
onPress={() => handleDecline(item.requestId)}
|
onPress={() => handleDecline(item.requestId)}
|
||||||
>
|
>
|
||||||
<Text style={[styles.actionBtnText, { color: theme.textMuted }]}>Decline</Text>
|
<Text style={[styles.actionBtnText, { color: theme.textMuted }]}>
|
||||||
|
Decline
|
||||||
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
@@ -203,7 +251,9 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
</View>
|
</View>
|
||||||
) : outgoing.length === 0 ? (
|
) : outgoing.length === 0 ? (
|
||||||
<View style={styles.empty}>
|
<View style={styles.empty}>
|
||||||
<Text style={[styles.emptyText, { color: theme.textMuted }]}>No outgoing requests</Text>
|
<Text style={[styles.emptyText, { color: theme.textMuted }]}>
|
||||||
|
No outgoing requests
|
||||||
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
) : (
|
) : (
|
||||||
<FlatList
|
<FlatList
|
||||||
@@ -211,13 +261,24 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
keyExtractor={r => r.requestId}
|
keyExtractor={r => r.requestId}
|
||||||
renderItem={({ item }) => (
|
renderItem={({ item }) => (
|
||||||
<View style={[styles.requestRow, { borderBottomColor: theme.border }]}>
|
<View style={[styles.requestRow, { borderBottomColor: theme.border }]}>
|
||||||
<Text style={[styles.friendName, { color: theme.textMuted }]}>{item.username}</Text>
|
<Text style={[styles.friendName, { color: theme.textMuted }]}>
|
||||||
|
{item.username}
|
||||||
|
</Text>
|
||||||
<Text style={[styles.pendingText, { color: theme.textFaint }]}>Pending</Text>
|
<Text style={[styles.pendingText, { color: theme.textFaint }]}>Pending</Text>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.cancelBtn, { backgroundColor: 'transparent', borderColor: theme.borderStrong, borderWidth: 1 }]}
|
style={[
|
||||||
|
styles.cancelBtn,
|
||||||
|
{
|
||||||
|
backgroundColor: 'transparent',
|
||||||
|
borderColor: theme.borderStrong,
|
||||||
|
borderWidth: 1,
|
||||||
|
},
|
||||||
|
]}
|
||||||
onPress={() => handleDecline(item.requestId)}
|
onPress={() => handleDecline(item.requestId)}
|
||||||
>
|
>
|
||||||
<Text style={[styles.cancelBtnText, { color: theme.textMuted }]}>Cancel</Text>
|
<Text style={[styles.cancelBtnText, { color: theme.textMuted }]}>
|
||||||
|
Cancel
|
||||||
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
@@ -230,7 +291,14 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
<View style={styles.content}>
|
<View style={styles.content}>
|
||||||
<View style={styles.searchContainer}>
|
<View style={styles.searchContainer}>
|
||||||
<TextInput
|
<TextInput
|
||||||
style={[styles.searchInput, { backgroundColor: theme.inputBg, borderColor: theme.borderStrong, color: theme.text }]}
|
style={[
|
||||||
|
styles.searchInput,
|
||||||
|
{
|
||||||
|
backgroundColor: theme.inputBg,
|
||||||
|
borderColor: theme.borderStrong,
|
||||||
|
color: theme.text,
|
||||||
|
},
|
||||||
|
]}
|
||||||
placeholder="Search by username"
|
placeholder="Search by username"
|
||||||
placeholderTextColor={theme.textMuted}
|
placeholderTextColor={theme.textMuted}
|
||||||
value={searchQuery}
|
value={searchQuery}
|
||||||
@@ -253,16 +321,24 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
keyExtractor={u => u.id}
|
keyExtractor={u => u.id}
|
||||||
renderItem={({ item }) => (
|
renderItem={({ item }) => (
|
||||||
<View style={[styles.friendRow, { borderBottomColor: theme.border }]}>
|
<View style={[styles.friendRow, { borderBottomColor: theme.border }]}>
|
||||||
<Text style={[styles.friendName, { color: theme.text }]}>{item.username}</Text>
|
<Text style={[styles.friendName, { color: theme.text }]}>
|
||||||
|
{item.username}
|
||||||
|
</Text>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.addBtn, { backgroundColor: theme.accent }]}
|
style={[styles.addBtn, { backgroundColor: theme.accent }]}
|
||||||
onPress={() => sendRequest(item.username)
|
onPress={() =>
|
||||||
|
sendRequest(item.username)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
setSearchQuery('');
|
setSearchQuery('');
|
||||||
setSearchResults([]);
|
setSearchResults([]);
|
||||||
setSelectedTab('friends');
|
setSelectedTab('friends');
|
||||||
})
|
})
|
||||||
.catch(err => Alert.alert('Error', err instanceof Error ? err.message : 'Failed to send request'))
|
.catch(err =>
|
||||||
|
Alert.alert(
|
||||||
|
'Error',
|
||||||
|
err instanceof Error ? err.message : 'Failed to send request'
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Text style={[styles.addBtnText, { color: theme.accentText }]}>Add</Text>
|
<Text style={[styles.addBtnText, { color: theme.accentText }]}>Add</Text>
|
||||||
@@ -272,7 +348,9 @@ export function FriendsModal({ visible, onClose }: FriendsModalProps) {
|
|||||||
/>
|
/>
|
||||||
) : searchQuery.length < 2 ? (
|
) : searchQuery.length < 2 ? (
|
||||||
<View style={styles.empty}>
|
<View style={styles.empty}>
|
||||||
<Text style={[styles.emptyHint, { color: theme.textFaint }]}>Type at least 2 characters to search</Text>
|
<Text style={[styles.emptyHint, { color: theme.textFaint }]}>
|
||||||
|
Type at least 2 characters to search
|
||||||
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
@@ -20,7 +20,9 @@ export function Header({ title, showLogo, rightAction }: HeaderProps) {
|
|||||||
<Text style={[styles.logoText, { color: theme.accentText }]}>✓</Text>
|
<Text style={[styles.logoText, { color: theme.accentText }]}>✓</Text>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
<Text style={[styles.title, { color: theme.text }]} accessibilityRole="header">{title}</Text>
|
<Text style={[styles.title, { color: theme.text }]} accessibilityRole="header">
|
||||||
|
{title}
|
||||||
|
</Text>
|
||||||
<View style={styles.spacer}>{rightAction}</View>
|
<View style={styles.spacer}>{rightAction}</View>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
@@ -136,7 +136,12 @@ export function LegalModal({ visible, type, onClose }: LegalModalProps) {
|
|||||||
<Text style={[styles.title, { color: theme.text }]}>{title}</Text>
|
<Text style={[styles.title, { color: theme.text }]}>{title}</Text>
|
||||||
<TouchableOpacity onPress={onClose} style={styles.closeButton} activeOpacity={0.7}>
|
<TouchableOpacity onPress={onClose} style={styles.closeButton} activeOpacity={0.7}>
|
||||||
<Svg width={24} height={24} viewBox="0 0 24 24">
|
<Svg width={24} height={24} viewBox="0 0 24 24">
|
||||||
<Path d="M18 6L6 18M6 6l12 12" stroke={theme.textSecondary} strokeWidth={2.2} strokeLinecap="round" />
|
<Path
|
||||||
|
d="M18 6L6 18M6 6l12 12"
|
||||||
|
stroke={theme.textSecondary}
|
||||||
|
strokeWidth={2.2}
|
||||||
|
strokeLinecap="round"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
|
|
||||||
import { useSettings } from '@/theme';
|
|
||||||
import Svg, { Path } from 'react-native-svg';
|
|
||||||
|
|
||||||
interface ListItemProps {
|
|
||||||
title: string;
|
|
||||||
subtitle?: string;
|
|
||||||
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
|
|
||||||
style={[
|
|
||||||
styles.container,
|
|
||||||
{ 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.rightContent}>
|
|
||||||
{rightElement}
|
|
||||||
{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>
|
|
||||||
</TouchableOpacity>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
|
||||||
container: {
|
|
||||||
flexDirection: 'row',
|
|
||||||
alignItems: 'center',
|
|
||||||
justifyContent: 'space-between',
|
|
||||||
paddingVertical: 14,
|
|
||||||
paddingHorizontal: 16,
|
|
||||||
borderRadius: 12,
|
|
||||||
borderWidth: 1,
|
|
||||||
marginBottom: 8,
|
|
||||||
},
|
|
||||||
interactive: {},
|
|
||||||
leftElement: {
|
|
||||||
marginRight: 12,
|
|
||||||
},
|
|
||||||
leftContent: {
|
|
||||||
flex: 1,
|
|
||||||
gap: 2,
|
|
||||||
},
|
|
||||||
title: {
|
|
||||||
fontSize: 16,
|
|
||||||
fontWeight: '500',
|
|
||||||
},
|
|
||||||
subtitle: {
|
|
||||||
fontSize: 13,
|
|
||||||
},
|
|
||||||
rightContent: {
|
|
||||||
flexDirection: 'row',
|
|
||||||
alignItems: 'center',
|
|
||||||
gap: 12,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
Reference in New Issue
Block a user