Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dab6cb3347 | ||
|
|
f9c3195552 |
@@ -14,7 +14,6 @@ Minimal Getting Things Done app. One Expo/React Native codebase for iPhone, Andr
|
||||
- **Quick add**: the title field parses tokens live — `Pay rent tmr p1 @home #Sydney ~30m monthly` — and mirrors them into the form.
|
||||
- **Repeat**: daily / weekdays / weekly / monthly / yearly; completing spawns the next occurrence (lapsed tasks catch up to today).
|
||||
- **Defer**: deferred tasks are hidden from action lists until their date; a footer link reveals them.
|
||||
- **Weekly review**: overdue, stalled (14d), aging waiting-fors (7d), someday sweep, deferred preview, stuck projects — with one-tap triage per row. Done and Trash (restorable) live at the bottom of Review.
|
||||
- `server/` — Bun API + Dockerfile + compose. Deployed at `~/personal/gtd` on rehbock.xyz, joined to `personal-db_default` + `caddy_net`.
|
||||
|
||||
## Develop
|
||||
|
||||
12
app/app.json
12
app/app.json
@@ -2,13 +2,19 @@
|
||||
"expo": {
|
||||
"name": "GTD",
|
||||
"slug": "gtd",
|
||||
"version": "1.0.0",
|
||||
"version": "1.24",
|
||||
"orientation": "portrait",
|
||||
"icon": "./assets/images/icon.png",
|
||||
"scheme": "gtd",
|
||||
"userInterfaceStyle": "automatic",
|
||||
"ios": {
|
||||
"icon": "./assets/expo.icon"
|
||||
"icon": "./assets/expo.icon",
|
||||
"bundleIdentifier": "xyz.rehbock.gtd",
|
||||
"buildNumber": "24",
|
||||
"supportsTablet": false,
|
||||
"infoPlist": {
|
||||
"ITSAppUsesNonExemptEncryption": false
|
||||
}
|
||||
},
|
||||
"android": {
|
||||
"adaptiveIcon": {
|
||||
@@ -33,7 +39,7 @@
|
||||
"widgets": [
|
||||
{
|
||||
"name": "NextUp",
|
||||
"label": "GTD — Next up",
|
||||
"label": "GTD \u2014 Next up",
|
||||
"description": "Your top three next actions",
|
||||
"minWidth": "250dp",
|
||||
"minHeight": "110dp",
|
||||
|
||||
14
app/eas.json
14
app/eas.json
@@ -9,10 +9,18 @@
|
||||
"buildType": "apk"
|
||||
},
|
||||
"env": {
|
||||
"VERSION_CODE": "23",
|
||||
"VERSION_NAME": "1.23"
|
||||
"VERSION_CODE": "24",
|
||||
"VERSION_NAME": "1.24"
|
||||
},
|
||||
"node": "22.20.0"
|
||||
"node": "22.20.0",
|
||||
"ios": {
|
||||
"autoIncrement": false
|
||||
}
|
||||
}
|
||||
},
|
||||
"submit": {
|
||||
"production": {
|
||||
"ios": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
78
app/src/app/(tabs)/_layout.tsx
Normal file
78
app/src/app/(tabs)/_layout.tsx
Normal file
@@ -0,0 +1,78 @@
|
||||
import { Link, useRouter } from "expo-router";
|
||||
import { Tabs } from "expo-router/js-tabs";
|
||||
import { Pressable, StyleSheet, View } from "react-native";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import AreaToggle from "../../components/AreaToggle";
|
||||
import Icon from "../../components/Icon";
|
||||
import TabBar, { TAB_BAR_CONTENT_HEIGHT, tabBarInset } from "../../components/TabBar";
|
||||
import { haptic } from "../../lib/haptics";
|
||||
import { C, shadow, space } from "../../lib/theme";
|
||||
|
||||
/**
|
||||
* The three top-level screens share one header (the personal/work pill plus
|
||||
* the settings gear) and one capture button. The FAB lives here rather than
|
||||
* on each screen so it never moves: same spot above the bar whichever tab is
|
||||
* open, which is what makes it a reflex.
|
||||
*/
|
||||
export default function TabsLayout() {
|
||||
const router = useRouter();
|
||||
const insets = useSafeAreaInsets();
|
||||
return (
|
||||
<View style={{ flex: 1 }}>
|
||||
<Tabs
|
||||
tabBar={(props) => <TabBar {...props} />}
|
||||
screenOptions={{
|
||||
headerStyle: { backgroundColor: C.bg },
|
||||
headerTintColor: C.text,
|
||||
headerShadowVisible: false,
|
||||
headerTitle: () => <AreaToggle />,
|
||||
headerTitleAlign: "center",
|
||||
headerRight: () => (
|
||||
<Link href="/settings" asChild>
|
||||
<Pressable
|
||||
hitSlop={12}
|
||||
style={({ pressed }) => [{ paddingHorizontal: space.sm }, pressed && { opacity: 0.5 }]}
|
||||
>
|
||||
<Icon name="settings" size={22} color={C.textSecondary} />
|
||||
</Pressable>
|
||||
</Link>
|
||||
),
|
||||
sceneStyle: { backgroundColor: C.bg },
|
||||
}}
|
||||
>
|
||||
<Tabs.Screen name="index" options={{ title: "Next up" }} />
|
||||
<Tabs.Screen name="today" options={{ title: "Today" }} />
|
||||
<Tabs.Screen name="lists" options={{ title: "Lists" }} />
|
||||
</Tabs>
|
||||
|
||||
<Pressable
|
||||
accessibilityLabel="New task"
|
||||
style={({ pressed }) => [
|
||||
s.fab,
|
||||
{ bottom: TAB_BAR_CONTENT_HEIGHT + tabBarInset(insets.bottom) + space.lg },
|
||||
pressed && { transform: [{ scale: 0.94 }] },
|
||||
]}
|
||||
onPress={() => {
|
||||
haptic.tap();
|
||||
router.push("/add");
|
||||
}}
|
||||
>
|
||||
<Icon name="plus" size={26} color={C.onAccent} />
|
||||
</Pressable>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const s = StyleSheet.create({
|
||||
fab: {
|
||||
position: "absolute",
|
||||
right: space.xl,
|
||||
width: 56,
|
||||
height: 56,
|
||||
borderRadius: 28,
|
||||
backgroundColor: C.accent,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
...shadow.fab,
|
||||
},
|
||||
});
|
||||
144
app/src/app/(tabs)/index.tsx
Normal file
144
app/src/app/(tabs)/index.tsx
Normal file
@@ -0,0 +1,144 @@
|
||||
import { useRouter } from "expo-router";
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native";
|
||||
import { NestableDraggableFlatList, NestableScrollContainer, ScaleDecorator } from "react-native-draggable-flatlist";
|
||||
import WebSortableList from "../../components/WebSortableList";
|
||||
import Icon from "../../components/Icon";
|
||||
import TaskRow, { TaskSeparator } from "../../components/TaskRow";
|
||||
import { cardEdges, Empty, Screen, Title } from "../../components/ui";
|
||||
import { haptic } from "../../lib/haptics";
|
||||
import { reorderTask, todayTasks, visibleTasksByStatus } from "../../lib/store";
|
||||
import { C, radius, shadow, space, type } from "../../lib/theme";
|
||||
import { useStore } from "../../lib/useStore";
|
||||
|
||||
const PREVIEW = 3;
|
||||
|
||||
/**
|
||||
* One small pill of status — overdue count, offline, sync trouble. Sits under
|
||||
* the title instead of in its own section, so a bad day costs one line, not a
|
||||
* card, and a good day costs nothing.
|
||||
*/
|
||||
function StatusPill({ tone, text, onPress }: { tone: string; text: string; onPress?: () => void }) {
|
||||
return (
|
||||
<Pressable
|
||||
disabled={!onPress}
|
||||
onPress={onPress}
|
||||
style={({ pressed }) => [s.pill, { backgroundColor: `${tone}14` }, pressed && { opacity: 0.6 }]}
|
||||
>
|
||||
<View style={[s.dot, { backgroundColor: tone }]} />
|
||||
<Text style={[s.pillText, { color: tone }]}>{text}</Text>
|
||||
{!!onPress && <Icon name="chevron" size={12} color={tone} />}
|
||||
</Pressable>
|
||||
);
|
||||
}
|
||||
|
||||
export default function Home() {
|
||||
const router = useRouter();
|
||||
const store = useStore();
|
||||
const next = visibleTasksByStatus(store, "next");
|
||||
const { overdue } = todayTasks(store);
|
||||
const preview = next.slice(0, PREVIEW);
|
||||
const attention = overdue.length > 0 || store.offline || !!store.syncError;
|
||||
|
||||
return (
|
||||
<Screen>
|
||||
<NestableScrollContainer contentContainerStyle={s.content} showsVerticalScrollIndicator={false}>
|
||||
<Title count={next.length}>Next up</Title>
|
||||
|
||||
{attention && (
|
||||
<View style={s.strip}>
|
||||
{overdue.length > 0 && (
|
||||
<StatusPill tone={C.danger} text={`${overdue.length} overdue`} onPress={() => router.push("/today")} />
|
||||
)}
|
||||
{store.offline && (
|
||||
<StatusPill
|
||||
tone={C.textSecondary}
|
||||
text={store.pending > 0 ? `Offline · ${store.pending} queued` : "Offline"}
|
||||
/>
|
||||
)}
|
||||
{!!store.syncError && (
|
||||
<StatusPill tone={C.danger} text="Sync failed" onPress={() => router.push("/settings")} />
|
||||
)}
|
||||
</View>
|
||||
)}
|
||||
|
||||
{preview.length === 0 ? (
|
||||
<Empty>Nothing queued. Add the next thing on your mind.</Empty>
|
||||
) : Platform.OS === "web" ? (
|
||||
<WebSortableList
|
||||
data={preview}
|
||||
onReorder={(id, to) => reorderTask(id, "next", to)}
|
||||
separator={<TaskSeparator />}
|
||||
renderItem={(t, i) => (
|
||||
<View style={cardEdges(i, preview.length)}>
|
||||
<TaskRow task={t} emphasized={i === 0} />
|
||||
</View>
|
||||
)}
|
||||
/>
|
||||
) : (
|
||||
// Draggable so the "do this now" slot is a hand-picked choice, not
|
||||
// just whatever sorted first. Preview indices are next[0..N], so a
|
||||
// drop reorders the real Next list.
|
||||
<NestableDraggableFlatList
|
||||
data={preview}
|
||||
keyExtractor={(t) => t.id}
|
||||
activationDistance={12}
|
||||
onDragBegin={() => haptic.pickup()}
|
||||
onDragEnd={({ data, from, to }) => {
|
||||
if (from !== to) {
|
||||
haptic.success();
|
||||
reorderTask(data[to].id, "next", to);
|
||||
}
|
||||
}}
|
||||
renderItem={({ item, drag, isActive, getIndex }) => {
|
||||
const i = getIndex() ?? 0;
|
||||
return (
|
||||
<ScaleDecorator activeScale={1.02}>
|
||||
<View style={[...cardEdges(i, preview.length), isActive && s.lifted]}>
|
||||
<TaskRow task={item} emphasized={i === 0} onLongPress={drag} />
|
||||
</View>
|
||||
</ScaleDecorator>
|
||||
);
|
||||
}}
|
||||
ItemSeparatorComponent={TaskSeparator}
|
||||
/>
|
||||
)}
|
||||
|
||||
{next.length > PREVIEW && (
|
||||
<Pressable
|
||||
onPress={() => router.push("/list/next")}
|
||||
style={({ pressed }) => [s.viewAll, pressed && { opacity: 0.6 }]}
|
||||
>
|
||||
<Text style={s.viewAllText}>All {next.length} next actions</Text>
|
||||
<Icon name="chevron" size={16} color={C.accent} />
|
||||
</Pressable>
|
||||
)}
|
||||
</NestableScrollContainer>
|
||||
</Screen>
|
||||
);
|
||||
}
|
||||
|
||||
const s = StyleSheet.create({
|
||||
content: { paddingHorizontal: space.lg, paddingBottom: 96 },
|
||||
lifted: { borderRadius: radius.lg, ...shadow.fab },
|
||||
|
||||
strip: { flexDirection: "row", flexWrap: "wrap", gap: space.sm, marginBottom: space.md },
|
||||
pill: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 6,
|
||||
paddingVertical: 5,
|
||||
paddingHorizontal: space.md,
|
||||
borderRadius: radius.pill,
|
||||
},
|
||||
dot: { width: 6, height: 6, borderRadius: 999 },
|
||||
pillText: { ...type.meta, fontWeight: "600" },
|
||||
|
||||
viewAll: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: space.xs,
|
||||
paddingVertical: space.md,
|
||||
paddingHorizontal: space.xs,
|
||||
},
|
||||
viewAllText: { ...type.body, color: C.accent, fontWeight: "500" },
|
||||
});
|
||||
230
app/src/app/(tabs)/lists.tsx
Normal file
230
app/src/app/(tabs)/lists.tsx
Normal file
@@ -0,0 +1,230 @@
|
||||
// The Lists board: four quadrants, one screen.
|
||||
//
|
||||
// Next up, Waiting, Someday and Projects used to be four separate launcher
|
||||
// buttons. Here they share a 2×2 board so the whole open-loop picture fits
|
||||
// in one glance. On a desktop window each quadrant is a full pane with its
|
||||
// own scroll; on a phone each is a card showing the first few rows, and the
|
||||
// quadrant header opens the full list.
|
||||
import { useRouter, type Href } from "expo-router";
|
||||
import { Pressable, ScrollView, StyleSheet, Text, useWindowDimensions, View, type StyleProp, type ViewStyle } from "react-native";
|
||||
import Icon, { type IconName } from "../../components/Icon";
|
||||
import { Card, Separator } from "../../components/ui";
|
||||
import { dueMeta } from "../../lib/dates";
|
||||
import { haptic } from "../../lib/haptics";
|
||||
import { PRIORITY_COLOR } from "../../lib/priority";
|
||||
import { activeProjects, openTaskCount, visibleTasksByStatus } from "../../lib/store";
|
||||
import { C, space, type } from "../../lib/theme";
|
||||
import { completeWithUndo } from "../../lib/undo";
|
||||
import { useStore } from "../../lib/useStore";
|
||||
import type { Project, Task } from "../../lib/types";
|
||||
|
||||
/** Two panes side by side need roughly this much to stay readable. */
|
||||
const WIDE = 720;
|
||||
/** Rows a phone-sized quadrant shows before handing off to the full list. */
|
||||
const PREVIEW = 4;
|
||||
|
||||
function TaskMini({ task, wide }: { task: Task; wide: boolean }) {
|
||||
const router = useRouter();
|
||||
const due = task.due_date ? dueMeta(task.due_date) : null;
|
||||
const dueColor = due?.tone === "overdue" ? C.danger : due?.tone === "today" ? C.warn : C.muted;
|
||||
return (
|
||||
<Pressable
|
||||
style={({ pressed }) => [s.row, pressed && s.rowPressed]}
|
||||
onPress={() => router.push(`/task/${task.id}`)}
|
||||
>
|
||||
<Pressable
|
||||
accessibilityRole="checkbox"
|
||||
accessibilityState={{ checked: false }}
|
||||
style={[s.check, { borderColor: PRIORITY_COLOR[task.priority] }]}
|
||||
hitSlop={10}
|
||||
onPress={() => completeWithUndo(task)}
|
||||
/>
|
||||
<Text style={s.rowTitle} numberOfLines={1}>
|
||||
{task.title}
|
||||
</Text>
|
||||
{/* Phone-width cards can't spare the room; overdue still shows as a dot. */}
|
||||
{due && wide ? (
|
||||
<Text style={[s.rowMeta, { color: dueColor }]}>{due.label}</Text>
|
||||
) : due?.tone === "overdue" ? (
|
||||
<View style={[s.dueDot, { backgroundColor: C.danger }]} />
|
||||
) : null}
|
||||
</Pressable>
|
||||
);
|
||||
}
|
||||
|
||||
function ProjectMini({ project, open }: { project: Project; open: number }) {
|
||||
const router = useRouter();
|
||||
return (
|
||||
<Pressable
|
||||
style={({ pressed }) => [s.row, pressed && s.rowPressed]}
|
||||
onPress={() => router.push(`/project/${project.id}`)}
|
||||
>
|
||||
<View style={s.projectDot} />
|
||||
<Text style={s.rowTitle} numberOfLines={1}>
|
||||
{project.name}
|
||||
</Text>
|
||||
<Text style={s.rowMeta}>{open === 0 ? "" : String(open)}</Text>
|
||||
<Icon name="chevron" size={13} color={C.muted} />
|
||||
</Pressable>
|
||||
);
|
||||
}
|
||||
|
||||
type Pane = {
|
||||
key: string;
|
||||
icon: IconName;
|
||||
title: string;
|
||||
/** Full-screen list the header opens. */
|
||||
href: Href;
|
||||
count: number;
|
||||
empty: string;
|
||||
rows: React.ReactNode[];
|
||||
};
|
||||
|
||||
function Quadrant({ pane, wide, style }: { pane: Pane; wide: boolean; style?: StyleProp<ViewStyle> }) {
|
||||
const router = useRouter();
|
||||
const shown = wide ? pane.rows : pane.rows.slice(0, PREVIEW);
|
||||
const hidden = pane.rows.length - shown.length;
|
||||
const open = () => {
|
||||
haptic.tap();
|
||||
router.push(pane.href);
|
||||
};
|
||||
const body = (
|
||||
<>
|
||||
{shown.length === 0 && <Text style={s.empty}>{pane.empty}</Text>}
|
||||
{shown.map((row, i) => (
|
||||
<View key={i}>
|
||||
{i > 0 && <Separator inset={space.lg + 18 + space.sm} />}
|
||||
{row}
|
||||
</View>
|
||||
))}
|
||||
</>
|
||||
);
|
||||
return (
|
||||
<Card style={[s.pane, style]}>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
onPress={open}
|
||||
style={({ pressed }) => [s.paneHeader, pressed && { backgroundColor: C.surface2 }]}
|
||||
>
|
||||
<Icon name={pane.icon} size={16} color={C.textSecondary} bg={C.surface} />
|
||||
<Text style={s.paneTitle}>{pane.title}</Text>
|
||||
{pane.count > 0 && <Text style={s.paneCount}>{pane.count}</Text>}
|
||||
<View style={{ flex: 1 }} />
|
||||
<Icon name="chevron" size={14} color={C.muted} />
|
||||
</Pressable>
|
||||
<Separator />
|
||||
{wide ? (
|
||||
<ScrollView style={{ flex: 1 }} showsVerticalScrollIndicator={false}>
|
||||
{body}
|
||||
</ScrollView>
|
||||
) : (
|
||||
<View>
|
||||
{body}
|
||||
{hidden > 0 && (
|
||||
<Pressable onPress={open} style={({ pressed }) => [s.more, pressed && { opacity: 0.6 }]}>
|
||||
<Text style={s.moreText}>{hidden} more</Text>
|
||||
</Pressable>
|
||||
)}
|
||||
</View>
|
||||
)}
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
export default function Lists() {
|
||||
const store = useStore();
|
||||
const { width } = useWindowDimensions();
|
||||
const wide = width >= WIDE;
|
||||
|
||||
const next = visibleTasksByStatus(store, "next");
|
||||
const waiting = visibleTasksByStatus(store, "waiting");
|
||||
const someday = visibleTasksByStatus(store, "someday");
|
||||
const projects = activeProjects(store).filter((p) => p.status === "active");
|
||||
const taskRows = (tasks: Task[]) => tasks.map((t) => <TaskMini key={t.id} task={t} wide={wide} />);
|
||||
|
||||
const panes: Pane[] = [
|
||||
{ key: "next", icon: "next", title: "Next up", href: "/list/next", count: next.length, empty: "Nothing next.", rows: taskRows(next) },
|
||||
{ key: "waiting", icon: "waiting", title: "Waiting", href: "/list/waiting", count: waiting.length, empty: "Not waiting on anyone.", rows: taskRows(waiting) },
|
||||
{ key: "someday", icon: "someday", title: "Someday", href: "/list/someday", count: someday.length, empty: "No someday items.", rows: taskRows(someday) },
|
||||
{
|
||||
key: "projects",
|
||||
icon: "projects",
|
||||
title: "Projects",
|
||||
href: "/projects",
|
||||
count: projects.length,
|
||||
empty: "No projects yet.",
|
||||
rows: projects.map((p) => <ProjectMini key={p.id} project={p} open={openTaskCount(store, p.id)} />),
|
||||
},
|
||||
];
|
||||
|
||||
if (wide) {
|
||||
return (
|
||||
<View style={s.board}>
|
||||
<View style={s.boardRow}>
|
||||
<Quadrant pane={panes[0]} wide style={{ flex: 1 }} />
|
||||
<Quadrant pane={panes[1]} wide style={{ flex: 1 }} />
|
||||
</View>
|
||||
<View style={s.boardRow}>
|
||||
<Quadrant pane={panes[2]} wide style={{ flex: 1 }} />
|
||||
<Quadrant pane={panes[3]} wide style={{ flex: 1 }} />
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
// Two columns that wrap. The container grows to the viewport and the two
|
||||
// lines share its height (alignContent: stretch), so the board always looks
|
||||
// like four quadrants — even when every list is empty.
|
||||
const col = (width - space.lg * 2 - space.md) / 2;
|
||||
return (
|
||||
<ScrollView contentContainerStyle={s.grid} showsVerticalScrollIndicator={false}>
|
||||
{panes.map((p) => (
|
||||
<Quadrant key={p.key} pane={p} wide={false} style={{ width: col }} />
|
||||
))}
|
||||
</ScrollView>
|
||||
);
|
||||
}
|
||||
|
||||
const s = StyleSheet.create({
|
||||
board: { flex: 1, padding: space.lg, gap: space.md },
|
||||
boardRow: { flex: 1, flexDirection: "row", gap: space.md },
|
||||
grid: {
|
||||
flexGrow: 1,
|
||||
flexDirection: "row",
|
||||
flexWrap: "wrap",
|
||||
alignContent: "stretch",
|
||||
gap: space.md,
|
||||
paddingHorizontal: space.lg,
|
||||
paddingTop: space.md,
|
||||
paddingBottom: 96,
|
||||
},
|
||||
|
||||
pane: { minHeight: 150 },
|
||||
paneHeader: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: space.sm,
|
||||
paddingHorizontal: space.lg,
|
||||
paddingVertical: space.md,
|
||||
},
|
||||
paneTitle: { fontSize: 15, fontWeight: "600", letterSpacing: -0.1, color: C.text },
|
||||
paneCount: { ...type.meta, color: C.muted, fontWeight: "600" },
|
||||
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: space.sm,
|
||||
paddingHorizontal: space.lg,
|
||||
paddingVertical: space.sm + 3,
|
||||
},
|
||||
rowPressed: { backgroundColor: C.surface2 },
|
||||
check: { width: 18, height: 18, borderRadius: 6, borderWidth: 1.5 },
|
||||
projectDot: { width: 18, height: 18, borderRadius: 5, backgroundColor: C.surface2 },
|
||||
rowTitle: { flex: 1, fontSize: 15, letterSpacing: -0.1, color: C.text },
|
||||
rowMeta: { ...type.meta, color: C.muted },
|
||||
dueDot: { width: 6, height: 6, borderRadius: 999 },
|
||||
|
||||
empty: { ...type.meta, color: C.muted, paddingHorizontal: space.lg, paddingVertical: space.md },
|
||||
more: { paddingHorizontal: space.lg, paddingVertical: space.sm + 2 },
|
||||
moreText: { ...type.meta, color: C.accent, fontWeight: "500" },
|
||||
});
|
||||
@@ -1,16 +1,16 @@
|
||||
import { SectionList, StyleSheet, View } from "react-native";
|
||||
import TaskRow, { TaskSeparator } from "../components/TaskRow";
|
||||
import { cardEdges, Empty, SectionHeader } from "../components/ui";
|
||||
import { todayTasks } from "../lib/store";
|
||||
import { C, space } from "../lib/theme";
|
||||
import { useStore } from "../lib/useStore";
|
||||
import TaskRow, { TaskSeparator } from "../../components/TaskRow";
|
||||
import { cardEdges, Empty, SectionHeader, Title } from "../../components/ui";
|
||||
import { todayTasks } from "../../lib/store";
|
||||
import { C, space } from "../../lib/theme";
|
||||
import { useStore } from "../../lib/useStore";
|
||||
|
||||
export default function Today() {
|
||||
const store = useStore();
|
||||
const { overdue, today } = todayTasks(store);
|
||||
const sections = [
|
||||
...(overdue.length ? [{ title: "Overdue", data: overdue, color: C.danger }] : []),
|
||||
{ title: "Today", data: today, color: C.textSecondary },
|
||||
{ title: "Due today", data: today, color: C.textSecondary },
|
||||
];
|
||||
const empty = overdue.length === 0 && today.length === 0;
|
||||
|
||||
@@ -19,6 +19,7 @@ export default function Today() {
|
||||
style={s.screen}
|
||||
sections={sections}
|
||||
keyExtractor={(t) => t.id}
|
||||
ListHeaderComponent={<Title count={overdue.length + today.length}>Today</Title>}
|
||||
// Each section is its own rounded card, so the first and last rows in a
|
||||
// section round their outer corners.
|
||||
renderItem={({ item, index, section }) => (
|
||||
@@ -40,5 +41,5 @@ export default function Today() {
|
||||
|
||||
const s = StyleSheet.create({
|
||||
screen: { flex: 1, backgroundColor: C.bg },
|
||||
content: { paddingHorizontal: space.lg, paddingBottom: 40 },
|
||||
content: { paddingHorizontal: space.lg, paddingBottom: 96 },
|
||||
});
|
||||
@@ -1,14 +1,12 @@
|
||||
import NetInfo from "@react-native-community/netinfo";
|
||||
import { Link, Stack } from "expo-router";
|
||||
import { Stack } from "expo-router";
|
||||
import { StatusBar } from "expo-status-bar";
|
||||
import { useEffect } from "react";
|
||||
import { AppState, Pressable } from "react-native";
|
||||
import { AppState } from "react-native";
|
||||
import { GestureHandlerRootView } from "react-native-gesture-handler";
|
||||
import { getState, hydrate, subscribe, sync } from "../lib/store";
|
||||
import AreaToggle from "../components/AreaToggle";
|
||||
import Icon from "../components/Icon";
|
||||
import { ToastHost } from "../components/Toast";
|
||||
import { C, space } from "../lib/theme";
|
||||
import { C } from "../lib/theme";
|
||||
import { refreshNextUpWidget } from "../widget/refresh";
|
||||
|
||||
export default function RootLayout() {
|
||||
@@ -51,34 +49,12 @@ export default function RootLayout() {
|
||||
contentStyle: { backgroundColor: C.bg },
|
||||
}}
|
||||
>
|
||||
<Stack.Screen
|
||||
name="index"
|
||||
options={{
|
||||
title: "GTD",
|
||||
// The personal/work switch sits where the title would be: it is
|
||||
// the screen's identity, and it must be reachable from the top of
|
||||
// every visit without scrolling.
|
||||
headerTitle: () => <AreaToggle />,
|
||||
headerTitleAlign: "center",
|
||||
headerRight: () => (
|
||||
<Link href="/settings" asChild>
|
||||
<Pressable
|
||||
hitSlop={12}
|
||||
style={({ pressed }) => [{ paddingHorizontal: space.sm }, pressed && { opacity: 0.5 }]}
|
||||
>
|
||||
<Icon name="settings" size={22} color={C.textSecondary} />
|
||||
</Pressable>
|
||||
</Link>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen name="(tabs)" options={{ headerShown: false }} />
|
||||
<Stack.Screen name="list/[status]" />
|
||||
<Stack.Screen name="today" options={{ title: "Today" }} />
|
||||
<Stack.Screen name="add" options={{ title: "New task", presentation: "modal" }} />
|
||||
<Stack.Screen name="projects" options={{ title: "Projects" }} />
|
||||
<Stack.Screen name="task/[id]" options={{ title: "Clarify", presentation: "modal" }} />
|
||||
<Stack.Screen name="project/[id]" options={{ title: "Project" }} />
|
||||
<Stack.Screen name="review" options={{ title: "Weekly review" }} />
|
||||
<Stack.Screen name="settings" options={{ title: "Settings", presentation: "modal" }} />
|
||||
</Stack>
|
||||
<ToastHost />
|
||||
|
||||
@@ -1,227 +0,0 @@
|
||||
import { useFocusEffect, useRouter } from "expo-router";
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native";
|
||||
import { NestableDraggableFlatList, NestableScrollContainer, ScaleDecorator } from "react-native-draggable-flatlist";
|
||||
import WebSortableList from "../components/WebSortableList";
|
||||
import Icon, { type IconName } from "../components/Icon";
|
||||
import TaskRow, { TaskSeparator } from "../components/TaskRow";
|
||||
import { Card, cardEdges, Empty, Screen, SectionHeader, Title } from "../components/ui";
|
||||
import { haptic } from "../lib/haptics";
|
||||
import { daysSince, useLastReview } from "../lib/review";
|
||||
import { reorderTask, todayTasks, visibleTasksByStatus } from "../lib/store";
|
||||
import { C, radius, shadow, space, type } from "../lib/theme";
|
||||
import { useStore } from "../lib/useStore";
|
||||
|
||||
const MENU: { icon: IconName; label: string; href: string }[] = [
|
||||
{ icon: "today", label: "Today", href: "/today" },
|
||||
{ icon: "next", label: "Next", href: "/list/next" },
|
||||
{ icon: "waiting", label: "Waiting", href: "/list/waiting" },
|
||||
{ icon: "someday", label: "Someday", href: "/list/someday" },
|
||||
{ icon: "projects", label: "Projects", href: "/projects" },
|
||||
{ icon: "review", label: "Review", href: "/review" },
|
||||
];
|
||||
|
||||
const PREVIEW = 3;
|
||||
|
||||
/**
|
||||
* One tappable line of status — overdue, review due, sync trouble. Rendered as
|
||||
* a real row with a chevron rather than coloured micro-text, so it reads as
|
||||
* something you can act on.
|
||||
*/
|
||||
function Alert({ tone, text, onPress }: { tone: string; text: string; onPress?: () => void }) {
|
||||
const body = (
|
||||
<View style={s.alert}>
|
||||
<View style={[s.dot, { backgroundColor: tone }]} />
|
||||
<Text style={[s.alertText, { color: tone }]}>{text}</Text>
|
||||
{!!onPress && <Icon name="chevron" size={16} color={tone} />}
|
||||
</View>
|
||||
);
|
||||
if (!onPress) return body;
|
||||
return (
|
||||
<Pressable onPress={onPress} style={({ pressed }) => pressed && { opacity: 0.6 }}>
|
||||
{body}
|
||||
</Pressable>
|
||||
);
|
||||
}
|
||||
|
||||
export default function Home() {
|
||||
const router = useRouter();
|
||||
const store = useStore();
|
||||
const next = visibleTasksByStatus(store, "next");
|
||||
const { overdue } = todayTasks(store);
|
||||
const [lastReview, reloadReview] = useLastReview();
|
||||
useFocusEffect(reloadReview);
|
||||
const reviewDays = daysSince(lastReview);
|
||||
const reviewDue = lastReview === null || (reviewDays !== null && reviewDays >= 7);
|
||||
const preview = next.slice(0, PREVIEW);
|
||||
|
||||
return (
|
||||
<Screen>
|
||||
<NestableScrollContainer contentContainerStyle={s.content} showsVerticalScrollIndicator={false}>
|
||||
<Title count={next.length}>Next up</Title>
|
||||
|
||||
{preview.length === 0 ? (
|
||||
<Empty>Nothing queued. Add the next thing on your mind.</Empty>
|
||||
) : Platform.OS === "web" ? (
|
||||
<WebSortableList
|
||||
data={preview}
|
||||
onReorder={(id, to) => reorderTask(id, "next", to)}
|
||||
separator={<TaskSeparator />}
|
||||
renderItem={(t, i) => (
|
||||
<View style={cardEdges(i, preview.length)}>
|
||||
<TaskRow task={t} emphasized={i === 0} />
|
||||
</View>
|
||||
)}
|
||||
/>
|
||||
) : (
|
||||
// Draggable so the "do this now" slot is a hand-picked choice, not
|
||||
// just whatever sorted first. Preview indices are next[0..N], so a
|
||||
// drop reorders the real Next list.
|
||||
<NestableDraggableFlatList
|
||||
data={preview}
|
||||
keyExtractor={(t) => t.id}
|
||||
activationDistance={12}
|
||||
onDragBegin={() => haptic.pickup()}
|
||||
onDragEnd={({ data, from, to }) => {
|
||||
if (from !== to) {
|
||||
haptic.success();
|
||||
reorderTask(data[to].id, "next", to);
|
||||
}
|
||||
}}
|
||||
renderItem={({ item, drag, isActive, getIndex }) => {
|
||||
const i = getIndex() ?? 0;
|
||||
return (
|
||||
<ScaleDecorator activeScale={1.02}>
|
||||
<View style={[...cardEdges(i, preview.length), isActive && s.lifted]}>
|
||||
<TaskRow task={item} emphasized={i === 0} onLongPress={drag} />
|
||||
</View>
|
||||
</ScaleDecorator>
|
||||
);
|
||||
}}
|
||||
ItemSeparatorComponent={TaskSeparator}
|
||||
/>
|
||||
)}
|
||||
|
||||
{next.length > PREVIEW && (
|
||||
<Pressable
|
||||
onPress={() => router.push("/list/next")}
|
||||
style={({ pressed }) => [s.viewAll, pressed && { opacity: 0.6 }]}
|
||||
>
|
||||
<Text style={s.viewAllText}>All {next.length} next actions</Text>
|
||||
<Icon name="chevron" size={16} color={C.accent} />
|
||||
</Pressable>
|
||||
)}
|
||||
|
||||
{(overdue.length > 0 || reviewDue || store.offline || !!store.syncError) && (
|
||||
<>
|
||||
<SectionHeader>Needs attention</SectionHeader>
|
||||
<Card>
|
||||
{overdue.length > 0 && (
|
||||
<Alert
|
||||
tone={C.danger}
|
||||
text={`${overdue.length} overdue`}
|
||||
onPress={() => router.push("/today")}
|
||||
/>
|
||||
)}
|
||||
{reviewDue && (
|
||||
<Alert
|
||||
tone={C.warn}
|
||||
text={
|
||||
lastReview === null
|
||||
? "No weekly review yet"
|
||||
: `Weekly review is ${reviewDays} days overdue`
|
||||
}
|
||||
onPress={() => router.push("/review")}
|
||||
/>
|
||||
)}
|
||||
{store.offline && (
|
||||
<Alert
|
||||
tone={C.textSecondary}
|
||||
text={
|
||||
store.pending > 0
|
||||
? `Offline — ${store.pending} change${store.pending === 1 ? "" : "s"} queued`
|
||||
: "Offline"
|
||||
}
|
||||
/>
|
||||
)}
|
||||
{!!store.syncError && <Alert tone={C.danger} text={store.syncError} />}
|
||||
</Card>
|
||||
</>
|
||||
)}
|
||||
</NestableScrollContainer>
|
||||
|
||||
<View style={s.tabBar}>
|
||||
{MENU.map((m) => (
|
||||
<Pressable
|
||||
key={m.label}
|
||||
style={({ pressed }) => [s.tab, pressed && { opacity: 0.5 }]}
|
||||
onPress={() => {
|
||||
haptic.tap();
|
||||
router.push(m.href);
|
||||
}}
|
||||
>
|
||||
<Icon name={m.icon} size={21} color={C.textSecondary} bg={C.surface} />
|
||||
<Text style={s.tabLabel}>{m.label}</Text>
|
||||
</Pressable>
|
||||
))}
|
||||
</View>
|
||||
|
||||
<Pressable
|
||||
style={({ pressed }) => [s.fab, pressed && { transform: [{ scale: 0.94 }] }]}
|
||||
onPress={() => {
|
||||
haptic.tap();
|
||||
router.push("/add");
|
||||
}}
|
||||
>
|
||||
<Icon name="plus" size={26} color={C.onAccent} />
|
||||
</Pressable>
|
||||
</Screen>
|
||||
);
|
||||
}
|
||||
|
||||
const s = StyleSheet.create({
|
||||
content: { paddingHorizontal: space.lg, paddingBottom: 120 },
|
||||
lifted: { borderRadius: radius.lg, ...shadow.fab },
|
||||
|
||||
viewAll: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: space.xs,
|
||||
paddingVertical: space.md,
|
||||
paddingHorizontal: space.xs,
|
||||
},
|
||||
viewAllText: { ...type.body, color: C.accent, fontWeight: "500" },
|
||||
|
||||
alert: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: space.md,
|
||||
paddingVertical: space.md + 1,
|
||||
paddingHorizontal: space.lg,
|
||||
},
|
||||
dot: { width: 7, height: 7, borderRadius: 999 },
|
||||
alertText: { ...type.body, flex: 1, fontWeight: "500" },
|
||||
|
||||
tabBar: {
|
||||
flexDirection: "row",
|
||||
backgroundColor: C.surface,
|
||||
borderTopWidth: StyleSheet.hairlineWidth,
|
||||
borderTopColor: C.border,
|
||||
paddingTop: space.md,
|
||||
paddingBottom: space.xxl,
|
||||
},
|
||||
tab: { flex: 1, alignItems: "center", gap: 5 },
|
||||
tabLabel: { fontSize: 11, color: C.textSecondary, letterSpacing: 0.1 },
|
||||
|
||||
fab: {
|
||||
position: "absolute",
|
||||
right: space.xl,
|
||||
bottom: 104,
|
||||
width: 56,
|
||||
height: 56,
|
||||
borderRadius: 28,
|
||||
backgroundColor: C.accent,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
...shadow.fab,
|
||||
},
|
||||
});
|
||||
@@ -1,208 +0,0 @@
|
||||
// Weekly review — GTD's keystone habit. One pass, one decision per row:
|
||||
// each row has exactly three quick actions (do next / someday / trash) plus
|
||||
// done on the checkbox, so nothing needs a trip through the edit modal.
|
||||
import { useRouter } from "expo-router";
|
||||
import { Pressable, ScrollView, StyleSheet, Text, View } from "react-native";
|
||||
import Icon from "../components/Icon";
|
||||
import { Button, Card, Empty, SectionHeader } from "../components/ui";
|
||||
import { friendlyDate } from "../lib/dates";
|
||||
import { haptic } from "../lib/haptics";
|
||||
import { PRIORITY_COLOR } from "../lib/priority";
|
||||
import { daysSince, markReviewed, useLastReview } from "../lib/review";
|
||||
import { reviewBuckets, trashTask, updateTask } from "../lib/store";
|
||||
import { completeWithUndo } from "../lib/undo";
|
||||
import { C, radius, space, type } from "../lib/theme";
|
||||
import { useStore } from "../lib/useStore";
|
||||
import type { Task } from "../lib/types";
|
||||
|
||||
function ReviewRow({
|
||||
task,
|
||||
showDefer,
|
||||
last,
|
||||
}: {
|
||||
task: Task;
|
||||
showDefer?: boolean;
|
||||
/** The card already draws the bottom edge — don't double it up. */
|
||||
last?: boolean;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
const act = (fn: () => void) => () => {
|
||||
haptic.select();
|
||||
fn();
|
||||
};
|
||||
return (
|
||||
<View style={[s.row, last && s.rowLast]}>
|
||||
<Pressable
|
||||
style={s.check}
|
||||
hitSlop={8}
|
||||
onPress={() => completeWithUndo(task)}
|
||||
>
|
||||
<View style={[s.checkbox, { borderColor: PRIORITY_COLOR[task.priority] }]} />
|
||||
</Pressable>
|
||||
<Pressable style={{ flex: 1 }} onPress={() => router.push(`/task/${task.id}`)}>
|
||||
<Text style={s.title} numberOfLines={2}>
|
||||
{task.title}
|
||||
</Text>
|
||||
<Text style={s.meta}>
|
||||
{[
|
||||
task.status,
|
||||
task.waiting_for && `→ ${task.waiting_for}`,
|
||||
showDefer && task.defer_date && `resurfaces ${friendlyDate(task.defer_date)}`,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(" · ")}
|
||||
</Text>
|
||||
</Pressable>
|
||||
{task.status !== "next" && (
|
||||
<Pressable
|
||||
style={({ pressed }) => [s.action, pressed && s.actionPressed]}
|
||||
hitSlop={6}
|
||||
onPress={act(() => updateTask(task.id, { status: "next" }))}
|
||||
>
|
||||
<Icon name="next" size={14} color={C.accent} />
|
||||
</Pressable>
|
||||
)}
|
||||
{task.status !== "someday" && (
|
||||
<Pressable
|
||||
style={({ pressed }) => [s.action, pressed && s.actionPressed]}
|
||||
hitSlop={6}
|
||||
onPress={act(() => updateTask(task.id, { status: "someday" }))}
|
||||
>
|
||||
<Icon name="someday" size={14} color={C.textSecondary} bg={C.surface} />
|
||||
</Pressable>
|
||||
)}
|
||||
<Pressable
|
||||
style={({ pressed }) => [s.action, pressed && s.actionPressed]}
|
||||
hitSlop={6}
|
||||
onPress={act(() => trashTask(task.id))}
|
||||
>
|
||||
<Text style={s.dropText}>Drop</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
function Section({ title, hint, tasks, showDefer }: { title: string; hint: string; tasks: Task[]; showDefer?: boolean }) {
|
||||
if (tasks.length === 0) return null;
|
||||
return (
|
||||
<View>
|
||||
<SectionHeader>
|
||||
{title} ({tasks.length})
|
||||
</SectionHeader>
|
||||
<Text style={s.sectionHint}>{hint}</Text>
|
||||
<Card>
|
||||
{tasks.map((t, i) => (
|
||||
<ReviewRow key={t.id} task={t} showDefer={showDefer} last={i === tasks.length - 1} />
|
||||
))}
|
||||
</Card>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
export default function Review() {
|
||||
const router = useRouter();
|
||||
const store = useStore();
|
||||
const buckets = reviewBuckets(store);
|
||||
const [last, reload] = useLastReview();
|
||||
const days = daysSince(last);
|
||||
|
||||
const empty =
|
||||
!buckets.overdue.length &&
|
||||
!buckets.staleNext.length &&
|
||||
!buckets.agingWaiting.length &&
|
||||
!buckets.someday.length &&
|
||||
!buckets.deferred.length &&
|
||||
!buckets.stuckProjects.length;
|
||||
|
||||
return (
|
||||
<ScrollView style={{ flex: 1, backgroundColor: C.bg }} contentContainerStyle={s.content}>
|
||||
<Text style={s.lastReview}>
|
||||
{last ? (days === 0 ? "Last review: today" : `Last review: ${days}d ago`) : "First review — welcome."}
|
||||
</Text>
|
||||
|
||||
<Section title="Overdue" hint="Reschedule, do, or let go." tasks={buckets.overdue} />
|
||||
<Section title="Stalled" hint="Next actions untouched for 2+ weeks — still the real next step?" tasks={buckets.staleNext} />
|
||||
<Section title="Waiting too long" hint="A week without movement — time to nudge?" tasks={buckets.agingWaiting} />
|
||||
<Section title="Someday sweep" hint="Promote what's ripe, trash what's dead." tasks={buckets.someday} />
|
||||
<Section title="Deferred" hint="Hidden from lists — just so you know they're coming." tasks={buckets.deferred} showDefer />
|
||||
|
||||
{buckets.stuckProjects.length > 0 && (
|
||||
<View>
|
||||
<SectionHeader>Stuck projects ({buckets.stuckProjects.length})</SectionHeader>
|
||||
<Text style={s.sectionHint}>Active, but no next action — decide the next step or park them.</Text>
|
||||
<Card>
|
||||
{buckets.stuckProjects.map((p, i) => (
|
||||
<Pressable
|
||||
key={p.id}
|
||||
style={({ pressed }) => [
|
||||
s.row,
|
||||
i === buckets.stuckProjects.length - 1 && s.rowLast,
|
||||
pressed && { backgroundColor: C.surface2 },
|
||||
]}
|
||||
onPress={() => router.push(`/project/${p.id}`)}
|
||||
>
|
||||
<Text style={[s.title, { flex: 1 }]}>{p.name}</Text>
|
||||
<Icon name="chevron" size={16} color={C.muted} />
|
||||
</Pressable>
|
||||
))}
|
||||
</Card>
|
||||
</View>
|
||||
)}
|
||||
|
||||
{empty && <Empty>All clear. Nothing needs a decision.</Empty>}
|
||||
|
||||
<Button
|
||||
title="Mark review complete"
|
||||
onPress={async () => {
|
||||
haptic.success();
|
||||
await markReviewed();
|
||||
reload();
|
||||
router.back();
|
||||
}}
|
||||
/>
|
||||
<View style={s.archiveRow}>
|
||||
<Pressable onPress={() => router.push("/list/done")}>
|
||||
<Text style={s.archiveLink}>Done</Text>
|
||||
</Pressable>
|
||||
<Text style={s.archiveDot}>·</Text>
|
||||
<Pressable onPress={() => router.push("/list/trashed")}>
|
||||
<Text style={s.archiveLink}>Trash</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
</ScrollView>
|
||||
);
|
||||
}
|
||||
|
||||
const s = StyleSheet.create({
|
||||
content: { padding: space.lg, paddingBottom: 48 },
|
||||
lastReview: { ...type.meta, color: C.textSecondary, marginBottom: space.xs },
|
||||
sectionHint: { ...type.meta, color: C.muted, paddingHorizontal: space.xs, marginBottom: space.sm },
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: space.md,
|
||||
paddingVertical: space.md,
|
||||
paddingHorizontal: space.lg,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
borderBottomColor: C.separator,
|
||||
backgroundColor: C.surface,
|
||||
},
|
||||
rowLast: { borderBottomWidth: 0 },
|
||||
check: { paddingRight: 2 },
|
||||
checkbox: { width: 21, height: 21, borderRadius: 7, borderWidth: 1.5 },
|
||||
title: { ...type.body, color: C.text },
|
||||
meta: { ...type.meta, fontSize: 12, color: C.muted, marginTop: 2 },
|
||||
action: {
|
||||
minWidth: 30,
|
||||
height: 28,
|
||||
paddingHorizontal: space.sm,
|
||||
borderRadius: radius.sm,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
actionPressed: { backgroundColor: C.surface2 },
|
||||
dropText: { ...type.meta, color: C.danger, fontWeight: "500" },
|
||||
archiveRow: { flexDirection: "row", justifyContent: "center", gap: space.sm, marginTop: space.xs },
|
||||
archiveLink: { ...type.meta, color: C.textSecondary, padding: space.sm },
|
||||
archiveDot: { color: C.muted, alignSelf: "center" },
|
||||
});
|
||||
@@ -1,8 +1,9 @@
|
||||
import * as Application from "expo-application";
|
||||
import { useRouter } from "expo-router";
|
||||
import { useEffect, useState } from "react";
|
||||
import { ScrollView, StyleSheet, Text } from "react-native";
|
||||
import { Button, Field } from "../components/ui";
|
||||
import { Pressable, ScrollView, StyleSheet, Text, View } from "react-native";
|
||||
import Icon from "../components/Icon";
|
||||
import { Button, Card, Field, SectionHeader, Separator } from "../components/ui";
|
||||
import { api } from "../lib/api";
|
||||
import { DEFAULT_URL, getConfig, setConfig } from "../lib/config";
|
||||
import { sync } from "../lib/store";
|
||||
@@ -45,6 +46,24 @@ export default function Settings() {
|
||||
/>
|
||||
<Button title="Save & test" onPress={save} />
|
||||
{status && <Text style={s.error}>{status}</Text>}
|
||||
|
||||
{/* Done and Trash are archives, not lists you work from — they live
|
||||
behind the gear rather than on the bar. */}
|
||||
<SectionHeader>Archive</SectionHeader>
|
||||
<Card>
|
||||
{(["done", "trashed"] as const).map((st, i) => (
|
||||
<View key={st}>
|
||||
{i > 0 && <Separator inset={space.lg} />}
|
||||
<Pressable
|
||||
onPress={() => router.push(`/list/${st}`)}
|
||||
style={({ pressed }) => [s.archiveRow, pressed && { backgroundColor: C.surface2 }]}
|
||||
>
|
||||
<Text style={s.archiveText}>{st === "done" ? "Done" : "Trash"}</Text>
|
||||
<Icon name="chevron" size={16} color={C.muted} />
|
||||
</Pressable>
|
||||
</View>
|
||||
))}
|
||||
</Card>
|
||||
{/* CI stamps versionName from the release tag — confirms which build Obtainium installed. */}
|
||||
<Text style={s.version}>GTD v{Application.nativeApplicationVersion ?? "dev"}</Text>
|
||||
</ScrollView>
|
||||
@@ -54,5 +73,13 @@ export default function Settings() {
|
||||
const s = StyleSheet.create({
|
||||
content: { padding: space.lg },
|
||||
error: { ...type.meta, color: C.danger, marginTop: space.xs },
|
||||
archiveRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
paddingHorizontal: space.lg,
|
||||
paddingVertical: space.md + 2,
|
||||
},
|
||||
archiveText: { ...type.body, color: C.text },
|
||||
version: { ...type.meta, color: C.muted, textAlign: "center", marginTop: space.xxl },
|
||||
});
|
||||
|
||||
@@ -13,7 +13,7 @@ export type IconName =
|
||||
| "waiting"
|
||||
| "someday"
|
||||
| "projects"
|
||||
| "review"
|
||||
| "grid"
|
||||
| "settings"
|
||||
| "flag"
|
||||
| "repeat"
|
||||
@@ -170,37 +170,18 @@ export default function Icon({ name, size = 22, color = C.textSecondary, bg = C.
|
||||
</View>
|
||||
);
|
||||
|
||||
case "review":
|
||||
case "grid":
|
||||
// Four squares — the Lists board's own shape.
|
||||
return (
|
||||
<View style={[box, s.center]}>
|
||||
{/* an open ring plus an arrowhead reads as "cycle" without an SVG path */}
|
||||
<View style={{ width: size * 0.8, height: size * 0.8, flexDirection: "row", flexWrap: "wrap", gap: size * 0.1 }}>
|
||||
{[0, 1, 2, 3].map((i) => (
|
||||
<View
|
||||
style={{
|
||||
width: size * 0.82,
|
||||
height: size * 0.82,
|
||||
borderRadius: 999,
|
||||
borderWidth: w,
|
||||
borderColor: color,
|
||||
borderTopColor: "transparent",
|
||||
transform: [{ rotate: "45deg" }],
|
||||
}}
|
||||
/>
|
||||
<View
|
||||
style={{
|
||||
position: "absolute",
|
||||
top: size * 0.06,
|
||||
right: size * 0.12,
|
||||
width: 0,
|
||||
height: 0,
|
||||
borderLeftWidth: size * 0.16,
|
||||
borderRightWidth: size * 0.16,
|
||||
borderBottomWidth: size * 0.2,
|
||||
borderLeftColor: "transparent",
|
||||
borderRightColor: "transparent",
|
||||
borderBottomColor: color,
|
||||
transform: [{ rotate: "115deg" }],
|
||||
}}
|
||||
key={i}
|
||||
style={{ width: size * 0.35, height: size * 0.35, borderWidth: w, borderColor: color, borderRadius: 3 }}
|
||||
/>
|
||||
))}
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
|
||||
|
||||
70
app/src/components/TabBar.tsx
Normal file
70
app/src/components/TabBar.tsx
Normal file
@@ -0,0 +1,70 @@
|
||||
// The three-tab bar under every top-level screen: Next up, Today, Lists.
|
||||
//
|
||||
// Three is the number a thumb can hit without looking. The old launcher had
|
||||
// six buttons and a second row of alerts; everything that was there is still
|
||||
// reachable, but through the Lists board or the header, so the bar only
|
||||
// carries the places you go many times a day.
|
||||
import type { BottomTabBarProps } from "expo-router/js-tabs";
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import { haptic } from "../lib/haptics";
|
||||
import { C, space } from "../lib/theme";
|
||||
import { useStore } from "../lib/useStore";
|
||||
import { AREA_TONE } from "./AreaToggle";
|
||||
import Icon, { type IconName } from "./Icon";
|
||||
|
||||
const TABS: Record<string, { icon: IconName; label: string }> = {
|
||||
index: { icon: "next", label: "Next up" },
|
||||
today: { icon: "today", label: "Today" },
|
||||
lists: { icon: "grid", label: "Lists" },
|
||||
};
|
||||
|
||||
const ICON = 22;
|
||||
const LABEL = 14;
|
||||
/** Bar height above the safe-area inset — the FAB sits this far up plus a gutter. */
|
||||
export const TAB_BAR_CONTENT_HEIGHT = space.md + ICON + 5 + LABEL;
|
||||
export const tabBarInset = (bottom: number) => Math.max(bottom, space.md);
|
||||
|
||||
export default function TabBar({ state, navigation }: BottomTabBarProps) {
|
||||
const insets = useSafeAreaInsets();
|
||||
// The active tab takes the lens colour, so Work mode reads as Work all the
|
||||
// way down the screen, not just in the header pill.
|
||||
const tone = AREA_TONE[useStore().area];
|
||||
return (
|
||||
<View style={[s.bar, { paddingBottom: tabBarInset(insets.bottom) }]}>
|
||||
{state.routes.map((route, i) => {
|
||||
const focused = state.index === i;
|
||||
const tab = TABS[route.name] ?? { icon: "next" as IconName, label: route.name };
|
||||
return (
|
||||
<Pressable
|
||||
key={route.key}
|
||||
accessibilityRole="tab"
|
||||
accessibilityState={{ selected: focused }}
|
||||
style={({ pressed }) => [s.tab, pressed && { opacity: 0.5 }]}
|
||||
onPress={() => {
|
||||
const e = navigation.emit({ type: "tabPress", target: route.key, canPreventDefault: true });
|
||||
if (focused || e.defaultPrevented) return;
|
||||
haptic.tap();
|
||||
navigation.navigate(route.name);
|
||||
}}
|
||||
>
|
||||
<Icon name={tab.icon} size={ICON} color={focused ? tone : C.textSecondary} bg={C.surface} />
|
||||
<Text style={[s.label, focused && { color: tone, fontWeight: "600" }]}>{tab.label}</Text>
|
||||
</Pressable>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const s = StyleSheet.create({
|
||||
bar: {
|
||||
flexDirection: "row",
|
||||
backgroundColor: C.surface,
|
||||
borderTopWidth: StyleSheet.hairlineWidth,
|
||||
borderTopColor: C.border,
|
||||
paddingTop: space.md,
|
||||
},
|
||||
tab: { flex: 1, alignItems: "center", gap: 5 },
|
||||
label: { fontSize: 11, lineHeight: LABEL, color: C.textSecondary, letterSpacing: 0.1 },
|
||||
});
|
||||
@@ -5,7 +5,7 @@
|
||||
// move/up listeners, and on release the target slot is computed from measured
|
||||
// row heights and handed to onReorder (the same store mutation native uses).
|
||||
import { useState, type ReactNode } from "react";
|
||||
import { StyleSheet, Text, View, type GestureResponderEvent } from "react-native";
|
||||
import { StyleSheet, Text, View, type GestureResponderEvent, type ViewStyle } from "react-native";
|
||||
import { C, space } from "../lib/theme";
|
||||
|
||||
export default function WebSortableList<T extends { id: string }>({
|
||||
@@ -77,7 +77,7 @@ export default function WebSortableList<T extends { id: string }>({
|
||||
>
|
||||
{renderItem(item, i)}
|
||||
{!disabled && (
|
||||
<View onPointerDown={(e) => startDrag(i, e as unknown as GestureResponderEvent)} style={s.handle}>
|
||||
<View onPointerDown={(e) => startDrag(i, e as unknown as GestureResponderEvent)} style={handleStyle}>
|
||||
<Text style={s.handleGlyph}>⠿</Text>
|
||||
</View>
|
||||
)}
|
||||
@@ -106,10 +106,10 @@ const s = StyleSheet.create({
|
||||
width: 44,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
// @ts-expect-error web-only style
|
||||
cursor: "grab",
|
||||
touchAction: "none",
|
||||
userSelect: "none",
|
||||
},
|
||||
handleGlyph: { color: C.muted, fontSize: 15, paddingHorizontal: space.sm },
|
||||
});
|
||||
|
||||
// Pointer affordances react-native-web honours but RN's ViewStyle doesn't
|
||||
// type ("grab" is not a CursorValue) — cast once, here, instead of per use.
|
||||
const handleStyle = { ...s.handle, cursor: "grab", touchAction: "none", userSelect: "none" } as unknown as ViewStyle;
|
||||
|
||||
@@ -5,7 +5,7 @@ import { C, radius, shadow, space, type } from "../lib/theme";
|
||||
* Screen background + consistent gutter. Every screen sits on the grouped
|
||||
* background so white cards read as raised paper.
|
||||
*/
|
||||
export function Screen({ children, style }: { children: React.ReactNode; style?: ViewStyle }) {
|
||||
export function Screen({ children, style }: { children: React.ReactNode; style?: StyleProp<ViewStyle> }) {
|
||||
return <View style={[u.screen, style]}>{children}</View>;
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ export function SectionHeader({ children, tone }: { children: React.ReactNode; t
|
||||
* Rounded white group. Rows inside are separated by inset hairlines rather
|
||||
* than full-bleed dividers, so the card keeps a clean silhouette.
|
||||
*/
|
||||
export function Card({ children, style }: { children: React.ReactNode; style?: ViewStyle }) {
|
||||
export function Card({ children, style }: { children: React.ReactNode; style?: StyleProp<ViewStyle> }) {
|
||||
return <View style={[u.card, style]}>{children}</View>;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
// Last-completed-review timestamp, local only — the review is a habit, not
|
||||
// synced data.
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage";
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
|
||||
const KEY = "review_last_v1";
|
||||
|
||||
export async function getLastReview(): Promise<string | null> {
|
||||
return AsyncStorage.getItem(KEY);
|
||||
}
|
||||
|
||||
export async function markReviewed(): Promise<void> {
|
||||
await AsyncStorage.setItem(KEY, new Date().toISOString());
|
||||
}
|
||||
|
||||
export function daysSince(iso: string | null): number | null {
|
||||
if (!iso) return null;
|
||||
return Math.floor((Date.now() - new Date(iso).getTime()) / 86_400_000);
|
||||
}
|
||||
|
||||
/** [lastReviewIso, reload] — call reload on focus to pick up changes. */
|
||||
export function useLastReview(): [string | null, () => void] {
|
||||
const [last, setLast] = useState<string | null>(null);
|
||||
const reload = useCallback(() => {
|
||||
void getLastReview().then(setLast);
|
||||
}, []);
|
||||
useEffect(reload, [reload]);
|
||||
return [last, reload];
|
||||
}
|
||||
@@ -104,15 +104,14 @@ describe("area lens", () => {
|
||||
expect(store.tasksByStatus(store.getState(), "next").some((t) => t.id === legacy.id)).toBe(true);
|
||||
});
|
||||
|
||||
test("today, review and contexts respect the lens", () => {
|
||||
test("today and contexts respect the lens", () => {
|
||||
store.createTask({ title: "p", due_date: "2000-01-01", context: "@home" });
|
||||
store.setArea("work");
|
||||
store.createTask({ title: "w", due_date: "2000-01-01", context: "@office" });
|
||||
const s = store.getState();
|
||||
expect(store.todayTasks(s).overdue.every((t) => t.area === "work")).toBe(true);
|
||||
expect(store.todayTasks(s).overdue.map((t) => t.title)).toContain("w");
|
||||
expect(store.reviewBuckets(s).overdue.map((t) => t.title)).toContain("w");
|
||||
expect(store.reviewBuckets(s).overdue.map((t) => t.title)).not.toContain("p");
|
||||
expect(store.todayTasks(s).overdue.map((t) => t.title)).not.toContain("p");
|
||||
expect(store.knownContexts(s)).toEqual(["@office"]);
|
||||
});
|
||||
|
||||
|
||||
@@ -426,43 +426,3 @@ export function knownContexts(s: State): string[] {
|
||||
}
|
||||
return [...set].sort();
|
||||
}
|
||||
|
||||
// ---- weekly review ----
|
||||
|
||||
const STALE_DAYS = 14;
|
||||
const WAITING_DAYS = 7;
|
||||
|
||||
function olderThanDays(ts: string, days: number): boolean {
|
||||
return Date.now() - new Date(ts).getTime() > days * 86_400_000;
|
||||
}
|
||||
|
||||
export interface ReviewBuckets {
|
||||
overdue: Task[];
|
||||
staleNext: Task[];
|
||||
agingWaiting: Task[];
|
||||
someday: Task[];
|
||||
deferred: Task[];
|
||||
stuckProjects: Project[];
|
||||
}
|
||||
|
||||
export function reviewBuckets(s: State): ReviewBuckets {
|
||||
const today = todayIso();
|
||||
const open = inArea(s, s.tasks).filter((t) => t.status !== "done" && t.status !== "trashed");
|
||||
const overdue = open.filter((t) => t.due_date && t.due_date < today).sort(byPriorityDue);
|
||||
const overdueIds = new Set(overdue.map((t) => t.id));
|
||||
const actionable = new Set(["next", "waiting"]);
|
||||
return {
|
||||
overdue,
|
||||
staleNext: open
|
||||
.filter((t) => t.status === "next" && !overdueIds.has(t.id) && olderThanDays(t.updated_at, STALE_DAYS))
|
||||
.sort(byPriorityDue),
|
||||
agingWaiting: open
|
||||
.filter((t) => t.status === "waiting" && olderThanDays(t.updated_at, WAITING_DAYS))
|
||||
.sort((a, b) => a.updated_at.localeCompare(b.updated_at)),
|
||||
someday: tasksByStatus(s, "someday"),
|
||||
deferred: open.filter((t) => isDeferred(t.defer_date, today)).sort((a, b) => a.defer_date!.localeCompare(b.defer_date!)),
|
||||
stuckProjects: activeProjects(s).filter(
|
||||
(p) => p.status === "active" && !s.tasks.some((t) => t.project_id === p.id && actionable.has(t.status)),
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user