diff --git a/README.md b/README.md
index 1154f23..dba118d 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,16 @@
# Focus Seed
-Focus Seed is a private, offline-first focus timer, habit tracker, and daily reflection app built with Flutter.
+Focus Seed is the current working name for a Flutter product evolving from a lightweight daily action loop into a personal growth and behavior intelligence system.
-## V1 Product Loop
+Current implementation starts with local-first focus sessions, habits, reflection, records, and privacy controls. Product direction, PRD, and roadmap are governed by `docs/product-current-baseline.md`.
-1. Choose one anchor task for today.
-2. Complete a focused session.
-3. Check off small habits.
-4. Save a one-minute reflection.
-5. Review the seven-day pulse.
+## Current MVP Loop
+
+1. Choose or continue one meaningful action.
+2. Complete a focused/action session.
+3. Capture a short record.
+4. Review accumulated records.
+5. Grow toward calendar, goals, tags, trends, and user insight over time.
## Architecture
@@ -26,7 +28,7 @@ See `launch/architecture.md` for the complete responsibility map.
## Privacy
-Version 1.0.0 has no account system, server, advertising SDK, analytics SDK, billing SDK, or sensitive Android permissions. User data remains on the device unless the user explicitly exports it.
+The current implementation has no account system, server, advertising SDK, analytics SDK, billing SDK, or sensitive Android permissions. This is the current trust and launch posture, not a permanent product ceiling.
## Development
diff --git a/assets/images/growth/growth-flower.png b/assets/images/growth/growth-flower.png
deleted file mode 100644
index 6187c3c..0000000
Binary files a/assets/images/growth/growth-flower.png and /dev/null differ
diff --git a/assets/images/growth/growth-leaves.png b/assets/images/growth/growth-leaves.png
deleted file mode 100644
index 035debc..0000000
Binary files a/assets/images/growth/growth-leaves.png and /dev/null differ
diff --git a/assets/images/growth/growth-seed.png b/assets/images/growth/growth-seed.png
deleted file mode 100644
index dbbdbf3..0000000
Binary files a/assets/images/growth/growth-seed.png and /dev/null differ
diff --git a/assets/images/growth/growth-sprout.png b/assets/images/growth/growth-sprout.png
deleted file mode 100644
index e648ffe..0000000
Binary files a/assets/images/growth/growth-sprout.png and /dev/null differ
diff --git a/docs/architecture/v1.0.1-architecture.md b/docs/architecture/v1.0.1-architecture.md
index c71ecba..f32d224 100644
--- a/docs/architecture/v1.0.1-architecture.md
+++ b/docs/architecture/v1.0.1-architecture.md
@@ -1,5 +1,7 @@
# Focus Seed 1.0.1 Architecture
+Status: historical reference. The current architecture and navigation contract lives in `../../launch/architecture.md` and `../product-current-baseline.md`.
+
## Decision
Keep the app offline-first and SDK-light. Flutter renders all product UI. `shared_preferences` remains the persistence adapter because the current dataset is one small versioned document and does not require relational queries, pagination, joins, or concurrent writers.
diff --git a/docs/design/focus-seed-living-ambience-v1.0.1.png b/docs/design/focus-seed-living-ambience-v1.0.1.png
deleted file mode 100644
index 2054c93..0000000
Binary files a/docs/design/focus-seed-living-ambience-v1.0.1.png and /dev/null differ
diff --git a/docs/design/focus-seed-visual-direction-v1.0.1.png b/docs/design/focus-seed-visual-direction-v1.0.1.png
deleted file mode 100644
index c84c748..0000000
Binary files a/docs/design/focus-seed-visual-direction-v1.0.1.png and /dev/null differ
diff --git a/docs/design/focus-seed-visual-system-v1.0.2.md b/docs/design/focus-seed-visual-system-v1.0.2.md
index 8bec3f4..dd30687 100644
--- a/docs/design/focus-seed-visual-system-v1.0.2.md
+++ b/docs/design/focus-seed-visual-system-v1.0.2.md
@@ -1,6 +1,6 @@
# Focus Seed Visual System v1.0.2
-Status: planning contract. Do not treat this document as an implementation diff.
+Status: visual direction reference. Current product scope is defined in `../product-current-baseline.md`.
## Product Thesis
@@ -31,14 +31,14 @@ This direction is global-friendly, feasible in Flutter, serious enough for produ
## Target App Structure
-Preferred primary navigation:
+Current V1 primary navigation:
- Today: daily action hub.
- Focus: immersive timer and active session.
-- Habits: habit list, completion, weekly rhythm.
-- Growth: reflection, history, trends, milestones.
+- Records: focus sessions and reflection history.
+- Me: preferences, privacy, and local data controls.
-Settings should move behind a top-right profile/settings entry or a More sheet. It should not compete with the daily loop unless account, billing, or preferences become a core product surface.
+Habits and Growth are not current primary tabs. They can be promoted later only when habit management, trend review, and detail pages are real product surfaces rather than thin wrappers.
## Screen Hierarchy
@@ -46,18 +46,22 @@ Settings should move behind a top-right profile/settings entry or a More sheet.
| --- | --- | --- | --- | --- | --- |
| Today | Know what to do now | Date, greeting, main focus | Start focus or set focus | Habit summary, reflection prompt, small growth cue | Natural vertical scroll; P0 remains near top |
| Focus | Stay in one session | Current task and timer | Pause/complete/start | Duration, mode, next break, session stats | Minimal scroll; controls stable |
-| Habits | Complete and manage habits | Today progress and filters | Toggle habit / add habit | Weekly dots, streaks, edit/reorder | Dense list; sticky section controls optional |
-| Growth | Understand progress | Reflection entry or weekly summary | Reflect today / view timeline | Sessions, habits, records, trend charts | Timeline + cards; history can go to detail |
-| Settings | Adjust app and privacy | Local data, appearance, language | Change preference | Privacy, clear data, version | Compact grouped list |
+| Records | Review saved work | Focus/reflection history switch | Open Today when empty | Sessions, notes, simple trends | Timeline/list; detail pages are V2 |
+| Me | Adjust app and privacy | Local data summary | Change preference | Privacy, clear data, language | Compact grouped list |
## Visual System
Palette:
-- Primary: mature green or teal for progress and focus.
-- Secondary: restrained blue/violet for reflection or insight.
+- Brand: deep ink for identity, headings, and logo text. Do not use brand as a catch-all accent.
+- Action: blue for primary buttons, navigation selection, and forward movement.
+- Focus: blue family for timer and active-session controls.
+- Habit: amber or warm accent for small repeatable actions.
+- Reflection: violet for notes, review, and insight.
+- Success: green for completion, checkmarks, and finished progress.
+- Privacy/local: green-teal for on-device trust indicators only.
- Warm neutral surfaces instead of pure white where appropriate.
-- Semantic colors for success, warning, destructive, disabled, offline.
+- Warning/destructive/disabled/offline must remain separate semantic colors.
- Dark mode must be designed, not inverted.
Typography:
@@ -79,6 +83,14 @@ Motifs:
- Use illustration in empty states, onboarding, growth, and rewards.
- Do not decorate every card.
+Asset ambition:
+
+- Be more expressive with the logo, app icon, key illustration set, reward visuals, and store screenshots. These are allowed to carry stronger identity than the everyday UI.
+- Do not rely only on the plant metaphor. Explore sharper symbols such as focus rings, marked paths, light windows, paper cuts, modular tiles, timeline traces, and crafted seed/anchor hybrids.
+- Navigation and utility icons should stay readable and consistent, but they may use a custom symbolic grammar after the structure passes.
+- Illustrations should feel complete and production-worthy at their real display size. Avoid rough placeholder line art in polished previews.
+- Dense task surfaces stay restrained; onboarding, empty states, milestones, completion moments, and launch assets can be bolder.
+
## Interaction And Motion
Motion budget:
@@ -87,6 +99,12 @@ Motion budget:
- 15% spatial motion: tab/page/sheet/list transitions.
- 5% reward: session complete, streak, milestone.
+Motion ambition:
+
+- Reward moments may be more memorable than the base UI: focus ring bloom, path lighting, notebook mark, seed-to-signal transition, or timeline pulse.
+- Keep bold motion rare, interruptible, and non-blocking. It should celebrate completion or clarify state, not decorate every tap.
+- Use Flutter-safe primitives first. Escalate to Rive/Lottie only for a signature reward or onboarding moment with a static fallback and reduced-motion behavior.
+
Required behavior:
- Tap feedback within 100 ms.
@@ -127,9 +145,9 @@ Create or consolidate:
1. Create design, component, and motion foundations.
2. Prototype Today and Focus first; review screenshots and interaction.
-3. Add the Habits screen as a real first-class surface.
-4. Rework Growth into reflection plus progress timeline.
-5. Move Settings out of primary navigation or make it compact.
+3. Keep Records and Me honest until Habits/Growth have enough product depth to become primary tabs.
+4. Add detail pages only when they have data writes, navigation targets, and clear user outcomes.
+5. Keep Settings compact and user-facing; avoid developer-tool language.
6. Add empty/dense/error/offline/restored states.
7. Verify light/dark, English/Chinese, small phone, large text.
8. Build and test Android release after each large module.
diff --git a/docs/design/visual-direction-v1.0.1.md b/docs/design/visual-direction-v1.0.1.md
deleted file mode 100644
index 75240c7..0000000
--- a/docs/design/visual-direction-v1.0.1.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Focus Seed Visual Direction 1.0.1
-
-## Decision
-
-Use an editorial botanical interface with premium Soft 3D growth objects and state-driven Material Expressive motion.
-
-The interface remains a mature productivity product. Illustration and 3D are reserved for progress, state, onboarding, empty states, and completion feedback rather than ordinary controls.
-
-## Product Expression
-
-- Core metaphor: intention plants a seed; focus, habits, and reflection grow it.
-- Navigation: Today, Journey, Me.
-- Today expands the current next action and compresses completed or future stages.
-- Journey shows the relationship between daily actions and growth rather than a generic statistics dashboard.
-- Ordinary lists, forms, dialogs, and settings stay compact and familiar.
-
-## Visual Balance
-
-- 72% functional editorial UI
-- 18% Soft 3D state objects
-- 10% botanical illustration, semantic accent, and motion
-
-## Foundation Tokens
-
-- Porcelain: `#F7F8F5`
-- Ink: `#17211C`
-- Leaf: `#4D8B63`
-- Mint: `#A9E8B5`
-- Ultramarine: `#4E63D8`
-- Coral: `#EA725E`
-- Radii: `8`, `12`, `16`
-- Spacing: four-point base with an eight-point layout rhythm
-- Elevation: two restrained levels plus hairline separators
-- Body type: 14-16 logical pixels with compact headings
-
-## Growth States
-
-- Seed: no intention
-- Sprout: intention saved
-- Leaves: focus and habit progress
-- Flower: reflection complete
-
-Every state needs a non-color cue. Reduced-motion mode replaces growth animation with crossfade and an immediate state swap.
-
-## Living Ambience System
-
-Use stable structure with slowly changing ambience. Time must never move controls, change navigation, alter semantic meaning, or reduce contrast.
-
-### Local Time Modes
-
-- Dawn, `05:00-09:59`: cool porcelain, pale sky-mint surface tint, low-stimulation entrance, dew highlight on seed or sprout.
-- Day, `10:00-16:59`: clean porcelain, highest information clarity, leaf and ultramarine accents.
-- Dusk, `17:00-20:59`: restrained coral-lilac tint, softer localized shadows, reflection receives more visual priority when pending.
-- Night, `21:00-04:59`: warm graphite, off-white text, mint primary, muted violet reflection accent, no bright glow.
-
-Determine the mode from the device clock. Do not request location or network access. Re-evaluate on launch, resume, and the next time boundary; never run a background polling loop.
-
-### Priority Order
-
-1. Accessibility and contrast requirements
-2. Explicit user Light, Dark, or System appearance preference
-3. Platform reduced-motion and high-contrast settings
-4. Time ambience within the selected appearance
-5. Product growth state
-
-If the user forces Light or Dark, preserve that appearance and vary only compatible neutral tints and object lighting. System appearance always wins over an automatic day/night surface switch.
-
-### Week And Season
-
-- Weekday/weekend may adjust optional greeting copy and recommended session length, but must not rearrange the interface.
-- Do not infer physical season from month alone for a global audience because hemispheres differ.
-- Offer optional Growth Seasons as cosmetic progression chapters. They are driven by product progress or an explicit user choice, not location.
-- Avoid weather, religious, national, and holiday imagery unless the user explicitly enables a localized pack.
-
-## Motion Contract
-
-- Press response: `120ms`
-- Ordinary state transition: `180-240ms`
-- Growth transformation: `360-480ms`
-- One-time completion celebration: no more than `700ms`
-- Page transition: preserve spatial continuity and remain under `300ms`
-
-Motion events:
-
-- Intention saved: seed rises, settles, and becomes a sprout.
-- Focus starts: progress begins; plant movement is nearly imperceptible.
-- Habit completes: checkbox morphs to a leaf and one leaf unfolds.
-- Reflection saves: flower opens once, then remains still.
-- Background restoration: timer and plant immediately snap to correct data, followed by a short confirmation.
-
-Never run continuous decorative motion. Pause nonessential animation when the app is inactive, during scrolling, under battery-saving conditions, or when reduced motion is enabled. Reduced motion uses crossfade, opacity, and immediate state replacement.
-
-## Variation Budget
-
-- Structure and navigation: `0%` time-based variation
-- Semantic colors and action meaning: `0%` variation
-- Neutral surfaces and background tint: subtle variation only
-- Plant state: driven by real user progress
-- Illustration: reserved for onboarding, empty states, milestones, and completion
-- Copy: may vary by time while preserving the same meaning and action
-
-The goal is recognition with freshness, not novelty on every launch.
-
-## Guardrails
-
-- No childish faces or mascot behavior.
-- No oversized 3D hero or giant timer.
-- No card-per-section dashboard.
-- No decorative illustration without state meaning.
-- No animation that delays input or hides status.
-- Validate long localization, 200% text, dense lists, keyboard, offline restoration, loading, and recoverable errors.
-
-## Visual Reference
-
-See `focus-seed-visual-direction-v1.0.1.png` in this directory.
-
-See `focus-seed-living-ambience-v1.0.1.png` for time modes and motion behavior.
diff --git a/docs/roadmaps/v1.0.2-local-database-product-loop.md b/docs/roadmaps/v1.0.2-local-database-product-loop.md
index 33af19b..5afe7ed 100644
--- a/docs/roadmaps/v1.0.2-local-database-product-loop.md
+++ b/docs/roadmaps/v1.0.2-local-database-product-loop.md
@@ -1,5 +1,7 @@
# Focus Seed 1.0.2 Local Database Product Loop
+Status: historical implementation/reference plan. Superseded for active product direction by `../product-current-baseline.md`.
+
## Decision Header
- Objective: move Focus Seed from a simple local MVP into a richer offline-first product with durable history, user-facing settings, and basic retention feedback.
diff --git a/launch/architecture.md b/launch/architecture.md
index 8c4f941..221181f 100644
--- a/launch/architecture.md
+++ b/launch/architecture.md
@@ -1,6 +1,6 @@
# Focus Seed Architecture
-Status: refactored from single-file prototype into modular Flutter structure.
+Status: current release architecture for Focus Seed 1.0.2.
## Directory Layout
@@ -8,77 +8,71 @@ Status: refactored from single-file prototype into modular Flutter structure.
lib/
main.dart
src/
- app/
- focus_seed_app.dart
- app_theme.dart
- core/
- date_keys.dart
- iterable_extensions.dart
- json_utils.dart
- data/
- focus_seed_store.dart
- models/
- app_state.dart
- focus_session.dart
- habit.dart
- mood.dart
- reflection_entry.dart
- services/
- analytics_provider.dart
- monetization_provider.dart
- features/
- shell/
- focus_seed_home.dart
- home/
- home_screen.dart
- timer/
- timer_screen.dart
- habits/
- habits_screen.dart
- reflection/
- reflection_screen.dart
- settings/
- settings_screen.dart
- widgets/
- app_scaffold.dart
- dialogs.dart
- empty_state.dart
- habit_row.dart
- inline_editable_text.dart
- loading_view.dart
- metric_tile.dart
- section_label.dart
- seed_card.dart
- settings_tile.dart
- weekly_progress.dart
+ app/ app shell, theme, ambience, localization setup
+ application/ product controllers and timer lifecycle
+ core/ date keys, focus durations, ambience, utilities
+ data/ local persistence boundary
+ data/local/ Drift SQLite database
+ models/ immutable product models and derived state
+ services/ no-op analytics and monetization interfaces
+ features/ Today, Focus, Records, Me, habits, onboarding, reflection, shell
+ widgets/ reusable panels, dialogs, headers, loading, illustrations
```
## Responsibility Boundaries
- `main.dart`: process entry only.
-- `src/app`: app shell and theme.
-- `src/models`: serializable domain objects.
-- `src/data`: persistence boundary using `shared_preferences`.
-- `src/services`: no-op interfaces for analytics and monetization.
-- `src/features/shell`: state orchestration and feature routing.
+- `src/app`: app-level theme, locale policy, ambience updates, and shell bootstrapping.
+- `src/application`: user commands, save rollback, local analytics events, and timer lifecycle.
+- `src/core`: framework-light utilities and product constants.
+- `src/data`: persistence boundary used by controllers.
+- `src/data/local`: Drift tables, SQLite connection, and product-data clearing.
+- `src/models`: product snapshots, sessions, habits, reflections, mood, records, and progress models.
+- `src/services`: SDK-light interfaces with no-op implementations.
+- `src/features/shell`: top-level navigation and controller wiring.
- `src/features/*`: screen-level UI and user flows.
-- `src/widgets`: reusable UI components and dialogs.
-- `src/core`: framework-light utilities.
+- `src/widgets`: reusable UI primitives.
+
+Widgets render state and forward intent. Controllers own commands. `FocusSeedStore` is the durable persistence boundary. Feature UI does not write to SQLite directly.
+
+## Current Product Structure
+
+Primary destinations:
+
+- Today: daily focus, timer entry, habit summary, reflection prompt, and loop progress.
+- Focus: immersive timer and active-session context.
+- Records: completed focus sessions, reflections, and lightweight history.
+- Me: preferences, privacy, local data controls, and about/legal surfaces.
+
+Habits are a Today support flow, not a primary tab. Growth/Journey was removed from the V1 primary surface; review belongs in Records until a future feature has enough depth to justify a dedicated destination.
+
+## Persistence
+
+Focus Seed is offline-first and stores product data locally with Drift/SQLite:
+
+- `daily_intentions`
+- `focus_sessions`
+- `habits`
+- `habit_logs`
+- `reflections`
+- `app_settings`
+
+The current user-facing app exposes no manual data transfer tools. Existing legacy local preference data is migrated once into SQLite when present, then removed. Small app preferences such as appearance and development language selection remain local preferences.
## Current Design Decisions
- No real ad SDK in V1.
- No real billing SDK in V1.
- No analytics SDK in V1.
-- No network dependency.
-- JSON import/export uses copy/paste to avoid file permissions.
-- Shell owns state until a future state-management package is justified.
+- No account, server, or network dependency.
+- Default focus duration is a user-facing local setting.
+- Clear today resets only today's loop.
+- Delete all data clears local product records while preserving app preference behavior where appropriate.
## Upgrade Path
-Next modularization steps when needed:
-
-- Move `src/app`, `src/core`, `src/models`, `src/services`, and `src/widgets` into shared packages.
-- Replace shell state with Riverpod once multiple apps/features share the same state patterns.
-- Add real `AnalyticsProvider`, `MonetizationProvider`, and remote config implementations only with privacy/Data safety updates.
-- Add golden tests for key screens before scaling the app factory.
+- Keep Drift as the local source of truth while the product remains offline-first.
+- Add DAO-style query methods before history grows large enough to make whole-snapshot writes inefficient.
+- Add Riverpod or a repository package only when multiple apps or features need shared state patterns.
+- Add real analytics, ads, billing, remote config, or sync only with privacy, Data safety, policy, and tests in the same release.
+- Add golden or screenshot tests before scaling launch screenshots or visual variants.
diff --git a/launch/play-console/closed-testing-plan.md b/launch/play-console/closed-testing-plan.md
index 73e016f..f378522 100644
--- a/launch/play-console/closed-testing-plan.md
+++ b/launch/play-console/closed-testing-plan.md
@@ -31,11 +31,11 @@ Official references:
2. Publish an internal testing release.
- Upload `build/app/outputs/bundle/release/app-release.aab`.
- - Use release name `1.0.0 internal`.
+ - Use release name `1.0.2 internal`.
- Release notes:
```text
- First internal test release.
- Includes focus timer, habit tracking, daily reflection, local progress stats, JSON export/import, and local privacy controls.
+ Internal test release for Focus Seed.
+ Includes focus timer, habit tracking, daily reflection, local progress stats, default focus duration, and local privacy controls.
```
- Add yourself and one or two trusted accounts if available.
- Use this to confirm Play delivery and installation.
@@ -45,11 +45,11 @@ Official references:
- Create track name: `Focus Seed V1 closed test`.
- Countries/regions: use English-first regions from `region-localization-strategy.md`.
- Upload the same AAB.
- - Release name: `1.0.0 closed test`.
+ - Use release name `1.0.2 closed test`.
- Release notes:
```text
- First closed test release for Focus Seed.
- Please test the Today, Timer, Habits, Reflect, Settings, Export JSON, Import JSON, and Clear local data flows.
+ Closed test release for Focus Seed.
+ Please test Today, Focus, Records, Me, habit management from Today, default focus duration, clear today's loop, delete local records, and privacy information.
```
4. Add testers.
@@ -58,11 +58,11 @@ Official references:
- Minimum passing target: 12 opted-in testers.
- Tester emails must be Google accounts that can access Google Play.
- Adding emails is not enough. Each tester must open the opt-in link and join the test.
- - If uploading CSV, use one email address per line with no comma and no header row. Use `tester-email-list-no-header.csv` as the safer template.
+ - If uploading CSV, use one email address per line with no comma and no header row.
5. Send tester instructions.
- Send the opt-in link from Play Console.
- - Ask each tester to confirm after they see the "You're a tester" or equivalent joined state.
+ - Ask each tester to confirm after they see the joined tester state.
- Ask each tester to install and open the app at least once.
6. Track 14 days.
@@ -74,14 +74,14 @@ Official references:
- Apply from the Play Console dashboard when eligible.
- Answer questions using the notes in this file.
-## 12 Tester Strategy For A Solo Developer
+## Tester Strategy For A Solo Developer
Best compliant sources:
- Friends and family with Android phones and Google accounts.
- Former classmates, coworkers, or community contacts.
- Small indie developer groups where members exchange real testing help.
-- Productivity/focus communities where you honestly ask for feedback.
+- Productivity or focus communities where you honestly ask for feedback.
- Existing users from your personal network.
Recommended count:
@@ -108,35 +108,7 @@ Tester success checklist:
- Tester tries at least one real flow.
- Tester sends short feedback privately.
-## Tester Invitation Message - Chinese
-
-```text
-我在 Google Play 上做一个新的 Android 应用封闭测试，名字是 Focus Seed。
-它是一个轻量的专注计时、习惯追踪和每日反思工具，不需要账号、不收费、没有广告。
-
-能麻烦你帮我测试一下吗？
-
-步骤：
-1. 用你的 Android 手机打开这个测试链接：
- [粘贴 Play Console opt-in 链接]
-2. 确认加入测试。
-3. 从 Google Play 安装 Focus Seed。
-4. 打开 App，试一下：
- - Today 页面设置一个今日重点
- - Timer 页面启动或完成一次专注
- - Habits 页面勾选一个习惯
- - Reflect 页面写一句反思
- - Settings 页面看一下隐私/导出入口
-5. 测完后告诉我：
- - 是否能正常安装和打开
- - 哪个页面最不清楚
- - 有没有崩溃、卡顿、文字看不清或按钮点不了
-
-这个测试需要保持加入状态 14 天。你不需要每天使用，但请不要退出测试。
-谢谢！
-```
-
-## Tester Invitation Message - English
+## Tester Invitation Message
```text
I am running a closed Google Play test for a new Android app called Focus Seed.
@@ -150,11 +122,13 @@ Steps:
2. Join the test.
3. Install Focus Seed from Google Play.
4. Try these flows:
- - Set a daily anchor on Today
+ - Set today's focus on Today
- Start or complete a focus timer
- Check off a habit
- Save a short reflection
- - Open Settings and review privacy/export controls
+ - Open Records and view progress/history
+ - Open Me and change the default focus duration
+ - Review privacy information and local data controls
5. Send me quick feedback:
- Did install/open work?
- Was any screen confusing?
@@ -166,23 +140,20 @@ Thank you!
## Quick Feedback Questions
-Send these as a message or simple form:
-
```text
1. Your phone model:
2. Android version, if known:
3. Did the app install from Google Play? Yes / No
4. Did the app open successfully? Yes / No
-5. Which screen did you try? Today / Timer / Habits / Reflect / Settings
-6. Any crash, freeze, lag, or layout issue?
-7. What felt confusing?
-8. One thing you would improve:
+5. Which screen did you try? Today / Focus / Records / Me / habit manager
+6. Did default focus duration work as expected?
+7. Any crash, freeze, lag, or layout issue?
+8. What felt confusing?
+9. One thing you would improve:
```
## Tester Tracking Table
-Use a spreadsheet or notes app:
-
```text
Tester name | Google account email | Invited | Opted in | Installed | Opened app | Feedback received | Still opted in day 14
```
@@ -199,8 +170,8 @@ Target:
Use these points when Play Console asks about the closed test:
- App purpose: Focus Seed is a private focus timer, habit tracker, and daily reflection app.
-- Test scope: Today anchor, timer, habits, reflection, settings, export/import, and local data deletion.
+- Test scope: Today focus, timer, habits, reflection, Records/history, Me/settings, default focus duration, clear today's loop, delete local records, and privacy information.
- Tester recruitment: invited trusted Android users through direct email/message using the Play Console opt-in link.
- Feedback collected: installation success, first-run clarity, timer usability, habit check-off, reflection save flow, settings/privacy clarity, layout or crash reports.
-- Actions taken: fixed native Android launch package path, removed unfinished ads/subscription placeholders from settings, verified release build on Android 14.
+- Actions taken: verified local-only storage, removed obsolete data-transfer wording, added default focus duration, and checked release-sensitive privacy wording.
- Readiness: no account, no server, no ads, no billing, no analytics SDK, no sensitive permissions, privacy policy and Data safety match the shipped app.
diff --git a/launch/play-console/data-safety-guide.md b/launch/play-console/data-safety-guide.md
index 8c78273..10a2dca 100644
--- a/launch/play-console/data-safety-guide.md
+++ b/launch/play-console/data-safety-guide.md
@@ -8,8 +8,8 @@ This guidance assumes the submitted build is the current Focus Seed V1:
- No analytics SDK.
- No billing SDK.
- No network permission.
-- Data stored locally with `shared_preferences`.
-- Export/import is user-controlled copy/paste JSON.
+- Data stored locally with Drift/SQLite plus small local preferences.
+- User can clear today's loop or delete local app records from settings.
## Suggested Data Safety Answers
diff --git a/launch/play-console/store-listing.md b/launch/play-console/store-listing.md
index c119bb7..1165ae2 100644
--- a/launch/play-console/store-listing.md
+++ b/launch/play-console/store-listing.md
@@ -10,9 +10,9 @@ Private focus timer, habit tracker, and one-minute daily reflection.
## Full Description
-Focus Seed helps you turn each day into a small, trackable win. Choose today’s anchor task, start a focused timer, mark habits as done, and write a short reflection when you finish.
+Focus Seed helps you turn each day into a small, trackable win. Choose today's anchor task, start a focused timer, mark habits as done, and write a short reflection when you finish.
-Everything works locally on your device. No account is required, and your focus sessions, habits, and reflections stay on your phone unless you choose to export them.
+Everything works locally on your device. No account is required, and your focus sessions, habits, reflections, and preferences stay on your phone.
Features:
@@ -22,7 +22,7 @@ Features:
- One-minute reflection log
- Mood tags
- Local 7-day progress view
-- JSON export and import
+- Default focus duration preference
- Clear local-data privacy controls
Focus Seed is designed for people who want a lightweight productivity tool without accounts, feeds, or complicated setup.
@@ -47,11 +47,11 @@ focus timer, habit tracker, reflection, productivity, offline, private, daily ro
## Release Notes
-First release:
+Current release:
- Focus timer
- Habit tracker
- Daily reflection
- Local progress stats
-- Local JSON export/import
+- Default focus duration setting
- In-app privacy controls
diff --git a/launch/privacy/privacy-policy.html b/launch/privacy/privacy-policy.html
index 9fdc47c..51a80dd 100644
--- a/launch/privacy/privacy-policy.html
+++ b/launch/privacy/privacy-policy.html
@@ -71,17 +71,15 @@
Habit names and completion dates
Focus session completion time and duration
Reflection notes and mood tags
+ App preferences such as appearance and default focus duration
Basic app state needed for the app to work
Data Sharing
Focus Seed V1 does not share your app data with the developer or third parties.
- Export And Import
- You can export your local data as JSON from the app settings. You control where that exported text is copied or stored. You can also paste a previous JSON export into the app to import it.
-
Data Deletion
- You can clear local app data from Settings. You can also remove data by uninstalling the app or clearing app storage in Android settings.
+ You can clear today's loop or delete local app records from Settings. You can also remove data by uninstalling the app or clearing app storage in Android settings.
Ads, Analytics, And Purchases
Focus Seed V1 does not include advertising SDKs, analytics SDKs, or in-app purchase SDKs.
diff --git a/launch/privacy/privacy-policy.md b/launch/privacy/privacy-policy.md
index 8578017..7565bb7 100644
--- a/launch/privacy/privacy-policy.md
+++ b/launch/privacy/privacy-policy.md
@@ -16,19 +16,16 @@ The app stores the following data locally on your device:
- Habit names and completion dates
- Focus session completion time and duration
- Reflection notes and mood tags
+- App preferences such as appearance and default focus duration
- Basic app state needed for the app to work
## Data Sharing
Focus Seed V1 does not share your app data with the developer or third parties.
-## Export And Import
-
-You can export your local data as JSON from the app settings. You control where that exported text is copied or stored. You can also paste a previous JSON export into the app to import it.
-
## Data Deletion
-You can clear local app data from Settings. You can also remove data by uninstalling the app or clearing app storage in Android settings.
+You can clear today's loop or delete local app records from Settings. You can also remove data by uninstalling the app or clearing app storage in Android settings.
## Ads, Analytics, And Purchases
diff --git a/launch/product-brief.md b/launch/product-brief.md
index 07d2239..2bc2aa2 100644
--- a/launch/product-brief.md
+++ b/launch/product-brief.md
@@ -1,6 +1,6 @@
# Focus Seed Product Brief
-Status: V1 release candidate
+Status: historical release reference. Superseded for active product decisions by `docs/product-current-baseline.md`.
## Positioning
@@ -13,10 +13,11 @@ Focus Seed is a private, offline-first focus timer, habit tracker, and one-minut
- Habit creation, rename, delete, and daily check-off.
- One-minute reflection with mood tag.
- 7-day progress pulse.
-- Local JSON export and import by copy/paste.
- In-app privacy explanation.
+- Local data controls: clear today's loop or delete all local records.
+- User-facing settings for appearance and default focus duration.
- No-op monetization and analytics interfaces.
-- English-only UI and store listing for the first launch wave.
+- Release defaults to English UI and English store listing for the first launch wave. Chinese remains development/testing support only.
## V1 Exclusions
@@ -50,7 +51,7 @@ Defer EU/EEA, United Kingdom, Switzerland, South Korea, Japan, Brazil/LATAM, and
## Future Revenue Path
- V2/V3: optional low-interruption ads after retention validation.
-- V4/V5: one-time unlock or subscription for advanced statistics, themes, export templates, widgets, and backup/sync.
+- V4/V5: one-time unlock or subscription for advanced statistics, premium themes, widgets, and backup/sync.
- Free core loop remains usable.
## App IDs
@@ -59,6 +60,6 @@ Defer EU/EEA, United Kingdom, Switzerland, South Korea, Japan, Brazil/LATAM, and
- Developer / brand: leavysong
- Support email: leavysong@gmail.com
- Package/application ID: `com.dailyanchor.focusseed`
-- Version: `1.0.0+1`
+- Version: `1.0.2+3`
- Android min SDK: 26
- Android target SDK: 35
diff --git a/launch/roadmaps/v1.0.1-experience-brief.md b/launch/roadmaps/v1.0.1-experience-brief.md
index 57a0ed6..08d8690 100644
--- a/launch/roadmaps/v1.0.1-experience-brief.md
+++ b/launch/roadmaps/v1.0.1-experience-brief.md
@@ -1,6 +1,8 @@
# Focus Seed 1.0.1 Experience Brief
-Status: approved product and design principles, visual route not yet selected.
+Status: historical experience reference. Superseded for active product direction by `../../docs/product-current-baseline.md`.
+
+Previous status: approved product and design principles, visual route not yet selected.
## Product Intent
diff --git a/launch/screenshots/screenshot-plan.md b/launch/screenshots/screenshot-plan.md
index 0e662d8..160a815 100644
--- a/launch/screenshots/screenshot-plan.md
+++ b/launch/screenshots/screenshot-plan.md
@@ -18,7 +18,7 @@ Recommended phone screenshots:
2. Focus timer with progress ring.
3. Habits screen with completed and pending habits.
4. Reflection screen with mood tags and text area.
-5. Settings screen showing local data export/import and privacy.
+5. Settings screen showing appearance, default focus duration, local data controls, and privacy.
Suggested captions:
@@ -26,7 +26,7 @@ Suggested captions:
- Start a calm focus session.
- Track tiny habits without an account.
- Finish with a one-minute reflection.
-- Keep your data local and export when needed.
+- Keep your records local and under your control.
Feature graphic direction:
diff --git a/lib/src/app/app_theme.dart b/lib/src/app/app_theme.dart
index 2039c3e..01dcda6 100644
--- a/lib/src/app/app_theme.dart
+++ b/lib/src/app/app_theme.dart
@@ -4,33 +4,38 @@ import '../core/ambience.dart';
class AppTheme {
static const ink = Color(0xFF17211C);
- static const leaf = Color(0xFF4D8B63);
- static const mint = Color(0xFFA9E8B5);
- static const ultramarine = Color(0xFF4E63D8);
- static const coral = Color(0xFFEA725E);
- static const violet = Color(0xFF7856D8);
- static const porcelain = Color(0xFFF7F8F5);
+ static const forest = Color(0xFF08785B);
+ static const teal = Color(0xFF0A8179);
+ static const moss = Color(0xFF6C8F6B);
+ static const mint = Color(0xFFA8E6C1);
+ static const ultramarine = Color(0xFF2E6FDB);
+ static const sky = Color(0xFF42A5F5);
+ static const amber = Color(0xFFE3A321);
+ static const coral = Color(0xFFD9654F);
+ static const violet = Color(0xFF7257C8);
+ static const paper = Color(0xFFFAFBFF);
+ static const porcelain = Color(0xFFF4F7FC);
static ThemeData light(DayPhase phase) {
final surface = switch (phase) {
- DayPhase.dawn => const Color(0xFFF3F8F7),
+ DayPhase.dawn => const Color(0xFFF3F8FC),
DayPhase.day => porcelain,
- DayPhase.dusk => const Color(0xFFFBF5F2),
- DayPhase.night => const Color(0xFFF3F5F3),
+ DayPhase.dusk => const Color(0xFFFBF6F4),
+ DayPhase.night => const Color(0xFFF2F5FA),
};
- final scheme = ColorScheme.fromSeed(seedColor: leaf).copyWith(
- primary: leaf,
+ final scheme = ColorScheme.fromSeed(seedColor: ultramarine).copyWith(
+ primary: ultramarine,
onPrimary: Colors.white,
secondary: ultramarine,
- tertiary: coral,
+ tertiary: amber,
surface: surface,
onSurface: ink,
- surfaceContainerLowest: Colors.white.withValues(alpha: 0.82),
- surfaceContainerLow: Colors.white.withValues(alpha: 0.72),
- surfaceContainer: const Color(0xFFF0F3EF),
- surfaceContainerHigh: const Color(0xFFE9EEE9),
- outline: const Color(0xFFB9C2BA),
- outlineVariant: const Color(0xFFDDE3DD),
+ surfaceContainerLowest: const Color(0xFFFFFEFA),
+ surfaceContainerLow: const Color(0xFFEFF3FA),
+ surfaceContainer: const Color(0xFFE4EAF4),
+ surfaceContainerHigh: const Color(0xFFD6DEEB),
+ outline: const Color(0xFF9EA9B8),
+ outlineVariant: const Color(0xFFD5DEEA),
);
return _base(scheme, phase);
}
@@ -42,50 +47,32 @@ class AppTheme {
DayPhase.dusk => const Color(0xFF1A181A),
DayPhase.night => const Color(0xFF101614),
};
- final scheme = ColorScheme.fromSeed(
- seedColor: mint,
- brightness: Brightness.dark,
- ).copyWith(
- primary: mint,
- onPrimary: ink,
- secondary: const Color(0xFFB9C2FF),
- tertiary: const Color(0xFFFFB4A8),
+ final scheme = ColorScheme.fromSeed(seedColor: mint, brightness: Brightness.dark).copyWith(
+ primary: const Color(0xFF8FBAFF),
+ onPrimary: const Color(0xFF071226),
+ secondary: const Color(0xFF8FBAFF),
+ tertiary: const Color(0xFFFFD782),
surface: surface,
onSurface: const Color(0xFFF1F5F1),
surfaceContainerLowest: const Color(0xFF0D1210),
- surfaceContainerLow: const Color(0xFF171E1B),
- surfaceContainer: const Color(0xFF1C2420),
- surfaceContainerHigh: const Color(0xFF243029),
- outline: const Color(0xFF7E8D83),
- outlineVariant: const Color(0xFF344039),
+ surfaceContainerLow: const Color(0xFF151C24),
+ surfaceContainer: const Color(0xFF1B2430),
+ surfaceContainerHigh: const Color(0xFF253142),
+ outline: const Color(0xFF7F8EA4),
+ outlineVariant: const Color(0xFF344153),
);
return _base(scheme, phase);
}
static ThemeData _base(ColorScheme scheme, DayPhase phase) {
- final base = ThemeData(
- useMaterial3: true,
- colorScheme: scheme,
- scaffoldBackgroundColor: scheme.surface,
- );
+ final base = ThemeData(useMaterial3: true, colorScheme: scheme, scaffoldBackgroundColor: scheme.surface);
final textTheme = base.textTheme.copyWith(
- headlineSmall: base.textTheme.headlineSmall?.copyWith(
- fontWeight: FontWeight.w700,
- height: 1.15,
- ),
- titleLarge: base.textTheme.titleLarge?.copyWith(
- fontWeight: FontWeight.w700,
- height: 1.2,
- ),
- titleMedium: base.textTheme.titleMedium?.copyWith(
- fontWeight: FontWeight.w600,
- height: 1.25,
- ),
+ headlineSmall: base.textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.w700, height: 1.15),
+ titleLarge: base.textTheme.titleLarge?.copyWith(fontWeight: FontWeight.w700, height: 1.2),
+ titleMedium: base.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600, height: 1.25),
bodyLarge: base.textTheme.bodyLarge?.copyWith(height: 1.4),
bodyMedium: base.textTheme.bodyMedium?.copyWith(height: 1.4),
- labelLarge: base.textTheme.labelLarge?.copyWith(
- fontWeight: FontWeight.w600,
- ),
+ labelLarge: base.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w600),
);
return base.copyWith(
textTheme: textTheme,
@@ -94,34 +81,22 @@ class AppTheme {
elevation: 0,
margin: EdgeInsets.zero,
color: scheme.surfaceContainerLowest,
- shadowColor: ink.withValues(alpha: 0.12),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(12),
- side: BorderSide(color: scheme.outlineVariant),
- ),
+ shadowColor: ink.withValues(alpha: 0.10),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
),
navigationBarTheme: NavigationBarThemeData(
- height: 68,
+ height: 72,
elevation: 0,
backgroundColor: scheme.surfaceContainerLowest,
- indicatorColor: scheme.primary.withValues(alpha: 0.14),
- labelTextStyle: WidgetStateProperty.resolveWith(
- (states) => TextStyle(
- fontSize: 12,
- fontWeight:
- states.contains(WidgetState.selected)
- ? FontWeight.w700
- : FontWeight.w500,
- ),
- ),
+ indicatorColor: scheme.primary.withValues(alpha: 0.13),
+ iconTheme: WidgetStateProperty.resolveWith((states) => IconThemeData(size: 23, color: states.contains(WidgetState.selected) ? scheme.primary : scheme.onSurfaceVariant)),
+ labelTextStyle: WidgetStateProperty.resolveWith((states) => TextStyle(fontSize: 12, fontWeight: states.contains(WidgetState.selected) ? FontWeight.w700 : FontWeight.w500)),
),
filledButtonTheme: FilledButtonThemeData(
style: FilledButton.styleFrom(
minimumSize: const Size(48, 48),
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(12),
- ),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
textStyle: const TextStyle(fontWeight: FontWeight.w700),
),
),
@@ -129,47 +104,24 @@ class AppTheme {
style: OutlinedButton.styleFrom(
minimumSize: const Size(48, 48),
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(12),
- ),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
),
),
inputDecorationTheme: InputDecorationTheme(
filled: true,
fillColor: scheme.surfaceContainerLow,
- contentPadding: const EdgeInsets.symmetric(
- horizontal: 14,
- vertical: 13,
- ),
- border: OutlineInputBorder(
- borderRadius: BorderRadius.circular(12),
- borderSide: BorderSide(color: scheme.outlineVariant),
- ),
- enabledBorder: OutlineInputBorder(
- borderRadius: BorderRadius.circular(12),
- borderSide: BorderSide(color: scheme.outlineVariant),
- ),
- ),
- chipTheme: base.chipTheme.copyWith(
- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
- side: BorderSide(color: scheme.outlineVariant),
- ),
- dividerTheme: DividerThemeData(
- color: scheme.outlineVariant,
- space: 1,
- thickness: 1,
- ),
- dialogTheme: DialogTheme(
- backgroundColor: scheme.surfaceContainerLowest,
- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+ contentPadding: const EdgeInsets.symmetric(horizontal: 14, vertical: 13),
+ border: OutlineInputBorder(borderRadius: BorderRadius.circular(12), borderSide: BorderSide(color: scheme.outlineVariant.withValues(alpha: 0.22))),
+ enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(12), borderSide: BorderSide(color: scheme.outlineVariant.withValues(alpha: 0.22))),
),
+ chipTheme: base.chipTheme.copyWith(shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), side: BorderSide(color: scheme.outlineVariant.withValues(alpha: 0.38))),
+ dividerTheme: DividerThemeData(color: scheme.outlineVariant.withValues(alpha: 0.64), space: 1, thickness: 1),
+ dialogTheme: DialogTheme(backgroundColor: scheme.surfaceContainerLowest, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16))),
bottomSheetTheme: BottomSheetThemeData(
backgroundColor: scheme.surface,
modalBackgroundColor: scheme.surface,
showDragHandle: true,
- shape: const RoundedRectangleBorder(
- borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
- ),
+ shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(16))),
),
extensions: [FocusSeedVisuals.forPhase(phase, scheme.brightness)],
);
@@ -180,14 +132,26 @@ class AppTheme {
class FocusSeedVisuals extends ThemeExtension {
const FocusSeedVisuals({
required this.ambientTint,
+ required this.brand,
+ required this.action,
+ required this.focus,
+ required this.habit,
required this.reflection,
required this.success,
+ required this.privacy,
+ required this.warning,
required this.shadow,
});
final Color ambientTint;
+ final Color brand;
+ final Color action;
+ final Color focus;
+ final Color habit;
final Color reflection;
final Color success;
+ final Color privacy;
+ final Color warning;
final Color shadow;
static FocusSeedVisuals of(BuildContext context) {
@@ -203,24 +167,31 @@ class FocusSeedVisuals extends ThemeExtension {
DayPhase.night => const Color(0xFF9A89D8),
};
return FocusSeedVisuals(
- ambientTint: ambientTint.withValues(alpha: isDark ? 0.18 : 0.22),
- reflection: isDark ? const Color(0xFFBDAAFF) : AppTheme.violet,
- success: isDark ? AppTheme.mint : AppTheme.leaf,
+ ambientTint: ambientTint.withValues(alpha: isDark ? 0.14 : 0.18),
+ brand: isDark ? const Color(0xFFF1F5F1) : AppTheme.ink,
+ action: isDark ? const Color(0xFFFFB09D) : AppTheme.coral,
+ focus: isDark ? const Color(0xFF8FBAFF) : AppTheme.ultramarine,
+ habit: isDark ? const Color(0xFFFFD782) : AppTheme.amber,
+ reflection: isDark ? const Color(0xFFC7B8FF) : AppTheme.violet,
+ success: isDark ? AppTheme.mint : AppTheme.forest,
+ privacy: isDark ? const Color(0xFF8DDFC1) : AppTheme.forest,
+ warning: isDark ? const Color(0xFFFFB4A8) : AppTheme.coral,
shadow: Colors.black.withValues(alpha: isDark ? 0.32 : 0.10),
);
}
@override
- FocusSeedVisuals copyWith({
- Color? ambientTint,
- Color? reflection,
- Color? success,
- Color? shadow,
- }) {
+ FocusSeedVisuals copyWith({Color? ambientTint, Color? brand, Color? action, Color? focus, Color? habit, Color? reflection, Color? success, Color? privacy, Color? warning, Color? shadow}) {
return FocusSeedVisuals(
ambientTint: ambientTint ?? this.ambientTint,
+ brand: brand ?? this.brand,
+ action: action ?? this.action,
+ focus: focus ?? this.focus,
+ habit: habit ?? this.habit,
reflection: reflection ?? this.reflection,
success: success ?? this.success,
+ privacy: privacy ?? this.privacy,
+ warning: warning ?? this.warning,
shadow: shadow ?? this.shadow,
);
}
@@ -232,8 +203,14 @@ class FocusSeedVisuals extends ThemeExtension {
}
return FocusSeedVisuals(
ambientTint: Color.lerp(ambientTint, other.ambientTint, t)!,
+ brand: Color.lerp(brand, other.brand, t)!,
+ action: Color.lerp(action, other.action, t)!,
+ focus: Color.lerp(focus, other.focus, t)!,
+ habit: Color.lerp(habit, other.habit, t)!,
reflection: Color.lerp(reflection, other.reflection, t)!,
success: Color.lerp(success, other.success, t)!,
+ privacy: Color.lerp(privacy, other.privacy, t)!,
+ warning: Color.lerp(warning, other.warning, t)!,
shadow: Color.lerp(shadow, other.shadow, t)!,
);
}
diff --git a/lib/src/app/focus_seed_app.dart b/lib/src/app/focus_seed_app.dart
index 74e2880..3f3e2a7 100644
--- a/lib/src/app/focus_seed_app.dart
+++ b/lib/src/app/focus_seed_app.dart
@@ -7,10 +7,12 @@ import 'package:flutter_localizations/flutter_localizations.dart';
import '../core/ambience.dart';
import '../data/app_preferences_store.dart';
import '../data/focus_seed_store.dart';
+import '../features/onboarding/welcome_screen.dart';
import '../features/shell/focus_seed_home.dart';
import '../l10n/generated/app_localizations.dart';
import '../models/appearance_preference.dart';
import '../models/language_preference.dart';
+import '../widgets/loading_view.dart';
import 'app_theme.dart';
@visibleForTesting
@@ -19,10 +21,16 @@ Locale focusSeedDefaultLocale({bool isRelease = kReleaseMode}) {
}
class FocusSeedApp extends StatefulWidget {
- const FocusSeedApp({this.locale, this.focusSeedStore, super.key});
+ const FocusSeedApp({
+ this.locale,
+ this.focusSeedStore,
+ this.showWelcomeOnFirstRun = true,
+ super.key,
+ });
final Locale? locale;
final FocusSeedStore? focusSeedStore;
+ final bool showWelcomeOnFirstRun;
@override
State createState() => _FocusSeedAppState();
@@ -33,6 +41,10 @@ class _FocusSeedAppState extends State
final _preferencesStore = AppPreferencesStore();
AppearancePreference _appearance = AppearancePreference.system;
LanguagePreference _language = LanguagePreference.defaultLocale;
+ bool _onboardingComplete = true;
+ bool _landingSetupComplete = true;
+ bool _showLandingSetup = false;
+ bool _preferencesLoaded = false;
DayPhase _dayPhase = dayPhaseFor(DateTime.now());
Timer? _phaseTimer;
@@ -52,14 +64,25 @@ class _FocusSeedAppState extends State
}
Future _loadPreferences() async {
- final appearance = await _preferencesStore.loadAppearance();
- final language = await _preferencesStore.loadLanguage();
+ final (appearance, language, firstRunProgress) =
+ await (
+ _preferencesStore.loadAppearance(),
+ _preferencesStore.loadLanguage(),
+ _preferencesStore.loadFirstRunProgress(),
+ ).wait;
if (!mounted) {
return;
}
setState(() {
_appearance = appearance;
_language = language;
+ _onboardingComplete = firstRunProgress.onboardingComplete;
+ _landingSetupComplete = firstRunProgress.landingSetupComplete;
+ _showLandingSetup =
+ widget.showWelcomeOnFirstRun &&
+ firstRunProgress.onboardingComplete &&
+ !firstRunProgress.landingSetupComplete;
+ _preferencesLoaded = true;
});
}
@@ -98,6 +121,22 @@ class _FocusSeedAppState extends State
return widget.locale ?? _language.locale ?? focusSeedDefaultLocale();
}
+ Future _completeOnboarding() async {
+ setState(() {
+ _onboardingComplete = true;
+ _showLandingSetup = true;
+ });
+ await _preferencesStore.saveOnboardingComplete();
+ }
+
+ Future _completeLandingSetup() async {
+ setState(() {
+ _landingSetupComplete = true;
+ _showLandingSetup = false;
+ });
+ await _preferencesStore.saveLandingSetupComplete();
+ }
+
@override
Widget build(BuildContext context) {
return MaterialApp(
@@ -115,14 +154,28 @@ class _FocusSeedAppState extends State
GlobalWidgetsLocalizations.delegate,
],
supportedLocales: AppLocalizations.supportedLocales,
- home: FocusSeedHome(
- focusSeedStore: widget.focusSeedStore,
- appearance: _appearance,
- onAppearanceChanged: _setAppearance,
- language: _language,
- showLanguageTools: !kReleaseMode && widget.locale == null,
- onLanguageChanged: _setLanguage,
- ),
+ home:
+ !_preferencesLoaded
+ ? const Scaffold(body: SafeArea(child: LoadingView()))
+ : widget.showWelcomeOnFirstRun && !_onboardingComplete
+ ? WelcomeScreen(
+ onStart: _completeOnboarding,
+ onSkip: _completeOnboarding,
+ )
+ : FocusSeedHome(
+ focusSeedStore: widget.focusSeedStore,
+ appearance: _appearance,
+ onAppearanceChanged: _setAppearance,
+ language: _language,
+ showLanguageTools: !kReleaseMode && widget.locale == null,
+ onLanguageChanged: _setLanguage,
+ showLandingSetupInitially:
+ widget.showWelcomeOnFirstRun &&
+ (!_landingSetupComplete || _showLandingSetup),
+ onLandingSetupComplete: () {
+ unawaited(_completeLandingSetup());
+ },
+ ),
);
}
diff --git a/lib/src/application/focus_seed_controller.dart b/lib/src/application/focus_seed_controller.dart
index 9903f37..15a3c85 100644
--- a/lib/src/application/focus_seed_controller.dart
+++ b/lib/src/application/focus_seed_controller.dart
@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import '../core/date_keys.dart';
+import '../core/focus_durations.dart';
import '../data/focus_seed_store.dart';
import '../models/app_state.dart';
import '../models/focus_session.dart';
@@ -55,12 +56,18 @@ class FocusSeedController extends ChangeNotifier {
Future setTodayAnchor(String value) async {
final current = _state;
- final anchor = value.trim();
- if (current == null || anchor.isEmpty) {
+ final title = value.trim();
+ if (current == null || title.isEmpty) {
return false;
}
_analytics.track('intention_saved');
- return _commit(current.copyWith(anchor: anchor, anchorDateKey: todayKey()));
+ return _commit(
+ current.copyWith(
+ anchor: title,
+ anchorDateKey: todayKey(),
+ selectedActionId: '',
+ ),
+ );
}
Future toggleHabit(Habit habit) async {
@@ -128,46 +135,86 @@ class FocusSeedController extends ChangeNotifier {
return _commit(current.copyWith(habits: habits));
}
- Future completeFocusSession(int minutes) async {
+ Future completeFocusSession(int minutes, {int? actualSeconds}) async {
final current = _state;
if (current == null) {
return false;
}
final now = DateTime.now();
+ final today = todayKey();
+ final anchor = current.activeAnchor(today);
final session = FocusSession(
id: 'session-${now.microsecondsSinceEpoch}',
minutes: minutes,
+ actualSeconds: actualSeconds,
completedAt: now,
+ intention: anchor,
+ actionTitleSnapshot: anchor,
+ );
+ _analytics.track('focus_completed', {
+ 'minutes': minutes,
+ 'actualSeconds': session.actualSeconds,
+ });
+ return _commit(
+ current.copyWith(
+ anchor: anchor,
+ anchorDateKey: today,
+ sessions: [...current.sessions, session],
+ ),
);
- _analytics.track('focus_completed', {'minutes': minutes});
- return _commit(current.copyWith(sessions: [...current.sessions, session]));
}
Future saveReflection(String value, Mood mood) async {
+ return saveReflectionForDate(todayKey(), value, mood);
+ }
+
+ Future saveReflectionForDate(
+ String dateKey,
+ String value,
+ Mood mood,
+ ) async {
final current = _state;
- final note = value.trim();
- if (current == null || note.isEmpty) {
+ final trimmedNote = value.trim();
+ final targetDateKey = dateKey.trim();
+ if (current == null || targetDateKey.isEmpty || trimmedNote.isEmpty) {
return false;
}
- final today = todayKey();
final now = DateTime.now();
final entry = ReflectionEntry(
id: 'reflection-${now.microsecondsSinceEpoch}',
- dateKey: today,
- note: note,
+ dateKey: targetDateKey,
+ note: trimmedNote,
mood: mood,
createdAt: now,
);
final reflections = [
- ...current.reflections.where((item) => item.dateKey != today),
+ ...current.reflections.where((item) => item.dateKey != targetDateKey),
entry,
];
_analytics.track('reflection_saved');
return _commit(current.copyWith(reflections: reflections));
}
+ Future setDefaultFocusMinutes(int minutes) async {
+ final current = _state;
+ if (current == null || !isFocusDurationPreset(minutes)) {
+ return false;
+ }
+ if (current.defaultFocusMinutes == minutes) {
+ return true;
+ }
+ _analytics.track('default_focus_minutes_changed', {'minutes': minutes});
+ return _commit(current.copyWith(defaultFocusMinutes: minutes));
+ }
+
Future clearData() async {
- return _commit(AppState.starter(defaultHabitTitles: _defaultHabitTitles));
+ final current = _state;
+ return _commit(
+ AppState.starter(defaultHabitTitles: _defaultHabitTitles).copyWith(
+ defaultFocusMinutes:
+ current?.defaultFocusMinutes ?? defaultFocusDurationMinutes,
+ ),
+ );
}
Future clearToday() async {
@@ -190,12 +237,22 @@ class FocusSeedController extends ChangeNotifier {
final reflections = current.reflections
.where((reflection) => reflection.dateKey != today)
.toList(growable: false);
+ final actions = current.actions
+ .where((action) => action.dateKey != today)
+ .toList(growable: false);
+ final progressNotes = current.progressNotes
+ .where((note) => note.dateKey != today)
+ .toList(growable: false);
_analytics.track('today_cleared');
return _commit(
current.copyWith(
anchor: current.anchorDateKey == today ? '' : current.anchor,
+ selectedActionId:
+ current.anchorDateKey == today ? '' : current.selectedActionId,
habits: habits,
+ actions: actions,
sessions: sessions,
+ progressNotes: progressNotes,
reflections: reflections,
),
);
diff --git a/lib/src/application/focus_timer_controller.dart b/lib/src/application/focus_timer_controller.dart
index 278387e..87c1978 100644
--- a/lib/src/application/focus_timer_controller.dart
+++ b/lib/src/application/focus_timer_controller.dart
@@ -3,21 +3,30 @@ import 'dart:math' as math;
import 'package:flutter/widgets.dart';
+import '../core/focus_durations.dart';
+import '../data/focus_timer_session_store.dart';
+
enum FocusTimerStatus { idle, running, paused, completed }
+typedef FocusTimerCompleted =
+ Future Function(int minutes, int actualSeconds);
+
class FocusTimerController extends ChangeNotifier with WidgetsBindingObserver {
FocusTimerController({
- required Future Function(int minutes) onCompleted,
- int initialMinutes = 25,
+ required FocusTimerCompleted onCompleted,
+ FocusTimerSessionStore? sessionStore,
+ int initialMinutes = defaultFocusDurationMinutes,
}) : _onCompleted = onCompleted,
+ _sessionStore = sessionStore,
_selectedMinutes = initialMinutes,
_remainingSeconds = initialMinutes * 60 {
WidgetsBinding.instance.addObserver(this);
}
- static const presets = [15, 25, 45];
+ static const presets = focusDurationPresets;
- final Future Function(int minutes) _onCompleted;
+ final FocusTimerCompleted _onCompleted;
+ final FocusTimerSessionStore? _sessionStore;
Timer? _ticker;
DateTime? _endsAt;
int _selectedMinutes;
@@ -27,6 +36,8 @@ class FocusTimerController extends ChangeNotifier with WidgetsBindingObserver {
int get selectedMinutes => _selectedMinutes;
int get remainingSeconds => _remainingSeconds;
+ int get elapsedSeconds =>
+ math.max(0, (_selectedMinutes * 60) - _remainingSeconds);
FocusTimerStatus get status => _status;
bool get isRunning => _status == FocusTimerStatus.running;
bool get isPaused => _status == FocusTimerStatus.paused;
@@ -38,6 +49,53 @@ class FocusTimerController extends ChangeNotifier with WidgetsBindingObserver {
: (1 - (_remainingSeconds / totalSeconds)).clamp(0, 1);
}
+ Future restoreSavedSession() async {
+ final sessionStore = _sessionStore;
+ if (sessionStore == null) {
+ return false;
+ }
+ final snapshot = await sessionStore.load();
+ if (snapshot == null) {
+ return false;
+ }
+ if (!presets.contains(snapshot.selectedMinutes)) {
+ await sessionStore.clear();
+ return false;
+ }
+
+ _selectedMinutes = snapshot.selectedMinutes;
+ final totalSeconds = _selectedMinutes * 60;
+ _remainingSeconds =
+ snapshot.remainingSeconds.clamp(0, totalSeconds).toInt();
+ _ticker?.cancel();
+ _endsAt = null;
+
+ switch (snapshot.status) {
+ case FocusTimerSnapshotStatus.running:
+ _status = FocusTimerStatus.running;
+ _endsAt =
+ snapshot.endsAt ??
+ DateTime.now().add(Duration(seconds: _remainingSeconds));
+ _refreshRemainingTime();
+ if (_remainingSeconds <= 0) {
+ unawaited(_complete());
+ } else {
+ _startTicker();
+ }
+ break;
+ case FocusTimerSnapshotStatus.paused:
+ _status = FocusTimerStatus.paused;
+ break;
+ case FocusTimerSnapshotStatus.completed:
+ _remainingSeconds = 0;
+ _status = FocusTimerStatus.completed;
+ unawaited(_retryCompletedSnapshot(snapshot));
+ break;
+ }
+ notifyListeners();
+ return true;
+ }
+
void selectMinutes(int minutes) {
if (isRunning || !presets.contains(minutes)) {
return;
@@ -58,6 +116,7 @@ class FocusTimerController extends ChangeNotifier with WidgetsBindingObserver {
_status = FocusTimerStatus.running;
_endsAt = DateTime.now().add(Duration(seconds: _remainingSeconds));
_startTicker();
+ unawaited(_persistActiveSession());
notifyListeners();
}
@@ -69,6 +128,7 @@ class FocusTimerController extends ChangeNotifier with WidgetsBindingObserver {
_ticker?.cancel();
_endsAt = null;
_status = FocusTimerStatus.paused;
+ unawaited(_persistActiveSession());
notifyListeners();
}
@@ -77,6 +137,7 @@ class FocusTimerController extends ChangeNotifier with WidgetsBindingObserver {
_endsAt = null;
_remainingSeconds = _selectedMinutes * 60;
_status = FocusTimerStatus.idle;
+ unawaited(_clearSavedSession());
notifyListeners();
}
@@ -118,19 +179,100 @@ class FocusTimerController extends ChangeNotifier with WidgetsBindingObserver {
if (_isCompleting || isCompleted) {
return;
}
+ if (isRunning) {
+ _refreshRemainingTime();
+ }
+ final totalSeconds = _selectedMinutes * 60;
+ final actualSeconds =
+ _remainingSeconds <= 0
+ ? totalSeconds
+ : math.max(1, totalSeconds - _remainingSeconds);
_isCompleting = true;
_ticker?.cancel();
_endsAt = null;
_remainingSeconds = 0;
_status = FocusTimerStatus.completed;
+ unawaited(_persistCompletedSession(actualSeconds));
notifyListeners();
try {
- await _onCompleted(_selectedMinutes);
+ final saved = await _onCompleted(_selectedMinutes, actualSeconds);
+ if (saved) {
+ await _clearSavedSession();
+ }
} finally {
_isCompleting = false;
}
}
+ Future _retryCompletedSnapshot(
+ FocusTimerSessionSnapshot snapshot,
+ ) async {
+ if (_isCompleting || snapshot.actualSeconds == null) {
+ return;
+ }
+ _isCompleting = true;
+ try {
+ final saved = await _onCompleted(
+ snapshot.selectedMinutes,
+ snapshot.actualSeconds!,
+ );
+ if (saved) {
+ await _clearSavedSession();
+ }
+ } finally {
+ _isCompleting = false;
+ }
+ }
+
+ Future _persistActiveSession() async {
+ final sessionStore = _sessionStore;
+ if (sessionStore == null) {
+ return;
+ }
+ if (isRunning) {
+ await sessionStore.save(
+ FocusTimerSessionSnapshot(
+ status: FocusTimerSnapshotStatus.running,
+ selectedMinutes: _selectedMinutes,
+ remainingSeconds: _remainingSeconds,
+ endsAt: _endsAt,
+ updatedAt: DateTime.now(),
+ ),
+ );
+ return;
+ }
+ if (isPaused) {
+ await sessionStore.save(
+ FocusTimerSessionSnapshot(
+ status: FocusTimerSnapshotStatus.paused,
+ selectedMinutes: _selectedMinutes,
+ remainingSeconds: _remainingSeconds,
+ updatedAt: DateTime.now(),
+ ),
+ );
+ }
+ }
+
+ Future _persistCompletedSession(int actualSeconds) async {
+ final sessionStore = _sessionStore;
+ if (sessionStore == null) {
+ return;
+ }
+ await sessionStore.save(
+ FocusTimerSessionSnapshot(
+ status: FocusTimerSnapshotStatus.completed,
+ selectedMinutes: _selectedMinutes,
+ remainingSeconds: 0,
+ actualSeconds: actualSeconds,
+ updatedAt: DateTime.now(),
+ ),
+ );
+ }
+
+ Future _clearSavedSession() async {
+ await _sessionStore?.clear();
+ }
+
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
diff --git a/lib/src/core/date_keys.dart b/lib/src/core/date_keys.dart
index cc0931e..c811502 100644
--- a/lib/src/core/date_keys.dart
+++ b/lib/src/core/date_keys.dart
@@ -22,7 +22,7 @@ List lastSevenDateKeys() {
int minutesForDate(List sessions, String key) {
return sessions
.where((session) => dateKey(session.completedAt) == key)
- .fold(0, (total, session) => total + session.minutes);
+ .fold(0, (total, session) => total + session.actualMinutes);
}
int currentStreak(
diff --git a/lib/src/data/app_preferences_store.dart b/lib/src/data/app_preferences_store.dart
index 8430a26..9371100 100644
--- a/lib/src/data/app_preferences_store.dart
+++ b/lib/src/data/app_preferences_store.dart
@@ -3,9 +3,22 @@ import 'package:shared_preferences/shared_preferences.dart';
import '../models/appearance_preference.dart';
import '../models/language_preference.dart';
+class FirstRunProgress {
+ const FirstRunProgress({
+ required this.onboardingComplete,
+ required this.landingSetupComplete,
+ });
+
+ final bool onboardingComplete;
+ final bool landingSetupComplete;
+}
+
class AppPreferencesStore {
static const _appearanceKey = 'focus_seed_appearance';
static const _languageKey = 'focus_seed_language';
+ static const _legacyWelcomeCompleteKey = 'focus_seed_welcome_complete';
+ static const _onboardingCompleteKey = 'focus_seed_onboarding_complete';
+ static const _landingSetupCompleteKey = 'focus_seed_landing_setup_complete';
Future loadAppearance() async {
final preferences = await SharedPreferences.getInstance();
@@ -26,4 +39,34 @@ class AppPreferencesStore {
final preferences = await SharedPreferences.getInstance();
await preferences.setString(_languageKey, language.name);
}
+
+ Future loadFirstRunProgress() async {
+ final preferences = await SharedPreferences.getInstance();
+ final legacyComplete =
+ preferences.getBool(_legacyWelcomeCompleteKey) ?? false;
+ final landingSetupComplete =
+ preferences.getBool(_landingSetupCompleteKey) ?? legacyComplete;
+ final onboardingComplete =
+ preferences.getBool(_onboardingCompleteKey) ??
+ (legacyComplete || landingSetupComplete);
+ return FirstRunProgress(
+ onboardingComplete: onboardingComplete,
+ landingSetupComplete: landingSetupComplete,
+ );
+ }
+
+ Future saveOnboardingComplete() async {
+ final preferences = await SharedPreferences.getInstance();
+ await preferences.setBool(_onboardingCompleteKey, true);
+ if (!preferences.containsKey(_landingSetupCompleteKey)) {
+ await preferences.setBool(_landingSetupCompleteKey, false);
+ }
+ }
+
+ Future saveLandingSetupComplete() async {
+ final preferences = await SharedPreferences.getInstance();
+ await preferences.setBool(_onboardingCompleteKey, true);
+ await preferences.setBool(_landingSetupCompleteKey, true);
+ await preferences.setBool(_legacyWelcomeCompleteKey, true);
+ }
}
diff --git a/lib/src/data/focus_seed_store.dart b/lib/src/data/focus_seed_store.dart
index 71c3709..7ee277b 100644
--- a/lib/src/data/focus_seed_store.dart
+++ b/lib/src/data/focus_seed_store.dart
@@ -4,10 +4,13 @@ import 'package:drift/drift.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../core/date_keys.dart' as date_keys;
+import '../core/focus_durations.dart';
import '../models/app_state.dart';
+import '../models/daily_action.dart';
import '../models/focus_session.dart';
import '../models/habit.dart';
import '../models/mood.dart';
+import '../models/progress_note.dart';
import '../models/reflection_entry.dart';
import 'local/focus_seed_database.dart';
@@ -17,6 +20,7 @@ class FocusSeedStore {
static const _legacyStorageKey = 'focus_seed_state_v1';
static const _legacyMigrationKey = 'focus_seed_state_v1_migrated_to_sqlite';
+ static const _defaultFocusMinutesKey = 'default_focus_minutes';
final FocusSeedDatabase _database;
@@ -35,25 +39,56 @@ class FocusSeedStore {
Future save(AppState state) async {
await _database.transaction(() async {
await _database.delete(_database.habitLogRows).go();
+ await _database.delete(_database.progressNoteRows).go();
await _database.delete(_database.reflectionRows).go();
await _database.delete(_database.focusSessionRows).go();
+ await _database.delete(_database.recentLabelRows).go();
+ await _database.delete(_database.dailyActionRows).go();
await _database.delete(_database.habitRows).go();
await _database.delete(_database.dailyIntentionRows).go();
- if (state.anchor.trim().isNotEmpty) {
+ await _database
+ .into(_database.appSettingRows)
+ .insertOnConflictUpdate(
+ AppSettingRowsCompanion.insert(
+ key: _defaultFocusMinutesKey,
+ value: state.defaultFocusMinutes.toString(),
+ ),
+ );
+
+ final anchorText = state.anchor.trim();
+ if (anchorText.isNotEmpty) {
final now = DateTime.now();
await _database
.into(_database.dailyIntentionRows)
.insert(
DailyIntentionRowsCompanion.insert(
dateKey: state.anchorDateKey,
- intentionText: state.anchor,
+ intentionText: anchorText,
createdAt: now,
updatedAt: now,
),
);
}
+ for (final action in state.actions) {
+ await _database
+ .into(_database.dailyActionRows)
+ .insert(_dailyActionCompanion(action));
+ }
+
+ for (final label in state.recentLabels) {
+ await _database
+ .into(_database.recentLabelRows)
+ .insert(
+ RecentLabelRowsCompanion.insert(
+ label: label,
+ lastUsedAt: DateTime.now(),
+ useCount: 1,
+ ),
+ );
+ }
+
for (final (index, habit) in state.habits.indexed) {
await _database
.into(_database.habitRows)
@@ -85,6 +120,12 @@ class FocusSeedStore {
.insert(_focusSessionCompanion(session));
}
+ for (final note in state.progressNotes) {
+ await _database
+ .into(_database.progressNoteRows)
+ .insert(_progressNoteCompanion(note));
+ }
+
for (final reflection in state.reflections) {
await _database
.into(_database.reflectionRows)
@@ -120,6 +161,12 @@ class FocusSeedStore {
..limit(1))
.get();
final latestIntention = intentionRows.firstOrNull;
+ final dailyActionRows =
+ await (_database.select(_database.dailyActionRows)..orderBy([
+ (row) => OrderingTerm.asc(row.dateKey),
+ (row) => OrderingTerm.asc(row.orderIndex),
+ (row) => OrderingTerm.asc(row.createdAt),
+ ])).get();
final habitRows =
await (_database.select(_database.habitRows)
..where((row) => row.archivedAt.isNull())
@@ -134,18 +181,36 @@ class FocusSeedStore {
final focusSessionRows =
await (_database.select(_database.focusSessionRows)
..orderBy([(row) => OrderingTerm.asc(row.endedAt)])).get();
+ final progressNoteRows =
+ await (_database.select(_database.progressNoteRows)
+ ..orderBy([(row) => OrderingTerm.asc(row.createdAt)])).get();
final reflectionRows =
await (_database.select(_database.reflectionRows)
..orderBy([(row) => OrderingTerm.asc(row.createdAt)])).get();
+ final recentLabelRows =
+ await (_database.select(_database.recentLabelRows)..orderBy([
+ (row) => OrderingTerm.desc(row.lastUsedAt),
+ (row) => OrderingTerm.desc(row.useCount),
+ ])).get();
+ final defaultFocusMinutes = await _readDefaultFocusMinutes();
final completedDatesByHabit = >{};
for (final log in habitLogRows) {
completedDatesByHabit.putIfAbsent(log.habitId, () => {}).add(log.dateKey);
}
+ final actions = [
+ for (final action in dailyActionRows) _dailyActionFromRow(action),
+ ];
+ final progressNotes = [
+ for (final note in progressNoteRows) _progressNoteFromRow(note),
+ ];
+ final anchorDateKey = latestIntention?.dateKey ?? date_keys.todayKey();
+ final anchor = latestIntention?.intentionText ?? '';
+
return AppState(
- anchor: latestIntention?.intentionText ?? '',
- anchorDateKey: latestIntention?.dateKey ?? date_keys.todayKey(),
+ anchor: anchor,
+ anchorDateKey: anchorDateKey,
habits: [
for (final habit in habitRows)
Habit(
@@ -160,7 +225,12 @@ class FocusSeedStore {
FocusSession(
id: session.id,
minutes: session.plannedMinutes,
+ actualSeconds: session.actualSeconds,
completedAt: session.endedAt,
+ intention: session.intentionText ?? '',
+ actionId: session.actionId,
+ actionTitleSnapshot:
+ session.actionTitleSnapshot ?? session.intentionText,
),
],
reflections: [
@@ -176,9 +246,28 @@ class FocusSeedStore {
createdAt: reflection.createdAt,
),
],
+ actions: actions,
+ progressNotes: progressNotes,
+ recentLabels: [
+ for (final label in recentLabelRows)
+ if (label.label.trim().isNotEmpty) label.label.trim(),
+ ],
+ defaultFocusMinutes: defaultFocusMinutes,
);
}
+ Future _readDefaultFocusMinutes() async {
+ final row =
+ await (_database.select(_database.appSettingRows)..where(
+ (row) => row.key.equals(_defaultFocusMinutesKey),
+ )).getSingleOrNull();
+ final value = int.tryParse(row?.value ?? '');
+ if (value == null || !isFocusDurationPreset(value)) {
+ return defaultFocusDurationMinutes;
+ }
+ return value;
+ }
+
Future _migrateLegacyJsonIfNeeded() async {
final preferences = await SharedPreferences.getInstance();
if (preferences.getBool(_legacyMigrationKey) ?? false) {
@@ -206,6 +295,12 @@ class FocusSeedStore {
}
Future _hasDatabaseContent() async {
+ final action =
+ await (_database.select(_database.dailyActionRows)
+ ..limit(1)).getSingleOrNull();
+ if (action != null) {
+ return true;
+ }
final intention =
await (_database.select(_database.dailyIntentionRows)
..limit(1)).getSingleOrNull();
@@ -224,20 +319,106 @@ class FocusSeedStore {
if (session != null) {
return true;
}
+ final progress =
+ await (_database.select(_database.progressNoteRows)
+ ..limit(1)).getSingleOrNull();
+ if (progress != null) {
+ return true;
+ }
final reflection =
await (_database.select(_database.reflectionRows)
..limit(1)).getSingleOrNull();
return reflection != null;
}
+ DailyAction _dailyActionFromRow(DailyActionRow row) {
+ return DailyAction(
+ id: row.id,
+ dateKey: row.dateKey,
+ title: row.title,
+ status: dailyActionStatusFromName(row.status),
+ orderIndex: row.orderIndex,
+ labels: _decodeLabels(row.labelsJson),
+ createdAt: row.createdAt,
+ updatedAt: row.updatedAt,
+ archivedAt: row.archivedAt,
+ source: row.source,
+ );
+ }
+
+ ProgressNote _progressNoteFromRow(ProgressNoteRow row) {
+ return ProgressNote(
+ id: row.id,
+ dateKey: row.dateKey,
+ actionId: row.actionId,
+ sessionId: row.sessionId,
+ note: row.note,
+ outcome: progressOutcomeFromName(row.outcome),
+ labels: _decodeLabels(row.labelsJson),
+ createdAt: row.createdAt,
+ updatedAt: row.updatedAt,
+ );
+ }
+
+ DailyActionRowsCompanion _dailyActionCompanion(DailyAction action) {
+ return DailyActionRowsCompanion.insert(
+ id: action.id,
+ dateKey: action.dateKey,
+ title: action.title,
+ status: action.status.name,
+ orderIndex: action.orderIndex,
+ labelsJson: jsonEncode(action.labels),
+ createdAt: action.createdAt,
+ updatedAt: action.updatedAt,
+ archivedAt: Value(action.archivedAt),
+ source: action.source,
+ );
+ }
+
+ ProgressNoteRowsCompanion _progressNoteCompanion(ProgressNote note) {
+ return ProgressNoteRowsCompanion.insert(
+ id: note.id,
+ dateKey: note.dateKey,
+ actionId: Value(note.actionId),
+ sessionId: Value(note.sessionId),
+ note: note.note,
+ outcome: Value(note.outcome?.name),
+ labelsJson: jsonEncode(note.labels),
+ createdAt: note.createdAt,
+ updatedAt: note.updatedAt,
+ );
+ }
+
+ List _decodeLabels(String raw) {
+ try {
+ final decoded = jsonDecode(raw);
+ if (decoded is! List) {
+ return const [];
+ }
+ return [
+ for (final item in decoded)
+ if (item is String && item.trim().isNotEmpty) item.trim(),
+ ];
+ } on Object {
+ return const [];
+ }
+ }
+
FocusSessionRowsCompanion _focusSessionCompanion(FocusSession session) {
final completedAt = session.completedAt;
return FocusSessionRowsCompanion.insert(
id: session.id,
dateKey: date_keys.dateKey(completedAt),
+ actionId: Value(session.actionId),
+ actionTitleSnapshot: Value(
+ session.actionTitle.trim().isEmpty ? null : session.actionTitle,
+ ),
+ intentionText: Value(
+ session.actionTitle.trim().isEmpty ? null : session.actionTitle,
+ ),
plannedMinutes: session.minutes,
- actualSeconds: session.minutes * 60,
- startedAt: completedAt.subtract(Duration(minutes: session.minutes)),
+ actualSeconds: session.actualSeconds,
+ startedAt: completedAt.subtract(Duration(seconds: session.actualSeconds)),
endedAt: completedAt,
status: 'completed',
);
diff --git a/lib/src/data/local/focus_seed_database.dart b/lib/src/data/local/focus_seed_database.dart
index c57cf03..a705914 100644
--- a/lib/src/data/local/focus_seed_database.dart
+++ b/lib/src/data/local/focus_seed_database.dart
@@ -26,6 +26,10 @@ class FocusSessionRows extends Table {
TextColumn get id => text()();
TextColumn get dateKey => text()();
+ TextColumn get actionId => text().nullable().named('action_id')();
+ TextColumn get actionTitleSnapshot =>
+ text().nullable().named('action_title_snapshot')();
+ TextColumn get intentionText => text().nullable().named('intention_text')();
IntColumn get plannedMinutes => integer()();
IntColumn get actualSeconds => integer()();
DateTimeColumn get startedAt => dateTime()();
@@ -36,6 +40,55 @@ class FocusSessionRows extends Table {
Set> get primaryKey => {id};
}
+class DailyActionRows extends Table {
+ @override
+ String get tableName => 'daily_actions';
+
+ TextColumn get id => text()();
+ TextColumn get dateKey => text()();
+ TextColumn get title => text()();
+ TextColumn get status => text()();
+ IntColumn get orderIndex => integer().named('order_index')();
+ TextColumn get labelsJson => text().named('labels_json')();
+ DateTimeColumn get createdAt => dateTime()();
+ DateTimeColumn get updatedAt => dateTime()();
+ DateTimeColumn get archivedAt => dateTime().nullable()();
+ TextColumn get source => text()();
+
+ @override
+ Set> get primaryKey => {id};
+}
+
+class ProgressNoteRows extends Table {
+ @override
+ String get tableName => 'progress_notes';
+
+ TextColumn get id => text()();
+ TextColumn get dateKey => text()();
+ TextColumn get actionId => text().nullable().named('action_id')();
+ TextColumn get sessionId => text().nullable().named('session_id')();
+ TextColumn get note => text()();
+ TextColumn get outcome => text().nullable()();
+ TextColumn get labelsJson => text().named('labels_json')();
+ DateTimeColumn get createdAt => dateTime()();
+ DateTimeColumn get updatedAt => dateTime()();
+
+ @override
+ Set> get primaryKey => {id};
+}
+
+class RecentLabelRows extends Table {
+ @override
+ String get tableName => 'recent_labels';
+
+ TextColumn get label => text()();
+ DateTimeColumn get lastUsedAt => dateTime()();
+ IntColumn get useCount => integer()();
+
+ @override
+ Set> get primaryKey => {label};
+}
+
class HabitRows extends Table {
@override
String get tableName => 'habits';
@@ -92,7 +145,10 @@ class AppSettingRows extends Table {
@DriftDatabase(
tables: [
DailyIntentionRows,
+ DailyActionRows,
FocusSessionRows,
+ ProgressNoteRows,
+ RecentLabelRows,
HabitRows,
HabitLogRows,
ReflectionRows,
@@ -104,13 +160,43 @@ class FocusSeedDatabase extends _$FocusSeedDatabase {
: super(executor ?? _openConnection());
@override
- int get schemaVersion => 1;
+ int get schemaVersion => 5;
+
+ @override
+ MigrationStrategy get migration {
+ return MigrationStrategy(
+ onUpgrade: (migrator, from, to) async {
+ if (from < 3) {
+ await customStatement('DROP TABLE IF EXISTS focus_plans');
+ await customStatement('DROP TABLE IF EXISTS preference_tags');
+ }
+ if (from < 4) {
+ await customStatement(
+ 'ALTER TABLE focus_sessions ADD COLUMN intention_text TEXT NULL',
+ );
+ }
+ if (from < 5) {
+ await migrator.createTable(dailyActionRows);
+ await migrator.createTable(progressNoteRows);
+ await migrator.createTable(recentLabelRows);
+ await migrator.addColumn(focusSessionRows, focusSessionRows.actionId);
+ await migrator.addColumn(
+ focusSessionRows,
+ focusSessionRows.actionTitleSnapshot,
+ );
+ }
+ },
+ );
+ }
Future clearProductData() async {
await transaction(() async {
await delete(habitLogRows).go();
+ await delete(progressNoteRows).go();
await delete(reflectionRows).go();
await delete(focusSessionRows).go();
+ await delete(recentLabelRows).go();
+ await delete(dailyActionRows).go();
await delete(habitRows).go();
await delete(dailyIntentionRows).go();
});
diff --git a/lib/src/data/local/focus_seed_database.g.dart b/lib/src/data/local/focus_seed_database.g.dart
index 5a1fe56..b19ae53 100644
--- a/lib/src/data/local/focus_seed_database.g.dart
+++ b/lib/src/data/local/focus_seed_database.g.dart
@@ -331,6 +331,622 @@ class DailyIntentionRowsCompanion extends UpdateCompanion {
}
}
+class $DailyActionRowsTable extends DailyActionRows
+ with TableInfo<$DailyActionRowsTable, DailyActionRow> {
+ @override
+ final GeneratedDatabase attachedDatabase;
+ final String? _alias;
+ $DailyActionRowsTable(this.attachedDatabase, [this._alias]);
+ static const VerificationMeta _idMeta = const VerificationMeta('id');
+ @override
+ late final GeneratedColumn id = GeneratedColumn(
+ 'id',
+ aliasedName,
+ false,
+ type: DriftSqlType.string,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _dateKeyMeta = const VerificationMeta(
+ 'dateKey',
+ );
+ @override
+ late final GeneratedColumn dateKey = GeneratedColumn(
+ 'date_key',
+ aliasedName,
+ false,
+ type: DriftSqlType.string,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _titleMeta = const VerificationMeta('title');
+ @override
+ late final GeneratedColumn title = GeneratedColumn(
+ 'title',
+ aliasedName,
+ false,
+ type: DriftSqlType.string,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _statusMeta = const VerificationMeta('status');
+ @override
+ late final GeneratedColumn status = GeneratedColumn(
+ 'status',
+ aliasedName,
+ false,
+ type: DriftSqlType.string,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _orderIndexMeta = const VerificationMeta(
+ 'orderIndex',
+ );
+ @override
+ late final GeneratedColumn orderIndex = GeneratedColumn(
+ 'order_index',
+ aliasedName,
+ false,
+ type: DriftSqlType.int,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _labelsJsonMeta = const VerificationMeta(
+ 'labelsJson',
+ );
+ @override
+ late final GeneratedColumn labelsJson = GeneratedColumn(
+ 'labels_json',
+ aliasedName,
+ false,
+ type: DriftSqlType.string,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _createdAtMeta = const VerificationMeta(
+ 'createdAt',
+ );
+ @override
+ late final GeneratedColumn createdAt = GeneratedColumn(
+ 'created_at',
+ aliasedName,
+ false,
+ type: DriftSqlType.dateTime,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _updatedAtMeta = const VerificationMeta(
+ 'updatedAt',
+ );
+ @override
+ late final GeneratedColumn updatedAt = GeneratedColumn(
+ 'updated_at',
+ aliasedName,
+ false,
+ type: DriftSqlType.dateTime,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _archivedAtMeta = const VerificationMeta(
+ 'archivedAt',
+ );
+ @override
+ late final GeneratedColumn archivedAt = GeneratedColumn(
+ 'archived_at',
+ aliasedName,
+ true,
+ type: DriftSqlType.dateTime,
+ requiredDuringInsert: false,
+ );
+ static const VerificationMeta _sourceMeta = const VerificationMeta('source');
+ @override
+ late final GeneratedColumn source = GeneratedColumn(
+ 'source',
+ aliasedName,
+ false,
+ type: DriftSqlType.string,
+ requiredDuringInsert: true,
+ );
+ @override
+ List get $columns => [
+ id,
+ dateKey,
+ title,
+ status,
+ orderIndex,
+ labelsJson,
+ createdAt,
+ updatedAt,
+ archivedAt,
+ source,
+ ];
+ @override
+ String get aliasedName => _alias ?? actualTableName;
+ @override
+ String get actualTableName => $name;
+ static const String $name = 'daily_actions';
+ @override
+ VerificationContext validateIntegrity(
+ Insertable instance, {
+ bool isInserting = false,
+ }) {
+ final context = VerificationContext();
+ final data = instance.toColumns(true);
+ if (data.containsKey('id')) {
+ context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+ } else if (isInserting) {
+ context.missing(_idMeta);
+ }
+ if (data.containsKey('date_key')) {
+ context.handle(
+ _dateKeyMeta,
+ dateKey.isAcceptableOrUnknown(data['date_key']!, _dateKeyMeta),
+ );
+ } else if (isInserting) {
+ context.missing(_dateKeyMeta);
+ }
+ if (data.containsKey('title')) {
+ context.handle(
+ _titleMeta,
+ title.isAcceptableOrUnknown(data['title']!, _titleMeta),
+ );
+ } else if (isInserting) {
+ context.missing(_titleMeta);
+ }
+ if (data.containsKey('status')) {
+ context.handle(
+ _statusMeta,
+ status.isAcceptableOrUnknown(data['status']!, _statusMeta),
+ );
+ } else if (isInserting) {
+ context.missing(_statusMeta);
+ }
+ if (data.containsKey('order_index')) {
+ context.handle(
+ _orderIndexMeta,
+ orderIndex.isAcceptableOrUnknown(data['order_index']!, _orderIndexMeta),
+ );
+ } else if (isInserting) {
+ context.missing(_orderIndexMeta);
+ }
+ if (data.containsKey('labels_json')) {
+ context.handle(
+ _labelsJsonMeta,
+ labelsJson.isAcceptableOrUnknown(data['labels_json']!, _labelsJsonMeta),
+ );
+ } else if (isInserting) {
+ context.missing(_labelsJsonMeta);
+ }
+ if (data.containsKey('created_at')) {
+ context.handle(
+ _createdAtMeta,
+ createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
+ );
+ } else if (isInserting) {
+ context.missing(_createdAtMeta);
+ }
+ if (data.containsKey('updated_at')) {
+ context.handle(
+ _updatedAtMeta,
+ updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+ );
+ } else if (isInserting) {
+ context.missing(_updatedAtMeta);
+ }
+ if (data.containsKey('archived_at')) {
+ context.handle(
+ _archivedAtMeta,
+ archivedAt.isAcceptableOrUnknown(data['archived_at']!, _archivedAtMeta),
+ );
+ }
+ if (data.containsKey('source')) {
+ context.handle(
+ _sourceMeta,
+ source.isAcceptableOrUnknown(data['source']!, _sourceMeta),
+ );
+ } else if (isInserting) {
+ context.missing(_sourceMeta);
+ }
+ return context;
+ }
+
+ @override
+ Set get $primaryKey => {id};
+ @override
+ DailyActionRow map(Map data, {String? tablePrefix}) {
+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+ return DailyActionRow(
+ id:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}id'],
+ )!,
+ dateKey:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}date_key'],
+ )!,
+ title:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}title'],
+ )!,
+ status:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}status'],
+ )!,
+ orderIndex:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.int,
+ data['${effectivePrefix}order_index'],
+ )!,
+ labelsJson:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}labels_json'],
+ )!,
+ createdAt:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.dateTime,
+ data['${effectivePrefix}created_at'],
+ )!,
+ updatedAt:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.dateTime,
+ data['${effectivePrefix}updated_at'],
+ )!,
+ archivedAt: attachedDatabase.typeMapping.read(
+ DriftSqlType.dateTime,
+ data['${effectivePrefix}archived_at'],
+ ),
+ source:
+ attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}source'],
+ )!,
+ );
+ }
+
+ @override
+ $DailyActionRowsTable createAlias(String alias) {
+ return $DailyActionRowsTable(attachedDatabase, alias);
+ }
+}
+
+class DailyActionRow extends DataClass implements Insertable {
+ final String id;
+ final String dateKey;
+ final String title;
+ final String status;
+ final int orderIndex;
+ final String labelsJson;
+ final DateTime createdAt;
+ final DateTime updatedAt;
+ final DateTime? archivedAt;
+ final String source;
+ const DailyActionRow({
+ required this.id,
+ required this.dateKey,
+ required this.title,
+ required this.status,
+ required this.orderIndex,
+ required this.labelsJson,
+ required this.createdAt,
+ required this.updatedAt,
+ this.archivedAt,
+ required this.source,
+ });
+ @override
+ Map toColumns(bool nullToAbsent) {
+ final map = {};
+ map['id'] = Variable(id);
+ map['date_key'] = Variable(dateKey);
+ map['title'] = Variable(title);
+ map['status'] = Variable(status);
+ map['order_index'] = Variable(orderIndex);
+ map['labels_json'] = Variable(labelsJson);
+ map['created_at'] = Variable(createdAt);
+ map['updated_at'] = Variable(updatedAt);
+ if (!nullToAbsent || archivedAt != null) {
+ map['archived_at'] = Variable(archivedAt);
+ }
+ map['source'] = Variable(source);
+ return map;
+ }
+
+ DailyActionRowsCompanion toCompanion(bool nullToAbsent) {
+ return DailyActionRowsCompanion(
+ id: Value(id),
+ dateKey: Value(dateKey),
+ title: Value(title),
+ status: Value(status),
+ orderIndex: Value(orderIndex),
+ labelsJson: Value(labelsJson),
+ createdAt: Value(createdAt),
+ updatedAt: Value(updatedAt),
+ archivedAt:
+ archivedAt == null && nullToAbsent
+ ? const Value.absent()
+ : Value(archivedAt),
+ source: Value(source),
+ );
+ }
+
+ factory DailyActionRow.fromJson(
+ Map json, {
+ ValueSerializer? serializer,
+ }) {
+ serializer ??= driftRuntimeOptions.defaultSerializer;
+ return DailyActionRow(
+ id: serializer.fromJson(json['id']),
+ dateKey: serializer.fromJson(json['dateKey']),
+ title: serializer.fromJson(json['title']),
+ status: serializer.fromJson(json['status']),
+ orderIndex: serializer.fromJson(json['orderIndex']),
+ labelsJson: serializer.fromJson(json['labelsJson']),
+ createdAt: serializer.fromJson(json['createdAt']),
+ updatedAt: serializer.fromJson(json['updatedAt']),
+ archivedAt: serializer.fromJson(json['archivedAt']),
+ source: serializer.fromJson(json['source']),
+ );
+ }
+ @override
+ Map toJson({ValueSerializer? serializer}) {
+ serializer ??= driftRuntimeOptions.defaultSerializer;
+ return {
+ 'id': serializer.toJson(id),
+ 'dateKey': serializer.toJson(dateKey),
+ 'title': serializer.toJson(title),
+ 'status': serializer.toJson(status),
+ 'orderIndex': serializer.toJson(orderIndex),
+ 'labelsJson': serializer.toJson(labelsJson),
+ 'createdAt': serializer.toJson(createdAt),
+ 'updatedAt': serializer.toJson(updatedAt),
+ 'archivedAt': serializer.toJson(archivedAt),
+ 'source': serializer.toJson(source),
+ };
+ }
+
+ DailyActionRow copyWith({
+ String? id,
+ String? dateKey,
+ String? title,
+ String? status,
+ int? orderIndex,
+ String? labelsJson,
+ DateTime? createdAt,
+ DateTime? updatedAt,
+ Value archivedAt = const Value.absent(),
+ String? source,
+ }) => DailyActionRow(
+ id: id ?? this.id,
+ dateKey: dateKey ?? this.dateKey,
+ title: title ?? this.title,
+ status: status ?? this.status,
+ orderIndex: orderIndex ?? this.orderIndex,
+ labelsJson: labelsJson ?? this.labelsJson,
+ createdAt: createdAt ?? this.createdAt,
+ updatedAt: updatedAt ?? this.updatedAt,
+ archivedAt: archivedAt.present ? archivedAt.value : this.archivedAt,
+ source: source ?? this.source,
+ );
+ DailyActionRow copyWithCompanion(DailyActionRowsCompanion data) {
+ return DailyActionRow(
+ id: data.id.present ? data.id.value : this.id,
+ dateKey: data.dateKey.present ? data.dateKey.value : this.dateKey,
+ title: data.title.present ? data.title.value : this.title,
+ status: data.status.present ? data.status.value : this.status,
+ orderIndex:
+ data.orderIndex.present ? data.orderIndex.value : this.orderIndex,
+ labelsJson:
+ data.labelsJson.present ? data.labelsJson.value : this.labelsJson,
+ createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+ updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+ archivedAt:
+ data.archivedAt.present ? data.archivedAt.value : this.archivedAt,
+ source: data.source.present ? data.source.value : this.source,
+ );
+ }
+
+ @override
+ String toString() {
+ return (StringBuffer('DailyActionRow(')
+ ..write('id: $id, ')
+ ..write('dateKey: $dateKey, ')
+ ..write('title: $title, ')
+ ..write('status: $status, ')
+ ..write('orderIndex: $orderIndex, ')
+ ..write('labelsJson: $labelsJson, ')
+ ..write('createdAt: $createdAt, ')
+ ..write('updatedAt: $updatedAt, ')
+ ..write('archivedAt: $archivedAt, ')
+ ..write('source: $source')
+ ..write(')'))
+ .toString();
+ }
+
+ @override
+ int get hashCode => Object.hash(
+ id,
+ dateKey,
+ title,
+ status,
+ orderIndex,
+ labelsJson,
+ createdAt,
+ updatedAt,
+ archivedAt,
+ source,
+ );
+ @override
+ bool operator ==(Object other) =>
+ identical(this, other) ||
+ (other is DailyActionRow &&
+ other.id == this.id &&
+ other.dateKey == this.dateKey &&
+ other.title == this.title &&
+ other.status == this.status &&
+ other.orderIndex == this.orderIndex &&
+ other.labelsJson == this.labelsJson &&
+ other.createdAt == this.createdAt &&
+ other.updatedAt == this.updatedAt &&
+ other.archivedAt == this.archivedAt &&
+ other.source == this.source);
+}
+
+class DailyActionRowsCompanion extends UpdateCompanion {
+ final Value id;
+ final Value dateKey;
+ final Value title;
+ final Value status;
+ final Value orderIndex;
+ final Value labelsJson;
+ final Value createdAt;
+ final Value updatedAt;
+ final Value archivedAt;
+ final Value source;
+ final Value rowid;
+ const DailyActionRowsCompanion({
+ this.id = const Value.absent(),
+ this.dateKey = const Value.absent(),
+ this.title = const Value.absent(),
+ this.status = const Value.absent(),
+ this.orderIndex = const Value.absent(),
+ this.labelsJson = const Value.absent(),
+ this.createdAt = const Value.absent(),
+ this.updatedAt = const Value.absent(),
+ this.archivedAt = const Value.absent(),
+ this.source = const Value.absent(),
+ this.rowid = const Value.absent(),
+ });
+ DailyActionRowsCompanion.insert({
+ required String id,
+ required String dateKey,
+ required String title,
+ required String status,
+ required int orderIndex,
+ required String labelsJson,
+ required DateTime createdAt,
+ required DateTime updatedAt,
+ this.archivedAt = const Value.absent(),
+ required String source,
+ this.rowid = const Value.absent(),
+ }) : id = Value(id),
+ dateKey = Value(dateKey),
+ title = Value(title),
+ status = Value(status),
+ orderIndex = Value(orderIndex),
+ labelsJson = Value(labelsJson),
+ createdAt = Value(createdAt),
+ updatedAt = Value(updatedAt),
+ source = Value(source);
+ static Insertable custom({
+ Expression? id,
+ Expression? dateKey,
+ Expression? title,
+ Expression? status,
+ Expression? orderIndex,
+ Expression? labelsJson,
+ Expression? createdAt,
+ Expression? updatedAt,
+ Expression? archivedAt,
+ Expression? source,
+ Expression? rowid,
+ }) {
+ return RawValuesInsertable({
+ if (id != null) 'id': id,
+ if (dateKey != null) 'date_key': dateKey,
+ if (title != null) 'title': title,
+ if (status != null) 'status': status,
+ if (orderIndex != null) 'order_index': orderIndex,
+ if (labelsJson != null) 'labels_json': labelsJson,
+ if (createdAt != null) 'created_at': createdAt,
+ if (updatedAt != null) 'updated_at': updatedAt,
+ if (archivedAt != null) 'archived_at': archivedAt,
+ if (source != null) 'source': source,
+ if (rowid != null) 'rowid': rowid,
+ });
+ }
+
+ DailyActionRowsCompanion copyWith({
+ Value? id,
+ Value? dateKey,
+ Value? title,
+ Value? status,
+ Value? orderIndex,
+ Value? labelsJson,
+ Value? createdAt,
+ Value? updatedAt,
+ Value? archivedAt,
+ Value? source,
+ Value? rowid,
+ }) {
+ return DailyActionRowsCompanion(
+ id: id ?? this.id,
+ dateKey: dateKey ?? this.dateKey,
+ title: title ?? this.title,
+ status: status ?? this.status,
+ orderIndex: orderIndex ?? this.orderIndex,
+ labelsJson: labelsJson ?? this.labelsJson,
+ createdAt: createdAt ?? this.createdAt,
+ updatedAt: updatedAt ?? this.updatedAt,
+ archivedAt: archivedAt ?? this.archivedAt,
+ source: source ?? this.source,
+ rowid: rowid ?? this.rowid,
+ );
+ }
+
+ @override
+ Map toColumns(bool nullToAbsent) {
+ final map = {};
+ if (id.present) {
+ map['id'] = Variable(id.value);
+ }
+ if (dateKey.present) {
+ map['date_key'] = Variable(dateKey.value);
+ }
+ if (title.present) {
+ map['title'] = Variable(title.value);
+ }
+ if (status.present) {
+ map['status'] = Variable(status.value);
+ }
+ if (orderIndex.present) {
+ map['order_index'] = Variable(orderIndex.value);
+ }
+ if (labelsJson.present) {
+ map['labels_json'] = Variable(labelsJson.value);
+ }
+ if (createdAt.present) {
+ map['created_at'] = Variable(createdAt.value);
+ }
+ if (updatedAt.present) {
+ map['updated_at'] = Variable(updatedAt.value);
+ }
+ if (archivedAt.present) {
+ map['archived_at'] = Variable(archivedAt.value);
+ }
+ if (source.present) {
+ map['source'] = Variable(source.value);
+ }
+ if (rowid.present) {
+ map['rowid'] = Variable(rowid.value);
+ }
+ return map;
+ }
+
+ @override
+ String toString() {
+ return (StringBuffer('DailyActionRowsCompanion(')
+ ..write('id: $id, ')
+ ..write('dateKey: $dateKey, ')
+ ..write('title: $title, ')
+ ..write('status: $status, ')
+ ..write('orderIndex: $orderIndex, ')
+ ..write('labelsJson: $labelsJson, ')
+ ..write('createdAt: $createdAt, ')
+ ..write('updatedAt: $updatedAt, ')
+ ..write('archivedAt: $archivedAt, ')
+ ..write('source: $source, ')
+ ..write('rowid: $rowid')
+ ..write(')'))
+ .toString();
+ }
+}
+
class $FocusSessionRowsTable extends FocusSessionRows
with TableInfo<$FocusSessionRowsTable, FocusSessionRow> {
@override
@@ -357,6 +973,39 @@ class $FocusSessionRowsTable extends FocusSessionRows
type: DriftSqlType.string,
requiredDuringInsert: true,
);
+ static const VerificationMeta _actionIdMeta = const VerificationMeta(
+ 'actionId',
+ );
+ @override
+ late final GeneratedColumn actionId = GeneratedColumn(
+ 'action_id',
+ aliasedName,
+ true,
+ type: DriftSqlType.string,
+ requiredDuringInsert: false,
+ );
+ static const VerificationMeta _actionTitleSnapshotMeta =
+ const VerificationMeta('actionTitleSnapshot');
+ @override
+ late final GeneratedColumn actionTitleSnapshot =
+ GeneratedColumn(
+ 'action_title_snapshot',
+ aliasedName,
+ true,
+ type: DriftSqlType.string,
+ requiredDuringInsert: false,
+ );
+ static const VerificationMeta _intentionTextMeta = const VerificationMeta(
+ 'intentionText',
+ );
+ @override
+ late final GeneratedColumn intentionText = GeneratedColumn(
+ 'intention_text',
+ aliasedName,
+ true,
+ type: DriftSqlType.string,
+ requiredDuringInsert: false,
+ );
static const VerificationMeta _plannedMinutesMeta = const VerificationMeta(
'plannedMinutes',
);
@@ -414,6 +1063,9 @@ class $FocusSessionRowsTable extends FocusSessionRows
List get $columns => [
id,
dateKey,
+ actionId,
+ actionTitleSnapshot,
+ intentionText,
plannedMinutes,
actualSeconds,
startedAt,
@@ -445,6 +1097,30 @@ class $FocusSessionRowsTable extends FocusSessionRows
} else if (isInserting) {
context.missing(_dateKeyMeta);
}
+ if (data.containsKey('action_id')) {
+ context.handle(
+ _actionIdMeta,
+ actionId.isAcceptableOrUnknown(data['action_id']!, _actionIdMeta),
+ );
+ }
+ if (data.containsKey('action_title_snapshot')) {
+ context.handle(
+ _actionTitleSnapshotMeta,
+ actionTitleSnapshot.isAcceptableOrUnknown(
+ data['action_title_snapshot']!,
+ _actionTitleSnapshotMeta,
+ ),
+ );
+ }
+ if (data.containsKey('intention_text')) {
+ context.handle(
+ _intentionTextMeta,
+ intentionText.isAcceptableOrUnknown(
+ data['intention_text']!,
+ _intentionTextMeta,
+ ),
+ );
+ }
if (data.containsKey('planned_minutes')) {
context.handle(
_plannedMinutesMeta,
@@ -510,6 +1186,18 @@ class $FocusSessionRowsTable extends FocusSessionRows
DriftSqlType.string,
data['${effectivePrefix}date_key'],
)!,
+ actionId: attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}action_id'],
+ ),
+ actionTitleSnapshot: attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}action_title_snapshot'],
+ ),
+ intentionText: attachedDatabase.typeMapping.read(
+ DriftSqlType.string,
+ data['${effectivePrefix}intention_text'],
+ ),
plannedMinutes:
attachedDatabase.typeMapping.read(
DriftSqlType.int,
@@ -547,6 +1235,9 @@ class $FocusSessionRowsTable extends FocusSessionRows
class FocusSessionRow extends DataClass implements Insertable {
final String id;
final String dateKey;
+ final String? actionId;
+ final String? actionTitleSnapshot;
+ final String? intentionText;
final int plannedMinutes;
final int actualSeconds;
final DateTime startedAt;
@@ -555,6 +1246,9 @@ class FocusSessionRow extends DataClass implements Insertable {
const FocusSessionRow({
required this.id,
required this.dateKey,
+ this.actionId,
+ this.actionTitleSnapshot,
+ this.intentionText,
required this.plannedMinutes,
required this.actualSeconds,
required this.startedAt,
@@ -566,6 +1260,15 @@ class FocusSessionRow extends DataClass implements Insertable {
final map = {};
map['id'] = Variable(id);
map['date_key'] = Variable(dateKey);
+ if (!nullToAbsent || actionId != null) {
+ map['action_id'] = Variable(actionId);
+ }
+ if (!nullToAbsent || actionTitleSnapshot != null) {
+ map['action_title_snapshot'] = Variable(actionTitleSnapshot);
+ }
+ if (!nullToAbsent || intentionText != null) {
+ map['intention_text'] = Variable(intentionText);
+ }
map['planned_minutes'] = Variable(plannedMinutes);
map['actual_seconds'] = Variable(actualSeconds);
map['started_at'] = Variable(startedAt);
@@ -578,6 +1281,18 @@ class FocusSessionRow extends DataClass implements Insertable {
return FocusSessionRowsCompanion(
id: Value(id),
dateKey: Value(dateKey),
+ actionId:
+ actionId == null && nullToAbsent
+ ? const Value.absent()
+ : Value(actionId),
+ actionTitleSnapshot:
+ actionTitleSnapshot == null && nullToAbsent
+ ? const Value.absent()
+ : Value(actionTitleSnapshot),
+ intentionText:
+ intentionText == null && nullToAbsent
+ ? const Value.absent()
+ : Value(intentionText),
plannedMinutes: Value(plannedMinutes),
actualSeconds: Value(actualSeconds),
startedAt: Value(startedAt),
@@ -594,6 +1309,11 @@ class FocusSessionRow extends DataClass implements Insertable {
return FocusSessionRow(
id: serializer.fromJson(json['id']),
dateKey: serializer.fromJson(json['dateKey']),
+ actionId: serializer.fromJson(json['actionId']),
+ actionTitleSnapshot: serializer.fromJson(
+ json['actionTitleSnapshot'],
+ ),
+ intentionText: serializer.fromJson(json['intentionText']),
plannedMinutes: serializer.fromJson(json['plannedMinutes']),
actualSeconds: serializer.fromJson(json['actualSeconds']),
startedAt: serializer.fromJson(json['startedAt']),
@@ -607,6 +1327,9 @@ class FocusSessionRow extends DataClass implements Insertable {
return {
'id': serializer.toJson(id),
'dateKey': serializer.toJson(dateKey),
+ 'actionId': serializer.toJson(actionId),
+ 'actionTitleSnapshot': serializer.toJson(actionTitleSnapshot),
+ 'intentionText': serializer.toJson(intentionText),
'plannedMinutes': serializer.toJson(plannedMinutes),
'actualSeconds': serializer.toJson(actualSeconds),
'startedAt': serializer.toJson(startedAt),
@@ -618,6 +1341,9 @@ class FocusSessionRow extends DataClass implements Insertable {
FocusSessionRow copyWith({
String? id,
String? dateKey,
+ Value actionId = const Value.absent(),
+ Value actionTitleSnapshot = const Value.absent(),
+ Value intentionText = const Value.absent(),
int? plannedMinutes,
int? actualSeconds,
DateTime? startedAt,
@@ -626,6 +1352,13 @@ class FocusSessionRow extends DataClass implements Insertable {
}) => FocusSessionRow(
id: id ?? this.id,
dateKey: dateKey ?? this.dateKey,
+ actionId: actionId.present ? actionId.value : this.actionId,
+ actionTitleSnapshot:
+ actionTitleSnapshot.present
+ ? actionTitleSnapshot.value
+ : this.actionTitleSnapshot,
+ intentionText:
+ intentionText.present ? intentionText.value : this.intentionText,
plannedMinutes: plannedMinutes ?? this.plannedMinutes,
actualSeconds: actualSeconds ?? this.actualSeconds,
startedAt: startedAt ?? this.startedAt,
@@ -636,6 +1369,15 @@ class FocusSessionRow extends DataClass implements Insertable {
return FocusSessionRow(
id: data.id.present ? data.id.value : this.id,
dateKey: data.dateKey.present ? data.dateKey.value : this.dateKey,
+ actionId: data.actionId.present ? data.actionId.value : this.actionId,
+ actionTitleSnapshot:
+ data.actionTitleSnapshot.present
+ ? data.actionTitleSnapshot.value
+ : this.actionTitleSnapshot,
+ intentionText:
+ data.intentionText.present
+ ? data.intentionText.value
+ : this.intentionText,
plannedMinutes:
data.plannedMinutes.present
? data.plannedMinutes.value
@@ -655,6 +1397,9 @@ class FocusSessionRow extends DataClass implements Insertable {
return (StringBuffer('FocusSessionRow(')
..write('id: $id, ')
..write('dateKey: $dateKey, ')
+ ..write('actionId: $actionId, ')
+ ..write('actionTitleSnapshot: $actionTitleSnapshot, ')
+ ..write('intentionText: $intentionText, ')
..write('plannedMinutes: $plannedMinutes, ')
..write('actualSeconds: $actualSeconds, ')
..write('startedAt: $startedAt, ')
@@ -668,6 +1413,9 @@ class FocusSessionRow extends DataClass implements Insertable {
int get hashCode => Object.hash(
id,
dateKey,
+ actionId,
+ actionTitleSnapshot,
+ intentionText,
plannedMinutes,
actualSeconds,
startedAt,
@@ -680,6 +1428,9 @@ class FocusSessionRow extends DataClass implements Insertable {
(other is FocusSessionRow &&
other.id == this.id &&
other.dateKey == this.dateKey &&
+ other.actionId == this.actionId &&
+ other.actionTitleSnapshot == this.actionTitleSnapshot &&
+ other.intentionText == this.intentionText &&
other.plannedMinutes == this.plannedMinutes &&
other.actualSeconds == this.actualSeconds &&
other.startedAt == this.startedAt &&
@@ -690,6 +1441,9 @@ class FocusSessionRow extends DataClass implements Insertable {
class FocusSessionRowsCompanion extends UpdateCompanion {
final Value id;
final Value dateKey;
+ final Value actionId;
+ final Value actionTitleSnapshot;
+ final Value intentionText;
final Value plannedMinutes;
final Value actualSeconds;
final Value startedAt;
@@ -699,6 +1453,9 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
const FocusSessionRowsCompanion({
this.id = const Value.absent(),
this.dateKey = const Value.absent(),
+ this.actionId = const Value.absent(),
+ this.actionTitleSnapshot = const Value.absent(),
+ this.intentionText = const Value.absent(),
this.plannedMinutes = const Value.absent(),
this.actualSeconds = const Value.absent(),
this.startedAt = const Value.absent(),
@@ -709,6 +1466,9 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
FocusSessionRowsCompanion.insert({
required String id,
required String dateKey,
+ this.actionId = const Value.absent(),
+ this.actionTitleSnapshot = const Value.absent(),
+ this.intentionText = const Value.absent(),
required int plannedMinutes,
required int actualSeconds,
required DateTime startedAt,
@@ -725,6 +1485,9 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
static Insertable custom({
Expression? id,
Expression? dateKey,
+ Expression? actionId,
+ Expression? actionTitleSnapshot,
+ Expression? intentionText,
Expression? plannedMinutes,
Expression? actualSeconds,
Expression? startedAt,
@@ -735,6 +1498,10 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
return RawValuesInsertable({
if (id != null) 'id': id,
if (dateKey != null) 'date_key': dateKey,
+ if (actionId != null) 'action_id': actionId,
+ if (actionTitleSnapshot != null)
+ 'action_title_snapshot': actionTitleSnapshot,
+ if (intentionText != null) 'intention_text': intentionText,
if (plannedMinutes != null) 'planned_minutes': plannedMinutes,
if (actualSeconds != null) 'actual_seconds': actualSeconds,
if (startedAt != null) 'started_at': startedAt,
@@ -747,6 +1514,9 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
FocusSessionRowsCompanion copyWith({
Value? id,
Value? dateKey,
+ Value? actionId,
+ Value? actionTitleSnapshot,
+ Value? intentionText,
Value? plannedMinutes,
Value? actualSeconds,
Value? startedAt,
@@ -757,6 +1527,9 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
return FocusSessionRowsCompanion(
id: id ?? this.id,
dateKey: dateKey ?? this.dateKey,
+ actionId: actionId ?? this.actionId,
+ actionTitleSnapshot: actionTitleSnapshot ?? this.actionTitleSnapshot,
+ intentionText: intentionText ?? this.intentionText,
plannedMinutes: plannedMinutes ?? this.plannedMinutes,
actualSeconds: actualSeconds ?? this.actualSeconds,
startedAt: startedAt ?? this.startedAt,
@@ -775,6 +1548,17 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
if (dateKey.present) {
map['date_key'] = Variable(dateKey.value);
}
+ if (actionId.present) {
+ map['action_id'] = Variable(actionId.value);
+ }
+ if (actionTitleSnapshot.present) {
+ map['action_title_snapshot'] = Variable(
+ actionTitleSnapshot.value,
+ );
+ }
+ if (intentionText.present) {
+ map['intention_text'] = Variable(intentionText.value);
+ }
if (plannedMinutes.present) {
map['planned_minutes'] = Variable(plannedMinutes.value);
}
@@ -801,6 +1585,9 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
return (StringBuffer('FocusSessionRowsCompanion(')
..write('id: $id, ')
..write('dateKey: $dateKey, ')
+ ..write('actionId: $actionId, ')
+ ..write('actionTitleSnapshot: $actionTitleSnapshot, ')
+ ..write('intentionText: $intentionText, ')
..write('plannedMinutes: $plannedMinutes, ')
..write('actualSeconds: $actualSeconds, ')
..write('startedAt: $startedAt, ')
@@ -812,6 +1599,851 @@ class FocusSessionRowsCompanion extends UpdateCompanion {
}
}
+class $ProgressNoteRowsTable extends ProgressNoteRows
+ with TableInfo<$ProgressNoteRowsTable, ProgressNoteRow> {
+ @override
+ final GeneratedDatabase attachedDatabase;
+ final String? _alias;
+ $ProgressNoteRowsTable(this.attachedDatabase, [this._alias]);
+ static const VerificationMeta _idMeta = const VerificationMeta('id');
+ @override
+ late final GeneratedColumn id = GeneratedColumn(
+ 'id',
+ aliasedName,
+ false,
+ type: DriftSqlType.string,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _dateKeyMeta = const VerificationMeta(
+ 'dateKey',
+ );
+ @override
+ late final GeneratedColumn dateKey = GeneratedColumn(
+ 'date_key',
+ aliasedName,
+ false,
+ type: DriftSqlType.string,
+ requiredDuringInsert: true,
+ );
+ static const VerificationMeta _actionIdMeta = const VerificationMeta(
+ 'actionId',
+ );
+ @override
+ late final GeneratedColumn actionId = GeneratedColumn