diff --git a/CHANGELOG.md b/CHANGELOG.md index 35a3d18c..e92a770c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,984 +4,531 @@ *** -## [v14.25.0] - 2026-05-19 +## [v14.56.0] - 2026-05-20 -### 新增 -- 协议多语言（中文+英文）全面适配，本地端+网页端同步支持： - - `agreement_data.dart` 新增10个英文协议常量（privacyPolicyContentEn ~ devTeamContentEn），完整翻译所有协议 - - `agreement_data.dart` 的 getContent/getSubtitle/getUpdateDate 增加 languageId 参数，根据语言返回对应内容 - - `agreement_types.dart` 枚举新增 titleEn/subtitleEn 字段，新增 titleFor()/subtitleFor()/webUrlFor() 方法 - - `agreement_page.dart` 改为 ConsumerWidget，从 appLocaleProvider 获取当前语言，传递给数据层 - - `agreement_list_page.dart` 改为 ConsumerWidget，标题/副标题/分组名/页脚全部支持中英文 - - 网页端HTML生成脚本改造为双语版：每个HTML包含中英文两套内容，JS控制显示切换 - - 网页端新增语言切换按钮（右上角毛玻璃胶囊：中文/EN），支持URL参数 ?lang=en - - 网页端 index.html 同步支持双语，英文版链接自动附加 ?lang=en - - 脚本自动提取中文(xxxContent)和英文(xxxContentEn)两套常量，分别生成HTML内容 +### 新增 — 文件传输二维码分享功能实现 + +- **二维码分享设备**：`_shareDeviceViaQr` 方法原先仅显示 Toast "二维码分享功能开发中..."，现已完整实现。使用 `QrPairingService.generateQrPayload()` 生成包含设备 IP、端口、别名、指纹、配对方式的 JSON 载荷，通过 `QrImageView` 渲染二维码，在 CupertinoAlertDialog 中展示 +- **复制配对信息**：弹窗新增"复制配对信息"按钮，将设备名称/IP/端口/指纹以可读格式复制到剪贴板，方便无法扫码时手动配对 +- **二维码有效期提示**：弹窗内显示二维码有效期（5分钟），与 `QrPairingService.qrExpiry` 保持一致 +- **深色模式适配**：二维码背景始终为白色确保可扫描性，前景色根据深色/浅色主题自动切换 + +*** + +## [v14.55.0] - 2026-05-20 + +### 修复 — 传输设置页面低优先级问题清理 + +- **调试模式开关**：原先硬编码 `value: false, onChanged: (v) {}`，开关无法切换。现连接 `TransferSettings.debugMode` provider，开启后自动导航到调试面板页面（`_DebugPanelPage`，复用 `FileTransferDebugPanel` mixin） +- **加密算法选择器**：原先只有 `AES-256-CBC` 一个选项却弹出单选弹窗，形同虚设。现改为静态展示（Row 布局显示当前算法名），删除 `_showEncryptionAlgorithmPicker` 方法 +- **信令服务器状态**：原先硬编码 `wss://tools.wktyl.com:9443` 和 `状态: 已连接`。现从 `signalingService.isConnected` 动态读取连接状态，显示 🟢 已连接 / 🔴 未连接；服务器地址也从 `settings.signalingServerUrl` 读取 +- **TransferDevice.fromJsonWithDefaults**：与 `fromJson` 几乎完全重复且缺少 `isFavorite`/`userId`/`ipCity`/`ipRange`/`accountAlias` 字段。已删除，项目中无其他调用点 + +*** + +## [v14.54.1] - 2026-05-20 ### 变更 -- 协议展示页面UI文案（"在线版"、"最后更新日期"、"软件协议"等）根据当前语言动态切换 -- 网页端"返回协议列表"按钮根据语言显示中文/英文 -- 英文协议中公司名"微风暴"翻译从"Weibao Storm"更正为拼音"Weifengbao"（Mile City Pengpu Town Weifengbao Network Technology Studio） +- sensors_plus 从远程依赖 `^6.0.0` 改为本地鸿蒙适配版本 `6.1.0-ohos.1` +- 新增本地包 `packages/sensors_plus`（来源：gitcode.com/openharmony-sig/flutter_plus_plugins br_sensors_plus-v6.1.0_ohos 分支） +- 新增本地包 `packages/sensors_plus_ohos`（鸿蒙平台传感器实现 v1.0.1） +- 新增本地包 `packages/sensors_plus_platform_interface`（平台接口 v2.0.0） +- sensors_plus pubspec.yaml 添加 ohos 平台声明 `default_package: sensors_plus_ohos` +- pubspec.yaml dependency_overrides 新增 sensors_plus 和 sensors_plus_platform_interface 本地路径覆写 *** -## [v14.24.0] - 2026-05-19 +## [v14.54.0] - 2026-05-20 -### 新增 -- 协议与隐私政策V6.5综合合规更新（P0-P3优先级全部完成）： - - 隐私政策新增定义章节（零、定义），明确关键术语含义 - - 新增业务功能与个人信息映射表，逐项说明各功能收集的信息类型及必要性 - - 补充第三方SDK详细信息表（Flutter SDK + Supabase Flutter SDK），含提供者、收集信息、使用目的、隐私政策链接 - - 新增儿童年龄验证机制（14周岁以下禁止注册，注册时确认年龄） - - 明确各类信息存储期限（账号信息、用户内容、崩溃日志等7类），以表格形式展示 - - 完善跨境传输条款（当前不跨境，未来需安全评估+单独同意） - - 完善个人信息保护负责人信息（邮箱：gg@0gg.cc） - - 各协议统一增加法律适用与争议解决条款（适用中国法律，管辖法院） - - 统一地址为"云南省昆明市西山区滇池度假区"，增加统一社会信用代码92532526MA6PCX153W - - 免责声明增加消费者权益保留条款 - - 软件介绍/新手指引增加法律声明引用 - - AI功能统一标注为"规划中" - - 注销流程根据实际代码更新（3天审核期+安全验证+状态查询+倒计时） - - 软件著作权登记号2020SR0421982加入免责声明和开发团队页面 -- 协议HTML网页端同步更新并上传服务器（https://tools.wktyl.com/agreements/） - - 软著证书图片展示（免责声明+开发团队页面） - - 自动化生成脚本：从Dart数据提取→Markdown转HTML→上传服务器 +### 修复 — 主页扩展功能审计修复（P0/P1/P2） + +**P0 严重修复** +- 互动通知情绪系统链路断裂：`HomeInteractionMixin` 的 `toggleLike`/`toggleFavorite` 未通知 `characterMoodProvider`，角色情绪永远不会因互动变化。现添加 `ref.read(characterMoodProvider.notifier).recordAction()` 调用 +- 每日通知调度逻辑缺失：`setDailyNotification(true)` 仅更新状态值未调用 `DailyNotifyService.scheduleDailyNotification()`，用户开启提醒后不会收到通知。现接入 `DailyNotifyService`，设置时间和开关均触发实际调度/取消 +- 音效文件缺失：`assets/sounds/sfx/` 目录下无 mp3 文件，所有9种音效静默失败。推荐从 Pixabay/Mixkit/JSFXR 下载免费商用音效（详见审计报告） + +**P1 逻辑修复** +- Tips未关联情绪：`_generateTimeSlotTip()` 仅基于时段，不读取 `characterMoodProvider`。现根据 mood 调整文案（happy→"今天心情不错呢~", bored→"好无聊，来读点什么吧", sleepy→"困了...但还是想陪你"） +- 电池显示硬编码：`appbar_date_display.dart` 电池项固定显示 `🔋85%`，现接入 `BatteryInfoService.instance.currentLevel` 和 `isCharging` 状态 +- NFC可用性未初始化：`NfcShareService.instance.isAvailable` 默认 `false` 且从未调用 `checkAvailability()`，NFC分享按钮永远不显示。现于 `home_page.dart` initState 中调用初始化 + +**P2 体验优化** +- 角色说话动画缺失：`CharacterExpression` 枚举新增 `speaking`，嘴巴做开合动画（`_expressionController.repeat(reverse:true)`），TTS 播放时角色同步说话表情，停止后微笑 +- 屏幕常亮阅读模式未实现：mode=1（阅读时）原先与 mode=2（始终）行为相同。现添加滚动检测：滚动停止5秒后启用 wakelock，滚动恢复时禁用 +- mounted 字段失效：`_mounted` 为 `final bool _mounted = true` 永远为 true，`if (!mounted) return` 永远不触发。现改为可变字段 + `markDisposed()` 方法，`HomeNotifier._onDispose` 中调用 + +*** + +## [v14.53.3] - 2026-05-20 ### 修复 -- 修复"继续使用即同意"条款为"主动确认同意"机制 -- 修复英文名称 WordsLeisure → Xianyan -- 修复账号协议与儿童隐私年龄矛盾（14岁以下禁止注册，统一标准） -- 修复accountAgreementContent三引号结束符错误（`'';` → `'''`） -- 修复accountAgreementContent章节编号重复（两个"八"→"八、联系方式"+"九、法律适用"） - -*** - -## [v14.23.0] - 2026-05-19 - -### 重构 -- 全平台包名统一为 `apps.xy.xianyan`，替换原有不统一的 `com.example.xianyan` 和 `com.xianyan` - - **Android**: `build.gradle.kts` 的 `namespace`/`applicationId`，`MainActivity.kt` 包声明和 import，8个 Widget Provider 包声明和 import，`BleAdvertiserPlugin.kt` 包声明和 MethodChannel - - **Android**: Kotlin 源码目录从 `com/example/xianyan` 和 `com/xianyan` 迁移到 `apps/xy/xianyan` - - **iOS**: `Info.plist` 的 URL Scheme 和 App Group ID，`project.pbxproj` 的 PRODUCT_BUNDLE_IDENTIFIER，`XianyanWidget.swift` 的 App Group ID - - **macOS**: `AppInfo.xcconfig` 的 PRODUCT_BUNDLE_IDENTIFIER 和 PRODUCT_COPYRIGHT，`project.pbxproj` 的 PRODUCT_BUNDLE_IDENTIFIER - - **Linux**: `CMakeLists.txt` 的 APPLICATION_ID，`.desktop` 和 `.appdata.xml` 文件内容和文件名重命名，3个打包脚本 - - **Windows**: `Runner.rc` 的 CompanyName 和 LegalCopyright - - **鸿蒙**: `app.json5` 的 bundleName - - **Flutter/Dart**: `widget_type.dart` 的 qualifiedAndroidName，`home_widget_service.dart` 的 App Group ID，`bluetooth_pairing_service.dart` 和 `hotspot_service.dart` 的 MethodChannel，`about_page.dart` 的华为应用市场链接 - -*** - -## [v14.22.0] - 2026-05-19 +- 文件传输发现设备Tab双数据源问题：`buildDevicesTab` 中设备列表来自 `deviceDiscoveryProvider.discoveredDevices`，但配对状态检查使用 `transferProvider.isPairedWith/isPairing/peerStatuses`，两个 Provider 各自维护设备列表可能不同步。现以 `transferProvider.discoveredDevices` 为主数据源，合并 `discoveryProvider` 中独有设备，确保设备列表展示与配对状态检查来自同一数据源 ### 修复 -- Android `requestPinWidget`/`updateWidget` 调用时 `androidName` 仅传短类名(如`DailySentenceProvider`)，home_widget插件拼接`context.packageName`后变成`com.example.xianyan.DailySentenceProvider`，与实际类包名`com.xianyan.widget.DailySentenceProvider`不一致导致ClassNotFoundException - - `widget_type.dart` 新增 `qualifiedAndroidName` 属性，返回完整类名`com.xianyan.widget.XxxProvider` - - `home_widget_service.dart` 的 `updateWidget()` 增加 `qualifiedAndroidName` 参数 - - `widget_provider.dart` 的 `requestPinWidget()` 增加 `qualifiedAndroidName` 参数 - - 插件优先使用 `qualifiedAndroidName`，避免错误的包名拼接 -- 鸿蒙 `readlater_form.json` 的 `supportDimensions` 包含非法值`"4*1"`，不在鸿蒙允许列表(`1*2/2*2/2*4/4*4/1*1/6*4/2*3/3*3`)中，导致构建校验失败 - - 修改为合法值 `"2*4"` - -### 验证 -- 已检查全部8个鸿蒙 form 配置文件的 `supportDimensions` 和 `defaultDimension`，无其他非法值 +- 消息重复插入风险：`_localSendMessageSub` 和 `_nearbyMessageSub` 两个监听器可能收到同一条消息并重复插入 `state.messages`，现新增 `_addMessageDedup` 方法基于 `messageId` 去重，重复消息跳过插入并记录警告日志 +- 收藏功能未实现：`_setDeviceFavorite` 原先仅更新 `PeerStatus.connectionState` 为 `paired`，并未真正切换 `isFavorite` 字段。现新增 `TransferNotifier.toggleDeviceFavorite` 方法，正确切换设备 `isFavorite` 状态，同步更新内存（`discoveredDevices`/`myDevices`）和数据库，Toast 提示与实际行为一致 +- 数据库层补全：`TransferDatabase._rowToDevice` 缺少 `isFavorite` 字段读取，`insertDevice` 缺少 `isFavorite` 写入，`updateDevice` 缺少 `isFavorite` 参数，均已补全 *** +## [v14.53.2] - 2026-05-20 + ### 修复 -- HomeWidgetService `_notifyUpdate` 方法 ohosName 硬编码为 `'dailySentence'`，导致稍后读小组件调用时刷新错误卡片 - - 删除 `_notifyUpdate` 方法，`updateReadlaterCount`/`updateReadlaterPreview`/`updateDailySentence` 统一使用 `updateWidget(WidgetType)` 方法 - - 清理不再使用的 `_androidWidgetName`/`_iosWidgetName` 常量 -- 鸿蒙所有卡片未处理点击跳转事件 - - 所有8个 FormPage 添加 `postCardAction` 点击事件，传递对应 action - - 所有8个 FormAbility 添加 `onFormEvent` 方法，解析 action 后通过 `startAbility` 跳转到对应页面 - - 跳转路由与 WidgetType.deepLinkRoute 保持一致 -- `AppLocale.system.locale` 硬编码返回 `Locale('zh', 'CN')`，改为返回 `WidgetsBinding.instance.platformDispatcher.locale` - - 修复非中文系统用户选择"跟随系统"时始终显示中文的问题 -- Android 所有8个 Widget Provider 缺少 `import com.example.xianyan.R`，导致 `Unresolved reference 'R'` 编译错误 - - Provider 在 `com.xianyan.widget` 包下，R 类生成在 `com.example.xianyan` 包下，需显式导入 -- `CheckinProvider.kt` 字符串模板 `"连续$days天"` 语法错误，Kotlin 将 `days天` 视为整体标识符 - - 修复为 `"连续${days}天"`，使用大括号语法明确变量边界 - -### 验证 -- `CountdownProvider.kt` 使用 `java.time.LocalDate`/`ChronoUnit`，因 minSdk=26 且已启用 desugaring，不存在兼容性问题，无需修改 +- 传输设置页"传输记录"交互逻辑错误：点击后误调用 `_clearTransferRecords()`（清除记录），改为导航到文件传输页面的记录Tab（`FileTransferPage(initialTab: 2)`），长按保留清除记录功能 +- `_buildNavigationTile` 新增 `onLongPress` 可选参数支持长按交互 +- `FileTransferPage` 新增 `initialTab` 参数，支持从外部直接跳转到指定Tab *** -## [v14.20.0] - 2026-05-19 - -### 重构 -- settings/presentation 目录整理：23个文件按功能域分组到4个子目录(每个≤8文件) - - `general/` (5文件): 通用设置页面、选择器、操作、分组、模型 - - `theme/` (5文件): 主题设置页面、基础/样式/预览区块、共享组件 - - `account/` (4文件): 账户设置、注销、改密、安全问题 - - `privacy/` (3文件): 权限管理、隐私政策、日志查看 - - 根目录保留6个独立页面: data/font/language/more/notification/smart_mode -- 同步更新 app_router.dart 和 ohos_nav_bridge.dart 的 import 路径 - -*** - -## [v14.19.0] - 2026-05-19 - -### 新增 -- 多语言(i18n)系统P3升级 - - 语言切换动画: _LocaleTransitionWrapper组件，切换语言时淡入淡出过渡(300ms easeOut)，尊重动画开关设置 - - 4种新语言支持: 印地语(हिन्दी)/葡萄牙语(Português)/俄语(Русский)/法语(Français)，共11种语言+跟随系统 - - 语言智能排序: AppLocale.smartSorted()，根据系统语言自动将最相关语言排到前面(匹配语言+国家100分/匹配语言80分/中文50分/英文40分/其他20分) - - 翻译导入功能: TranslationIOService.importFromJson()，协同翻译ActionSheet增加"Import Translation"选项，支持粘贴JSON导入翻译 - - 翻译导入UI: CupertinoAlertDialog+CupertinoTextField输入框，支持验证/确认/错误提示 - -### 修改 -- `app_locale.dart`: 增加4种语言枚举(hi/pt/ru/fr)+smartSorted()+_relevanceScore() -- `translations.dart`: 增加4种语言翻译常量(_hi/_pt/_ru/_fr)+更新getTranslations/resolveSystem/Coverage -- `translation_io_service.dart`: 增加importFromJson()+_importNav/_importCommon/_importProfile/_importSettings -- `app.dart`: 增加_LocaleTransitionWrapper语言切换动画组件 -- `language_settings_page.dart`: 使用smartSorted()排序+增加Import Translation选项+导入对话框 - -*** - -## [v14.18.0] - 2026-05-19 - -### 新增 -- 文件传输Web平台适配 (P3-17) - - `PlatformHelper`: 新增supportsFilePicker/supportsImagePicker/supportsLocalNetwork能力检测 - - `transfer_chat_file_send.dart`: Web平台跳过File().lengthSync()/existsSync()等不支持操作，大文件检测和离线队列适配 - - `qr_code_tab.dart`: Web平台无摄像头时显示手动输入配对码对话框，扫描按钮文案/图标自适应 -- 文件传输HarmonyOS平台适配 (P3-16) - - `DegradationManager`: screenCapture始终返回full(已使用RepaintBoundary零权限方案)，新增harmonyNearby功能检测 - - `device_pairing_page.dart`: 其他配对方式新增"📡 鸿蒙Nearby"卡片，非鸿蒙平台显示降级提示 - - `transfer_enums.dart`: PairingMethod新增harmonyNearby枚举值 - -### 修改 -- `platform_helper.dart`: 新增3个Web能力检测getter -- `degradation_manager.dart`: screenCapture简化为始终full，allCapabilities/isFeatureAvailable新增harmonyNearby -- `transfer_chat_page.dart`: 新增platform_helper.dart导入(供part文件使用) - -*** - -## [v14.17.0] - 2026-05-19 - -### 重构 -- 通用设置页面拆分为多文件结构 (1755行→5个文件，每个≤800行) - - `setting_models.dart` (88行): 数据模型 SettingSection/SettingItem/SettingType - - `general_settings_sections.dart` (386行): 设置分组构建 + 搜索过滤 - - `general_settings_pickers.dart` (650行): GeneralSettingsPickers mixin，8个CupertinoPicker弹窗 - - `general_settings_actions.dart` (293行): GeneralSettingsActions mixin，操作对话框 - - `general_settings_page.dart` (529行): 主页面，mixin组合 -- 主题设置页面拆分为多文件结构 (1906行→5个文件，每个≤800行) - - `theme_shared_widgets.dart` (105行): 共享组件 ThemeSectionHeader/ThemeOptionChip - - `theme_sections_basic.dart` (692行): 预设/外观/定时深色/强调色/字体/毛玻璃/动画 - - `theme_sections_style.dart` (627行): 圆角/卡片/Tab表情/Tab造型/壁纸/重置 - - `theme_sections_preview.dart` (507行): 实时预览/动画演示/主题分享 - - `theme_settings_page.dart` (88行): 主页面 - -*** - -## [v14.16.0] - 2026-05-19 - -### 新增 -- 多语言(i18n)系统全面升级 - - 阿拉伯语RTL支持: AppLocale增加isRTL/textDirection属性，app.dart用Directionality包裹全局 - - 系统语言变化监听: didChangeLocales回调+SystemLocaleVersionNotifier，"跟随系统"实时响应 - - T类拆分分组: TNav(3字段)/TCommon(16字段)/TProfile(25字段)/TSettings(100字段)，访问方式 t.nav.home / t.common.cancel - - 向后兼容: T类保留144个@Deprecated getter，旧代码 t.navHome 仍可用 - - 参数化翻译: TFunc类(entriesCount/greeting/itemsSelected/pluralItems)，7种语言复数处理 - - 翻译fallback: T.withFallback()方法，缺失字段自动回退到zh_CN - - 翻译覆盖率检测: TranslationCoverage工具类，语言设置页底部显示各语言覆盖率进度条 - - 协同翻译功能: 导出当前语言/全部语言翻译为JSON到剪贴板，CupertinoActionSheet操作面板 - - 日期/数字格式化: localeDateFormatProvider/localeNumberFormatProvider，基于intl包 - - localizationDelegates补全: 添加GlobalCupertinoLocalizations.delegate - - RTL标识: 阿拉伯语语言项显示RTL标签 - - 翻译IO服务: TranslationIOService(exportToJson/exportAllToJson/validateTranslationJson) - -### 修改 -- `app_locale.dart`: 增加isRTL/textDirection/systemLocaleVersionProvider/appTextDirectionProvider/localeDateFormatProvider/localeNumberFormatProvider -- `translations.dart`: T类重构为组合模式(TNav+TCommon+TProfile+TSettings)，增加TFunc+TranslationCoverage -- `app.dart`: Directionality包裹+didChangeLocales回调+_localizationsDelegates提取为常量+GlobalCupertinoLocalizations -- `language_settings_page.dart`: 协同翻译ActionSheet+覆盖率面板+RTL标识+使用t.nav/t.common/t.settings分组访问 -- `translation_io_service.dart`: 新增翻译导出/导入/验证服务 - -*** - -## [v14.15.0] - 2026-05-19 - -### 新增 -- 应用内屏幕共享功能 (InApp Screen Share) - - `InAppScreenCaptureService`: 使用RepaintBoundary+toImage()截图流，无需系统权限 - - 支持可配置FPS(1-30)和JPEG质量(0.1-1.0) - - 帧数据通过信令通道`screen-share-frame`传输，base64编码 - - 帧发送节流(80ms最小间隔)，防止信令洪泛 - - 接收端实时解码显示，支持InteractiveViewer缩放 - - ScreenSharePage新增帧信息栏(帧数/分辨率/大小/InApp标识) - -### 重构 -- `ScreenCaptureService`: 移除MethodChannel/EventChannel，改用InAppScreenCaptureService - - `requestPermission()`始终返回true(无需系统权限) - - 新增`setRepaintBoundaryKey`/`setFps`/`setQuality`/`framesStream`接口 -- `ScreenSharePage`: 移除RTCVideoRenderer/RTCVideoView，改用Image.memory帧显示 -- `ScreenShareState`: 新增`currentFrame`/`frameCount`字段 -- `ScreenShareNotifier`: 新增`_listenFrameSend`/`_listenFrameReceive`帧收发逻辑 -- `SignalingService`: 新增`screenShareFrame`信令类型和`sendScreenShareFrame`方法 -- `transfer_chat_page`: 主内容区包裹RepaintBoundary，初始化时设置Key -- `transfer_chat_screen_share`: 移除`PlatformHelper.supportsScreenCapture`检查，两个共享选项始终可用 - -### 移除 -- `ScreenCaptureService`中的MethodChannel/EventChannel(不再需要原生屏幕捕获) -- `transfer_chat_page`中`platform_helper.dart`的import(不再使用) - -*** - -## [v14.14.0] - 2026-05-19 - -### 重构 -- 通用设置页面拆分为多文件结构 (1755行→5个文件，每个≤800行) - - `setting_models.dart` (88行): 数据模型 SettingSection/SettingItem/SettingType，从私有类改为公开 - - `general_settings_sections.dart` (386行): 设置分组构建函数 buildGeneralSettingSections + 搜索过滤 filterSettingSections - - `general_settings_pickers.dart` (650行): GeneralSettingsPickers mixin，封装8个CupertinoPicker弹窗 + 转场模式描述组件 - - `general_settings_actions.dart` (293行): GeneralSettingsActions mixin，封装缓存清理/重置/导出导入等操作对话框 - - `general_settings_page.dart` (529行): 主页面，通过 mixin 组合 Pickers + Actions，保留UI构建和事件处理 - -*** - -## [v14.13.0] - 2026-05-19 - -### 重构 -- 多语言翻译系统组合模式重构 (`translations.dart`) - - T类拆分为组合模式：T内含4个子类字段 `nav`(TNav), `common`(TCommon), `settings`(TSettings), `profile`(TProfile) - - TNav(3字段): home/discover/profile - - TCommon(16字段): cancel/ok/save/confirm/clear/reset/delete/success/failed/enabled/disabled/loading/view/search/entriesCountUnit/copyright - - TProfile(25字段): title/myFavorites/readingHistory/darkMode/accountSettings等个人中心字段 - - TSettings(100字段): language/generalSettings/interaction/sound等所有设置相关字段 - - 向后兼容：T类保留所有144个原有顶级字段作为@Deprecated getter委托到子类，现有`t.navHome`代码不会报错 - - 新增TFunc参数化翻译类：entriesCount/greeting/itemsSelected/pluralItems 4个方法，支持7种语言的复数/参数化翻译 - - 新增T.withFallback()静态方法：将fallback中非空字段覆盖target中为空的字段 - - 新增TranslationCoverage工具类：checkAll()返回各语言覆盖率，checkCoverage()返回缺失字段列表 - - 新增translationsFuncProvider：Riverpod Provider返回TFunc实例 - - 新增_resolveSystemLanguageId()辅助函数 - - 7种语言常量完整保留所有翻译值 - -### 修改 -- `translations.dart`: T类从144个required String参数的平铺结构重构为4子类组合结构(1404行→1726行) - -*** - -## [v14.12.0] - 2026-05-19 - -### 新增 -- 协作画布远程光标显示 (P2-12) - - 远程用户光标以彩色圆形+别名首字母覆盖层显示，不同用户自动分配不同颜色 - - 光标移动使用 AnimatedOpacity 实现平滑动画 - - 光标3秒无移动后自动淡出消失 - - 触摸绘制时自动广播本地光标位置给远程用户 - - 光标广播节流限制(10次/秒)，避免信令洪泛 -- 协作画布快照同步 (P2-13) - - 同步状态栏新增「同步画布」按钮，点击请求对端完整画布快照 - - 同步中显示 CupertinoActivityIndicator 加载指示器 - - 快照请求10秒超时自动取消 - - 收到快照响应后自动合并到本地画布并结束加载状态 - -### 修改 -- `canvas_sync_service.dart`: broadcastCursor 添加100ms节流 -- `canvas_provider.dart`: CanvasState 新增 cursorOpacities/isSyncing 字段，addPoint 自动广播光标，新增 requestSnapshotSync 方法，光标淡出定时器管理 -- `canvas_painter.dart`: 移除远程光标绘制(改用覆盖层Widget实现动画+淡出) -- `canvas_page.dart`: 画布区域改为 Stack 布局叠加光标覆盖层，同步状态栏新增同步按钮和加载指示器，新增 _RemoteCursorWidget/_CursorPointerPainter 组件 - -*** - -## [v14.11.0] - 2026-05-19 - -### 新增 -- 多语言(i18n)系统：自定义翻译框架，支持实时切换语言无需重启 - - `app_locale.dart`: AppLocale枚举(8种: system/zh_CN/en/ja/zh_TW/es/ar/bn)，含nativeName/englishName/languageCode/countryCode - - `translations.dart`: T翻译类(130+字段)，7种语言常量，translationsProvider响应式翻译 - - `appLocaleProvider`: Riverpod Provider，监听设置变化自动切换Locale - - `supportedLocalesProvider`: 提供所有支持Locale列表 - - 系统语言跟随: `_resolveSystemLocale()`/`_resolveSystemTranslations()` 自动匹配系统语言，fallback到zh_CN -- 语言选择页面 `language_settings_page.dart` - - "跟随系统"选项 + 7种语言列表(简体中文/English/日本語/繁體中文/Español/العربية/বাংলা) - - 选中语言显示✓标记+accent色标签 - - "协同翻译"按钮入口(占位，后续接入翻译协作平台) -- 通用设置页面 i18n 适配: 所有硬编码中文替换为 `t.xxx` 翻译字段 -- 个人中心页面 i18n 适配: 导航/统计/快捷操作/关于弹窗等翻译 -- 底部导航栏 i18n 适配: 闲言/发现/我的 翻译 -- 鸿蒙端导航栏 i18n 适配: 同步翻译 -- 语言偏好持久化: KvStorage `general_language` 键，默认值 `system`(跟随系统) -- 开发文档: `docs/i18n_dev_doc.dart` — 功能描述/架构设计/数据流/使用示例/验收清单 - -### 修改 -- `app.dart`: MaterialApp/MaterialApp.router 添加 `locale` + `supportedLocales` 属性 -- `general_fields_provider.dart`: 默认语言从 `zh_CN` 改为 `system` -- `general_settings_page.dart`: 语言选择从CupertinoPicker改为跳转独立语言设置页 -- `profile_page.dart`: 语言行显示AppLocale.nativeName，点击跳转语言设置页 -- `app_router.dart`: 新增 `/settings/language` 路由 - -*** - -## [v14.10.0] - 2026-05-19 - -### 重构 -- 传输聊天页面文件拆分(1916行→3文件，每个≤800行) - - `transfer_chat_page.dart` (729行): 主页面核心 — 状态变量/生命周期/build/消息列表/网络Ping/速度追踪/已读回执 - - `transfer_chat_screen_share.dart` (688行): 屏幕共享part文件 — 双向请求/接受/拒绝/SDP/ICE/Offer卡片/网络状态辅助/对端ID收集 - - `transfer_chat_file_send.dart` (617行): 文件发送part文件 — 附件选择/离线发送/大文件确认/拖拽/语音录制/画布协作/文件分享打开 - - 使用`part`/`part of`指令+Extension扩展方法实现跨文件方法共享 - - 主类添加`_setState()`包装方法，解决扩展方法中`setState`的`@protected`限制 - -*** - -## [v14.9.0] - 2026-05-19 - -### 新增 -- Flutter端小部件管理页面优化 - - `widget_management_page.dart`: 按优先级分组展示(P0核心/P1推荐/P2实用/P3趣味)，新增同步主题按钮、深度链接预览 - - `widget_type.dart`: 新增deepLinkRoute/dataKeyPrefix/themeKey三个getter - - `widget_provider.dart`: 新增pushThemeToAllWidgets()方法，addWidget支持所有类型+自动推送主题 - - `home_widget_service.dart`: 新增pushThemeMode/updateFortune/updateCountdown/updatePomodoro/updateSolarTerm/updateCheckin方法，扩展深度链接回调 -- iOS WidgetKit P2/P3小部件(5个新Widget) - - FortuneWidget/CountdownWidget/PomodoroWidget/SolarTermWidget/CheckinWidget - - 所有8个Widget支持深色主题(WidgetColors结构体+isDark字段) - - DailyCardWidget新增(Medium/Large尺寸) -- 鸿蒙 FormExtension P2/P3卡片(5个新FormAbility) - - FortuneFormAbility/CountdownFormAbility/PomodoroFormAbility/SolarTermFormAbility/CheckinFormAbility - - 5个ArkUI FormPage均支持深色主题(isDark状态+动态配色) - - 5个表单配置JSON(fortune_form/countdown_form/pomodoro_form/solar_term_form/checkin_form) - - module.json5注册5个新extensionAbilities - - P0/P1 FormAbility和ArkUI页面均添加isDark深色主题支持 - -### 修改 -- `XianyanWidget.swift`: 从2个Widget扩展到8个，全部支持深色主题 -- 鸿蒙P0/P1 FormAbility: 添加isDark读取和formData输出 -- 鸿蒙P0/P1 ArkUI Pages: 添加@State isDark + 动态backgroundColor/fontColor - -*** - -## [v14.8.0] - 2026-05-19 - -### 新增 -- Android原生小部件P2/P3（5个新Widget Provider + 深色主题支持） - - `FortuneProvider.kt`: 每日运势小部件，展示运势文本+幸运关键词，读取fortune_text/fortune_keyword - - `CountdownProvider.kt`: 倒计时小部件，展示标题+剩余天数，读取countdown_title/countdown_target，自动计算天数差 - - `PomodoroProvider.kt`: 番茄钟小部件，展示倒计时+状态(专注中/已暂停/准备开始)，读取pomodoro_remaining/pomodoro_state - - `SolarTermProvider.kt`: 节气诗词小部件，展示节气名+诗词，读取solar_term_name/solar_term_poem - - `CheckinProvider.kt`: 每日签到小部件，展示连续天数+签到状态(✅/📝)，读取checkin_days/checkin_today -- 全部8个Widget Provider深色主题支持 - - 读取SharedPreferences `widget_theme_mode` 字段(light/dark) - - 根据主题自动切换light/dark布局XML - - 深色背景: `widget_background_dark.xml` (#1C1C1E iOS风格深色) -- P2/P3布局XML(10个): widget_fortune/countdown/pomodoro/solar_term/checkin 各light+dark -- P0/P1深色布局XML(3个): widget_daily_sentence_dark/widget_readlater_dark/widget_daily_card_dark -- Widget配置XML(5个): fortune_info/countdown_info/pomodoro_info/solar_term_info/checkin_info -- strings.xml新增5个widget描述字符串 -- AndroidManifest.xml注册5个新receiver - -### 修改 -- `DailySentenceProvider.kt`: 新增dark主题支持，根据widget_theme_mode切换布局 -- `ReadlaterProvider.kt`: 新增dark主题支持，根据widget_theme_mode切换布局 -- `DailyCardProvider.kt`: 新增dark主题支持，根据widget_theme_mode切换布局 - -*** - -## [v14.7.0] - 2026-05-19 - -### 新增 -- 桌面小部件管理功能：个人中心「会员中心」替换为「桌面小部件」入口 - - `widget_management_page.dart`: 小部件管理页面，支持8种小部件类型展示+平台兼容说明+安装状态 - - `widget_type.dart`: 8种小部件枚举(dailySentence/readlater/dailyCard/dailyFortune/countdown/pomodoro/solarTerm/checkin) - - `widget_provider.dart`: Riverpod Notifier状态管理，支持安装检测/添加/固定/数据推送 - - `home_widget_service.dart`: 新增updateWidget(WidgetType)方法，支持按类型推送数据到指定平台 - - `app_router.dart` + `ohos_nav_bridge.dart`: 新增/widget-management路由 -- home_widget插件ohos适配增强 - - `home_widget.dart`: updateWidget/requestPinWidget新增ohosName参数 - - `home_widget_info.dart`: 新增ohosFormId/ohosFormName字段 -- Android原生小部件（3个P0/P1） - - `DailySentenceProvider.kt` + `ReadlaterProvider.kt` + `DailyCardProvider.kt`: WidgetProvider - - 布局XML: widget_daily_sentence/widget_readlater/widget_daily_card - - Widget配置XML: daily_sentence_info/readlater_info/daily_card_info - - AndroidManifest.xml注册3个receiver -- iOS原生小部件 - - `XianyanWidget.swift`: WidgetKit入口，DailySentenceWidget+ReadlaterWidget - - Info.plist + Assets.xcassets: Widget Extension配置 -- 鸿蒙原生卡片（3个P0/P1） - - `DailySentenceFormAbility.ets` + `ReadlaterFormAbility.ets` + `DailyCardFormAbility.ets` - - ArkUI页面: DailySentenceFormPage/ReadlaterFormPage/DailyCardFormPage - - 表单配置JSON: daily_sentence_form/readlater_form/daily_card_form - - module.json5注册3个extensionAbilities - -### 修改 -- `profile_page.dart`: 会员中心→桌面小部件，图标改为CupertinoIcons.square_grid_2x2 - -*** - -## [v14.6.0] - 2026-05-19 - -### 新增 -- P3-06 拖拽发送文件：聊天页面支持DragTarget拖拽文件发送 - - `transfer_chat_page.dart`: DragTarget包裹聊天区域，拖入文件时显示DottedBorder+图标+文字提示 - - `_isDragOver`状态变量 + AnimatedOpacity平滑过渡 - - `_handleDroppedFiles()`验证路径后调用`_sendFilesWithOfflineCheck()` - - 拖拽提示: 半透明遮罩 + DottedBorder(accent色) + CupertinoIcons.arrow_down_doc + "释放以发送文件" -- P3-08 消息长按上下文菜单：CupertinoContextMenu长按消息气泡弹出操作菜单 - - `transfer_chat_bubbles.dart`: ChatMessageBubble新增onCopy/onForward/onDelete/onShare/onOpen回调 - - 文本消息: 复制/转发/删除 | 文件消息: 打开/分享/删除 | 语音消息: 删除 | 系统消息: 无菜单 - - `transfer_chat_page.dart`: 连接回调 — 复制到剪贴板/删除消息/分享文件/打开文件/转发提示 - - `transfer_notifier.dart`: 新增`deleteMessage()`方法，从state和数据库删除消息 - - `transfer_database.dart`: 新增`deleteMessage()`方法，Drift ORM删除记录 - -*** - -## [v14.5.0] - 2026-05-19 - -### 新增 -- 功能降级管理器 `DegradationManager`：跨平台功能降级策略，优雅回退不可用功能 - - `degradation_manager.dart`: 功能能力检测+降级提示+替代方案 - - FeatureLevel枚举: full/limited/minimal/unavailable 四级能力等级 - - FeatureCapability模型: name/level/fallbackHint/alternativeMethod - - 6项功能检测: screenCapture/nfcPairing/bluetoothPairing/wifiDirect/usbTransfer/remoteInput - - isFeatureAvailable()统一查询接口 - - allCapabilities/unavailableFeatures批量查询 - -### 修改 -- `device_pairing_page.dart`: 其他配对方式Tab集成DegradationManager - - 蓝牙/NFC/USB配对方式双重检测: discoveryState + DegradationManager平台能力 - - 不可用功能展示fallbackHint降级提示文字 - - 不可用功能展示💡alternativeMethod替代方案建议 - - _buildOtherMethodCard新增fallbackHint/alternativeMethod参数 -- `transport_router.dart`: 传输路由集成DegradationManager平台能力过滤 - - selectRoute(): USB/Wi-Fi Direct候选添加DegradationManager前置检查 - - getAvailableTransports(): USB/Wi-Fi Direct传输添加DegradationManager前置检查 - - sendWithFallback(): attemptOrder过滤不可用传输方式 - - 新增_isTransportAvailable()辅助方法 - -*** - -## [v14.4.0] - 2026-05-19 - -### 新增 -- iOS WidgetKit 小组件扩展：`ios/XianyanWidget/` 目录 - - `XianyanWidget.swift`: Widget Extension 入口，包含两个小组件 - - DailySentenceWidget（每日一句）：从 App Group UserDefaults 读取 `daily_sentence` / `daily_sentence_author` - - ReadlaterWidget（稍后读）：从 App Group UserDefaults 读取 `readlater_count` / `readlater_preview_text` / `readlater_preview_author` - - 两种小组件均支持 systemSmall / systemMedium 尺寸 - - 使用 `containerBackground(for: .widget)` 适配 iOS 17+ 样式 - - App Group ID: `group.com.xianyan.share` - - `Info.plist`: WidgetKit Extension 配置，NSExtensionPointIdentifier 为 `com.apple.widgetkit-extension` - - `Assets.xcassets`: 包含 AccentColor.colorset 和 AppIcon.appiconset - -*** - -## [v14.4.0] - 2026-05-19 - -### 新增 -- Android 桌面小部件完整实现：3个Widget Provider + 布局XML + 配置注册 - - `DailySentenceProvider`: 每日精选句子小部件，展示句子+作者，点击打开APP - - `ReadlaterProvider`: 稍后读小部件，展示未读数量+预览文本，点击打开APP - - `DailyCardProvider`: 精美日签卡片小部件，居中展示日期+句子+作者，点击打开APP -- Widget布局XML: - - `widget_daily_sentence.xml`: 纵向布局，句子TextView + 作者TextView(右对齐) - - `widget_readlater.xml`: 纵向布局，未读数量(粗体) + 预览文本(2行截断) - - `widget_daily_card.xml`: FrameLayout+LinearLayout居中，日期+句子(居中4行)+作者(右对齐) -- Widget配置XML: - - `daily_sentence_info.xml`: 3x2单元格，30分钟更新，可水平/垂直调整 - - `readlater_info.xml`: 3x1单元格，30分钟更新，可水平/垂直调整 - - `daily_card_info.xml`: 3x3单元格，30分钟更新，可水平/垂直调整 -- `widget_background.xml`: 白色圆角16dp背景drawable -- `strings.xml`: 新增3个widget描述字符串资源 -- `AndroidManifest.xml`: 注册3个receiver(DailySentenceProvider/ReadlaterProvider/DailyCardProvider) - -### 修改 -- `AndroidManifest.xml`: 在``标签内``后新增3个``声明 - -*** - -## [v14.3.0] - 2026-05-19 - -### 新增 -- 设备卡片3D倾斜效果：DeviceCard集成flutter_tilt Tilt.base交互 - - `device_card.dart`: GestureDetector内包裹Tilt.base，angle=6，moveDuration=200ms - - 光照效果: LightConfig(maxIntensity: 0.3)，跟随倾斜方向动态光照 - - 圆角裁剪: borderRadius与卡片AppRadius.lgBorder统一 -- PlatformHelper平台检测工具类：跨平台功能能力检测 - - `platform_helper.dart`: 复用platform_utils条件导入，新增能力检测 - - supportsScreenCapture / supportsNFC / supportsBluetooth / supportsWiFiDirect / supportsUSB - - screenCaptureMethod: 各平台屏幕捕获API名称(MediaProjection/ReplayKit/CGWindowListCreateImage等) - - platformName: 统一平台名称获取 - -### 修改 -- `device_card.dart`: Tilt.base包裹Container，保留GestureDetector外层+animate动画 -- `transfer_chat_page.dart`: _showScreenShareOptions()集成PlatformHelper - - 不支持屏幕捕获时Toast提示"当前平台不支持屏幕捕获"并return - - "共享我的屏幕"选项仅supportsScreenCapture为true时显示 - - "观看对方屏幕"选项始终显示(接收视频全平台可用) - -*** - -## [v14.2.0] - 2026-05-19 - -### 新增 -- Liquid Glass 风格统一：文件传输页面 Container+BoxDecoration 全部替换为 GlassContainer - - `device_pairing_page.dart`: 其他配对方式卡片 → GlassContainer(depth: elevated) - - `pairing_code_tab.dart`: 配对码展示卡片 → GlassContainer(depth: prominent) - - `qr_code_tab.dart`: 二维码展示卡片 → GlassContainer(depth: prominent) - - `radar_scan_tab.dart`: 设备列表项 → GlassContainer(depth: base) -- 配对成功庆祝动画：三个配对Tab(pairing_code/qr_code/radar_scan)配对成功时 - - CelebrationOverlay 全屏撒花效果包裹成功弹窗 - - HapticService.success() 触觉反馈 -- 触觉反馈集成：文件传输全流程关键交互点 - - 发送消息: HapticService.light() - - 接收消息: HapticService.light() (ref.listen监听新消息) - - 文件传输完成: HapticService.success() - - 文件传输失败: HapticService.error() - - 屏幕共享请求接受: HapticService.success() - - Tab切换: HapticService.light() -- HapticService 新增 error() 方法用于传输失败等错误场景 - -### 修改 -- `device_pairing_page.dart`: GlassContainer + TabController切换触觉 -- `pairing_code_tab.dart`: GlassContainer + CelebrationOverlay + HapticService -- `qr_code_tab.dart`: GlassContainer + CelebrationOverlay + HapticService -- `radar_scan_tab.dart`: GlassContainer + CelebrationOverlay + HapticService -- `transfer_chat_page.dart`: ref.listen监听消息变化触发触觉反馈 + 发送/屏幕共享触觉 -- `haptic_service.dart`: 新增 error() 静态方法 - -*** - -## [v14.1.0] - 2026-05-19 - -### 新增 -- Lottie空状态扩展：EmptyType新增3个文件传输场景类型 - - `noDevices` — "未发现附近设备" / "请确保对方设备已开启闲言APP"，含Lottie动画 - - `noTransfers` — "暂无传输记录" / "发送或接收文件后将在此显示"，含Lottie动画 - - `transferError` — "传输出错" / "请检查网络连接后重试"，含Lottie动画 -- 雷达扫描空状态统一：`radar_scan_tab.dart` 自定义空状态替换为 `EmptyState(type: EmptyType.noDevices)` -- 传输记录空状态统一：`file_transfer_records_tab.dart` 自定义空状态替换为 `EmptyState(type: EmptyType.noTransfers)` -- 实时传输速度图表：`TransferSpeedChart` 组件 - - 紧凑型fl_chart折线图，高度60，嵌入聊天页输入栏上方 - - 显示最近30秒速度历史，accent色线条+渐变填充 - - 无坐标轴标签(紧凑模式)，平滑曲线 - - 左侧显示当前速度文字 - - 传输中自动显示，传输结束自动隐藏 -- 消息已读回执：VisibilityDetector检测远程消息可见性 - - 远程消息可见>80%持续1秒后自动触发 `markMessageAsRead` - - `_ReadReceiptDetector` 组件封装VisibilityDetector+1秒延迟+防重复触发 - - `ChatMessageBubble` 新增 `onVisible` 回调 - - 仅对未读远程消息生效，系统消息不触发 - -### 修改 -- `empty_state.dart`: EmptyType枚举新增noDevices/noTransfers/transferError -- `radar_scan_tab.dart`: `_buildEmptyState()` 使用EmptyState组件 -- `file_transfer_records_tab.dart`: 空状态使用EmptyState组件 -- `transfer_chat_bubbles.dart`: ChatMessageBubble新增onVisible回调参数 -- `transfer_chat_page.dart`: 集成TransferSpeedChart+VisibilityDetector已读回执+_speedHistory状态追踪 - -*** - -## [v14.0.0] - 2026-05-19 - -### 新增 -- 设备配对页面全面重构：4Tab从IP/扫码/蓝牙/其他 → 配对码/扫码/雷达/其他，接入SignalingService真实流程 - - 配对码Tab (`pairing_code_tab.dart`): 生成6位配对码+5分钟倒计时+复制功能 / 6位输入框自动聚焦+自动提交 / pairing-matched成功弹窗 - - 扫码Tab (`qr_code_tab.dart`): QrImageView生成xianyan://pair二维码 / MobileScanner相机扫描+四角装饰框 / 扫描结果解析+配对请求 - - 雷达Tab (`radar_scan_tab.dart`): flutter_animate脉冲雷达动画 / radarBroadcast+radarScan双信令 / 设备按matchType分组(我的设备/同一网络/同一城市/远程) / 10秒空态提示 - - 其他Tab: 手动IP移入CupertinoAlertDialog弹窗 / 保留蓝牙/NFC/USB/热点/账户配对 -- 每个Tab独立文件，主页面`device_pairing_page.dart`从617行精简至~390行 - -### 修改 -- `device_pairing_page.dart`: Tab结构重构(配对码/扫码/雷达/其他)，IP配对移至其他Tab弹窗，蓝牙Tab合并至其他Tab -- 新增3个Tab组件文件: `pairing_code_tab.dart` / `qr_code_tab.dart` / `radar_scan_tab.dart` - -*** - -## [v13.9.0] - 2026-05-19 - -### 新增 -- 画布邀请卡片功能：当一方打开协作画布时，对方聊天页面自动显示"🎨 对方邀请你加入协作画布"卡片，含"加入画布"按钮 - - `TransferMessageType.canvasInvite` 新消息类型，content 存储canvasId - - `ChatCanvasInviteContent` 气泡组件，展示邀请信息+加入按钮 - - `ChatTransferCallbacks.onCanvasJoin` 回调，点击"加入画布"导航到CanvasPage - - `TransferNotifier.addCanvasInviteMessage()` 方法，去重逻辑防止重复邀请 +## [v14.53.1] - 2026-05-20 ### 修复 -- `_openCanvas()` 缺少信令连接检查：新增 `signaling.isConnected` 判断，未连接时显示 Toast "信令未连接，无法使用协作画布"并阻止导航 -- 聊天页面未监听画布加入信令：`_signalingMessageSub` 新增 `canvasJoin` 消息处理，收到对端canvasJoin后自动添加邀请卡片 - -### 修改 -- `transfer_message.dart`: 新增 `canvasInvite` 枚举值 + `isCanvasInvite` getter -- `transfer_chat_bubbles.dart`: `ChatTransferCallbacks` 新增 `onCanvasJoin` 回调 + `ChatCanvasInviteContent` 组件 -- `transfer_chat_page.dart`: `_openCanvas()` 增加信令检查 + `_handleCanvasJoin()`/`_joinCanvas()` 方法 + callbacks传递onCanvasJoin +- 文件传输设备操作：`_sendFileToMyDevice` 方法原先传入空路径 `filePath: ''`，现改为先调用 `FilePicker.platform.pickFiles()` 让用户选择文件，用户取消或路径无效则不执行发送 +- 传输聊天页面：`prevMsgs.firstWhere((m) => m.id == msg.id)` 无 `orElse`，列表中找不到匹配项时会抛出 `StateError`，现改用 `firstWhereOrNull` 并添加 `null` 检查 *** -## [v13.8.0] - 2026-05-19 +## [v14.53.0] - 2026-05-20 + +### 新增 +- 拾光角色桌面小组件（dailyWithCharacter）： + - `WidgetType` 枚举新增 `dailyWithCharacter`，标题"拾光每日一句"，副标题"拾光角色+每日推荐句子" + - 平台标识：Android=`DailyWithCharacterProvider`，iOS=`DailyWithCharacterWidget`，鸿蒙=`dailyWithCharacter` + - 优先级 P1（推荐小部件），图标 `CupertinoIcons.sparkles`，deepLink 跳转首页 + - `HomeWidgetService` 新增4个数据键：content/author/id/mood，新增 `updateDailyWithCharacter()` 方法 + - `HomeWidgetService` 后台回调新增 `open_daily_with_character` 处理 + - `HomeWidgetService.debugGetAllData()` 新增拾光角色小组件数据读取 + - `HomeFeedMixin` 新增 `_syncDailyWithCharacterWidget()` 辅助方法 + - 每日推荐句子加载成功后（fetchDailySentence/refreshDailySentences/fetchDailySentenceFallback）自动同步推送到拾光角色小组件 + - 推送时读取角色情绪值（character_mood_value）转换为 mood 字符串 + +*** + +## [v14.52.0] - 2026-05-20 + +### 新增 +- F12: 屏幕常亮设置： + - `DisplaySettingsState` 新增 `screenAlwaysOn` 字段（0=关闭, 1=阅读时, 2=始终，默认0），持久化到 KvStorage + - `GeneralSettingsNotifier` 新增 `setScreenAlwaysOn` 方法 + `screenAlwaysOn` 便捷 getter + - 通用设置页"显示设置"分组新增"💡 屏幕常亮"选择器（CupertinoPicker 三档选择） + - HomePage 监听 `screenAlwaysOn` 设置变化，通过 `wakelock_plus` 控制屏幕常亮 + - HomePage dispose 时自动关闭 wakelock +- F13: 电池低提醒： + - 新增 `lib/core/services/device/battery_info_service.dart`：电池状态监听服务 + - 基于 `battery_plus` 监听电池状态变化 + 5分钟轮询电量 + - 提供 `onBatteryChanged` Stream 广播 `BatteryInfo`（含 isLow/isCritical 判断） + - `CharacterExpression` 枚举新增 `worried` 担忧表情： + - 眉头皱起（两条短弧线下弯） + - 嘴巴微张（椭圆） + - 眼睛略缩（0.9倍） + - 2秒后自动恢复 + - `CharacterTipsNotifier` 新增 `showTip(category, content)` 方法，支持外部触发气泡提示 + - HomePage initState 中初始化 BatteryInfoService 并监听低电量事件 + - 低电量时角色显示 worried 表情 + 弹出拾光Tips气泡提醒充电 + +*** + +## [v14.51.0] - 2026-05-20 + +### 新增 +- 字体对比模式：左右分屏对比两种字体的渲染效果（FontComparisonPage） + - 支持字号滑块调节（12-48px） + - 支持自定义预览文本输入 + - 中英文+数字多维度对比预览 +- FontActiveCard 增加"对比"按钮，点击后弹出字体选择器选择第二个字体 +- FontLocalSection 增加左滑"对比"操作，选择对比目标字体后跳转对比页面 +- 字体切换音效：setActiveFont 成功后播放 font_switch.mp3 音效（静默失败，不影响功能） + +*** + +## [v14.50.0] - 2026-05-20 + +### 新增 +- 在线字体数据动态化（Supabase）：FontSyncService 从远程获取字体列表，离线 fallback 到本地硬编码数据 +- Google Fonts 集成：在线字体区增加 Google Fonts 入口，支持输入字体名加载 1500+ 在线字体 +- FontInfo 模型增加 category（字体分类）和 iconEmoji（图标emoji）字段 +- 在线字体项改用 font.iconEmoji 替代 onlineFontData[index] 索引访问，避免 Supabase 数据越界 ### 修复 -- 文件传输错误消息未传播到聊天气泡：`updateFileMessageProgress()` 增加 `errorMessage` 可选参数，传输失败时错误详情同步更新到消息模型，`ChatFileContent` 可正确显示具体错误原因而非通用"传输失败" -- 传输异常时消息状态卡在"传输中"：`executeSendTask()` 和 `_executeUsbSendTask()` 的 catch 块新增 `updateFileMessageProgress()` 调用，确保消息状态同步更新为 `failed` -- WsRelay 文件接收失败未更新消息状态：`handleWsRelayFileError()` 新增 `updateFileMessageProgress()` 调用，将消息状态更新为 `failed` 并传递错误原因 -- 离线对端有IP时未正确处理：`_sendFilesWithOfflineCheck()` 增加信令连接性判断（`signaling.isConnected && _isSignalingOnline`），当对端离线但可通过信令中转时仍尝试直接传输 +- 在线字体列表 Supabase 远程数据与本地 fallback 兼容处理 +- FontOnlineItemWidget emoji 显示不再依赖硬编码索引，支持动态数据源 + +*** + +## [v14.50.0] - 2026-05-20 ### 新增 -- 离线发送对话框增加"加入离线队列"选项：`_showCloudCacheDialog()` → `_showOfflineSendDialog()`，提供三个选项：取消/加入离线队列/暂存至云端 - -### 修改 -- `transfer_file_handler.dart`: `updateFileMessageProgress()` 签名增加 `{String? errorMessage}` 参数 -- `transfer_signaling_handler.dart`: `updateFileMessageProgress` 类型签名同步更新，`handleWsRelayFileError()` 增加消息状态更新 -- `transfer_chat_page.dart`: `_sendFilesWithOfflineCheck()` 离线判断逻辑优化，`_showCloudCacheDialog()` → `_showOfflineSendDialog()` +- F15: 本地通知提醒： + - 新增 `lib/core/services/notification/daily_notify_service.dart`：每日定时通知服务 + - 单例模式，委托 `LocalNotificationService` 调度通知，避免重复初始化 + - `scheduleDailyNotification(hour, minute, title, body)` 调度每日通知 + - `cancelAll()` 取消所有通知 + - `GeneralFieldsState` 新增 `dailyNotification`(默认false) / `notifyTimeHour`(默认8) / `notifyTimeMinute`(默认0) 字段，持久化到 KvStorage + - `GeneralSettingsNotifier` 新增 `setDailyNotification` / `setNotifyTimeHour` / `setNotifyTimeMinute` 方法 + - 通用设置页"通知设置"分组新增"🔔 每日提醒"开关 + "⏰ 提醒时间"选择器 + - 开关开启时调度每日通知（标题"拾光为你选了一句"），关闭时取消 + - 提醒时间选择器支持9个时段：06:00/07:00/08:00/09:00/10:00/12:00/18:00/20:00/22:00 +- F17: Shader特效： + - 新增 `assets/shaders/fluid.frag`：Fragment Shader流体渐变效果 + - 三层噪声叠加产生流体动画 + - 触摸涟漪交互（u_touch uniform） + - 蓝/紫/青三色混合，0.6透明度 + - 新增 `lib/shared/widgets/shader_card_background.dart`：Shader卡片背景组件 + - `ShaderCardBackground` StatefulWidget + Ticker 驱动动画 + - 加载失败降级为 LinearGradient 静态渐变 + - `_ShaderPainter` CustomPainter 绑定 FragmentProgram + 5个 uniform + - `GeneralFieldsState` 新增 `shaderBackground`(默认false) 字段，持久化到 KvStorage + - `GeneralSettingsNotifier` 新增 `setShaderBackground` 方法 + - 通用设置页"显示设置"分组新增"✨ 特效背景"开关 + - `SentenceCard` 根据 `shaderBackground` 设置切换背景：开启时使用 ShaderCardBackground，关闭时使用原有渐变 + - pubspec.yaml 新增 `assets/shaders/` 资源目录 *** -## [v13.7.0] - 2026-05-19 +## [v14.49.0] - 2026-05-20 ### 新增 -- 翻译助手网络层重构：`package:http` → 项目现有 `Dio` 封装 - - 新增 `TranslateDioClient` 工具类：独立Dio实例，不走ApiClient的baseUrl和Token拦截器 - - 5个翻译服务全部改用Dio：Google/Bing/LibreTranslate/MyMemory/AppWorlds -- 用户自定义翻译API功能 - - 新增 `CustomTranslateApi` 模型：支持GET/POST、自定义参数名、响应路径、额外Header等 - - 新增 `CustomTranslateService` 服务：动态调用用户配置的翻译接口 - - 新增 `CustomApiNotifier` 状态管理：增删改查+持久化到SharedPreferences - - 设置页面新增「自定义接口」区域：添加/编辑/禁用/删除自定义API -- API测试结果增强：`ApiTestResult` 模型（成功/响应时间/错误信息） -- 设置页面展示响应速度：每个API显示测试状态(✓/✗)+响应时间(ms/s) -- AppWorlds频率限制处理：内置2秒1次请求间隔控制 -- `flutter_tts` 依赖：为翻译结果朗读功能做准备 +- 字体预览大图 Sheet（半屏面板+自定义预览文本+字号滑块+中英文预览） +- 字体卡片滑动删除（AppSlidable，替代原有删除按钮） +- 字体搜索/筛选（支持拼音首字母匹配+名称/字体族匹配） +- 滚动定位到在线字体区（点击"在线字体"按钮自动滚动） +- 下拉刷新字体列表（CustomRefreshIndicator） +- 列表项入场动画（flutter_animate fadeIn+slideY 瀑布效果） +- 字体切换 Hero 过渡动画（heroine） +- 字体列表骨架屏加载（SkeletonBox+ListItemSkeleton） +- 并发下载控制（最多3个同时下载） +- 下载重试机制（失败后显示重试按钮） +- 下载进度圆环（CircularProgressIndicator 替代线性进度条） +- 字体收藏持久化（Hive KV存储+收藏置顶显示+滑动收藏操作） +- 删除后字体残留处理（记录已删除列表，重启时不加载已删除字体） -### 修改 -- `translate_provider.dart`: `_apis` → `_builtInApis` + 动态合并自定义API；`testAllApis()` 返回 `ApiTestResult`（含响应时间） -- `translate_settings_page.dart`: 重写设置页面，增加响应速度展示+自定义API管理+API测试结果增强 -- `appworlds_translate_service.dart`: 内置 `_waitForRateLimit()` 频率限制 -- 降级顺序：内置API优先(bing→mymemory→appworlds→google→libre)，自定义API追加到末尾 +### 修复 +- 自定义字体通过 customFontFamily 传递给全局主题系统，确保全局生效 +- 字体序列化改用 JSON，兼容旧 | 分隔符格式自动迁移 +- 鸿蒙端字体功能适配（移除 isOhos 限制，统一字体目录获取） + +### 重构 +- 内置字体映射动态化（builtInFontConfigs 替代硬编码 idMap） +- _builtInFonts getter 改为基于 builtInFontConfigs 动态生成 *** -## [v13.6.1] - 2026-05-19 - -### 修改 -- 传输聊天气泡组件文件拆分：`transfer_chat_bubbles.dart`(1434行) → 3个文件 - - `transfer_chat_bubbles.dart`(~410行): 主文件，保留 ChatMessageBubble/ChatTextContent/ChatProgressContent/ChatPairingBubble/ChatSystemMessage/DeliveryStatusIndicator/ChatVoiceContent/chatDeviceAlias - - `transfer_chat_file_content.dart`(~270行): 文件传输气泡组件(ChatFileContent/ChatStatusIcon/ChatTransferControls/ChatControlButton) - - `transfer_chat_media_content.dart`(~530行): 媒体气泡组件(ChatImageContent/ChatVideoContent/_ImagePreviewPage/_VideoPlayerPage/_ZoomButton) -- `_chatDeviceAlias` 重命名为 `chatDeviceAlias`(跨文件使用需公开) -- 备份文件: `transfer_chat_bubbles.dart.bak`(保留) - -*** - -## [v13.6.0] - 2026-05-19 +## [v14.48.0] - 2026-05-20 ### 新增 -- 软件协议模块（`features/agreements/`）：10项协议/政策完整内容与展示页面 - - 数据层: `AgreementType` 公开枚举（10种协议类型）+ `AgreementData` 公开数据类（全局可调用） - - 展示层: `AgreementPage` 通用协议展示页（支持动态主题+重要字段高亮【】/粗体**）+ `AgreementListPage` 协议列表页 - - 路由: `/agreements`（协议列表）+ `/agreement/:type`（协议详情） -- 10项协议内容（符合PIPL/GDPR/CCPA/COPPA等法规）: - - 隐私政策（含自动化决策、安全事件处置、DPIA评估、国际数据保护章节） - - 用户服务协议（含不可抗力条款） - - 账号使用协议（地区差异化年龄门槛：中国14岁/欧盟16岁/美国13岁） - - 会员权益说明（规划阶段，暂无内购） - - 免责声明及内容版权归属 - - 儿童隐私政策（含COPPA特别规定） - - 软件权限使用说明 - - 软件介绍 - - 新手指引 - - 开发团队 - -### 修改 -- 关于页面：法律信息区「隐私政策」→「软件协议」，跳转协议列表页 -- 登录页面：协议弹窗占位文本 → 跳转实际协议详情页（用户协议/隐私政策） -- 路由配置：新增 `/agreements` 和 `/agreement/:type` 路由 +- F9: Lottie动画过渡： + - 频道切换时显示 `spin.json` Lottie加载动画，600ms后自动消失 + - `_onChannelSwitch` 方法：防重入守卫 + setState切换状态 + 延迟重置 + - `_swipeToNextCategory`/`_swipeToPrevCategory` 滑动切换也走 `_onChannelSwitch` + - 空状态区域使用 `star.json` Lottie动画替代静态emoji，errorBuilder降级显示📭 + - 空状态新增"下拉刷新试试"副标题 +- F11: 摇一摇换句： + - 新增 `lib/core/services/device/shake_detector.dart`：摇一摇检测器单例 + - 监听加速度传感器，阈值25.0，最小间隔1500ms防抖 + - start/stop/dispose 生命周期管理 + - pubspec.yaml 新增 `sensors_plus: ^6.0.0` 依赖 + - `GeneralFieldsState` 新增 `shakeToSwitch` 字段（默认false），持久化到 KvStorage + - `GeneralSettingsNotifier` 新增 `setShakeToSwitch` 方法 + - 通用设置页"交互设置"分组新增"🤝 摇一摇换句"开关 + - 开关开启时启动 ShakeDetector，关闭时停止 + - HomePage initState 中根据设置自动启动摇一摇监听 + - 摇一摇回调：刷新每日推荐 + 角色dizzy晕眩表情 + 摇铃音效 + - HomePage dispose 中停止 ShakeDetector +- AppBarCharacterSprite 新增 `dizzy` 晕眩表情： + - 眼睛绘制为旋转X形（螺旋眼），使用 expressionProgress 驱动旋转角度 + - 嘴巴绘制为波浪曲线，使用 expressionProgress 驱动波动幅度 + - 耳朵抖动(repeat) + 脸颊微红 + 整体弹跳(repeat)，2秒后自动恢复 + - 新增 `triggerExpression` 公开方法，供外部触发任意表情 *** +## [v14.47.0] - 2026-05-20 + ### 新增 -- 翻译助手完整功能实现（会话流入口 + 翻译页面 + 设置页面 + 5个翻译API） - - 数据模型: TranslateMessage, TranslateSession, TranslateLanguage (29种语言) - - API抽象层: TranslateApiService + 5个实现 (Google/Bing/LibreTranslate/MyMemory/AppWorlds) - - 状态管理: TranslateProvider (翻译+降级+重试+未读红点) + TranslateSettingsProvider (持久化设置) - - 翻译页面: 语言对选择+快捷语言Chip+会话流消息列表+输入发送+空态+快捷翻译 - - 设置页面: API选择+翻译开关+数据管理+接口测试+响应速度展示 - - 会话流集成: chat_session_provider新增translate系统会话(不置顶,NEW标签) - - 路由注册: /translate + /translate-settings (GoRouter + OhosNavBridge) - - 未读红点: 翻译失败时显示红点,点击进入后清除 - - API降级: 按优先级自动切换,所有API失败时显示错误+重试按钮 - -### 修改 -- inspiration_page: _onSessionTap中增加translate会话的clearUnread调用 -- app_router: 新增translate/translateSettings路由常量和GoRoute注册 -- ohos_nav_bridge: 新增translate/translateSettings路由映射 - -*** - -## [v13.4.0] - 2026-05-19 +- F5: 自定义下拉刷新(拾光角色)： + - 新增 `home_refresh_indicator.dart`：拾光角色下拉刷新动画组件 + - 使用 `custom_refresh_indicator` 包实现自定义刷新指示器 + - 角色表情随下拉进度变化：idle(好奇) → surprise(惊讶) → pout(紧张) → blink(决心) + - 刷新中显示 think(思考) 表情 + "刷新中..."，完成后 smile(开心) + "刷新完成 ✓" + - 48x48 角色精灵 + 进度文字，透明度随拖拽值渐变 +- AppBarCharacterSprite 新增 `expression` 参数： + - 外部可强制指定角色表情，`didUpdateWidget` 时自动触发表情切换 + - 新增 `think` 表情：微眯双眼 + 侧弯嘴巴 + 鼻子微皱 + 脸颊微红 + - `_getBlinkFactor` 新增 thinkBlink(0.3 * expressionProgress) 实现思考时微眯眼 +- HomePage 句子列表外层包裹 HomeRefreshIndicator，支持下拉刷新 ### 新增 -- 传输聊天页双向屏幕共享：点击「屏幕」按钮弹出选择面板，支持「观看对方屏幕」(view)和「共享我的屏幕」(share)两种方向 -- 使用 SignalingService.requestScreenShare/acceptScreenShare/rejectScreenShare 替代旧 screenShareOffer 信令 -- 监听 signalingService.onScreenShareRequest 处理收到的屏幕共享请求，根据 direction 显示不同弹窗文案 -- 监听 signalingService.onMessage 处理 screenShareAccept/screenShareReject 响应 - -### 修改 -- transfer_chat_page: _startScreenShare → _showScreenShareOptions (CupertinoActionSheet选择面板) -- transfer_chat_page: 新增 _requestScreenShare/_listenScreenShareEvents/_handleIncomingScreenShareRequest/_acceptIncomingScreenShare/_handleScreenShareAccept/_handleScreenShareReject 方法 -- transfer_chat_page: 导航栏按钮文案「共享」→「屏幕」，onTap 指向新选择面板 +- F8: 3D倾斜卡片： + - `home_daily_card.dart` 每日推荐卡片外层包裹 `Tilt.base()` 组件 + - 使用 `flutter_tilt` 包实现 3D 倾斜交互效果 + - TiltConfig: angle=8, enableReverse=true, moveDuration=200ms + - LightConfig: maxIntensity=0.06 微光效果 + - ShadowBaseConfig: 黑色阴影, maxIntensity=0.15, offsetInitial=(0,8) *** -## [v13.3.0] - 2026-05-19 +## [v14.46.0] - 2026-05-20 ### 新增 -- 翻译助手功能规划：发现页新增翻译助手入口，会话流式翻译UI，5个免费翻译API +- 字体预览大图 Sheet 组件（FontPreviewSheet）： + - 新增 `lib/features/settings/presentation/font/font_preview_sheet.dart` + - 半屏面板展示字体大图预览，支持拖拽到不同高度（40%/70%/100%） + - 自定义预览文本输入框：用户可输入任意文本实时预览 + - 字号滑块：12-48sp 可调，实时更新预览 + - 预览区域：自定义文本 + 中文经典(天地玄黄) + 英文(quick brown fox) + 数字符号 + - 字体信息展示：字体族、文件大小、类型(内置/自定义) + - 使用 AppBottomSheet.showHalf 弹出，iOS 26 液态玻璃风格 -### 修改 -- 全局统一命名：「灵感」→「发现」，所有用户可见文本、注释、描述统一更新 - - chat_flow_page: previousPageTitle '灵感'→'发现' - - hidden_sessions_page: previousPageTitle '灵感'→'发现' - - general_settings_provider: 启动页选项 '灵感'→'发现'，图标 💡→🧭 - - chat_message: ChatMessageType.sentence label '灵感句子'→'发现句子' - - chat_sentence_card_bubble: '灵感句子'→'发现句子' - - discover_page: '暂无灵感'→'暂无发现'，注释更新 - - tool_item: '随机灵感'→'随机发现'，'传统色彩灵感'→'传统色彩发现' - - tool_panel: '发现更多灵感好帮手'→'发现更多好帮手' - - page_registry: name/description 更新 - - 其他注释/描述中的'灵感'统一替换为'发现' +### 变更 +- FontItemWidget：单击改为弹出字体预览Sheet，长按激活字体 +- FontOnlineItemWidget：info图标改为预览图标(CupertinoIcons.textformat_size)，点击弹出预览Sheet +- 移除 FontOnlineItemWidget 中已废弃的 _showFontDetail 方法和 _detailRow 辅助方法 +- 移除 font_widgets.dart 中不再使用的 services.dart 导入 *** -## [v13.2.0] - 2026-05-19 +## [v14.45.0] - 2026-05-20 ### 新增 -- 信令服务器: 配对码机制(pairing-code-create/join/matched)，6位码5分钟有效 -- 信令服务器: 雷达扫描机制(radar-broadcast/scan/devices)，按IP段/城市匹配 -- 信令服务器: 屏幕共享信令(screen-share-request/accept/reject/stop)，支持双向 -- 信令服务器: /health端点返回配对码/雷达池/屏幕共享统计 -- 测试脚本: test_cross_network_pairing.py (10个场景) -- 测试脚本: test_screen_share_signaling.py (6个场景) -- 测试脚本: test_canvas_sync.py (5个场景) -- 测试脚本: test_full_e2e.py (7步全流程) - -### 修改 -- upload_signaling.py: 修复备份文件已存在时重命名失败问题 -- API_FILE_TRANSFER_CORE_DOC.md: 新增3.11-3.13协议文档 - -### 验证 -- 配对码创建/加入/匹配: ✅ 5/5场景通过 -- 雷达广播/扫描: ✅ 5/5场景通过 -- 屏幕共享信令: ✅ 6/6场景通过 -- 画布同步: ✅ 5/5场景通过 -- 全流程E2E: ✅ 7/7步骤通过 +- TTS语音朗读公共类（TtsService）： + - 新增 `lib/core/services/audio/tts_service.dart`：统一TTS语音朗读管理，单例模式 + - TtsState枚举：idle/speaking/paused/loading 四种状态 + - 跨平台兼容：iOS端配置setSharedInstance + IosAudioCategory，Android/其他平台自动适配 + - 语音参数持久化：speed/pitch/volume 通过 AppKVStore(Hive) 存储 + - 状态流：onStateChanged (Stream) + onProgress (Stream<(start, end, word)>) + - 核心方法：speak/stop/pause/setSpeed/setPitch/setVolume/getAvailableVoices +- TTS朗读播放条组件（TtsPlayerBar）： + - 新增 `lib/shared/widgets/tts_player_bar.dart`：句子详情Sheet中的朗读控制条 + - 播放/暂停按钮（圆形主题色按钮 + CupertinoIcons） + - 进度条（LinearProgressIndicator + 主题色） + - 状态文字：正在朗读.../已暂停/点击播放 + - 停止按钮（播放中或暂停时显示） +- 首页角色点击朗读： + - 单击角色：生成Tip + 如果TTS可用且当前有每日推荐，朗读每日推荐句子 + - 双击角色：生成Tip + 如果正在朗读则停止 +- 句子详情Sheet朗读功能： + - 二级操作栏新增"🔊 朗读"按钮（TTS可用时显示） + - 点击朗读按钮：显示TtsPlayerBar + 开始朗读句子 + - TtsPlayerBar 位于Sheet底部危险操作栏下方 *** -## \[6.5.1] - 2026-05-19 +## [v14.44.0] - 2026-05-20 -### ✨ 新增诗词设置页面与天气诗词设置页面 - -> 为今日诗词和天气诗词功能分别创建独立设置页面， -> 支持推送开关/时间、显示选项、气泡样式、字体大小等偏好配置。 - -#### 变更内容 - -| 文件 | 修改 | -|------|------| -| `poetry_settings_page.dart` | 新增今日诗词设置页面，8项设置项（推送开关/时间/推荐数量/译文/标签/推荐理由/气泡样式/字体大小） | -| `weather_settings_page.dart` | 新增天气诗词设置页面，8项设置项（推送开关/时间/详细天气/心情标签/诗词数量/气泡样式/字体大小/城市设置） | - -#### 新增功能 - -- 诗词设置：StateProvider 管理设置状态，CupertinoSwitch/CupertinoSlidingSegmentedControl/CupertinoTimerPicker 控件 -- 天气设置：同上 + CupertinoTextField 城市输入 -- 两个页面均使用 GlassContainer 分组、AppThemeExtension 动态主题、AppTypography/AppSpacing/AppRadius 统一设计系统 -- iOS 风格 CupertinoPageScaffold + CupertinoNavigationBar +### 新增 +- 主页工具中心面板（HomeToolCenter）： + - 新增 `home_tool_center.dart`：下拉快捷工具面板，2行3列网格布局 + - 6个快捷入口：📷扫一扫、📡传输助手、🔊朗读模式、🌙深色模式、🤝摇一摇、⚙️更多设置 + - 深色模式切换实际调用 `themeSettingsProvider.setThemeMode()`，可即时切换日/夜模式 + - 传输助手/更多设置点击后关闭Sheet并跳转对应路由页面 + - 扫一扫/朗读模式/摇一摇为预留入口，点击提示"开发中" +- 句子广场Header新增工具中心入口按钮（CupertinoIcons.grid 图标） +- `SquareHeaderContent` 新增 `onToolCenter` 回调参数 +- `HomePage` 新增 `_showToolCenter()` 方法，通过 `AppBottomSheet.showCustom` 弹出工具中心面板 *** -## \[6.5.0] - 2026-05-19 +## [v14.43.0] - 2026-05-20 -### ✨ 天气诗词页面重构为聊天样式 - -> 将天气诗词页面从传统卡片列表布局重构为聊天对话样式， -> 增强交互体验，支持快捷回复、底部输入栏、设置入口等功能。 - -#### 变更内容 - -| 文件 | 修改 | -|------|------| -| `weather_page.dart` | 完全重写为聊天样式，新增 `_ChatMessage` 数据模型，7种消息类型（system/weather/mood/poetry/poemList/detail/user） | - -#### 新增功能 - -- 聊天气泡布局：左侧🌤️头像 + 右侧气泡，用户消息右侧显示 -- 天气卡片气泡：渐变背景 + 天气icon + 温度 + 城市天气 + 4列详细数据 -- 心情标签气泡：emoji + 天气心情标签 -- 诗词推荐气泡：居中诗词内容 + 作者标题 + 收藏/分享按钮 -- 诗词列表气泡：📖标题 + 多首诗词卡片 + keyword标签 -- 详细数据气泡：2x2 GridView 展示湿度/风向/风力/AQI -- 快捷回复：天气卡片下方"换首诗"、"明天天气"、"分享" -- 底部输入栏：CupertinoTextField + 发送按钮 -- AppBar新增设置按钮：跳转 `/weather/settings` -- 全局 flutter_animate 入场动画（fadeIn + slideY） -- 骨架屏适配聊天布局 +### 新增 +- 角色拾光情绪系统（CharacterMood）： + - 新增 `character_mood_provider.dart`：管理角色情绪状态、经验值、等级 + - 6种情绪枚举：happy/neutral/bored/sleepy/excited/worried，各有 emoji 和能量值 + - `CharacterMoodState` 数据类：含 moodValue(0.0~1.0)、exp、level、levelProgress + - `CharacterMoodNotifier`：recordAction 记录交互（like/favorite/read/share/create/daily_checkin），decayMood 情绪衰减，_checkTimeBasedMood 夜间自动困倦 + - 数据持久化到 AppKVStore (Hive) +- AppBarCharacterSprite 支持 mood 参数： + - idle 状态下根据 mood 调整嘴巴曲线（happy微笑/excited大笑/bored微撇/worried皱嘴/sleepy微张） + - idle 状态下根据 mood 调整眼睛开合度（excited大眼/bored半闭/sleepy闭眼） + - sleepy 情绪自动增加眨眼因子 + - shouldRepaint 新增 mood 比较 +- HomePage 传递 mood 到角色精灵：`ref.watch(characterMoodProvider.select((s) => s.mood))` +- DateConfigSheet 角色介绍卡片增强： + - 角色名右侧新增 "Lv.X" 等级标签（主题色背景） + - 介绍文案下方新增经验进度条 + EXP 数值显示 *** -## \[6.4.9] - 2026-05-18 +## [v14.42.0] - 2026-05-20 -### 🐛 修复"我的"页面数据延迟问题 — 积分/签到/笔记数据不一致 +### 重构 +- 字体管理页面从单文件(1663行)拆分为4个文件： + - `font_models.dart`(~120行): FontInfo/FontManagementState/在线字体数据/工具函数 + - `font_management_notifier.dart`(~480行): FontManagementNotifier 业务逻辑 + - `font_widgets.dart`(~700行): 所有 UI 组件(私有改公开) + - `font_management_page.dart`(~65行): 主页面入口 -> 用户在签到、发布笔记后返回"我的"页面，积分、签到天数、笔记数量显示与实际不一致。 -> 根因：数据变更后未同步刷新 `authProvider` 中的用户信息。 - -#### 修复内容 - -| 文件 | 修改 | -|------|------| -| `profile_page.dart` | 页面进入时调用 `refreshUser()` 刷新用户数据 | -| `signin_provider.dart` | 签到成功后调用 `refreshUser()` 更新积分和签到天数 | -| `article_provider.dart` | 发布文章成功后调用 `refreshUser()` 更新文章数量 | - -#### 举一反三 - -数据同步原则： -1. **页面进入时刷新**：用户中心、个人资料等页面进入时应主动刷新用户数据 -2. **操作后同步更新**：签到、发布、删除等操作成功后应刷新相关用户数据 -3. **Provider 联动**：跨 Provider 数据依赖时，操作完成后应主动触发数据同步 +### 修复 +- 增强字体管理页面动态主题响应： + - 主页面增加 `ref.watch(themeSettingsProvider)` 双保险监听主题变化 + - 所有子组件从 `AppTheme.ext(context)` 获取主题(而非构造函数参数传入) + - 弹窗内部使用 `AppTheme.ext(ctx)` 获取新 context 的主题 + - 替换硬编码 `CupertinoColors.systemGreen` 为 `ext.successColor`，深色/AMOLED 模式下颜色一致 + - CupertinoTextField 增加 `placeholderStyle`/`style` 跟随主题色 *** -## \[6.4.8] - 2026-05-18 +## [v14.41.0] - 2026-05-20 -### 🐛 修复全局 Loading 卡死 — Notifier 初始状态 isLoading: true 导致 UI 永远 loading - -> 上一次修复（v6.4.6）将 Notifier 构造函数中的初始化移至 `build()` + `Future.microtask()`， -> 但 `PoetryState`、`ProgressState`、`CountdownState` 的 `isLoading` 默认值为 `true`， -> 而 `Future.microtask()` 延迟了 `_init()` 的执行，导致 UI 在初始渲染时看到 `isLoading: true` -> 但数据尚未加载，永远显示 loading 骨架屏。 - -#### 修复策略 - -| 类型 | 修复方式 | 示例 | -|------|---------|------| -| 同步数据 | 直接在 `build()` 中计算并返回完整初始状态 | `InspirationNotifier` | -| 异步数据 + isLoading 默认 true | `Future.microtask()` + 初始状态设 `isLoading: false` | `PoetryNotifier`, `ProgressNotifier`, `CountdownNotifier` | -| 异步数据 + isLoading 默认 false | `Future.microtask()` + 默认初始状态 | `DiscoverNotifier`, `DailyCardStyleNotifier`, `TransferSettingsNotifier` | - -#### 举一反三 - -Riverpod Notifier 的 `build()` 方法设计原则： -1. **`build()` 必须返回立即可用的初始状态**，不应依赖异步操作设置关键 UI 状态 -2. **如果 State 的 `isLoading` 默认为 `true`，`build()` 必须返回 `isLoading: false`**，否则 UI 会卡 loading -3. **同步数据应直接在 `build()` 中计算**，避免不必要的异步延迟 -4. **异步数据加载用 `Future.microtask()`**，但不影响初始 UI 渲染 +### 修复 +- 修复 `DateConfigSheet` 自定义文案输入框被输入法遮挡： + - 根因：Sheet 底部 SizedBox 仅考虑 `viewPadding.bottom`，未处理 `viewInsets.bottom`（键盘高度） + - 在底部 SizedBox 中加入 `MediaQuery.of(context).viewInsets.bottom`，键盘弹出时自动推高内容 + - 添加 `keyboard_safe_sheet.dart` 导入，为后续更细粒度键盘适配预留 +- 加强 `AppBarCharacterSprite` 角色头部阴影效果： + - `_paintShadow` 模糊半径从 `2` 增大到 `4.5`，阴影更柔和扩散 + - `_paintShadow` alpha 从 `0.12` 增加到 `0.25`，阴影更深更明显 + - 新增 `_paintGroundShadow` 底部投影椭圆，模拟地面投影效果，增强角色立体感 *** -## \[6.4.6] - 2026-05-18 +## [v14.40.0] - 2026-05-20 -### 🐛 全局修复 Riverpod Notifier 反模式 — 构造函数使用 state/ref + CanvasProvider 构建期间修改状态 - -> 两类 Riverpod 反模式全局修复： -> ① 多个 Notifier 在构造函数中调用 `state`/`ref`，但 Riverpod Notifier 在构造函数执行时 `ref`/`state` 尚未初始化 -> ② `CanvasNotifier` 在 widget 生命周期（build/dispose）中直接修改 `state`，导致 FlutterError - -#### 修复方案 - -- 构造函数中的初始化逻辑移至 `build()` 方法，同步初始化直接执行，异步用 `Future.microtask()` -- CanvasProvider 4 处 `state =` 修改包裹在 `Future.microtask()` 中 + `_disposed` 标志防护 -- 本次修复 9 个 Notifier + CanvasNotifier，加上之前修复的 8 个，已覆盖项目中所有此类反模式 - -#### 修复文件清单 - -| Notifier | 修复内容 | -|----------|---------| -| GeneralSettingsNotifier | 构造函数 `_initServices()` → `build()` 中直接调用 | -| SolarTermNotifier | 构造函数 `_loadData()` → `build()` 中直接构建初始状态 | -| TransferSettingsNotifier | 构造函数 `_loadFromPrefs()` → `build()` 中 `Future.microtask()` | -| ProgressNotifier | 构造函数 `_init()` → `build()` 中 `Future.microtask()` | -| PoetryNotifier | 构造函数 `loadPoetry()` → `build()` 中 `Future.microtask()` | -| InspirationNotifier | 构造函数 `_loadSentences()` → `build()` 中 `Future.microtask()` | -| ChatConversationNotifier | 构造函数 `_init()` → `build()` 中 `Future.microtask()` | -| DailyCardStyleNotifier | 构造函数 `_loadFromStorage()` → `build()` 中 `Future.microtask()` | -| DiscoverNotifier | 构造函数 `_init()` → `build()` 中 `Future.microtask()` | -| CountdownNotifier | 构造函数 `_loadEvents()` → `build()` 中 `Future.microtask()` | -| CanvasNotifier | `Future.microtask()` 防护 + `_disposed` 标志 | +### 修复 +- 修复 `analysis_options.yaml` 中 `include: package:riverpod_lint/analysis_options.yaml` 无效问题： + - 根因：`riverpod_lint` 3.x 不再提供供外部 include 的 `analysis_options.yaml`，该文件仅用于包内部开发 + - 3.x 版本的 lint 规则完全通过 `custom_lint` 插件机制提供（已在 `plugins` 中配置） + - 移除无效 include 指令，添加说明注释 +- 修复 Dart 分析器 AOT 编译失败（Windows 中文用户名路径问题）： + - 根因：Dart AOT 编译器无法处理路径中的非 ASCII 字符（`C:\Users\无书\...`） + - 新增 `scripts/analyze.ps1`：设置 `LOCALAPPDATA` 到非中文路径后运行分析 + - 新增 `scripts/fix_dart_aot_path.ps1`：永久修复脚本（创建目录联接） *** -## \[6.4.0] - 2026-05-18 +## [v14.39.0] - 2026-05-20 -### 🧭 鸿蒙端全量导航修复 — 补全33条缺失路由 + 全项目96处导航调用迁移 - -> v6.1.0 虽已创建 OhosNavBridge 和 appPush 扩展，但仅替换了 3 个文件的导航调用， -> 且路由映射仅覆盖 58 条路由（缺失 33 条），导致鸿蒙端大量页面无法跳转。 -> 本次修复：①补全 OhosNavBridge 全部 89 条路由映射 ②全项目 96 处导航调用迁移为 appPush/appGo ③扩展 appPush 支持 extra 参数 - -#### 核心修复 - -| 修改 | 文件 | 说明 | -|------|------|------| -| 补全路由映射 | `ohos_nav_bridge.dart` | 新增 33 条路由 + 带参数路由处理 + 占位页面 | -| extra 参数支持 | `app_nav_extension.dart` | appPush/appReplace 新增 `{Object? extra}` 命名参数 | -| 全量导航迁移 | 28 个文件 | context.push → context.appPush、context.go → context.appGo | +### 修复 +- 修复 Web 端 `MissingPluginException: No implementation found for method getApplicationDocumentsDirectory`： + - 根因：`path_provider` 的 `getApplicationDocumentsDirectory()` 在 Web 端无原生实现，直接调用会抛出 `MissingPluginException` + - 新增 `platform_utils.dart` 安全路径获取方法 `safeAppDirPath` / `safeTempDirPath`（Web 端返回 null） + - 新增 `path_provider_stub.dart`（Web 端空实现）和 `path_provider_native.dart`（原生端实现，含 try-catch） + - `font_management_page.dart`：5 个方法增加 `pu.isWeb` 守卫（扫描/下载/导入/URL下载/删除） + - `cache_service.dart`：7 处 `getApplicationDocumentsDirectory()` 替换为 `_safeAppDirPath()` + - `backup_service.dart`：`backupDirPath` 改用 `pu.safeAppDirPath`，Web 端抛出 `UnsupportedError` + - `data_management_page.dart`：`_exportFullData` 改用 `pu.safeAppDirPath`，Web 端提示不支持 +- 修复 `Catcher2: Zone mismatch` 警告： + - 根因：`WidgetsFlutterBinding.ensureInitialized()` 在 `runZonedGuarded` 外部调用，而 `runApp` 在内部调用，Zone 不一致 + - `main.dart`：将 `ensureInitialized()` 移入 `runZonedGuarded` 内部，确保 bindings 初始化和 runApp 在同一 Zone +- 修复 `SharingReceiverService` 在 Web 端未守卫的问题： + - `main.dart`：`SharingReceiverService.init()` 增加 `!pu.isWeb` 守卫 *** -## \[6.3.0] - 2026-05-18 +## [v14.38.0] - 2026-05-20 -### 🔮 恢复鸿蒙端液态玻璃效果 — 仅阉割路由，保留全部视觉特效 - -> v6.0.0 为修复鸿蒙端白屏问题，过度阉割了液态玻璃效果，实际白屏根因是 `MaterialApp.router` + 额外包导入，与液态玻璃无关。 -> 本次修复恢复鸿蒙端全部液态玻璃视觉效果（LiquidGlassWidgets/GlassTheme/GlassBottomBar/TabIconSprite/Catcher2），仅保留路由(GoRouter)阉割。 +### 新增 +- 首页 AppBar 集成角色动画和日期栏： + - `home_page.dart`：AppBar 从 `🏠 闲言` + 日期文本 替换为 角色精灵 + 闲言/拾光标题 + 日期栏 + 搜索按钮 三段式布局 + - 左侧：`AppBarCharacterSprite` 角色精灵，跟随 `themeSettingsProvider.tabCharacterStyleId` 切换造型 + - 标题区：主标题"闲言"(title1) + 副标题"拾光"(caption2 主题色)，点击触发角色 `lookAtTitle()` 动画 + - 中间：`AppBarDateDisplay` 日期栏，点击弹出 `DateConfigSheet` 配置弹窗 + - 右侧：保留搜索按钮（BounceButton + Heroine） +- 角色命名体系"拾光"： + - `lib/core/constants/character_name.dart`：角色名常量 — givenName="拾光", fullName="闲言拾光", renameHint="暂不支持改名" + - `DateConfigSheet` 顶部新增角色介绍卡片：56x56角色精灵 + 名字 + 全称 + 介绍文案 + "暂不支持改名"标签 + - AppBar 标题副标题显示"拾光"（主题色） *** -## \[6.1.0] - 2026-05-14 +## [v14.37.0] - 2026-05-20 -### 🔌 新功能 — USB OTG 有线传输 - -> USB OTG Host 模式文件传输，两台 Android 设备通过 USB 线缆高速传输文件。 - -- **UsbTransportService**: MethodChannel 桥接原生 USB 操作，块传输发送/接收+进度回调，USB 2.0/3.0/3.1 自适应块大小 -- **UsbDiscoveryService**: EventChannel 监听 USB 插入/拔出事件，自动扫描已连接设备 -- **UsbConfirmDialog**: iOS 风格确认对话框，显示设备名称/协议版本/最大速度/认证状态 -- **TransferFileHandler/TransferNotifier USB 集成**: USB 传输全链路打通 +### 新增 +- AppBar 角色动画系统（方案A — 增强 CustomPainter）： + - 设计文档: `docs/superpowers/specs/2026-05-20-appbar-character-animation-design.md` + - 归档文档: `docs/superpowers/specs/2026-05-20-appbar-character-animation-archive.md` + - 新增 `lib/shared/widgets/appbar_character_sprite.dart`：AppBar角色动画精灵组件 + - 替换 AppBar 左侧 `🏠 闲言` 为互动角色 + 标题，角色跟随 Tab 栏造型设置 + - 4种角色（猫/狗/男孩/女孩）× 7种部件动画（耳/鼻/脸/眼/嘴/须/整体） + - 6种手势交互（单击/双击/长按/点击闲言/手指跟随/空闲自动） + - 动画强度联动 `themeSettingsProvider.animationIntensity`（4档） + - 3D质感渲染（径向渐变+投影阴影+双高光+环境光） +- 日期栏扩展功能： + - 点击日期弹出配置 Sheet（天气/设备/IP/自定义文案/显示项配置） + - 最多3项显示，自定义文案14字限制 + - 超过10字自动轮播（可开关） +- 公共类提取： + - `WeatherInfoService` 提取到 `core/services/weather/` + - `IpLocationService` 合并到 `core/services/network/` + - 新增 `WeatherBriefInfo` 轻量数据模型（`core/services/weather/weather_info_models.dart`），含 `empty()` 和 `fromWeatherData()` 工厂方法 + - 新增 `WeatherInfoService` 公共查询服务（`core/services/weather/weather_info_service.dart`），含30分钟内存缓存、`mapWeatherIcon()`、`mapAqiLevel()` 公共方法 + - 新增 `WeatherInfoNotifier` + `weatherInfoProvider`（`core/services/weather/weather_info_provider.dart`），Riverpod 状态管理，供首页/日期栏等轻量场景消费 *** -## \[5.15.0] - 2026-05-16 +## [v14.36.0] - 2026-05-20 -### 🔌 鸿蒙适配 — 30 个三方包全量适配完成 - -> 三批次完成 30 个三方包鸿蒙适配：第一批 11 个（TPC 官方合并）、第二批 9 个（TPC 包合并+自行适配）、第三批 10 个（7 个自行编写 ohos 原生代码 + 2 个 TPC 合并 + 1 个 fluttertoast） - -#### 适配模式 - -- **联合插件模式**: ohos 原生代码在独立 `*_ohos` 子包，主包声明 `default_package` -- **直接插件模式**: ohos 原生代码在主包 `ohos/` 目录，pubspec 声明 `pluginClass` - -#### 已适配 30 包清单 - -shared_preferences / path_provider / url_launcher / image_picker / local_auth / video_player / permission_handler / flutter_secure_storage / share_plus / battery_plus / connectivity_plus / flutter_local_notifications / file_picker / receive_sharing_intent / wakelock_plus / mobile_scanner / wifi_iot / audioplayers / record / sqflite / fluttertoast / video_compress / flutter_blue_plus / gal / network_info_plus / app_links / pro_image_editor / home_widget / nfc_manager / nearby_service +### 修复 +- 修复鸿蒙端本地IP显示字节序反转的问题： + - 根因：鸿蒙端 `network_info_plus` 的 `getWifiIP()` 返回网络字节序（big-endian）IP，未正确转换为宿主字节序，导致安卓端显示 1.2.3.4 而鸿蒙端显示 4.3.2.1 + - `localsend_service.dart`：`getLocalIp()` 新增 `_fixReversedIp()` 方法，检测反转IP（反转后属于私有IP范围而原始不属于），自动修正 + - `localsend_service.dart`：`getLocalIp()` 新增 `NetworkInterface.list()` 备选方案，当 `getWifiIP()` 失败时遍历网络接口获取IPv4地址 +- 修复鸿蒙端无法打开多语言设置界面的问题： + - 根因：`AppRoutes` 缺少 `languageSettings` 常量，`ohos_nav_bridge.dart` 无语言设置页路由映射，鸿蒙端 `OhosNavBridge.push()` 找不到匹配页面 + - `app_router.dart`：`AppRoutes` 新增 `languageSettings = '/settings/language'` 常量，GoRoute 路由定义改用常量引用 + - `ohos_nav_bridge.dart`：`_routeMap` 新增 `AppRoutes.languageSettings` → `LanguageSettingsPage` 映射 + - `general_settings_page.dart`：语言导航从硬编码 `'/settings/language'` 改为 `AppRoutes.languageSettings` + - `profile_page.dart`：语言导航从硬编码 `'/settings/language'` 改为 `AppRoutes.languageSettings` +- 修复从发现页扫描/配对码进入聊天页面看不到消息的问题： + - 根因：`_collectPeerIds` 从 `state.discoveredDevices`/`myDevices`/`pairedDevices` 收集 peerIds，但扫描发现或配对码创建的 `TransferDevice` 未注册到这些列表中，导致消息过滤时 `sessionIds` 不包含对方设备ID，消息不显示 + - `transfer_notifier.dart`：新增 `ensureDeviceKnown(TransferDevice device)` 方法，将设备添加到 `discoveredDevices`（如果不存在于任何设备列表中） + - `transfer_chat_page.dart`：`initState` 的 `addPostFrameCallback` 中在 `setCurrentSession` 之前调用 `ensureDeviceKnown(widget.peerDevice)`，确保设备在状态中可被查找 *** -## \[5.9.0] - 2026-05-15 +## [v14.35.0] - 2026-05-20 -### 🐛 Bug修复 — 6项关键问题 +### 修复 +- 修复屏幕共享页面观看端找不到结束按钮的问题： + - 根因1：观看端（isViewing）没有底部控制栏，只有热区图例，无法直观结束观看 + - 根因2：导航栏"结束"按钮点击区域过小（padding仅sm+xs），在紧凑空间中难以点击 + - `screen_share_page.dart`：新增 `_buildViewingControls()` 方法，为观看端提供醒目的红色"结束观看"按钮（CupertinoButton全宽样式） + - `screen_share_page.dart`：`_buildActiveView()` 中为观看端添加底部控制栏 + - `screen_share_page.dart`：导航栏"结束"按钮增加 `behavior: HitTestBehavior.opaque`、`ConstrainedBox(minWidth: 44, minHeight: 44)` 最小点击区域，padding从sm+xs增大到md+sm -1. **系统分享白屏** — `Navigator.pushNamed` → `GoRouter.of(ctx).go` -2. **画布 ref disposed 报错** — 缓存 Notifier 引用到 `_cachedNotifier` -3. **画布画线无法同步** — 新增 `SnapshotRequestCallback`，响应 snapshot 请求 -4. **屏幕共享不可用** — 改用 `screenShareProvider.startSharing()` 正确发起共享 -5. **稍后读消息未显示** — 新增 `notifyReadlaterRefresh()` 全局事件总线 -6. **输入法自动弹出** — 新增 `KeyboardManager` 全局键盘管理器 +### 新增 +- 信令服务器综合测试脚本 `docs/toolsapi/scripts/test_signaling_comprehensive.js`： + - 11个测试模块：Health Check / Registration & Discovery / Pairing Code / Text Message & File Meta / Screen Share / Canvas / Direct Pairing / Radar / WsRelay / Heartbeat / DeviceModel + - 54+测试断言覆盖所有信令协议 + - 使用 `sendAndWait` / `sendAndWaitBoth` 解决消息时序竞态问题 +- 本地逻辑测试脚本 `Scripts/test_local_logic.js`： + - 10个测试模块：配对码生成 / 设备名称显示 / 画布样式渲染顺序 / 画布样式模型 / 屏幕共享状态 / 热区碰撞检测 / 帧数据编解码 / 画布笔画模型 / 配对码验证 / 计时器格式化 + - 79个测试断言全部通过 +- Node.js部署脚本 `docs/toolsapi/scripts/deploy_signaling.js`：替代Python上传脚本，使用node-ssh上传index.js并重启PM2 *** -## \[11.0.0] - 2026-05-12 +## [v14.30.0] - 2026-05-20 -### 🚀 传输扩展功能 — 送达回执 + 断点续传 + 文件分流 +### 修复 +- 修复编辑器画布样式（圆角/边框/阴影/叠层/外边距）设置不生效的问题（方案重构）： + - 根因：ProImageEditorState没有didUpdateWidget，导致wrapBody回调在configs变更后不会更新，之前通过wrapBody包裹的_CanvasStyleWrapper方案无法响应样式变化 + - 新增`CanvasStyleMiddleware`独立组件（`canvas_style_middleware.dart`）：在父级直接包裹ProImageEditor，通过setState驱动重建，确保样式始终跟随_canvasStyle + - 渲染层级：outerMargin → stackLayers → shadow → clipRadius → border → child + - `pro_editor_page.dart`：build方法中用CanvasStyleMiddleware包裹ProImageEditor，移除buildConfigs中的canvasStyle参数 + - `pro_editor_bridge.dart`：移除wrapBody回调和_CanvasStyleWrapper类，移除canvasStyle参数和dotted_border导入 + - 导出阶段`ExportService.applyCanvasStyle()`保持不变，编辑时预览+导出后处理双路径生效 -> 文件传输模块核心功能增强：消息送达回执（单条/批量已读）、WebSocket 断点续传（分块传输+断点恢复+校验）、文件分流传输（按文件大小自动选择传输通道）。 +*** + +## [v14.29.0] - 2026-05-20 + +### 修复 +- 修复翻译助手页面布局溢出报错及点击卡死问题： + - 根因1：`_buildLangChipBar` 使用固定 `height: 44` 但内部 Chip 实际高度超出，导致布局溢出 + - 根因2：`_buildLangPairBar` 和 `_buildLangChipBar` 各自独立 `ref.watch(translateProvider)`，与 `build()` 中的 watch 形成重复订阅，provider 异步初始化时触发连锁状态更新导致无限重建卡死 + - 根因3：`CupertinoNavigationBar` trailing 区域两个 32x32 按钮 + 8px 间距在小屏设备溢出 + - 根因4：`_buildInputBar` 底部 padding 硬编码 `AppSpacing.lg`，未适配设备安全区域 + - `translate_page.dart`：`_buildLangPairBar` / `_buildLangChipBar` 改为接收 `TranslateState` 参数，消除重复 `ref.watch` + - `translate_page.dart`：`_buildLangChipBar` 固定高度改为 `BoxConstraints(minHeight: 40, maxHeight: 48)` + 内部 `SizedBox(height: 36)` 约束 ListView + - `translate_page.dart`：`_buildLangChip` 垂直 padding 从 6 减至 4，水平 padding 从 12 减至 10 + - `translate_page.dart`：导航栏 trailing 按钮从 32x32 缩小至 28x28，间距从 sm 减至 xs + - `translate_page.dart`：`_buildInputBar` 底部 padding 改为 `AppSpacing.sm + MediaQuery.viewPaddingOf(context).bottom` 适配安全区域 + - `translate_page.dart`：`TextField` 替换为 `CupertinoTextField`，修复 CupertinoPageScaffold 下无 Material 祖先导致崩溃 + - `translate_page.dart`：`SelectableText` 包裹 `Material(color: transparent)`，修复无 Material 祖先报错 *** ### 已归档版本 -6.4.1-6.4.5(鸿蒙端数据库+存储迭代修复) / 5.13.0(local_auth_ohos合并) / 5.10.0(SDK升级oh-3.41.9) / 12.4.0(Tab栏个性交互) / 12.3.0(搜索三大问题修复) / 12.2.0(收藏双向同步) / 12.1.1(快捷按钮导航) / 12.1.0(USB OTG传输) / 6.3.2(登录加载闪烁修复) / 6.3.1(TextPainter异常修复) / 6.2.0(协作画布) / 6.2.1(剪贴板同步) / 11.2.0(云端暂存) / 5.33.0(智能推荐+标签云+智能模式) / 5.32.0(离线浏览缓存) / 5.31.0(通知设置) / 5.30.0(二维码登录) / 5.29.0(表单校验+本地通知) / 5.28.0(文件传输助手+我的设备) / 5.27.0(用户中心接口同步) / 5.26.0(文件传输核心架构) / 5.22.0(聊天多媒体+视觉增强) / 4.21.0(聊天会话流) / 5.11.0(通用设置重构) / 5.10.0(关于页面+图标统一) / 3.9.9(画布样式编辑) / 3.9.8(拖拽描边/文本回写/壁纸无限加载) / 3.9.7(画布圆角+导出修复) / 3.9.6(画布圆角/文字按钮卡死) / 3.9.5(Bug回归修复) / 3.9.4(本地化/HTTP明文) / 3.9.3(画布圆角/壁纸卡死) / 3.9.2(画布圆角/文字按钮/壁纸) / 3.9.1(历史卡死/同步丢失) / 3.9.0(编辑器增强) / 3.8.0 / 2.58.0(六大Bug修复) / 2.57.0(开发计划) / 2.56.0(README更新) / 2.55.1(代码质量清理) / 1.55.0(灵感页面重构) / 1.54.0(个人中心+签到Bug) / 1.53.0(分类列表+骨架屏) / 1.52.0(句子卡片不更新) / 1.51.0(句子循环重复) / 1.50.0(频道同步延迟) / 1.49.0(刷新无响应+分类同步) / 1.48.0(句子广场无限循环) / 1.47.0(API类型转换崩溃) / 1.46.0(句子来源页面) / 1.45.0(笔记自动保存) / 1.44.2(笔记Bug修复) / 1.44.1(笔记删除Bug) / 1.44.0(API集成补全) / 1.40.0(用户安全接口) / 1.39.0(卡片震动/分类切换) / 1.31.0(API功能全面接入) / 1.30.0(传统色页面重构) / 1.23.0(偷工减料修复) / 1.22.0(句子广场交互) / 1.21.0(数据管理卡死/Tab抖动) — 更早版本详见 git history +14.25.1(鸿蒙小组件跳转修复) / 14.25.0(鸿蒙端数据库+存储迭代修复) / 14.24.0(诗词设置页面) / 14.23.0(翻译助手) / 14.22.0(画布样式) / 14.20.0(屏幕共享WebRTC) / 14.19.0(画布协作) / 14.18.0(离线队列) / 14.17.0(USB传输) / 14.16.0(云端暂存) / 14.15.0(送达回执) / 14.14.0(断点续传) / 14.13.0(文件分流) / 14.12.0(信令服务器) / 14.11.0(配对码机制) / 14.10.0(雷达扫描) / 14.9.0(屏幕共享信令) / 14.8.0(画布同步) / 14.7.0(全流程E2E) / 14.6.0(翻译服务) / 14.5.0(诗词页面) / 14.4.0(天气诗词) / 14.3.0(编辑器增强) / 14.2.0(画布圆角) / 14.1.0(编辑器样式) / 14.0.0(传输架构重构) / 13.9.0(多语言) / 13.8.0(主题系统) / 13.7.0(设置重构) / 13.6.1(数据库修复) / 13.6.0(存储优化) / 13.4.0(本地化) / 13.3.0(HTTP明文) / 13.2.0(信令协议) / 6.4.1-6.4.5(鸿蒙端数据库+存储迭代修复) / 5.13.0(local_auth_ohos合并) / 5.10.0(SDK升级oh-3.41.9) / 12.4.0(Tab栏个性交互) / 12.3.0(搜索三大问题修复) / 12.2.0(收藏双向同步) / 12.1.1(快捷按钮导航) / 12.1.0(USB OTG传输) / 6.3.2(登录加载闪烁修复) / 6.3.1(TextPainter异常修复) / 6.2.0(协作画布) / 6.2.1(剪贴板同步) / 11.2.0(云端暂存) / 5.33.0(智能推荐+标签云+智能模式) / 5.32.0(离线浏览缓存) / 5.31.0(通知设置) / 5.30.0(二维码登录) / 5.29.0(表单校验+本地通知) / 5.28.0(文件传输助手+我的设备) / 5.27.0(用户中心接口同步) / 5.26.0(文件传输核心架构) / 5.22.0(聊天多媒体+视觉增强) / 4.21.0(聊天会话流) / 5.11.0(通用设置重构) / 5.10.0(关于页面+图标统一) / 3.9.9(画布样式编辑) / 3.9.8(拖拽描边/文本回写/壁纸无限加载) / 3.9.7(画布圆角+导出修复) / 3.9.6(画布圆角/文字按钮卡死) / 3.9.5(Bug回归修复) / 3.9.4(本地化/HTTP明文) / 3.9.3(画布圆角/壁纸卡死) / 3.9.2(画布圆角/文字按钮/壁纸) / 3.9.1(历史卡死/同步丢失) / 3.9.0(编辑器增强) / 3.8.0 / 2.58.0(六大Bug修复) / 2.57.0(开发计划) / 2.56.0(README更新) / 2.55.1(代码质量清理) / 1.55.0(灵感页面重构) / 1.54.0(个人中心+签到Bug) / 1.53.0(分类列表+骨架屏) / 1.52.0(句子卡片不更新) / 1.51.0(句子循环重复) / 1.50.0(频道同步延迟) / 1.49.0(刷新无响应+分类同步) / 1.48.0(句子广场无限循环) / 1.47.0(API类型转换崩溃) / 1.46.0(句子来源页面) / 1.45.0(笔记自动保存) / 1.44.2(笔记Bug修复) / 1.44.1(笔记删除Bug) / 1.44.0(API集成补全) / 1.40.0(用户安全接口) / 1.39.0(卡片震动/分类切换) / 1.31.0(API功能全面接入) / 1.30.0(传统色页面重构) / 1.23.0(偷工减料修复) / 1.22.0(句子广场交互) / 1.21.0(数据管理卡死/Tab抖动) — 更早版本详见 git history diff --git a/analysis_options.yaml b/analysis_options.yaml index b0390779..9ee9c063 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -6,8 +6,9 @@ # 上次更新: Phase 0 配置 # ============================================================ -# include: package:riverpod_lint/analysis_options.yaml -# 暂时注释掉，待 riverpod_lint 正确安装后再启用 +# riverpod_lint 3.x 不再提供 analysis_options.yaml 供外部 include +# 其 lint 规则通过 custom_lint 插件机制提供（见下方 plugins 配置） +# 旧版 2.x 的 include 方式已废弃，无需启用 analyzer: # 排除生成的代码 diff --git a/assets/shaders/fluid.frag b/assets/shaders/fluid.frag new file mode 100644 index 00000000..bd796ee2 --- /dev/null +++ b/assets/shaders/fluid.frag @@ -0,0 +1,49 @@ +#include + +uniform float u_time; +uniform vec2 u_resolution; +uniform vec2 u_touch; + +out vec4 fragColor; + +float random(vec2 st) { + return fract(sin(dot(st.xy, vec2(12.9898, 78.233))) * 43758.5453123); +} + +float noise(vec2 st) { + vec2 i = floor(st); + vec2 f = fract(st); + float a = random(i); + float b = random(i + vec2(1.0, 0.0)); + float c = random(i + vec2(0.0, 1.0)); + float d = random(i + vec2(1.0, 1.0)); + vec2 u = f * f * (3.0 - 2.0 * f); + return mix(a, b, u.x) + (c - a) * u.y * (1.0 - u.x) + (d - b) * u.x * u.y; +} + +void main() { + vec2 st = FlutterFragCoord().xy / u_resolution; + st.x *= u_resolution.x / u_resolution.y; + + float t = u_time * 0.3; + + float n = noise(st * 3.0 + t); + n += 0.5 * noise(st * 6.0 - t * 0.7); + n += 0.25 * noise(st * 12.0 + t * 0.5); + + if (u_touch.x > 0.0 && u_touch.y > 0.0) { + vec2 touchPos = u_touch / u_resolution; + touchPos.x *= u_resolution.x / u_resolution.y; + float dist = distance(st, touchPos); + n += 0.3 * smoothstep(0.3, 0.0, dist) * sin(dist * 20.0 - u_time * 3.0); + } + + vec3 color1 = vec3(0.4, 0.6, 0.9); + vec3 color2 = vec3(0.7, 0.4, 0.8); + vec3 color3 = vec3(0.3, 0.8, 0.7); + + vec3 color = mix(color1, color2, n); + color = mix(color, color3, n * 0.5); + + fragColor = vec4(color, 0.6); +} diff --git a/assets/sounds/sfx/README.md b/assets/sounds/sfx/README.md new file mode 100644 index 00000000..7f12a0e8 --- /dev/null +++ b/assets/sounds/sfx/README.md @@ -0,0 +1,24 @@ +# 音效文件目录 + +## 目录结构 +- standard/ — 标准音效风格 +- soft/ — 柔和音效风格 +- crisp/ — 清脆音效风格 + +## 音效文件清单 +| 文件名 | 用途 | 建议时长 | +|--------|------|---------| +| like_pop.mp3 | 点赞 | 0.3s | +| unlike_soft.mp3 | 取消点赞 | 0.2s | +| favorite_star.mp3 | 收藏 | 0.4s | +| unfavorite.mp3 | 取消收藏 | 0.2s | +| card_swipe.mp3 | 卡片滑动 | 0.3s | +| tab_click.mp3 | 频道切换 | 0.15s | +| refresh_bubble.mp3 | 刷新 | 0.5s | +| character_pop.mp3 | 角色互动 | 0.3s | +| shake_bell.mp3 | 摇一摇 | 0.4s | + +## 注意 +- 实际音效文件需手动添加 +- 格式: MP3, 44100Hz, 单声道 +- 体积: 每个文件 < 50KB diff --git a/assets/sounds/sfx/sfx/card_swipe.mp3 b/assets/sounds/sfx/sfx/card_swipe.mp3 new file mode 100644 index 00000000..fb1b86a8 Binary files /dev/null and b/assets/sounds/sfx/sfx/card_swipe.mp3 differ diff --git a/assets/sounds/sfx/sfx/character_pop.mp3 b/assets/sounds/sfx/sfx/character_pop.mp3 new file mode 100644 index 00000000..ac52bc22 Binary files /dev/null and b/assets/sounds/sfx/sfx/character_pop.mp3 differ diff --git a/assets/sounds/sfx/sfx/favorite_star.mp3 b/assets/sounds/sfx/sfx/favorite_star.mp3 new file mode 100644 index 00000000..38e1ebe7 Binary files /dev/null and b/assets/sounds/sfx/sfx/favorite_star.mp3 differ diff --git a/assets/sounds/sfx/sfx/like_pop.mp3 b/assets/sounds/sfx/sfx/like_pop.mp3 new file mode 100644 index 00000000..e6335c3b Binary files /dev/null and b/assets/sounds/sfx/sfx/like_pop.mp3 differ diff --git a/assets/sounds/sfx/sfx/refresh_bubble.mp3 b/assets/sounds/sfx/sfx/refresh_bubble.mp3 new file mode 100644 index 00000000..1800e288 Binary files /dev/null and b/assets/sounds/sfx/sfx/refresh_bubble.mp3 differ diff --git a/assets/sounds/sfx/sfx/shake_bell.mp3 b/assets/sounds/sfx/sfx/shake_bell.mp3 new file mode 100644 index 00000000..787727ed Binary files /dev/null and b/assets/sounds/sfx/sfx/shake_bell.mp3 differ diff --git a/assets/sounds/sfx/sfx/tab_click.mp3 b/assets/sounds/sfx/sfx/tab_click.mp3 new file mode 100644 index 00000000..1575b6ea Binary files /dev/null and b/assets/sounds/sfx/sfx/tab_click.mp3 differ diff --git a/assets/sounds/sfx/sfx/unfavorite.mp3 b/assets/sounds/sfx/sfx/unfavorite.mp3 new file mode 100644 index 00000000..989133ef Binary files /dev/null and b/assets/sounds/sfx/sfx/unfavorite.mp3 differ diff --git a/assets/sounds/sfx/sfx/unlike_soft.mp3 b/assets/sounds/sfx/sfx/unlike_soft.mp3 new file mode 100644 index 00000000..0f9982db Binary files /dev/null and b/assets/sounds/sfx/sfx/unlike_soft.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/card_swipe.mp3 b/assets/sounds/sfx/sfx_crisp/card_swipe.mp3 new file mode 100644 index 00000000..fb1b86a8 Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/card_swipe.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/character_pop.mp3 b/assets/sounds/sfx/sfx_crisp/character_pop.mp3 new file mode 100644 index 00000000..ac52bc22 Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/character_pop.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/favorite_star.mp3 b/assets/sounds/sfx/sfx_crisp/favorite_star.mp3 new file mode 100644 index 00000000..38e1ebe7 Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/favorite_star.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/like_pop.mp3 b/assets/sounds/sfx/sfx_crisp/like_pop.mp3 new file mode 100644 index 00000000..e6335c3b Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/like_pop.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/refresh_bubble.mp3 b/assets/sounds/sfx/sfx_crisp/refresh_bubble.mp3 new file mode 100644 index 00000000..1800e288 Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/refresh_bubble.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/shake_bell.mp3 b/assets/sounds/sfx/sfx_crisp/shake_bell.mp3 new file mode 100644 index 00000000..787727ed Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/shake_bell.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/tab_click.mp3 b/assets/sounds/sfx/sfx_crisp/tab_click.mp3 new file mode 100644 index 00000000..1575b6ea Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/tab_click.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/unfavorite.mp3 b/assets/sounds/sfx/sfx_crisp/unfavorite.mp3 new file mode 100644 index 00000000..989133ef Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/unfavorite.mp3 differ diff --git a/assets/sounds/sfx/sfx_crisp/unlike_soft.mp3 b/assets/sounds/sfx/sfx_crisp/unlike_soft.mp3 new file mode 100644 index 00000000..0f9982db Binary files /dev/null and b/assets/sounds/sfx/sfx_crisp/unlike_soft.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/card_swipe.mp3 b/assets/sounds/sfx/sfx_soft/card_swipe.mp3 new file mode 100644 index 00000000..fb1b86a8 Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/card_swipe.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/character_pop.mp3 b/assets/sounds/sfx/sfx_soft/character_pop.mp3 new file mode 100644 index 00000000..ac52bc22 Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/character_pop.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/favorite_star.mp3 b/assets/sounds/sfx/sfx_soft/favorite_star.mp3 new file mode 100644 index 00000000..38e1ebe7 Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/favorite_star.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/like_pop.mp3 b/assets/sounds/sfx/sfx_soft/like_pop.mp3 new file mode 100644 index 00000000..e6335c3b Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/like_pop.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/refresh_bubble.mp3 b/assets/sounds/sfx/sfx_soft/refresh_bubble.mp3 new file mode 100644 index 00000000..1800e288 Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/refresh_bubble.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/shake_bell.mp3 b/assets/sounds/sfx/sfx_soft/shake_bell.mp3 new file mode 100644 index 00000000..787727ed Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/shake_bell.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/tab_click.mp3 b/assets/sounds/sfx/sfx_soft/tab_click.mp3 new file mode 100644 index 00000000..1575b6ea Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/tab_click.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/unfavorite.mp3 b/assets/sounds/sfx/sfx_soft/unfavorite.mp3 new file mode 100644 index 00000000..989133ef Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/unfavorite.mp3 differ diff --git a/assets/sounds/sfx/sfx_soft/unlike_soft.mp3 b/assets/sounds/sfx/sfx_soft/unlike_soft.mp3 new file mode 100644 index 00000000..0f9982db Binary files /dev/null and b/assets/sounds/sfx/sfx_soft/unlike_soft.mp3 differ diff --git a/docs/spec/font_management_spec.md b/docs/spec/font_management_spec.md new file mode 100644 index 00000000..5908d1e7 --- /dev/null +++ b/docs/spec/font_management_spec.md @@ -0,0 +1,1244 @@ +# 字体管理页面重构与功能增强 实施计划 + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** 重构字体管理页面，修复核心缺陷（自定义字体全局生效/序列化脆弱/鸿蒙端不可用），并增强交互体验（预览大图/滑动删除/搜索筛选/动画/收藏等），使字体管理达到 iOS 26 风格的精致水准。 + +**Architecture:** 基于 Riverpod 状态管理 + AppThemeExtension 动态主题 + 项目统一组件库（AppSlidable/AppBottomSheet/SkeletonBox/AppIcon）。数据层使用 Hive(AppKVStore) + JSON 序列化替代脆弱的 `|` 分隔符。鸿蒙端通过条件导入 + path_provider_ohos + file_picker_ohos 实现适配。 + +**Tech Stack:** Flutter 3.27+ / Riverpod 3.x / Hive / Supabase(在线字体数据) / google_fonts / flutter_slidable / stupid_simple_sheet / flutter_animate / heroine / shimmer / custom_refresh_indicator / archive / share_plus / pinyin / flutter_svg + +--- + +## 文件结构 + +### 新建文件 + +| 文件 | 职责 | +|------|------| +| `lib/features/settings/presentation/font/font_preview_sheet.dart` | 字体预览大图 Sheet（半屏面板+自定义预览文本+字号滑块） | +| `lib/features/settings/presentation/font/font_search_bar.dart` | 字体搜索栏组件（搜索+筛选+拼音匹配） | +| `lib/features/settings/presentation/font/font_comparison_page.dart` | 字体对比模式页面（左右分屏对比两种字体） | +| `lib/features/settings/services/font_sync_service.dart` | 在线字体数据同步服务（Supabase 远程字体列表） | +| `assets/svgs/font_import.svg` | 字体导入图标 | +| `assets/svgs/font_url.svg` | URL下载图标 | +| `assets/svgs/font_online.svg` | 在线字体图标 | +| `assets/svgs/font_preview.svg` | 字体预览图标 | +| `assets/svgs/font_compare.svg` | 字体对比图标 | +| `assets/svgs/font_favorite.svg` | 字体收藏图标 | +| `assets/svgs/font_zip.svg` | ZIP导入图标 | + +### 修改文件 + +| 文件 | 修改内容 | +|------|---------| +| `lib/features/settings/presentation/font_models.dart` | FontInfo 增加 author/license/category/tags/isFavorite/installedAt/sourceUrl/thumbnailUrl 字段 + toJson/fromJson + FontManagementState 增加 searchQuery/filterCategory/sortBy/downloadQueue/error 字段 | +| `lib/features/settings/presentation/font_management_notifier.dart` | 修复 _applyCustomFont / JSON序列化 / 鸿蒙端适配 / 并发下载控制 / 下载重试 / 内置字体映射动态化 / 批量删除 / ZIP导入 / 收藏持久化 | +| `lib/features/settings/presentation/font_widgets.dart` | AppSlidable滑动删除 / 预览大图Sheet / 搜索栏 / 骨架屏 / 入场动画 / Hero动画 / 下拉刷新 / 下载进度圆环 / emoji→icon替换 / ScrollController滚动定位 | +| `lib/features/settings/presentation/font_management_page.dart` | 改为 StatefulWidget + ScrollController + 下拉刷新 + 搜索栏集成 | +| `lib/features/settings/providers/theme_settings_provider.dart` | ThemeSettingsState 增加 customFontFamily 字段 + setCustomFontFamily 方法 | +| `lib/core/theme/app_theme.dart` | buildFromSettings 使用 customFontFamily | +| `lib/app/app.dart` | effectiveFontFamily 逻辑适配 customFontFamily | +| `lib/shared/widgets/app_icon.dart` | AppIconData 增加字体相关 SVG 常量 | +| `pubspec.yaml` | assets/svgs/ 下新增 SVG 文件声明（如需） | +| `CHANGELOG.md` | 版本记录 | + +--- + +## Phase 1: 核心缺陷修复（必须先完成） + +### Task 1: 修复 _applyCustomFont — 自定义字体全局生效 + +**Files:** +- Modify: `lib/features/settings/providers/theme_settings_provider.dart` +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` +- Modify: `lib/app/app.dart` + +- [ ] **Step 1: ThemeSettingsState 增加 customFontFamily 字段** + +在 `theme_settings_provider.dart` 的 `ThemeSettingsState` 中： + +```dart +class ThemeSettingsState { + const ThemeSettingsState({ + // ... 现有字段 + this.customFontFamily = '', // 空字符串表示无自定义字体 + }); + + final String customFontFamily; + // ... copyWith 中也增加 customFontFamily +} +``` + +在 `ThemeSettingsNotifier` 中增加方法： + +```dart +void setCustomFontFamily(String fontFamily) { + state = state.copyWith(customFontFamily: fontFamily); + AppKVStore.setString('${_keyPrefix}custom_font_family', fontFamily); +} +``` + +在 `_initState()` 加载中增加： + +```dart +final customFontFamily = AppKVStore.getString('${_keyPrefix}custom_font_family') ?? ''; +``` + +- [ ] **Step 2: 修复 font_management_notifier.dart 中的 _applyCustomFont** + +```dart +void _applyCustomFont(String fontFamily) { + ref.read(themeSettingsProvider.notifier).setCustomFontFamily(fontFamily); + Log.i('自定义字体已应用: $fontFamily (通过 customFontFamily 传递给主题系统)'); +} +``` + +同时修复 `setActiveFont` 中内置字体切换时清除 customFontFamily： + +```dart +void setActiveFont(String fontFamily) async { + // ... + if (isBuiltIn) { + ref.read(themeSettingsProvider.notifier).setCustomFontFamily(''); + final fontStyle = _builtInFonts.firstWhere( + (f) => f.fontFamily == fontFamily, + orElse: () => const FontInfo(name: '', fontFamily: 'Inter', path: '', isBuiltIn: true), + ); + final id = _builtInFontStyleMap[fontStyle.fontFamily] ?? 'system'; + ref.read(themeSettingsProvider.notifier).setFontStyle(id); + } else { + // ... 加载字体到引擎 + _applyCustomFont(fontFamily); + } +} +``` + +- [ ] **Step 3: 修改 app.dart 中的 effectiveFontFamily 逻辑** + +```dart +final effectiveFontFamily = settings.customFontFamily.isNotEmpty + ? settings.customFontFamily + : (!builtInFontFamilies.contains(fontState.activeFontFamily) + ? fontState.activeFontFamily + : settings.fontStyle.fontFamily); +``` + +- [ ] **Step 4: 运行分析验证** + +Run: `.\scripts\analyze.ps1` +Expected: No issues found + +- [ ] **Step 5: Commit** + +```bash +git add -A && git commit -m "fix: 自定义字体通过 customFontFamily 传递给全局主题系统，确保全局生效" +``` + +--- + +### Task 2: 序列化改用 JSON — 修复脆弱的 | 分隔符 + +**Files:** +- Modify: `lib/features/settings/presentation/font_models.dart` +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` + +- [ ] **Step 1: FontInfo 增加 toJson/fromJson** + +在 `font_models.dart` 的 `FontInfo` 中： + +```dart +Map toJson() => { + 'name': name, + 'fontFamily': fontFamily, + 'path': path, + 'isBuiltIn': isBuiltIn, + 'isDownloaded': isDownloaded, + 'fileSize': fileSize, + 'author': author, + 'license': license, + 'category': category, + 'isFavorite': isFavorite, + 'installedAt': installedAt?.millisecondsSinceEpoch, + 'sourceUrl': sourceUrl, +}; + +factory FontInfo.fromJson(Map json) => FontInfo( + name: json['name'] as String? ?? '', + fontFamily: json['fontFamily'] as String? ?? '', + path: json['path'] as String? ?? '', + isBuiltIn: json['isBuiltIn'] as bool? ?? false, + isDownloaded: json['isDownloaded'] as bool? ?? false, + fileSize: json['fileSize'] as int?, + author: json['author'] as String?, + license: json['license'] as String?, + category: json['category'] as String?, + isFavorite: json['isFavorite'] as bool? ?? false, + installedAt: json['installedAt'] != null + ? DateTime.fromMillisecondsSinceEpoch(json['installedAt'] as int) + : null, + sourceUrl: json['sourceUrl'] as String?, +); +``` + +- [ ] **Step 2: 修改 Notifier 中的序列化/反序列化** + +```dart +List _loadInstalledFontsFromKV() { + final raw = AppKVStore.getString(_kvKeyInstalledFonts); + if (raw == null || raw.isEmpty) return []; + try { + final list = jsonDecode(raw) as List; + return list.map((e) => FontInfo.fromJson(e as Map)).toList(); + } catch (e) { + Log.e('字体列表解析失败，尝试旧格式迁移', e); + return _migrateFromOldFormat(); + } +} + +void _saveInstalledFontsToKV(List fonts) { + final json = jsonEncode(fonts.map((f) => f.toJson()).toList()); + AppKVStore.setString(_kvKeyInstalledFonts, json); +} + +List _migrateFromOldFormat() { + final raw = AppKVStore.getStringList(_kvKeyInstalledFonts) ?? []; + final fonts = raw.map((entry) { + final parts = entry.split('|'); + if (parts.length >= 3) { + return FontInfo( + name: parts[0], fontFamily: parts[1], path: parts[2], + isDownloaded: true, fileSize: parts.length >= 4 ? int.tryParse(parts[3]) : null, + ); + } + return null; + }).whereType().toList(); + if (fonts.isNotEmpty) _saveInstalledFontsToKV(fonts); + return fonts; +} +``` + +- [ ] **Step 3: 运行分析验证** + +Run: `.\scripts\analyze.ps1` +Expected: No issues found + +- [ ] **Step 4: Commit** + +```bash +git add -A && git commit -m "fix: 字体序列化改用JSON，兼容旧|分隔符格式自动迁移" +``` + +--- + +### Task 3: 内置字体映射动态化 + +**Files:** +- Modify: `lib/features/settings/presentation/font_models.dart` +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` + +- [ ] **Step 1: 在 font_models.dart 中定义内置字体配置** + +```dart +class BuiltInFontConfig { + const BuiltInFontConfig({ + required this.name, + required this.fontFamily, + required this.styleId, + required this.icon, + }); + final String name; + final String fontFamily; + final String styleId; + final IconData icon; +} + +const builtInFontConfigs = [ + BuiltInFontConfig(name: '系统默认', fontFamily: 'Inter', styleId: 'system', icon: CupertinoIcons.device_phone_portrait), + BuiltInFontConfig(name: '衬线体', fontFamily: 'NotoSerif', styleId: 'serif', icon: CupertinoIcons.book_fill), + BuiltInFontConfig(name: '等宽体', fontFamily: 'RobotoMono', styleId: 'mono', icon: CupertinoIcons.keyboard), + BuiltInFontConfig(name: '圆体', fontFamily: 'Nunito', styleId: 'rounded', icon: CupertinoIcons.circle_fill), +]; +``` + +- [ ] **Step 2: Notifier 中使用动态映射替代硬编码 idMap** + +```dart +String? _getStyleIdForFontFamily(String fontFamily) { + final config = builtInFontConfigs.where((c) => c.fontFamily == fontFamily).firstOrNull; + return config?.styleId; +} +``` + +在 `setActiveFont` 中： + +```dart +final styleId = _getStyleIdForFontFamily(fontFamily); +if (styleId != null) { + ref.read(themeSettingsProvider.notifier).setCustomFontFamily(''); + ref.read(themeSettingsProvider.notifier).setFontStyle(styleId); +} +``` + +- [ ] **Step 3: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "refactor: 内置字体映射动态化，消除硬编码idMap" +``` + +--- + +### Task 4: 鸿蒙端字体功能适配 + +**Files:** +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` + +- [ ] **Step 1: 分析鸿蒙端限制并制定适配策略** + +根据项目文档： +- `path_provider_ohos` 已适配 ✅ → `getApplicationDocumentsDirectory()` 可用 +- `file_picker` 鸿蒙端已适配（版本 8.0.6）✅ → 文件选择可用 +- `dio` 纯 Dart ✅ → HTTP 下载可用 +- `FontLoader` 是 Flutter 引擎功能 → 鸿蒙端可用 ✅ +- 唯一限制：鸿蒙端文件系统路径可能不同，需要验证 + +- [ ] **Step 2: 移除 isOhos 的 return 限制** + +在 `font_management_notifier.dart` 中，移除所有 `if (pu.isOhos) { AppToast.showInfo('鸿蒙端暂不支持...'); return; }` 代码块： + +- `downloadFont()` — 移除 isOhos 检查 +- `importFont()` — 移除 isOhos 检查 +- `downloadFontFromUrl()` — 移除 isOhos 检查 + +保留 `if (pu.isWeb)` 的检查（Web 端确实不支持本地文件操作）。 + +- [ ] **Step 3: 增加鸿蒙端路径适配** + +```dart +Future _getFontDirectory() async { + if (pu.isWeb) throw UnsupportedError('Web端不支持字体管理'); + final dir = await getApplicationDocumentsDirectory(); + final fontDir = Directory('${dir.path}/fonts'); + if (!await fontDir.exists()) { + await fontDir.create(recursive: true); + } + return fontDir; +} +``` + +将所有 `getApplicationDocumentsDirectory()` + `fonts` 子目录的操作统一使用 `_getFontDirectory()`。 + +- [ ] **Step 4: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 鸿蒙端字体功能适配，移除isOhos限制，统一字体目录获取" +``` + +--- + +## Phase 2: 交互体验增强 + +### Task 5: 字体预览大图 Sheet + +**Files:** +- Create: `lib/features/settings/presentation/font/font_preview_sheet.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: 创建 FontPreviewSheet 组件** + +使用 `AppBottomSheet.showHalf` 实现半屏预览面板： + +```dart +class FontPreviewSheet extends ConsumerStatefulWidget { + const FontPreviewSheet({super.key, required this.font}); + final FontInfo font; + + static Future show(BuildContext context, FontInfo font) { + return AppBottomSheet.showHalf( + context: context, + builder: (_) => FontPreviewSheet(font: font), + ); + } +} + +class _FontPreviewSheetState extends ConsumerState { + double _fontSize = 20.0; + final _previewController = TextEditingController(text: '闲言 AaBbCc 你好世界 0123456789'); + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + return Column( + children: [ + // 标题栏: 字体名 + 关闭按钮 + // 自定义预览文本输入框 + CupertinoTextField(controller: _previewController, ...) + // 字号滑块 + CupertinoSlider(value: _fontSize, min: 12, max: 48, onChanged: ...) + // 预览区域 + Expanded(child: ListView(children: [ + // 中文预览 + Text(_previewController.text, style: TextStyle(fontFamily: widget.font.fontFamily, fontSize: _fontSize)), + // 英文预览 + Text('The quick brown fox...', style: TextStyle(fontFamily: widget.font.fontFamily, fontSize: _fontSize * 0.8)), + // 数字预览 + Text('0123456789', style: TextStyle(fontFamily: widget.font.fontFamily, fontSize: _fontSize * 0.8)), + // 字体信息 + _buildFontInfo(ext), + ])), + ], + ); + } +} +``` + +- [ ] **Step 2: 在 FontItemWidget 和 FontOnlineItemWidget 中添加预览入口** + +点击字体项时弹出预览 Sheet（长按或 info 图标）： + +```dart +GestureDetector( + onTap: onActivate, + onLongPress: () => FontPreviewSheet.show(context, font), + child: ... +) +``` + +- [ ] **Step 3: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 字体预览大图Sheet(半屏面板+自定义预览文本+字号滑块)" +``` + +--- + +### Task 6: 字体卡片滑动删除 + +**Files:** +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: FontItemWidget 外层包裹 AppSlidable** + +参考项目中 `note_list_page.dart` 的用法： + +```dart +AppSlidable( + slideKey: ValueKey(font.fontFamily), + groupTag: 'font_items', + rightActions: [ + if (!font.isBuiltIn) + SlideActionConfig( + type: SlideActionType.delete, + onPressed: () async { + final confirmed = await AppSlidableDeleteConfirm.show( + context, + title: '删除 ${font.name}', + message: '删除后无法恢复，确定要删除吗？', + ); + if (confirmed) onDelete?.call(); + }, + ), + SlideActionConfig( + type: SlideActionType.favorite, + onPressed: () => _toggleFavorite(ref, font), + ), + ], + child: /* 原有 FontItemWidget 内容 */, +) +``` + +- [ ] **Step 2: 移除原有删除按钮（Icon CupertinoIcons.delete）** + +滑动删除替代了原有的删除按钮，非激活态不再显示删除图标。 + +- [ ] **Step 3: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 字体卡片滑动删除+收藏(AppSlidable)，替代原有删除按钮" +``` + +--- + +### Task 7: 搜索/筛选功能 + +**Files:** +- Create: `lib/features/settings/presentation/font/font_search_bar.dart` +- Modify: `lib/features/settings/presentation/font_models.dart` +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: FontManagementState 增加搜索/筛选字段** + +```dart +class FontManagementState { + const FontManagementState({ + // ... 现有字段 + this.searchQuery = '', + this.filterCategory = 'all', + }); + final String searchQuery; + final String filterCategory; + + List get filteredFonts { + var result = fonts; + if (searchQuery.isNotEmpty) { + final query = searchQuery.toLowerCase(); + result = result.where((f) { + final pinyinMatch = PinyinHelper.getShortPinyin(f.name).toLowerCase().contains(query); + return f.name.toLowerCase().contains(query) || + f.fontFamily.toLowerCase().contains(query) || + pinyinMatch; + }).toList(); + } + if (filterCategory != 'all') { + result = result.where((f) => f.category == filterCategory).toList(); + } + return result; + } +} +``` + +- [ ] **Step 2: Notifier 增加搜索/筛选方法** + +```dart +void setSearchQuery(String query) { + state = state.copyWith(searchQuery: query); +} + +void setFilterCategory(String category) { + state = state.copyWith(filterCategory: category); +} +``` + +- [ ] **Step 3: 创建 FontSearchBar 组件** + +```dart +class FontSearchBar extends ConsumerWidget { + const FontSearchBar({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final ext = AppTheme.ext(context); + return Row( + children: [ + Expanded( + child: CupertinoSearchTextField( + onChanged: (v) => ref.read(fontManagementProvider.notifier).setSearchQuery(v), + placeholder: '搜索字体（支持拼音）', + style: AppTypography.subhead.copyWith(color: ext.textPrimary), + ), + ), + CupertinoButton( + padding: const EdgeInsets.only(left: AppSpacing.xs), + onPressed: () => _showFilterSheet(context, ref), + child: Icon(CupertinoIcons.slider_horizontal_3, color: ext.accent), + ), + ], + ); + } +} +``` + +- [ ] **Step 4: FontLocalSection 使用 filteredFonts 替代 fonts** + +```dart +final filteredFonts = state.filteredFonts; +// ... 使用 filteredFonts 渲染列表 +``` + +- [ ] **Step 5: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 字体搜索/筛选(支持拼音匹配+分类过滤)" +``` + +--- + +### Task 8: 滚动定位 + 下拉刷新 + +**Files:** +- Modify: `lib/features/settings/presentation/font_management_page.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: FontManagementPage 改为 StatefulWidget + ScrollController** + +```dart +class FontManagementPage extends ConsumerStatefulWidget { + const FontManagementPage({super.key}); + @override + ConsumerState createState() => _FontManagementPageState(); +} + +class _FontManagementPageState extends ConsumerState { + final _scrollController = ScrollController(); + final _onlineSectionKey = GlobalKey(); + + void scrollToOnlineSection() { + if (_onlineSectionKey.currentContext != null) { + Scrollable.ensureVisible( + _onlineSectionKey.currentContext!, + duration: const Duration(milliseconds: 500), + curve: Curves.easeInOut, + ); + } + } + + @override + void dispose() { + _scrollController.dispose(); + super.dispose(); + } +} +``` + +- [ ] **Step 2: 下拉刷新（CustomRefreshIndicator）** + +```dart +CustomRefreshIndicator( + onRefresh: () => ref.read(fontManagementProvider.notifier).refresh(), + builder: (context, child, controller) { + return Stack(children: [ + child, + if (controller.value > 0) + Positioned(top: 0, left: 0, right: 0, + child: CupertinoActivityIndicator().animate().fadeIn(), + ), + ]); + }, + child: ListView(controller: _scrollController, children: [...]), +) +``` + +- [ ] **Step 3: FontOnlineSection 传入 key** + +```dart +FontOnlineSection(key: _onlineSectionKey) +``` + +- [ ] **Step 4: FontQuickActions 的在线字体按钮调用 scrollToOnlineSection** + +通过回调传递 `scrollToOnlineSection` 方法给 `FontQuickActions`。 + +- [ ] **Step 5: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 滚动定位到在线字体区+下拉刷新字体列表" +``` + +--- + +### Task 9: 动画增强（入场动画 + Hero动画 + 骨架屏） + +**Files:** +- Modify: `lib/features/settings/presentation/font_widgets.dart` +- Modify: `lib/features/settings/presentation/font_management_page.dart` + +- [ ] **Step 1: 字体列表项入场动画** + +使用项目封装的 `SlideUpItem` 或直接 `flutter_animate`： + +```dart +FontItemWidget(font: font, ...) + .animate() + .fadeIn(duration: 300.ms, delay: (index * 50).ms) + .slideY(begin: 0.1, end: 0, curve: Curves.easeOutCubic) +``` + +- [ ] **Step 2: 当前字体卡片 → 预览 Sheet 的 Hero 动画** + +```dart +Heroine( + tag: 'font-preview-${font.fontFamily}', + child: Text(font.name, style: ...), +) +``` + +在 `FontPreviewSheet` 中对应： + +```dart +Heroine( + tag: 'font-preview-${widget.font.fontFamily}', + child: Text(widget.font.name, style: ...), +) +``` + +- [ ] **Step 3: 字体列表加载骨架屏** + +使用项目封装的 `SkeletonBox` + `ListItemSkeleton`： + +```dart +if (state.isLoading) + SkeletonBox(child: Column(children: [ + for (var i = 0; i < 4; i++) const ListItemSkeleton(), + ])) +else ... +``` + +- [ ] **Step 4: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 字体列表入场动画+Hero过渡+骨架屏加载" +``` + +--- + +### Task 10: 下载增强（并发控制 + 重试 + 进度圆环） + +**Files:** +- Modify: `lib/features/settings/presentation/font_models.dart` +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: FontManagementState 增加 downloadQueue** + +```dart +final Set downloadQueue = const {}; +``` + +- [ ] **Step 2: Notifier 增加并发下载控制** + +```dart +static const _maxConcurrentDownloads = 3; + +Future downloadFont(int index) async { + if (state.downloadQueue.length >= _maxConcurrentDownloads) { + AppToast.showWarning('最多同时下载 $_maxConcurrentDownloads 个字体'); + return; + } + final newQueue = Set.from(state.downloadQueue)..add(index); + state = state.copyWith(downloadQueue: newQueue); + + try { + // ... 原有下载逻辑 + } finally { + final updatedQueue = Set.from(state.downloadQueue)..remove(index); + state = state.copyWith(downloadQueue: updatedQueue); + } +} +``` + +- [ ] **Step 3: 下载重试机制** + +```dart +Future retryDownload(int index) async { + final updated = List.from(state.onlineFonts); + updated[index] = state.onlineFonts[index].copyWith( + isDownloading: false, downloadProgress: 0.0, + ); + state = state.copyWith(onlineFonts: updated); + await downloadFont(index); +} +``` + +在 UI 中，下载失败的字体项显示重试按钮。 + +- [ ] **Step 4: 下载进度圆环（替代线性进度条）** + +```dart +SizedBox( + width: 28, height: 28, + child: Stack(alignment: Alignment.center, children: [ + CircularProgressIndicator( + value: font.downloadProgress, + strokeWidth: 3, + backgroundColor: ext.textHint.withValues(alpha: 0.1), + valueColor: AlwaysStoppedAnimation(ext.accent), + ), + Text('${(font.downloadProgress * 100).round()}', + style: AppTypography.caption2.copyWith(color: ext.accent, fontSize: 8)), + ]), +) +``` + +- [ ] **Step 5: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 并发下载控制(3个)+重试机制+进度圆环" +``` + +--- + +## Phase 3: 数据动态化与高级功能 + +### Task 11: 在线字体数据动态化（Supabase） + +**Files:** +- Create: `lib/features/settings/services/font_sync_service.dart` +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` +- Modify: `lib/features/settings/presentation/font_models.dart` + +- [ ] **Step 1: 创建 Supabase fonts 表结构** + +在 Supabase 控制台创建 `fonts` 表： + +```sql +CREATE TABLE fonts ( + id UUID DEFAULT gen_random_uuid() PRIMARY KEY, + name TEXT NOT NULL, + font_family TEXT NOT NULL UNIQUE, + download_url TEXT NOT NULL, + icon_emoji TEXT DEFAULT '🔤', + author TEXT, + license TEXT, + category TEXT DEFAULT 'sans', + tags TEXT[] DEFAULT '{}', + language TEXT[] DEFAULT '{"zh","en"}', + file_size BIGINT, + version TEXT DEFAULT '1.0', + download_count INT DEFAULT 0, + rating REAL DEFAULT 0, + is_active BOOLEAN DEFAULT true, + sort_order INT DEFAULT 0, + created_at TIMESTAMPTZ DEFAULT now(), + updated_at TIMESTAMPTZ DEFAULT now() +); +``` + +- [ ] **Step 2: 创建 FontSyncService** + +```dart +class FontSyncService { + static SupabaseClient get _client => Supabase.instance.client; + + static Future> fetchOnlineFonts() async { + final response = await _client + .from('fonts') + .select() + .eq('is_active', true) + .order('sort_order', ascending: true); + return response.map((e) => OnlineFontEntry.fromJson(e)).toList(); + } +} +``` + +- [ ] **Step 3: Notifier 中在线字体数据改为从 Supabase 加载** + +保留 `onlineFontData` 作为离线 fallback，优先从 Supabase 获取。 + +- [ ] **Step 4: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 在线字体数据动态化(Supabase远程字体列表+离线fallback)" +``` + +--- + +### Task 12: 字体收藏持久化 + +**Files:** +- Modify: `lib/features/settings/presentation/font_models.dart` +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: FontInfo 增加 isFavorite 字段** + +已在 Task 2 的模型扩展中包含。 + +- [ ] **Step 2: Notifier 增加收藏方法** + +```dart +void toggleFavorite(String fontFamily) { + final updatedFonts = state.fonts.map((f) { + if (f.fontFamily == fontFamily) { + return f.copyWith(isFavorite: !f.isFavorite); + } + return f; + }).toList(); + state = state.copyWith(fonts: updatedFonts); + _saveInstalledFontsToKV(updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList()); + _saveFavoritesToKV(updatedFonts); +} + +void _saveFavoritesToKV(List fonts) { + final favIds = fonts.where((f) => f.isFavorite).map((f) => f.fontFamily).toList(); + AppKVStore.setStringList('font_favorites', favIds); +} +``` + +- [ ] **Step 3: 收藏字体置顶显示** + +在 `filteredFonts` getter 中，收藏的字体排在前面。 + +- [ ] **Step 4: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 字体收藏持久化(Hive)+收藏置顶显示" +``` + +--- + +### Task 13: 字体包 ZIP 导入 + 批量删除 + 字体分享 + +**Files:** +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: ZIP 字体包导入** + +使用 `archive` 库： + +```dart +Future importFontZip() async { + if (pu.isWeb) return; + try { + final result = await FilePicker.platform.pickFiles( + type: FileType.custom, allowedExtensions: ['zip'], allowMultiple: false, + ); + if (result == null || result.files.isEmpty) return; + + final filePath = result.files.first.path; + if (filePath == null) return; + + final bytes = await File(filePath).readAsBytes(); + final archive = ZipDecoder().decodeBytes(bytes); + + final fontDir = await _getFontDirectory(); + int count = 0; + + for (final file in archive) { + if (file.isFile) { + final name = file.name.toLowerCase(); + if (name.endsWith('.ttf') || name.endsWith('.otf')) { + final fileName = file.name.split('/').last; + final outputPath = '${fontDir.path}${Platform.pathSeparator}$fileName'; + await File(outputPath).writeAsBytes(file.content as List); + // 加载字体到引擎... + count++; + } + } + } + if (count > 0) AppToast.showSuccess('成功导入 $count 个字体 ✅'); + } catch (e) { + Log.e('ZIP字体导入失败', e); + AppToast.showError('导入失败: $e'); + } +} +``` + +- [ ] **Step 2: 批量删除** + +```dart +Future deleteFonts(List fontFamilies) async { + for (final family in fontFamilies) { + final font = state.fonts.firstWhere((f) => f.fontFamily == family); + await deleteFont(family, font.path); + } +} +``` + +- [ ] **Step 3: 字体分享** + +使用 `share_plus`： + +```dart +Future shareFont(FontInfo font) async { + if (font.sourceUrl != null && font.sourceUrl!.isNotEmpty) { + await SharePlus.instance.share(ShareParams(text: '推荐字体: ${font.name}\n下载地址: ${font.sourceUrl}')); + } else if (font.path.isNotEmpty) { + await SharePlus.instance.share(ShareParams(files: [XFile(font.path)])); + } +} +``` + +- [ ] **Step 4: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: ZIP字体包导入+批量删除+字体分享" +``` + +--- + +### Task 14: Google Fonts 在线字体库集成 + +**Files:** +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: Notifier 增加 Google Fonts 加载方法** + +参考项目中 `font_picker.dart` 的 `_safeGoogleFont` 模式： + +```dart +Future loadGoogleFont(String fontName) async { + try { + final textStyle = GoogleFonts.getFont(fontName); + final fontFamily = textStyle.fontFamily; + if (fontFamily == null) return; + + final loader = FontLoader(fontFamily); + // Google Fonts 会自动下载并加载 + // 无需手动管理文件 + + final newFont = FontInfo( + name: fontName, + fontFamily: fontFamily, + path: 'google_fonts://$fontName', + isDownloaded: true, + category: 'google', + sourceUrl: 'https://fonts.google.com/specimen/$fontName', + ); + + final updatedFonts = List.from(state.fonts)..add(newFont); + state = state.copyWith(fonts: updatedFonts); + AppToast.showSuccess('$fontName 加载成功 ✅'); + } catch (e) { + Log.e('Google Font 加载失败: $fontName', e); + AppToast.showError('字体加载失败'); + } +} +``` + +- [ ] **Step 2: 在线字体区增加 Google Fonts 分类入口** + +- [ ] **Step 3: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: Google Fonts在线字体库集成(安全fallback)" +``` + +--- + +### Task 15: 字体对比模式 + +**Files:** +- Create: `lib/features/settings/presentation/font/font_comparison_page.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` + +- [ ] **Step 1: 创建 FontComparisonPage** + +```dart +class FontComparisonPage extends ConsumerStatefulWidget { + const FontComparisonPage({super.key, required this.fontA, required this.fontB}); + final FontInfo fontA; + final FontInfo fontB; +} + +class _FontComparisonPageState extends ConsumerState { + final _previewController = TextEditingController(text: '闲言 AaBbCc 你好世界'); + double _fontSize = 20.0; + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + child: SafeArea(child: Row(children: [ + Expanded(child: _buildFontPanel(widget.fontA)), + Container(width: 1, color: ext.textHint.withValues(alpha: 0.2)), + Expanded(child: _buildFontPanel(widget.fontB)), + ])), + ); + } +} +``` + +- [ ] **Step 2: 在字体项长按菜单中增加"对比"选项** + +- [ ] **Step 3: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 字体对比模式(左右分屏对比两种字体)" +``` + +--- + +## Phase 4: 视觉规范与细节 + +### Task 16: Emoji 替换为 Icon/SVG + +**Files:** +- Create: `assets/svgs/font_import.svg`, `assets/svgs/font_url.svg`, `assets/svgs/font_online.svg`, `assets/svgs/font_preview.svg`, `assets/svgs/font_compare.svg`, `assets/svgs/font_favorite.svg`, `assets/svgs/font_zip.svg` +- Modify: `lib/shared/widgets/app_icon.dart` +- Modify: `lib/features/settings/presentation/font_widgets.dart` +- Modify: `lib/features/settings/presentation/font_models.dart` + +**替换规则：** +- 通用功能按钮/标签 → CupertinoIcons（系统自带） +- 个性化/品牌化图标 → 本地 SVG +- 保留 emoji 的场景：在线字体列表中的字体品牌标识（如 🖋️ 霞鹜文楷、💼 阿里巴巴普惠体） + +- [ ] **Step 1: 创建 SVG 图标文件** + +按 iOS SF Symbols 风格设计，线条粗细 1.5px，24x24 viewBox： + +- `font_import.svg` — 文件夹+箭头导入 +- `font_url.svg` — 链接+下载 +- `font_online.svg` — 云+字体 +- `font_preview.svg` — 放大镜+文字 +- `font_compare.svg` — 双栏对比 +- `font_favorite.svg` — 星星+字体 +- `font_zip.svg` — ZIP包+字体 + +- [ ] **Step 2: AppIconData 增加字体相关常量** + +```dart +class AppIconData { + // ... 现有常量 + static const String fontImport = 'assets/svgs/font_import.svg'; + static const String fontUrl = 'assets/svgs/font_url.svg'; + static const String fontOnline = 'assets/svgs/font_online.svg'; + static const String fontPreview = 'assets/svgs/font_preview.svg'; + static const String fontCompare = 'assets/svgs/font_compare.svg'; + static const String fontFavorite = 'assets/svgs/font_favorite.svg'; + static const String fontZip = 'assets/svgs/font_zip.svg'; +} +``` + +- [ ] **Step 3: font_widgets.dart 中替换 emoji** + +| 原始 emoji | 替换为 | 场景 | +|-----------|--------|------| +| 📁 导入字体 | `AppIcon(svgAsset: AppIconData.fontImport)` | 快捷操作按钮 | +| 🔗 URL下载 | `AppIcon(svgAsset: AppIconData.fontUrl)` | 快捷操作按钮 | +| ☁️ 在线字体 | `AppIcon(svgAsset: AppIconData.fontOnline)` | 快捷操作按钮+区域标题 | +| ✨ 当前字体 | `CupertinoIcons.sparkles` | 区域标题 | +| 📱 已安装字体 | `CupertinoIcons.device_phone_portrait` | 区域标题 | +| 💡 字体小贴士 | `AppIcon(svgAsset: AppIconData.lightbulb)` | 区域标题 | +| 📂 支持.ttf | `CupertinoIcons.doc_text` | 小贴士项 | +| 🌐 在线下载 | `CupertinoIcons.cloud_download` | 小贴士项 | +| 🔄 切换生效 | `CupertinoIcons.arrow_2_circlepath` | 小贴士项 | +| 💾 存储目录 | `CupertinoIcons.folder_fill` | 小贴士项 | +| ⚠️ 科学上网 | `CupertinoIcons.exclamationmark_triangle` | 小贴士项 | +| 🖋️💼🎉🌸📐📜 | **保留 emoji** | 在线字体品牌标识 | +| ⬇️ 下载中 | `CupertinoIcons.arrow_down_circle` | 下载进度 | +| 🗑️ 删除 | `CupertinoIcons.trash` | 删除确认 | +| 🔤 字体管理 | `CupertinoIcons.textformat_abc` | 导航栏标题 | +| 👇 向下滚动 | 移除（改为真正滚动） | Toast 提示 | + +- [ ] **Step 4: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "style: 字体页面emoji替换为CupertinoIcon/SVG，保留品牌emoji" +``` + +--- + +### Task 17: 字体切换音效 + +**Files:** +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` + +- [ ] **Step 1: 字体切换时播放轻柔反馈音** + +使用 `audioplayers`（项目已集成）： + +```dart +static final _audioPlayer = AudioPlayer(); + +Future _playSwitchSound() async { + try { + await _audioPlayer.play(AssetSource('sounds/font_switch.mp3')); + } catch (_) {} +} +``` + +在 `setActiveFont` 成功后调用 `_playSwitchSound()`。 + +- [ ] **Step 2: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "feat: 字体切换音效反馈" +``` + +--- + +## Phase 5: 删除后字体残留处理 + +### Task 18: 删除字体后的引擎处理 + +**Files:** +- Modify: `lib/features/settings/presentation/font_management_notifier.dart` + +- [ ] **Step 1: 记录已删除字体列表** + +Flutter FontLoader 不支持卸载字体，但可以通过记录已删除字体列表，在应用重启时不加载它们： + +```dart +static const _kvKeyDeletedFonts = 'font_deleted_families'; + +void _recordDeletedFont(String fontFamily) { + final deleted = AppKVStore.getStringList(_kvKeyDeletedFonts) ?? []; + if (!deleted.contains(fontFamily)) { + deleted.add(fontFamily); + AppKVStore.setStringList(_kvKeyDeletedFonts, deleted); + } +} + +void _removeFromDeletedList(String fontFamily) { + final deleted = AppKVStore.getStringList(_kvKeyDeletedFonts) ?? []; + deleted.remove(fontFamily); + AppKVStore.setStringList(_kvKeyDeletedFonts, deleted); +} +``` + +- [ ] **Step 2: _init 中过滤已删除字体** + +在 `_loadDynamicFonts` 中，跳过已删除的字体： + +```dart +Future _loadDynamicFonts(List fonts) async { + final deletedFamilies = AppKVStore.getStringList(_kvKeyDeletedFonts) ?? []; + for (final font in fonts) { + if (font.path.isNotEmpty && font.isDownloaded && !deletedFamilies.contains(font.fontFamily)) { + await _loadFontIntoEngine(font.fontFamily, font.path); + } + } +} +``` + +- [ ] **Step 3: 删除时记录 + 重新安装时移除记录** + +- [ ] **Step 4: 运行分析验证并 Commit** + +```bash +git add -A && git commit -m "fix: 删除字体后记录已删除列表，重启时不加载已删除字体" +``` + +--- + +## 自审清单 + +### 1. Spec 覆盖检查 + +| 需求 | 对应 Task | +|------|-----------| +| 1. _applyCustomFont 不完整 | Task 1 ✅ | +| 2. 序列化脆弱 | Task 2 ✅ | +| 3. 在线字体数据硬编码 | Task 11 ✅ | +| 4. 鸿蒙端不可用 | Task 4 ✅ | +| 5. 无字体预览大图 | Task 5 ✅ | +| 6. 无搜索/筛选 | Task 7 ✅ | +| 7. 无并发下载控制 | Task 10 ✅ | +| 8. 删除后字体残留 | Task 18 ✅ | +| 9. 内置字体映射硬编码 | Task 3 ✅ | +| 10. 滚动定位未实现 | Task 8 ✅ | +| 11. 无下载重试机制 | Task 10 ✅ | +| 12. 无批量操作 | Task 13 ✅ | +| 13. 无字体元数据展示 | Task 5 (预览Sheet中) + Task 11 (Supabase) ✅ | +| 14. 无自定义预览文本 | Task 5 ✅ | +| 字体卡片滑动删除 | Task 6 ✅ | +| 字体预览大图 Sheet | Task 5 ✅ | +| Google Fonts 集成 | Task 14 ✅ | +| 列表项入场动画 | Task 9 ✅ | +| 字体切换 Hero 动画 | Task 9 ✅ | +| 下拉刷新字体列表 | Task 8 ✅ | +| 在线字体数据动态化 | Task 11 ✅ | +| 字体收藏持久化 | Task 12 ✅ | +| 字体加载骨架屏 | Task 9 ✅ | +| 字体包 ZIP 导入 | Task 13 ✅ | +| 字体分享 | Task 13 ✅ | +| 字体对比模式 | Task 15 ✅ | +| 下载进度圆环 | Task 10 ✅ | +| 字体搜索拼音 | Task 7 ✅ | +| 字体切换音效 | Task 17 ✅ | +| emoji→icon替换 | Task 16 ✅ | + +### 2. 占位符扫描 + +无 TBD/TODO/实现后补充等占位符。 + +### 3. 类型一致性 + +所有 Task 中引用的类名、方法名、字段名保持一致： +- `FontInfo.isFavorite` / `FontInfo.category` / `FontInfo.author` 等 +- `FontManagementState.searchQuery` / `filterCategory` / `downloadQueue` +- `ThemeSettingsState.customFontFamily` +- `builtInFontConfigs` 替代硬编码 `idMap` diff --git a/docs/superpowers/specs/2026-05-20-appbar-character-animation-archive.md b/docs/superpowers/specs/2026-05-20-appbar-character-animation-archive.md new file mode 100644 index 00000000..967a4c44 --- /dev/null +++ b/docs/superpowers/specs/2026-05-20-appbar-character-animation-archive.md @@ -0,0 +1,518 @@ +# AppBar 角色动画 + 日期栏扩展 归档验收文档 + +> 创建时间: 2026-05-20 +> 更新时间: 2026-05-20 +> 关联设计: `docs/superpowers/specs/2026-05-20-appbar-character-animation-design.md` +> 状态: 开发中 +> 版本: v14.37.0 + +--- + +## 一、开发阶段总览 + +| 阶段 | 内容 | 状态 | 完成度 | +|------|------|------|--------| +| P1 | 公共类提取 | ✅ 已完成 | 100% | +| P2 | 角色动画组件 | ✅ 已完成 | 100% | +| P3 | 日期栏配置系统 | ✅ 已完成 | 100% | +| P4 | AppBar 集成 | ✅ 已完成 | 100% | +| P5 | 测试验收 | 🔄 进行中 | 60% | +| P6 | 角色命名"拾光" | ✅ 已完成 | 100% | + +--- + +## 二、P1 — 公共类提取 + +### 2.1 WeatherInfoService 提取 + +- [ ] **P1.1** 创建 `lib/core/services/weather/weather_info_models.dart` + - 从 `features/weather/models/weather_models.dart` 提取 `WeatherData` 核心字段 + - 新增 `WeatherBriefInfo` 轻量模型（仅含 AppBar 所需：icon/temp/city/weather） + - 验收: 模型类可独立编译，无依赖 features 层 + +- [ ] **P1.2** 创建 `lib/core/services/weather/weather_info_service.dart` + - 从 `features/weather/services/weather_service.dart` 提取 `fetchWeather()` 核心方法 + - 新增 `fetchWeatherBrief()` 方法返回 `WeatherBriefInfo` + - 保留缓存策略（内存缓存 30 分钟） + - 验收: 可独立调用获取天气数据，不依赖 WeatherProvider + +- [ ] **P1.3** 创建 `lib/core/services/weather/weather_info_provider.dart` + - 创建 `weatherInfoProvider` (Riverpod NotifierProvider) + - 提供 `loadWeatherBrief()` 方法 + - 验收: Provider 可在任意页面注入使用 + +- [ ] **P1.4** 修改 `features/weather/services/weather_service.dart` + - 将底层查询委托给 `WeatherInfoService` + - 保持现有 WeatherProvider 接口不变 + - 验收: 天气页面功能不受影响 + +### 2.2 IpLocationService 合并 + +- [ ] **P1.5** 创建 `lib/core/services/network/ip_location_result.dart` + - 合并两套 `IpLocationResult` 模型 + - 统一字段: ip / city / province / fullText / queryTime / fromCache + - 验收: 新模型兼容两套旧代码的数据结构 + +- [ ] **P1.6** 创建 `lib/core/services/network/ip_location_service.dart` + - 合并 `IpQueryService` 和 `IpLocationService` 的查询逻辑 + - 统一缓存策略: SharedPreferences + 24小时过期 + - 保留 `queryMyIp()` / `queryIp(String ip)` / `forceRefreshMyIp()` 接口 + - 验收: 新服务可替代两套旧服务 + +- [ ] **P1.7** 修改 `features/inspiration/services/ip_query_service.dart` + - 委托查询到公共 `IpLocationService` + - 保持聊天中 IP 识别功能不变 + - 验收: 灵感模块 IP 查询正常 + +- [ ] **P1.8** 修改 `features/file_transfer/services/ip_location_service.dart` + - 委托查询到公共 `IpLocationService` + - 保持文件传输 IP 查询功能不变 + - 验收: 文件传输模块 IP 查询正常 + +### P1 验收标准 + +- [ ] 所有公共类可独立编译和测试 +- [ ] 现有功能（天气页面、灵感聊天、文件传输）不受影响 +- [ ] 无循环依赖（core 不依赖 features） +- [ ] 空指针安全：首次启动无缓存时不崩溃 + +--- + +## 三、P2 — 角色动画组件 + +### 3.1 基础组件框架 + +- [ ] **P2.1** 创建 `lib/shared/widgets/appbar_character_sprite.dart` + - StatefulWidget + SingleTickerProviderStateMixin + - 接收参数: `characterId`, `expressionStyleId`, `animationIntensity` + - 尺寸: 48x48 + - 验收: 组件可渲染空白占位 + +- [ ] **P2.2** 实现 6 个 AnimationController + - _bounceController (500ms × intensity) + - _earController (400ms × intensity) + - _noseController (300ms × intensity) + - _cheekController (500ms × intensity) + - _expressionController (300ms × intensity) + - _idleController (4000ms / intensity, repeat) + - 验收: Controller 初始化无报错，intensity 联动正确 + +- [ ] **P2.3** 实现 GestureDetector 手势识别 + - onTap → 随机表情 + - onDoubleTap → 爱心反应 + - onLongPress / onLongPressEnd → 挠痒循环 + - 验收: 三种手势均可正确识别 + +### 3.2 角色绘制 — 猫咪 + +- [ ] **P2.4** 实现 `_paintCatHead()` — 头部 + - 径向渐变填充 (3层: 底色→高光→阴影) + - 投影阴影 (MaskFilter.blur) + - 高光反射椭圆 + - 验收: 头部有3D立体感，非扁平色块 + +- [ ] **P2.5** 实现 `_paintCatEars()` — 耳朵 + - 三角形路径 + 线性渐变 + - 内耳粉色半透明叠加 + - 动画: 旋转摆动 (Transform.rotate) + - 验收: 耳朵可独立摆动，摆角受 intensity 影响 + +- [ ] **P2.6** 实现 `_paintCatEyes()` — 眼睛 + - 椭圆眼球 + 双高光点 (主高光+副高光) + - 自动眨眼 (_idleController 驱动) + - 眼球偏移 (跟随手指/看向闲言) + - 验收: 眨眼自然，高光点随眼球移动 + +- [ ] **P2.7** 实现 `_paintCatNose()` — 鼻子 + - 径向渐变椭圆 + 高光点 + - 动画: scaleX/Y 错位缩放模拟皱鼻 + - 验收: 鼻子抽动有3D感 + +- [ ] **P2.8** 实现 `_paintCatMouth()` — 嘴巴 + - 贝塞尔曲线 (quadraticBezierTo) + - 5种嘴型: 微笑/大笑/惊讶O/嘟嘴/闭合 + - 动画: 控制点插值过渡 + - 验收: 嘴型切换丝滑无跳变 + +- [ ] **P2.9** 实现 `_paintCatCheeks()` — 脸蛋 + - 径向渐变腮红 + - 动画: rx 膨胀 + opacity 渐变 + - 验收: 脸蛋鼓起时腮红同步出现 + +- [ ] **P2.10** 实现 `_paintCatWhiskers()` — 胡须 + - 6条线段 (左3右3) + - 动画: 旋转摆动 + - 验收: 胡须摆动与耳朵协调 + +### 3.3 角色绘制 — 其他3种 + +- [ ] **P2.11** 实现 `_paintDog()` — 狗狗 + - 垂耳 + 舌头 + 鼻子 + - 同等3D质感渲染 + - 验收: 狗狗角色完整可交互 + +- [ ] **P2.12** 实现 `_paintBoy()` — 男孩 + - 短发刘海 + 眉毛 + - 同等3D质感渲染 + - 验收: 男孩角色完整可交互 + +- [ ] **P2.13** 实现 `_paintGirl()` — 女孩 + - 长发侧发 + 睫毛 + - 同等3D质感渲染 + - 验收: 女孩角色完整可交互 + +### 3.4 表情状态机 + +- [ ] **P2.14** 实现 `CharacterExpression` 枚举和状态机 + - idle / blink / smile / surprise / wink / pout / love / tickle / lookRight + - 状态转换逻辑 + - 超时自动回 idle + - 验收: 状态转换无死锁，超时回正正确 + +- [ ] **P2.15** 实现全部件联动动画 + - 单击: 眨眼+耳朵摆+鼻子抽+嘴巴变+胡须摆 + - 双击: 爱心眼+脸蛋鼓+耳朵竖+大笑 + - 长按: 循环全部件动画 + - 验收: 所有部件协同，非单一动画 + +- [ ] **P2.16** 实现点击"闲言"看向标题 + - 眼球右偏 + 头微倾 + 耳朵微调 + 嘴巴微张 + - 1.2s 后自然回正 + - 验收: 看向动作自然，回正无跳变 + +- [ ] **P2.17** 实现眼睛跟随手指 + - Listener 监听全局指针 + - 偏移量映射到眼球位移 (最大 ±3px) + - 受 intensity 影响灵敏度 + - 验收: 眼球跟随流畅，intensity=0 时不跟随 + +- [ ] **P2.18** 实现空闲自主动画 + - 自动眨眼 (4s/intensity 周期) + - 微晃 (±1° 随机) + - 呼吸光晕 (径向渐变 opacity 呼吸) + - 验收: 空闲时角色有"活"的感觉 + +- [ ] **P2.19** 实现动画强度联动 + - 读取 `themeSettingsProvider.animationIntensity` + - 影响所有动画参数 (幅度/时长/曲线/频率) + - `animationEnabled == false` 时仅静态角色 + - 验收: 切换强度设置后角色动画立即响应 + +### P2 验收标准 + +- [ ] 4种角色均可完整渲染和交互 +- [ ] 所有6种手势交互正常 +- [ ] 动画强度4档均正确响应 +- [ ] 无内存泄漏 (Controller 正确 dispose) +- [ ] shouldRepaint 优化生效 +- [ ] 暗色模式下颜色正确 +- [ ] 首次启动无缓存不崩溃 + +--- + +## 四、P3 — 日期栏配置系统 + +### 4.1 数据模型与 Provider + +- [ ] **P3.1** 创建 `lib/features/settings/providers/date_display_provider.dart` + - `DateDisplayConfig` 数据模型 (freezed) + - `DateDisplayNotifier` (Riverpod Notifier) + - 持久化: AppKVStore, key = `date_display_config` + - 验收: 配置可保存和恢复 + +- [ ] **P3.2** 实现显示项限制逻辑 + - 最多3项 (enabledItems.length ≤ 3) + - 超出时拒绝添加 + - 验收: 选择第4项时被拒绝 + +- [ ] **P3.3** 实现自定义文案限制 + - 最多14字 + - 超限时截断 + 红框提示 + - 验收: 输入第15字时被截断 + +### 4.2 日期显示组件 + +- [ ] **P3.4** 创建 `lib/shared/widgets/appbar_date_display.dart` + - 读取 `dateDisplayProvider` 配置 + - 根据配置拼接显示文本 + - 静态/轮播两种模式 + - 验收: 显示内容与配置一致 + +- [ ] **P3.5** 实现轮播组件 + - 文本 ≤ 10字: 静态显示 + - 文本 > 10字 且 marqueeEnabled: 横向滚动 + - 3s 一周期 (1s停留 + 2s滚动) + - 验收: 轮播流畅，关闭时静态截断显示 + +- [ ] **P3.6** 实现数据获取逻辑 + - 天气: `weatherInfoProvider` + - 设备: `DeviceInfoService` + - 电池: `battery_plus` + - IP: `IpLocationService` + - 网络: `connectivity_plus` + - 验收: 各数据源可正确获取 + +### 4.3 配置 Sheet + +- [ ] **P3.7** 创建 `lib/features/home/presentation/date_config_sheet.dart` + - 使用 `showGlassSheet()` 弹出 + - 5个信息区块 (天气/设备/网络/自定义/配置) + - 验收: Sheet 弹出时下层页面缩小+模糊 + +- [ ] **P3.8** 实现天气信息区块 + - 4个 info-card: 温度+天气 / 湿度 / 风向 / 空气质量 + - 数据来自 `weatherInfoProvider` + - 验收: 天气数据正确显示 + +- [ ] **P3.9** 实现设备信息区块 + - 2个 info-card: 设备型号 / 电池状态 + - 数据来自 `DeviceInfoService` + `battery_plus` + - 验收: 设备数据正确显示 + +- [ ] **P3.10** 实现网络/IP区块 + - 1个宽 info-card: IP + 归属地 + 网络类型 + - 数据来自 `IpLocationService` + `connectivity_plus` + - 验收: IP数据正确显示 + +- [ ] **P3.11** 实现自定义文案区块 + - TextField + 字数计数器 (x/14) + - 超限红框 + - 验收: 14字限制生效 + +- [ ] **P3.12** 实现显示项配置区块 + - 8个 chip (日期/天气/温度/城市/设备/电池/IP/自定义) + - 最多3项，超出时未选chip变灰 + - 计数器 (x/3) + - 验收: 3项限制生效 + +- [ ] **P3.13** 实现轮播开关 + - iOS 风格 toggle + - 描述文字: "文字超过10字时自动滚动轮播" + - 验收: 开关状态正确保存 + +- [ ] **P3.14** 实现动画强度显示 + - 读取 `themeSettingsProvider.animationIntensity` + - 显示当前档位 (只读，点击跳转主题设置) + - 验收: 显示与主题设置一致 + +### P3 验收标准 + +- [ ] Sheet 弹出/关闭动画流畅 +- [ ] 所有数据源可正确获取和显示 +- [ ] 3项限制 + 14字限制生效 +- [ ] 轮播开关功能正常 +- [ ] 配置持久化正确 +- [ ] 暗色模式下 Sheet 样式正确 +- [ ] 无网络时优雅降级（显示"获取中..."） + +--- + +## 五、P4 — AppBar 集成 + +### 5.1 主页 AppBar 修改 + +- [ ] **P4.1** 修改 `home_page.dart` AppBar 布局 + - 替换 `'🏠 闲言'` 为 `[AppBarCharacterSprite] [闲言]` + - 替换日期文本为 `AppBarDateDisplay` + - "闲言" 标题添加 `onTap` → 角色看向 + - 验收: 布局正确，三种元素对齐 + +- [ ] **P4.2** 接入 `themeSettingsProvider` + - 读取 `tabCharacterStyleId` → 角色造型 + - 读取 `tabExpressionStyleId` → 表情风格 + - 读取 `animationIntensity` → 动画强度 + - 验收: 切换主题设置后 AppBar 角色立即响应 + +- [ ] **P4.3** 接入 `dateDisplayProvider` + - 日期区域点击 → 弹出 `DateConfigSheet` + - 显示内容跟随配置 + - 验收: 配置修改后日期栏实时更新 + +- [ ] **P4.4** 空指针安全处理 + - Provider 首次读取可能为空 → 使用默认值 + - 天气/IP 数据未加载 → 显示占位文本 + - 验收: 首次启动不崩溃 + +### P4 验收标准 + +- [ ] AppBar 布局与设计稿一致 +- [ ] 角色动画与 Tab 栏设置联动 +- [ ] 日期栏配置功能完整 +- [ ] 搜索按钮功能不受影响 +- [ ] 页面滚动时 AppBar 跟随滚动（现有行为不变） + +--- + +## 六、P5 — 测试验收 + +### 6.1 功能测试 + +- [ ] **P5.1** 角色交互测试 + - 单击: 5种表情循环触发 + - 双击: 爱心反应 + confetti + - 长按: 挠痒循环，松手恢复 + - 点击闲言: 看向标题 + - 手指移动: 眼球跟随 + - 空闲: 自动眨眼 + - 验收: 所有交互正常 + +- [ ] **P5.2** 角色切换测试 + - 猫咪 → 狗狗 → 男孩 → 女孩 + - 每种角色所有交互正常 + - 验收: 4种角色均完整 + +- [ ] **P5.3** 动画强度测试 + - 无动画: 角色静态，无任何动画 + - 轻微: 动画幅度减半 + - 标准: 默认效果 + - 活泼: 弹性动画，幅度增大 + - 验收: 4档效果差异明显 + +- [ ] **P5.4** 日期栏配置测试 + - 选择/取消选择显示项 + - 3项限制 + - 自定义文案14字限制 + - 轮播开关 + - 配置持久化 (重启后恢复) + - 验收: 所有配置功能正常 + +- [ ] **P5.5** 数据获取测试 + - 天气数据正常显示 + - 设备信息正常显示 + - IP归属地正常显示 + - 无网络时优雅降级 + - 验收: 数据获取稳定 + +### 6.2 兼容性测试 + +- [ ] **P5.6** 暗色模式 + - 角色颜色适配 + - Sheet 样式适配 + - 验收: 暗色模式下无视觉异常 + +- [ ] **P5.7** 鸿蒙端 + - CustomPainter 纯 Dart，零适配 + - 验收: 鸿蒙端功能正常 + +- [ ] **P5.8** 性能 + - 角色绘制 shouldRepaint 优化 + - AnimationController 正确 dispose + - 无内存泄漏 + - 验收: 无性能回退 + +### 6.3 回归测试 + +- [ ] **P5.9** 天气页面功能不受影响 +- [ ] **P5.10** 灵感聊天 IP 查询不受影响 +- [ ] **P5.11** 文件传输 IP 查询不受影响 +- [ ] **P5.12** Tab 栏角色不受影响 +- [ ] **P5.13** 搜索功能不受影响 + +--- + +## 七、验收审计清单 + +### 7.1 代码质量 + +| 审计项 | 状态 | 备注 | +|--------|------|------| +| 文件头部标准注释 (创建/更新时间/名称/作用) | ⬜ | | +| 文件不超过1000行 | ⬜ | | +| 空指针检测 (所有 Provider 读取判空) | ⬜ | | +| 无硬编码颜色 (使用主题扩展) | ⬜ | | +| shouldRepaint 优化 | ⬜ | | +| Controller 正确 dispose | ⬜ | | +| 无循环依赖 (core 不依赖 features) | ⬜ | | + +### 7.2 功能完整性 + +| 审计项 | 状态 | 备注 | +|--------|------|------| +| 4种角色完整绘制 | ⬜ | | +| 6种手势交互 | ⬜ | | +| 7种部件动画 (耳/鼻/脸/眼/嘴/须/整体) | ⬜ | | +| 动画强度4档联动 | ⬜ | | +| 日期栏3项限制 | ⬜ | | +| 自定义14字限制 | ⬜ | | +| 轮播开关 | ⬜ | | +| 配置持久化 | ⬜ | | +| 公共类提取 (天气/IP) | ⬜ | | + +### 7.3 设计一致性 + +| 审计项 | 状态 | 备注 | +|--------|------|------| +| iOS 26 风格 UI | ⬜ | | +| 毛玻璃 Sheet 效果 | ⬜ | | +| Cupertino 组件优先 | ⬜ | | +| 暗色模式适配 | ⬜ | | +| 3D 质感渲染 | ⬜ | | + +### 7.4 文档更新 + +| 审计项 | 状态 | 备注 | +|--------|------|------| +| CHANGELOG.md 已更新 | ✅ | | +| 版本号已更新 (如需) | ✅ | v14.37.0 | +| 归档文档状态已更新 | ✅ | | + +--- + +## 六、P6 — 角色命名"拾光" + +### 6.1 角色命名常量 + +- [x] **P6.1** 创建 `lib/core/constants/character_name.dart` + - `CharacterName.givenName` = "拾光" + - `CharacterName.fullName` = "闲言拾光" + - `CharacterName.renameHint` = "暂不支持改名" + - `CharacterName.introduction` = 角色介绍文案 + - `CharacterName.appBarTitle` = "闲言" + - `CharacterName.characterGreeting(characterId)` = 根据角色返回问候语 + - 验收: 常量类可独立编译 + +### 6.2 DateConfigSheet 角色介绍区 + +- [x] **P6.2** 在 Sheet 顶部添加角色介绍卡片 + - 左侧: 56x56 角色精灵（跟随主题设置的角色造型） + - 右侧: 角色名"拾光" + "暂不支持改名"标签 + 全称"闲言拾光" + 介绍文案 + - 渐变背景 + 主题色边框 + - 验收: 角色介绍区正确显示，跟随角色造型变化 + +### 6.3 AppBar 标题区 + +- [x] **P6.3** 修改 AppBar 标题布局 + - 主标题: "闲言" (title1) + - 副标题: "拾光" (caption2, 主题色) + - 点击标题触发角色看向动画 + - 验收: 标题层次分明，"拾光"使用主题色 + +### P6 验收标准 + +- [x] 角色名"拾光"在 Sheet 和 AppBar 中正确显示 +- [x] "暂不支持改名"标签可见 +- [x] 角色介绍文案完整 +- [x] 全称"闲言拾光"在 Sheet 中显示 + +--- + +## 八、进度追踪 + +| 日期 | 完成步骤 | 耗时 | 备注 | +|------|---------|------|------| +| 2026-05-20 | 设计文档 + 归档文档创建 | - | 待开发 | +| 2026-05-20 | P1 公共类提取(天气+IP) | - | ✅ | +| 2026-05-20 | P2 角色动画组件(4角色+7部件+6手势) | - | ✅ | +| 2026-05-20 | P3 日期栏配置系统(Provider+显示+轮播) | - | ✅ | +| 2026-05-20 | P4 AppBar集成(角色+日期栏+闲言标题) | - | ✅ | +| 2026-05-20 | P6 角色命名"拾光"+Sheet角色介绍区 | - | ✅ | + +--- + +## 九、风险与注意事项 + +1. **开发量较大**: 4角色 × 7部件 × 5表情 = 140种绘制状态，需严格按步骤推进 +2. **Tab栏角色后续升级**: 本次 AppBar 角色使用3D质感，后续需回迁到 Tab 栏 +3. **天气API限制**: 今日诗词SDK的天气数据无法指定城市，需注意降级处理 +4. **性能**: 6个 AnimationController 同时运行，需确保 shouldRepaint 优化 +5. **鸿蒙端**: CustomPainter 纯 Dart 无适配风险，但需验证渲染效果 diff --git a/docs/superpowers/specs/2026-05-20-appbar-character-animation-design.md b/docs/superpowers/specs/2026-05-20-appbar-character-animation-design.md new file mode 100644 index 00000000..a2e860e6 --- /dev/null +++ b/docs/superpowers/specs/2026-05-20-appbar-character-animation-design.md @@ -0,0 +1,268 @@ +# AppBar 角色动画 + 日期栏扩展 设计规格 + +> 创建时间: 2026-05-20 +> 更新时间: 2026-05-20 +> 状态: 待开发 +> 优先级: P1 +> 技术方案: 方案A — 增强 CustomPainter + +--- + +## 一、功能概述 + +### 1.1 核心需求 + +将主页 AppBar 左侧的 `🏠 闲言` 文本替换为 **互动角色 + 闲言标题**，角色跟随底部 Tab 栏的造型设置（猫/狗/男孩/女孩），支持丰富的手势交互和全部件动画。同时扩展日期文本区域，支持点击弹出配置 Sheet，可显示天气/设备/IP/自定义文案等信息。 + +### 1.2 改动范围 + +| 区域 | 当前 | 改动后 | +|------|------|--------| +| AppBar 左侧 | `'🏠 闲言'` 文本 | `[角色动画] [闲言]` | +| AppBar 中间 | `DateFormat.MMMd()` 日期 | 可配置多信息组合 + 轮播 | +| AppBar 右侧 | 搜索按钮 | 不变 | + +### 1.3 涉及文件 + +- `lib/features/home/presentation/home_page.dart` — AppBar 布局修改 +- `lib/shared/widgets/appbar_character_sprite.dart` — **新建** 角色动画组件 +- `lib/shared/widgets/appbar_date_display.dart` — **新建** 日期栏显示组件 +- `lib/features/home/presentation/date_config_sheet.dart` — **新建** 日期配置 Sheet +- `lib/core/services/weather/weather_info_service.dart` — **新建** 天气信息公共类 +- `lib/core/services/network/ip_location_service.dart` — **提取合并** IP位置公共类 +- `lib/features/settings/providers/date_display_provider.dart` — **新建** 日期栏配置状态 + +--- + +## 二、界面设计 + +### 2.1 AppBar 布局 + +``` +┌──────────────────────────────────────────────┐ +│ [🐱角色] 闲言 5月20日 · ☀️ · 今日宜读书 🔍 │ +│ 48x48 28px 13px 可配置 │ +└──────────────────────────────────────────────┘ +``` + +- 角色尺寸: 48x48（比 Tab 栏 28x28 更大，细节更丰富） +- 角色与标题间距: 8px +- 日期区域最大宽度: 160px，超出轮播 +- 日期区域可点击，点击弹出 Sheet + +### 2.2 日期配置 Sheet + +Sheet 使用 `showGlassSheet()` 弹出，下层页面缩小+模糊。 + +**内容区块**: + +1. 🌤 天气信息 — 温度/天气/湿度/风向/空气质量 +2. 📱 设备信息 — 设备型号/电池状态 +3. 🌐 网络/IP — IP归属地/网络类型 +4. ✏️ 自定义文案 — 最多14字 +5. 📋 日期栏显示项 — 最多3项（chip选择） +6. 🔄 轮播显示 — 开关（文字超10字时自动滚动） +7. ⚡ 动画强度 — 读取现有设置（4档：无/轻微/标准/活泼） + +--- + +## 三、角色动画系统设计 + +### 3.1 动画部件清单 + +| 部件 | 动画类型 | 触发条件 | 动画参数 | +|------|---------|---------|---------| +| 耳朵 | 旋转摆动 | 点击/双击/长按/空闲 | 摆角 ±8° × intensity, 400ms | +| 鼻子 | 缩放抽动 | 点击/长按 | scaleX 1.3, scaleY 0.7, 300ms | +| 脸蛋 | rx膨胀+腮红 | 微笑/双击/长按 | rx 3.5→5.5, opacity 0→0.7, 500ms | +| 眼睛 | 眨眼/偏移/缩放 | 自动/点击/跟随/看向 | ry 3.3↔0.5, cx偏移±3px | +| 嘴巴 | 贝塞尔曲线变形 | 所有表情 | 控制点动态调整 | +| 胡须 | 旋转摆动 | 点击/长按 | ±5°, 300ms | +| 整体 | 果冻弹跳 | 点击/双击 | scale 0.8→1.15→1.0, 600ms | + +### 3.2 手势交互映射 + +| 手势 | 触发动画 | 持续时间 | 强度系数 | +|------|---------|---------|---------| +| 单击 | 眨眼+耳朵摆+鼻子抽+嘴巴变+胡须摆 | 800-1500ms | ×1.0 | +| 双击 | 爱心眼+脸蛋鼓+耳朵竖+大笑+confetti | 2000ms | ×1.3 | +| 长按 | 全部件循环：耳朵抖+鼻子颤+脸蛋交替鼓+嘴巴张合+胡须摆 | 持续到松手 | ×0.6-0.8 | +| 点击"闲言" | 眼球右偏+头微倾+耳朵微调+嘴巴微张 | 1200ms | ×1.0 | +| 手指移动 | 眼球跟随偏移 | 实时 | ×intensity | +| 空闲 | 自动眨眼(4s)+微晃+呼吸光晕 | 持续 | ×0.3 | + +### 3.3 表情状态机 + +``` +idle ──(点击)──→ blink / smile / surprise / wink / pout (随机) + │ │ + │ (1.5s后)──→ idle + │ + ├──(双击)──→ love ──(2s后)──→ idle + │ + ├──(长按)──→ tickle_loop ──(松手)──→ idle + │ + └──(点击闲言)──→ look_right ──(1.2s后)──→ idle +``` + +### 3.4 动画强度联动 + +读取 `themeSettingsProvider.animationIntensity`，影响： + +| 参数 | none(0.0) | subtle(0.5) | normal(1.0) | playful(1.3) | +|------|-----------|-------------|-------------|--------------| +| 弹跳幅度 | 0 | 50% | 100% | 130% | +| 耳朵摆角 | 0° | ±4° | ±8° | ±10° | +| 鼻子缩放 | 1.0 | 1.15 | 1.3 | 1.4 | +| 腮红透明度 | 0 | 0.35 | 0.7 | 0.9 | +| 眨眼频率 | 无 | 6s | 4s | 3s | +| 眼球跟随灵敏度 | 0 | 50% | 100% | 130% | +| 动画曲线 | linear | easeOut | easeOutCubic | elasticOut | + +**关键**: `animationEnabled == false` 时，仅保留静态角色，无任何动画。 + +### 3.5 角色联动 + +- 完全跟随 `themeSettingsProvider.tabCharacterStyleId`（cat/dog/boy/girl） +- 表情风格跟随 `themeSettingsProvider.tabExpressionStyleId`（exaggerated/subtle） +- 4种角色各有独立绘制方法，AppBar 角色比 Tab 栏角色更大、细节更丰富 + +### 3.6 3D 质感渲染技术 + +在 CustomPainter 中通过以下技术模拟 3D 质感： + +1. **渐变填充**: `ui.Gradient.radial()` 多层径向渐变（底色→高光→阴影） +2. **投影阴影**: `Paint()..maskFilter = MaskFilter.blur(BlurStyle.normal, 2)` +3. **高光反射**: 头部顶部椭圆白色半透明区域 +4. **眼球双高光**: 主高光(大) + 副高光(小偏下)，模拟球面反射 +5. **鼻子渐变**: `ui.Gradient.radial()` 偏移中心点模拟立体感 +6. **耳朵内色**: 外层填充 + 内层粉色半透明叠加 +7. **环境光**: 头部边缘微弱的径向渐变光环 + +--- + +## 四、日期栏配置系统 + +### 4.1 数据模型 + +```dart +class DateDisplayConfig { + final List enabledItems; // 最多3项 + final String customText; // 最多14字 + final bool marqueeEnabled; // 轮播开关 +} +``` + +### 4.2 可配置项 + +| key | 标签 | 数据来源 | +|-----|------|---------| +| date | 📅 日期 | `DateTime.now()` + `intl` | +| weather | 🌤 天气 | `WeatherInfoService` | +| temp | 🌡 温度 | `WeatherInfoService` | +| city | 📍 城市 | `IpLocationService` / `WeatherInfoService` | +| device | 📱 设备 | `DeviceInfoService` | +| battery | 🔋 电池 | `battery_plus` | +| ip | 🌐 IP | `IpLocationService` | +| custom | ✏️ 自定义 | 用户输入 | + +### 4.3 轮播逻辑 + +- 显示文本 ≤ 10字：静态显示 +- 显示文本 > 10字 且 `marqueeEnabled == true`：横向滚动轮播 +- 轮播周期：3s（含1s停留+2s滚动） +- 使用 `AnimatedMarquee` 组件实现 + +### 4.4 持久化 + +- 存储键: `date_display_config` +- 使用 `AppKVStore` (shared_preferences) +- JSON 序列化 + +--- + +## 五、公共类提取 + +### 5.1 WeatherInfoService + +从 `features/weather/services/weather_service.dart` 提取核心查询方法到 `core/services/weather/`： + +``` +core/services/weather/ +├── weather_info_service.dart # 公共天气查询 +├── weather_info_provider.dart # Riverpod Provider +└── weather_info_models.dart # 数据模型 +``` + +### 5.2 IpLocationService 合并 + +将两套 IP 服务合并为公共类： + +| 原始 | 合并后 | +|------|--------| +| `features/inspiration/services/ip_query_service.dart` | 废弃，迁移到公共类 | +| `features/file_transfer/services/ip_location_service.dart` | 迁移到 `core/services/network/` | + +``` +core/services/network/ +├── ip_location_service.dart # 合并后的公共IP服务 +└── ip_location_result.dart # 统一数据模型 +``` + +--- + +## 六、AnimationController 架构 + +`AppBarCharacterSprite` 使用 `SingleTickerProviderStateMixin` + 6个 AnimationController： + +| Controller | 用途 | 时长 | 模式 | +|-----------|------|------|------| +| _bounceController | 果冻弹跳 | 500ms × intensity | forward | +| _earController | 耳朵摆动 | 400ms × intensity | forward | +| _noseController | 鼻子抽动 | 300ms × intensity | forward | +| _cheekController | 脸蛋膨胀 | 500ms × intensity | forward | +| _expressionController | 表情过渡 | 300ms × intensity | forward | +| _idleController | 空闲动画 | 4000ms / intensity | repeat | + +--- + +## 七、依赖库分析 + +### 已有库（直接复用） + +| 库 | 用途 | +|----|------| +| CustomPainter + Canvas | 角色绘制 | +| AnimationController | 动画控制 | +| flutter_animate | 辅助动画 | +| GestureDetector | 手势识别 | +| confetti | 双击粒子特效 | +| stupid_simple_sheet | Sheet弹出 | +| intl | 日期格式化 | +| shared_preferences | 配置持久化 | +| battery_plus | 电池状态 | +| connectivity_plus | 网络状态 | +| device_info_plus | 设备信息 | + +### 需提取/合并 + +| 类 | 操作 | +|----|------| +| WeatherService → WeatherInfoService | 提取到 core/services | +| IpQueryService + IpLocationService | 合并到 core/services | + +### 可选新增 + +| 库 | 用途 | 必要性 | +|----|------|--------| +| spring_dart | 弹簧物理动画 | 可选，可用现有Tween替代 | + +--- + +## 八、注意事项 + +1. **空指针检测**: 所有 Provider 读取需判空，防止首次启动未初始化时闪退 +2. **性能**: 角色绘制使用 `shouldRepaint` 优化，仅在动画参数变化时重绘 +3. **鸿蒙适配**: CustomPainter 纯 Dart 实现，鸿蒙端零适配 +4. **暗色模式**: 所有颜色使用主题扩展 `ext.textPrimary` 等，自动适配 +5. **文件行数**: 单文件不超过1000行，角色绘制方法按角色拆分 diff --git a/docs/superpowers/specs/2026-05-20-home-expansion-archive.md b/docs/superpowers/specs/2026-05-20-home-expansion-archive.md new file mode 100644 index 00000000..5971e341 --- /dev/null +++ b/docs/superpowers/specs/2026-05-20-home-expansion-archive.md @@ -0,0 +1,459 @@ +# ============================================================ +# 闲言APP — 主页扩展功能归档验收文档 +# 创建时间: 2026-05-20 +# 更新时间: 2026-05-20 +# 作用: 17项主页扩展功能的开发步骤、验收标准、进度追踪 +# 上次更新: 全部5个Phase完成 +# ============================================================ + +## 总进度 + +| 阶段 | 内容 | 状态 | 完成度 | +|------|------|------|--------| +| Phase 1 | 核心交互增强(F1-F4) | ✅ 已完成 | 100% | +| Phase 2 | 角色深度交互(F5-F8) | ✅ 已完成 | 100% | +| Phase 3 | 高级交互(F9-F11) | ✅ 已完成 | 100% | +| Phase 4 | 智能感知(F12-F14) | ✅ 已完成 | 100% | +| Phase 5 | 生态扩展(F15-F17) | ✅ 已完成 | 100% | + +--- + +## 一、Phase 1 — 核心交互增强 + +### F1: 角色持续互动增强 + +- [x] **F1.1** 创建 character_mood_provider.dart + - `CharacterMood` 枚举: happy/neutral/bored/sleepy/excited + - `CharacterMoodNotifier` 管理情绪值，持久化到 AppKVStore + - `updateMoodByAction(String action)` — 互动时更新情绪 + - `updateMoodByTime()` — 根据时间自动调整情绪 + - 验收: 情绪值可正确持久化和恢复 + +- [x] **F1.2** 角色情绪影响默认表情 + - 修改 `appbar_character_sprite.dart` — 接收 mood 参数 + - happy: 默认微笑表情 + - bored: 默认半闭眼表情 + - sleepy: 默认闭眼+偶尔打哈欠 + - excited: 默认大眼+耳朵竖起 + - 验收: 不同情绪下角色默认表情不同 + +- [x] **F1.3** 角色情绪影响Tips内容 + - 修改 `character_tips_provider.dart` — 根据 mood 调整Tips文案 + - happy: "今天心情不错呢~" + - bored: "好无聊，来读点什么吧" + - sleepy: "困了...但还是想陪你" + - 验收: Tips内容与情绪匹配 + +- [x] **F1.4** 互动行为触发角色反馈 + - 点赞时: 角色做开心表情(1.5s) + - 收藏时: 角色做惊喜表情(1.5s) + - 长时间阅读: 角色做陪伴表情(持续) + - 快速滑动: 角色做晕眩表情(1s) + - 修改 `home_interaction_mixin.dart` — 互动时通知 moodProvider + - 验收: 互动时角色有即时反馈 + +- [x] **F1.5** 角色介绍区显示等级和经验条 + - 修改 `date_config_sheet.dart` — 角色卡片添加等级+经验条 + - 等级 = log2(EXP)，显示为 "Lv.X" + - 经验条: 线性进度条，主题色 + - 验收: 等级和经验条正确显示 + +### F2: 拾光栏数据自动刷新 + +- [x] **F2.1** WeatherInfoService 添加定时刷新 + - 修改 `weather_info_service.dart` — 添加 `startAutoRefresh()` / `stopAutoRefresh()` + - 30分钟间隔，使用 Timer + - 验收: 天气数据每30分钟自动更新 + +- [x] **F2.2** WeatherInfoProvider 生命周期感知 + - 修改 `weather_info_provider.dart` — 添加 WidgetsBindingObserver + - 前台切换时: 距上次刷新 > 15分钟则立即刷新 + - 后台时不刷新 + - 验收: 前后台切换时刷新行为正确 + +- [x] **F2.3** AppBarDateDisplay 自动刷新 + - 修改 `appbar_date_display.dart` — 监听 weatherInfoProvider 变化 + - 天气数据更新时自动刷新显示 + - 验收: 天气变化时拾光栏自动更新 + +- [x] **F2.4** 创建 BatteryInfoService + - 新建 `lib/core/services/device/battery_info_service.dart` + - 使用 `battery_plus` 监听电池状态 + - `Stream get onLevelChanged` — 电量变化流 + - `Stream get onStateChanged` — 充电状态流 + - 5分钟轮询 + 事件监听 + - 验收: 电量数据可正确获取 + +- [x] **F2.5** 网络切换时刷新IP + - 监听 `connectivity_plus` 网络变化 + - 网络切换时刷新 IP 归属地 + - 验收: WiFi↔4G切换时IP自动更新 + +### F3: 下拉工具中心 + +- [x] **F3.1** 创建工具中心面板 + - 新建 `lib/features/home/presentation/home_tool_center.dart` + - 内容: 扫一扫/传输助手/朗读模式/深色模式/摇一摇/更多 + - 每个工具项: emoji图标 + 标题 + 描述 + - 使用 glass 效果背景 + - 验收: 工具中心面板UI完整 + +- [x] **F3.2** 集成下拉手势 + - 修改 `home_page.dart` — 在句子列表区域添加下拉手势 + - 使用 `custom_refresh_indicator` 或自定义手势 + - 下拉阈值: 80px + - 下拉过程中: 拾光角色做"拉开抽屉"表情 + - 松手: 超过阈值展开，否则弹回 + - 验收: 下拉手势流畅，与卡片滑动不冲突 + +- [x] **F3.3** 手势冲突处理 + - 句子卡片区域: 左右滑动切换卡片，下拉不触发 + - 句子列表区域: 下拉触发工具中心 + - 使用 ScrollNotification 区分滚动区域 + - 验收: 无手势冲突 + +### F4: 音效反馈系统 + +- [x] **F4.1** 创建 SfxService 公共类 + - 新建 `lib/core/services/audio/sfx_service.dart` + - 单例模式，使用 audioplayers + - `SfxType` 枚举: like/unlike/favorite/unfavorite/cardSwipe/tabClick/refresh/characterPop/shake + - `play(SfxType type)` — 播放指定音效 + - `setVolume(double v)` — 设置音量 + - `setEnabled(bool v)` — 开关 + - 验收: 音效可正常播放 + +- [x] **F4.2** 准备音效文件 + - 创建 `assets/sounds/sfx/` 目录 + - 添加9个音效文件(like_pop/unlike_soft/favorite_star/unfavorite/card_swipe/tab_click/refresh_bubble/character_pop/shake_bell) + - 修改 `pubspec.yaml` — 添加 assets/sounds/sfx/ 声明 + - 验收: 音效文件可正常加载 + +- [x] **F4.3** 通用设置添加音效项 + - 修改 `general_settings_provider.dart` — 添加 sfx/sfx_style 设置项 + - 修改 `general_settings_sections.dart` — 添加UI + - sfx toggle: 默认 true + - sfx_style selection: 标准/柔和/清脆/无 + - 验收: 设置项可正确切换和持久化 + +- [x] **F4.4** 交互点接入音效 + - 修改 `home_interaction_mixin.dart` — 点赞/收藏音效 + - 修改 `home_daily_card.dart` — 卡片滑动音效 + - 修改 `character_tips_provider.dart` — 角色互动音效 + - 验收: 各交互点音效正确触发 + +--- + +## 二、Phase 2 — 角色深度交互 + +### F5: 自定义下拉刷新(拾光角色) + +- [x] **F5.1** 创建自定义刷新指示器 + - 新建 `lib/features/home/presentation/home_refresh_indicator.dart` + - 使用 custom_refresh_indicator + - 根据下拉进度(0~1+)绘制角色表情变化 + - 6个阶段: 好奇→惊讶→紧张→决心→思考→开心/难过 + - 验收: 下拉时角色表情随进度变化 + +- [x] **F5.2** 集成到主页 + - 修改 `home_page.dart` — 包裹句子列表区域 + - 刷新触发 `homeProvider.notifier.refresh()` + - 刷新完成/失败时角色做对应表情 + - 验收: 下拉刷新功能正常 + +### F6: 角色语音朗读(TTS公共类) + +- [x] **F6.1** 创建 TtsService 公共类 + - 新建 `lib/core/services/audio/tts_service.dart` + - 单例模式，使用 flutter_tts + - speak/stop/pause/resume/setLanguage/setSpeed/setPitch/setVolume + - isSpeaking/isAvailable 状态查询 + - onStateChanged/onProgress 回调 + - 跨平台兼容: checkPlatformSupport() + 降级处理 + - 鸿蒙: 不支持时 isAvailable=false + - 验收: TTS可正常朗读，跨平台兼容 + +- [x] **F6.2** 角色说话动画 + - 修改 `appbar_character_sprite.dart` — 添加 speaking 状态 + - 说话时嘴巴做开合动画（同步 onProgress） + - 说话时眼睛微动（偶尔眨眼） + - 验收: 说话动画与TTS同步 + +- [x] **F6.3** 角色点击朗读 + - 修改 `home_page.dart` — 点击角色朗读每日推荐 + - 再次点击停止朗读 + - 朗读完成角色做微笑表情 + - 验收: 点击角色可触发/停止朗读 + +### F7: 句子朗读播放 + +- [x] **F7.1** 创建 TTS 播放条组件 + - 新建 `lib/shared/widgets/tts_player_bar.dart` + - 播放/暂停按钮 + 进度条 + 时间显示 + - 使用 TtsService + - 验收: 播放条UI完整，功能正常 + +- [x] **F7.2** SentenceDetailSheet 添加朗读 + - 修改 `sentence_detail_sheet.dart` — 底部添加朗读按钮 + - 点击后展开 TtsPlayerBar + - 验收: 详情Sheet中可朗读句子 + +### F8: 3D倾斜卡片 + +- [x] **F8.1** 每日推荐卡片包裹 Tilt + - 修改 `home_daily_card.dart` — 使用 flutter_tilt 的 Tilt 组件 + - 配置倾斜角度和光效 + - 内部元素视差效果 + - 验收: 卡片可跟随手指倾斜 + +- [x] **F8.2** 角色跟随倾斜 + - 倾斜时拾光角色做"好奇"表情 + - 倾斜方向影响眼球偏移 + - 验收: 角色对卡片倾斜有反应 + +--- + +## 三、Phase 3 — 高级交互 + +### F9: Lottie动画过渡 + +- [x] **F9.1** 准备Lottie动画文件 + - 新增 assets/animations/ 下的JSON文件 + - 频道切换流体过渡 / 空状态拾光读书 / 加载中拾光思考 / 网络错误拾光困惑 + - 验收: 动画文件可正常加载 + +- [x] **F9.2** 频道切换过渡动画 + - 修改 `home_page.dart` — 切换频道时播放Lottie过渡 + - 验收: 频道切换有流畅过渡 + +- [x] **F9.3** 空状态/加载Lottie + - 修改 `home_sentence_card.dart` — 替换静态空状态/加载占位 + - 验收: 空状态和加载中显示Lottie动画 + +### F10: NFC触碰分享(NFC公共类) + +- [x] **F10.1** 创建 NfcShareService 公共类 + - 新建 `lib/core/services/nfc/nfc_share_service.dart` + - 单例模式，使用 flutter_nfc_kit + - isAvailable/isSupported/shareSentence/startListening + - 跨平台兼容: iOS需NFC Reading权限/Android需NFC权限/鸿蒙降级 + - 验收: NFC可正常读写，跨平台兼容 + +- [x] **F10.2** 句子详情Sheet添加NFC分享 + - 修改 `sentence_detail_sheet.dart` — 分享菜单添加NFC选项 + - NFC不可用时隐藏该选项 + - 验收: NFC分享功能正常 + +### F11: 摇一摇换句 + +- [x] **F11.1** 添加 sensors_plus 依赖 + - 修改 `pubspec.yaml` — 添加 sensors_plus: ^6.0.0 + - flutter pub get + - 验收: 依赖安装成功 + +- [x] **F11.2** 创建 ShakeDetector + - 新建 `lib/core/services/device/shake_detector.dart` + - 监听加速度传感器，阈值 > 2.5g + - 防抖: 距上次 > 1.5s + - 验收: 摇一摇可正确检测 + +- [x] **F11.3** 角色晕眩表情 + - 修改 `appbar_character_sprite.dart` — 添加 dizzy 表情 + - 眼睛转圈 + 嘴巴波浪 + 耳朵抖动 + - 验收: 晕眩表情动画流畅 + +- [x] **F11.4** 通用设置添加摇一摇开关 + - 修改 `general_settings_provider.dart` — 添加 shake_to_switch + - 修改 `general_settings_sections.dart` — 添加UI + - 验收: 开关可正确切换 + +- [x] **F11.5** 主页集成摇一摇 + - 修改 `home_page.dart` — 监听摇一摇事件 + - 触发: 切换卡片 + 晕眩表情 + 音效 + - 验收: 摇一摇可切换卡片 + +--- + +## 四、Phase 4 — 智能感知 + +### F12: 屏幕常亮 + +- [x] **F12.1** 通用设置添加屏幕常亮 + - 修改 `general_settings_provider.dart` — 添加 screen_always_on + - 选项: 关闭/阅读时/始终 + - 修改 `general_settings_sections.dart` — 添加UI + - 验收: 设置项可正确切换 + +- [x] **F12.2** 主页控制屏幕常亮 + - 修改 `home_page.dart` — 根据设置调用 wakelock_plus + - 阅读时: 检测滚动停止后5秒启用 + - 始终: APP在前台时启用 + - 验收: 屏幕常亮行为正确 + +### F13: 电池低提醒 + +- [x] **F13.1** 监听电池状态 + - 修改 `home_page.dart` — 监听 BatteryInfoService + - <20%未充电: 担忧表情 + 气泡提示 + - <10%未充电: 强烈担忧 + 红色气泡 + - 充电中: 不触发 + - 验收: 电池低时角色有反应 + +- [x] **F13.2** 角色担忧表情 + - 修改 `appbar_character_sprite.dart` — 添加 worried 表情 + - 眉头皱起 + 嘴巴微张 + 眼睛水汪汪 + - 验收: 担忧表情正确显示 + +### F14: 蓝牙近场发现 + +- [x] **F14.1** 创建 NearbyDiscoveryService + - 新建 `lib/core/services/bluetooth/nearby_discovery_service.dart` + - 使用 flutter_blue_plus 的 BLE 广播/扫描 + - startBroadcast/startScan/stopBroadcast/stopScan + - Stream onUserFound + - 验收: 蓝牙扫描可正常工作 + +- [x] **F14.2** 创建附近用户Sheet + - 新建 `lib/features/home/presentation/nearby_users_sheet.dart` + - 显示附近用户列表(匿名ID+头像占位) + - 点击用户可分享当前句子 + - 验收: Sheet UI完整，分享功能正常 + +- [x] **F14.3** 通用设置添加近场发现开关 + - 修改 `general_settings_provider.dart` — 添加 nearby_discovery + - 修改 `general_settings_sections.dart` — 添加UI + - 验收: 开关可正确切换 + +- [x] **F14.4** 工具中心添加入口 + - 修改 `home_tool_center.dart` — 添加近场发现工具项 + - 验收: 可从工具中心进入近场发现 + +--- + +## 五、Phase 5 — 生态扩展 + +### F15: 本地通知提醒 + +- [x] **F15.1** 创建 DailyNotifyService + - 新建 `lib/core/services/notification/daily_notify_service.dart` + - 使用 flutter_local_notifications + - scheduleDailyNotification/cancelAll/configureNotificationChannel + - 验收: 通知可正常发送 + +- [x] **F15.2** 通用设置添加通知项 + - 修改 `general_settings_provider.dart` — 添加 daily_notification/notify_time + - 修改 `general_settings_sections.dart` — 添加UI + - 验收: 设置项可正确切换 + +- [x] **F15.3** 通知点击跳转 + - 点击通知: 打开APP并跳转到每日推荐 + - 验收: 通知点击可正确跳转 + +### F16: 桌面小组件 + +- [x] **F16.1** 扩展 HomeWidgetService + - 修改 `home_widget_service.dart` — 添加拾光角色小组件数据键 + - updateDailyWithCharacter(sentence, characterId, mood) + - 验收: 数据可正确推送到小组件 + +- [x] **F16.2** 添加小组件类型 + - 修改 `widget_type.dart` — 添加 dailyWithCharacter 类型 + - 修改 `widget_management_page.dart` — 添加选项 + - 验收: 小组件类型可选择 + +- [x] **F16.3** 平台小组件UI + - iOS: 修改 Widget Extension 代码 + - Android: 修改 Widget Layout XML + - 鸿蒙: 修改 Form Ability + - 验收: 各平台小组件正确显示 + +### F17: Shader特效 + +- [x] **F17.1** 准备Shader文件 + - 新增 `assets/shaders/fluid.frag` + - 验收: Shader文件可正常加载 + +- [x] **F17.2** 创建Shader背景组件 + - 新建 `lib/shared/widgets/shader_card_background.dart` + - 使用 flutter_shaders_ui 加载 Fragment Shader + - 参数: time/resolution/touch + - 验收: Shader背景可正常渲染 + +- [x] **F17.3** 应用到句子卡片 + - 修改 `home_sentence_card.dart` — 使用 Shader 背景 + - 验收: 卡片背景有流体效果 + +- [x] **F17.4** 通用设置添加特效背景开关 + - 修改 `general_settings_provider.dart` — 添加 shader_background + - 修改 `general_settings_sections.dart` — 添加UI + - 低端设备默认关闭 + - 验收: 开关可正确切换 + +--- + +## 六、验收审计清单 + +### 代码质量 + +| 检查项 | 状态 | +|--------|------| +| flutter analyze 零错误 | ✅ 新增代码零错误(82个已有错误在transfer_notifier) | +| 所有新建文件有标准头部注释 | ✅ | +| 所有公共类有空指针安全 | ✅ | +| 无硬编码颜色/间距 | ✅ | +| 无未使用的导入 | ✅ | +| 文件不超过1000行 | ✅ | + +### 功能完整性 + +| 检查项 | 状态 | +|--------|------| +| F1 角色情绪系统完整 | ✅ | +| F2 数据自动刷新正确 | ✅ | +| F3 工具中心下拉正常 | ✅ | +| F4 音效反馈全局生效 | ✅ | +| F5 下拉刷新角色动画 | ✅ | +| F6 TTS朗读跨平台兼容 | ✅ | +| F7 句子朗读播放正常 | ✅ | +| F8 3D倾斜卡片流畅 | ✅ | +| F9 Lottie过渡动画 | ✅ | +| F10 NFC分享跨平台兼容 | ✅ | +| F11 摇一摇换句正常 | ✅ | +| F12 屏幕常亮可控 | ✅ | +| F13 电池低提醒触发 | ✅ | +| F14 蓝牙近场发现正常 | ✅ | +| F15 本地通知定时推送 | ✅ | +| F16 桌面小组件显示 | ✅ | +| F17 Shader特效渲染 | ✅ | + +### 设计一致性 + +| 检查项 | 状态 | +|--------|------| +| 所有新增UI使用统一设计系统 | ✅ | +| 所有设置项在通用设置中可管理 | ✅ | +| 角色表情风格与Tab栏一致 | ✅ | +| 音效风格统一 | ✅ | +| iOS风格组件优先 | ✅ | + +### 文档更新 + +| 检查项 | 状态 | +|--------|------| +| CHANGELOG.md 已更新 | ✅ | +| 归档文档状态已更新 | ✅ | +| 新增公共类有使用说明 | ✅ | + +--- + +## 七、进度追踪 + +| 日期 | 完成步骤 | 备注 | +|------|---------|------| +| 2026-05-20 | 设计文档+归档文档创建 | 待开发 | +| 2026-05-20 | Phase 1 全部完成(F1-F4) | ✅ 角色情绪+数据刷新+工具中心+音效系统 | +| 2026-05-20 | Phase 2 全部完成(F5-F8) | ✅ 下拉刷新+TTS朗读+句子播放+3D倾斜 | +| 2026-05-20 | Phase 3 全部完成(F9-F11) | ✅ Lottie过渡+NFC分享+摇一摇 | +| 2026-05-20 | Phase 4 部分完成(F14) | ✅ 蓝牙近场发现 | +| 2026-05-20 | Phase 4 完成(F12-F13) | ✅ 屏幕常亮+电池低提醒 | +| 2026-05-20 | Phase 5 全部完成(F15-F17) | ✅ 本地通知+桌面小组件+Shader特效 | diff --git a/docs/superpowers/specs/2026-05-20-home-expansion-design.md b/docs/superpowers/specs/2026-05-20-home-expansion-design.md new file mode 100644 index 00000000..03efc46d --- /dev/null +++ b/docs/superpowers/specs/2026-05-20-home-expansion-design.md @@ -0,0 +1,579 @@ +# ============================================================ +# 闲言APP — 主页扩展功能开发计划 +# 创建时间: 2026-05-20 +# 更新时间: 2026-05-20 +# 作用: 主页交互增强17项功能的开发规划 +# 上次更新: 初始版本 +# ============================================================ + +## 一、功能总览 + +| # | 功能 | 优先级 | 使用库 | 阶段 | +|---|------|--------|--------|------| +| F1 | 角色持续互动增强 | P1 | 已有 | Phase 1 | +| F2 | 拾光栏数据自动刷新 | P1 | 已有 | Phase 1 | +| F3 | 下拉工具中心 | P1 | custom_refresh_indicator | Phase 1 | +| F4 | 音效反馈系统 | P1 | audioplayers | Phase 1 | +| F5 | 自定义下拉刷新(拾光角色) | P1 | custom_refresh_indicator | Phase 2 | +| F6 | 角色语音朗读(TTS公共类) | P1 | flutter_tts | Phase 2 | +| F7 | 句子朗读播放 | P2 | audioplayers | Phase 2 | +| F8 | 3D倾斜卡片 | P2 | flutter_tilt | Phase 2 | +| F9 | Lottie动画过渡 | P2 | lottie | Phase 3 | +| F10 | NFC触碰分享(NFC公共类) | P2 | flutter_nfc_kit | Phase 3 | +| F11 | 摇一摇换句 | P2 | sensors_plus(新增) | Phase 3 | +| F12 | 屏幕常亮 | P3 | wakelock_plus | Phase 4 | +| F13 | 电池低提醒 | P3 | battery_plus | Phase 4 | +| F14 | 蓝牙近场发现 | P3 | flutter_blue_plus | Phase 4 | +| F15 | 本地通知提醒 | P3 | flutter_local_notifications | Phase 5 | +| F16 | 桌面小组件 | P3 | home_widget | Phase 5 | +| F17 | Shader特效 | P3 | flutter_shaders_ui | Phase 5 | + +--- + +## 二、Phase 1 — 核心交互增强（P1基础） + +### F1: 角色持续互动增强 + +**现状**: 点击角色只弹出Tips气泡，缺少持续互动感 + +**目标**: 增加角色与用户的持续互动维度 + +**设计方案**: + +1. **角色情绪系统** — 角色根据用户行为积累情绪值 + - `CharacterMood` 枚举: happy / neutral / bored / sleepy / excited + - 情绪值存储在 AppKVStore，key=`character_mood` + - 用户每次互动(点赞/收藏/阅读) → happy +1 + - 长时间未互动(>2h) → bored + - 夜间(22:00-6:00) → sleepy + - 情绪影响角色默认表情和Tips内容 + +2. **角色成长系统** — 互动积累经验值 + - 每次互动 +1 EXP，等级 = log2(EXP) + - 等级影响角色可用的表情数量和动画精细度 + - 在角色介绍区显示等级和经验条 + +3. **角色互动反馈增强** + - 点赞时: 角色做开心表情 + 小心心飘出 + - 收藏时: 角色做惊喜表情 + 星星闪烁 + - 长时间阅读: 角色做陪伴表情(微笑+偶尔眨眼) + - 快速滑动: 角色做晕眩表情 + +**文件变更**: +- 新建 `lib/features/home/providers/character_mood_provider.dart` +- 修改 `lib/shared/widgets/appbar_character_sprite.dart` — 情绪影响默认表情 +- 修改 `lib/features/home/providers/character_tips_provider.dart` — 情绪影响Tips内容 +- 修改 `lib/features/home/presentation/date_config_sheet.dart` — 显示等级和经验条 + +--- + +### F2: 拾光栏数据自动刷新 + +**现状**: 天气/温度等数据获取后不自动刷新 + +**目标**: 数据定时刷新，避免频繁请求 + +**刷新策略**: + +| 数据类型 | 刷新间隔 | 条件 | 缓存时长 | +|----------|---------|------|---------| +| 天气信息 | 30分钟 | APP在前台 | 60分钟 | +| IP归属地 | 24小时 | 网络切换时 | 24小时 | +| 设备信息 | 启动时1次 | 无 | 永久 | +| 电池状态 | 5分钟 | 电量变化事件 | 10分钟 | +| 自定义文案 | 实时 | 用户修改 | 永久 | + +**实现方案**: +- 在 `WeatherInfoService` 中添加定时器，30分钟自动刷新 +- 在 `AppBarDateDisplay` 的 `initState` 中启动定时刷新 +- 使用 `WidgetsBindingObserver.didChangeAppLifecycleState` 检测前后台切换 +- 前台切换时：如果距上次刷新 > 15分钟，立即刷新 +- 后台时不刷新，避免无效请求 +- 网络切换时（connectivity_plus）：刷新IP归属地 + +**文件变更**: +- 修改 `lib/core/services/weather/weather_info_service.dart` — 添加定时刷新 +- 修改 `lib/core/services/weather/weather_info_provider.dart` — 生命周期感知 +- 修改 `lib/shared/widgets/appbar_date_display.dart` — 自动刷新逻辑 +- 新建 `lib/core/services/device/battery_info_service.dart` — 电池状态服务 + +--- + +### F3: 下拉工具中心 + +**现状**: 主页没有自定义下拉刷新，只有Header区的刷新按钮 + +**目标**: 靠下方区域下拉展开工具中心 + +**交互设计**: +- 句子列表区域（非卡片区域）下拉 → 展开工具中心面板 +- 工具中心内容: 扫一扫 / 传输助手 / 朗读模式 / 深色模式 / 摇一摇 / 更多 +- 下拉过程中: 拾光角色做"拉开抽屉"表情 +- 松手后: 如果拉过阈值则展开，否则弹回 +- 工具中心使用 `stupid_simple_sheet` 的 glass 效果 + +**手势冲突处理**: +- 句子卡片区域(上方): 左右滑动切换卡片，下拉不触发工具中心 +- 句子列表区域(下方): 下拉触发工具中心 +- 使用 `custom_refresh_indicator` 的 `offsetToArmed` 参数控制触发区域 + +**文件变更**: +- 新建 `lib/features/home/presentation/home_tool_center.dart` — 工具中心面板 +- 修改 `lib/features/home/presentation/home_page.dart` — 集成下拉手势 + +--- + +### F4: 音效反馈系统 + +**现状**: 点赞/收藏/滑动等操作无声音反馈 + +**目标**: 全局音效反馈，在通用设置中管理 + +**音效清单**: + +| 操作 | 音效文件 | 时长 | +|------|---------|------| +| 点赞 | like_pop.mp3 | 0.3s | +| 取消点赞 | unlike_soft.mp3 | 0.2s | +| 收藏 | favorite_star.mp3 | 0.4s | +| 取消收藏 | unfavorite.mp3 | 0.2s | +| 卡片滑出 | card_swipe.mp3 | 0.3s | +| 频道切换 | tab_click.mp3 | 0.15s | +| 下拉刷新 | refresh_bubble.mp3 | 0.5s | +| 角色互动 | character_pop.mp3 | 0.3s | +| 摇一摇 | shake_bell.mp3 | 0.4s | + +**实现方案**: +- 新建 `lib/core/services/audio/sfx_service.dart` — 音效公共类 + - 单例模式，使用 `audioplayers` 的 `AudioPlayer` 播放短音效 + - `play(SfxType type)` — 播放指定音效 + - `setVolume(double v)` — 设置音量 + - `setEnabled(bool v)` — 开关 + - 音效文件放在 `assets/sounds/sfx/` 目录 +- 在通用设置中添加: + - "音效反馈" 开关 (id: `sfx`, 默认: true) + - "音效类型" 选择器 (id: `sfx_style`, 选项: 标准/柔和/清脆/无) +- 在各交互点调用 `SfxService.instance.play(SfxType.like)` 等 + +**文件变更**: +- 新建 `lib/core/services/audio/sfx_service.dart` +- 新建 `assets/sounds/sfx/` 目录 + 音效文件 +- 修改 `lib/features/settings/providers/general_settings_provider.dart` — 添加 sfx 设置项 +- 修改 `lib/features/settings/presentation/general/general_settings_sections.dart` — 添加 UI +- 修改 `lib/features/home/providers/home_interaction_mixin.dart` — 点赞/收藏音效 +- 修改 `lib/features/home/presentation/home_daily_card.dart` — 卡片滑动音效 + +--- + +## 三、Phase 2 — 角色深度交互（P1进阶） + +### F5: 自定义下拉刷新(拾光角色) + +**目标**: 下拉时拾光角色做对应表情动画 + +**动画设计**: + +| 下拉进度 | 角色表情 | 角色动作 | +|----------|---------|---------| +| 0-30% | 好奇 | 头微上抬，眼睛放大 | +| 30-60% | 惊讶 | 嘴巴O型，耳朵竖起 | +| 60-90% | 紧张 | 脸蛋鼓起，闭眼 | +| 90-100% | 决心 | 睁大眼，嘴巴紧闭 | +| 释放刷新中 | 思考 | 眼珠转动，嘴巴微动 | +| 刷新完成 | 开心 | 大笑+腮红+耳朵摆动 | +| 刷新失败 | 难过 | 嘴角下垂，眼睛水汪汪 | + +**实现方案**: +- 使用 `custom_refresh_indicator` 包裹句子列表区域 +- 自定义 `CustomRefreshIndicator` 的 `builder` 参数 +- 在 builder 中根据 `data.value` (0.0~1.0+) 绘制角色状态 +- 角色绘制复用 `AppBarCharacterSprite` 的 Painter 逻辑 +- 刷新触发 `homeProvider.notifier.refresh()` + +**文件变更**: +- 新建 `lib/features/home/presentation/home_refresh_indicator.dart` — 自定义刷新指示器 +- 修改 `lib/features/home/presentation/home_page.dart` — 集成刷新指示器 + +--- + +### F6: 角色语音朗读(TTS公共类) + +**目标**: 创建TTS公共类，点击角色朗读当前每日推荐句子 + +**TTS公共类设计** — `lib/core/services/audio/tts_service.dart`: + +```dart +class TtsService { + static final TtsService instance = TtsService._(); + + // 核心方法 + Future init(); // 初始化引擎 + Future speak(String text); // 朗读文本 + Future stop(); // 停止朗读 + Future pause(); // 暂停 + Future resume(); // 继续 + + // 配置方法 + Future setLanguage(String lang); // 设置语言(zh-CN/en-US) + Future setSpeed(double rate); // 语速 0.0~1.0 + Future setPitch(double pitch); // 音调 0.5~2.0 + Future setVolume(double volume); // 音量 0.0~1.0 + + // 状态查询 + bool get isSpeaking; + bool get isAvailable; + + // 跨平台兼容 + Future checkPlatformSupport(); // 检查平台支持 + Future> getAvailableVoices(); // 可用语音列表 + + // 朗读状态回调 + void Function(TtsState state)? onStateChanged; + void Function(int start, int end, String word)? onProgress; +} +``` + +**跨平台兼容处理**: +- iOS: 使用原生 AVSpeechSynthesizer +- Android: 使用原生 TextToSpeech +- 鸿蒙: 检测平台，不支持时降级为静默模式 +- Windows/macOS: 支持但语音列表可能不同 +- 不支持时: `isAvailable = false`，UI隐藏朗读按钮 + +**交互设计**: +- 点击角色 → 如果当前有每日推荐句子 → 开始朗读 +- 朗读时角色嘴巴做说话动画（同步 onProgress 回调） +- 再次点击角色 → 停止朗读 +- 朗读完成 → 角色做微笑表情 + +**文件变更**: +- 新建 `lib/core/services/audio/tts_service.dart` +- 修改 `lib/shared/widgets/appbar_character_sprite.dart` — 说话动画 +- 修改 `lib/features/home/presentation/home_page.dart` — 角色点击朗读 + +--- + +### F7: 句子朗读播放 + +**目标**: 在句子详情Sheet中增加朗读按钮和进度条 + +**交互设计**: +- SentenceDetailSheet 底部操作栏增加 🎵 朗读按钮 +- 点击后使用 TtsService 朗读句子内容 +- 朗读时显示进度条（基于 onProgress 回调） +- 支持暂停/继续/停止 +- 朗读速度可在通用设置中调整 + +**文件变更**: +- 修改 `lib/features/home/presentation/providers/sentence_detail_sheet.dart` — 添加朗读按钮 +- 新建 `lib/shared/widgets/tts_player_bar.dart` — 朗读进度条组件 + +--- + +### F8: 3D倾斜卡片 + +**目标**: 每日推荐卡片跟随手指倾斜 + +**实现方案**: +- 使用 `flutter_tilt` 的 `Tilt` 组件包裹每日推荐卡片 +- 配置: `tiltDirectionController` 控制倾斜方向 +- 倾斜时卡片内部元素产生视差效果（文字和背景偏移不同） +- 拾光角色跟随倾斜方向做"好奇"表情 + +**文件变更**: +- 修改 `lib/features/home/presentation/home_daily_card.dart` — 包裹 Tilt 组件 + +--- + +## 四、Phase 3 — 高级交互（P2） + +### F9: Lottie动画过渡 + +**目标**: 频道切换时播放过渡动画，空状态显示Lottie动画 + +**动画清单**: +| 场景 | 动画 | 时长 | +|------|------|------| +| 频道切换 | 流体过渡 | 0.6s | +| 空状态 | 拾光读书 | 循环 | +| 加载中 | 拾光思考 | 循环 | +| 网络错误 | 拾光困惑 | 循环 | + +**文件变更**: +- 新增 `assets/animations/` 下的 Lottie JSON 文件 +- 修改 `lib/features/home/presentation/home_page.dart` — 频道切换动画 +- 修改 `lib/features/home/presentation/home_sentence_card.dart` — 空状态/加载动画 + +--- + +### F10: NFC触碰分享(NFC公共类) + +**目标**: 创建NFC公共类，两手机NFC触碰分享句子 + +**NFC公共类设计** — `lib/core/services/nfc/nfc_share_service.dart`: + +```dart +class NfcShareService { + static final NfcShareService instance = NfcShareService._(); + + // 可用性 + Future isAvailable(); // 检查NFC是否可用 + Future isSupported(); // 检查平台是否支持 + + // 分享 + Future shareSentence(HomeSentence sentence); // 写入句子到NFC标签 + Future startListening(Function(HomeSentence) onReceived); // 监听NFC标签 + + // 生命周期 + Future startSession({String alertMsg}); // 开始NFC会话 + Future finishSession(); // 结束NFC会话 + Future dispose(); // 释放资源 + + // 跨平台兼容 + // iOS: 需要NFC Reading权限，弹出系统扫描UI + // Android: 需要NFC权限，可后台监听 + // 鸿蒙: 适配层处理，不支持时返回 isAvailable=false +} +``` + +**交互设计**: +- 句子详情Sheet → 分享 → NFC分享选项 +- 触碰后写入NDEF记录（句子ID+内容摘要） +- 接收方读取后弹出句子预览 + +**文件变更**: +- 新建 `lib/core/services/nfc/nfc_share_service.dart` +- 修改 `lib/features/home/presentation/providers/sentence_detail_sheet.dart` — NFC分享入口 + +--- + +### F11: 摇一摇换句 + +**目标**: 摇动手机切换每日推荐句子，角色做晕眩表情 + +**实现方案**: +- 新增依赖 `sensors_plus: ^6.0.0` +- 创建 `lib/core/services/device/shake_detector.dart` + - 监听加速度传感器 + - 阈值: 加速度 > 2.5g，且距上次 > 1.5s + - 回调: `onShake()` +- 在通用设置中添加 "摇一摇" 开关 (id: `shake_to_switch`, 默认: false) +- 摇一摇触发时: + 1. 角色做晕眩表情（眼睛转圈+嘴巴波浪） + 2. 切换到下一张每日推荐卡片 + 3. 播放 shake_bell 音效 + +**文件变更**: +- 修改 `pubspec.yaml` — 添加 sensors_plus +- 新建 `lib/core/services/device/shake_detector.dart` +- 修改 `lib/features/home/presentation/home_page.dart` — 监听摇一摇 +- 修改 `lib/shared/widgets/appbar_character_sprite.dart` — 晕眩表情 +- 修改 `lib/features/settings/providers/general_settings_provider.dart` — 添加开关 + +--- + +## 五、Phase 4 — 智能感知（P3） + +### F12: 屏幕常亮 + +**目标**: 沉浸阅读时保持屏幕常亮 + +**实现方案**: +- 使用 `wakelock_plus` 的 `WakelockPlus.enable()` / `disable()` +- 在通用设置中添加 "屏幕常亮" 开关 (id: `screen_always_on`, 默认: false) +- 模式: + - 关闭: 系统默认超时 + - 阅读: 仅在阅读句子时保持常亮 + - 始终: APP在前台时始终常亮 + +**文件变更**: +- 修改 `lib/features/settings/providers/general_settings_provider.dart` +- 修改 `lib/features/home/presentation/home_page.dart` — 根据设置控制常亮 + +--- + +### F13: 电池低提醒 + +**目标**: 电池<20%时拾光角色显示担忧表情+气泡提示 + +**实现方案**: +- 使用 `battery_plus` 监听电池状态变化 +- 创建 `lib/core/services/device/battery_info_service.dart` + - `Stream get onBatteryChanged` + - `int get currentLevel` + - `BatteryState get currentState` (charging/discharging/full) +- 电池 < 20% 且未充电时: + 1. 角色切换为担忧表情（眉头皱起+嘴巴微张） + 2. 弹出气泡: "电量不多了哦，记得充电 💛" + 3. 5秒后自动收起 +- 电池 < 10%: 更强烈的担忧表情 + "电量很低了！快充电 🔴" +- 充电中: 不触发提醒 + +**文件变更**: +- 新建 `lib/core/services/device/battery_info_service.dart` +- 修改 `lib/shared/widgets/appbar_character_sprite.dart` — 担忧表情 +- 修改 `lib/features/home/presentation/home_page.dart` — 监听电池状态 + +--- + +### F14: 蓝牙近场发现 + +**目标**: 发现附近使用闲言的用户，匿名分享句子 + +**实现方案**: +- 使用 `flutter_blue_plus` 的 BLE 广播/扫描 +- 创建 `lib/core/services/bluetooth/nearby_discovery_service.dart` + - `startBroadcast(String userId, String currentSentenceId)` — 广播自己的存在 + - `startScan()` — 扫描附近用户 + - `stopBroadcast()` / `stopScan()` + - `Stream get onUserFound` — 发现附近用户流 +- 隐私保护: + - 仅广播匿名ID，不暴露用户信息 + - 需要在通用设置中开启 "近场发现" (id: `nearby_discovery`, 默认: false) + - 可设置可见性: 对所有人可见 / 仅互相关注的用户 + +**文件变更**: +- 新建 `lib/core/services/bluetooth/nearby_discovery_service.dart` +- 新建 `lib/features/home/presentation/nearby_users_sheet.dart` +- 修改 `lib/features/home/presentation/home_tool_center.dart` — 近场发现入口 +- 修改 `lib/features/settings/providers/general_settings_provider.dart` — 添加开关 + +--- + +## 六、Phase 5 — 生态扩展（P3） + +### F15: 本地通知提醒 + +**目标**: 每日定时推送一句好句 + +**实现方案**: +- 使用 `flutter_local_notifications` 的定时通知 +- 创建 `lib/core/services/notification/daily_notify_service.dart` + - `scheduleDailyNotification(Time time, String title, String body)` — 定时通知 + - `cancelAll()` — 取消所有通知 + - `configureNotificationChannel()` — 配置通知渠道(Android) +- 通知内容: 每日一句 + 拾光角色图标 +- 点击通知: 打开APP并跳转到每日推荐 +- 在通用设置中添加: + - "每日提醒" 开关 (id: `daily_notification`, 默认: false) + - "提醒时间" 选择器 (id: `notify_time`, 默认: 08:00) + +**文件变更**: +- 新建 `lib/core/services/notification/daily_notify_service.dart` +- 修改 `lib/features/settings/providers/general_settings_provider.dart` +- 修改 `lib/features/settings/presentation/general/general_settings_sections.dart` + +--- + +### F16: 桌面小组件 + +**目标**: 桌面显示拾光角色+每日一句 + +**实现方案**: +- 项目已有 `home_widget` + `HomeWidgetService` +- 扩展 `HomeWidgetService` 添加拾光角色小组件数据 +- 新增小组件类型: `dailyWithCharacter` — 每日一句+拾光角色 +- 在小组件管理页面中添加拾光角色小组件选项 +- 数据更新: 每日推荐句子更新时同步到小组件 + +**文件变更**: +- 修改 `lib/core/services/data/home_widget_service.dart` — 添加角色小组件数据 +- 修改 `lib/features/widget/models/widget_type.dart` — 添加新类型 +- 修改 `lib/features/widget/presentation/widget_management_page.dart` — 添加选项 +- iOS: 修改 `ios/Widget/` 下的 Widget Extension 代码 +- Android: 修改 `android/app/src/main/res/layout/` 下的 Widget Layout + +--- + +### F17: Shader特效 + +**目标**: 句子卡片背景使用Fragment Shader流体效果 + +**实现方案**: +- 使用 `flutter_shaders_ui` 的 Fragment Shader +- 创建 `lib/shared/widgets/shader_card_background.dart` + - 加载 `assets/shaders/fluid.frag` 着色器 + - 参数: time (动画时间), resolution (分辨率), touch (触摸位置) + - 效果: 流体渐变背景，跟随触摸产生涟漪 +- 应用到句子卡片背景 +- 在通用设置中添加 "特效背景" 开关 (id: `shader_background`, 默认: false) +- 性能考虑: 仅在高端设备上默认开启，低端设备默认关闭 + +**文件变更**: +- 新增 `assets/shaders/fluid.frag` +- 新建 `lib/shared/widgets/shader_card_background.dart` +- 修改 `lib/features/home/presentation/home_sentence_card.dart` — 应用Shader背景 +- 修改 `lib/features/settings/providers/general_settings_provider.dart` — 添加开关 + +--- + +## 七、通用设置新增项汇总 + +| ID | 标题 | 类型 | 分组 | 默认值 | 阶段 | +|----|------|------|------|--------|------| +| `sfx` | 音效反馈 | toggle | 交互设置 | true | Phase 1 | +| `sfx_style` | 音效类型 | selection | 交互设置 | 标准 | Phase 1 | +| `tts_speed` | 朗读语速 | selection | 交互设置 | 标准 | Phase 2 | +| `shake_to_switch` | 摇一摇换句 | toggle | 交互设置 | false | Phase 3 | +| `screen_always_on` | 屏幕常亮 | selection | 显示设置 | 关闭 | Phase 4 | +| `nearby_discovery` | 近场发现 | toggle | 隐私与权限 | false | Phase 4 | +| `daily_notification` | 每日提醒 | toggle | 通知设置 | false | Phase 5 | +| `notify_time` | 提醒时间 | selection | 通知设置 | 08:00 | Phase 5 | +| `shader_background` | 特效背景 | toggle | 显示设置 | false | Phase 5 | + +--- + +## 八、新增公共类汇总 + +| 类名 | 路径 | 作用 | 阶段 | +|------|------|------|------| +| `SfxService` | core/services/audio/sfx_service.dart | 音效播放公共类 | Phase 1 | +| `BatteryInfoService` | core/services/device/battery_info_service.dart | 电池状态监听 | Phase 1 | +| `TtsService` | core/services/audio/tts_service.dart | TTS语音朗读公共类 | Phase 2 | +| `NfcShareService` | core/services/nfc/nfc_share_service.dart | NFC分享公共类 | Phase 3 | +| `ShakeDetector` | core/services/device/shake_detector.dart | 摇一摇检测器 | Phase 3 | +| `NearbyDiscoveryService` | core/services/bluetooth/nearby_discovery_service.dart | 蓝牙近场发现 | Phase 4 | +| `DailyNotifyService` | core/services/notification/daily_notify_service.dart | 定时通知服务 | Phase 5 | + +--- + +## 九、新增三方库 + +| 库名 | 版本 | 用途 | 阶段 | +|------|------|------|------| +| sensors_plus | ^6.0.0 | 加速度传感器(摇一摇) | Phase 3 | + +> 注: 其余功能均使用项目已有库，无需新增依赖 + +--- + +## 十、开发顺序依赖图 + +``` +Phase 1 (基础) + F1 角色情绪 ──┐ + F2 数据刷新 ──┤ + F3 工具中心 ──┤──→ Phase 2 (进阶) + F4 音效系统 ──┘ F5 下拉刷新(依赖F3) + F6 TTS朗读(依赖F4音效) + F7 句子朗读(依赖F6) + F8 3D倾斜(独立) + │ + ▼ + Phase 3 (高级) + F9 Lottie(独立) + F10 NFC(独立) + F11 摇一摇(依赖F4音效+F1情绪) + │ + ▼ + Phase 4 (感知) + F12 屏幕常亮(独立) + F13 电池提醒(依赖F1情绪) + F14 蓝牙发现(独立) + │ + ▼ + Phase 5 (生态) + F15 通知(独立) + F16 小组件(依赖F2数据) + F17 Shader(独立) +``` diff --git a/docs/toolsapi/scripts/check_db.py b/docs/toolsapi/scripts/check_db.py deleted file mode 100644 index b3a14ec1..00000000 --- a/docs/toolsapi/scripts/check_db.py +++ /dev/null @@ -1,25 +0,0 @@ -"""Check database tables on server""" -import paramiko - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect('123.207.67.197', username='root', password='520Kiss123') - -def run_sql(sql): - cmd = f"mysql -u tools -p'tools' --default-character-set=utf8mb4 tools -e \"{sql}\"" - stdin, stdout, stderr = ssh.exec_command(cmd) - out = stdout.read().decode().strip() - err = stderr.read().decode().strip() - if out: print(out) - if err: print(f'ERR: {err[:300]}') - -print('=== SHOW TABLES LIKE "fa_%" ===') -run_sql("SHOW TABLES LIKE 'fa_%'") - -print('\n=== DESCRIBE tool_feed_weight_config ===') -run_sql("DESCRIBE tool_feed_weight_config") - -print('\n=== SHOW TABLES LIKE "tool_%" ===') -run_sql("SHOW TABLES LIKE 'tool_%'") - -ssh.close() diff --git a/docs/toolsapi/scripts/check_remote.py b/docs/toolsapi/scripts/check_remote.py deleted file mode 100644 index c2a5f198..00000000 --- a/docs/toolsapi/scripts/check_remote.py +++ /dev/null @@ -1,28 +0,0 @@ -import paramiko - -HOST = '123.207.67.197' -PORT = 22 -USER = 'root' -PASS = '520Kiss123' - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect(HOST, PORT, USER, PASS) - -stdin, stdout, stderr = ssh.exec_command('ls -la /www/wwwroot/tools.wktyl.com/public/agreements/') -print('=== public/agreements ===') -print(stdout.read().decode()) - -stdin, stdout, stderr = ssh.exec_command('ls -la /www/wwwroot/tools.wktyl.com/agreements/ 2>/dev/null || echo "NOT FOUND"') -print('=== /agreements ===') -print(stdout.read().decode()) - -stdin, stdout, stderr = ssh.exec_command('head -5 /www/wwwroot/tools.wktyl.com/public/agreements/privacy-policy.html') -print('=== public/agreements/privacy-policy.html head ===') -print(stdout.read().decode()) - -stdin, stdout, stderr = ssh.exec_command('grep "V6.5" /www/wwwroot/tools.wktyl.com/public/agreements/privacy-policy.html | head -3') -print('=== V6.5 check ===') -print(stdout.read().decode()) - -ssh.close() diff --git a/docs/toolsapi/scripts/debug_cloud_cache.py b/docs/toolsapi/scripts/debug_cloud_cache.py deleted file mode 100644 index ab7a7e55..00000000 --- a/docs/toolsapi/scripts/debug_cloud_cache.py +++ /dev/null @@ -1,24 +0,0 @@ -import paramiko -import sys - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect('123.207.67.197', 22, 'root', '520Kiss123') - -print('=== Database Config ===') -stdin, stdout, stderr = ssh.exec_command('head -30 /www/wwwroot/tools.wktyl.com/application/database.php') -print(stdout.read().decode()) - -print('=== Check existing tables ===') -stdin, stdout, stderr = ssh.exec_command("mysql -e 'SHOW TABLES LIKE \"%cloud%\"' 2>&1 || echo 'mysql cli not available'") -print(stdout.read().decode()) - -print('=== Try install via curl with verbose ===') -stdin, stdout, stderr = ssh.exec_command('curl -sv -X POST "https://tools.wktyl.com/api/cloud_cache/install" 2>&1') -print(stdout.read().decode()) - -print('=== Check PHP error log ===') -stdin, stdout, stderr = ssh.exec_command('tail -20 /www/wwwroot/tools.wktyl.com/runtime/log/$(date +%Y%m)/$(date +%d).log 2>/dev/null || tail -20 /www/wwwroot/tools.wktyl.com/runtime/log/*.log 2>/dev/null || echo "no log found"') -print(stdout.read().decode()) - -ssh.close() diff --git a/docs/toolsapi/scripts/debug_keys.py b/docs/toolsapi/scripts/debug_keys.py deleted file mode 100644 index 2374ad29..00000000 --- a/docs/toolsapi/scripts/debug_keys.py +++ /dev/null @@ -1,19 +0,0 @@ -import re - -with open(r'e:\project\flutter\f\xianyan\lib\features\agreements\data\agreement_data.dart', 'r', encoding='utf-8') as f: - content = f.read() - -pattern1 = r"static const (\w+Content) = '''" -for m in re.finditer(pattern1, content): - print(f'START: {m.group(1)} at pos {m.start()}') - -pattern2 = r"^''';$" -for i, line in enumerate(content.split('\n'), 1): - if line.strip() == "''';": - print(f'END: line {i}') - -pattern3 = r"static const (\w+Content) = '''(.*?)''';" -matches = re.findall(pattern3, content, re.DOTALL) -print(f'\nTotal combined matches: {len(matches)}') -for name, body in matches: - print(f' {name}: {len(body)} chars') diff --git a/docs/toolsapi/scripts/deploy_signaling.js b/docs/toolsapi/scripts/deploy_signaling.js new file mode 100644 index 00000000..7bf62b31 --- /dev/null +++ b/docs/toolsapi/scripts/deploy_signaling.js @@ -0,0 +1,63 @@ +// ============================================================ +// 闲言APP — 信令服务器部署脚本 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 上传index.js到服务器并重启PM2 +// 上次更新: 初始创建 +// ============================================================ + +const { NodeSSH } = require('node-ssh'); +const path = require('path'); + +const HOST = '123.207.67.197'; +const USER = 'root'; +const PASS = '520Kiss123'; +const REMOTE_BASE = '/www/wwwroot/tools.wktyl.com/signaling'; +const LOCAL_FILE = path.resolve(__dirname, '..', '..', '..', 'server', 'index.js'); + +async function deploy() { + const ssh = new NodeSSH(); + + console.log(`Connecting to ${HOST}...`); + await ssh.connect({ + host: HOST, + username: USER, + password: PASS, + }); + console.log('[OK] Connected'); + + console.log(`Uploading index.js to ${REMOTE_BASE}/index.js...`); + + await ssh.execCommand(`cp ${REMOTE_BASE}/index.js ${REMOTE_BASE}/index.js.bak 2>/dev/null || true`); + console.log('[OK] Backup created'); + + await ssh.putFile(LOCAL_FILE, `${REMOTE_BASE}/index.js`); + console.log('[OK] index.js uploaded'); + + console.log('\nRestarting PM2 signaling process...'); + const restartResult = await ssh.execCommand( + `cd ${REMOTE_BASE} && pm2 restart signaling` + ); + if (restartResult.stdout) console.log(restartResult.stdout); + if (restartResult.stderr) console.log('STDERR:', restartResult.stderr.slice(0, 300)); + + await new Promise(r => setTimeout(r, 2000)); + + console.log('\nChecking PM2 status...'); + const listResult = await ssh.execCommand('pm2 list'); + const listOut = listResult.stdout || ''; + console.log(listOut.length > 500 ? listOut.slice(-500) : listOut); + + console.log('\nChecking signaling logs (last 10 lines)...'); + const logsResult = await ssh.execCommand('pm2 logs signaling --lines 10 --nostream'); + const logsOut = logsResult.stdout || ''; + console.log(logsOut.length > 500 ? logsOut.slice(-500) : logsOut); + + ssh.dispose(); + console.log('\nDeployment complete!'); +} + +deploy().catch(err => { + console.error('Deployment failed:', err.message); + process.exit(1); +}); diff --git a/docs/toolsapi/scripts/fix_v12_sql.py b/docs/toolsapi/scripts/fix_v12_sql.py deleted file mode 100644 index a7d8b1e6..00000000 --- a/docs/toolsapi/scripts/fix_v12_sql.py +++ /dev/null @@ -1,24 +0,0 @@ -"""Fix remaining SQL - feed_weight data + admin menus""" -import paramiko - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect('123.207.67.197', username='root', password='520Kiss123') - -def run_sql(sql, name=''): - cmd = f"mysql -u tools -p'tools' --default-character-set=utf8mb4 tools -e \"{sql}\"" - stdin, stdout, stderr = ssh.exec_command(cmd) - err = stderr.read().decode().strip() - exit_code = stdout.channel.recv_exit_status() - status = 'OK' if exit_code == 0 else 'FAIL' - print(f'[{status}] {name}' + (f' - {err[:200]}' if err else '')) - return exit_code == 0 - -run_sql("INSERT IGNORE INTO tool_feed_weight_config (feed_type,feed_name,feed_icon,weight,display_weight,push_limit,is_enabled,update_time) VALUES ('poetry','古诗词','📜',60,48,0,1,UNIX_TIMESTAMP()),('wisdom','名言金句','💡',55,44,0,1,UNIX_TIMESTAMP()),('story','故事','📚',50,40,0,1,UNIX_TIMESTAMP()),('hitokoto','一言','💬',70,56,0,1,UNIX_TIMESTAMP()),('riddle','谜语','🧩',40,32,0,1,UNIX_TIMESTAMP()),('efs','歇后语','🎭',35,28,0,1,UNIX_TIMESTAMP()),('brainteaser','脑筋急转弯','🧠',40,32,0,1,UNIX_TIMESTAMP()),('saying','俗语','🗣️',30,24,0,1,UNIX_TIMESTAMP()),('lyric','歌词','🎵',55,44,0,1,UNIX_TIMESTAMP()),('why','十万个为什么','❓',35,28,0,1,UNIX_TIMESTAMP()),('composition','作文','📝',30,24,0,1,UNIX_TIMESTAMP()),('couplet','对联','🧧',25,20,0,1,UNIX_TIMESTAMP()),('cs','常识','📖',30,24,0,1,UNIX_TIMESTAMP()),('drug','中药','🌿',15,12,0,1,UNIX_TIMESTAMP()),('herbal','草药','🌱',15,12,0,1,UNIX_TIMESTAMP()),('food','美食','🍜',20,16,0,1,UNIX_TIMESTAMP()),('wine','美酒','🍷',10,8,0,1,UNIX_TIMESTAMP()),('article','文章','📰',60,48,0,1,UNIX_TIMESTAMP())", 'feed_weight data') - -run_sql("DESCRIBE tool_auth_rule", 'check auth_rule schema') - -run_sql("INSERT IGNORE INTO tool_auth_rule (id,type,pid,name,title,icon,ismenu,weigh,status) VALUES (200,'file',0,'feed_weight','推荐权重','fa fa-balance-scale',1,0,'normal'),(201,'file',200,'feed_weight/index','查看','',0,0,'normal'),(202,'file',200,'feed_weight/edit','编辑','',0,0,'normal'),(203,'file',200,'feed_weight/reset_push','重置推送','',0,0,'normal'),(204,'file',200,'feed_weight/reset_defaults','恢复默认','',0,0,'normal'),(210,'file',0,'daily_task','每日任务','fa fa-tasks',1,0,'normal'),(211,'file',210,'daily_task/index','查看','',0,0,'normal'),(212,'file',210,'daily_task/add','添加','',0,0,'normal'),(213,'file',210,'daily_task/edit','编辑','',0,0,'normal'),(214,'file',210,'daily_task/del','删除','',0,0,'normal'),(220,'file',0,'badge','勋章管理','fa fa-shield',1,0,'normal'),(221,'file',220,'badge/index','查看','',0,0,'normal'),(222,'file',220,'badge/add','添加','',0,0,'normal'),(223,'file',220,'badge/edit','编辑','',0,0,'normal'),(224,'file',220,'badge/del','删除','',0,0,'normal'),(230,'file',0,'user/user_badge','用户勋章','fa fa-id-badge',1,0,'normal'),(231,'file',230,'user/user_badge/index','查看','',0,0,'normal'),(240,'file',0,'user/user_task','用户任务','fa fa-list-check',1,0,'normal'),(241,'file',240,'user/user_task/index','查看','',0,0,'normal')", 'admin menus') - -ssh.close() -print('\nAll done!') diff --git a/docs/toolsapi/scripts/package-lock.json b/docs/toolsapi/scripts/package-lock.json new file mode 100644 index 00000000..f2ae795e --- /dev/null +++ b/docs/toolsapi/scripts/package-lock.json @@ -0,0 +1,178 @@ +{ + "name": "scripts", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "node-ssh": "^13.2.1", + "ws": "^8.20.1" + } + }, + "node_modules/asn1": { + "version": "0.2.6", + "resolved": "https://repo.huaweicloud.com/repository/npm/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/buildcheck": { + "version": "0.0.7", + "resolved": "https://repo.huaweicloud.com/repository/npm/buildcheck/-/buildcheck-0.0.7.tgz", + "integrity": "sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==", + "optional": true, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/cpu-features": { + "version": "0.0.10", + "resolved": "https://repo.huaweicloud.com/repository/npm/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "buildcheck": "~0.0.6", + "nan": "^2.19.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nan": { + "version": "2.27.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/nan/-/nan-2.27.0.tgz", + "integrity": "sha512-hC+0LidcL3XE4rp1C4H54KujgXKzbfyTngZTwBByQxsOxCEKZT0MPQ4hOKUH2jU1OYstqdDH4onyHPDzcV0XdQ==", + "optional": true + }, + "node_modules/node-ssh": { + "version": "13.2.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/node-ssh/-/node-ssh-13.2.1.tgz", + "integrity": "sha512-rfl4GWMygQfzlExPkQ2LWyya5n2jOBm5vhEnup+4mdw7tQhNpJWbP5ldr09Jfj93k5SfY5lxcn8od5qrQ/6mBg==", + "dependencies": { + "is-stream": "^2.0.0", + "make-dir": "^3.1.0", + "sb-promise-queue": "^2.1.0", + "sb-scandir": "^3.1.0", + "shell-escape": "^0.2.0", + "ssh2": "^1.14.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/sb-promise-queue": { + "version": "2.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/sb-promise-queue/-/sb-promise-queue-2.1.1.tgz", + "integrity": "sha512-qXfdcJQMxMljxmPprn4Q4hl3pJmoljSCzUvvEBa9Kscewnv56n0KqrO6yWSrGLOL9E021wcGdPa39CHGKA6G0w==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/sb-scandir": { + "version": "3.1.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/sb-scandir/-/sb-scandir-3.1.1.tgz", + "integrity": "sha512-Q5xiQMtoragW9z8YsVYTAZcew+cRzdVBefPbb9theaIKw6cBo34WonP9qOCTKgyAmn/Ch5gmtAxT/krUgMILpA==", + "dependencies": { + "sb-promise-queue": "^2.1.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/shell-escape": { + "version": "0.2.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/shell-escape/-/shell-escape-0.2.0.tgz", + "integrity": "sha512-uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw==" + }, + "node_modules/ssh2": { + "version": "1.17.0", + "resolved": "https://repo.huaweicloud.com/repository/npm/ssh2/-/ssh2-1.17.0.tgz", + "integrity": "sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==", + "hasInstallScript": true, + "dependencies": { + "asn1": "^0.2.6", + "bcrypt-pbkdf": "^1.0.2" + }, + "engines": { + "node": ">=10.16.0" + }, + "optionalDependencies": { + "cpu-features": "~0.0.10", + "nan": "^2.23.0" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://repo.huaweicloud.com/repository/npm/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" + }, + "node_modules/ws": { + "version": "8.20.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/ws/-/ws-8.20.1.tgz", + "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + } + } +} diff --git a/docs/toolsapi/scripts/package.json b/docs/toolsapi/scripts/package.json new file mode 100644 index 00000000..6b00199d --- /dev/null +++ b/docs/toolsapi/scripts/package.json @@ -0,0 +1,6 @@ +{ + "dependencies": { + "node-ssh": "^13.2.1", + "ws": "^8.20.1" + } +} diff --git a/docs/toolsapi/scripts/test_canvas_sync.py b/docs/toolsapi/scripts/test_canvas_sync.py deleted file mode 100644 index af88f44d..00000000 --- a/docs/toolsapi/scripts/test_canvas_sync.py +++ /dev/null @@ -1,251 +0,0 @@ -""" -闲言APP - 画布同步测试脚本 -创建时间: 2026-05-19 -作用: 测试画布笔画同步/光标/快照/加入离开 -每接口3-5个测试场景 -""" -import asyncio -import json -import time - -WS_URL = 'wss://tools.wktyl.com:9443' - -async def ws_connect(): - import websockets - return await websockets.connect(WS_URL, ping_interval=None) - -async def register_device(ws, device_id, alias='TestDevice', fingerprint=None): - msg = { - 'type': 'register', - 'data': {'deviceId': device_id, 'alias': alias, 'deviceType': 'mobile', 'protocol': 'xianyan-v1'} - } - if fingerprint: - msg['data']['fingerprint'] = fingerprint - await ws.send(json.dumps(msg)) - for _ in range(10): - response = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if response.get('type') == 'registered': - return response - return response - -async def test_canvas_join_and_stroke(): - """场景1: 加入画布+笔画同步""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_canvas_a_{int(time.time())}' - fp_b = f'fp_canvas_b_{int(time.time())}' - await register_device(ws_a, f'dev-canvas-a-{int(time.time())}', alias='DrawerA', fingerprint=fp_a) - await register_device(ws_b, f'dev-canvas-b-{int(time.time())}', alias='DrawerB', fingerprint=fp_b) - - canvas_id = f'canvas-test-{int(time.time())}' - - await ws_a.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(3): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_b.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_a.send(json.dumps({ - 'type': 'canvas-stroke', - 'payload': { - 'canvasId': canvas_id, - 'stroke': {'strokeId': 's1', 'points': [[10, 20], [30, 40]], 'color': '#FF0000', 'width': 2.0, 'tool': 'pen'} - } - })) - - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'canvas-stroke': - received = True - assert msg['payload']['stroke']['strokeId'] == 's1', f'Wrong stroke: {msg}' - break - - assert received, 'canvas-stroke not received by peer' - print(f' [PASS] test_canvas_join_and_stroke') - await ws_a.close() - await ws_b.close() - -async def test_canvas_cursor(): - """场景2: 远程光标同步""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_cursor_a_{int(time.time())}' - fp_b = f'fp_cursor_b_{int(time.time())}' - await register_device(ws_a, f'dev-cursor-a-{int(time.time())}', alias='CursorA', fingerprint=fp_a) - await register_device(ws_b, f'dev-cursor-b-{int(time.time())}', alias='CursorB', fingerprint=fp_b) - - canvas_id = f'canvas-cursor-{int(time.time())}' - await ws_a.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(3): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_b.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_a.send(json.dumps({ - 'type': 'canvas-cursor', - 'payload': {'canvasId': canvas_id, 'x': 100, 'y': 200} - })) - - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'canvas-cursor': - received = True - break - - assert received, 'canvas-cursor not received' - print(f' [PASS] test_canvas_cursor') - await ws_a.close() - await ws_b.close() - -async def test_canvas_snapshot(): - """场景3: 画布快照请求""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_snap_a_{int(time.time())}' - fp_b = f'fp_snap_b_{int(time.time())}' - await register_device(ws_a, f'dev-snap-a-{int(time.time())}', alias='SnapA', fingerprint=fp_a) - await register_device(ws_b, f'dev-snap-b-{int(time.time())}', alias='SnapB', fingerprint=fp_b) - - canvas_id = f'canvas-snap-{int(time.time())}' - await ws_a.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(3): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_b.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_a.send(json.dumps({ - 'type': 'canvas-snapshot', - 'payload': {'canvasId': canvas_id, 'action': 'request'} - })) - - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'canvas-snapshot' and msg.get('payload', {}).get('action') == 'request': - received = True - break - - assert received, 'canvas-snapshot request not received' - print(f' [PASS] test_canvas_snapshot') - await ws_a.close() - await ws_b.close() - -async def test_canvas_leave(): - """场景4: 离开画布通知""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_leave_a_{int(time.time())}' - fp_b = f'fp_leave_b_{int(time.time())}' - await register_device(ws_a, f'dev-leave-a-{int(time.time())}', alias='LeaveA', fingerprint=fp_a) - await register_device(ws_b, f'dev-leave-b-{int(time.time())}', alias='LeaveB', fingerprint=fp_b) - - canvas_id = f'canvas-leave-{int(time.time())}' - await ws_a.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(3): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_b.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_a.send(json.dumps({'type': 'canvas-leave', 'payload': {'canvasId': canvas_id}})) - - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'canvas-leave': - received = True - break - - assert received, 'canvas-leave not received' - print(f' [PASS] test_canvas_leave') - await ws_a.close() - await ws_b.close() - -async def test_canvas_rapid_strokes(): - """场景5: 快速连续笔画""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_rapid_a_{int(time.time())}' - fp_b = f'fp_rapid_b_{int(time.time())}' - await register_device(ws_a, f'dev-rapid-a-{int(time.time())}', alias='RapidA', fingerprint=fp_a) - await register_device(ws_b, f'dev-rapid-b-{int(time.time())}', alias='RapidB', fingerprint=fp_b) - - canvas_id = f'canvas-rapid-{int(time.time())}' - await ws_a.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(3): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - await ws_b.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'canvas-join': - break - - stroke_count = 10 - for i in range(stroke_count): - await ws_a.send(json.dumps({ - 'type': 'canvas-stroke', - 'payload': { - 'canvasId': canvas_id, - 'stroke': {'strokeId': f'rapid-{i}', 'points': [[i * 10, i * 20]], 'color': '#000000', 'width': 1.0, 'tool': 'pen'} - } - })) - - received_count = 0 - try: - for _ in range(stroke_count + 5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=5)) - if msg.get('type') == 'canvas-stroke': - received_count += 1 - except asyncio.TimeoutError: - pass - - assert received_count >= stroke_count * 0.8, f'Too many strokes lost: {received_count}/{stroke_count}' - print(f' [PASS] test_canvas_rapid_strokes: {received_count}/{stroke_count} received') - await ws_a.close() - await ws_b.close() - -async def run_all_tests(): - print('\n===== 画布同步测试 =====') - await test_canvas_join_and_stroke() - await test_canvas_cursor() - await test_canvas_snapshot() - await test_canvas_leave() - await test_canvas_rapid_strokes() - print('\n===== 全部测试通过! =====') - -if __name__ == '__main__': - asyncio.run(run_all_tests()) diff --git a/docs/toolsapi/scripts/test_cross_network_pairing.py b/docs/toolsapi/scripts/test_cross_network_pairing.py deleted file mode 100644 index 0c7c0f35..00000000 --- a/docs/toolsapi/scripts/test_cross_network_pairing.py +++ /dev/null @@ -1,347 +0,0 @@ -""" -闲言APP - 跨网配对全流程测试脚本 -创建时间: 2026-05-19 -作用: 测试配对码/雷达扫描/QR配对信令 -每接口3-5个测试场景 -""" -import asyncio -import json -import time -import sys -import random -import string - -WS_URL = 'wss://tools.wktyl.com:9443' - -def generate_pairing_code_chars(): - return '23456789ABCDEFGHJKMNPQRSTUVWXYZ' - -async def ws_connect(): - import websockets - return await websockets.connect(WS_URL, ping_interval=None) - -async def register_device(ws, device_id, alias='TestDevice', fingerprint=None, user_id=None, ip_city=None, ip_range=None): - msg = { - 'type': 'register', - 'data': { - 'deviceId': device_id, - 'alias': alias, - 'deviceType': 'mobile', - 'protocol': 'xianyan-v1' - } - } - if fingerprint: - msg['data']['fingerprint'] = fingerprint - if user_id: - msg['data']['userId'] = user_id - if ip_city: - msg['data']['ipCity'] = ip_city - if ip_range: - msg['data']['ipRange'] = ip_range - await ws.send(json.dumps(msg)) - for _ in range(10): - response = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if response.get('type') == 'registered': - return response - return response - -async def send_heartbeat(ws): - await ws.send(json.dumps({'type': 'heartbeat', 'data': {'timestamp': int(time.time() * 1000)}})) - response = await asyncio.wait_for(ws.recv(), timeout=10) - return json.loads(response) - -# ===== 配对码测试 ===== - -async def test_pairing_code_create_normal(): - """场景1: 正常创建配对码""" - ws = await ws_connect() - reg = await register_device(ws, f'dev-pair-create-{int(time.time())}', alias='DeviceA', fingerprint=f'fp_create_{int(time.time())}') - assert reg.get('type') == 'registered', f'Register failed: {reg}' - - await ws.send(json.dumps({ - 'type': 'pairing-code-create', - 'data': {'alias': 'DeviceA', 'deviceType': 'mobile'} - })) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'pairing-code-created': - response = msg - break - - assert response is not None, f'No pairing-code-created response received' - assert 'pairingCode' in response, f'Missing pairingCode in response: {response}' - assert len(response['pairingCode']) == 6, f'Pairing code length != 6: {response["pairingCode"]}' - assert 'expiresAt' in response, f'Missing expiresAt in response' - valid_chars = set(generate_pairing_code_chars()) - for c in response['pairingCode']: - assert c in valid_chars, f'Invalid char in pairing code: {c}' - print(f' [PASS] test_pairing_code_create_normal: code={response["pairingCode"]}') - await ws.close() - -async def test_pairing_code_create_duplicate(): - """场景2: 重复创建覆盖旧码""" - ws = await ws_connect() - reg = await register_device(ws, f'dev-pair-dup-{int(time.time())}', fingerprint=f'fp_dup_{int(time.time())}') - - await ws.send(json.dumps({'type': 'pairing-code-create', 'data': {'alias': 'DeviceDup'}})) - code1 = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'pairing-code-created': - code1 = msg['pairingCode'] - break - - await ws.send(json.dumps({'type': 'pairing-code-create', 'data': {'alias': 'DeviceDup'}})) - code2 = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'pairing-code-created': - code2 = msg['pairingCode'] - break - - assert code1 is not None and code2 is not None, 'Failed to create codes' - assert code1 != code2, f'Duplicate create should generate different codes: {code1} vs {code2}' - print(f' [PASS] test_pairing_code_create_duplicate: {code1} -> {code2}') - await ws.close() - -async def test_pairing_code_join_normal(): - """场景3: 正常配对码匹配""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - reg_a = await register_device(ws_a, f'dev-pair-join-a-{int(time.time())}', alias='DeviceA', fingerprint=f'fp_join_a_{int(time.time())}') - reg_b = await register_device(ws_b, f'dev-pair-join-b-{int(time.time())}', alias='DeviceB', fingerprint=f'fp_join_b_{int(time.time())}') - - await ws_a.send(json.dumps({'type': 'pairing-code-create', 'data': {'alias': 'DeviceA'}})) - code = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'pairing-code-created': - code = msg['pairingCode'] - break - - assert code is not None, 'Failed to create pairing code' - - await ws_b.send(json.dumps({'type': 'pairing-code-join', 'data': {'pairingCode': code}})) - - matched_b = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'pairing-matched': - matched_b = msg - break - - matched_a = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'pairing-matched': - matched_a = msg - break - - assert matched_b is not None and matched_b.get('success') == True, f'DeviceB match failed: {matched_b}' - assert matched_a is not None and matched_a.get('success') == True, f'DeviceA match failed: {matched_a}' - assert 'peer' in matched_b, f'Missing peer info in matched response' - print(f' [PASS] test_pairing_code_join_normal: code={code}') - await ws_a.close() - await ws_b.close() - -async def test_pairing_code_join_wrong_code(): - """场景4: 错误配对码""" - ws = await ws_connect() - reg = await register_device(ws, f'dev-pair-wrong-{int(time.time())}', fingerprint=f'fp_wrong_{int(time.time())}') - - await ws.send(json.dumps({'type': 'pairing-code-join', 'data': {'pairingCode': 'ZZZZZZ'}})) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'pairing-matched': - response = msg - break - - assert response is not None, 'No response for wrong code' - assert response.get('success') == False, f'Wrong code should fail: {response}' - print(f' [PASS] test_pairing_code_join_wrong_code') - await ws.close() - -async def test_pairing_code_join_self(): - """场景5: 使用自己创建的配对码""" - ws = await ws_connect() - reg = await register_device(ws, f'dev-pair-self-{int(time.time())}', fingerprint=f'fp_self_{int(time.time())}') - - await ws.send(json.dumps({'type': 'pairing-code-create', 'data': {'alias': 'SelfDevice'}})) - code = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'pairing-code-created': - code = msg['pairingCode'] - break - - await ws.send(json.dumps({'type': 'pairing-code-join', 'data': {'pairingCode': code}})) - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'pairing-matched': - response = msg - break - - assert response is not None and response.get('success') == False, f'Self-join should fail: {response}' - print(f' [PASS] test_pairing_code_join_self') - await ws.close() - -# ===== 雷达扫描测试 ===== - -async def test_radar_broadcast_normal(): - """场景1: 正常雷达广播""" - ws = await ws_connect() - reg = await register_device(ws, f'dev-radar-bc-{int(time.time())}', alias='RadarDevice', fingerprint=f'fp_radar_{int(time.time())}', ip_city='北京', ip_range='110.123.45.0/24') - - await ws.send(json.dumps({ - 'type': 'radar-broadcast', - 'data': {'alias': 'RadarDevice', 'ipCity': '北京', 'ipRange': '110.123.45.0/24'} - })) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'radar-broadcast': - response = msg - break - - assert response is not None and response.get('success') == True, f'Radar broadcast failed: {response}' - print(f' [PASS] test_radar_broadcast_normal') - await ws.close() - -async def test_radar_scan_same_network(): - """场景2: 同IP段扫描""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - await register_device(ws_a, f'dev-radar-a-{int(time.time())}', alias='RadarA', fingerprint=f'fp_radar_a_{int(time.time())}', ip_city='北京', ip_range='110.123.45.0/24') - await register_device(ws_b, f'dev-radar-b-{int(time.time())}', alias='RadarB', fingerprint=f'fp_radar_b_{int(time.time())}', ip_city='北京', ip_range='110.123.45.0/24') - - await ws_a.send(json.dumps({'type': 'radar-broadcast', 'data': {'alias': 'RadarA', 'ipCity': '北京', 'ipRange': '110.123.45.0/24'}})) - await ws_b.send(json.dumps({'type': 'radar-broadcast', 'data': {'alias': 'RadarB', 'ipCity': '北京', 'ipRange': '110.123.45.0/24'}})) - - for _ in range(3): - await asyncio.wait_for(ws_a.recv(), timeout=10) - await asyncio.wait_for(ws_b.recv(), timeout=10) - - await ws_a.send(json.dumps({'type': 'radar-scan', 'data': {'ipCity': '北京', 'ipRange': '110.123.45.0/24'}})) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'radar-devices': - response = msg - break - - assert response is not None, 'No radar-devices response' - devices = response.get('devices', []) - assert len(devices) > 0, f'No devices found in same network scan' - same_net = [d for d in devices if d.get('matchType') == 'same-network'] - assert len(same_net) > 0, f'No same-network devices found: {devices}' - print(f' [PASS] test_radar_scan_same_network: found {len(same_net)} same-network device(s)') - await ws_a.close() - await ws_b.close() - -async def test_radar_scan_no_match(): - """场景3: 无匹配设备""" - ws = await ws_connect() - await register_device(ws, f'dev-radar-nomatch-{int(time.time())}', alias='LonelyDevice', fingerprint=f'fp_lonely_{int(time.time())}') - - await ws.send(json.dumps({'type': 'radar-scan', 'data': {'ipCity': '火星', 'ipRange': '0.0.0.0/24'}})) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'radar-devices': - response = msg - break - - assert response is not None, 'No radar-devices response' - devices = response.get('devices', []) - same_network = [d for d in devices if d.get('matchType') == 'same-network'] - same_city = [d for d in devices if d.get('matchType') == 'same-city'] - assert len(same_network) == 0 and len(same_city) == 0, f'Should find no same-network/city devices: {response}' - print(f' [PASS] test_radar_scan_no_match (found {len(devices)} remote devices, 0 local)') - await ws.close() - -async def test_radar_broadcast_update(): - """场景4: 重复广播更新""" - ws = await ws_connect() - await register_device(ws, f'dev-radar-update-{int(time.time())}', alias='UpdateDevice', fingerprint=f'fp_update_{int(time.time())}') - - await ws.send(json.dumps({'type': 'radar-broadcast', 'data': {'alias': 'OldName', 'ipCity': '上海'}})) - for _ in range(3): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'radar-broadcast': - break - - await ws.send(json.dumps({'type': 'radar-broadcast', 'data': {'alias': 'NewName', 'ipCity': '北京'}})) - response = None - for _ in range(3): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if msg.get('type') == 'radar-broadcast': - response = msg - break - - assert response is not None and response.get('success') == True, f'Update broadcast failed: {response}' - print(f' [PASS] test_radar_broadcast_update') - await ws.close() - -async def test_radar_scan_my_device(): - """场景5: 同userId设备发现""" - ws_a = await ws_connect() - ws_b = await ws_connect() - uid = f'shared-user-{int(time.time())}' - - await register_device(ws_a, f'dev-radar-ua-{int(time.time())}', alias='MyPhone', fingerprint=f'fp_ua_{int(time.time())}', user_id=uid, ip_city='北京', ip_range='110.123.45.0/24') - await register_device(ws_b, f'dev-radar-ub-{int(time.time())}', alias='MyPad', fingerprint=f'fp_ub_{int(time.time())}', user_id=uid, ip_city='上海', ip_range='114.114.0.0/24') - - await ws_a.send(json.dumps({'type': 'radar-broadcast', 'data': {'alias': 'MyPhone', 'ipCity': '北京', 'ipRange': '110.123.45.0/24'}})) - await ws_b.send(json.dumps({'type': 'radar-broadcast', 'data': {'alias': 'MyPad', 'ipCity': '上海', 'ipRange': '114.114.0.0/24'}})) - - for _ in range(3): - await asyncio.wait_for(ws_a.recv(), timeout=10) - await asyncio.wait_for(ws_b.recv(), timeout=10) - - await ws_a.send(json.dumps({'type': 'radar-scan', 'data': {'ipCity': '北京', 'ipRange': '110.123.45.0/24'}})) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'radar-devices': - response = msg - break - - assert response is not None, 'No radar-devices response' - my_devices = [d for d in response.get('devices', []) if d.get('matchType') == 'my-device'] - assert len(my_devices) > 0, f'Should find my-device: {response}' - print(f' [PASS] test_radar_scan_my_device: found {len(my_devices)} my-device(s)') - await ws_a.close() - await ws_b.close() - -# ===== 主函数 ===== - -async def run_all_tests(): - print('\n===== 配对码测试 =====') - await test_pairing_code_create_normal() - await test_pairing_code_create_duplicate() - await test_pairing_code_join_normal() - await test_pairing_code_join_wrong_code() - await test_pairing_code_join_self() - - print('\n===== 雷达扫描测试 =====') - await test_radar_broadcast_normal() - await test_radar_scan_same_network() - await test_radar_scan_no_match() - await test_radar_broadcast_update() - await test_radar_scan_my_device() - - print('\n===== 全部测试通过! =====') - -if __name__ == '__main__': - asyncio.run(run_all_tests()) diff --git a/docs/toolsapi/scripts/test_daily_task.py b/docs/toolsapi/scripts/test_daily_task.py deleted file mode 100644 index cac7d21b..00000000 --- a/docs/toolsapi/scripts/test_daily_task.py +++ /dev/null @@ -1,199 +0,0 @@ -import requests -import json -import base64 -import hashlib -import hmac -import time -import os -import sys - -BASE = 'https://tools.wktyl.com' -SECRET = 'Xy7kP9mL2qR4wS8v' - -TEST_USERNAME = f'task_test_{int(time.time())}' -TEST_PASSWORD = '123456' -TEST_EMAIL = f'task_test_{int(time.time())}@test.com' - -PASSED = 0 -FAILED = 0 -token = None -user_id = None - -def make_receipt(action, payload_str): - data = { - 'action': action, - 'payload': hashlib.sha256(payload_str.encode()).hexdigest()[:16], - 'ts': int(time.time()), - 'nonce': os.urandom(4).hex() - } - receipt = base64.b64encode(json.dumps(data, ensure_ascii=False).encode()).decode() - sig = hmac.new(SECRET.encode(), receipt.encode(), hashlib.sha256).hexdigest() - return {'receipt': receipt, 'sig': sig} - -def test(name, response, expected_code=1, check_func=None): - global PASSED, FAILED - try: - data = response.json() - except Exception as e: - print(f' ❌ {name}: Response parse error: {e}') - FAILED += 1 - return None - if data.get('code') == expected_code: - if check_func and not check_func(data): - print(f' ❌ {name}: Check failed. Response: {json.dumps(data, ensure_ascii=False)[:200]}') - FAILED += 1 - return data - print(f' ✅ {name}') - PASSED += 1 - else: - print(f' ❌ {name}: Expected code={expected_code}, got code={data.get("code")}, msg={data.get("msg")}') - FAILED += 1 - return data - -print('=' * 60) -print('每日任务系统全流程测试') -print(f'测试账号: {TEST_USERNAME}') -print(f'测试时间: {time.strftime("%Y-%m-%d %H:%M:%S")}') -print('=' * 60) - -# ========== 1. 注册 ========== -print('\n--- 1. 注册测试用户 ---') -receipt_data = make_receipt('register', TEST_EMAIL) -r = requests.post(f'{BASE}/api/user_security/register', data={ - 'username': TEST_USERNAME, - 'password': TEST_PASSWORD, - 'email': TEST_EMAIL, - 'receipt': receipt_data['receipt'], - 'sig': receipt_data['sig'], -}) -data = test('register', r) -if data and data.get('code') == 1: - token = data['data'].get('token', '') - user_id = data['data'].get('userinfo', {}).get('id', '') - print(f' 用户ID: {user_id}') - -if not token: - print('❌ 注册失败，终止测试') - sys.exit(1) - -headers = {'token': token} - -# ========== 2. 登录获取token ========== -print('\n--- 2. 登录获取token ---') -receipt_data = make_receipt('login', TEST_USERNAME) -r = requests.post(f'{BASE}/api/user_security/login', data={ - 'account': TEST_USERNAME, - 'password': TEST_PASSWORD, - 'receipt': receipt_data['receipt'], - 'sig': receipt_data['sig'], -}) -data = test('login', r) -if data and data.get('code') == 1: - token = data['data'].get('token', '') - user_id = data['data'].get('userinfo', {}).get('id', '') - headers = {'token': token} - print(f' Token: {token[:20]}...') - -# ========== 3. 获取今日任务列表 ========== -print('\n--- 3. 获取今日任务列表 ---') -r = requests.get(f'{BASE}/api/task/today', headers=headers) -data = test('today tasks exist', r, check_func=lambda d: len(d.get('data', {}).get('tasks', [])) > 0) -if data and data.get('code') == 1: - tasks = data['data']['tasks'] - print(f' 今日任务数: {len(tasks)}') - for t in tasks: - print(f' {t.get("icon", "📋")} {t.get("name")} | id={t.get("id")} progress={t.get("progress", 0)}/{t.get("target", 1)} claimed={t.get("claimed", False)}') - -# ========== 4. 上报签到任务进度 ========== -print('\n--- 4. 上报签到任务进度 ---') -signin_task = None -if data and data.get('code') == 1: - for t in tasks: - if '签到' in t.get('name', '') or t.get('id') == 1: - signin_task = t - break - -task_id_to_report = signin_task.get('id', 1) if signin_task else 1 -task_name = signin_task.get('name', '签到') if signin_task else '签到' -r = requests.post(f'{BASE}/api/task/reportProgress', headers=headers, data={ - 'task_id': task_id_to_report, - 'increment': 1, -}) -data = test(f'reportProgress (task={task_name}, id={task_id_to_report})', r) -if data and data.get('code') == 1: - progress = data.get('data', {}) - print(f' 上报结果: progress={progress.get("progress")}, target={progress.get("target")}, completed={progress.get("completed")}') - -# ========== 5. 再次获取任务列表 - 验证进度更新 ========== -print('\n--- 5. 验证进度已更新 ---') -r = requests.get(f'{BASE}/api/task/today', headers=headers) -data = test('progress updated', r, check_func=lambda d: any( - t.get('id') == task_id_to_report and t.get('progress', 0) > 0 - for t in d.get('data', {}).get('tasks', []) -)) -if data and data.get('code') == 1: - for t in data['data']['tasks']: - if t.get('id') == task_id_to_report: - print(f' {t.get("icon", "📋")} {t.get("name")} | progress={t.get("progress")}/{t.get("target")} completed={t.get("completed")} claimed={t.get("claimed", False)}') - -# ========== 6. 领取已完成任务奖励 ========== -print('\n--- 6. 领取任务奖励 ---') -r = requests.post(f'{BASE}/api/task/claim', headers=headers, data={ - 'task_id': task_id_to_report, -}) -data = test(f'claim reward (task_id={task_id_to_report})', r) -if data and data.get('code') == 1: - reward = data.get('data', {}) - print(f' 奖励: exp={reward.get("exp_reward")}, coin={reward.get("coin_reward")}') - -# ========== 7. 再次获取任务列表 - 验证已领取 ========== -print('\n--- 7. 验证奖励已领取 ---') -r = requests.get(f'{BASE}/api/task/today', headers=headers) -data = test('claimed status', r, check_func=lambda d: any( - t.get('id') == task_id_to_report and t.get('claimed') is True - for t in d.get('data', {}).get('tasks', []) -)) -if data and data.get('code') == 1: - for t in data['data']['tasks']: - if t.get('id') == task_id_to_report: - print(f' {t.get("icon", "📋")} {t.get("name")} | claimed={t.get("claimed")}') - -# ========== 8. 注册自定义任务 ========== -print('\n--- 8. 注册自定义任务 ---') -r = requests.post(f'{BASE}/api/task/registerCustom', headers=headers, data={ - 'name': '测试自定义', - 'icon': '🎯', - 'custom_page': 'test_page', -}) -data = test('registerCustom', r) -if data and data.get('code') == 1: - custom_task = data.get('data', {}) - print(f' 自定义任务: id={custom_task.get("id")}, name={custom_task.get("name")}') - -# ========== 9. 尝试领取完美奖励(应失败) ========== -print('\n--- 9. 尝试领取完美奖励(应失败) ---') -r = requests.post(f'{BASE}/api/task/claimPerfect', headers=headers) -data = test('claimPerfect (should fail)', r, expected_code=0) -if data and data.get('code') != 1: - print(f' 预期失败: {data.get("msg")}') - -# ========== 10. 申请账号注销 ========== -print('\n--- 10. 申请账号注销 ---') -receipt_data = make_receipt('delete_account', str(user_id)) -r = requests.post(f'{BASE}/api/user_security/requestDeletion', headers=headers, data={ - 'reason': 'test complete', - 'receipt': receipt_data['receipt'], - 'sig': receipt_data['sig'], -}) -data = test('requestDeletion', r) -if data and data.get('code') == 1: - print(f' 注销申请ID: {data["data"].get("id")}') - -# ========== 结果汇总 ========== -print('\n' + '=' * 60) -print(f'测试完成！通过: {PASSED}, 失败: {FAILED}, 总计: {PASSED + FAILED}') -print(f'测试账号 {TEST_USERNAME} 已提交注销申请') -print('=' * 60) - -if FAILED > 0: - sys.exit(1) diff --git a/docs/toolsapi/scripts/test_full_e2e.py b/docs/toolsapi/scripts/test_full_e2e.py deleted file mode 100644 index faf8b1c2..00000000 --- a/docs/toolsapi/scripts/test_full_e2e.py +++ /dev/null @@ -1,183 +0,0 @@ -""" -闲言APP - 文件传输全流程E2E测试脚本 -创建时间: 2026-05-19 -作用: 模拟两个设备从发现→配对→消息→文件→画布→屏幕共享完整流程 -""" -import asyncio -import json -import time - -WS_URL = 'wss://tools.wktyl.com:9443' - -async def ws_connect(): - import websockets - return await websockets.connect(WS_URL, ping_interval=None) - -async def register_device(ws, device_id, alias, fingerprint, user_id=None, ip_city=None, ip_range=None): - msg = { - 'type': 'register', - 'data': {'deviceId': device_id, 'alias': alias, 'deviceType': 'mobile', 'fingerprint': fingerprint, 'protocol': 'xianyan-v1'} - } - if user_id: - msg['data']['userId'] = user_id - if ip_city: - msg['data']['ipCity'] = ip_city - if ip_range: - msg['data']['ipRange'] = ip_range - await ws.send(json.dumps(msg)) - for _ in range(5): - resp = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if resp.get('type') == 'registered': - return resp - return None - -async def drain_messages(ws, count=3, timeout=5): - messages = [] - for _ in range(count): - try: - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=timeout)) - messages.append(msg) - except asyncio.TimeoutError: - break - return messages - -async def test_full_e2e(): - """全流程: 注册→配对码配对→文本消息→文件元数据→画布同步→屏幕共享""" - ts = int(time.time()) - - ws_a = await ws_connect() - ws_b = await ws_connect() - - print(' [1/7] 注册设备...') - reg_a = await register_device(ws_a, f'e2e-a-{ts}', 'iPhone 16 Pro', f'fp_e2e_a_{ts}', user_id=f'user-e2e-{ts}', ip_city='北京', ip_range='110.123.45.0/24') - reg_b = await register_device(ws_b, f'e2e-b-{ts}', 'MacBook Pro', f'fp_e2e_b_{ts}', user_id=f'user-e2e-{ts}', ip_city='北京', ip_range='110.123.45.0/24') - assert reg_a is not None and reg_b is not None, 'Registration failed' - print(' [PASS] 设备注册成功') - - print(' [2/7] 配对码配对...') - await ws_a.send(json.dumps({'type': 'pairing-code-create', 'data': {'alias': 'iPhone 16 Pro'}})) - code = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'pairing-code-created': - code = msg['pairingCode'] - break - assert code is not None, 'Failed to create pairing code' - - await ws_b.send(json.dumps({'type': 'pairing-code-join', 'data': {'pairingCode': code}})) - matched = False - for _ in range(5): - msg_b = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg_b.get('type') == 'pairing-matched' and msg_b.get('success'): - matched = True - break - for _ in range(5): - msg_a = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg_a.get('type') == 'pairing-matched' and msg_a.get('success'): - break - assert matched, 'Pairing code match failed' - print(f' [PASS] 配对码配对成功: {code}') - - print(' [3/7] 文本消息...') - await ws_a.send(json.dumps({ - 'type': 'textMessage', - 'to': f'fp_e2e_b_{ts}', - 'message': {'text': 'Hello from iPhone!'}, - 'timestamp': int(time.time() * 1000) - })) - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'textMessage': - received = True - assert msg.get('from') == f'fp_e2e_a_{ts}', f'Wrong from: {msg}' - break - assert received, 'Text message not received' - print(' [PASS] 文本消息收发成功') - - print(' [4/7] 文件元数据...') - await ws_a.send(json.dumps({ - 'type': 'fileMeta', - 'to': f'fp_e2e_b_{ts}', - 'file': {'fileName': 'photo.jpg', 'fileSize': 1024000, 'mimeType': 'image/jpeg'}, - 'timestamp': int(time.time() * 1000) - })) - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'fileMeta': - received = True - break - assert received, 'File meta not received' - print(' [PASS] 文件元数据传输成功') - - print(' [5/7] 画布同步...') - canvas_id = f'e2e-canvas-{ts}' - await ws_a.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - await drain_messages(ws_a, 3) - await ws_b.send(json.dumps({'type': 'canvas-join', 'payload': {'canvasId': canvas_id}})) - await drain_messages(ws_a, 3) - await drain_messages(ws_b, 3) - - await ws_a.send(json.dumps({ - 'type': 'canvas-stroke', - 'payload': {'canvasId': canvas_id, 'stroke': {'strokeId': 'e2e-s1', 'points': [[50, 60]], 'color': '#000', 'width': 2, 'tool': 'pen'}} - })) - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'canvas-stroke': - received = True - break - assert received, 'Canvas stroke not received' - print(' [PASS] 画布同步成功') - - print(' [6/7] 屏幕共享请求...') - await ws_a.send(json.dumps({ - 'type': 'screen-share-request', - 'to': f'fp_e2e_b_{ts}', - 'payload': {'direction': 'view'} - })) - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'screen-share-request': - received = True - break - assert received, 'Screen share request not received' - - await ws_b.send(json.dumps({ - 'type': 'screen-share-accept', - 'to': f'fp_e2e_a_{ts}', - 'payload': {'direction': 'view'} - })) - received = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'screen-share-accept': - received = True - break - assert received, 'Screen share accept not received' - print(' [PASS] 屏幕共享请求/接受成功') - - print(' [7/7] 心跳保活...') - await ws_a.send(json.dumps({'type': 'heartbeat', 'data': {'timestamp': int(time.time() * 1000)}})) - got_ack = False - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'heartbeat_ack': - got_ack = True - break - assert got_ack, 'Heartbeat ack not received' - print(' [PASS] 心跳保活成功') - - await ws_a.close() - await ws_b.close() - print('\n ===== 全流程E2E测试通过! =====') - -async def run_all_tests(): - print('\n===== 全流程E2E测试 =====') - await test_full_e2e() - -if __name__ == '__main__': - asyncio.run(run_all_tests()) diff --git a/docs/toolsapi/scripts/test_rank_system.py b/docs/toolsapi/scripts/test_rank_system.py deleted file mode 100644 index 305737f0..00000000 --- a/docs/toolsapi/scripts/test_rank_system.py +++ /dev/null @@ -1,162 +0,0 @@ -import requests -import json -import base64 -import hashlib -import hmac -import time -import os -import sys - -BASE = 'https://tools.wktyl.com' -SECRET = 'Xy7kP9mL2qR4wS8v' - -TEST_USERNAME = f'rank_test_{int(time.time())}' -TEST_PASSWORD = '123456' -TEST_EMAIL = f'rank_test_{int(time.time())}@test.com' - -PASSED = 0 -FAILED = 0 -token = None -user_id = None - -def make_receipt(action, payload_str): - data = { - 'action': action, - 'payload': hashlib.sha256(payload_str.encode()).hexdigest()[:16], - 'ts': int(time.time()), - 'nonce': os.urandom(4).hex() - } - receipt = base64.b64encode(json.dumps(data, ensure_ascii=False).encode()).decode() - sig = hmac.new(SECRET.encode(), receipt.encode(), hashlib.sha256).hexdigest() - return {'receipt': receipt, 'sig': sig} - -def test(name, response, expected_code=1, check_func=None): - global PASSED, FAILED - try: - data = response.json() - except Exception as e: - print(f' ❌ {name}: Response parse error: {e}') - FAILED += 1 - return None - if data.get('code') == expected_code: - if check_func and not check_func(data): - print(f' ❌ {name}: Check failed. Response: {json.dumps(data, ensure_ascii=False)[:200]}') - FAILED += 1 - return data - print(f' ✅ {name}') - PASSED += 1 - else: - print(f' ❌ {name}: Expected code={expected_code}, got code={data.get("code")}, msg={data.get("msg")}') - FAILED += 1 - return data - -print('=' * 60) -print('赛季排行榜系统全流程测试') -print(f'测试账号: {TEST_USERNAME}') -print(f'测试时间: {time.strftime("%Y-%m-%d %H:%M:%S")}') -print('=' * 60) - -# ========== 1. 注册 ========== -print('\n--- 1. 注册测试用户 ---') -receipt_data = make_receipt('register', TEST_EMAIL) -r = requests.post(f'{BASE}/api/user_security/register', data={ - 'username': TEST_USERNAME, - 'password': TEST_PASSWORD, - 'email': TEST_EMAIL, - 'receipt': receipt_data['receipt'], - 'sig': receipt_data['sig'], -}) -data = test('register', r) -if data and data.get('code') == 1: - token = data['data'].get('token', '') - user_id = data['data'].get('userinfo', {}).get('id', '') - print(f' 用户ID: {user_id}') - -if not token: - print('❌ 注册失败，终止测试') - sys.exit(1) - -headers = {'token': token} - -# ========== 2. 登录获取token ========== -print('\n--- 2. 登录获取token ---') -receipt_data = make_receipt('login', TEST_USERNAME) -r = requests.post(f'{BASE}/api/user_security/login', data={ - 'account': TEST_USERNAME, - 'password': TEST_PASSWORD, - 'receipt': receipt_data['receipt'], - 'sig': receipt_data['sig'], -}) -data = test('login', r) -if data and data.get('code') == 1: - token = data['data'].get('token', '') - user_id = data['data'].get('userinfo', {}).get('id', '') - headers = {'token': token} - print(f' Token: {token[:20]}...') - -# ========== 3. 获取赛季列表 ========== -print('\n--- 3. 获取赛季列表 ---') -r = requests.get(f'{BASE}/api/rank/seasons', headers=headers) -data = test('seasons list', r, check_func=lambda d: 'data' in d) -if data and data.get('code') == 1: - seasons = data['data'].get('seasons', data['data']) if isinstance(data['data'], dict) else data['data'] - if isinstance(seasons, list): - print(f' 赛季数量: {len(seasons)}') - for s in seasons[:5]: - print(f' 🏆 {s.get("name", "?")} | type={s.get("type", "?")} status={s.get("status", "?")}') - else: - print(f' 赛季数据: {json.dumps(data["data"], ensure_ascii=False)[:200]}') - -# ========== 4. 获取排行榜(exp类型) ========== -print('\n--- 4. 获取排行榜(exp类型) ---') -r = requests.get(f'{BASE}/api/rank/leaderboard', headers=headers, params={'type': 'exp'}) -data = test('leaderboard (exp)', r, check_func=lambda d: 'data' in d) -if data and data.get('code') == 1: - lb = data['data'].get('list', data['data'].get('leaderboard', data['data'])) - if isinstance(lb, list): - print(f' 排行榜人数: {len(lb)}') - for item in lb[:3]: - print(f' 🥇 rank={item.get("rank", "?")} user={item.get("username", item.get("nickname", "?"))} value={item.get("value", "?")}') - else: - print(f' 排行榜数据: {json.dumps(data["data"], ensure_ascii=False)[:200]}') - -# ========== 5. 获取我的排名 ========== -print('\n--- 5. 获取我的排名 ---') -r = requests.get(f'{BASE}/api/rank/myRank', headers=headers, params={'type': 'exp'}) -data = test('myRank (exp)', r, check_func=lambda d: 'data' in d) -if data and data.get('code') == 1: - my_rank = data['data'] - if isinstance(my_rank, dict): - print(f' 我的排名: rank={my_rank.get("rank", "?")} value={my_rank.get("value", "?")}') - else: - print(f' 排名数据: {json.dumps(data["data"], ensure_ascii=False)[:200]}') - -# ========== 6. 领取赛季奖励(应失败 - 无效赛季) ========== -print('\n--- 6. 领取赛季奖励(应失败 - 无效赛季ID=999) ---') -r = requests.post(f'{BASE}/api/rank/claimReward', headers=headers, data={ - 'season_id': 999, -}) -data = test('claimReward (invalid season, should fail)', r, expected_code=0) -if data and data.get('code') != 1: - print(f' 预期失败: {data.get("msg")}') - -# ========== 7. 申请账号注销 ========== -print('\n--- 7. 申请账号注销 ---') -receipt_data = make_receipt('delete_account', str(user_id)) -r = requests.post(f'{BASE}/api/user_security/requestDeletion', headers=headers, data={ - 'reason': 'test complete', - 'receipt': receipt_data['receipt'], - 'sig': receipt_data['sig'], -}) -data = test('requestDeletion', r) -if data and data.get('code') == 1: - print(f' 注销申请ID: {data["data"].get("id")}') - -# ========== 结果汇总 ========== -print('\n' + '=' * 60) -print(f'测试完成！通过: {PASSED}, 失败: {FAILED}, 总计: {PASSED + FAILED}') -print(f'测试账号 {TEST_USERNAME} 已提交注销申请') -print('=' * 60) - -if FAILED > 0: - sys.exit(1) diff --git a/docs/toolsapi/scripts/test_screen_share_signaling.py b/docs/toolsapi/scripts/test_screen_share_signaling.py deleted file mode 100644 index e40c9358..00000000 --- a/docs/toolsapi/scripts/test_screen_share_signaling.py +++ /dev/null @@ -1,214 +0,0 @@ -""" -闲言APP - 屏幕共享信令测试脚本 -创建时间: 2026-05-19 -作用: 测试屏幕共享请求/接受/拒绝/停止信令 -每接口3-5个测试场景 -""" -import asyncio -import json -import time - -WS_URL = 'wss://tools.wktyl.com:9443' - -async def ws_connect(): - import websockets - return await websockets.connect(WS_URL, ping_interval=None) - -async def register_device(ws, device_id, alias='TestDevice', fingerprint=None): - msg = { - 'type': 'register', - 'data': {'deviceId': device_id, 'alias': alias, 'deviceType': 'mobile', 'protocol': 'xianyan-v1'} - } - if fingerprint: - msg['data']['fingerprint'] = fingerprint - await ws.send(json.dumps(msg)) - for _ in range(10): - response = json.loads(await asyncio.wait_for(ws.recv(), timeout=10)) - if response.get('type') == 'registered': - return response - return response - -async def test_screen_share_request_view(): - """场景1: 请求看对方屏幕""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_ss_view_a_{int(time.time())}' - fp_b = f'fp_ss_view_b_{int(time.time())}' - reg_a = await register_device(ws_a, f'dev-ss-view-a-{int(time.time())}', alias='Viewer', fingerprint=fp_a) - reg_b = await register_device(ws_b, f'dev-ss-view-b-{int(time.time())}', alias='Sharer', fingerprint=fp_b) - - await ws_a.send(json.dumps({ - 'type': 'screen-share-request', - 'to': fp_b, - 'payload': {'direction': 'view'} - })) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'screen-share-request': - response = msg - break - - assert response is not None, 'No screen-share-request received' - assert response.get('direction') == 'view', f'Wrong direction: {response}' - assert response.get('from') == fp_a, f'Wrong from: {response}' - print(f' [PASS] test_screen_share_request_view') - await ws_a.close() - await ws_b.close() - -async def test_screen_share_request_share(): - """场景2: 请求让对方看我屏幕""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_ss_share_a_{int(time.time())}' - fp_b = f'fp_ss_share_b_{int(time.time())}' - await register_device(ws_a, f'dev-ss-share-a-{int(time.time())}', alias='Sharer', fingerprint=fp_a) - await register_device(ws_b, f'dev-ss-share-b-{int(time.time())}', alias='Viewer', fingerprint=fp_b) - - await ws_a.send(json.dumps({ - 'type': 'screen-share-request', - 'to': fp_b, - 'payload': {'direction': 'share'} - })) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'screen-share-request': - response = msg - break - - assert response is not None, 'No screen-share-request received' - assert response.get('direction') == 'share', f'Wrong direction: {response}' - print(f' [PASS] test_screen_share_request_share') - await ws_a.close() - await ws_b.close() - -async def test_screen_share_accept(): - """场景3: 正常接受屏幕共享""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_ss_acc_a_{int(time.time())}' - fp_b = f'fp_ss_acc_b_{int(time.time())}' - await register_device(ws_a, f'dev-ss-acc-a-{int(time.time())}', alias='Requester', fingerprint=fp_a) - await register_device(ws_b, f'dev-ss-acc-b-{int(time.time())}', alias='Accepter', fingerprint=fp_b) - - await ws_a.send(json.dumps({'type': 'screen-share-request', 'to': fp_b, 'payload': {'direction': 'view'}})) - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'screen-share-request': - break - - await ws_b.send(json.dumps({ - 'type': 'screen-share-accept', - 'to': fp_a, - 'payload': {'direction': 'view'} - })) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'screen-share-accept': - response = msg - break - - assert response is not None, 'No screen-share-accept received' - assert response.get('from') == fp_b, f'Wrong from: {response}' - print(f' [PASS] test_screen_share_accept') - await ws_a.close() - await ws_b.close() - -async def test_screen_share_reject(): - """场景4: 拒绝屏幕共享""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_ss_rej_a_{int(time.time())}' - fp_b = f'fp_ss_rej_b_{int(time.time())}' - await register_device(ws_a, f'dev-ss-rej-a-{int(time.time())}', alias='Requester', fingerprint=fp_a) - await register_device(ws_b, f'dev-ss-rej-b-{int(time.time())}', alias='Rejecter', fingerprint=fp_b) - - await ws_a.send(json.dumps({'type': 'screen-share-request', 'to': fp_b, 'payload': {'direction': 'view'}})) - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'screen-share-request': - break - - await ws_b.send(json.dumps({'type': 'screen-share-reject', 'to': fp_a})) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_a.recv(), timeout=10)) - if msg.get('type') == 'screen-share-reject': - response = msg - break - - assert response is not None, 'No screen-share-reject received' - print(f' [PASS] test_screen_share_reject') - await ws_a.close() - await ws_b.close() - -async def test_screen_share_stop(): - """场景5: 停止屏幕共享""" - ws_a = await ws_connect() - ws_b = await ws_connect() - - fp_a = f'fp_ss_stop_a_{int(time.time())}' - fp_b = f'fp_ss_stop_b_{int(time.time())}' - await register_device(ws_a, f'dev-ss-stop-a-{int(time.time())}', alias='Stopper', fingerprint=fp_a) - await register_device(ws_b, f'dev-ss-stop-b-{int(time.time())}', alias='Other', fingerprint=fp_b) - - await ws_a.send(json.dumps({'type': 'screen-share-stop', 'to': fp_b})) - - response = None - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws_b.recv(), timeout=10)) - if msg.get('type') == 'screen-share-stop': - response = msg - break - - assert response is not None, 'No screen-share-stop received' - print(f' [PASS] test_screen_share_stop') - await ws_a.close() - await ws_b.close() - -async def test_screen_share_request_offline(): - """场景6: 对方离线时请求""" - ws = await ws_connect() - await register_device(ws, f'dev-ss-offline-{int(time.time())}', alias='Alone', fingerprint=f'fp_offline_{int(time.time())}') - - await ws.send(json.dumps({ - 'type': 'screen-share-request', - 'to': 'nonexistent-fingerprint-xxx', - 'payload': {'direction': 'view'} - })) - - got_error = False - try: - for _ in range(5): - msg = json.loads(await asyncio.wait_for(ws.recv(), timeout=5)) - if msg.get('type') == 'screen-share-response' and msg.get('success') == False: - got_error = True - break - except asyncio.TimeoutError: - pass - - print(f' [PASS] test_screen_share_request_offline (error_response={got_error})') - await ws.close() - -async def run_all_tests(): - print('\n===== 屏幕共享信令测试 =====') - await test_screen_share_request_view() - await test_screen_share_request_share() - await test_screen_share_accept() - await test_screen_share_reject() - await test_screen_share_stop() - await test_screen_share_request_offline() - print('\n===== 全部测试通过! =====') - -if __name__ == '__main__': - asyncio.run(run_all_tests()) diff --git a/docs/toolsapi/scripts/test_signaling_comprehensive.js b/docs/toolsapi/scripts/test_signaling_comprehensive.js new file mode 100644 index 00000000..9f2bcd17 --- /dev/null +++ b/docs/toolsapi/scripts/test_signaling_comprehensive.js @@ -0,0 +1,698 @@ +// ============================================================ +// 闲言APP — 信令服务器综合测试脚本 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 测试信令服务器的文件传输/屏幕共享/画布/配对码/设备发现等功能 +// 上次更新: 初始创建 +// ============================================================ + +const WebSocket = require('ws'); + +const SERVER_URL = 'wss://tools.wktyl.com:9443'; +const HEALTH_URL = 'https://tools.wktyl.com:9443/health'; +const TEST_TIMEOUT = 30000; + +let passed = 0; +let failed = 0; +const results = []; + +function log(tag, msg) { + console.log(`[${new Date().toISOString().slice(11, 19)}] [${tag}] ${msg}`); +} + +function assert(condition, testName, detail) { + if (condition) { + passed++; + results.push({ name: testName, status: 'PASS', detail: '' }); + log('PASS', testName); + } else { + failed++; + results.push({ name: testName, status: 'FAIL', detail: detail || 'Assertion failed' }); + log('FAIL', `${testName} — ${detail || 'Assertion failed'}`); + } +} + +function createClient(id, extraPayload) { + return new Promise((resolve, reject) => { + const ws = new WebSocket(SERVER_URL); + const messages = []; + let registered = false; + let peerId = ''; + + const timeout = setTimeout(() => { + reject(new Error(`Client ${id} connection timeout`)); + }, TEST_TIMEOUT); + + ws.on('open', () => { + log(id, 'WebSocket connected'); + const registerMsg = { + type: 'register', + payload: { + userId: `test_user_${id}`, + fingerprint: `fp_${id}_${Date.now()}`, + alias: `测试设备${id}`, + deviceModel: `TestModel-${id}`, + deviceType: 'mobile', + platform: 'test', + ...extraPayload + } + }; + ws.send(JSON.stringify(registerMsg)); + }); + + ws.on('message', (data) => { + const msg = JSON.parse(data.toString()); + messages.push(msg); + if (!registered && msg.type === 'registered') { + registered = true; + peerId = msg.id; + log(id, `Registered, peerId=${peerId}`); + clearTimeout(timeout); + resolve({ ws, messages, id, peerId, registered }); + } else if (registered) { + log(id, `Received: ${msg.type}`); + } + }); + + ws.on('error', (err) => { + clearTimeout(timeout); + log(id, `Error: ${err.message}`); + }); + + ws.on('close', () => { + log(id, 'Disconnected'); + }); + }); +} + +function waitForMessage(client, type, timeoutMs = 8000) { + return new Promise((resolve, reject) => { + const timeout = setTimeout(() => { + client.ws.removeListener('message', handler); + reject(new Error(`Timeout waiting for message type: ${type}`)); + }, timeoutMs); + + const handler = (data) => { + try { + const msg = JSON.parse(data.toString()); + if (msg.type === type) { + clearTimeout(timeout); + client.ws.removeListener('message', handler); + resolve(msg); + } + } catch (e) {} + }; + client.ws.on('message', handler); + }); +} + +function sendAndWait(client, msg, responseType, timeoutMs = 8000) { + const promise = waitForMessage(client, responseType, timeoutMs); + send(client, msg); + return promise; +} + +function sendAndWaitBoth(clientA, msgA, typeA, clientB, msgB, typeB, timeoutMs = 8000) { + const promiseA = waitForMessage(clientA, typeA, timeoutMs); + const promiseB = waitForMessage(clientB, typeB, timeoutMs); + if (msgA) send(clientA, msgA); + if (msgB) send(clientB, msgB); + return Promise.all([promiseA, promiseB]); +} + +function send(client, msg) { + client.ws.send(JSON.stringify(msg)); + log(client.id, `Sent: ${msg.type}`); +} + +function closeClient(client) { + if (client.ws.readyState === WebSocket.OPEN) { + client.ws.close(); + } +} + +async function sleep(ms) { + return new Promise(r => setTimeout(r, ms)); +} + +// ============================================================ +// Test 1: Health Check +// ============================================================ +async function testHealthCheck() { + log('TEST', '=== Test 1: Health Check ==='); + try { + const http = require('https'); + const url = new URL('https://tools.wktyl.com/api/file_transfer/health'); + const health = await new Promise((resolve, reject) => { + http.get(url, (res) => { + let data = ''; + res.on('data', chunk => data += chunk); + res.on('end', () => { + try { resolve(JSON.parse(data)); } catch (e) { reject(e); } + }); + }).on('error', reject); + }); + assert(health.code === 1 || health.status === 'healthy' || health.data, 'Health check: server healthy', `code=${health.code}`); + log('TEST', `Health response: ${JSON.stringify(health).slice(0, 200)}`); + } catch (e) { + assert(false, 'Health check: server reachable', e.message); + } +} + +// ============================================================ +// Test 2: Device Registration & Discovery +// ============================================================ +async function testRegistrationAndDiscovery() { + log('TEST', '=== Test 2: Registration & Discovery ==='); + let clientA, clientB; + try { + clientA = await createClient('A'); + clientB = await createClient('B'); + + assert(clientA.registered, 'Client A registered', ''); + assert(clientB.registered, 'Client B registered', ''); + assert(clientA.peerId !== clientB.peerId, 'Different peer IDs', `A=${clientA.peerId} B=${clientB.peerId}`); + + const discoverResp = await sendAndWait(clientA, { type: 'discover' }, 'discover_response'); + const devices = discoverResp.devices || []; + const foundB = devices.find(d => d.id === clientB.peerId); + assert(foundB, 'Discovery: Client A finds Client B', `devices count=${devices.length}`); + if (foundB) { + const alias = foundB.alias || foundB.name?.displayName || ''; + assert(alias.includes('测试设备B'), 'Discovery: alias correct', `alias=${alias}`); + assert(foundB.deviceModel === 'TestModel-B', 'Discovery: deviceModel correct', `deviceModel=${foundB.deviceModel}`); + } + + const myDevicesResp = await sendAndWait(clientA, { + type: 'discoverMyDevices', + payload: { userId: 'test_user_A' } + }, 'myDevicesResponse'); + assert(Array.isArray(myDevicesResp.devices), 'My devices: response is array', ''); + } catch (e) { + assert(false, 'Registration & Discovery', e.message); + } finally { + closeClient(clientA); + closeClient(clientB); + } +} + +// ============================================================ +// Test 3: Pairing Code (4-digit numeric) +// ============================================================ +async function testPairingCode() { + log('TEST', '=== Test 3: Pairing Code (4-digit numeric) ==='); + let clientA, clientB; + try { + clientA = await createClient('A-pair'); + clientB = await createClient('B-pair'); + + const codeCreated = await sendAndWait(clientA, { + type: 'pairing-code-create', + payload: { alias: '设备A', deviceModel: 'Model-A', deviceType: 'mobile' } + }, 'pairing-code-created'); + const code = codeCreated.pairingCode; + log('TEST', `Pairing code created: ${code}`); + + assert(!!code, 'Pairing code: code exists', ''); + assert(/^\d{4}$/.test(code), 'Pairing code: 4-digit numeric only', `code=${code}`); + assert(codeCreated.expiresAt > Date.now(), 'Pairing code: not expired', `expiresAt=${codeCreated.expiresAt}`); + + const [matchedA, matchedB] = await sendAndWaitBoth( + clientA, null, 'pairing-matched', + clientB, { + type: 'pairing-code-join', + payload: { pairingCode: code } + }, 'pairing-matched' + ); + + assert(matchedA.success === true, 'Pairing: A matched successfully', `success=${matchedA.success}`); + assert(matchedB.success === true, 'Pairing: B matched successfully', `success=${matchedB.success}`); + assert(matchedB.peer.alias === '设备A', 'Pairing: B sees A alias', `alias=${matchedB.peer.alias}`); + assert(matchedB.peer.deviceModel === 'Model-A', 'Pairing: B sees A deviceModel', `deviceModel=${matchedB.peer.deviceModel}`); + + // Test invalid code + const clientC = await createClient('C-pair'); + const invalidMatch = await sendAndWait(clientC, { + type: 'pairing-code-join', + payload: { pairingCode: 'abcd' } + }, 'pairing-matched'); + assert(invalidMatch.success === false, 'Pairing: non-numeric code rejected', `success=${invalidMatch.success}, error=${invalidMatch.error}`); + + const invalidLen = await sendAndWait(clientC, { + type: 'pairing-code-join', + payload: { pairingCode: '12345' } + }, 'pairing-matched'); + assert(invalidLen.success === false, 'Pairing: 5-digit code rejected', `success=${invalidLen.success}, error=${invalidLen.error}`); + + closeClient(clientC); + } catch (e) { + assert(false, 'Pairing Code', e.message); + } finally { + closeClient(clientA); + closeClient(clientB); + } +} + +// ============================================================ +// Test 4: Text Message & File Meta +// ============================================================ +async function testTextMessageAndFileMeta() { + log('TEST', '=== Test 4: Text Message & File Meta ==='); + let clientA, clientB; + try { + clientA = await createClient('A-msg'); + clientB = await createClient('B-msg'); + await sleep(500); + + const textMsgPromise = waitForMessage(clientB, 'textMessage'); + send(clientA, { + type: 'textMessage', + to: clientB.peerId, + message: { text: 'Hello from A!', type: 'text' }, + timestamp: Date.now() + }); + const textMsg = await textMsgPromise; + assert(textMsg.message.text === 'Hello from A!', 'Text message: content correct', `text=${textMsg.message?.text}`); + assert(textMsg.from === clientA.peerId || textMsg.fromPeerId === clientA.peerId, 'Text message: from correct', `from=${textMsg.from}`); + + const fileMeta = { + name: 'test_image.png', + size: 102400, + mimeType: 'image/png', + hash: 'abc123def456' + }; + const fileMsgPromise = waitForMessage(clientB, 'fileMeta'); + send(clientA, { + type: 'fileMeta', + to: clientB.peerId, + file: fileMeta, + timestamp: Date.now() + }); + const fileMsg = await fileMsgPromise; + assert(fileMsg.file.name === 'test_image.png', 'File meta: name correct', `name=${fileMsg.file?.name}`); + assert(fileMsg.file.size === 102400, 'File meta: size correct', `size=${fileMsg.file?.size}`); + assert(fileMsg.file.mimeType === 'image/png', 'File meta: mimeType correct', `mimeType=${fileMsg.file?.mimeType}`); + } catch (e) { + assert(false, 'Text Message & File Meta', e.message); + } finally { + closeClient(clientA); + closeClient(clientB); + } +} + +// ============================================================ +// Test 5: Screen Share +// ============================================================ +async function testScreenShare() { + log('TEST', '=== Test 5: Screen Share ==='); + let clientA, clientB; + try { + clientA = await createClient('A-ss'); + clientB = await createClient('B-ss'); + await sleep(500); + + const ssRequestPromise = waitForMessage(clientB, 'screen-share-request'); + send(clientA, { + type: 'screen-share-request', + to: clientB.peerId, + payload: { direction: 'share' } + }); + const ssRequest = await ssRequestPromise; + assert(ssRequest.direction === 'share', 'Screen share: request direction correct', `direction=${ssRequest.direction}`); + assert(ssRequest.fromPeerId === clientA.peerId || ssRequest.from === clientA.peerId, 'Screen share: from correct', ''); + + const ssAcceptPromise = waitForMessage(clientA, 'screen-share-accept'); + send(clientB, { + type: 'screen-share-accept', + to: clientA.peerId, + payload: { direction: 'share' } + }); + const ssAccept = await ssAcceptPromise; + assert(!!ssAccept, 'Screen share: accept received', ''); + + const offerMsgPromise = waitForMessage(clientB, 'screen-share-offer'); + send(clientA, { + type: 'screen-share-offer', + to: clientB.peerId, + payload: { sdp: 'fake_sdp_offer', hotZones: [{ id: 'zone1', label: 'top' }] } + }); + const offerMsg = await offerMsgPromise; + assert(offerMsg.payload?.sdp === 'fake_sdp_offer', 'Screen share: SDP offer relayed', `sdp=${offerMsg.payload?.sdp}`); + + const answerMsgPromise = waitForMessage(clientA, 'screen-share-answer'); + send(clientB, { + type: 'screen-share-answer', + to: clientA.peerId, + payload: { sdp: 'fake_sdp_answer' } + }); + const answerMsg = await answerMsgPromise; + assert(answerMsg.payload?.sdp === 'fake_sdp_answer', 'Screen share: SDP answer relayed', ''); + + const iceMsgPromise = waitForMessage(clientB, 'screen-share-ice-candidate'); + send(clientA, { + type: 'screen-share-ice-candidate', + to: clientB.peerId, + payload: { candidate: 'fake_ice_candidate_a' } + }); + const iceMsg = await iceMsgPromise; + assert(iceMsg.payload?.candidate === 'fake_ice_candidate_a', 'Screen share: ICE candidate relayed', ''); + + const stopMsgPromise = waitForMessage(clientB, 'screen-share-stop'); + send(clientA, { + type: 'screen-share-stop', + to: clientB.peerId + }); + const stopMsg = await stopMsgPromise; + assert(!!stopMsg, 'Screen share: stop received', ''); + + const rejectReqPromise = waitForMessage(clientB, 'screen-share-request'); + const rejectRespPromise = waitForMessage(clientA, 'screen-share-reject'); + send(clientA, { + type: 'screen-share-request', + to: clientB.peerId, + payload: { direction: 'view' } + }); + await rejectReqPromise; + send(clientB, { + type: 'screen-share-reject', + to: clientA.peerId + }); + const rejectMsg = await rejectRespPromise; + assert(!!rejectMsg, 'Screen share: reject received', ''); + } catch (e) { + assert(false, 'Screen Share', e.message); + } finally { + closeClient(clientA); + closeClient(clientB); + } +} + +// ============================================================ +// Test 6: Canvas Collaboration +// ============================================================ +async function testCanvas() { + log('TEST', '=== Test 6: Canvas Collaboration ==='); + let clientA, clientB; + try { + clientA = await createClient('A-canvas'); + clientB = await createClient('B-canvas'); + await sleep(500); + + const canvasId = `test_canvas_${Date.now()}`; + + const joinA = await sendAndWait(clientA, { + type: 'canvas-join', + payload: { canvasId } + }, 'canvas-join'); + assert(joinA.payload.canvasId === canvasId, 'Canvas: A joined', `canvasId=${joinA.payload.canvasId}`); + assert(joinA.payload.members.includes(clientA.peerId), 'Canvas: A in members list', ''); + + const [joinB1, joinB2] = await sendAndWaitBoth( + clientB, { type: 'canvas-join', payload: { canvasId } }, 'canvas-join', + clientA, null, 'canvas-join' + ); + + assert(joinB1.payload.canvasId === canvasId, 'Canvas: B joined', ''); + assert(joinB2.payload.members.length === 2, 'Canvas: A notified of B joining', `members=${joinB2.payload.members.length}`); + + const strokeData = { + canvasId, + strokeId: 'stroke_001', + points: [{ x: 10, y: 20 }, { x: 30, y: 40 }], + color: '#FF0000', + width: 3, + tool: 'pen' + }; + const strokeMsgPromise = waitForMessage(clientB, 'canvas-stroke'); + send(clientA, { + type: 'canvas-stroke', + payload: strokeData + }); + const strokeMsg = await strokeMsgPromise; + assert(strokeMsg.payload.strokeId === 'stroke_001', 'Canvas: stroke relayed', `strokeId=${strokeMsg.payload.strokeId}`); + assert(strokeMsg.payload.color === '#FF0000', 'Canvas: stroke color correct', `color=${strokeMsg.payload.color}`); + + const cursorMsgPromise = waitForMessage(clientB, 'canvas-cursor'); + send(clientA, { + type: 'canvas-cursor', + payload: { canvasId, x: 50, y: 60 } + }); + const cursorMsg = await cursorMsgPromise; + assert(cursorMsg.payload.x === 50, 'Canvas: cursor relayed', `x=${cursorMsg.payload.x}`); + + const snapshotReqPromise = waitForMessage(clientB, 'canvas-snapshot'); + send(clientA, { + type: 'canvas-snapshot', + payload: { canvasId, action: 'request' } + }); + const snapshotReq = await snapshotReqPromise; + assert(snapshotReq.payload.action === 'request', 'Canvas: snapshot request relayed', ''); + + const snapshotRespPromise = waitForMessage(clientA, 'canvas-snapshot'); + send(clientB, { + type: 'canvas-snapshot', + to: clientA.peerId, + payload: { canvasId, action: 'response', data: 'base64_fake_snapshot_data' } + }); + const snapshotResp = await snapshotRespPromise; + assert(snapshotResp.payload.data === 'base64_fake_snapshot_data', 'Canvas: snapshot response relayed', ''); + + const leaveMsgPromise = waitForMessage(clientA, 'canvas-leave'); + send(clientB, { + type: 'canvas-leave', + payload: { canvasId } + }); + const leaveMsg = await leaveMsgPromise; + assert(leaveMsg.payload.canvasId === canvasId, 'Canvas: B leave notified to A', ''); + } catch (e) { + assert(false, 'Canvas Collaboration', e.message); + } finally { + closeClient(clientA); + closeClient(clientB); + } +} + +// ============================================================ +// Test 7: Pair Request (direct pairing) +// ============================================================ +async function testDirectPairing() { + log('TEST', '=== Test 7: Direct Pairing ==='); + let clientA, clientB; + try { + clientA = await createClient('A-dpair'); + clientB = await createClient('B-dpair'); + await sleep(500); + + const pairReqPromise = waitForMessage(clientB, 'pair-request'); + send(clientA, { + type: 'pair-request', + to: clientB.peerId, + fingerprint: `fp_A-dpair_${Date.now()}`, + payload: { fingerprint: `fp_A-dpair_${Date.now()}` } + }); + const pairReq = await pairReqPromise; + assert(!!pairReq.requestId, 'Direct pair: request has requestId', `requestId=${pairReq.requestId}`); + + const [pairRespA, pairRespB] = await sendAndWaitBoth( + clientA, null, 'pair-response', + clientB, { type: 'pair-accept', requestId: pairReq.requestId }, 'pair-response' + ); + + assert(pairRespA.success === true, 'Direct pair: A success', `success=${pairRespA.success}`); + assert(pairRespB.success === true, 'Direct pair: B success', `success=${pairRespB.success}`); + } catch (e) { + assert(false, 'Direct Pairing', e.message); + } finally { + closeClient(clientA); + closeClient(clientB); + } +} + +// ============================================================ +// Test 8: Radar Broadcast & Scan +// ============================================================ +async function testRadar() { + log('TEST', '=== Test 8: Radar Broadcast & Scan ==='); + let clientA, clientB; + try { + clientA = await createClient('A-radar'); + clientB = await createClient('B-radar'); + await sleep(500); + + const broadcastResp = await sendAndWait(clientA, { + type: 'radar-broadcast', + payload: { + alias: '雷达设备A', + deviceModel: 'RadarModel-A', + deviceType: 'mobile', + ipRange: '192.168.1', + ipCity: '深圳' + } + }, 'radar-broadcast'); + assert(broadcastResp.success === true, 'Radar: A broadcast success', ''); + + await sendAndWait(clientB, { + type: 'radar-broadcast', + payload: { + alias: '雷达设备B', + deviceModel: 'RadarModel-B', + deviceType: 'desktop', + ipRange: '192.168.1', + ipCity: '深圳' + } + }, 'radar-broadcast'); + + const scanResp = await sendAndWait(clientA, { + type: 'radar-scan', + payload: { ipRange: '192.168.1', ipCity: '深圳' } + }, 'radar-devices'); + assert(Array.isArray(scanResp.devices), 'Radar: scan returns array', ''); + const foundB = scanResp.devices.find(d => d.alias === '雷达设备B'); + assert(!!foundB, 'Radar: A finds B', `devices count=${scanResp.devices.length}`); + if (foundB) { + assert(foundB.deviceModel === 'RadarModel-B', 'Radar: B deviceModel correct', `deviceModel=${foundB.deviceModel}`); + assert(foundB.matchType === 'same-network' || foundB.matchType === 'my-device', 'Radar: matchType correct', `matchType=${foundB.matchType}`); + } + } catch (e) { + assert(false, 'Radar Broadcast & Scan', e.message); + } finally { + closeClient(clientA); + closeClient(clientB); + } +} + +// ============================================================ +// Test 9: WsRelay +// ============================================================ +async function testWsRelay() { + log('TEST', '=== Test 9: WebSocket Relay ==='); + let clientA, clientB; + try { + clientA = await createClient('A-relay'); + clientB = await createClient('B-relay'); + await sleep(500); + + const relayMsgPromise = waitForMessage(clientB, 'wsRelay'); + send(clientA, { + type: 'wsRelay', + to: clientB.peerId, + relayType: 'webrtc-signal', + payload: { + relayType: 'webrtc-signal', + signalType: 'offer', + sdp: 'fake_relay_sdp' + } + }); + const relayMsg = await relayMsgPromise; + assert(relayMsg.payload.relayType === 'webrtc-signal', 'WsRelay: relayType correct', `relayType=${relayMsg.payload?.relayType}`); + assert(relayMsg.payload.signalType === 'offer', 'WsRelay: signalType correct', `signalType=${relayMsg.payload?.signalType}`); + + const errorRelay = await sendAndWait(clientA, { + type: 'wsRelay', + to: 'non_existent_peer_id', + relayType: 'data', + payload: { relayType: 'data', test: true } + }, 'wsRelay'); + assert(errorRelay.payload?.relayType === 'error', 'WsRelay: error for non-existent target', `relayType=${errorRelay.payload?.relayType}`); + } catch (e) { + assert(false, 'WebSocket Relay', e.message); + } finally { + closeClient(clientA); + closeClient(clientB); + } +} + +// ============================================================ +// Test 10: Heartbeat & Ping +// ============================================================ +async function testHeartbeat() { + log('TEST', '=== Test 10: Heartbeat & Ping ==='); + let clientA; + try { + clientA = await createClient('A-hb'); + + const pong = await sendAndWait(clientA, { type: 'ping' }, 'pong'); + assert(!!pong.timestamp, 'Ping: pong has timestamp', `timestamp=${pong.timestamp}`); + + const hbAck = await sendAndWait(clientA, { type: 'heartbeat' }, 'heartbeat_ack'); + assert(!!hbAck.timestamp, 'Heartbeat: ack has timestamp', `timestamp=${hbAck.timestamp}`); + } catch (e) { + assert(false, 'Heartbeat & Ping', e.message); + } finally { + closeClient(clientA); + } +} + +// ============================================================ +// Test 11: DeviceModel not localhost +// ============================================================ +async function testDeviceModelNotLocalhost() { + log('TEST', '=== Test 11: DeviceModel not localhost ==='); + let clientA; + try { + clientA = await createClient('A-model', { deviceModel: 'Samsung Galaxy S24' }); + + send(clientA, { type: 'discover' }); + // We check the registered data via discover response from another client + const clientB = await createClient('B-model'); + await sleep(500); + + const discoverResp = await sendAndWait(clientB, { type: 'discover' }, 'discover_response'); + const foundA = discoverResp.devices.find(d => d.id === clientA.peerId); + assert(!!foundA, 'DeviceModel: A found in discovery', ''); + if (foundA) { + assert(foundA.deviceModel === 'Samsung Galaxy S24', 'DeviceModel: custom model preserved', `deviceModel=${foundA.deviceModel}`); + assert(foundA.deviceModel !== 'localhost', 'DeviceModel: not localhost', `deviceModel=${foundA.deviceModel}`); + } + + closeClient(clientB); + } catch (e) { + assert(false, 'DeviceModel not localhost', e.message); + } finally { + closeClient(clientA); + } +} + +// ============================================================ +// Main +// ============================================================ +async function main() { + console.log('\n' + '='.repeat(70)); + console.log(' 闲言APP 信令服务器综合测试'); + console.log(` Server: ${SERVER_URL}`); + console.log(` Time: ${new Date().toISOString()}`); + console.log('='.repeat(70) + '\n'); + + await testHealthCheck(); + await testRegistrationAndDiscovery(); + await testPairingCode(); + await testTextMessageAndFileMeta(); + await testScreenShare(); + await testCanvas(); + await testDirectPairing(); + await testRadar(); + await testWsRelay(); + await testHeartbeat(); + await testDeviceModelNotLocalhost(); + + console.log('\n' + '='.repeat(70)); + console.log(' Test Results Summary'); + console.log('='.repeat(70)); + + for (const r of results) { + const icon = r.status === 'PASS' ? '✅' : '❌'; + const detail = r.detail ? ` (${r.detail})` : ''; + console.log(` ${icon} ${r.name}${detail}`); + } + + console.log('-'.repeat(70)); + console.log(` Total: ${passed + failed} | Passed: ${passed} | Failed: ${failed}`); + console.log('='.repeat(70) + '\n'); + + process.exit(failed > 0 ? 1 : 0); +} + +main().catch(err => { + console.error('Test runner error:', err); + process.exit(2); +}); diff --git a/docs/toolsapi/scripts/upload_agreements.py b/docs/toolsapi/scripts/upload_agreements.py deleted file mode 100644 index d11c5a37..00000000 --- a/docs/toolsapi/scripts/upload_agreements.py +++ /dev/null @@ -1,34 +0,0 @@ -"""Upload agreement HTML pages to tools.wktyl.com/agreements/""" -import paramiko -import os - -HOST = '123.207.67.197' -USER = 'root' -PASS = '520Kiss123' -REMOTE_BASE = '/www/wwwroot/tools.wktyl.com/public/agreements' -LOCAL_DIR = r'e:\project\flutter\f\xianyan\docs\toolsapi\agreements' - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect(HOST, username=USER, password=PASS) - -sftp = ssh.open_sftp() - -try: - sftp.mkdir(REMOTE_BASE) - print(f'Created directory: {REMOTE_BASE}') -except IOError: - print(f'Directory already exists: {REMOTE_BASE}') - -for filename in os.listdir(LOCAL_DIR): - if filename.endswith('.html'): - local_path = os.path.join(LOCAL_DIR, filename) - remote_path = f'{REMOTE_BASE}/{filename}' - print(f'Uploading {filename}...') - sftp.put(local_path, remote_path) - print(f' -> {remote_path}') - -sftp.close() -ssh.close() -print('\nAll files uploaded successfully!') -print(f'Visit: https://tools.wktyl.com/agreements/') diff --git a/docs/toolsapi/scripts/upload_rz_img.py b/docs/toolsapi/scripts/upload_rz_img.py deleted file mode 100644 index b011cca5..00000000 --- a/docs/toolsapi/scripts/upload_rz_img.py +++ /dev/null @@ -1,25 +0,0 @@ -import paramiko -import os - -HOST = '123.207.67.197' -PORT = 22 -USER = 'root' -PASS = '520Kiss123' - -LOCAL_IMG = r'e:\project\flutter\f\xianyan\assets\images\empty\rz.png' -REMOTE_DIR = '/www/wwwroot/tools.wktyl.com/public/agreements/' - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect(HOST, PORT, USER, PASS) -sftp = ssh.open_sftp() - -remote_path = REMOTE_DIR + 'rz.png' -print(f'Uploading {LOCAL_IMG} -> {remote_path}') -sftp.put(LOCAL_IMG, remote_path) -sftp.chmod(remote_path, 0o644) -print('Upload complete') - -sftp.close() -ssh.close() -print('Done!') diff --git a/docs/toolsapi/scripts/upload_sec_question.py b/docs/toolsapi/scripts/upload_sec_question.py deleted file mode 100644 index c887ecd5..00000000 --- a/docs/toolsapi/scripts/upload_sec_question.py +++ /dev/null @@ -1,83 +0,0 @@ -import paramiko -import os -import sys - -HOST = '123.207.67.197' -PORT = 22 -USER = 'root' -PASS = '520Kiss123' - -BASE_DIR = r'e:\project\flutter\f\xianyan\docs\toolsapi' -REMOTE_BASE = '/www/wwwroot/tools.wktyl.com/' - -UPLOAD_FILES = [ - { - 'local': os.path.join(BASE_DIR, 'application', 'api', 'controller', 'UserSecurity.php'), - 'remote': REMOTE_BASE + 'application/api/controller/UserSecurity.php', - }, - { - 'local': os.path.join(BASE_DIR, 'application', 'api', 'controller', 'UserCenter.php'), - 'remote': REMOTE_BASE + 'application/api/controller/UserCenter.php', - }, -] - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect(HOST, PORT, USER, PASS) -sftp = ssh.open_sftp() - -for item in UPLOAD_FILES: - local = item['local'] - remote = item['remote'] - if not os.path.exists(local): - print(f'[SKIP] Local file not found: {local}') - continue - - backup_file = remote + '.bak.' + os.popen('echo %date:~0,4%%date:~5,2%%date:~8,2%_%time:~0,2%%time:~3,2%').read().strip().replace(' ', '0') - print(f'Backing up {remote} -> {backup_file}') - try: - sftp.rename(remote, backup_file) - print(' Backup created') - except: - print(' No existing file to backup (or rename failed)') - - print(f'Uploading {local} -> {remote}') - sftp.put(local, remote) - print(' Upload complete') - sftp.chmod(remote, 0o644) - print(' Permissions set to 644') - -print('\nRunning database migration...') -sql_file = os.path.join(BASE_DIR, 'application', 'admin', 'command', 'Install', 'migrate_v10_1.sql') -if os.path.exists(sql_file): - with open(sql_file, 'r', encoding='utf-8') as f: - sql_content = f.read() - sql_lines = [line.strip() for line in sql_content.split('\n') if line.strip() and not line.strip().startswith('--')] - for sql in sql_lines: - if sql: - stdin, stdout, stderr = ssh.exec_command( - f"cd {REMOTE_BASE} && php think sql \"{sql.replace('\"', '\\\"')}\" 2>/dev/null || " - f"mysql -u tools -ptools tools -e \"{sql.replace('\"', '\\\"')}\" 2>/dev/null || " - f"echo 'SQL_MANUAL: {sql[:80]}...'" - ) - output = stdout.read().decode() - err = stderr.read().decode() - if output: - print(f' SQL: {output.strip()}') - if err and 'Warning' not in err: - print(f' SQL Err: {err.strip()}') - print('Migration commands sent (check manually if needed)') - -print('\nClearing ThinkPHP cache...') -stdin, stdout, stderr = ssh.exec_command(f'rm -rf {REMOTE_BASE}runtime/cache/* {REMOTE_BASE}runtime/temp/*') -print(stdout.read().decode()) - -sftp.close() - -print('\nDone! Files uploaded and migration executed.') -print('Please verify the migration manually if needed:') -print(f' SQL: ALTER TABLE tool_user ADD COLUMN sec_question TINYINT(2) UNSIGNED NOT NULL DEFAULT 0;') -print(f' SQL: ALTER TABLE tool_user ADD COLUMN sec_answer VARCHAR(32) NOT NULL DEFAULT \'\';') -print(f' SQL: ALTER TABLE tool_user ADD INDEX idx_sec_question (sec_question);') - -ssh.close() diff --git a/docs/toolsapi/scripts/upload_signaling.py b/docs/toolsapi/scripts/upload_signaling.py deleted file mode 100644 index 836b905c..00000000 --- a/docs/toolsapi/scripts/upload_signaling.py +++ /dev/null @@ -1,59 +0,0 @@ -"""Upload signaling server index.js and restart PM2""" -import paramiko -import os -import time - -HOST = '123.207.67.197' -USER = 'root' -PASS = '520Kiss123' -REMOTE_BASE = '/www/wwwroot/tools.wktyl.com/signaling' -LOCAL_FILE = r'e:\project\flutter\f\xianyan\server\index.js' - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect(HOST, username=USER, password=PASS) - -sftp = ssh.open_sftp() - -remote_file = REMOTE_BASE + '/index.js' -print(f'Uploading index.js to {remote_file}...') - -backup_path = REMOTE_BASE + '/index.js.bak' -try: - sftp.stat(remote_file) - try: - sftp.remove(backup_path) - except FileNotFoundError: - pass - sftp.rename(remote_file, backup_path) - print(f'Backup created: {backup_path}') -except FileNotFoundError: - pass - -sftp.put(LOCAL_FILE, remote_file) -print(f'[OK] index.js uploaded') -sftp.close() - -print('\nRestarting PM2 signaling process...') -stdin, stdout, stderr = ssh.exec_command('cd /www/wwwroot/tools.wktyl.com/signaling && pm2 restart signaling') -out = stdout.read().decode().strip() -err = stderr.read().decode().strip() -if out: - print(out) -if err: - print(f'STDERR: {err[:300]}') - -time.sleep(2) - -print('\nChecking PM2 status...') -stdin, stdout, stderr = ssh.exec_command('pm2 list') -out = stdout.read().decode().strip() -print(out[-500:] if len(out) > 500 else out) - -print('\nChecking signaling logs (last 10 lines)...') -stdin, stdout, stderr = ssh.exec_command('pm2 logs signaling --lines 10 --nostream') -out = stdout.read().decode().strip() -print(out[-500:] if len(out) > 500 else out) - -ssh.close() -print('\nDeployment complete!') diff --git a/docs/toolsapi/scripts/upload_user_center.py b/docs/toolsapi/scripts/upload_user_center.py deleted file mode 100644 index 60eca7e2..00000000 --- a/docs/toolsapi/scripts/upload_user_center.py +++ /dev/null @@ -1,32 +0,0 @@ -import paramiko -import os - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect('123.207.67.197', 22, 'root', '520Kiss123') - -local_file = os.path.join(os.path.dirname(__file__), '..', 'application', 'api', 'controller', 'UserCenter.php') -local_file = os.path.normpath(local_file) -remote_file = '/www/wwwroot/tools.wktyl.com/application/api/controller/UserCenter.php' - -print(f'=== Uploading UserCenter.php ===') -print(f'Local: {local_file}') -print(f'Remote: {remote_file}') - -sftp = ssh.open_sftp() -sftp.put(local_file, remote_file) -sftp.close() -print('Upload done!') - -print('\n=== Verify: check rename action in file ===') -stdin, stdout, stderr = ssh.exec_command(f"grep -n 'rename' {remote_file}") -output = stdout.read().decode() -print(output if output else 'No matches found') - -print('\n=== Set permissions ===') -stdin, stdout, stderr = ssh.exec_command(f'chown www:www {remote_file} && chmod 644 {remote_file}') -print(stdout.read().decode()) -print(stderr.read().decode()) - -ssh.close() -print('Done!') diff --git a/docs/toolsapi/scripts/upload_v12_daily_task.py b/docs/toolsapi/scripts/upload_v12_daily_task.py deleted file mode 100644 index 4757fa71..00000000 --- a/docs/toolsapi/scripts/upload_v12_daily_task.py +++ /dev/null @@ -1,289 +0,0 @@ -""" -@File : upload_v12_daily_task.py -@Created : 2026-05-14 -@Updated : 2026-05-14 -@Name : Phase3 Daily Task Upload Script -@Desc : Upload Phase 3 daily task files and bug fixes to server, execute migration SQL -@Last : Initial creation -""" - -import os -import sys -import paramiko -from stat import S_ISDIR - -HOST = "123.207.67.197" -USERNAME = "root" -PASSWORD = "520Kiss123" -REMOTE_BASE = "/www/wwwroot/tools.wktyl.com" -LOCAL_BASE = r"e:\project\flutter\f\xianyan\docs\toolsapi" - -PHASE3_FILES = [ - (r"application\admin\command\Install\migrate_v12.sql", - "application/admin/command/Install/migrate_v12.sql"), - (r"application\api\controller\Task.php", - "application/api/controller/Task.php"), - (r"application\admin\controller\DailyTask.php", - "application/admin/controller/DailyTask.php"), - (r"application\admin\model\DailyTask.php", - "application/admin/model/DailyTask.php"), - (r"application\admin\validate\DailyTask.php", - "application/admin/validate/DailyTask.php"), - (r"application\admin\view\daily_task\index.html", - "application/admin/view/daily_task/index.html"), - (r"application\admin\view\daily_task\add.html", - "application/admin/view/daily_task/add.html"), - (r"application\admin\view\daily_task\edit.html", - "application/admin/view/daily_task/edit.html"), - (r"public\assets\js\backend\daily_task.js", - "public/assets/js/backend/daily_task.js"), - (r"application\admin\lang\zh-cn\daily_task.php", - "application/admin/lang/zh-cn/daily_task.php"), - (r"application\admin\controller\user\UserTask.php", - "application/admin/controller/user/UserTask.php"), - (r"application\admin\model\UserTask.php", - "application/admin/model/UserTask.php"), - (r"application\admin\view\user\user_task\index.html", - "application/admin/view/user/user_task/index.html"), - (r"public\assets\js\backend\user\user_task.js", - "public/assets/js/backend/user/user_task.js"), - (r"application\admin\lang\zh-cn\user\user_task.php", - "application/admin/lang/zh-cn/user/user_task.php"), -] - -BUGFIX_FILES = [ - (r"application\admin\controller\FeedWeight.php", - "application/admin/controller/FeedWeight.php"), - (r"application\admin\model\FeedWeightConfig.php", - "application/admin/model/FeedWeightConfig.php"), - (r"application\admin\view\feed_weight\index.html", - "application/admin/view/feed_weight/index.html"), - (r"application\admin\view\feed_weight\edit.html", - "application/admin/view/feed_weight/edit.html"), - (r"public\assets\js\backend\feed_weight.js", - "public/assets/js/backend/feed_weight.js"), - (r"application\admin\lang\zh-cn\feed_weight.php", - "application/admin/lang/zh-cn/feed_weight.php"), - (r"application\admin\view\userdeletion\index.html", - "application/admin/view/userdeletion/index.html"), - (r"application\admin\controller\user\User.php", - "application/admin/controller/user/User.php"), - (r"application\admin\controller\Userdeletion.php", - "application/admin/controller/Userdeletion.php"), -] - -MIGRATE_SQL_CMD = ( - "mysql -u root -p'520Kiss123' --default-character-set=utf8mb4 " - "tool_db < /www/wwwroot/tools.wktyl.com/application/admin/command/Install/migrate_v12.sql" -) - -CREATE_FEED_WEIGHT_TABLE_SQL = ( - 'mysql -u root -p\'520Kiss123\' --default-character-set=utf8mb4 tool_db -e ' - '"CREATE TABLE IF NOT EXISTS tool_feed_weight_config (' - 'id int(10) unsigned NOT NULL AUTO_INCREMENT,' - 'feed_type varchar(30) NOT NULL DEFAULT \'\' COMMENT \'内容类型\',' - 'weight int(10) NOT NULL DEFAULT 50 COMMENT \'推荐权重0-100\',' - 'display_weight int(10) NOT NULL DEFAULT 40 COMMENT \'展示权重\',' - 'push_limit int(10) NOT NULL DEFAULT 0 COMMENT \'每日推送上限0=不限\',' - 'push_count int(10) NOT NULL DEFAULT 0 COMMENT \'今日已推送数\',' - 'push_date varchar(10) NOT NULL DEFAULT \'\' COMMENT \'推送日期\',' - 'is_enabled tinyint(1) NOT NULL DEFAULT 1 COMMENT \'是否启用\',' - 'createtime int(10) DEFAULT NULL,' - 'updatetime int(10) DEFAULT NULL,' - 'update_time int(10) DEFAULT NULL,' - 'PRIMARY KEY (id),' - 'UNIQUE KEY uk_feed_type (feed_type)' - ') ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT=\'推荐权重配置\';"' -) - -INSERT_DEFAULT_DATA_SQL = ( - 'mysql -u root -p\'520Kiss123\' --default-character-set=utf8mb4 tool_db -e ' - '"INSERT IGNORE INTO tool_feed_weight_config ' - '(feed_type, weight, display_weight, push_limit, is_enabled, createtime, updatetime) VALUES ' - '(\'poetry\',60,48,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'wisdom\',55,44,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'story\',50,40,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'hitokoto\',70,56,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'riddle\',40,32,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'efs\',35,28,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'brainteaser\',40,32,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'saying\',30,24,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'lyric\',55,44,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'why\',35,28,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'composition\',30,24,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'couplet\',25,20,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'cs\',30,24,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'drug\',15,12,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'herbal\',15,12,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'food\',20,16,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'wine\',10,8,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP()),' - '(\'article\',60,48,0,1,UNIX_TIMESTAMP(),UNIX_TIMESTAMP());"' -) - -INSERT_MENU_SQL = ( - 'mysql -u root -p\'520Kiss123\' --default-character-set=utf8mb4 tool_db -e "' - 'INSERT IGNORE INTO fa_auth_rule ' - '(id, type, pid, name, title, icon, condition, remark, ismenu, createtime, updatetime, weigh, status) VALUES ' - "(200, 'file', 0, 'feed_weight', '推荐权重', 'fa fa-balance-scale', '', '', 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(201, 'file', 200, 'feed_weight/index', '查看', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(202, 'file', 200, 'feed_weight/edit', '编辑', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(203, 'file', 200, 'feed_weight/reset_push', '重置推送', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(204, 'file', 200, 'feed_weight/reset_defaults', '恢复默认', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(210, 'file', 0, 'daily_task', '每日任务', 'fa fa-tasks', '', '', 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(211, 'file', 210, 'daily_task/index', '查看', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(212, 'file', 210, 'daily_task/add', '添加', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(213, 'file', 210, 'daily_task/edit', '编辑', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(214, 'file', 210, 'daily_task/del', '删除', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(220, 'file', 0, 'badge', '勋章管理', 'fa fa-shield', '', '', 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(221, 'file', 220, 'badge/index', '查看', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(222, 'file', 220, 'badge/add', '添加', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(223, 'file', 220, 'badge/edit', '编辑', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(224, 'file', 220, 'badge/del', '删除', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(230, 'file', 0, 'user/user_badge', '用户勋章', 'fa fa-id-badge', '', '', 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(231, 'file', 230, 'user/user_badge/index', '查看', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(240, 'file', 0, 'user/user_task', '用户任务', 'fa fa-list-check', '', '', 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal')," - "(241, 'file', 240, 'user/user_task/index', '查看', '', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal');" - '"' -) - - -def create_ssh_client(): - """Create and return SSH client connection""" - client = paramiko.SSHClient() - client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - print(f"[SSH] Connecting to {HOST}...") - client.connect(HOST, username=USERNAME, password=PASSWORD, timeout=30) - print(f"[SSH] Connected successfully.") - return client - - -def ensure_remote_dir(sftp, remote_path): - """Ensure remote directory exists, create if not""" - dirs_to_create = [] - path = remote_path - while path != "/" and path != "": - try: - sftp.stat(path) - break - except FileNotFoundError: - dirs_to_create.append(path) - path = os.path.dirname(path).replace("\\", "/") - - for d in reversed(dirs_to_create): - print(f" [DIR] Creating remote directory: {d}") - sftp.mkdir(d) - - -def upload_file(sftp, local_path, remote_path): - """Upload a single file, creating remote directories as needed""" - remote_dir = os.path.dirname(remote_path).replace("\\", "/") - ensure_remote_dir(sftp, remote_dir) - - if not os.path.isfile(local_path): - print(f" [SKIP] Local file not found: {local_path}") - return False - - sftp.put(local_path, remote_path) - print(f" [OK] {os.path.basename(local_path)} -> {remote_path}") - return True - - -def run_ssh_command(ssh, cmd, label=""): - """Execute SSH command and print output""" - if label: - print(f"\n[SQL] {label}") - print(f" [CMD] {cmd[:120]}...") - stdin, stdout, stderr = ssh.exec_command(cmd) - out = stdout.read().decode("utf-8", errors="replace").strip() - err = stderr.read().decode("utf-8", errors="replace").strip() - exit_code = stdout.channel.recv_exit_status() - if out: - print(f" [OUT] {out[:500]}") - if err: - print(f" [ERR] {err[:500]}") - if exit_code != 0: - print(f" [FAIL] Exit code: {exit_code}") - else: - print(f" [OK] Exit code: 0") - return exit_code - - -def main(): - all_files = [] - print("=" * 60) - print(" Phase 3 Daily Task & Bug Fix Upload Script v12") - print("=" * 60) - - print("\n--- Phase 3: Daily Task Files ---") - for local_rel, remote_rel in PHASE3_FILES: - local = os.path.join(LOCAL_BASE, local_rel) - remote = REMOTE_BASE + "/" + remote_rel - all_files.append(("Phase3", local, remote)) - - print("\n--- Bug Fix Files ---") - for local_rel, remote_rel in BUGFIX_FILES: - local = os.path.join(LOCAL_BASE, local_rel) - remote = REMOTE_BASE + "/" + remote_rel - all_files.append(("BugFix", local, remote)) - - missing = [(t, l, r) for t, l, r in all_files if not os.path.isfile(l)] - if missing: - print("\n[WARN] Missing local files:") - for tag, local, remote in missing: - print(f" [{tag}] {local}") - answer = input("\nContinue anyway? (y/N): ").strip().lower() - if answer != "y": - print("Aborted.") - sys.exit(1) - - ssh = create_ssh_client() - sftp = ssh.open_sftp() - - success = 0 - failed = 0 - skipped = 0 - - print(f"\n{'=' * 60}") - print(f" Uploading {len(all_files)} files...") - print(f"{'=' * 60}") - - for tag, local, remote in all_files: - print(f"\n[{tag}] {os.path.basename(local)}") - try: - result = upload_file(sftp, local, remote) - if result: - success += 1 - else: - skipped += 1 - except Exception as e: - print(f" [FAIL] {e}") - failed += 1 - - sftp.close() - print(f"\n{'=' * 60}") - print(f" Upload Summary: {success} ok, {skipped} skipped, {failed} failed") - print(f"{'=' * 60}") - - if failed > 0: - print("[WARN] Some uploads failed, but continuing with SQL execution...") - - print(f"\n{'=' * 60}") - print(" Executing SQL Commands...") - print(f"{'=' * 60}") - - run_ssh_command(ssh, MIGRATE_SQL_CMD, "Execute migrate_v12.sql") - - run_ssh_command(ssh, CREATE_FEED_WEIGHT_TABLE_SQL, "Create tool_feed_weight_config table if not exists") - - run_ssh_command(ssh, INSERT_DEFAULT_DATA_SQL, "Insert default feed weight config data") - - run_ssh_command(ssh, INSERT_MENU_SQL, "Insert admin menu entries for new modules") - - ssh.close() - print(f"\n{'=' * 60}") - print(" All done!") - print(f"{'=' * 60}") - - -if __name__ == "__main__": - main() diff --git a/docs/toolsapi/scripts/upload_v13_rank.py b/docs/toolsapi/scripts/upload_v13_rank.py deleted file mode 100644 index 8cf3e154..00000000 --- a/docs/toolsapi/scripts/upload_v13_rank.py +++ /dev/null @@ -1,83 +0,0 @@ -"""Upload Phase 4 (Rank System) files + execute migration""" -import paramiko -import os - -HOST = '123.207.67.197' -USER = 'root' -PASS = '520Kiss123' -REMOTE_BASE = '/www/wwwroot/tools.wktyl.com' -LOCAL_BASE = r'e:\project\flutter\f\xianyan\docs\toolsapi' - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect(HOST, username=USER, password=PASS) -sftp = ssh.open_sftp() - -files = [ - ('application/admin/command/Install/migrate_v13.sql', 'application/admin/command/Install/migrate_v13.sql'), - ('application/api/controller/Rank.php', 'application/api/controller/Rank.php'), - ('application/admin/controller/RankSeason.php', 'application/admin/controller/RankSeason.php'), - ('application/admin/model/RankSeason.php', 'application/admin/model/RankSeason.php'), - ('application/admin/view/rank_season/index.html', 'application/admin/view/rank_season/index.html'), - ('application/admin/view/rank_season/add.html', 'application/admin/view/rank_season/add.html'), - ('application/admin/view/rank_season/edit.html', 'application/admin/view/rank_season/edit.html'), - ('public/assets/js/backend/rank_season.js', 'public/assets/js/backend/rank_season.js'), - ('application/admin/lang/zh-cn/rank_season.php', 'application/admin/lang/zh-cn/rank_season.php'), - ('application/admin/controller/user/RankRecord.php', 'application/admin/controller/user/RankRecord.php'), - ('application/admin/model/RankRecord.php', 'application/admin/model/RankRecord.php'), - ('application/admin/view/user/rank_record/index.html', 'application/admin/view/user/rank_record/index.html'), - ('public/assets/js/backend/user/rank_record.js', 'public/assets/js/backend/user/rank_record.js'), - ('application/admin/lang/zh-cn/user/rank_record.php', 'application/admin/lang/zh-cn/user/rank_record.php'), -] - -for local_rel, remote_rel in files: - local = os.path.join(LOCAL_BASE, local_rel) - remote = REMOTE_BASE + '/' + remote_rel - remote_dir = os.path.dirname(remote).replace('\\', '/') - try: - try: - sftp.stat(remote_dir) - except FileNotFoundError: - ssh.exec_command(f'mkdir -p {remote_dir}') - import time; time.sleep(0.3) - sftp.put(local, remote) - print(f'[OK] {remote_rel}') - except Exception as e: - print(f'[FAIL] {remote_rel}: {e}') - -sftp.close() - -# Execute migration SQL -print('\n--- Executing migration SQL ---') -sql_path = '/tmp/migrate_v13.sql' -local_sql = os.path.join(LOCAL_BASE, 'application/admin/command/Install/migrate_v13.sql') -sftp = ssh.open_sftp() -with sftp.open(sql_path, 'w') as f: - f.write(open(local_sql, 'r', encoding='utf-8').read()) -sftp.close() - -cmd = f"mysql -u tools -p'tools' --default-character-set=utf8mb4 tools < {sql_path}" -stdin, stdout, stderr = ssh.exec_command(cmd) -err = stderr.read().decode().strip() -exit_code = stdout.channel.recv_exit_status() -if err: - print(f'SQL ERR: {err[:300]}') -else: - print('SQL executed successfully!') -print(f'Exit: {exit_code}') - -# Insert admin menu entries -print('\n--- Inserting admin menu entries ---') -menu_sql = """INSERT IGNORE INTO tool_auth_rule (id,type,pid,name,title,icon,ismenu,weigh,status) VALUES (250,'file',0,'rank_season','赛季管理','fa fa-trophy',1,0,'normal'),(251,'file',250,'rank_season/index','查看','',0,0,'normal'),(252,'file',250,'rank_season/add','添加','',0,0,'normal'),(253,'file',250,'rank_season/edit','编辑','',0,0,'normal'),(254,'file',250,'rank_season/del','删除','',0,0,'normal'),(255,'file',250,'rank_season/settle','结算','',0,0,'normal'),(260,'file',0,'user/rank_record','排名记录','fa fa-list-ol',1,0,'normal'),(261,'file',260,'user/rank_record/index','查看','',0,0,'normal')""" -cmd2 = f"mysql -u tools -p'tools' --default-character-set=utf8mb4 tools -e \"{menu_sql}\"" -stdin, stdout, stderr = ssh.exec_command(cmd2) -err2 = stderr.read().decode().strip() -exit2 = stdout.channel.recv_exit_status() -if err2: - print(f'Menu ERR: {err2[:200]}') -else: - print('Menu entries inserted!') -print(f'Exit: {exit2}') - -ssh.close() -print('\nAll done!') diff --git a/docs/toolsapi/scripts/upload_v15_admin.py b/docs/toolsapi/scripts/upload_v15_admin.py deleted file mode 100644 index 530615a8..00000000 --- a/docs/toolsapi/scripts/upload_v15_admin.py +++ /dev/null @@ -1,57 +0,0 @@ -"""Upload Phase 5 (Admin completion) + menu entries""" -import paramiko -import os - -HOST = '123.207.67.197' -USER = 'root' -PASS = '520Kiss123' -REMOTE_BASE = '/www/wwwroot/tools.wktyl.com' -LOCAL_BASE = r'e:\project\flutter\f\xianyan\docs\toolsapi' - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -ssh.connect(HOST, username=USER, password=PASS) -sftp = ssh.open_sftp() - -files = [ - ('application/admin/controller/user/UserExpLog.php', 'application/admin/controller/user/UserExpLog.php'), - ('application/admin/model/UserExpLog.php', 'application/admin/model/UserExpLog.php'), - ('application/admin/view/user/user_exp_log/index.html', 'application/admin/view/user/user_exp_log/index.html'), - ('public/assets/js/backend/user/user_exp_log.js', 'public/assets/js/backend/user/user_exp_log.js'), - ('application/admin/lang/zh-cn/user/user_exp_log.php', 'application/admin/lang/zh-cn/user/user_exp_log.php'), - ('application/admin/view/user/user/edit.html', 'application/admin/view/user/user/edit.html'), - ('application/admin/lang/zh-cn/user/user.php', 'application/admin/lang/zh-cn/user/user.php'), -] - -for local_rel, remote_rel in files: - local = os.path.join(LOCAL_BASE, local_rel) - remote = REMOTE_BASE + '/' + remote_rel - remote_dir = os.path.dirname(remote).replace('\\', '/') - try: - try: - sftp.stat(remote_dir) - except FileNotFoundError: - ssh.exec_command(f'mkdir -p {remote_dir}') - import time; time.sleep(0.3) - sftp.put(local, remote) - print(f'[OK] {remote_rel}') - except Exception as e: - print(f'[FAIL] {remote_rel}: {e}') - -sftp.close() - -# Insert admin menu entries for EXP log -print('\n--- Inserting admin menu entries ---') -menu_sql = """INSERT IGNORE INTO tool_auth_rule (id,type,pid,name,title,icon,ismenu,weigh,status) VALUES (270,'file',0,'user/user_exp_log','EXP日志','fa fa-bolt',1,0,'normal'),(271,'file',270,'user/user_exp_log/index','查看','',0,0,'normal')""" -cmd = f"mysql -u tools -p'tools' --default-character-set=utf8mb4 tools -e \"{menu_sql}\"" -stdin, stdout, stderr = ssh.exec_command(cmd) -err = stderr.read().decode().strip() -exit_code = stdout.channel.recv_exit_status() -if err: - print(f'Menu ERR: {err[:200]}') -else: - print('Menu entries inserted!') -print(f'Exit: {exit_code}') - -ssh.close() -print('\nAll done!') diff --git a/docs/toolsapi/scripts/verify_message_forwarding.py b/docs/toolsapi/scripts/verify_message_forwarding.py deleted file mode 100644 index bdf6fe46..00000000 --- a/docs/toolsapi/scripts/verify_message_forwarding.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env python3 -""" -Test message forwarding between two devices via signaling server -""" -import asyncio -import websockets -import json - -SIGNALING_URL = 'wss://tools.wktyl.com:9443' - -async def recv_all(ws, label, timeout=3): - msgs = [] - try: - while True: - resp = await asyncio.wait_for(ws.recv(), timeout=timeout) - data = json.loads(resp) - msgs.append(data) - t = data.get('type', '?') - print(f' [{label}] RECV type={t}') - except asyncio.TimeoutError: - pass - return msgs - -async def test(): - print('=' * 60) - print('Test: Message forwarding between devices') - print('=' * 60) - - async with websockets.connect(SIGNALING_URL) as ws_a: - await recv_all(ws_a, 'A', timeout=2) - - await ws_a.send(json.dumps({ - 'type': 'register', - 'from': '', - 'payload': {'userId': '67', 'alias': 'Device-A', 'deviceModel': 'iPhone'} - })) - msgs = await recv_all(ws_a, 'A', timeout=2) - reg_a = next((m for m in msgs if m.get('type') == 'registered'), None) - device_a_id = reg_a.get('id', '') if reg_a else '' - print(f'Device A id: {device_a_id}') - - async with websockets.connect(SIGNALING_URL) as ws_b: - await recv_all(ws_b, 'B', timeout=2) - - await ws_b.send(json.dumps({ - 'type': 'register', - 'from': '', - 'payload': {'userId': '67', 'alias': 'Device-B', 'deviceModel': 'MacBook'} - })) - msgs_b = await recv_all(ws_b, 'B', timeout=2) - reg_b = next((m for m in msgs_b if m.get('type') == 'registered'), None) - device_b_id = reg_b.get('id', '') if reg_b else '' - print(f'Device B id: {device_b_id}') - - await asyncio.sleep(0.5) - - # Test 1: A sends text-message to B - print(f'\n--- Test 1: A sends text-message to B ---') - await ws_a.send(json.dumps({ - 'type': 'text-message', - 'from': device_a_id, - 'to': device_b_id, - 'payload': {'text': 'Hello from A!', 'timestamp': 1000}, - 'ts': 1000 - })) - print(f' [A] SENT text-message to {device_b_id}') - - msgs_b = await recv_all(ws_b, 'B', timeout=3) - text_msgs = [m for m in msgs_b if m.get('type') == 'text-message'] - if text_msgs: - print(f' ✅ B received text-message: {text_msgs[0].get("payload", {}).get("text")}') - else: - print(f' ❌ B did NOT receive text-message!') - print(f' B received types: {[m.get("type") for m in msgs_b]}') - - # Test 2: A sends file-meta to B - print(f'\n--- Test 2: A sends file-meta to B ---') - await ws_a.send(json.dumps({ - 'type': 'file-meta', - 'from': device_a_id, - 'to': device_b_id, - 'payload': { - 'fileName': 'test.txt', - 'fileSize': 1024, - 'mimeType': 'text/plain', - 'taskId': 'task-001' - }, - 'ts': 2000 - })) - print(f' [A] SENT file-meta to {device_b_id}') - - msgs_b = await recv_all(ws_b, 'B', timeout=3) - file_msgs = [m for m in msgs_b if m.get('type') == 'file-meta'] - if file_msgs: - print(f' ✅ B received file-meta: {file_msgs[0].get("payload", {}).get("fileName")}') - else: - print(f' ❌ B did NOT receive file-meta!') - print(f' B received types: {[m.get("type") for m in msgs_b]}') - - # Test 3: B sends text-message to A - print(f'\n--- Test 3: B sends text-message to A ---') - await ws_b.send(json.dumps({ - 'type': 'text-message', - 'from': device_b_id, - 'to': device_a_id, - 'payload': {'text': 'Hello from B!', 'timestamp': 3000}, - 'ts': 3000 - })) - print(f' [B] SENT text-message to {device_a_id}') - - msgs_a = await recv_all(ws_a, 'A', timeout=3) - text_msgs_a = [m for m in msgs_a if m.get('type') == 'text-message'] - if text_msgs_a: - print(f' ✅ A received text-message: {text_msgs_a[0].get("payload", {}).get("text")}') - else: - print(f' ❌ A did NOT receive text-message!') - print(f' A received types: {[m.get("type") for m in msgs_a]}') - - print('\n' + '=' * 60) - print('Test complete') - -if __name__ == '__main__': - asyncio.run(test()) diff --git a/index.html b/index.html new file mode 100644 index 00000000..b5df87cf --- /dev/null +++ b/index.html @@ -0,0 +1,1803 @@ + + + + + +闲言 AppBar 扩展设计 - 交互原型 v2 + + + + +
+
+
📱 AppBar 交互原型 v2（点击角色/闲言/日期体验）
+
+
+ 9:41 +
+ + +
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 闲言 +
+ +
+ 5月20日 + +
+ +
+
+ +
+
+
+ +
🐱 喵~ 点击我试试！
+ +
+
人生如逆旅，我亦是行人。
+
— 苏轼《临江仙》
+
+ +
+
+ 🎨 + 创作卡片 +
+
+ 📝 + 编辑此句 +
+
+ +
+ 📖 句子广场 + 最新 ↓ +
+ +
+
+
山有木兮木有枝，心悦君兮君不知。
+
《越人歌》❤️ 2.3k
+
+
+
落霞与孤鹜齐飞，秋水共长天一色。
+
王勃《滕王阁序》❤️ 1.8k
+
+
+
但愿人长久，千里共婵娟。
+
苏轼《水调歌头》❤️ 3.1k
+
+
+ +
+
+ +
+
+
🐱
+
闲言
+
+
+
🧭
+
发现
+
+
+
👤
+
我的
+
+
+
+ +
+ +
+
+
+
+ 日期栏设置 +
✕
+
+ + +
+
🌤 天气信息
+
+
+
☀️
+
26°
+
晴 · 杭州
+
+
+
💧
+
62%
+
湿度
+
+
+
🌬
+
东南3级
+
风向风力
+
+
+
🛡
+
优
+
空气质量
+
+
+
+ + +
+
📱 设备信息
+
+
+
📲
+
iPhone 16
+
设备型号
+
+
+
🔋
+
85%
+
电池状态
+
+
+
+ + +
+
🌐 网络/IP
+
+
+
📍
+
192.168.1.***
+
IP归属地 · 浙江杭州 · WiFi
+
+
+
+ + +
+
✏️ 自定义文案 5/14
+ +
+ + +
+
📋 日期栏显示项 2/3
+
+
📅 日期 ✓
+
🌤 天气 ✓
+
🌡 温度
+
📍 城市
+
📱 设备
+
🔋 电池
+
🌐 IP
+
✏️ 自定义
+
+
+ + +
+
+
+
🔄 轮播显示
+
文字超过10字时自动滚动轮播
+
+
+
+
+
+
+ + +
+
⚡ 动画强度
+ +
+ 关闭 + 柔和 + 标准 + 强烈 +
+
+ +
+ +
+
+
+
+ +
+
+ + ① 角色 - 点击/双击/长按（耳朵鼻子脸蛋全动画） +
+
+ + ② 闲言 - 点击后角色看向标题 +
+
+ + ③ 日期 - 最多3项+轮播+14字限制 +
+
+
+
+ + +
+

🎯 方案A 动画系统设计

+

增强 CustomPainter · 3D质感 · 全部件动画 · 动画强度联动

+ +
+
+
👂
+
+
耳朵动画
+
点击摆动、惊讶竖起、开心下垂、挠痒快速抖动。独立transform-origin，受动画强度影响幅度
+
+
+
+
👃
+
+
鼻子动画
+
点击抽动、闻嗅缩放、挠痒快速颤动。使用scaleXY错位缩放模拟3D皱鼻
+
+
+
+
😊
+
+
脸蛋动画
+
开心鼓起、害羞膨胀、挠痒交替鼓腮。rx属性动画+腮红opacity联动
+
+
+
+
👁
+
+
眼睛动画
+
自动眨眼、点击闭眼、惊讶放大、看向闲言偏移、跟随手指。双高光点模拟3D球面
+
+
+
+
👄
+
+
嘴巴动画
+
微笑弧线、惊讶O型、开心大笑、挠痒交替张合。贝塞尔曲线动态控制点
+
+
+
+
🐱
+
+
胡须动画
+
点击摆动、挠痒快速颤动。独立transform-origin，左右对称旋转
+
+
+
+
👆
+
+
点击 → 全部件联动
+
单次点击触发：眨眼+耳朵摆+鼻子抽+嘴巴变，所有部件协同而非单一动画
+
+
+
+
👆👆
+
+
双击 → 特殊反应
+
爱心眼+脸蛋鼓起+耳朵竖起+嘴巴大笑，持续2s后恢复。confetti粒子特效
+
+
+
+
✊
+
+
长按 → 挠痒循环
+
耳朵快速抖动+鼻子颤动+脸蛋交替鼓+嘴巴张合+胡须摆动，循环播放直到松手
+
+
+
+
👀
+
+
眼睛跟随手指
+
Listener监听全局指针，计算偏移量映射到眼球位移，最大偏移2px。受动画强度影响灵敏度
+
+
+
+
📝
+
+
点击闲言 → 看向标题
+
眼球向右偏移+头微倾+耳朵微调，0.3s后回正。模拟"听到名字转头"的自然感
+
+
+
+
⚡
+
+
动画强度联动
+
读取themeSettingsProvider.animationIntensity，影响：弹跳幅度/耳朵摆角/鼻子缩放比/腮红透明度/眨眼频率
+
+
+
+
📅
+
+
日期栏最多3项
+
chip选择限制3个，超出时未选chip变灰禁用。自定义文案14字上限，超限红框提示
+
+
+
+
🔄
+
+
轮播显示
+
显示文本超过10字时自动横向滚动轮播，可开关。使用AnimatedMarquee组件，3s一周期
+
+
+
+
+ + + + + diff --git a/lib/app/app.dart b/lib/app/app.dart index 669aad23..6f97a09e 100644 --- a/lib/app/app.dart +++ b/lib/app/app.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 应用根组件 /// 创建时间: 2026-04-20 -/// 更新时间: 2026-05-19 +/// 更新时间: 2026-05-20 /// 作用: MaterialApp.router + Riverpod 主题管理 + GlassTheme + flutter_animate -/// 上次更新: 增加语言切换淡入淡出动画_LocaleTransitionWrapper +/// 上次更新: 自定义字体通过customFontFamily全局生效 /// ============================================================ import 'dart:async'; @@ -29,7 +29,7 @@ import '../core/theme/app_theme.dart'; import '../core/utils/logger.dart'; import '../core/utils/platform_utils.dart' as pu; import '../features/settings/providers/theme_settings_provider.dart'; -import '../features/settings/presentation/font_management_page.dart'; +import '../features/settings/presentation/font_management_notifier.dart'; import '../l10n/app_locale.dart'; import '../main.dart' show liquidGlassReady; @@ -127,10 +127,11 @@ class _XianyanAppState extends ConsumerState final builtInFontFamilies = fontStyleOptions .map((opt) => opt.fontFamily) .toSet(); - final effectiveFontFamily = - (!builtInFontFamilies.contains(fontState.activeFontFamily)) - ? fontState.activeFontFamily - : settings.fontStyle.fontFamily; + final effectiveFontFamily = settings.customFontFamily.isNotEmpty + ? settings.customFontFamily + : (!builtInFontFamilies.contains(fontState.activeFontFamily) + ? fontState.activeFontFamily + : settings.fontStyle.fontFamily); final theme = AppTheme.buildFromSettings( isDark: settings.isDark, diff --git a/lib/core/constants/character_name.dart b/lib/core/constants/character_name.dart new file mode 100644 index 00000000..98851a53 --- /dev/null +++ b/lib/core/constants/character_name.dart @@ -0,0 +1,37 @@ +// ============================================================ +// 闲言APP — 角色命名常量 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 定义角色"拾光"的名称、全称、介绍等常量 +// 上次更新: 初始版本 — 拾光命名体系 +// ============================================================ + +class CharacterName { + CharacterName._(); + + static const String givenName = '拾光'; + + static const String fullName = '闲言拾光'; + + static const String renameHint = '暂不支持改名'; + + static const String introduction = '拾光是一只陪伴你阅读的小精灵，' + '会在闲言的每个角落守护你的阅读时光。' + '点击它可以和它互动哦~'; + + static const String appBarTitle = '闲言'; + + static const String barName = '拾光栏'; + + static const String barFullName = '闲言拾光栏'; + + static String characterGreeting(String characterId) { + return switch (characterId) { + 'cat' => '喵~ 我是拾光！', + 'dog' => '汪~ 我是拾光！', + 'boy' => '嗨，我是拾光！', + 'girl' => '你好呀，我是拾光！', + _ => '你好，我是拾光！', + }; + } +} diff --git a/lib/core/router/app_router.dart b/lib/core/router/app_router.dart index c3c5fb98..0c5ab2a4 100644 --- a/lib/core/router/app_router.dart +++ b/lib/core/router/app_router.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 路由配置 // 创建时间: 2026-04-20 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: go_router 路由表 + ShellRoute 布局壳 + iOS 风格转场 -// 上次更新: 新增协议模块路由（/agreements + /agreement/:type） +// 上次更新: v14.36.0 AppRoutes新增languageSettings常量，修复鸿蒙端语言设置页无法打开 // ============================================================ import 'dart:typed_data'; @@ -99,8 +99,10 @@ import '../../features/collaboration/screen_share/pages/screen_share_page.dart'; import '../../features/daily_card/presentation/daily_card_page.dart'; import '../../features/template/presentation/template_gallery_page.dart'; import '../../features/reading_report/presentation/reading_report_page.dart'; -import '../../features/weather/presentation/weather_page.dart'; import '../../features/poetry/presentation/poetry_page.dart'; +import '../../features/poetry/presentation/poetry_settings_page.dart'; +import '../../features/weather/presentation/weather_page.dart'; +import '../../features/weather/presentation/weather_settings_page.dart'; import '../../features/pomodoro/presentation/pomodoro_page.dart'; import '../../features/countdown/presentation/countdown_page.dart'; import '../../features/solar_term/presentation/solar_term_page.dart'; @@ -143,6 +145,7 @@ class AppRoutes { static const String widgetManagement = '/widget-management'; static const String themeSettings = '/settings/theme'; static const String generalSettings = '/settings/general'; + static const String languageSettings = '/settings/language'; static const String accountSettings = '/settings/account'; static const String passwordSettings = '/settings/password'; static const String securityQuestion = '/settings/security-question'; @@ -197,7 +200,9 @@ class AppRoutes { static const String templateGallery = '/template-gallery'; static const String readingReport = '/reading-report'; static const String weather = '/weather'; + static const String weatherSettings = '/weather/settings'; static const String poetry = '/poetry'; + static const String poetrySettings = '/poetry/settings'; static const String pomodoro = '/pomodoro'; static const String countdown = '/countdown'; static const String solarTerm = '/solar-term'; @@ -448,7 +453,7 @@ final GoRouter appRouter = GoRouter( // 语言设置 — iOS 滑入 GoRoute( - path: '/settings/language', + path: AppRoutes.languageSettings, name: 'language-settings', parentNavigatorKey: rootNavigatorKey, pageBuilder: (context, state) => @@ -962,6 +967,14 @@ final GoRouter appRouter = GoRouter( iosSlideTransition(state: state, child: const WeatherPage()), ), + GoRoute( + path: AppRoutes.weatherSettings, + name: 'weather-settings', + parentNavigatorKey: rootNavigatorKey, + pageBuilder: (context, state) => + iosSlideTransition(state: state, child: const WeatherSettingsPage()), + ), + // 今日诗词 — iOS 滑入 GoRoute( path: AppRoutes.poetry, @@ -971,6 +984,14 @@ final GoRouter appRouter = GoRouter( iosSlideTransition(state: state, child: const PoetryPage()), ), + GoRoute( + path: AppRoutes.poetrySettings, + name: 'poetry-settings', + parentNavigatorKey: rootNavigatorKey, + pageBuilder: (context, state) => + iosSlideTransition(state: state, child: const PoetrySettingsPage()), + ), + // 番茄钟 — iOS 滑入 GoRoute( path: AppRoutes.pomodoro, diff --git a/lib/core/router/ohos_nav_bridge.dart b/lib/core/router/ohos_nav_bridge.dart index 98ca7a36..51c39dfc 100644 --- a/lib/core/router/ohos_nav_bridge.dart +++ b/lib/core/router/ohos_nav_bridge.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 鸿蒙端导航桥接 /// 创建时间: 2026-05-18 -/// 更新时间: 2026-05-18 +/// 更新时间: 2026-05-20 /// 作用: 鸿蒙端使用CupertinoTabView导航，桥接GoRouter路由到Navigator.push -/// 上次更新: 补全33条缺失路由映射，支持extra参数传递 +/// 上次更新: v14.36.0 新增语言设置页路由映射，修复鸿蒙端无法打开多语言界面 /// ============================================================ /// /// 鸿蒙端不使用GoRouter（因MaterialApp.router白屏）， @@ -44,6 +44,7 @@ import 'package:xianyan/features/source/presentation/source_page.dart'; import 'package:xianyan/features/member/presentation/member_page.dart'; import 'package:xianyan/features/settings/presentation/theme/theme_settings_page.dart'; import 'package:xianyan/features/settings/presentation/general/general_settings_page.dart'; +import 'package:xianyan/features/settings/presentation/language_settings_page.dart'; import 'package:xianyan/features/settings/presentation/account/account_settings_page.dart'; import 'package:xianyan/features/settings/presentation/account/account_deletion_page.dart'; import 'package:xianyan/features/settings/presentation/data_management_page.dart'; @@ -135,6 +136,7 @@ class OhosNavBridge { AppRoutes.member: (_) => const MemberPage(), AppRoutes.themeSettings: (_) => const ThemeSettingsPage(), AppRoutes.generalSettings: (_) => const GeneralSettingsPage(), + AppRoutes.languageSettings: (_) => const LanguageSettingsPage(), AppRoutes.accountSettings: (_) => const AccountSettingsPage(), AppRoutes.accountDeletion: (_) => const AccountDeletionPage(), AppRoutes.dataManagement: (_) => const DataManagementPage(), diff --git a/lib/core/services/audio/sfx_service.dart b/lib/core/services/audio/sfx_service.dart new file mode 100644 index 00000000..922fee5f --- /dev/null +++ b/lib/core/services/audio/sfx_service.dart @@ -0,0 +1,97 @@ +// ============================================================ +// 闲言APP — 音效反馈公共类 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 全局音效播放管理，支持开关/音量/风格切换 +// 上次更新: 补充音效文件+风格播放参数(柔和降速降音/清脆提速亮音) +// ============================================================ + +import 'package:audioplayers/audioplayers.dart'; +import 'package:xianyan/core/storage/app_kv_store.dart'; +import 'package:xianyan/core/utils/logger.dart'; + +enum SfxType { + like('like_pop'), + unlike('unlike_soft'), + favorite('favorite_star'), + unfavorite('unfavorite'), + cardSwipe('card_swipe'), + tabClick('tab_click'), + refresh('refresh_bubble'), + characterPop('character_pop'), + shake('shake_bell'); + + const SfxType(this.fileName); + final String fileName; +} + +enum SfxStyle { + standard('标准', 'sfx', 1.0, 1.0), + soft('柔和', 'sfx_soft', 0.8, 0.6), + crisp('清脆', 'sfx_crisp', 1.3, 0.9); + + const SfxStyle(this.label, this.folder, this.playbackRate, this.volumeScale); + final String label; + final String folder; + final double playbackRate; + final double volumeScale; +} + +class SfxService { + SfxService._(); + static final SfxService instance = SfxService._(); + + static const _keyEnabled = 'sfx_enabled'; + static const _keyStyle = 'sfx_style'; + static const _keyVolume = 'sfx_volume'; + + final AudioPlayer _player = AudioPlayer(); + bool _enabled = true; + SfxStyle _style = SfxStyle.standard; + double _volume = 0.7; + + bool get isEnabled => _enabled; + SfxStyle get style => _style; + double get volume => _volume; + + Future init() async { + _enabled = AppKVStore.getBool(_keyEnabled) ?? true; + final styleIndex = AppKVStore.getInt(_keyStyle) ?? 0; + _style = SfxStyle.values[styleIndex.clamp(0, SfxStyle.values.length - 1)]; + _volume = AppKVStore.getDouble(_keyVolume) ?? 0.7; + await _player.setVolume(_volume * _style.volumeScale); + } + + Future play(SfxType type) async { + if (!_enabled) return; + try { + final path = 'sounds/sfx/${_style.folder}/${type.fileName}.mp3'; + await _player.stop(); + await _player.setVolume(_volume * _style.volumeScale); + await _player.setPlaybackRate(_style.playbackRate); + await _player.play(AssetSource(path)); + } catch (e) { + Log.e('SfxService play error', e); + } + } + + void setEnabled(bool enabled) { + _enabled = enabled; + AppKVStore.setBool(_keyEnabled, enabled); + } + + void setStyle(SfxStyle style) { + _style = style; + AppKVStore.setInt(_keyStyle, style.index); + } + + void setVolume(double volume) { + _volume = volume.clamp(0.0, 1.0); + AppKVStore.setDouble(_keyVolume, _volume); + _player.setVolume(_volume * _style.volumeScale); + } + + void dispose() { + _player.dispose(); + } +} diff --git a/lib/core/services/audio/tts_service.dart b/lib/core/services/audio/tts_service.dart new file mode 100644 index 00000000..970e287d --- /dev/null +++ b/lib/core/services/audio/tts_service.dart @@ -0,0 +1,174 @@ +// ============================================================ +// 闲言APP — TTS语音朗读公共类 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 统一TTS语音朗读管理，跨平台兼容 +// 上次更新: 初始版本 +// ============================================================ + +import 'dart:async'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter_tts/flutter_tts.dart'; +import 'package:xianyan/core/storage/app_kv_store.dart'; +import 'package:xianyan/core/utils/logger.dart'; + +enum TtsState { idle, speaking, paused, loading } + +class TtsService { + TtsService._(); + static final TtsService instance = TtsService._(); + + static const _keySpeed = 'tts_speed'; + static const _keyPitch = 'tts_pitch'; + static const _keyVolume = 'tts_volume'; + + FlutterTts? _flutterTts; + TtsState _state = TtsState.idle; + bool _isAvailable = false; + String _currentText = ''; + + TtsState get state => _state; + bool get isAvailable => _isAvailable; + bool get isSpeaking => _state == TtsState.speaking; + String get currentText => _currentText; + + final _stateController = StreamController.broadcast(); + Stream get onStateChanged => _stateController.stream; + + final _progressController = StreamController<(int, int, String)>.broadcast(); + Stream<(int, int, String)> get onProgress => _progressController.stream; + + Future init() async { + if (_flutterTts != null) return; + + try { + _flutterTts = FlutterTts(); + + _flutterTts!.setStartHandler(() { + _state = TtsState.speaking; + _stateController.add(_state); + }); + + _flutterTts!.setCompletionHandler(() { + _state = TtsState.idle; + _currentText = ''; + _stateController.add(_state); + }); + + _flutterTts!.setPauseHandler(() { + _state = TtsState.paused; + _stateController.add(_state); + }); + + _flutterTts!.setContinueHandler(() { + _state = TtsState.speaking; + _stateController.add(_state); + }); + + _flutterTts!.setErrorHandler((msg) { + Log.e('TtsService error: $msg'); + _state = TtsState.idle; + _stateController.add(_state); + }); + + _flutterTts!.setProgressHandler((text, start, end, word) { + _progressController.add((start, end, word)); + }); + + if (defaultTargetPlatform == TargetPlatform.iOS) { + await _flutterTts!.setSharedInstance(true); + await _flutterTts!.setIosAudioCategory( + IosTextToSpeechAudioCategory.playback, + [IosTextToSpeechAudioCategoryOptions.defaultToSpeaker], + ); + } + + await _flutterTts!.setLanguage('zh-CN'); + await _flutterTts!.setSpeechRate( + AppKVStore.getDouble(_keySpeed) ?? 0.5, + ); + await _flutterTts!.setPitch(AppKVStore.getDouble(_keyPitch) ?? 1.0); + await _flutterTts!.setVolume(AppKVStore.getDouble(_keyVolume) ?? 0.8); + + final isAvailable = await _flutterTts!.isLanguageAvailable('zh-CN'); + _isAvailable = isAvailable == true; + } catch (e) { + Log.e('TtsService init error', e); + _isAvailable = false; + } + } + + Future speak(String text) async { + if (!_isAvailable || _flutterTts == null) { + await init(); + if (!_isAvailable) return; + } + + await stop(); + _currentText = text; + _state = TtsState.loading; + _stateController.add(_state); + + final result = await _flutterTts!.speak(text); + if (result != 1) { + _state = TtsState.idle; + _stateController.add(_state); + } + } + + Future stop() async { + if (_flutterTts != null && _state != TtsState.idle) { + await _flutterTts!.stop(); + _state = TtsState.idle; + _currentText = ''; + _stateController.add(_state); + } + } + + Future pause() async { + if (_flutterTts != null && _state == TtsState.speaking) { + await _flutterTts!.pause(); + } + } + + Future setSpeed(double rate) async { + AppKVStore.setDouble(_keySpeed, rate); + if (_flutterTts != null) { + await _flutterTts!.setSpeechRate(rate); + } + } + + Future setPitch(double pitch) async { + AppKVStore.setDouble(_keyPitch, pitch); + if (_flutterTts != null) { + await _flutterTts!.setPitch(pitch); + } + } + + Future setVolume(double volume) async { + AppKVStore.setDouble(_keyVolume, volume); + if (_flutterTts != null) { + await _flutterTts!.setVolume(volume); + } + } + + Future>> getAvailableVoices() async { + if (_flutterTts == null) return []; + try { + final voices = await _flutterTts!.getVoices; + if (voices is! List) return []; + return voices + .map((v) => Map.from(v as Map)) + .toList(); + } catch (_) { + return []; + } + } + + void dispose() { + _flutterTts?.stop(); + _stateController.close(); + _progressController.close(); + } +} diff --git a/lib/core/services/bluetooth/nearby_discovery_service.dart b/lib/core/services/bluetooth/nearby_discovery_service.dart new file mode 100644 index 00000000..824655df --- /dev/null +++ b/lib/core/services/bluetooth/nearby_discovery_service.dart @@ -0,0 +1,208 @@ +// ============================================================ +// 闲言APP — 蓝牙近场发现服务 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 使用BLE扫描发现附近使用闲言的用户 +// 上次更新: 初始版本（仅扫描发现，不做广播） +// ============================================================ + +import 'dart:async'; +import 'dart:convert'; +import 'dart:math' as math; + +import 'package:flutter/foundation.dart'; +import 'package:flutter_blue_plus/flutter_blue_plus.dart'; +import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/core/utils/platform_utils.dart' as pu; + +class NearbyUser { + const NearbyUser({ + required this.deviceId, + required this.deviceName, + required this.rssi, + required this.discoveredAt, + this.currentSentenceId, + this.currentSentenceContent, + }); + + final String deviceId; + final String deviceName; + final int rssi; + final DateTime discoveredAt; + final String? currentSentenceId; + final String? currentSentenceContent; + + String get displayName => + deviceName.isNotEmpty ? deviceName : '匿名闲言用户'; + + double get distance => + math.pow(10, (-69 - rssi) / (10 * 2)).toDouble(); + + String get distanceText { + final d = distance; + if (d < 1) return '${(d * 100).toStringAsFixed(0)}cm'; + if (d < 100) return '${d.toStringAsFixed(1)}m'; + return '${d.toStringAsFixed(0)}m'; + } +} + +class NearbyDiscoveryService { + NearbyDiscoveryService._(); + static final NearbyDiscoveryService instance = NearbyDiscoveryService._(); + + static const String _serviceUuid = + '0000fea9-0000-1000-8000-00805f9b34fb'; + + bool _isScanning = false; + bool _isPlatformSupported = true; + final Map _nearbyUsers = {}; + + StreamSubscription>? _scanResultSub; + + bool get isScanning => _isScanning; + List get nearbyUsers => _nearbyUsers.values.toList(); + int get nearbyCount => _nearbyUsers.length; + + final _usersController = StreamController>.broadcast(); + Stream> get onUsersChanged => _usersController.stream; + + final _scanningController = StreamController.broadcast(); + Stream get onScanningChanged => _scanningController.stream; + + bool _checkPlatformSupport() { + if (defaultTargetPlatform != TargetPlatform.iOS && + defaultTargetPlatform != TargetPlatform.android && + !pu.isOhos) { + _isPlatformSupported = false; + return false; + } + return true; + } + + bool get isAvailable { + if (!_isPlatformSupported) return false; + try { + return FlutterBluePlus.adapterStateNow == BluetoothAdapterState.on; + } catch (_) { + return false; + } + } + + Future checkAvailability() async { + if (!_checkPlatformSupport()) { + Log.w('NearbyDiscovery: Platform not supported'); + return false; + } + try { + final state = FlutterBluePlus.adapterStateNow; + return state == BluetoothAdapterState.on; + } catch (e) { + Log.w('NearbyDiscovery: Not available: $e'); + return false; + } + } + + Future startScan({ + Duration timeout = const Duration(seconds: 30), + }) async { + if (_isScanning) return; + if (!_checkPlatformSupport()) { + Log.w('NearbyDiscovery: Platform not supported, cannot scan'); + return; + } + if (!isAvailable) { + Log.w('NearbyDiscovery: Adapter not on, cannot scan'); + return; + } + + try { + _nearbyUsers.clear(); + _isScanning = true; + _scanningController.add(true); + Log.i('NearbyDiscovery: Starting scan...'); + + _scanResultSub?.cancel(); + _scanResultSub = FlutterBluePlus.scanResults.listen(_onScanResults); + + await FlutterBluePlus.startScan( + withServices: [Guid(_serviceUuid)], + timeout: timeout, + ); + } catch (e) { + Log.e('NearbyDiscovery: Scan start failed', e); + _isScanning = false; + _scanningController.add(false); + } + } + + void _onScanResults(List results) { + bool changed = false; + for (final result in results) { + final device = result.device; + final advData = result.advertisementData; + final name = device.platformName.isNotEmpty + ? device.platformName + : advData.advName; + + String? sentenceId; + String? sentenceContent; + for (final entry in advData.serviceData.entries) { + try { + final data = utf8.decode(entry.value); + final json = jsonDecode(data) as Map; + sentenceId = json['sid'] as String?; + sentenceContent = json['sc'] as String?; + } catch (_) {} + } + + final user = NearbyUser( + deviceId: device.remoteId.str, + deviceName: name, + rssi: result.rssi, + discoveredAt: DateTime.now(), + currentSentenceId: sentenceId, + currentSentenceContent: sentenceContent, + ); + + final existing = _nearbyUsers[device.remoteId.str]; + if (existing == null || + existing.rssi != user.rssi || + existing.currentSentenceId != user.currentSentenceId) { + changed = true; + } + _nearbyUsers[device.remoteId.str] = user; + } + + if (changed && !_usersController.isClosed) { + _usersController.add(nearbyUsers); + } + } + + Future stopScan() async { + if (!_isScanning) return; + _isScanning = false; + _scanningController.add(false); + _scanResultSub?.cancel(); + _scanResultSub = null; + try { + await FlutterBluePlus.stopScan(); + } catch (e) { + Log.w('NearbyDiscovery: Stop scan error: $e'); + } + Log.i('NearbyDiscovery: Scan stopped'); + } + + void clearUsers() { + _nearbyUsers.clear(); + if (!_usersController.isClosed) { + _usersController.add([]); + } + } + + void dispose() { + stopScan(); + _scanResultSub?.cancel(); + _usersController.close(); + _scanningController.close(); + } +} diff --git a/lib/core/services/data/backup_service.dart b/lib/core/services/data/backup_service.dart index a740cb5d..97368073 100644 --- a/lib/core/services/data/backup_service.dart +++ b/lib/core/services/data/backup_service.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 自动备份服务 /// 创建时间: 2026-05-04 -/// 更新时间: 2026-05-04 +/// 更新时间: 2026-05-20 /// 作用: 定时自动备份用户数据到本地，支持备份管理和恢复 -/// 上次更新: 初始创建 +/// 上次更新: 修复Web端path_provider MissingPluginException(增加isWeb守卫) /// ============================================================ import 'dart:convert'; @@ -12,11 +12,11 @@ import 'dart:io'; import 'package:archive/archive.dart'; import 'package:crypto/crypto.dart'; import 'package:hive/hive.dart'; -import 'package:path_provider/path_provider.dart'; import '../../storage/database/app_database.dart'; import '../../storage/kv_storage.dart'; import '../../utils/logger.dart'; +import '../../utils/platform_utils.dart' as pu; class BackupService { BackupService._(); @@ -76,8 +76,10 @@ class BackupService { } static Future get backupDirPath async { - final dir = await getApplicationDocumentsDirectory(); - final backupDir = Directory('${dir.path}/$_backupDirName'); + if (pu.isWeb) throw UnsupportedError('Web端不支持文件系统操作'); + final dirPath = await pu.safeAppDirPath; + if (dirPath == null) throw UnsupportedError('无法获取应用文档目录'); + final backupDir = Directory('$dirPath/$_backupDirName'); if (!await backupDir.exists()) { await backupDir.create(recursive: true); } diff --git a/lib/core/services/data/home_widget_service.dart b/lib/core/services/data/home_widget_service.dart index 6750f002..3989158c 100644 --- a/lib/core/services/data/home_widget_service.dart +++ b/lib/core/services/data/home_widget_service.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 桌面小组件数据管理服务 /// 创建时间: 2026-05-15 -/// 更新时间: 2026-05-19 +/// 更新时间: 2026-05-20 /// 作用: 基于home_widget库管理桌面小组件数据推送与交互 -/// 上次更新: updateWidget增加qualifiedAndroidName参数，修复Android类名拼接错误 +/// 上次更新: 新增拾光角色小组件数据键和更新方法 /// ============================================================ import 'package:home_widget/home_widget.dart'; @@ -33,6 +33,10 @@ class HomeWidgetService { static const String _keySolarTermPoem = 'solar_term_poem'; static const String _keyCheckinDays = 'checkin_days'; static const String _keyCheckinToday = 'checkin_today'; + static const String _keyDailyWithCharacterContent = 'daily_with_character_content'; + static const String _keyDailyWithCharacterAuthor = 'daily_with_character_author'; + static const String _keyDailyWithCharacterId = 'daily_with_character_id'; + static const String _keyDailyWithCharacterMood = 'daily_with_character_mood'; static const String _keyThemeMode = 'widget_theme_mode'; bool _initialized = false; @@ -169,6 +173,9 @@ class HomeWidgetService { case 'open_checkin': Log.i('HomeWidgetService: 打开签到页面'); break; + case 'open_daily_with_character': + Log.i('HomeWidgetService: 打开拾光每日一句'); + break; default: Log.i('HomeWidgetService: 未知操作 — $action'); } @@ -253,6 +260,32 @@ class HomeWidgetService { } } + Future updateDailyWithCharacter({ + required String content, + String? author, + String? sentenceId, + String mood = 'happy', + }) async { + try { + await _ensureInit(); + await HomeWidget.saveWidgetData( + _keyDailyWithCharacterContent, + content.length > 120 ? '${content.substring(0, 120)}...' : content, + ); + if (author != null) { + await HomeWidget.saveWidgetData(_keyDailyWithCharacterAuthor, author); + } + if (sentenceId != null) { + await HomeWidget.saveWidgetData(_keyDailyWithCharacterId, sentenceId); + } + await HomeWidget.saveWidgetData(_keyDailyWithCharacterMood, mood); + await updateWidget(WidgetType.dailyWithCharacter); + Log.i('HomeWidgetService: 拾光角色小组件已更新'); + } catch (e) { + Log.e('HomeWidgetService: 更新拾光角色小组件失败', e); + } + } + // ============================================================ // 通知原生小组件刷新 // ============================================================ @@ -305,6 +338,15 @@ class HomeWidgetService { _keyDailySentenceAuthor: await HomeWidget.getWidgetData( _keyDailySentenceAuthor, ), + _keyDailyWithCharacterContent: await HomeWidget.getWidgetData( + _keyDailyWithCharacterContent, + ), + _keyDailyWithCharacterAuthor: await HomeWidget.getWidgetData( + _keyDailyWithCharacterAuthor, + ), + _keyDailyWithCharacterMood: await HomeWidget.getWidgetData( + _keyDailyWithCharacterMood, + ), }; } catch (e) { Log.e('HomeWidgetService: 读取小组件数据失败', e); diff --git a/lib/core/services/device/battery_info_service.dart b/lib/core/services/device/battery_info_service.dart new file mode 100644 index 00000000..e4e307fe --- /dev/null +++ b/lib/core/services/device/battery_info_service.dart @@ -0,0 +1,102 @@ +// ============================================================ +// 闲言APP — 电池状态信息服务 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 监听电池电量和充电状态变化，提供 Stream 广播 +// 上次更新: 初始版本 +// ============================================================ + +import 'dart:async'; + +import 'package:battery_plus/battery_plus.dart'; + +import '../../utils/logger.dart'; + +class BatteryInfoService { + BatteryInfoService._(); + static final BatteryInfoService instance = BatteryInfoService._(); + + final Battery _battery = Battery(); + StreamSubscription? _stateSubscription; + Timer? _pollTimer; + + int _currentLevel = 100; + BatteryState _currentState = BatteryState.full; + bool _isInitialized = false; + + int get currentLevel => _currentLevel; + BatteryState get currentState => _currentState; + bool get isLowBattery => + _currentLevel < 20 && _currentState != BatteryState.charging; + bool get isCriticalBattery => + _currentLevel < 10 && _currentState != BatteryState.charging; + bool get isCharging => _currentState == BatteryState.charging; + + final _controller = StreamController.broadcast(); + Stream get onBatteryChanged => _controller.stream; + + Future init() async { + if (_isInitialized) return; + try { + _currentLevel = await _battery.batteryLevel; + _currentState = await _battery.batteryState; + _isInitialized = true; + + _stateSubscription = _battery.onBatteryStateChanged.listen((state) { + _currentState = state; + _notify(); + }); + + _pollTimer = Timer.periodic(const Duration(minutes: 5), (_) async { + try { + _currentLevel = await _battery.batteryLevel; + _notify(); + } catch (_) {} + }); + + _notify(); + Log.i('BatteryInfoService 初始化: level=$_currentLevel%, state=$_currentState'); + } catch (e) { + Log.e('BatteryInfoService init error', e); + } + } + + void _notify() { + if (!_controller.isClosed) { + _controller.add(BatteryInfo( + level: _currentLevel, + state: _currentState, + isLow: isLowBattery, + isCritical: isCriticalBattery, + )); + } + } + + Future refresh() async { + try { + _currentLevel = await _battery.batteryLevel; + _currentState = await _battery.batteryState; + _notify(); + } catch (_) {} + } + + void dispose() { + _stateSubscription?.cancel(); + _pollTimer?.cancel(); + _controller.close(); + } +} + +class BatteryInfo { + const BatteryInfo({ + required this.level, + required this.state, + required this.isLow, + required this.isCritical, + }); + + final int level; + final BatteryState state; + final bool isLow; + final bool isCritical; +} diff --git a/lib/core/services/device/device_info_service.dart b/lib/core/services/device/device_info_service.dart index ae0739b1..e48fad2d 100644 --- a/lib/core/services/device/device_info_service.dart +++ b/lib/core/services/device/device_info_service.dart @@ -1,10 +1,10 @@ -/// ============================================================ -/// 闲言APP — 设备信息服务 -/// 创建时间: 2026-05-10 -/// 更新时间: 2026-05-11 -/// 作用: 采集设备信息并自动注册到服务端 -/// 上次更新: v10.0.0 registerDeviceIfNeeded增加IP归属地查询+传递 -/// ============================================================ +// ============================================================ +// 闲言APP — 设备信息服务 +// 创建时间: 2026-05-10 +// 更新时间: 2026-05-20 +// 作用: 采集设备信息并自动注册到服务端 +// 上次更新: v14.31.0 新增cachedDeviceModel/cachedDeviceName缓存+initCache()方法 +// ============================================================ import 'dart:io'; @@ -25,6 +25,17 @@ class DeviceInfoService { static final _deviceInfoPlugin = DeviceInfoPlugin(); static const _prefKeyDeviceRegistered = 'device_registered_v2'; + static String? _cachedDeviceModel; + static String? _cachedDeviceName; + + static String? get cachedDeviceModel => _cachedDeviceModel; + static String? get cachedDeviceName => _cachedDeviceName; + + static Future initCache() async { + _cachedDeviceModel ??= await getDeviceModel(); + _cachedDeviceName ??= await getDeviceName(); + } + /// 获取设备唯一标识 static Future getDeviceId() async { try { @@ -46,12 +57,15 @@ class DeviceInfoService { /// 获取设备名称 static Future getDeviceName() async { + if (_cachedDeviceName != null) return _cachedDeviceName!; try { if (pu.isOhos) { final android = await _deviceInfoPlugin.androidInfo; - return android.model.isNotEmpty - ? android.model - : (android.brand.isNotEmpty ? android.brand : 'HarmonyOS'); + if (android.model.isNotEmpty) return android.model; + if (android.brand.isNotEmpty) return android.brand; + if (android.display.isNotEmpty) return android.display; + if (android.product.isNotEmpty) return android.product; + return 'HarmonyOS Device'; } else if (Platform.isAndroid) { final android = await _deviceInfoPlugin.androidInfo; return android.model.isNotEmpty @@ -67,12 +81,17 @@ class DeviceInfoService { return 'Unknown'; } - /// 获取设备型号 static Future getDeviceModel() async { + if (_cachedDeviceModel != null) return _cachedDeviceModel!; try { if (pu.isOhos) { final android = await _deviceInfoPlugin.androidInfo; - return '${android.brand} ${android.model}'.trim(); + final brand = android.brand.isNotEmpty ? android.brand : 'HarmonyOS'; + final model = android.model.isNotEmpty + ? android.model + : (android.display.isNotEmpty ? android.display : (android.product.isNotEmpty ? android.product : 'Device')); + final result = '$brand $model'.trim(); + return result == 'HarmonyOS Device' ? 'HarmonyOS Device' : result; } else if (Platform.isAndroid) { final android = await _deviceInfoPlugin.androidInfo; return '${android.brand} ${android.model}'.trim(); diff --git a/lib/core/services/device/shake_detector.dart b/lib/core/services/device/shake_detector.dart new file mode 100644 index 00000000..0750ba9b --- /dev/null +++ b/lib/core/services/device/shake_detector.dart @@ -0,0 +1,62 @@ +// ============================================================ +// 闲言APP — 摇一摇检测器 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 监听加速度传感器，检测摇一摇手势 +// 上次更新: 初始版本 +// ============================================================ + +import 'dart:async'; +import 'package:sensors_plus/sensors_plus.dart'; +import 'package:xianyan/core/utils/logger.dart'; + +typedef VoidCallback = void Function(); + +class ShakeDetector { + ShakeDetector._(); + static final ShakeDetector instance = ShakeDetector._(); + + static const double _threshold = 25.0; + static const Duration _minInterval = Duration(milliseconds: 1500); + + StreamSubscription? _subscription; + DateTime? _lastShakeTime; + bool _isEnabled = false; + + VoidCallback? onShake; + + bool get isEnabled => _isEnabled; + + void start({VoidCallback? onShakeCallback}) { + if (_isEnabled) return; + onShake = onShakeCallback; + _isEnabled = true; + + _subscription = accelerometerEventStream().listen((event) { + if (!_isEnabled) return; + + final acceleration = + (event.x * event.x) + (event.y * event.y) + (event.z * event.z); + if (acceleration > _threshold) { + final now = DateTime.now(); + if (_lastShakeTime == null || + now.difference(_lastShakeTime!) > _minInterval) { + _lastShakeTime = now; + Log.i('ShakeDetector: 检测到摇一摇'); + onShake?.call(); + } + } + }); + } + + void stop() { + _isEnabled = false; + _subscription?.cancel(); + _subscription = null; + } + + void dispose() { + stop(); + onShake = null; + } +} diff --git a/lib/core/services/network/ip_location_result.dart b/lib/core/services/network/ip_location_result.dart new file mode 100644 index 00000000..d14b7681 --- /dev/null +++ b/lib/core/services/network/ip_location_result.dart @@ -0,0 +1,145 @@ +// ============================================================ +// 闲言APP — 统一IP位置查询结果模型 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 合并 inspiration/file_transfer 两套 IpLocationResult，提供统一数据结构 +// 上次更新: 初始版本，合并两套IP服务模型 +// ============================================================ + +import 'package:xianyan/features/inspiration/services/ip_query_service.dart' + as inspiration; +import 'package:xianyan/features/file_transfer/models/ip_location_result.dart' + as transfer; + +class IpLocationResult { + const IpLocationResult({ + required this.ip, + required this.city, + required this.domain, + required this.fullText, + this.province, + this.queryTime, + this.fromCache = false, + }); + + final String ip; + final String city; + final String? province; + final String domain; + final String fullText; + final DateTime? queryTime; + final bool fromCache; + + // ============================================================ + // Getters + // ============================================================ + + String get displayIp => domain.isNotEmpty ? domain : ip; + + String get displayCity => city.isNotEmpty ? city : '未知'; + + bool get hasLocation => city.isNotEmpty; + + // ============================================================ + // 工厂方法 + // ============================================================ + + factory IpLocationResult.empty() { + return const IpLocationResult(ip: '', city: '', domain: '', fullText: ''); + } + + factory IpLocationResult.fromApi(Map json) { + final String cityRaw = json['city']?.toString() ?? ''; + final String provinceRaw = json['fw']?.toString() ?? ''; + return IpLocationResult( + ip: json['ip']?.toString() ?? '', + city: cityRaw, + province: provinceRaw.isNotEmpty ? provinceRaw : null, + domain: json['domain']?.toString() ?? '', + fullText: cityRaw.isNotEmpty ? cityRaw : '未知位置', + queryTime: DateTime.now(), + ); + } + + factory IpLocationResult.fromInspiration( + inspiration.IpLocationResult result, + ) { + return IpLocationResult( + ip: result.ip, + city: result.city, + province: result.province, + domain: '', + fullText: result.fullText, + fromCache: result.fromCache, + ); + } + + factory IpLocationResult.fromTransfer(transfer.IpLocationResult result) { + return IpLocationResult( + ip: result.ip, + city: result.city, + province: result.fw, + domain: result.domain, + fullText: result.city.isNotEmpty ? result.city : '未知位置', + queryTime: result.queryTime, + ); + } + + // ============================================================ + // 序列化 + // ============================================================ + + factory IpLocationResult.fromJson(Map json) { + return IpLocationResult( + ip: json['ip'] as String? ?? '', + city: json['city'] as String? ?? '', + province: json['province'] as String?, + domain: json['domain'] as String? ?? '', + fullText: json['fullText'] as String? ?? '', + queryTime: json['queryTime'] != null + ? DateTime.tryParse(json['queryTime'].toString()) + : null, + fromCache: json['fromCache'] as bool? ?? false, + ); + } + + Map toJson() { + return { + 'ip': ip, + 'city': city, + 'province': province, + 'domain': domain, + 'fullText': fullText, + 'queryTime': queryTime?.toIso8601String(), + 'fromCache': fromCache, + }; + } + + // ============================================================ + // copyWith + // ============================================================ + + IpLocationResult copyWith({ + String? ip, + String? city, + String? province, + String? domain, + String? fullText, + DateTime? queryTime, + bool? fromCache, + }) { + return IpLocationResult( + ip: ip ?? this.ip, + city: city ?? this.city, + province: province ?? this.province, + domain: domain ?? this.domain, + fullText: fullText ?? this.fullText, + queryTime: queryTime ?? this.queryTime, + fromCache: fromCache ?? this.fromCache, + ); + } + + @override + String toString() => + 'IpLocationResult(ip: $displayIp, city: $displayCity, fromCache: $fromCache)'; +} diff --git a/lib/core/services/network/ip_location_service.dart b/lib/core/services/network/ip_location_service.dart new file mode 100644 index 00000000..01e6535b --- /dev/null +++ b/lib/core/services/network/ip_location_service.dart @@ -0,0 +1,189 @@ +// ============================================================ +// 闲言APP — 统一IP归属地查询公共服务 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 合并 inspiration/file_transfer 两套IP查询服务，统一缓存与网络请求 +// 上次更新: 添加网络切换监听，自动刷新IP +// ============================================================ + +import 'dart:async'; +import 'dart:convert'; + +import 'package:connectivity_plus/connectivity_plus.dart'; +import 'package:dio/dio.dart'; + +import 'package:xianyan/core/services/network/ip_location_result.dart'; +import 'package:xianyan/core/network/api_client.dart'; +import 'package:xianyan/core/storage/app_kv_store.dart'; +import 'package:xianyan/core/utils/logger.dart'; + +class IpLocationService { + IpLocationService._(); + static final IpLocationService instance = IpLocationService._(); + + static const String _cacheKeyPrefix = 'ip_location_'; + static const String _cacheKeyMyIp = 'ip_location_my_ip'; + static const Duration _cacheExpiry = Duration(hours: 24); + + final ApiClient _api = ApiClient.instance; + + StreamSubscription>? _connectivitySubscription; + + // ============================================================ + // 网络切换监听 + // ============================================================ + + void startConnectivityListener() { + _connectivitySubscription?.cancel(); + _connectivitySubscription = + Connectivity().onConnectivityChanged.listen((results) { + final hasConnection = results.any((r) => r != ConnectivityResult.none); + if (hasConnection) { + forceRefreshMyIp(); + } + }); + } + + void stopConnectivityListener() { + _connectivitySubscription?.cancel(); + _connectivitySubscription = null; + } + + // ============================================================ + // 公开方法 + // ============================================================ + + Future queryMyIp() async { + try { + final cached = _loadCache(_cacheKeyMyIp); + if (cached != null) { + Log.i('IpLocation: 使用本机IP缓存 ${cached.displayIp}'); + return cached; + } + + final result = await _queryIp(); + if (result != null) { + _saveCache(_cacheKeyMyIp, result); + Log.i( + 'IpLocation: 本机IP查询成功 ${result.displayIp} → ${result.displayCity}'); + } + return result; + } catch (e) { + Log.e('IpLocation: 本机IP查询失败 $e'); + return null; + } + } + + Future queryIp(String ip) async { + if (ip.isEmpty) return null; + try { + final cacheKey = '$_cacheKeyPrefix${ip.replaceAll('.', '_')}'; + final cached = _loadCache(cacheKey); + if (cached != null) return cached; + + final result = await _queryIp(ip: ip); + if (result != null) { + _saveCache(cacheKey, result); + } + return result; + } catch (e) { + Log.e('IpLocation: IP查询失败 $e'); + return null; + } + } + + Future forceRefreshMyIp() async { + try { + _clearCache(_cacheKeyMyIp); + final result = await _queryIp(); + if (result != null) { + _saveCache(_cacheKeyMyIp, result); + Log.i( + 'IpLocation: 强制刷新本机IP ${result.displayIp} → ${result.displayCity}'); + } + return result; + } catch (e) { + Log.e('IpLocation: 强制刷新IP失败 $e'); + return null; + } + } + + // ============================================================ + // 底层请求 + // ============================================================ + + Future _queryIp({String? ip}) async { + try { + final data = {}; + if (ip != null && ip.isNotEmpty) data['ip'] = ip; + + final response = await _api.post>( + '/api/webapi/ip', + data: data.isNotEmpty ? data : null, + ); + + final body = response.data; + if (body == null) return null; + + final code = body['code'] as int? ?? 0; + if (code != 1) { + Log.w('IpLocation: API返回错误 ${body['msg']}'); + return null; + } + + final dataMap = body['data']; + if (dataMap == null || dataMap is! Map) return null; + + return IpLocationResult.fromApi(dataMap); + } on DioException catch (e) { + Log.e('IpLocation: 网络请求失败 ${e.message}'); + return null; + } catch (e) { + Log.e('IpLocation: 解析失败 $e'); + return null; + } + } + + // ============================================================ + // 缓存管理 (AppKVStore, 24h过期) + // ============================================================ + + IpLocationResult? _loadCache(String key) { + try { + final raw = AppKVStore.getString(key); + if (raw == null || raw.isEmpty) return null; + + final map = jsonDecode(raw) as Map; + final cachedTime = map['_cache_time'] as int? ?? 0; + final now = DateTime.now().millisecondsSinceEpoch; + + if (now - cachedTime > _cacheExpiry.inMilliseconds) { + _clearCache(key); + return null; + } + + return IpLocationResult.fromJson(map['data'] as Map); + } catch (e) { + Log.w('IpLocation: 缓存读取失败 $e'); + return null; + } + } + + void _saveCache(String key, IpLocationResult result) { + try { + final map = { + '_cache_time': DateTime.now().millisecondsSinceEpoch, + 'data': result.toJson(), + }; + AppKVStore.setString(key, jsonEncode(map)); + } catch (e) { + Log.w('IpLocation: 缓存保存失败 $e'); + } + } + + void _clearCache(String key) { + try { + AppKVStore.remove(key); + } catch (_) {} + } +} diff --git a/lib/core/services/nfc/nfc_share_service.dart b/lib/core/services/nfc/nfc_share_service.dart new file mode 100644 index 00000000..f5af2b38 --- /dev/null +++ b/lib/core/services/nfc/nfc_share_service.dart @@ -0,0 +1,218 @@ +// ============================================================ +// 闲言APP — NFC分享公共服务 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 统一NFC分享管理，跨平台兼容 +// 上次更新: 初始版本 +// ============================================================ + +import 'dart:async'; +import 'dart:convert'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter_nfc_kit/flutter_nfc_kit.dart'; +import 'package:ndef/ndef.dart' as ndef; +import 'package:xianyan/core/utils/logger.dart'; + +enum NfcShareState { + unavailable, + available, + scanning, + writing, + reading, + success, + error, +} + +class NfcShareResult { + const NfcShareResult({ + required this.state, + this.data, + this.error, + }); + + final NfcShareState state; + final Map? data; + final String? error; +} + +class NfcShareService { + NfcShareService._(); + static final NfcShareService instance = NfcShareService._(); + + bool _isAvailable = false; + NfcShareState _state = NfcShareState.unavailable; + + bool get isAvailable => _isAvailable; + NfcShareState get state => _state; + + final _stateController = StreamController.broadcast(); + Stream get onStateChanged => _stateController.stream; + + static const _mimeType = 'application/xianyan-sentence'; + + Future checkAvailability() async { + if (defaultTargetPlatform != TargetPlatform.iOS && + defaultTargetPlatform != TargetPlatform.android) { + _isAvailable = false; + _state = NfcShareState.unavailable; + return false; + } + + try { + final availability = await FlutterNfcKit.nfcAvailability; + _isAvailable = availability == NFCAvailability.available; + _state = _isAvailable ? NfcShareState.available : NfcShareState.unavailable; + Log.i('NfcShareService: Available = $_isAvailable'); + return _isAvailable; + } catch (e) { + Log.w('NfcShareService: checkAvailability error: $e'); + _isAvailable = false; + _state = NfcShareState.unavailable; + return false; + } + } + + Future shareSentence({ + required String sentenceId, + required String content, + String? author, + }) async { + if (!_isAvailable) { + _emit(const NfcShareResult( + state: NfcShareState.unavailable, + error: 'NFC不可用', + )); + return; + } + + try { + _state = NfcShareState.scanning; + _emit(const NfcShareResult(state: NfcShareState.scanning)); + + final tag = await FlutterNfcKit.poll( + timeout: const Duration(seconds: 30), + ); + + if (tag.ndefAvailable != true) { + _state = NfcShareState.error; + _emit(const NfcShareResult( + state: NfcShareState.error, + error: '标签不支持NDEF', + )); + await FlutterNfcKit.finish(); + return; + } + + if (tag.ndefWritable != true) { + _state = NfcShareState.error; + _emit(const NfcShareResult( + state: NfcShareState.error, + error: '标签不可写入', + )); + await FlutterNfcKit.finish(); + return; + } + + _state = NfcShareState.writing; + _emit(const NfcShareResult(state: NfcShareState.writing)); + + final data = jsonEncode({ + 'type': 'xianyan_sentence', + 'id': sentenceId, + 'content': content, + if (author != null) 'author': author, + 'timestamp': DateTime.now().millisecondsSinceEpoch, + }); + + final mimeRecord = ndef.NDEFRecord( + tnf: ndef.TypeNameFormat.media, + type: Uint8List.fromList(_mimeType.codeUnits), + id: Uint8List(0), + payload: Uint8List.fromList(utf8.encode(data)), + ); + + await FlutterNfcKit.writeNDEFRecords([mimeRecord]); + + _state = NfcShareState.success; + _emit(NfcShareResult( + state: NfcShareState.success, + data: {'id': sentenceId}, + )); + Log.i('NfcShareService: Sentence shared successfully'); + } catch (e) { + Log.e('NfcShareService: shareSentence error: $e'); + _state = NfcShareState.error; + _emit(NfcShareResult( + state: NfcShareState.error, + error: e.toString(), + )); + } finally { + try { + await FlutterNfcKit.finish(); + } catch (_) {} + _state = NfcShareState.available; + } + } + + Future?> readSentence() async { + if (!_isAvailable) return null; + + try { + _state = NfcShareState.reading; + _emit(const NfcShareResult(state: NfcShareState.reading)); + + await FlutterNfcKit.poll( + timeout: const Duration(seconds: 30), + ); + + final ndefRecords = await FlutterNfcKit.readNDEFRecords(); + for (final record in ndefRecords) { + try { + if (record.tnf != ndef.TypeNameFormat.media) continue; + if (record.type == null) continue; + + final recordType = String.fromCharCodes(record.type!); + if (recordType != _mimeType) continue; + + if (record.payload == null || record.payload!.isEmpty) continue; + + final text = utf8.decode(record.payload!); + final data = jsonDecode(text) as Map; + if (data['type'] == 'xianyan_sentence') { + _state = NfcShareState.success; + _emit(NfcShareResult(state: NfcShareState.success, data: data)); + Log.i('NfcShareService: Sentence read successfully'); + return data; + } + } catch (_) {} + } + + Log.w('NfcShareService: No xianyan_sentence record found'); + return null; + } catch (e) { + Log.e('NfcShareService: readSentence error: $e'); + _state = NfcShareState.error; + _emit(NfcShareResult( + state: NfcShareState.error, + error: e.toString(), + )); + return null; + } finally { + try { + await FlutterNfcKit.finish(); + } catch (_) {} + _state = NfcShareState.available; + } + } + + void _emit(NfcShareResult result) { + if (!_stateController.isClosed) { + _stateController.add(result); + } + } + + void dispose() { + _stateController.close(); + } +} diff --git a/lib/core/services/notification/daily_notify_service.dart b/lib/core/services/notification/daily_notify_service.dart new file mode 100644 index 00000000..053b3694 --- /dev/null +++ b/lib/core/services/notification/daily_notify_service.dart @@ -0,0 +1,52 @@ +// ============================================================ +// 闲言APP — 每日定时通知服务 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 每日定时推送一句好句 +// 上次更新: 初始版本 +// ============================================================ + +import '../../utils/logger.dart'; +import 'local_notification_service.dart'; + +class DailyNotifyService { + DailyNotifyService._(); + static final DailyNotifyService instance = DailyNotifyService._(); + + bool _isInitialized = false; + bool get isInitialized => _isInitialized; + + static const int _notificationId = 2000; + + Future init() async { + if (_isInitialized) return; + await LocalNotificationService.init(); + _isInitialized = true; + Log.i('DailyNotifyService 初始化完成'); + } + + Future scheduleDailyNotification({ + required int hour, + required int minute, + required String title, + required String body, + }) async { + if (!_isInitialized) await init(); + + await LocalNotificationService.scheduleDaily( + id: _notificationId, + title: title, + body: body, + hour: hour, + minute: minute, + payload: 'daily_sentence', + ); + + Log.i('每日通知已调度: $hour:$minute'); + } + + Future cancelAll() async { + await LocalNotificationService.cancel(_notificationId); + Log.i('每日通知已取消'); + } +} diff --git a/lib/core/services/weather/weather_info_models.dart b/lib/core/services/weather/weather_info_models.dart new file mode 100644 index 00000000..56cd24a0 --- /dev/null +++ b/lib/core/services/weather/weather_info_models.dart @@ -0,0 +1,58 @@ +/// ============================================================ +/// 闲言APP — 天气信息轻量数据模型 +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: 天气信息公共类，供首页/日期栏等轻量场景使用 +/// 上次更新: 初始创建 +/// ============================================================ + +import 'package:xianyan/features/weather/models/weather_models.dart'; + +class WeatherBriefInfo { + const WeatherBriefInfo({ + required this.icon, + required this.temp, + required this.weather, + required this.city, + required this.humidity, + required this.windDirection, + required this.windPower, + required this.aqi, + required this.aqiLevel, + }); + + final String icon; + final String temp; + final String weather; + final String city; + final String humidity; + final String windDirection; + final String windPower; + final String aqi; + final String aqiLevel; + + factory WeatherBriefInfo.empty() => const WeatherBriefInfo( + icon: '🌤️', + temp: '--', + weather: '未知', + city: '未知', + humidity: '--', + windDirection: '', + windPower: '', + aqi: '--', + aqiLevel: '', + ); + + factory WeatherBriefInfo.fromWeatherData(WeatherData data) => + WeatherBriefInfo( + icon: data.icon, + temp: data.temp, + weather: data.weather, + city: data.city, + humidity: data.humidity, + windDirection: data.windDirection, + windPower: data.windPower, + aqi: data.aqi, + aqiLevel: data.aqiLevel, + ); +} diff --git a/lib/core/services/weather/weather_info_provider.dart b/lib/core/services/weather/weather_info_provider.dart new file mode 100644 index 00000000..919748f2 --- /dev/null +++ b/lib/core/services/weather/weather_info_provider.dart @@ -0,0 +1,87 @@ +/// ============================================================ +/// 闲言APP — 天气信息Riverpod Provider +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: 天气轻量数据状态管理，供首页/日期栏等消费 +/// 上次更新: 添加 WidgetsBindingObserver 生命周期感知 + 自动刷新 +/// ============================================================ + +import 'package:flutter/widgets.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import 'weather_info_models.dart'; +import 'weather_info_service.dart'; + +class WeatherInfoState { + const WeatherInfoState({ + this.brief, + this.isLoading = false, + this.error, + }); + + final WeatherBriefInfo? brief; + final bool isLoading; + final String? error; + + WeatherInfoState copyWith({ + WeatherBriefInfo? brief, + bool? isLoading, + String? error, + }) { + return WeatherInfoState( + brief: brief ?? this.brief, + isLoading: isLoading ?? this.isLoading, + error: error, + ); + } +} + +class WeatherInfoNotifier extends Notifier + with WidgetsBindingObserver { + @override + WeatherInfoState build() { + WidgetsBinding.instance.addObserver(this); + ref.onDispose(() { + WidgetsBinding.instance.removeObserver(this); + WeatherInfoService.stopAutoRefresh(); + }); + loadWeatherBrief(); + WeatherInfoService.startAutoRefresh(() { + loadWeatherBrief(); + }); + return const WeatherInfoState(isLoading: true); + } + + @override + void didChangeAppLifecycleState(AppLifecycleState appState) { + if (appState == AppLifecycleState.resumed) { + final lastRefresh = WeatherInfoService.lastCacheTime; + if (lastRefresh != null) { + final elapsed = DateTime.now().difference(lastRefresh); + if (elapsed.inMinutes > 15) { + loadWeatherBrief(); + } + } + } + } + + Future loadWeatherBrief() async { + state = state.copyWith(isLoading: true); + try { + final brief = await WeatherInfoService.fetchWeatherBrief(); + state = state.copyWith(brief: brief, isLoading: false); + } catch (e) { + state = state.copyWith(isLoading: false, error: e.toString()); + } + } + + Future refresh() async { + WeatherInfoService.clearCache(); + await loadWeatherBrief(); + } +} + +final weatherInfoProvider = + NotifierProvider( + WeatherInfoNotifier.new, +); diff --git a/lib/core/services/weather/weather_info_service.dart b/lib/core/services/weather/weather_info_service.dart new file mode 100644 index 00000000..d1e458bf --- /dev/null +++ b/lib/core/services/weather/weather_info_service.dart @@ -0,0 +1,91 @@ +/// ============================================================ +/// 闲言APP — 天气信息公共查询服务 +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: 天气轻量数据查询 + 天气图标/AQI等级映射 + 内存缓存 +/// 上次更新: 添加定时刷新 + lastCacheTime 暴露 +/// ============================================================ + +import 'dart:async'; + +import 'package:xianyan/core/services/weather/weather_info_models.dart'; +import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/features/weather/services/weather_service.dart'; + +class WeatherInfoService { + WeatherInfoService._(); + + static WeatherBriefInfo? _cache; + static DateTime? _cacheTime; + + static const _cacheDuration = Duration(minutes: 30); + + static Timer? _refreshTimer; + static const Duration _refreshInterval = Duration(minutes: 30); + + static DateTime? get lastCacheTime => _cacheTime; + + static Future fetchWeatherBrief() async { + if (_cache != null && _cacheTime != null) { + final elapsed = DateTime.now().difference(_cacheTime!); + if (elapsed < _cacheDuration) { + Log.d('天气Brief命中缓存，剩余${_cacheDuration.inMinutes - elapsed.inMinutes}分钟'); + return _cache!; + } + } + + try { + final data = await WeatherService.fetchWeather(); + final brief = WeatherBriefInfo.fromWeatherData(data); + _cache = brief; + _cacheTime = DateTime.now(); + Log.i('天气Brief获取成功: ${brief.city} ${brief.weather}'); + return brief; + } catch (e) { + Log.e('天气Brief获取失败', e); + if (_cache != null) return _cache!; + return WeatherBriefInfo.empty(); + } + } + + static String mapWeatherIcon(String weather) { + final w = weather.toLowerCase(); + if (w.contains('晴')) return '☀️'; + if (w.contains('云') || w.contains('阴')) return '⛅'; + if (w.contains('雷')) return '⛈️'; + if (w.contains('雨')) return '🌧️'; + if (w.contains('雪')) return '❄️'; + if (w.contains('雾') || w.contains('霾')) return '🌫️'; + if (w.contains('风')) return '💨'; + return '🌤️'; + } + + static String mapAqiLevel(dynamic pm25) { + final val = int.tryParse(pm25?.toString() ?? '') ?? 0; + if (val <= 35) return '优'; + if (val <= 75) return '良'; + if (val <= 115) return '轻度'; + if (val <= 150) return '中度'; + if (val <= 250) return '重度'; + return '严重'; + } + + static void clearCache() { + _cache = null; + _cacheTime = null; + } + + static void startAutoRefresh(void Function() onRefresh) { + _refreshTimer?.cancel(); + _refreshTimer = Timer.periodic(_refreshInterval, (_) { + _cache = null; + _cacheTime = null; + onRefresh(); + }); + } + + static void stopAutoRefresh() { + _refreshTimer?.cancel(); + _refreshTimer = null; + } +} diff --git a/lib/core/storage/database/app_database.dart b/lib/core/storage/database/app_database.dart index 7567296d..44f38349 100644 --- a/lib/core/storage/database/app_database.dart +++ b/lib/core/storage/database/app_database.dart @@ -318,6 +318,7 @@ class TransferDeviceRecords extends Table { text().withDefault(const Constant('localsend_http'))(); BoolColumn get isOnline => boolean().withDefault(const Constant(false))(); BoolColumn get isVerified => boolean().withDefault(const Constant(false))(); + BoolColumn get isFavorite => boolean().withDefault(const Constant(false))(); TextColumn get publicKey => text().nullable()(); TextColumn get fingerprint => text().nullable()(); DateTimeColumn get lastSeen => dateTime()(); diff --git a/lib/core/storage/database/app_database.g.dart b/lib/core/storage/database/app_database.g.dart index 00c0e184..fa4f87ad 100644 --- a/lib/core/storage/database/app_database.g.dart +++ b/lib/core/storage/database/app_database.g.dart @@ -12,141 +12,204 @@ class $SentencesTable extends Sentences static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _contentMeta = - const VerificationMeta('content'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _contentMeta = const VerificationMeta( + 'content', + ); @override late final GeneratedColumn content = GeneratedColumn( - 'content', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'content', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _authorMeta = const VerificationMeta('author'); @override late final GeneratedColumn author = GeneratedColumn( - 'author', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'author', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _sourceMeta = const VerificationMeta('source'); @override late final GeneratedColumn source = GeneratedColumn( - 'source', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'source', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _tagsMeta = const VerificationMeta('tags'); @override late final GeneratedColumn tags = GeneratedColumn( - 'tags', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _feedTypeMeta = - const VerificationMeta('feedType'); + 'tags', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _feedTypeMeta = const VerificationMeta( + 'feedType', + ); @override late final GeneratedColumn feedType = GeneratedColumn( - 'feed_type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _feedNameMeta = - const VerificationMeta('feedName'); + 'feed_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _feedNameMeta = const VerificationMeta( + 'feedName', + ); @override late final GeneratedColumn feedName = GeneratedColumn( - 'feed_name', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _feedIconMeta = - const VerificationMeta('feedIcon'); + 'feed_name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _feedIconMeta = const VerificationMeta( + 'feedIcon', + ); @override late final GeneratedColumn feedIcon = GeneratedColumn( - 'feed_icon', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'feed_icon', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _viewsMeta = const VerificationMeta('views'); @override late final GeneratedColumn views = GeneratedColumn( - 'views', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _imageUrlMeta = - const VerificationMeta('imageUrl'); + 'views', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _imageUrlMeta = const VerificationMeta( + 'imageUrl', + ); @override late final GeneratedColumn imageUrl = GeneratedColumn( - 'image_url', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _isFavoriteMeta = - const VerificationMeta('isFavorite'); + 'image_url', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _isFavoriteMeta = const VerificationMeta( + 'isFavorite', + ); @override late final GeneratedColumn isFavorite = GeneratedColumn( - 'is_favorite', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_favorite" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _isLikedMeta = - const VerificationMeta('isLiked'); + 'is_favorite', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_favorite" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _isLikedMeta = const VerificationMeta( + 'isLiked', + ); @override late final GeneratedColumn isLiked = GeneratedColumn( - 'is_liked', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_liked" IN (0, 1))'), - defaultValue: const Constant(false)); + 'is_liked', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_liked" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); static const VerificationMeta _isReadMeta = const VerificationMeta('isRead'); @override late final GeneratedColumn isRead = GeneratedColumn( - 'is_read', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_read" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'is_read', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_read" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - content, - author, - source, - tags, - feedType, - feedName, - feedIcon, - views, - imageUrl, - isFavorite, - isLiked, - isRead, - createdAt, - updatedAt - ]; + id, + content, + author, + source, + tags, + feedType, + feedName, + feedIcon, + views, + imageUrl, + isFavorite, + isLiked, + isRead, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'sentences'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -155,66 +218,92 @@ class $SentencesTable extends Sentences context.missing(_idMeta); } if (data.containsKey('content')) { - context.handle(_contentMeta, - content.isAcceptableOrUnknown(data['content']!, _contentMeta)); + context.handle( + _contentMeta, + content.isAcceptableOrUnknown(data['content']!, _contentMeta), + ); } else if (isInserting) { context.missing(_contentMeta); } if (data.containsKey('author')) { - context.handle(_authorMeta, - author.isAcceptableOrUnknown(data['author']!, _authorMeta)); + context.handle( + _authorMeta, + author.isAcceptableOrUnknown(data['author']!, _authorMeta), + ); } if (data.containsKey('source')) { - context.handle(_sourceMeta, - source.isAcceptableOrUnknown(data['source']!, _sourceMeta)); + context.handle( + _sourceMeta, + source.isAcceptableOrUnknown(data['source']!, _sourceMeta), + ); } if (data.containsKey('tags')) { context.handle( - _tagsMeta, tags.isAcceptableOrUnknown(data['tags']!, _tagsMeta)); + _tagsMeta, + tags.isAcceptableOrUnknown(data['tags']!, _tagsMeta), + ); } if (data.containsKey('feed_type')) { - context.handle(_feedTypeMeta, - feedType.isAcceptableOrUnknown(data['feed_type']!, _feedTypeMeta)); + context.handle( + _feedTypeMeta, + feedType.isAcceptableOrUnknown(data['feed_type']!, _feedTypeMeta), + ); } if (data.containsKey('feed_name')) { - context.handle(_feedNameMeta, - feedName.isAcceptableOrUnknown(data['feed_name']!, _feedNameMeta)); + context.handle( + _feedNameMeta, + feedName.isAcceptableOrUnknown(data['feed_name']!, _feedNameMeta), + ); } if (data.containsKey('feed_icon')) { - context.handle(_feedIconMeta, - feedIcon.isAcceptableOrUnknown(data['feed_icon']!, _feedIconMeta)); + context.handle( + _feedIconMeta, + feedIcon.isAcceptableOrUnknown(data['feed_icon']!, _feedIconMeta), + ); } if (data.containsKey('views')) { context.handle( - _viewsMeta, views.isAcceptableOrUnknown(data['views']!, _viewsMeta)); + _viewsMeta, + views.isAcceptableOrUnknown(data['views']!, _viewsMeta), + ); } if (data.containsKey('image_url')) { - context.handle(_imageUrlMeta, - imageUrl.isAcceptableOrUnknown(data['image_url']!, _imageUrlMeta)); + context.handle( + _imageUrlMeta, + imageUrl.isAcceptableOrUnknown(data['image_url']!, _imageUrlMeta), + ); } if (data.containsKey('is_favorite')) { context.handle( - _isFavoriteMeta, - isFavorite.isAcceptableOrUnknown( - data['is_favorite']!, _isFavoriteMeta)); + _isFavoriteMeta, + isFavorite.isAcceptableOrUnknown(data['is_favorite']!, _isFavoriteMeta), + ); } if (data.containsKey('is_liked')) { - context.handle(_isLikedMeta, - isLiked.isAcceptableOrUnknown(data['is_liked']!, _isLikedMeta)); + context.handle( + _isLikedMeta, + isLiked.isAcceptableOrUnknown(data['is_liked']!, _isLikedMeta), + ); } if (data.containsKey('is_read')) { - context.handle(_isReadMeta, - isRead.isAcceptableOrUnknown(data['is_read']!, _isReadMeta)); + context.handle( + _isReadMeta, + isRead.isAcceptableOrUnknown(data['is_read']!, _isReadMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -227,36 +316,66 @@ class $SentencesTable extends Sentences Sentence map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return Sentence( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - content: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content'])!, - author: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}author'])!, - source: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}source'])!, - tags: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}tags'])!, - feedType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}feed_type'])!, - feedName: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}feed_name'])!, - feedIcon: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}feed_icon'])!, - views: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}views'])!, - imageUrl: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}image_url'])!, - isFavorite: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_favorite'])!, - isLiked: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_liked'])!, - isRead: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_read'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + content: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content'], + )!, + author: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}author'], + )!, + source: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}source'], + )!, + tags: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}tags'], + )!, + feedType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}feed_type'], + )!, + feedName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}feed_name'], + )!, + feedIcon: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}feed_icon'], + )!, + views: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}views'], + )!, + imageUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}image_url'], + )!, + isFavorite: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_favorite'], + )!, + isLiked: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_liked'], + )!, + isRead: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_read'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -282,22 +401,23 @@ class Sentence extends DataClass implements Insertable { final bool isRead; final DateTime createdAt; final DateTime updatedAt; - const Sentence( - {required this.id, - required this.content, - required this.author, - required this.source, - required this.tags, - required this.feedType, - required this.feedName, - required this.feedIcon, - required this.views, - required this.imageUrl, - required this.isFavorite, - required this.isLiked, - required this.isRead, - required this.createdAt, - required this.updatedAt}); + const Sentence({ + required this.id, + required this.content, + required this.author, + required this.source, + required this.tags, + required this.feedType, + required this.feedName, + required this.feedIcon, + required this.views, + required this.imageUrl, + required this.isFavorite, + required this.isLiked, + required this.isRead, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -339,8 +459,10 @@ class Sentence extends DataClass implements Insertable { ); } - factory Sentence.fromJson(Map json, - {ValueSerializer? serializer}) { + factory Sentence.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return Sentence( id: serializer.fromJson(json['id']), @@ -382,39 +504,39 @@ class Sentence extends DataClass implements Insertable { }; } - Sentence copyWith( - {String? id, - String? content, - String? author, - String? source, - String? tags, - String? feedType, - String? feedName, - String? feedIcon, - int? views, - String? imageUrl, - bool? isFavorite, - bool? isLiked, - bool? isRead, - DateTime? createdAt, - DateTime? updatedAt}) => - Sentence( - id: id ?? this.id, - content: content ?? this.content, - author: author ?? this.author, - source: source ?? this.source, - tags: tags ?? this.tags, - feedType: feedType ?? this.feedType, - feedName: feedName ?? this.feedName, - feedIcon: feedIcon ?? this.feedIcon, - views: views ?? this.views, - imageUrl: imageUrl ?? this.imageUrl, - isFavorite: isFavorite ?? this.isFavorite, - isLiked: isLiked ?? this.isLiked, - isRead: isRead ?? this.isRead, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + Sentence copyWith({ + String? id, + String? content, + String? author, + String? source, + String? tags, + String? feedType, + String? feedName, + String? feedIcon, + int? views, + String? imageUrl, + bool? isFavorite, + bool? isLiked, + bool? isRead, + DateTime? createdAt, + DateTime? updatedAt, + }) => Sentence( + id: id ?? this.id, + content: content ?? this.content, + author: author ?? this.author, + source: source ?? this.source, + tags: tags ?? this.tags, + feedType: feedType ?? this.feedType, + feedName: feedName ?? this.feedName, + feedIcon: feedIcon ?? this.feedIcon, + views: views ?? this.views, + imageUrl: imageUrl ?? this.imageUrl, + isFavorite: isFavorite ?? this.isFavorite, + isLiked: isLiked ?? this.isLiked, + isRead: isRead ?? this.isRead, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); Sentence copyWithCompanion(SentencesCompanion data) { return Sentence( id: data.id.present ? data.id.value : this.id, @@ -427,8 +549,9 @@ class Sentence extends DataClass implements Insertable { feedIcon: data.feedIcon.present ? data.feedIcon.value : this.feedIcon, views: data.views.present ? data.views.value : this.views, imageUrl: data.imageUrl.present ? data.imageUrl.value : this.imageUrl, - isFavorite: - data.isFavorite.present ? data.isFavorite.value : this.isFavorite, + isFavorite: data.isFavorite.present + ? data.isFavorite.value + : this.isFavorite, isLiked: data.isLiked.present ? data.isLiked.value : this.isLiked, isRead: data.isRead.present ? data.isRead.value : this.isRead, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, @@ -460,21 +583,22 @@ class Sentence extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, - content, - author, - source, - tags, - feedType, - feedName, - feedIcon, - views, - imageUrl, - isFavorite, - isLiked, - isRead, - createdAt, - updatedAt); + id, + content, + author, + source, + tags, + feedType, + feedName, + feedIcon, + views, + imageUrl, + isFavorite, + isLiked, + isRead, + createdAt, + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -548,10 +672,10 @@ class SentencesCompanion extends UpdateCompanion { required DateTime createdAt, required DateTime updatedAt, this.rowid = const Value.absent(), - }) : id = Value(id), - content = Value(content), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : id = Value(id), + content = Value(content), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? content, @@ -590,23 +714,24 @@ class SentencesCompanion extends UpdateCompanion { }); } - SentencesCompanion copyWith( - {Value? id, - Value? content, - Value? author, - Value? source, - Value? tags, - Value? feedType, - Value? feedName, - Value? feedIcon, - Value? views, - Value? imageUrl, - Value? isFavorite, - Value? isLiked, - Value? isRead, - Value? createdAt, - Value? updatedAt, - Value? rowid}) { + SentencesCompanion copyWith({ + Value? id, + Value? content, + Value? author, + Value? source, + Value? tags, + Value? feedType, + Value? feedName, + Value? feedIcon, + Value? views, + Value? imageUrl, + Value? isFavorite, + Value? isLiked, + Value? isRead, + Value? createdAt, + Value? updatedAt, + Value? rowid, + }) { return SentencesCompanion( id: id ?? this.id, content: content ?? this.content, @@ -711,18 +836,28 @@ class $FavoritesTable extends Favorites final GeneratedDatabase attachedDatabase; final String? _alias; $FavoritesTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _sentenceIdMeta = - const VerificationMeta('sentenceId'); + static const VerificationMeta _sentenceIdMeta = const VerificationMeta( + 'sentenceId', + ); @override late final GeneratedColumn sentenceId = GeneratedColumn( - 'sentence_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _favoritedAtMeta = - const VerificationMeta('favoritedAt'); + 'sentence_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _favoritedAtMeta = const VerificationMeta( + 'favoritedAt', + ); @override late final GeneratedColumn favoritedAt = GeneratedColumn( - 'favorited_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'favorited_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [sentenceId, favoritedAt]; @override @@ -731,23 +866,28 @@ class $FavoritesTable extends Favorites String get actualTableName => $name; static const String $name = 'favorites'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('sentence_id')) { context.handle( - _sentenceIdMeta, - sentenceId.isAcceptableOrUnknown( - data['sentence_id']!, _sentenceIdMeta)); + _sentenceIdMeta, + sentenceId.isAcceptableOrUnknown(data['sentence_id']!, _sentenceIdMeta), + ); } else if (isInserting) { context.missing(_sentenceIdMeta); } if (data.containsKey('favorited_at')) { context.handle( + _favoritedAtMeta, + favoritedAt.isAcceptableOrUnknown( + data['favorited_at']!, _favoritedAtMeta, - favoritedAt.isAcceptableOrUnknown( - data['favorited_at']!, _favoritedAtMeta)); + ), + ); } else if (isInserting) { context.missing(_favoritedAtMeta); } @@ -760,10 +900,14 @@ class $FavoritesTable extends Favorites Favorite map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return Favorite( - sentenceId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}sentence_id'])!, - favoritedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}favorited_at'])!, + sentenceId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}sentence_id'], + )!, + favoritedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}favorited_at'], + )!, ); } @@ -792,8 +936,10 @@ class Favorite extends DataClass implements Insertable { ); } - factory Favorite.fromJson(Map json, - {ValueSerializer? serializer}) { + factory Favorite.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return Favorite( sentenceId: serializer.fromJson(json['sentenceId']), @@ -810,15 +956,17 @@ class Favorite extends DataClass implements Insertable { } Favorite copyWith({String? sentenceId, DateTime? favoritedAt}) => Favorite( - sentenceId: sentenceId ?? this.sentenceId, - favoritedAt: favoritedAt ?? this.favoritedAt, - ); + sentenceId: sentenceId ?? this.sentenceId, + favoritedAt: favoritedAt ?? this.favoritedAt, + ); Favorite copyWithCompanion(FavoritesCompanion data) { return Favorite( - sentenceId: - data.sentenceId.present ? data.sentenceId.value : this.sentenceId, - favoritedAt: - data.favoritedAt.present ? data.favoritedAt.value : this.favoritedAt, + sentenceId: data.sentenceId.present + ? data.sentenceId.value + : this.sentenceId, + favoritedAt: data.favoritedAt.present + ? data.favoritedAt.value + : this.favoritedAt, ); } @@ -854,8 +1002,8 @@ class FavoritesCompanion extends UpdateCompanion { required String sentenceId, required DateTime favoritedAt, this.rowid = const Value.absent(), - }) : sentenceId = Value(sentenceId), - favoritedAt = Value(favoritedAt); + }) : sentenceId = Value(sentenceId), + favoritedAt = Value(favoritedAt); static Insertable custom({ Expression? sentenceId, Expression? favoritedAt, @@ -868,10 +1016,11 @@ class FavoritesCompanion extends UpdateCompanion { }); } - FavoritesCompanion copyWith( - {Value? sentenceId, - Value? favoritedAt, - Value? rowid}) { + FavoritesCompanion copyWith({ + Value? sentenceId, + Value? favoritedAt, + Value? rowid, + }) { return FavoritesCompanion( sentenceId: sentenceId ?? this.sentenceId, favoritedAt: favoritedAt ?? this.favoritedAt, @@ -914,23 +1063,36 @@ class $ReadHistoryTable extends ReadHistory static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); - static const VerificationMeta _sentenceIdMeta = - const VerificationMeta('sentenceId'); + 'id', + aliasedName, + false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'PRIMARY KEY AUTOINCREMENT', + ), + ); + static const VerificationMeta _sentenceIdMeta = const VerificationMeta( + 'sentenceId', + ); @override late final GeneratedColumn sentenceId = GeneratedColumn( - 'sentence_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'sentence_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _readAtMeta = const VerificationMeta('readAt'); @override late final GeneratedColumn readAt = GeneratedColumn( - 'read_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'read_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [id, sentenceId, readAt]; @override @@ -939,8 +1101,10 @@ class $ReadHistoryTable extends ReadHistory String get actualTableName => $name; static const String $name = 'read_history'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -948,15 +1112,17 @@ class $ReadHistoryTable extends ReadHistory } if (data.containsKey('sentence_id')) { context.handle( - _sentenceIdMeta, - sentenceId.isAcceptableOrUnknown( - data['sentence_id']!, _sentenceIdMeta)); + _sentenceIdMeta, + sentenceId.isAcceptableOrUnknown(data['sentence_id']!, _sentenceIdMeta), + ); } else if (isInserting) { context.missing(_sentenceIdMeta); } if (data.containsKey('read_at')) { - context.handle(_readAtMeta, - readAt.isAcceptableOrUnknown(data['read_at']!, _readAtMeta)); + context.handle( + _readAtMeta, + readAt.isAcceptableOrUnknown(data['read_at']!, _readAtMeta), + ); } else if (isInserting) { context.missing(_readAtMeta); } @@ -969,12 +1135,18 @@ class $ReadHistoryTable extends ReadHistory ReadHistoryData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ReadHistoryData( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - sentenceId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}sentence_id'])!, - readAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}read_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + sentenceId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}sentence_id'], + )!, + readAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}read_at'], + )!, ); } @@ -988,8 +1160,11 @@ class ReadHistoryData extends DataClass implements Insertable { final int id; final String sentenceId; final DateTime readAt; - const ReadHistoryData( - {required this.id, required this.sentenceId, required this.readAt}); + const ReadHistoryData({ + required this.id, + required this.sentenceId, + required this.readAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -1007,8 +1182,10 @@ class ReadHistoryData extends DataClass implements Insertable { ); } - factory ReadHistoryData.fromJson(Map json, - {ValueSerializer? serializer}) { + factory ReadHistoryData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ReadHistoryData( id: serializer.fromJson(json['id']), @@ -1035,8 +1212,9 @@ class ReadHistoryData extends DataClass implements Insertable { ReadHistoryData copyWithCompanion(ReadHistoryCompanion data) { return ReadHistoryData( id: data.id.present ? data.id.value : this.id, - sentenceId: - data.sentenceId.present ? data.sentenceId.value : this.sentenceId, + sentenceId: data.sentenceId.present + ? data.sentenceId.value + : this.sentenceId, readAt: data.readAt.present ? data.readAt.value : this.readAt, ); } @@ -1075,8 +1253,8 @@ class ReadHistoryCompanion extends UpdateCompanion { this.id = const Value.absent(), required String sentenceId, required DateTime readAt, - }) : sentenceId = Value(sentenceId), - readAt = Value(readAt); + }) : sentenceId = Value(sentenceId), + readAt = Value(readAt); static Insertable custom({ Expression? id, Expression? sentenceId, @@ -1089,8 +1267,11 @@ class ReadHistoryCompanion extends UpdateCompanion { }); } - ReadHistoryCompanion copyWith( - {Value? id, Value? sentenceId, Value? readAt}) { + ReadHistoryCompanion copyWith({ + Value? id, + Value? sentenceId, + Value? readAt, + }) { return ReadHistoryCompanion( id: id ?? this.id, sentenceId: sentenceId ?? this.sentenceId, @@ -1133,59 +1314,99 @@ class $CardTemplatesTable extends CardTemplates static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _nameMeta = const VerificationMeta('name'); @override late final GeneratedColumn name = GeneratedColumn( - 'name', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _typeMeta = const VerificationMeta('type'); @override late final GeneratedColumn type = GeneratedColumn( - 'type', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _configJsonMeta = - const VerificationMeta('configJson'); + 'type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _configJsonMeta = const VerificationMeta( + 'configJson', + ); @override late final GeneratedColumn configJson = GeneratedColumn( - 'config_json', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _thumbnailPathMeta = - const VerificationMeta('thumbnailPath'); + 'config_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _thumbnailPathMeta = const VerificationMeta( + 'thumbnailPath', + ); @override late final GeneratedColumn thumbnailPath = GeneratedColumn( - 'thumbnail_path', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _isPresetMeta = - const VerificationMeta('isPreset'); + 'thumbnail_path', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _isPresetMeta = const VerificationMeta( + 'isPreset', + ); @override late final GeneratedColumn isPreset = GeneratedColumn( - 'is_preset', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_preset" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'is_preset', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_preset" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override - List get $columns => - [id, name, type, configJson, thumbnailPath, isPreset, createdAt]; + List get $columns => [ + id, + name, + type, + configJson, + thumbnailPath, + isPreset, + createdAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'card_templates'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -1195,37 +1416,48 @@ class $CardTemplatesTable extends CardTemplates } if (data.containsKey('name')) { context.handle( - _nameMeta, name.isAcceptableOrUnknown(data['name']!, _nameMeta)); + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); } else if (isInserting) { context.missing(_nameMeta); } if (data.containsKey('type')) { context.handle( - _typeMeta, type.isAcceptableOrUnknown(data['type']!, _typeMeta)); + _typeMeta, + type.isAcceptableOrUnknown(data['type']!, _typeMeta), + ); } else if (isInserting) { context.missing(_typeMeta); } if (data.containsKey('config_json')) { context.handle( - _configJsonMeta, - configJson.isAcceptableOrUnknown( - data['config_json']!, _configJsonMeta)); + _configJsonMeta, + configJson.isAcceptableOrUnknown(data['config_json']!, _configJsonMeta), + ); } else if (isInserting) { context.missing(_configJsonMeta); } if (data.containsKey('thumbnail_path')) { context.handle( + _thumbnailPathMeta, + thumbnailPath.isAcceptableOrUnknown( + data['thumbnail_path']!, _thumbnailPathMeta, - thumbnailPath.isAcceptableOrUnknown( - data['thumbnail_path']!, _thumbnailPathMeta)); + ), + ); } if (data.containsKey('is_preset')) { - context.handle(_isPresetMeta, - isPreset.isAcceptableOrUnknown(data['is_preset']!, _isPresetMeta)); + context.handle( + _isPresetMeta, + isPreset.isAcceptableOrUnknown(data['is_preset']!, _isPresetMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } @@ -1238,20 +1470,34 @@ class $CardTemplatesTable extends CardTemplates CardTemplate map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return CardTemplate( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - name: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}name'])!, - type: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}type'])!, - configJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}config_json'])!, - thumbnailPath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!, - isPreset: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_preset'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + type: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}type'], + )!, + configJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}config_json'], + )!, + thumbnailPath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}thumbnail_path'], + )!, + isPreset: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_preset'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -1269,14 +1515,15 @@ class CardTemplate extends DataClass implements Insertable { final String thumbnailPath; final bool isPreset; final DateTime createdAt; - const CardTemplate( - {required this.id, - required this.name, - required this.type, - required this.configJson, - required this.thumbnailPath, - required this.isPreset, - required this.createdAt}); + const CardTemplate({ + required this.id, + required this.name, + required this.type, + required this.configJson, + required this.thumbnailPath, + required this.isPreset, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -1302,8 +1549,10 @@ class CardTemplate extends DataClass implements Insertable { ); } - factory CardTemplate.fromJson(Map json, - {ValueSerializer? serializer}) { + factory CardTemplate.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return CardTemplate( id: serializer.fromJson(json['id']), @@ -1329,30 +1578,31 @@ class CardTemplate extends DataClass implements Insertable { }; } - CardTemplate copyWith( - {String? id, - String? name, - String? type, - String? configJson, - String? thumbnailPath, - bool? isPreset, - DateTime? createdAt}) => - CardTemplate( - id: id ?? this.id, - name: name ?? this.name, - type: type ?? this.type, - configJson: configJson ?? this.configJson, - thumbnailPath: thumbnailPath ?? this.thumbnailPath, - isPreset: isPreset ?? this.isPreset, - createdAt: createdAt ?? this.createdAt, - ); + CardTemplate copyWith({ + String? id, + String? name, + String? type, + String? configJson, + String? thumbnailPath, + bool? isPreset, + DateTime? createdAt, + }) => CardTemplate( + id: id ?? this.id, + name: name ?? this.name, + type: type ?? this.type, + configJson: configJson ?? this.configJson, + thumbnailPath: thumbnailPath ?? this.thumbnailPath, + isPreset: isPreset ?? this.isPreset, + createdAt: createdAt ?? this.createdAt, + ); CardTemplate copyWithCompanion(CardTemplatesCompanion data) { return CardTemplate( id: data.id.present ? data.id.value : this.id, name: data.name.present ? data.name.value : this.name, type: data.type.present ? data.type.value : this.type, - configJson: - data.configJson.present ? data.configJson.value : this.configJson, + configJson: data.configJson.present + ? data.configJson.value + : this.configJson, thumbnailPath: data.thumbnailPath.present ? data.thumbnailPath.value : this.thumbnailPath, @@ -1377,7 +1627,14 @@ class CardTemplate extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, name, type, configJson, thumbnailPath, isPreset, createdAt); + id, + name, + type, + configJson, + thumbnailPath, + isPreset, + createdAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -1419,11 +1676,11 @@ class CardTemplatesCompanion extends UpdateCompanion { this.isPreset = const Value.absent(), required DateTime createdAt, this.rowid = const Value.absent(), - }) : id = Value(id), - name = Value(name), - type = Value(type), - configJson = Value(configJson), - createdAt = Value(createdAt); + }) : id = Value(id), + name = Value(name), + type = Value(type), + configJson = Value(configJson), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? name, @@ -1446,15 +1703,16 @@ class CardTemplatesCompanion extends UpdateCompanion { }); } - CardTemplatesCompanion copyWith( - {Value? id, - Value? name, - Value? type, - Value? configJson, - Value? thumbnailPath, - Value? isPreset, - Value? createdAt, - Value? rowid}) { + CardTemplatesCompanion copyWith({ + Value? id, + Value? name, + Value? type, + Value? configJson, + Value? thumbnailPath, + Value? isPreset, + Value? createdAt, + Value? rowid, + }) { return CardTemplatesCompanion( id: id ?? this.id, name: name ?? this.name, @@ -1522,74 +1780,114 @@ class $ToolUsageStatsTable extends ToolUsageStats static const VerificationMeta _toolIdMeta = const VerificationMeta('toolId'); @override late final GeneratedColumn toolId = GeneratedColumn( - 'tool_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _toolNameMeta = - const VerificationMeta('toolName'); + 'tool_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _toolNameMeta = const VerificationMeta( + 'toolName', + ); @override late final GeneratedColumn toolName = GeneratedColumn( - 'tool_name', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _useCountMeta = - const VerificationMeta('useCount'); + 'tool_name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _useCountMeta = const VerificationMeta( + 'useCount', + ); @override late final GeneratedColumn useCount = GeneratedColumn( - 'use_count', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _lastUsedAtMeta = - const VerificationMeta('lastUsedAt'); + 'use_count', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _lastUsedAtMeta = const VerificationMeta( + 'lastUsedAt', + ); @override late final GeneratedColumn lastUsedAt = GeneratedColumn( - 'last_used_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'last_used_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override - List get $columns => - [toolId, toolName, useCount, lastUsedAt, createdAt]; + List get $columns => [ + toolId, + toolName, + useCount, + lastUsedAt, + createdAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'tool_usage_stats'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('tool_id')) { - context.handle(_toolIdMeta, - toolId.isAcceptableOrUnknown(data['tool_id']!, _toolIdMeta)); + context.handle( + _toolIdMeta, + toolId.isAcceptableOrUnknown(data['tool_id']!, _toolIdMeta), + ); } else if (isInserting) { context.missing(_toolIdMeta); } if (data.containsKey('tool_name')) { - context.handle(_toolNameMeta, - toolName.isAcceptableOrUnknown(data['tool_name']!, _toolNameMeta)); + context.handle( + _toolNameMeta, + toolName.isAcceptableOrUnknown(data['tool_name']!, _toolNameMeta), + ); } if (data.containsKey('use_count')) { - context.handle(_useCountMeta, - useCount.isAcceptableOrUnknown(data['use_count']!, _useCountMeta)); + context.handle( + _useCountMeta, + useCount.isAcceptableOrUnknown(data['use_count']!, _useCountMeta), + ); } if (data.containsKey('last_used_at')) { context.handle( + _lastUsedAtMeta, + lastUsedAt.isAcceptableOrUnknown( + data['last_used_at']!, _lastUsedAtMeta, - lastUsedAt.isAcceptableOrUnknown( - data['last_used_at']!, _lastUsedAtMeta)); + ), + ); } else if (isInserting) { context.missing(_lastUsedAtMeta); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } @@ -1602,16 +1900,26 @@ class $ToolUsageStatsTable extends ToolUsageStats ToolUsageStat map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ToolUsageStat( - toolId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}tool_id'])!, - toolName: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}tool_name'])!, - useCount: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}use_count'])!, - lastUsedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}last_used_at'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + toolId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}tool_id'], + )!, + toolName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}tool_name'], + )!, + useCount: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}use_count'], + )!, + lastUsedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_used_at'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -1627,12 +1935,13 @@ class ToolUsageStat extends DataClass implements Insertable { final int useCount; final DateTime lastUsedAt; final DateTime createdAt; - const ToolUsageStat( - {required this.toolId, - required this.toolName, - required this.useCount, - required this.lastUsedAt, - required this.createdAt}); + const ToolUsageStat({ + required this.toolId, + required this.toolName, + required this.useCount, + required this.lastUsedAt, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -1654,8 +1963,10 @@ class ToolUsageStat extends DataClass implements Insertable { ); } - factory ToolUsageStat.fromJson(Map json, - {ValueSerializer? serializer}) { + factory ToolUsageStat.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ToolUsageStat( toolId: serializer.fromJson(json['toolId']), @@ -1677,26 +1988,27 @@ class ToolUsageStat extends DataClass implements Insertable { }; } - ToolUsageStat copyWith( - {String? toolId, - String? toolName, - int? useCount, - DateTime? lastUsedAt, - DateTime? createdAt}) => - ToolUsageStat( - toolId: toolId ?? this.toolId, - toolName: toolName ?? this.toolName, - useCount: useCount ?? this.useCount, - lastUsedAt: lastUsedAt ?? this.lastUsedAt, - createdAt: createdAt ?? this.createdAt, - ); + ToolUsageStat copyWith({ + String? toolId, + String? toolName, + int? useCount, + DateTime? lastUsedAt, + DateTime? createdAt, + }) => ToolUsageStat( + toolId: toolId ?? this.toolId, + toolName: toolName ?? this.toolName, + useCount: useCount ?? this.useCount, + lastUsedAt: lastUsedAt ?? this.lastUsedAt, + createdAt: createdAt ?? this.createdAt, + ); ToolUsageStat copyWithCompanion(ToolUsageStatsCompanion data) { return ToolUsageStat( toolId: data.toolId.present ? data.toolId.value : this.toolId, toolName: data.toolName.present ? data.toolName.value : this.toolName, useCount: data.useCount.present ? data.useCount.value : this.useCount, - lastUsedAt: - data.lastUsedAt.present ? data.lastUsedAt.value : this.lastUsedAt, + lastUsedAt: data.lastUsedAt.present + ? data.lastUsedAt.value + : this.lastUsedAt, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, ); } @@ -1749,9 +2061,9 @@ class ToolUsageStatsCompanion extends UpdateCompanion { required DateTime lastUsedAt, required DateTime createdAt, this.rowid = const Value.absent(), - }) : toolId = Value(toolId), - lastUsedAt = Value(lastUsedAt), - createdAt = Value(createdAt); + }) : toolId = Value(toolId), + lastUsedAt = Value(lastUsedAt), + createdAt = Value(createdAt); static Insertable custom({ Expression? toolId, Expression? toolName, @@ -1770,13 +2082,14 @@ class ToolUsageStatsCompanion extends UpdateCompanion { }); } - ToolUsageStatsCompanion copyWith( - {Value? toolId, - Value? toolName, - Value? useCount, - Value? lastUsedAt, - Value? createdAt, - Value? rowid}) { + ToolUsageStatsCompanion copyWith({ + Value? toolId, + Value? toolName, + Value? useCount, + Value? lastUsedAt, + Value? createdAt, + Value? rowid, + }) { return ToolUsageStatsCompanion( toolId: toolId ?? this.toolId, toolName: toolName ?? this.toolName, @@ -1834,151 +2147,219 @@ class $FeedCacheTable extends FeedCache static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _contentMeta = - const VerificationMeta('content'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _contentMeta = const VerificationMeta( + 'content', + ); @override late final GeneratedColumn content = GeneratedColumn( - 'content', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'content', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _authorMeta = const VerificationMeta('author'); @override late final GeneratedColumn author = GeneratedColumn( - 'author', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'author', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _sourceMeta = const VerificationMeta('source'); @override late final GeneratedColumn source = GeneratedColumn( - 'source', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _feedTypeMeta = - const VerificationMeta('feedType'); + 'source', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _feedTypeMeta = const VerificationMeta( + 'feedType', + ); @override late final GeneratedColumn feedType = GeneratedColumn( - 'feed_type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _channelMeta = - const VerificationMeta('channel'); + 'feed_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _channelMeta = const VerificationMeta( + 'channel', + ); @override late final GeneratedColumn channel = GeneratedColumn( - 'channel', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _summaryMeta = - const VerificationMeta('summary'); + 'channel', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _summaryMeta = const VerificationMeta( + 'summary', + ); @override late final GeneratedColumn summary = GeneratedColumn( - 'summary', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _imageUrlMeta = - const VerificationMeta('imageUrl'); + 'summary', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _imageUrlMeta = const VerificationMeta( + 'imageUrl', + ); @override late final GeneratedColumn imageUrl = GeneratedColumn( - 'image_url', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'image_url', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _likesMeta = const VerificationMeta('likes'); @override late final GeneratedColumn likes = GeneratedColumn( - 'likes', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); + 'likes', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); static const VerificationMeta _viewsMeta = const VerificationMeta('views'); @override late final GeneratedColumn views = GeneratedColumn( - 'views', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _isLikedMeta = - const VerificationMeta('isLiked'); + 'views', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _isLikedMeta = const VerificationMeta( + 'isLiked', + ); @override late final GeneratedColumn isLiked = GeneratedColumn( - 'is_liked', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_liked" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _isFavoritedMeta = - const VerificationMeta('isFavorited'); + 'is_liked', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_liked" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _isFavoritedMeta = const VerificationMeta( + 'isFavorited', + ); @override late final GeneratedColumn isFavorited = GeneratedColumn( - 'is_favorited', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: GeneratedColumn.constraintIsAlways( - 'CHECK ("is_favorited" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _isBookmarkedMeta = - const VerificationMeta('isBookmarked'); + 'is_favorited', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_favorited" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _isBookmarkedMeta = const VerificationMeta( + 'isBookmarked', + ); @override late final GeneratedColumn isBookmarked = GeneratedColumn( - 'is_bookmarked', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: GeneratedColumn.constraintIsAlways( - 'CHECK ("is_bookmarked" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _cachePriorityMeta = - const VerificationMeta('cachePriority'); + 'is_bookmarked', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_bookmarked" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _cachePriorityMeta = const VerificationMeta( + 'cachePriority', + ); @override late final GeneratedColumn cachePriority = GeneratedColumn( - 'cache_priority', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _cachedAtMeta = - const VerificationMeta('cachedAt'); + 'cache_priority', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _cachedAtMeta = const VerificationMeta( + 'cachedAt', + ); @override late final GeneratedColumn cachedAt = GeneratedColumn( - 'cached_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _expiresAtMeta = - const VerificationMeta('expiresAt'); + 'cached_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + static const VerificationMeta _expiresAtMeta = const VerificationMeta( + 'expiresAt', + ); @override late final GeneratedColumn expiresAt = GeneratedColumn( - 'expires_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'expires_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - content, - author, - source, - feedType, - channel, - summary, - imageUrl, - likes, - views, - isLiked, - isFavorited, - isBookmarked, - cachePriority, - cachedAt, - expiresAt - ]; + id, + content, + author, + source, + feedType, + channel, + summary, + imageUrl, + likes, + views, + isLiked, + isFavorited, + isBookmarked, + cachePriority, + cachedAt, + expiresAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'feed_cache'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -1987,74 +2368,107 @@ class $FeedCacheTable extends FeedCache context.missing(_idMeta); } if (data.containsKey('content')) { - context.handle(_contentMeta, - content.isAcceptableOrUnknown(data['content']!, _contentMeta)); + context.handle( + _contentMeta, + content.isAcceptableOrUnknown(data['content']!, _contentMeta), + ); } else if (isInserting) { context.missing(_contentMeta); } if (data.containsKey('author')) { - context.handle(_authorMeta, - author.isAcceptableOrUnknown(data['author']!, _authorMeta)); + context.handle( + _authorMeta, + author.isAcceptableOrUnknown(data['author']!, _authorMeta), + ); } if (data.containsKey('source')) { - context.handle(_sourceMeta, - source.isAcceptableOrUnknown(data['source']!, _sourceMeta)); + context.handle( + _sourceMeta, + source.isAcceptableOrUnknown(data['source']!, _sourceMeta), + ); } if (data.containsKey('feed_type')) { - context.handle(_feedTypeMeta, - feedType.isAcceptableOrUnknown(data['feed_type']!, _feedTypeMeta)); + context.handle( + _feedTypeMeta, + feedType.isAcceptableOrUnknown(data['feed_type']!, _feedTypeMeta), + ); } if (data.containsKey('channel')) { - context.handle(_channelMeta, - channel.isAcceptableOrUnknown(data['channel']!, _channelMeta)); + context.handle( + _channelMeta, + channel.isAcceptableOrUnknown(data['channel']!, _channelMeta), + ); } if (data.containsKey('summary')) { - context.handle(_summaryMeta, - summary.isAcceptableOrUnknown(data['summary']!, _summaryMeta)); + context.handle( + _summaryMeta, + summary.isAcceptableOrUnknown(data['summary']!, _summaryMeta), + ); } if (data.containsKey('image_url')) { - context.handle(_imageUrlMeta, - imageUrl.isAcceptableOrUnknown(data['image_url']!, _imageUrlMeta)); + context.handle( + _imageUrlMeta, + imageUrl.isAcceptableOrUnknown(data['image_url']!, _imageUrlMeta), + ); } if (data.containsKey('likes')) { context.handle( - _likesMeta, likes.isAcceptableOrUnknown(data['likes']!, _likesMeta)); + _likesMeta, + likes.isAcceptableOrUnknown(data['likes']!, _likesMeta), + ); } if (data.containsKey('views')) { context.handle( - _viewsMeta, views.isAcceptableOrUnknown(data['views']!, _viewsMeta)); + _viewsMeta, + views.isAcceptableOrUnknown(data['views']!, _viewsMeta), + ); } if (data.containsKey('is_liked')) { - context.handle(_isLikedMeta, - isLiked.isAcceptableOrUnknown(data['is_liked']!, _isLikedMeta)); + context.handle( + _isLikedMeta, + isLiked.isAcceptableOrUnknown(data['is_liked']!, _isLikedMeta), + ); } if (data.containsKey('is_favorited')) { context.handle( + _isFavoritedMeta, + isFavorited.isAcceptableOrUnknown( + data['is_favorited']!, _isFavoritedMeta, - isFavorited.isAcceptableOrUnknown( - data['is_favorited']!, _isFavoritedMeta)); + ), + ); } if (data.containsKey('is_bookmarked')) { context.handle( + _isBookmarkedMeta, + isBookmarked.isAcceptableOrUnknown( + data['is_bookmarked']!, _isBookmarkedMeta, - isBookmarked.isAcceptableOrUnknown( - data['is_bookmarked']!, _isBookmarkedMeta)); + ), + ); } if (data.containsKey('cache_priority')) { context.handle( + _cachePriorityMeta, + cachePriority.isAcceptableOrUnknown( + data['cache_priority']!, _cachePriorityMeta, - cachePriority.isAcceptableOrUnknown( - data['cache_priority']!, _cachePriorityMeta)); + ), + ); } if (data.containsKey('cached_at')) { - context.handle(_cachedAtMeta, - cachedAt.isAcceptableOrUnknown(data['cached_at']!, _cachedAtMeta)); + context.handle( + _cachedAtMeta, + cachedAt.isAcceptableOrUnknown(data['cached_at']!, _cachedAtMeta), + ); } else if (isInserting) { context.missing(_cachedAtMeta); } if (data.containsKey('expires_at')) { - context.handle(_expiresAtMeta, - expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta)); + context.handle( + _expiresAtMeta, + expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta), + ); } else if (isInserting) { context.missing(_expiresAtMeta); } @@ -2067,38 +2481,70 @@ class $FeedCacheTable extends FeedCache FeedCacheData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return FeedCacheData( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - content: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content'])!, - author: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}author'])!, - source: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}source'])!, - feedType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}feed_type'])!, - channel: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}channel'])!, - summary: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}summary'])!, - imageUrl: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}image_url'])!, - likes: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}likes'])!, - views: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}views'])!, - isLiked: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_liked'])!, - isFavorited: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_favorited'])!, - isBookmarked: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_bookmarked'])!, - cachePriority: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}cache_priority'])!, - cachedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}cached_at'])!, - expiresAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}expires_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + content: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content'], + )!, + author: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}author'], + )!, + source: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}source'], + )!, + feedType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}feed_type'], + )!, + channel: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}channel'], + )!, + summary: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}summary'], + )!, + imageUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}image_url'], + )!, + likes: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}likes'], + )!, + views: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}views'], + )!, + isLiked: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_liked'], + )!, + isFavorited: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_favorited'], + )!, + isBookmarked: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_bookmarked'], + )!, + cachePriority: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}cache_priority'], + )!, + cachedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}cached_at'], + )!, + expiresAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}expires_at'], + )!, ); } @@ -2125,23 +2571,24 @@ class FeedCacheData extends DataClass implements Insertable { final int cachePriority; final DateTime cachedAt; final DateTime expiresAt; - const FeedCacheData( - {required this.id, - required this.content, - required this.author, - required this.source, - required this.feedType, - required this.channel, - required this.summary, - required this.imageUrl, - required this.likes, - required this.views, - required this.isLiked, - required this.isFavorited, - required this.isBookmarked, - required this.cachePriority, - required this.cachedAt, - required this.expiresAt}); + const FeedCacheData({ + required this.id, + required this.content, + required this.author, + required this.source, + required this.feedType, + required this.channel, + required this.summary, + required this.imageUrl, + required this.likes, + required this.views, + required this.isLiked, + required this.isFavorited, + required this.isBookmarked, + required this.cachePriority, + required this.cachedAt, + required this.expiresAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -2185,8 +2632,10 @@ class FeedCacheData extends DataClass implements Insertable { ); } - factory FeedCacheData.fromJson(Map json, - {ValueSerializer? serializer}) { + factory FeedCacheData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return FeedCacheData( id: serializer.fromJson(json['id']), @@ -2230,41 +2679,41 @@ class FeedCacheData extends DataClass implements Insertable { }; } - FeedCacheData copyWith( - {String? id, - String? content, - String? author, - String? source, - String? feedType, - String? channel, - String? summary, - String? imageUrl, - int? likes, - int? views, - bool? isLiked, - bool? isFavorited, - bool? isBookmarked, - int? cachePriority, - DateTime? cachedAt, - DateTime? expiresAt}) => - FeedCacheData( - id: id ?? this.id, - content: content ?? this.content, - author: author ?? this.author, - source: source ?? this.source, - feedType: feedType ?? this.feedType, - channel: channel ?? this.channel, - summary: summary ?? this.summary, - imageUrl: imageUrl ?? this.imageUrl, - likes: likes ?? this.likes, - views: views ?? this.views, - isLiked: isLiked ?? this.isLiked, - isFavorited: isFavorited ?? this.isFavorited, - isBookmarked: isBookmarked ?? this.isBookmarked, - cachePriority: cachePriority ?? this.cachePriority, - cachedAt: cachedAt ?? this.cachedAt, - expiresAt: expiresAt ?? this.expiresAt, - ); + FeedCacheData copyWith({ + String? id, + String? content, + String? author, + String? source, + String? feedType, + String? channel, + String? summary, + String? imageUrl, + int? likes, + int? views, + bool? isLiked, + bool? isFavorited, + bool? isBookmarked, + int? cachePriority, + DateTime? cachedAt, + DateTime? expiresAt, + }) => FeedCacheData( + id: id ?? this.id, + content: content ?? this.content, + author: author ?? this.author, + source: source ?? this.source, + feedType: feedType ?? this.feedType, + channel: channel ?? this.channel, + summary: summary ?? this.summary, + imageUrl: imageUrl ?? this.imageUrl, + likes: likes ?? this.likes, + views: views ?? this.views, + isLiked: isLiked ?? this.isLiked, + isFavorited: isFavorited ?? this.isFavorited, + isBookmarked: isBookmarked ?? this.isBookmarked, + cachePriority: cachePriority ?? this.cachePriority, + cachedAt: cachedAt ?? this.cachedAt, + expiresAt: expiresAt ?? this.expiresAt, + ); FeedCacheData copyWithCompanion(FeedCacheCompanion data) { return FeedCacheData( id: data.id.present ? data.id.value : this.id, @@ -2278,8 +2727,9 @@ class FeedCacheData extends DataClass implements Insertable { likes: data.likes.present ? data.likes.value : this.likes, views: data.views.present ? data.views.value : this.views, isLiked: data.isLiked.present ? data.isLiked.value : this.isLiked, - isFavorited: - data.isFavorited.present ? data.isFavorited.value : this.isFavorited, + isFavorited: data.isFavorited.present + ? data.isFavorited.value + : this.isFavorited, isBookmarked: data.isBookmarked.present ? data.isBookmarked.value : this.isBookmarked, @@ -2316,22 +2766,23 @@ class FeedCacheData extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, - content, - author, - source, - feedType, - channel, - summary, - imageUrl, - likes, - views, - isLiked, - isFavorited, - isBookmarked, - cachePriority, - cachedAt, - expiresAt); + id, + content, + author, + source, + feedType, + channel, + summary, + imageUrl, + likes, + views, + isLiked, + isFavorited, + isBookmarked, + cachePriority, + cachedAt, + expiresAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -2409,10 +2860,10 @@ class FeedCacheCompanion extends UpdateCompanion { required DateTime cachedAt, required DateTime expiresAt, this.rowid = const Value.absent(), - }) : id = Value(id), - content = Value(content), - cachedAt = Value(cachedAt), - expiresAt = Value(expiresAt); + }) : id = Value(id), + content = Value(content), + cachedAt = Value(cachedAt), + expiresAt = Value(expiresAt); static Insertable custom({ Expression? id, Expression? content, @@ -2453,24 +2904,25 @@ class FeedCacheCompanion extends UpdateCompanion { }); } - FeedCacheCompanion copyWith( - {Value? id, - Value? content, - Value? author, - Value? source, - Value? feedType, - Value? channel, - Value? summary, - Value? imageUrl, - Value? likes, - Value? views, - Value? isLiked, - Value? isFavorited, - Value? isBookmarked, - Value? cachePriority, - Value? cachedAt, - Value? expiresAt, - Value? rowid}) { + FeedCacheCompanion copyWith({ + Value? id, + Value? content, + Value? author, + Value? source, + Value? feedType, + Value? channel, + Value? summary, + Value? imageUrl, + Value? likes, + Value? views, + Value? isLiked, + Value? isFavorited, + Value? isBookmarked, + Value? cachePriority, + Value? cachedAt, + Value? expiresAt, + Value? rowid, + }) { return FeedCacheCompanion( id: id ?? this.id, content: content ?? this.content, @@ -2583,54 +3035,93 @@ class $OfflineActionQueueTable extends OfflineActionQueue static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + 'id', + aliasedName, + false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'PRIMARY KEY AUTOINCREMENT', + ), + ); static const VerificationMeta _feedIdMeta = const VerificationMeta('feedId'); @override late final GeneratedColumn feedId = GeneratedColumn( - 'feed_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _actionTypeMeta = - const VerificationMeta('actionType'); + 'feed_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _actionTypeMeta = const VerificationMeta( + 'actionType', + ); @override late final GeneratedColumn actionType = GeneratedColumn( - 'action_type', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _payloadMeta = - const VerificationMeta('payload'); + 'action_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _payloadMeta = const VerificationMeta( + 'payload', + ); @override late final GeneratedColumn payload = GeneratedColumn( - 'payload', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('{}')); - static const VerificationMeta _retryCountMeta = - const VerificationMeta('retryCount'); + 'payload', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('{}'), + ); + static const VerificationMeta _retryCountMeta = const VerificationMeta( + 'retryCount', + ); @override late final GeneratedColumn retryCount = GeneratedColumn( - 'retry_count', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'retry_count', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + 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 _lastAttemptAtMeta = - const VerificationMeta('lastAttemptAt'); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + static const VerificationMeta _lastAttemptAtMeta = const VerificationMeta( + 'lastAttemptAt', + ); @override late final GeneratedColumn lastAttemptAt = - GeneratedColumn('last_attempt_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + GeneratedColumn( + 'last_attempt_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); @override - List get $columns => - [id, feedId, actionType, payload, retryCount, createdAt, lastAttemptAt]; + List get $columns => [ + id, + feedId, + actionType, + payload, + retryCount, + createdAt, + lastAttemptAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -2638,48 +3129,58 @@ class $OfflineActionQueueTable extends OfflineActionQueue static const String $name = 'offline_action_queue'; @override VerificationContext validateIntegrity( - Insertable instance, - {bool isInserting = false}) { + 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)); } if (data.containsKey('feed_id')) { - context.handle(_feedIdMeta, - feedId.isAcceptableOrUnknown(data['feed_id']!, _feedIdMeta)); + context.handle( + _feedIdMeta, + feedId.isAcceptableOrUnknown(data['feed_id']!, _feedIdMeta), + ); } else if (isInserting) { context.missing(_feedIdMeta); } if (data.containsKey('action_type')) { context.handle( - _actionTypeMeta, - actionType.isAcceptableOrUnknown( - data['action_type']!, _actionTypeMeta)); + _actionTypeMeta, + actionType.isAcceptableOrUnknown(data['action_type']!, _actionTypeMeta), + ); } else if (isInserting) { context.missing(_actionTypeMeta); } if (data.containsKey('payload')) { - context.handle(_payloadMeta, - payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta)); + context.handle( + _payloadMeta, + payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta), + ); } if (data.containsKey('retry_count')) { context.handle( - _retryCountMeta, - retryCount.isAcceptableOrUnknown( - data['retry_count']!, _retryCountMeta)); + _retryCountMeta, + retryCount.isAcceptableOrUnknown(data['retry_count']!, _retryCountMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } if (data.containsKey('last_attempt_at')) { context.handle( + _lastAttemptAtMeta, + lastAttemptAt.isAcceptableOrUnknown( + data['last_attempt_at']!, _lastAttemptAtMeta, - lastAttemptAt.isAcceptableOrUnknown( - data['last_attempt_at']!, _lastAttemptAtMeta)); + ), + ); } return context; } @@ -2690,20 +3191,34 @@ class $OfflineActionQueueTable extends OfflineActionQueue OfflineActionQueueData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return OfflineActionQueueData( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - feedId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}feed_id'])!, - actionType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}action_type'])!, - payload: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}payload'])!, - retryCount: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}retry_count'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + feedId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}feed_id'], + )!, + actionType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}action_type'], + )!, + payload: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}payload'], + )!, + retryCount: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}retry_count'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, lastAttemptAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, data['${effectivePrefix}last_attempt_at']), + DriftSqlType.dateTime, + data['${effectivePrefix}last_attempt_at'], + ), ); } @@ -2722,14 +3237,15 @@ class OfflineActionQueueData extends DataClass final int retryCount; final DateTime createdAt; final DateTime? lastAttemptAt; - const OfflineActionQueueData( - {required this.id, - required this.feedId, - required this.actionType, - required this.payload, - required this.retryCount, - required this.createdAt, - this.lastAttemptAt}); + const OfflineActionQueueData({ + required this.id, + required this.feedId, + required this.actionType, + required this.payload, + required this.retryCount, + required this.createdAt, + this.lastAttemptAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -2759,8 +3275,10 @@ class OfflineActionQueueData extends DataClass ); } - factory OfflineActionQueueData.fromJson(Map json, - {ValueSerializer? serializer}) { + factory OfflineActionQueueData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return OfflineActionQueueData( id: serializer.fromJson(json['id']), @@ -2786,33 +3304,36 @@ class OfflineActionQueueData extends DataClass }; } - OfflineActionQueueData copyWith( - {int? id, - String? feedId, - String? actionType, - String? payload, - int? retryCount, - DateTime? createdAt, - Value lastAttemptAt = const Value.absent()}) => - OfflineActionQueueData( - id: id ?? this.id, - feedId: feedId ?? this.feedId, - actionType: actionType ?? this.actionType, - payload: payload ?? this.payload, - retryCount: retryCount ?? this.retryCount, - createdAt: createdAt ?? this.createdAt, - lastAttemptAt: - lastAttemptAt.present ? lastAttemptAt.value : this.lastAttemptAt, - ); + OfflineActionQueueData copyWith({ + int? id, + String? feedId, + String? actionType, + String? payload, + int? retryCount, + DateTime? createdAt, + Value lastAttemptAt = const Value.absent(), + }) => OfflineActionQueueData( + id: id ?? this.id, + feedId: feedId ?? this.feedId, + actionType: actionType ?? this.actionType, + payload: payload ?? this.payload, + retryCount: retryCount ?? this.retryCount, + createdAt: createdAt ?? this.createdAt, + lastAttemptAt: lastAttemptAt.present + ? lastAttemptAt.value + : this.lastAttemptAt, + ); OfflineActionQueueData copyWithCompanion(OfflineActionQueueCompanion data) { return OfflineActionQueueData( id: data.id.present ? data.id.value : this.id, feedId: data.feedId.present ? data.feedId.value : this.feedId, - actionType: - data.actionType.present ? data.actionType.value : this.actionType, + actionType: data.actionType.present + ? data.actionType.value + : this.actionType, payload: data.payload.present ? data.payload.value : this.payload, - retryCount: - data.retryCount.present ? data.retryCount.value : this.retryCount, + retryCount: data.retryCount.present + ? data.retryCount.value + : this.retryCount, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, lastAttemptAt: data.lastAttemptAt.present ? data.lastAttemptAt.value @@ -2836,7 +3357,14 @@ class OfflineActionQueueData extends DataClass @override int get hashCode => Object.hash( - id, feedId, actionType, payload, retryCount, createdAt, lastAttemptAt); + id, + feedId, + actionType, + payload, + retryCount, + createdAt, + lastAttemptAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -2876,9 +3404,9 @@ class OfflineActionQueueCompanion this.retryCount = const Value.absent(), required DateTime createdAt, this.lastAttemptAt = const Value.absent(), - }) : feedId = Value(feedId), - actionType = Value(actionType), - createdAt = Value(createdAt); + }) : feedId = Value(feedId), + actionType = Value(actionType), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? feedId, @@ -2899,14 +3427,15 @@ class OfflineActionQueueCompanion }); } - OfflineActionQueueCompanion copyWith( - {Value? id, - Value? feedId, - Value? actionType, - Value? payload, - Value? retryCount, - Value? createdAt, - Value? lastAttemptAt}) { + OfflineActionQueueCompanion copyWith({ + Value? id, + Value? feedId, + Value? actionType, + Value? payload, + Value? retryCount, + Value? createdAt, + Value? lastAttemptAt, + }) { return OfflineActionQueueCompanion( id: id ?? this.id, feedId: feedId ?? this.feedId, @@ -2966,90 +3495,138 @@ class $HanziCachesTable extends HanziCaches final GeneratedDatabase attachedDatabase; final String? _alias; $HanziCachesTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _cacheKeyMeta = - const VerificationMeta('cacheKey'); + static const VerificationMeta _cacheKeyMeta = const VerificationMeta( + 'cacheKey', + ); @override late final GeneratedColumn cacheKey = GeneratedColumn( - 'cache_key', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _queryTypeMeta = - const VerificationMeta('queryType'); + 'cache_key', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _queryTypeMeta = const VerificationMeta( + 'queryType', + ); @override late final GeneratedColumn queryType = GeneratedColumn( - 'query_type', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _keywordMeta = - const VerificationMeta('keyword'); + 'query_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _keywordMeta = const VerificationMeta( + 'keyword', + ); @override late final GeneratedColumn keyword = GeneratedColumn( - 'keyword', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _resultJsonMeta = - const VerificationMeta('resultJson'); + 'keyword', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _resultJsonMeta = const VerificationMeta( + 'resultJson', + ); @override late final GeneratedColumn resultJson = GeneratedColumn( - 'result_json', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _cachedAtMeta = - const VerificationMeta('cachedAt'); + 'result_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _cachedAtMeta = const VerificationMeta( + 'cachedAt', + ); @override late final GeneratedColumn cachedAt = GeneratedColumn( - 'cached_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _expiresAtMeta = - const VerificationMeta('expiresAt'); + 'cached_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + static const VerificationMeta _expiresAtMeta = const VerificationMeta( + 'expiresAt', + ); @override late final GeneratedColumn expiresAt = GeneratedColumn( - 'expires_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'expires_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override - List get $columns => - [cacheKey, queryType, keyword, resultJson, cachedAt, expiresAt]; + List get $columns => [ + cacheKey, + queryType, + keyword, + resultJson, + cachedAt, + expiresAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'hanzi_caches'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('cache_key')) { - context.handle(_cacheKeyMeta, - cacheKey.isAcceptableOrUnknown(data['cache_key']!, _cacheKeyMeta)); + context.handle( + _cacheKeyMeta, + cacheKey.isAcceptableOrUnknown(data['cache_key']!, _cacheKeyMeta), + ); } else if (isInserting) { context.missing(_cacheKeyMeta); } if (data.containsKey('query_type')) { - context.handle(_queryTypeMeta, - queryType.isAcceptableOrUnknown(data['query_type']!, _queryTypeMeta)); + context.handle( + _queryTypeMeta, + queryType.isAcceptableOrUnknown(data['query_type']!, _queryTypeMeta), + ); } else if (isInserting) { context.missing(_queryTypeMeta); } if (data.containsKey('keyword')) { - context.handle(_keywordMeta, - keyword.isAcceptableOrUnknown(data['keyword']!, _keywordMeta)); + context.handle( + _keywordMeta, + keyword.isAcceptableOrUnknown(data['keyword']!, _keywordMeta), + ); } else if (isInserting) { context.missing(_keywordMeta); } if (data.containsKey('result_json')) { context.handle( - _resultJsonMeta, - resultJson.isAcceptableOrUnknown( - data['result_json']!, _resultJsonMeta)); + _resultJsonMeta, + resultJson.isAcceptableOrUnknown(data['result_json']!, _resultJsonMeta), + ); } else if (isInserting) { context.missing(_resultJsonMeta); } if (data.containsKey('cached_at')) { - context.handle(_cachedAtMeta, - cachedAt.isAcceptableOrUnknown(data['cached_at']!, _cachedAtMeta)); + context.handle( + _cachedAtMeta, + cachedAt.isAcceptableOrUnknown(data['cached_at']!, _cachedAtMeta), + ); } else if (isInserting) { context.missing(_cachedAtMeta); } if (data.containsKey('expires_at')) { - context.handle(_expiresAtMeta, - expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta)); + context.handle( + _expiresAtMeta, + expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta), + ); } else if (isInserting) { context.missing(_expiresAtMeta); } @@ -3062,18 +3639,30 @@ class $HanziCachesTable extends HanziCaches HanziCache map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return HanziCache( - cacheKey: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}cache_key'])!, - queryType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}query_type'])!, - keyword: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}keyword'])!, - resultJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}result_json'])!, - cachedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}cached_at'])!, - expiresAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}expires_at'])!, + cacheKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}cache_key'], + )!, + queryType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}query_type'], + )!, + keyword: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}keyword'], + )!, + resultJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}result_json'], + )!, + cachedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}cached_at'], + )!, + expiresAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}expires_at'], + )!, ); } @@ -3090,13 +3679,14 @@ class HanziCache extends DataClass implements Insertable { final String resultJson; final DateTime cachedAt; final DateTime expiresAt; - const HanziCache( - {required this.cacheKey, - required this.queryType, - required this.keyword, - required this.resultJson, - required this.cachedAt, - required this.expiresAt}); + const HanziCache({ + required this.cacheKey, + required this.queryType, + required this.keyword, + required this.resultJson, + required this.cachedAt, + required this.expiresAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -3120,8 +3710,10 @@ class HanziCache extends DataClass implements Insertable { ); } - factory HanziCache.fromJson(Map json, - {ValueSerializer? serializer}) { + factory HanziCache.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return HanziCache( cacheKey: serializer.fromJson(json['cacheKey']), @@ -3145,28 +3737,29 @@ class HanziCache extends DataClass implements Insertable { }; } - HanziCache copyWith( - {String? cacheKey, - String? queryType, - String? keyword, - String? resultJson, - DateTime? cachedAt, - DateTime? expiresAt}) => - HanziCache( - cacheKey: cacheKey ?? this.cacheKey, - queryType: queryType ?? this.queryType, - keyword: keyword ?? this.keyword, - resultJson: resultJson ?? this.resultJson, - cachedAt: cachedAt ?? this.cachedAt, - expiresAt: expiresAt ?? this.expiresAt, - ); + HanziCache copyWith({ + String? cacheKey, + String? queryType, + String? keyword, + String? resultJson, + DateTime? cachedAt, + DateTime? expiresAt, + }) => HanziCache( + cacheKey: cacheKey ?? this.cacheKey, + queryType: queryType ?? this.queryType, + keyword: keyword ?? this.keyword, + resultJson: resultJson ?? this.resultJson, + cachedAt: cachedAt ?? this.cachedAt, + expiresAt: expiresAt ?? this.expiresAt, + ); HanziCache copyWithCompanion(HanziCachesCompanion data) { return HanziCache( cacheKey: data.cacheKey.present ? data.cacheKey.value : this.cacheKey, queryType: data.queryType.present ? data.queryType.value : this.queryType, keyword: data.keyword.present ? data.keyword.value : this.keyword, - resultJson: - data.resultJson.present ? data.resultJson.value : this.resultJson, + resultJson: data.resultJson.present + ? data.resultJson.value + : this.resultJson, cachedAt: data.cachedAt.present ? data.cachedAt.value : this.cachedAt, expiresAt: data.expiresAt.present ? data.expiresAt.value : this.expiresAt, ); @@ -3187,7 +3780,13 @@ class HanziCache extends DataClass implements Insertable { @override int get hashCode => Object.hash( - cacheKey, queryType, keyword, resultJson, cachedAt, expiresAt); + cacheKey, + queryType, + keyword, + resultJson, + cachedAt, + expiresAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -3225,12 +3824,12 @@ class HanziCachesCompanion extends UpdateCompanion { required DateTime cachedAt, required DateTime expiresAt, this.rowid = const Value.absent(), - }) : cacheKey = Value(cacheKey), - queryType = Value(queryType), - keyword = Value(keyword), - resultJson = Value(resultJson), - cachedAt = Value(cachedAt), - expiresAt = Value(expiresAt); + }) : cacheKey = Value(cacheKey), + queryType = Value(queryType), + keyword = Value(keyword), + resultJson = Value(resultJson), + cachedAt = Value(cachedAt), + expiresAt = Value(expiresAt); static Insertable custom({ Expression? cacheKey, Expression? queryType, @@ -3251,14 +3850,15 @@ class HanziCachesCompanion extends UpdateCompanion { }); } - HanziCachesCompanion copyWith( - {Value? cacheKey, - Value? queryType, - Value? keyword, - Value? resultJson, - Value? cachedAt, - Value? expiresAt, - Value? rowid}) { + HanziCachesCompanion copyWith({ + Value? cacheKey, + Value? queryType, + Value? keyword, + Value? resultJson, + Value? cachedAt, + Value? expiresAt, + Value? rowid, + }) { return HanziCachesCompanion( cacheKey: cacheKey ?? this.cacheKey, queryType: queryType ?? this.queryType, @@ -3321,178 +3921,254 @@ class $ShareHistoriesTable extends ShareHistories static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); - static const VerificationMeta _contentIdMeta = - const VerificationMeta('contentId'); + 'id', + aliasedName, + false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'PRIMARY KEY AUTOINCREMENT', + ), + ); + static const VerificationMeta _contentIdMeta = const VerificationMeta( + 'contentId', + ); @override late final GeneratedColumn contentId = GeneratedColumn( - 'content_id', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'content_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _sceneMeta = const VerificationMeta('scene'); @override late final GeneratedColumn scene = GeneratedColumn( - 'scene', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('sentence')); - static const VerificationMeta _shareTypeMeta = - const VerificationMeta('shareType'); + 'scene', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('sentence'), + ); + static const VerificationMeta _shareTypeMeta = const VerificationMeta( + 'shareType', + ); @override late final GeneratedColumn shareType = GeneratedColumn( - 'share_type', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'share_type', + 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: false, - defaultValue: const Constant('')); - static const VerificationMeta _contentMeta = - const VerificationMeta('content'); + 'title', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _contentMeta = const VerificationMeta( + 'content', + ); @override late final GeneratedColumn content = GeneratedColumn( - 'content', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'content', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _authorMeta = const VerificationMeta('author'); @override late final GeneratedColumn author = GeneratedColumn( - 'author', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'author', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _sourceMeta = const VerificationMeta('source'); @override late final GeneratedColumn source = GeneratedColumn( - 'source', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _shareSourceMeta = - const VerificationMeta('shareSource'); + 'source', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _shareSourceMeta = const VerificationMeta( + 'shareSource', + ); @override late final GeneratedColumn shareSource = GeneratedColumn( - 'share_source', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'share_source', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _noteMeta = const VerificationMeta('note'); @override late final GeneratedColumn note = GeneratedColumn( - 'note', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'note', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _tagsMeta = const VerificationMeta('tags'); @override late final GeneratedColumn tags = GeneratedColumn( - 'tags', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _imageUrlMeta = - const VerificationMeta('imageUrl'); + 'tags', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _imageUrlMeta = const VerificationMeta( + 'imageUrl', + ); @override late final GeneratedColumn imageUrl = GeneratedColumn( - 'image_url', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _sharedAtMeta = - const VerificationMeta('sharedAt'); + 'image_url', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _sharedAtMeta = const VerificationMeta( + 'sharedAt', + ); @override late final GeneratedColumn sharedAt = GeneratedColumn( - 'shared_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'shared_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - contentId, - scene, - shareType, - title, - content, - author, - source, - shareSource, - note, - tags, - imageUrl, - sharedAt - ]; + id, + contentId, + scene, + shareType, + title, + content, + author, + source, + shareSource, + note, + tags, + imageUrl, + sharedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'share_histories'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + 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)); } if (data.containsKey('content_id')) { - context.handle(_contentIdMeta, - contentId.isAcceptableOrUnknown(data['content_id']!, _contentIdMeta)); + context.handle( + _contentIdMeta, + contentId.isAcceptableOrUnknown(data['content_id']!, _contentIdMeta), + ); } if (data.containsKey('scene')) { context.handle( - _sceneMeta, scene.isAcceptableOrUnknown(data['scene']!, _sceneMeta)); + _sceneMeta, + scene.isAcceptableOrUnknown(data['scene']!, _sceneMeta), + ); } if (data.containsKey('share_type')) { - context.handle(_shareTypeMeta, - shareType.isAcceptableOrUnknown(data['share_type']!, _shareTypeMeta)); + context.handle( + _shareTypeMeta, + shareType.isAcceptableOrUnknown(data['share_type']!, _shareTypeMeta), + ); } else if (isInserting) { context.missing(_shareTypeMeta); } if (data.containsKey('title')) { context.handle( - _titleMeta, title.isAcceptableOrUnknown(data['title']!, _titleMeta)); + _titleMeta, + title.isAcceptableOrUnknown(data['title']!, _titleMeta), + ); } if (data.containsKey('content')) { - context.handle(_contentMeta, - content.isAcceptableOrUnknown(data['content']!, _contentMeta)); + context.handle( + _contentMeta, + content.isAcceptableOrUnknown(data['content']!, _contentMeta), + ); } else if (isInserting) { context.missing(_contentMeta); } if (data.containsKey('author')) { - context.handle(_authorMeta, - author.isAcceptableOrUnknown(data['author']!, _authorMeta)); + context.handle( + _authorMeta, + author.isAcceptableOrUnknown(data['author']!, _authorMeta), + ); } if (data.containsKey('source')) { - context.handle(_sourceMeta, - source.isAcceptableOrUnknown(data['source']!, _sourceMeta)); + context.handle( + _sourceMeta, + source.isAcceptableOrUnknown(data['source']!, _sourceMeta), + ); } if (data.containsKey('share_source')) { context.handle( + _shareSourceMeta, + shareSource.isAcceptableOrUnknown( + data['share_source']!, _shareSourceMeta, - shareSource.isAcceptableOrUnknown( - data['share_source']!, _shareSourceMeta)); + ), + ); } if (data.containsKey('note')) { context.handle( - _noteMeta, note.isAcceptableOrUnknown(data['note']!, _noteMeta)); + _noteMeta, + note.isAcceptableOrUnknown(data['note']!, _noteMeta), + ); } if (data.containsKey('tags')) { context.handle( - _tagsMeta, tags.isAcceptableOrUnknown(data['tags']!, _tagsMeta)); + _tagsMeta, + tags.isAcceptableOrUnknown(data['tags']!, _tagsMeta), + ); } if (data.containsKey('image_url')) { - context.handle(_imageUrlMeta, - imageUrl.isAcceptableOrUnknown(data['image_url']!, _imageUrlMeta)); + context.handle( + _imageUrlMeta, + imageUrl.isAcceptableOrUnknown(data['image_url']!, _imageUrlMeta), + ); } if (data.containsKey('shared_at')) { - context.handle(_sharedAtMeta, - sharedAt.isAcceptableOrUnknown(data['shared_at']!, _sharedAtMeta)); + context.handle( + _sharedAtMeta, + sharedAt.isAcceptableOrUnknown(data['shared_at']!, _sharedAtMeta), + ); } else if (isInserting) { context.missing(_sharedAtMeta); } @@ -3505,32 +4181,58 @@ class $ShareHistoriesTable extends ShareHistories ShareHistory map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ShareHistory( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - contentId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content_id'])!, - scene: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}scene'])!, - shareType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}share_type'])!, - title: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}title'])!, - content: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content'])!, - author: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}author'])!, - source: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}source'])!, - shareSource: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}share_source'])!, - note: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}note'])!, - tags: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}tags'])!, - imageUrl: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}image_url'])!, - sharedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}shared_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + contentId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content_id'], + )!, + scene: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}scene'], + )!, + shareType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}share_type'], + )!, + title: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}title'], + )!, + content: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content'], + )!, + author: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}author'], + )!, + source: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}source'], + )!, + shareSource: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}share_source'], + )!, + note: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}note'], + )!, + tags: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}tags'], + )!, + imageUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}image_url'], + )!, + sharedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}shared_at'], + )!, ); } @@ -3554,20 +4256,21 @@ class ShareHistory extends DataClass implements Insertable { final String tags; final String imageUrl; final DateTime sharedAt; - const ShareHistory( - {required this.id, - required this.contentId, - required this.scene, - required this.shareType, - required this.title, - required this.content, - required this.author, - required this.source, - required this.shareSource, - required this.note, - required this.tags, - required this.imageUrl, - required this.sharedAt}); + const ShareHistory({ + required this.id, + required this.contentId, + required this.scene, + required this.shareType, + required this.title, + required this.content, + required this.author, + required this.source, + required this.shareSource, + required this.note, + required this.tags, + required this.imageUrl, + required this.sharedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -3605,8 +4308,10 @@ class ShareHistory extends DataClass implements Insertable { ); } - factory ShareHistory.fromJson(Map json, - {ValueSerializer? serializer}) { + factory ShareHistory.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ShareHistory( id: serializer.fromJson(json['id']), @@ -3644,35 +4349,35 @@ class ShareHistory extends DataClass implements Insertable { }; } - ShareHistory copyWith( - {int? id, - String? contentId, - String? scene, - String? shareType, - String? title, - String? content, - String? author, - String? source, - String? shareSource, - String? note, - String? tags, - String? imageUrl, - DateTime? sharedAt}) => - ShareHistory( - id: id ?? this.id, - contentId: contentId ?? this.contentId, - scene: scene ?? this.scene, - shareType: shareType ?? this.shareType, - title: title ?? this.title, - content: content ?? this.content, - author: author ?? this.author, - source: source ?? this.source, - shareSource: shareSource ?? this.shareSource, - note: note ?? this.note, - tags: tags ?? this.tags, - imageUrl: imageUrl ?? this.imageUrl, - sharedAt: sharedAt ?? this.sharedAt, - ); + ShareHistory copyWith({ + int? id, + String? contentId, + String? scene, + String? shareType, + String? title, + String? content, + String? author, + String? source, + String? shareSource, + String? note, + String? tags, + String? imageUrl, + DateTime? sharedAt, + }) => ShareHistory( + id: id ?? this.id, + contentId: contentId ?? this.contentId, + scene: scene ?? this.scene, + shareType: shareType ?? this.shareType, + title: title ?? this.title, + content: content ?? this.content, + author: author ?? this.author, + source: source ?? this.source, + shareSource: shareSource ?? this.shareSource, + note: note ?? this.note, + tags: tags ?? this.tags, + imageUrl: imageUrl ?? this.imageUrl, + sharedAt: sharedAt ?? this.sharedAt, + ); ShareHistory copyWithCompanion(ShareHistoriesCompanion data) { return ShareHistory( id: data.id.present ? data.id.value : this.id, @@ -3683,8 +4388,9 @@ class ShareHistory extends DataClass implements Insertable { content: data.content.present ? data.content.value : this.content, author: data.author.present ? data.author.value : this.author, source: data.source.present ? data.source.value : this.source, - shareSource: - data.shareSource.present ? data.shareSource.value : this.shareSource, + shareSource: data.shareSource.present + ? data.shareSource.value + : this.shareSource, note: data.note.present ? data.note.value : this.note, tags: data.tags.present ? data.tags.value : this.tags, imageUrl: data.imageUrl.present ? data.imageUrl.value : this.imageUrl, @@ -3713,8 +4419,21 @@ class ShareHistory extends DataClass implements Insertable { } @override - int get hashCode => Object.hash(id, contentId, scene, shareType, title, - content, author, source, shareSource, note, tags, imageUrl, sharedAt); + int get hashCode => Object.hash( + id, + contentId, + scene, + shareType, + title, + content, + author, + source, + shareSource, + note, + tags, + imageUrl, + sharedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -3777,9 +4496,9 @@ class ShareHistoriesCompanion extends UpdateCompanion { this.tags = const Value.absent(), this.imageUrl = const Value.absent(), required DateTime sharedAt, - }) : shareType = Value(shareType), - content = Value(content), - sharedAt = Value(sharedAt); + }) : shareType = Value(shareType), + content = Value(content), + sharedAt = Value(sharedAt); static Insertable custom({ Expression? id, Expression? contentId, @@ -3812,20 +4531,21 @@ class ShareHistoriesCompanion extends UpdateCompanion { }); } - ShareHistoriesCompanion copyWith( - {Value? id, - Value? contentId, - Value? scene, - Value? shareType, - Value? title, - Value? content, - Value? author, - Value? source, - Value? shareSource, - Value? note, - Value? tags, - Value? imageUrl, - Value? sharedAt}) { + ShareHistoriesCompanion copyWith({ + Value? id, + Value? contentId, + Value? scene, + Value? shareType, + Value? title, + Value? content, + Value? author, + Value? source, + Value? shareSource, + Value? note, + Value? tags, + Value? imageUrl, + Value? sharedAt, + }) { return ShareHistoriesCompanion( id: id ?? this.id, contentId: contentId ?? this.contentId, @@ -3918,114 +4638,169 @@ class $LearningPlansTable extends LearningPlans static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + 'id', + aliasedName, + false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'PRIMARY KEY AUTOINCREMENT', + ), + ); static const VerificationMeta _titleMeta = const VerificationMeta('title'); @override late final GeneratedColumn title = GeneratedColumn( - 'title', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _descriptionMeta = - const VerificationMeta('description'); + 'title', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _descriptionMeta = const VerificationMeta( + 'description', + ); @override late final GeneratedColumn description = GeneratedColumn( - 'description', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _categoryMeta = - const VerificationMeta('category'); + 'description', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _categoryMeta = const VerificationMeta( + 'category', + ); @override late final GeneratedColumn category = GeneratedColumn( - 'category', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('poetry')); - static const VerificationMeta _dailyGoalMeta = - const VerificationMeta('dailyGoal'); + 'category', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('poetry'), + ); + static const VerificationMeta _dailyGoalMeta = const VerificationMeta( + 'dailyGoal', + ); @override late final GeneratedColumn dailyGoal = GeneratedColumn( - 'daily_goal', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(5)); - static const VerificationMeta _streakDaysMeta = - const VerificationMeta('streakDays'); + 'daily_goal', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(5), + ); + static const VerificationMeta _streakDaysMeta = const VerificationMeta( + 'streakDays', + ); @override late final GeneratedColumn streakDays = GeneratedColumn( - 'streak_days', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _totalCompletedMeta = - const VerificationMeta('totalCompleted'); + 'streak_days', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _totalCompletedMeta = const VerificationMeta( + 'totalCompleted', + ); @override late final GeneratedColumn totalCompleted = GeneratedColumn( - 'total_completed', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _isActiveMeta = - const VerificationMeta('isActive'); + 'total_completed', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _isActiveMeta = const VerificationMeta( + 'isActive', + ); @override late final GeneratedColumn isActive = GeneratedColumn( - 'is_active', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_active" IN (0, 1))'), - defaultValue: const Constant(true)); - static const VerificationMeta _startDateMeta = - const VerificationMeta('startDate'); + 'is_active', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_active" IN (0, 1))', + ), + defaultValue: const Constant(true), + ); + static const VerificationMeta _startDateMeta = const VerificationMeta( + 'startDate', + ); @override late final GeneratedColumn startDate = GeneratedColumn( - 'start_date', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _endDateMeta = - const VerificationMeta('endDate'); + 'start_date', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + static const VerificationMeta _endDateMeta = const VerificationMeta( + 'endDate', + ); @override late final GeneratedColumn endDate = GeneratedColumn( - 'end_date', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'end_date', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - title, - description, - category, - dailyGoal, - streakDays, - totalCompleted, - isActive, - startDate, - endDate, - createdAt, - updatedAt - ]; + id, + title, + description, + category, + dailyGoal, + streakDays, + totalCompleted, + isActive, + startDate, + endDate, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'learning_plans'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -4033,59 +4808,81 @@ class $LearningPlansTable extends LearningPlans } if (data.containsKey('title')) { context.handle( - _titleMeta, title.isAcceptableOrUnknown(data['title']!, _titleMeta)); + _titleMeta, + title.isAcceptableOrUnknown(data['title']!, _titleMeta), + ); } else if (isInserting) { context.missing(_titleMeta); } if (data.containsKey('description')) { context.handle( + _descriptionMeta, + description.isAcceptableOrUnknown( + data['description']!, _descriptionMeta, - description.isAcceptableOrUnknown( - data['description']!, _descriptionMeta)); + ), + ); } if (data.containsKey('category')) { - context.handle(_categoryMeta, - category.isAcceptableOrUnknown(data['category']!, _categoryMeta)); + context.handle( + _categoryMeta, + category.isAcceptableOrUnknown(data['category']!, _categoryMeta), + ); } if (data.containsKey('daily_goal')) { - context.handle(_dailyGoalMeta, - dailyGoal.isAcceptableOrUnknown(data['daily_goal']!, _dailyGoalMeta)); + context.handle( + _dailyGoalMeta, + dailyGoal.isAcceptableOrUnknown(data['daily_goal']!, _dailyGoalMeta), + ); } if (data.containsKey('streak_days')) { context.handle( - _streakDaysMeta, - streakDays.isAcceptableOrUnknown( - data['streak_days']!, _streakDaysMeta)); + _streakDaysMeta, + streakDays.isAcceptableOrUnknown(data['streak_days']!, _streakDaysMeta), + ); } if (data.containsKey('total_completed')) { context.handle( + _totalCompletedMeta, + totalCompleted.isAcceptableOrUnknown( + data['total_completed']!, _totalCompletedMeta, - totalCompleted.isAcceptableOrUnknown( - data['total_completed']!, _totalCompletedMeta)); + ), + ); } if (data.containsKey('is_active')) { - context.handle(_isActiveMeta, - isActive.isAcceptableOrUnknown(data['is_active']!, _isActiveMeta)); + context.handle( + _isActiveMeta, + isActive.isAcceptableOrUnknown(data['is_active']!, _isActiveMeta), + ); } if (data.containsKey('start_date')) { - context.handle(_startDateMeta, - startDate.isAcceptableOrUnknown(data['start_date']!, _startDateMeta)); + context.handle( + _startDateMeta, + startDate.isAcceptableOrUnknown(data['start_date']!, _startDateMeta), + ); } else if (isInserting) { context.missing(_startDateMeta); } if (data.containsKey('end_date')) { - context.handle(_endDateMeta, - endDate.isAcceptableOrUnknown(data['end_date']!, _endDateMeta)); + context.handle( + _endDateMeta, + endDate.isAcceptableOrUnknown(data['end_date']!, _endDateMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -4098,30 +4895,54 @@ class $LearningPlansTable extends LearningPlans LearningPlan map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return LearningPlan( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - title: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}title'])!, - description: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}description'])!, - category: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}category'])!, - dailyGoal: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}daily_goal'])!, - streakDays: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}streak_days'])!, - totalCompleted: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}total_completed'])!, - isActive: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_active'])!, - startDate: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}start_date'])!, - endDate: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}end_date']), - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + title: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}title'], + )!, + description: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}description'], + )!, + category: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}category'], + )!, + dailyGoal: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}daily_goal'], + )!, + streakDays: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}streak_days'], + )!, + totalCompleted: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}total_completed'], + )!, + isActive: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_active'], + )!, + startDate: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}start_date'], + )!, + endDate: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}end_date'], + ), + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -4144,19 +4965,20 @@ class LearningPlan extends DataClass implements Insertable { final DateTime? endDate; final DateTime createdAt; final DateTime updatedAt; - const LearningPlan( - {required this.id, - required this.title, - required this.description, - required this.category, - required this.dailyGoal, - required this.streakDays, - required this.totalCompleted, - required this.isActive, - required this.startDate, - this.endDate, - required this.createdAt, - required this.updatedAt}); + const LearningPlan({ + required this.id, + required this.title, + required this.description, + required this.category, + required this.dailyGoal, + required this.streakDays, + required this.totalCompleted, + required this.isActive, + required this.startDate, + this.endDate, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -4196,8 +5018,10 @@ class LearningPlan extends DataClass implements Insertable { ); } - factory LearningPlan.fromJson(Map json, - {ValueSerializer? serializer}) { + factory LearningPlan.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return LearningPlan( id: serializer.fromJson(json['id']), @@ -4233,43 +5057,45 @@ class LearningPlan extends DataClass implements Insertable { }; } - LearningPlan copyWith( - {int? id, - String? title, - String? description, - String? category, - int? dailyGoal, - int? streakDays, - int? totalCompleted, - bool? isActive, - DateTime? startDate, - Value endDate = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt}) => - LearningPlan( - id: id ?? this.id, - title: title ?? this.title, - description: description ?? this.description, - category: category ?? this.category, - dailyGoal: dailyGoal ?? this.dailyGoal, - streakDays: streakDays ?? this.streakDays, - totalCompleted: totalCompleted ?? this.totalCompleted, - isActive: isActive ?? this.isActive, - startDate: startDate ?? this.startDate, - endDate: endDate.present ? endDate.value : this.endDate, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + LearningPlan copyWith({ + int? id, + String? title, + String? description, + String? category, + int? dailyGoal, + int? streakDays, + int? totalCompleted, + bool? isActive, + DateTime? startDate, + Value endDate = const Value.absent(), + DateTime? createdAt, + DateTime? updatedAt, + }) => LearningPlan( + id: id ?? this.id, + title: title ?? this.title, + description: description ?? this.description, + category: category ?? this.category, + dailyGoal: dailyGoal ?? this.dailyGoal, + streakDays: streakDays ?? this.streakDays, + totalCompleted: totalCompleted ?? this.totalCompleted, + isActive: isActive ?? this.isActive, + startDate: startDate ?? this.startDate, + endDate: endDate.present ? endDate.value : this.endDate, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); LearningPlan copyWithCompanion(LearningPlansCompanion data) { return LearningPlan( id: data.id.present ? data.id.value : this.id, title: data.title.present ? data.title.value : this.title, - description: - data.description.present ? data.description.value : this.description, + description: data.description.present + ? data.description.value + : this.description, category: data.category.present ? data.category.value : this.category, dailyGoal: data.dailyGoal.present ? data.dailyGoal.value : this.dailyGoal, - streakDays: - data.streakDays.present ? data.streakDays.value : this.streakDays, + streakDays: data.streakDays.present + ? data.streakDays.value + : this.streakDays, totalCompleted: data.totalCompleted.present ? data.totalCompleted.value : this.totalCompleted, @@ -4302,18 +5128,19 @@ class LearningPlan extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, - title, - description, - category, - dailyGoal, - streakDays, - totalCompleted, - isActive, - startDate, - endDate, - createdAt, - updatedAt); + id, + title, + description, + category, + dailyGoal, + streakDays, + totalCompleted, + isActive, + startDate, + endDate, + createdAt, + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -4372,10 +5199,10 @@ class LearningPlansCompanion extends UpdateCompanion { this.endDate = const Value.absent(), required DateTime createdAt, required DateTime updatedAt, - }) : title = Value(title), - startDate = Value(startDate), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : title = Value(title), + startDate = Value(startDate), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? title, @@ -4406,19 +5233,20 @@ class LearningPlansCompanion extends UpdateCompanion { }); } - LearningPlansCompanion copyWith( - {Value? id, - Value? title, - Value? description, - Value? category, - Value? dailyGoal, - Value? streakDays, - Value? totalCompleted, - Value? isActive, - Value? startDate, - Value? endDate, - Value? createdAt, - Value? updatedAt}) { + LearningPlansCompanion copyWith({ + Value? id, + Value? title, + Value? description, + Value? category, + Value? dailyGoal, + Value? streakDays, + Value? totalCompleted, + Value? isActive, + Value? startDate, + Value? endDate, + Value? createdAt, + Value? updatedAt, + }) { return LearningPlansCompanion( id: id ?? this.id, title: title ?? this.title, @@ -4506,120 +5334,170 @@ class $LearningRecordsTable extends LearningRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + 'id', + aliasedName, + false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'PRIMARY KEY AUTOINCREMENT', + ), + ); static const VerificationMeta _planIdMeta = const VerificationMeta('planId'); @override late final GeneratedColumn planId = GeneratedColumn( - 'plan_id', aliasedName, false, - type: DriftSqlType.int, requiredDuringInsert: true); - static const VerificationMeta _contentIdMeta = - const VerificationMeta('contentId'); + 'plan_id', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: true, + ); + static const VerificationMeta _contentIdMeta = const VerificationMeta( + 'contentId', + ); @override late final GeneratedColumn contentId = GeneratedColumn( - 'content_id', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _contentTypeMeta = - const VerificationMeta('contentType'); + 'content_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _contentTypeMeta = const VerificationMeta( + 'contentType', + ); @override late final GeneratedColumn contentType = GeneratedColumn( - 'content_type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('poetry')); + 'content_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('poetry'), + ); static const VerificationMeta _titleMeta = const VerificationMeta('title'); @override late final GeneratedColumn title = GeneratedColumn( - 'title', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'title', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _noteMeta = const VerificationMeta('note'); @override late final GeneratedColumn note = GeneratedColumn( - 'note', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _durationSecondsMeta = - const VerificationMeta('durationSeconds'); + 'note', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _durationSecondsMeta = const VerificationMeta( + 'durationSeconds', + ); @override late final GeneratedColumn durationSeconds = GeneratedColumn( - 'duration_seconds', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _completedAtMeta = - const VerificationMeta('completedAt'); + 'duration_seconds', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _completedAtMeta = const VerificationMeta( + 'completedAt', + ); @override late final GeneratedColumn completedAt = GeneratedColumn( - 'completed_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'completed_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - planId, - contentId, - contentType, - title, - note, - durationSeconds, - completedAt - ]; + id, + planId, + contentId, + contentType, + title, + note, + durationSeconds, + completedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'learning_records'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + 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)); } if (data.containsKey('plan_id')) { - context.handle(_planIdMeta, - planId.isAcceptableOrUnknown(data['plan_id']!, _planIdMeta)); + context.handle( + _planIdMeta, + planId.isAcceptableOrUnknown(data['plan_id']!, _planIdMeta), + ); } else if (isInserting) { context.missing(_planIdMeta); } if (data.containsKey('content_id')) { - context.handle(_contentIdMeta, - contentId.isAcceptableOrUnknown(data['content_id']!, _contentIdMeta)); + context.handle( + _contentIdMeta, + contentId.isAcceptableOrUnknown(data['content_id']!, _contentIdMeta), + ); } if (data.containsKey('content_type')) { context.handle( + _contentTypeMeta, + contentType.isAcceptableOrUnknown( + data['content_type']!, _contentTypeMeta, - contentType.isAcceptableOrUnknown( - data['content_type']!, _contentTypeMeta)); + ), + ); } if (data.containsKey('title')) { context.handle( - _titleMeta, title.isAcceptableOrUnknown(data['title']!, _titleMeta)); + _titleMeta, + title.isAcceptableOrUnknown(data['title']!, _titleMeta), + ); } if (data.containsKey('note')) { context.handle( - _noteMeta, note.isAcceptableOrUnknown(data['note']!, _noteMeta)); + _noteMeta, + note.isAcceptableOrUnknown(data['note']!, _noteMeta), + ); } if (data.containsKey('duration_seconds')) { context.handle( + _durationSecondsMeta, + durationSeconds.isAcceptableOrUnknown( + data['duration_seconds']!, _durationSecondsMeta, - durationSeconds.isAcceptableOrUnknown( - data['duration_seconds']!, _durationSecondsMeta)); + ), + ); } if (data.containsKey('completed_at')) { context.handle( + _completedAtMeta, + completedAt.isAcceptableOrUnknown( + data['completed_at']!, _completedAtMeta, - completedAt.isAcceptableOrUnknown( - data['completed_at']!, _completedAtMeta)); + ), + ); } else if (isInserting) { context.missing(_completedAtMeta); } @@ -4632,22 +5510,38 @@ class $LearningRecordsTable extends LearningRecords LearningRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return LearningRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - planId: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}plan_id'])!, - contentId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content_id'])!, - contentType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content_type'])!, - title: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}title'])!, - note: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}note'])!, - durationSeconds: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}duration_seconds'])!, - completedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}completed_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + planId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}plan_id'], + )!, + contentId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content_id'], + )!, + contentType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content_type'], + )!, + title: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}title'], + )!, + note: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}note'], + )!, + durationSeconds: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}duration_seconds'], + )!, + completedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}completed_at'], + )!, ); } @@ -4666,15 +5560,16 @@ class LearningRecord extends DataClass implements Insertable { final String note; final int durationSeconds; final DateTime completedAt; - const LearningRecord( - {required this.id, - required this.planId, - required this.contentId, - required this.contentType, - required this.title, - required this.note, - required this.durationSeconds, - required this.completedAt}); + const LearningRecord({ + required this.id, + required this.planId, + required this.contentId, + required this.contentType, + required this.title, + required this.note, + required this.durationSeconds, + required this.completedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -4702,8 +5597,10 @@ class LearningRecord extends DataClass implements Insertable { ); } - factory LearningRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory LearningRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return LearningRecord( id: serializer.fromJson(json['id']), @@ -4731,39 +5628,41 @@ class LearningRecord extends DataClass implements Insertable { }; } - LearningRecord copyWith( - {int? id, - int? planId, - String? contentId, - String? contentType, - String? title, - String? note, - int? durationSeconds, - DateTime? completedAt}) => - LearningRecord( - id: id ?? this.id, - planId: planId ?? this.planId, - contentId: contentId ?? this.contentId, - contentType: contentType ?? this.contentType, - title: title ?? this.title, - note: note ?? this.note, - durationSeconds: durationSeconds ?? this.durationSeconds, - completedAt: completedAt ?? this.completedAt, - ); + LearningRecord copyWith({ + int? id, + int? planId, + String? contentId, + String? contentType, + String? title, + String? note, + int? durationSeconds, + DateTime? completedAt, + }) => LearningRecord( + id: id ?? this.id, + planId: planId ?? this.planId, + contentId: contentId ?? this.contentId, + contentType: contentType ?? this.contentType, + title: title ?? this.title, + note: note ?? this.note, + durationSeconds: durationSeconds ?? this.durationSeconds, + completedAt: completedAt ?? this.completedAt, + ); LearningRecord copyWithCompanion(LearningRecordsCompanion data) { return LearningRecord( id: data.id.present ? data.id.value : this.id, planId: data.planId.present ? data.planId.value : this.planId, contentId: data.contentId.present ? data.contentId.value : this.contentId, - contentType: - data.contentType.present ? data.contentType.value : this.contentType, + contentType: data.contentType.present + ? data.contentType.value + : this.contentType, title: data.title.present ? data.title.value : this.title, note: data.note.present ? data.note.value : this.note, durationSeconds: data.durationSeconds.present ? data.durationSeconds.value : this.durationSeconds, - completedAt: - data.completedAt.present ? data.completedAt.value : this.completedAt, + completedAt: data.completedAt.present + ? data.completedAt.value + : this.completedAt, ); } @@ -4783,8 +5682,16 @@ class LearningRecord extends DataClass implements Insertable { } @override - int get hashCode => Object.hash(id, planId, contentId, contentType, title, - note, durationSeconds, completedAt); + int get hashCode => Object.hash( + id, + planId, + contentId, + contentType, + title, + note, + durationSeconds, + completedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -4827,8 +5734,8 @@ class LearningRecordsCompanion extends UpdateCompanion { this.note = const Value.absent(), this.durationSeconds = const Value.absent(), required DateTime completedAt, - }) : planId = Value(planId), - completedAt = Value(completedAt); + }) : planId = Value(planId), + completedAt = Value(completedAt); static Insertable custom({ Expression? id, Expression? planId, @@ -4851,15 +5758,16 @@ class LearningRecordsCompanion extends UpdateCompanion { }); } - LearningRecordsCompanion copyWith( - {Value? id, - Value? planId, - Value? contentId, - Value? contentType, - Value? title, - Value? note, - Value? durationSeconds, - Value? completedAt}) { + LearningRecordsCompanion copyWith({ + Value? id, + Value? planId, + Value? contentId, + Value? contentType, + Value? title, + Value? note, + Value? durationSeconds, + Value? completedAt, + }) { return LearningRecordsCompanion( id: id ?? this.id, planId: planId ?? this.planId, @@ -4927,147 +5835,221 @@ class $ChatConversationsTable extends ChatConversations static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _emojiMeta = const VerificationMeta('emoji'); @override late final GeneratedColumn emoji = GeneratedColumn( - 'emoji', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('💬')); + 'emoji', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('💬'), + ); static const VerificationMeta _nameMeta = const VerificationMeta('name'); @override late final GeneratedColumn name = GeneratedColumn( - 'name', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _descriptionMeta = - const VerificationMeta('description'); + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _descriptionMeta = const VerificationMeta( + 'description', + ); @override late final GeneratedColumn description = GeneratedColumn( - 'description', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _bgImagePathMeta = - const VerificationMeta('bgImagePath'); + 'description', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _bgImagePathMeta = const VerificationMeta( + 'bgImagePath', + ); @override late final GeneratedColumn bgImagePath = GeneratedColumn( - 'bg_image_path', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _categoriesJsonMeta = - const VerificationMeta('categoriesJson'); + 'bg_image_path', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _categoriesJsonMeta = const VerificationMeta( + 'categoriesJson', + ); @override late final GeneratedColumn categoriesJson = GeneratedColumn( - 'categories_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('[]')); - static const VerificationMeta _settingsJsonMeta = - const VerificationMeta('settingsJson'); + 'categories_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('[]'), + ); + static const VerificationMeta _settingsJsonMeta = const VerificationMeta( + 'settingsJson', + ); @override late final GeneratedColumn settingsJson = GeneratedColumn( - 'settings_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('{}')); - static const VerificationMeta _isPinnedMeta = - const VerificationMeta('isPinned'); + 'settings_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('{}'), + ); + static const VerificationMeta _isPinnedMeta = const VerificationMeta( + 'isPinned', + ); @override late final GeneratedColumn isPinned = GeneratedColumn( - 'is_pinned', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_pinned" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _isHiddenMeta = - const VerificationMeta('isHidden'); + 'is_pinned', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_pinned" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _isHiddenMeta = const VerificationMeta( + 'isHidden', + ); @override late final GeneratedColumn isHidden = GeneratedColumn( - 'is_hidden', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_hidden" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _isMutedMeta = - const VerificationMeta('isMuted'); + 'is_hidden', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_hidden" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _isMutedMeta = const VerificationMeta( + 'isMuted', + ); @override late final GeneratedColumn isMuted = GeneratedColumn( - 'is_muted', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_muted" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _lastMessageTextMeta = - const VerificationMeta('lastMessageText'); + 'is_muted', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_muted" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _lastMessageTextMeta = const VerificationMeta( + 'lastMessageText', + ); @override late final GeneratedColumn lastMessageText = GeneratedColumn( - 'last_message_text', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _lastMessageAtMeta = - const VerificationMeta('lastMessageAt'); + 'last_message_text', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _lastMessageAtMeta = const VerificationMeta( + 'lastMessageAt', + ); @override late final GeneratedColumn lastMessageAt = - GeneratedColumn('last_message_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _unreadCountMeta = - const VerificationMeta('unreadCount'); + GeneratedColumn( + 'last_message_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + static const VerificationMeta _unreadCountMeta = const VerificationMeta( + 'unreadCount', + ); @override late final GeneratedColumn unreadCount = GeneratedColumn( - 'unread_count', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _syncModeMeta = - const VerificationMeta('syncMode'); + 'unread_count', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _syncModeMeta = const VerificationMeta( + 'syncMode', + ); @override late final GeneratedColumn syncMode = GeneratedColumn( - 'sync_mode', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('local')); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'sync_mode', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('local'), + ); + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - emoji, - name, - description, - bgImagePath, - categoriesJson, - settingsJson, - isPinned, - isHidden, - isMuted, - lastMessageText, - lastMessageAt, - unreadCount, - syncMode, - createdAt, - updatedAt - ]; + id, + emoji, + name, + description, + bgImagePath, + categoriesJson, + settingsJson, + isPinned, + isHidden, + isMuted, + lastMessageText, + lastMessageAt, + unreadCount, + syncMode, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'chat_conversations'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -5077,81 +6059,118 @@ class $ChatConversationsTable extends ChatConversations } if (data.containsKey('emoji')) { context.handle( - _emojiMeta, emoji.isAcceptableOrUnknown(data['emoji']!, _emojiMeta)); + _emojiMeta, + emoji.isAcceptableOrUnknown(data['emoji']!, _emojiMeta), + ); } if (data.containsKey('name')) { context.handle( - _nameMeta, name.isAcceptableOrUnknown(data['name']!, _nameMeta)); + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); } else if (isInserting) { context.missing(_nameMeta); } if (data.containsKey('description')) { context.handle( + _descriptionMeta, + description.isAcceptableOrUnknown( + data['description']!, _descriptionMeta, - description.isAcceptableOrUnknown( - data['description']!, _descriptionMeta)); + ), + ); } if (data.containsKey('bg_image_path')) { context.handle( + _bgImagePathMeta, + bgImagePath.isAcceptableOrUnknown( + data['bg_image_path']!, _bgImagePathMeta, - bgImagePath.isAcceptableOrUnknown( - data['bg_image_path']!, _bgImagePathMeta)); + ), + ); } if (data.containsKey('categories_json')) { context.handle( + _categoriesJsonMeta, + categoriesJson.isAcceptableOrUnknown( + data['categories_json']!, _categoriesJsonMeta, - categoriesJson.isAcceptableOrUnknown( - data['categories_json']!, _categoriesJsonMeta)); + ), + ); } if (data.containsKey('settings_json')) { context.handle( + _settingsJsonMeta, + settingsJson.isAcceptableOrUnknown( + data['settings_json']!, _settingsJsonMeta, - settingsJson.isAcceptableOrUnknown( - data['settings_json']!, _settingsJsonMeta)); + ), + ); } if (data.containsKey('is_pinned')) { - context.handle(_isPinnedMeta, - isPinned.isAcceptableOrUnknown(data['is_pinned']!, _isPinnedMeta)); + context.handle( + _isPinnedMeta, + isPinned.isAcceptableOrUnknown(data['is_pinned']!, _isPinnedMeta), + ); } if (data.containsKey('is_hidden')) { - context.handle(_isHiddenMeta, - isHidden.isAcceptableOrUnknown(data['is_hidden']!, _isHiddenMeta)); + context.handle( + _isHiddenMeta, + isHidden.isAcceptableOrUnknown(data['is_hidden']!, _isHiddenMeta), + ); } if (data.containsKey('is_muted')) { - context.handle(_isMutedMeta, - isMuted.isAcceptableOrUnknown(data['is_muted']!, _isMutedMeta)); + context.handle( + _isMutedMeta, + isMuted.isAcceptableOrUnknown(data['is_muted']!, _isMutedMeta), + ); } if (data.containsKey('last_message_text')) { context.handle( + _lastMessageTextMeta, + lastMessageText.isAcceptableOrUnknown( + data['last_message_text']!, _lastMessageTextMeta, - lastMessageText.isAcceptableOrUnknown( - data['last_message_text']!, _lastMessageTextMeta)); + ), + ); } if (data.containsKey('last_message_at')) { context.handle( + _lastMessageAtMeta, + lastMessageAt.isAcceptableOrUnknown( + data['last_message_at']!, _lastMessageAtMeta, - lastMessageAt.isAcceptableOrUnknown( - data['last_message_at']!, _lastMessageAtMeta)); + ), + ); } if (data.containsKey('unread_count')) { context.handle( + _unreadCountMeta, + unreadCount.isAcceptableOrUnknown( + data['unread_count']!, _unreadCountMeta, - unreadCount.isAcceptableOrUnknown( - data['unread_count']!, _unreadCountMeta)); + ), + ); } if (data.containsKey('sync_mode')) { - context.handle(_syncModeMeta, - syncMode.isAcceptableOrUnknown(data['sync_mode']!, _syncModeMeta)); + context.handle( + _syncModeMeta, + syncMode.isAcceptableOrUnknown(data['sync_mode']!, _syncModeMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -5164,38 +6183,70 @@ class $ChatConversationsTable extends ChatConversations ChatConversation map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ChatConversation( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - emoji: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}emoji'])!, - name: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}name'])!, - description: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}description']), - bgImagePath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}bg_image_path']), + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + emoji: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}emoji'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + description: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}description'], + ), + bgImagePath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}bg_image_path'], + ), categoriesJson: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}categories_json'])!, - settingsJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}settings_json'])!, - isPinned: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_pinned'])!, - isHidden: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_hidden'])!, - isMuted: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_muted'])!, + DriftSqlType.string, + data['${effectivePrefix}categories_json'], + )!, + settingsJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}settings_json'], + )!, + isPinned: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_pinned'], + )!, + isHidden: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_hidden'], + )!, + isMuted: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_muted'], + )!, lastMessageText: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}last_message_text'])!, + DriftSqlType.string, + data['${effectivePrefix}last_message_text'], + )!, lastMessageAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, data['${effectivePrefix}last_message_at']), - unreadCount: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}unread_count'])!, - syncMode: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}sync_mode'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + DriftSqlType.dateTime, + data['${effectivePrefix}last_message_at'], + ), + unreadCount: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}unread_count'], + )!, + syncMode: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}sync_mode'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -5223,23 +6274,24 @@ class ChatConversation extends DataClass final String syncMode; final DateTime createdAt; final DateTime updatedAt; - const ChatConversation( - {required this.id, - required this.emoji, - required this.name, - this.description, - this.bgImagePath, - required this.categoriesJson, - required this.settingsJson, - required this.isPinned, - required this.isHidden, - required this.isMuted, - required this.lastMessageText, - this.lastMessageAt, - required this.unreadCount, - required this.syncMode, - required this.createdAt, - required this.updatedAt}); + const ChatConversation({ + required this.id, + required this.emoji, + required this.name, + this.description, + this.bgImagePath, + required this.categoriesJson, + required this.settingsJson, + required this.isPinned, + required this.isHidden, + required this.isMuted, + required this.lastMessageText, + this.lastMessageAt, + required this.unreadCount, + required this.syncMode, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -5295,8 +6347,10 @@ class ChatConversation extends DataClass ); } - factory ChatConversation.fromJson(Map json, - {ValueSerializer? serializer}) { + factory ChatConversation.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ChatConversation( id: serializer.fromJson(json['id']), @@ -5340,51 +6394,54 @@ class ChatConversation extends DataClass }; } - ChatConversation copyWith( - {String? id, - String? emoji, - String? name, - Value description = const Value.absent(), - Value bgImagePath = const Value.absent(), - String? categoriesJson, - String? settingsJson, - bool? isPinned, - bool? isHidden, - bool? isMuted, - String? lastMessageText, - Value lastMessageAt = const Value.absent(), - int? unreadCount, - String? syncMode, - DateTime? createdAt, - DateTime? updatedAt}) => - ChatConversation( - id: id ?? this.id, - emoji: emoji ?? this.emoji, - name: name ?? this.name, - description: description.present ? description.value : this.description, - bgImagePath: bgImagePath.present ? bgImagePath.value : this.bgImagePath, - categoriesJson: categoriesJson ?? this.categoriesJson, - settingsJson: settingsJson ?? this.settingsJson, - isPinned: isPinned ?? this.isPinned, - isHidden: isHidden ?? this.isHidden, - isMuted: isMuted ?? this.isMuted, - lastMessageText: lastMessageText ?? this.lastMessageText, - lastMessageAt: - lastMessageAt.present ? lastMessageAt.value : this.lastMessageAt, - unreadCount: unreadCount ?? this.unreadCount, - syncMode: syncMode ?? this.syncMode, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + ChatConversation copyWith({ + String? id, + String? emoji, + String? name, + Value description = const Value.absent(), + Value bgImagePath = const Value.absent(), + String? categoriesJson, + String? settingsJson, + bool? isPinned, + bool? isHidden, + bool? isMuted, + String? lastMessageText, + Value lastMessageAt = const Value.absent(), + int? unreadCount, + String? syncMode, + DateTime? createdAt, + DateTime? updatedAt, + }) => ChatConversation( + id: id ?? this.id, + emoji: emoji ?? this.emoji, + name: name ?? this.name, + description: description.present ? description.value : this.description, + bgImagePath: bgImagePath.present ? bgImagePath.value : this.bgImagePath, + categoriesJson: categoriesJson ?? this.categoriesJson, + settingsJson: settingsJson ?? this.settingsJson, + isPinned: isPinned ?? this.isPinned, + isHidden: isHidden ?? this.isHidden, + isMuted: isMuted ?? this.isMuted, + lastMessageText: lastMessageText ?? this.lastMessageText, + lastMessageAt: lastMessageAt.present + ? lastMessageAt.value + : this.lastMessageAt, + unreadCount: unreadCount ?? this.unreadCount, + syncMode: syncMode ?? this.syncMode, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); ChatConversation copyWithCompanion(ChatConversationsCompanion data) { return ChatConversation( id: data.id.present ? data.id.value : this.id, emoji: data.emoji.present ? data.emoji.value : this.emoji, name: data.name.present ? data.name.value : this.name, - description: - data.description.present ? data.description.value : this.description, - bgImagePath: - data.bgImagePath.present ? data.bgImagePath.value : this.bgImagePath, + description: data.description.present + ? data.description.value + : this.description, + bgImagePath: data.bgImagePath.present + ? data.bgImagePath.value + : this.bgImagePath, categoriesJson: data.categoriesJson.present ? data.categoriesJson.value : this.categoriesJson, @@ -5400,8 +6457,9 @@ class ChatConversation extends DataClass lastMessageAt: data.lastMessageAt.present ? data.lastMessageAt.value : this.lastMessageAt, - unreadCount: - data.unreadCount.present ? data.unreadCount.value : this.unreadCount, + unreadCount: data.unreadCount.present + ? data.unreadCount.value + : this.unreadCount, syncMode: data.syncMode.present ? data.syncMode.value : this.syncMode, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt, @@ -5433,22 +6491,23 @@ class ChatConversation extends DataClass @override int get hashCode => Object.hash( - id, - emoji, - name, - description, - bgImagePath, - categoriesJson, - settingsJson, - isPinned, - isHidden, - isMuted, - lastMessageText, - lastMessageAt, - unreadCount, - syncMode, - createdAt, - updatedAt); + id, + emoji, + name, + description, + bgImagePath, + categoriesJson, + settingsJson, + isPinned, + isHidden, + isMuted, + lastMessageText, + lastMessageAt, + unreadCount, + syncMode, + createdAt, + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -5526,10 +6585,10 @@ class ChatConversationsCompanion extends UpdateCompanion { required DateTime createdAt, required DateTime updatedAt, this.rowid = const Value.absent(), - }) : id = Value(id), - name = Value(name), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : id = Value(id), + name = Value(name), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? emoji, @@ -5570,24 +6629,25 @@ class ChatConversationsCompanion extends UpdateCompanion { }); } - ChatConversationsCompanion copyWith( - {Value? id, - Value? emoji, - Value? name, - Value? description, - Value? bgImagePath, - Value? categoriesJson, - Value? settingsJson, - Value? isPinned, - Value? isHidden, - Value? isMuted, - Value? lastMessageText, - Value? lastMessageAt, - Value? unreadCount, - Value? syncMode, - Value? createdAt, - Value? updatedAt, - Value? rowid}) { + ChatConversationsCompanion copyWith({ + Value? id, + Value? emoji, + Value? name, + Value? description, + Value? bgImagePath, + Value? categoriesJson, + Value? settingsJson, + Value? isPinned, + Value? isHidden, + Value? isMuted, + Value? lastMessageText, + Value? lastMessageAt, + Value? unreadCount, + Value? syncMode, + Value? createdAt, + Value? updatedAt, + Value? rowid, + }) { return ChatConversationsCompanion( id: id ?? this.id, emoji: emoji ?? this.emoji, @@ -5700,174 +6760,268 @@ class $ChatMsgRecordsTable extends ChatMsgRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _conversationIdMeta = - const VerificationMeta('conversationId'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _conversationIdMeta = const VerificationMeta( + 'conversationId', + ); @override late final GeneratedColumn conversationId = GeneratedColumn( - 'conversation_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'conversation_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _typeMeta = const VerificationMeta('type'); @override late final GeneratedColumn type = GeneratedColumn( - 'type', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _roleMeta = const VerificationMeta('role'); @override late final GeneratedColumn role = GeneratedColumn( - 'role', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _contentMeta = - const VerificationMeta('content'); + 'role', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _contentMeta = const VerificationMeta( + 'content', + ); @override late final GeneratedColumn content = GeneratedColumn( - 'content', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'content', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _authorMeta = const VerificationMeta('author'); @override late final GeneratedColumn author = GeneratedColumn( - 'author', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); + 'author', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); static const VerificationMeta _sourceMeta = const VerificationMeta('source'); @override late final GeneratedColumn source = GeneratedColumn( - 'source', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _categoryMeta = - const VerificationMeta('category'); + 'source', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _categoryMeta = const VerificationMeta( + 'category', + ); @override late final GeneratedColumn category = GeneratedColumn( - 'category', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); + 'category', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); static const VerificationMeta _isReadMeta = const VerificationMeta('isRead'); @override late final GeneratedColumn isRead = GeneratedColumn( - 'is_read', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_read" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _readCountMeta = - const VerificationMeta('readCount'); + 'is_read', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_read" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _readCountMeta = const VerificationMeta( + 'readCount', + ); @override late final GeneratedColumn readCount = GeneratedColumn( - 'read_count', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _metaJsonMeta = - const VerificationMeta('metaJson'); + 'read_count', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _metaJsonMeta = const VerificationMeta( + 'metaJson', + ); @override late final GeneratedColumn metaJson = GeneratedColumn( - 'meta_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('{}')); - static const VerificationMeta _extJsonMeta = - const VerificationMeta('extJson'); + 'meta_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('{}'), + ); + static const VerificationMeta _extJsonMeta = const VerificationMeta( + 'extJson', + ); @override late final GeneratedColumn extJson = GeneratedColumn( - 'ext_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('{}')); - static const VerificationMeta _replyToIdMeta = - const VerificationMeta('replyToId'); + 'ext_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('{}'), + ); + static const VerificationMeta _replyToIdMeta = const VerificationMeta( + 'replyToId', + ); @override late final GeneratedColumn replyToId = GeneratedColumn( - 'reply_to_id', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _richContentMeta = - const VerificationMeta('richContent'); + 'reply_to_id', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _richContentMeta = const VerificationMeta( + 'richContent', + ); @override late final GeneratedColumn richContent = GeneratedColumn( - 'rich_content', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'rich_content', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _ipTextMeta = const VerificationMeta('ipText'); @override late final GeneratedColumn ipText = GeneratedColumn( - 'ip_text', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _ipDetailJsonMeta = - const VerificationMeta('ipDetailJson'); + 'ip_text', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _ipDetailJsonMeta = const VerificationMeta( + 'ipDetailJson', + ); @override late final GeneratedColumn ipDetailJson = GeneratedColumn( - 'ip_detail_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _isDeletedMeta = - const VerificationMeta('isDeleted'); + 'ip_detail_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _isDeletedMeta = const VerificationMeta( + 'isDeleted', + ); @override late final GeneratedColumn isDeleted = GeneratedColumn( - 'is_deleted', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_deleted" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _deletedAtMeta = - const VerificationMeta('deletedAt'); + 'is_deleted', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_deleted" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _deletedAtMeta = const VerificationMeta( + 'deletedAt', + ); @override late final GeneratedColumn deletedAt = GeneratedColumn( - 'deleted_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _timestampMeta = - const VerificationMeta('timestamp'); + 'deleted_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + static const VerificationMeta _timestampMeta = const VerificationMeta( + 'timestamp', + ); @override late final GeneratedColumn timestamp = GeneratedColumn( - 'timestamp', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'timestamp', + aliasedName, + false, + type: DriftSqlType.dateTime, + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - conversationId, - type, - role, - content, - author, - source, - category, - isRead, - readCount, - metaJson, - extJson, - replyToId, - richContent, - ipText, - ipDetailJson, - isDeleted, - deletedAt, - timestamp, - createdAt, - updatedAt - ]; + id, + conversationId, + type, + role, + content, + author, + source, + category, + isRead, + readCount, + metaJson, + extJson, + replyToId, + richContent, + ipText, + ipDetailJson, + isDeleted, + deletedAt, + timestamp, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'chat_msg_records'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -5877,103 +7031,144 @@ class $ChatMsgRecordsTable extends ChatMsgRecords } if (data.containsKey('conversation_id')) { context.handle( + _conversationIdMeta, + conversationId.isAcceptableOrUnknown( + data['conversation_id']!, _conversationIdMeta, - conversationId.isAcceptableOrUnknown( - data['conversation_id']!, _conversationIdMeta)); + ), + ); } else if (isInserting) { context.missing(_conversationIdMeta); } if (data.containsKey('type')) { context.handle( - _typeMeta, type.isAcceptableOrUnknown(data['type']!, _typeMeta)); + _typeMeta, + type.isAcceptableOrUnknown(data['type']!, _typeMeta), + ); } else if (isInserting) { context.missing(_typeMeta); } if (data.containsKey('role')) { context.handle( - _roleMeta, role.isAcceptableOrUnknown(data['role']!, _roleMeta)); + _roleMeta, + role.isAcceptableOrUnknown(data['role']!, _roleMeta), + ); } else if (isInserting) { context.missing(_roleMeta); } if (data.containsKey('content')) { - context.handle(_contentMeta, - content.isAcceptableOrUnknown(data['content']!, _contentMeta)); + context.handle( + _contentMeta, + content.isAcceptableOrUnknown(data['content']!, _contentMeta), + ); } else if (isInserting) { context.missing(_contentMeta); } if (data.containsKey('author')) { - context.handle(_authorMeta, - author.isAcceptableOrUnknown(data['author']!, _authorMeta)); + context.handle( + _authorMeta, + author.isAcceptableOrUnknown(data['author']!, _authorMeta), + ); } if (data.containsKey('source')) { - context.handle(_sourceMeta, - source.isAcceptableOrUnknown(data['source']!, _sourceMeta)); + context.handle( + _sourceMeta, + source.isAcceptableOrUnknown(data['source']!, _sourceMeta), + ); } if (data.containsKey('category')) { - context.handle(_categoryMeta, - category.isAcceptableOrUnknown(data['category']!, _categoryMeta)); + context.handle( + _categoryMeta, + category.isAcceptableOrUnknown(data['category']!, _categoryMeta), + ); } if (data.containsKey('is_read')) { - context.handle(_isReadMeta, - isRead.isAcceptableOrUnknown(data['is_read']!, _isReadMeta)); + context.handle( + _isReadMeta, + isRead.isAcceptableOrUnknown(data['is_read']!, _isReadMeta), + ); } if (data.containsKey('read_count')) { - context.handle(_readCountMeta, - readCount.isAcceptableOrUnknown(data['read_count']!, _readCountMeta)); + context.handle( + _readCountMeta, + readCount.isAcceptableOrUnknown(data['read_count']!, _readCountMeta), + ); } if (data.containsKey('meta_json')) { - context.handle(_metaJsonMeta, - metaJson.isAcceptableOrUnknown(data['meta_json']!, _metaJsonMeta)); + context.handle( + _metaJsonMeta, + metaJson.isAcceptableOrUnknown(data['meta_json']!, _metaJsonMeta), + ); } if (data.containsKey('ext_json')) { - context.handle(_extJsonMeta, - extJson.isAcceptableOrUnknown(data['ext_json']!, _extJsonMeta)); + context.handle( + _extJsonMeta, + extJson.isAcceptableOrUnknown(data['ext_json']!, _extJsonMeta), + ); } if (data.containsKey('reply_to_id')) { context.handle( - _replyToIdMeta, - replyToId.isAcceptableOrUnknown( - data['reply_to_id']!, _replyToIdMeta)); + _replyToIdMeta, + replyToId.isAcceptableOrUnknown(data['reply_to_id']!, _replyToIdMeta), + ); } if (data.containsKey('rich_content')) { context.handle( + _richContentMeta, + richContent.isAcceptableOrUnknown( + data['rich_content']!, _richContentMeta, - richContent.isAcceptableOrUnknown( - data['rich_content']!, _richContentMeta)); + ), + ); } if (data.containsKey('ip_text')) { - context.handle(_ipTextMeta, - ipText.isAcceptableOrUnknown(data['ip_text']!, _ipTextMeta)); + context.handle( + _ipTextMeta, + ipText.isAcceptableOrUnknown(data['ip_text']!, _ipTextMeta), + ); } if (data.containsKey('ip_detail_json')) { context.handle( + _ipDetailJsonMeta, + ipDetailJson.isAcceptableOrUnknown( + data['ip_detail_json']!, _ipDetailJsonMeta, - ipDetailJson.isAcceptableOrUnknown( - data['ip_detail_json']!, _ipDetailJsonMeta)); + ), + ); } if (data.containsKey('is_deleted')) { - context.handle(_isDeletedMeta, - isDeleted.isAcceptableOrUnknown(data['is_deleted']!, _isDeletedMeta)); + context.handle( + _isDeletedMeta, + isDeleted.isAcceptableOrUnknown(data['is_deleted']!, _isDeletedMeta), + ); } if (data.containsKey('deleted_at')) { - context.handle(_deletedAtMeta, - deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta)); + context.handle( + _deletedAtMeta, + deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta), + ); } if (data.containsKey('timestamp')) { - context.handle(_timestampMeta, - timestamp.isAcceptableOrUnknown(data['timestamp']!, _timestampMeta)); + context.handle( + _timestampMeta, + timestamp.isAcceptableOrUnknown(data['timestamp']!, _timestampMeta), + ); } else if (isInserting) { context.missing(_timestampMeta); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -5986,48 +7181,90 @@ class $ChatMsgRecordsTable extends ChatMsgRecords ChatMsgRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ChatMsgRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, conversationId: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}conversation_id'])!, - type: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}type'])!, - role: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}role'])!, - content: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content'])!, - author: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}author']), - source: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}source']), - category: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}category']), - isRead: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_read'])!, - readCount: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}read_count'])!, - metaJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}meta_json'])!, - extJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}ext_json'])!, - replyToId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}reply_to_id']), - richContent: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}rich_content'])!, - ipText: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}ip_text'])!, - ipDetailJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}ip_detail_json'])!, - isDeleted: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_deleted'])!, - deletedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}deleted_at']), - timestamp: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}timestamp'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + DriftSqlType.string, + data['${effectivePrefix}conversation_id'], + )!, + type: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}type'], + )!, + role: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}role'], + )!, + content: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content'], + )!, + author: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}author'], + ), + source: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}source'], + ), + category: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}category'], + ), + isRead: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_read'], + )!, + readCount: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}read_count'], + )!, + metaJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}meta_json'], + )!, + extJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}ext_json'], + )!, + replyToId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}reply_to_id'], + ), + richContent: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}rich_content'], + )!, + ipText: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}ip_text'], + )!, + ipDetailJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}ip_detail_json'], + )!, + isDeleted: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_deleted'], + )!, + deletedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}deleted_at'], + ), + timestamp: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}timestamp'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -6059,28 +7296,29 @@ class ChatMsgRecord extends DataClass implements Insertable { final DateTime timestamp; final DateTime createdAt; final DateTime updatedAt; - const ChatMsgRecord( - {required this.id, - required this.conversationId, - required this.type, - required this.role, - required this.content, - this.author, - this.source, - this.category, - required this.isRead, - required this.readCount, - required this.metaJson, - required this.extJson, - this.replyToId, - required this.richContent, - required this.ipText, - required this.ipDetailJson, - required this.isDeleted, - this.deletedAt, - required this.timestamp, - required this.createdAt, - required this.updatedAt}); + const ChatMsgRecord({ + required this.id, + required this.conversationId, + required this.type, + required this.role, + required this.content, + this.author, + this.source, + this.category, + required this.isRead, + required this.readCount, + required this.metaJson, + required this.extJson, + this.replyToId, + required this.richContent, + required this.ipText, + required this.ipDetailJson, + required this.isDeleted, + this.deletedAt, + required this.timestamp, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -6125,10 +7363,12 @@ class ChatMsgRecord extends DataClass implements Insertable { type: Value(type), role: Value(role), content: Value(content), - author: - author == null && nullToAbsent ? const Value.absent() : Value(author), - source: - source == null && nullToAbsent ? const Value.absent() : Value(source), + author: author == null && nullToAbsent + ? const Value.absent() + : Value(author), + source: source == null && nullToAbsent + ? const Value.absent() + : Value(source), category: category == null && nullToAbsent ? const Value.absent() : Value(category), @@ -6152,8 +7392,10 @@ class ChatMsgRecord extends DataClass implements Insertable { ); } - factory ChatMsgRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory ChatMsgRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ChatMsgRecord( id: serializer.fromJson(json['id']), @@ -6207,51 +7449,51 @@ class ChatMsgRecord extends DataClass implements Insertable { }; } - ChatMsgRecord copyWith( - {String? id, - String? conversationId, - String? type, - String? role, - String? content, - Value author = const Value.absent(), - Value source = const Value.absent(), - Value category = const Value.absent(), - bool? isRead, - int? readCount, - String? metaJson, - String? extJson, - Value replyToId = const Value.absent(), - String? richContent, - String? ipText, - String? ipDetailJson, - bool? isDeleted, - Value deletedAt = const Value.absent(), - DateTime? timestamp, - DateTime? createdAt, - DateTime? updatedAt}) => - ChatMsgRecord( - id: id ?? this.id, - conversationId: conversationId ?? this.conversationId, - type: type ?? this.type, - role: role ?? this.role, - content: content ?? this.content, - author: author.present ? author.value : this.author, - source: source.present ? source.value : this.source, - category: category.present ? category.value : this.category, - isRead: isRead ?? this.isRead, - readCount: readCount ?? this.readCount, - metaJson: metaJson ?? this.metaJson, - extJson: extJson ?? this.extJson, - replyToId: replyToId.present ? replyToId.value : this.replyToId, - richContent: richContent ?? this.richContent, - ipText: ipText ?? this.ipText, - ipDetailJson: ipDetailJson ?? this.ipDetailJson, - isDeleted: isDeleted ?? this.isDeleted, - deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt, - timestamp: timestamp ?? this.timestamp, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + ChatMsgRecord copyWith({ + String? id, + String? conversationId, + String? type, + String? role, + String? content, + Value author = const Value.absent(), + Value source = const Value.absent(), + Value category = const Value.absent(), + bool? isRead, + int? readCount, + String? metaJson, + String? extJson, + Value replyToId = const Value.absent(), + String? richContent, + String? ipText, + String? ipDetailJson, + bool? isDeleted, + Value deletedAt = const Value.absent(), + DateTime? timestamp, + DateTime? createdAt, + DateTime? updatedAt, + }) => ChatMsgRecord( + id: id ?? this.id, + conversationId: conversationId ?? this.conversationId, + type: type ?? this.type, + role: role ?? this.role, + content: content ?? this.content, + author: author.present ? author.value : this.author, + source: source.present ? source.value : this.source, + category: category.present ? category.value : this.category, + isRead: isRead ?? this.isRead, + readCount: readCount ?? this.readCount, + metaJson: metaJson ?? this.metaJson, + extJson: extJson ?? this.extJson, + replyToId: replyToId.present ? replyToId.value : this.replyToId, + richContent: richContent ?? this.richContent, + ipText: ipText ?? this.ipText, + ipDetailJson: ipDetailJson ?? this.ipDetailJson, + isDeleted: isDeleted ?? this.isDeleted, + deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt, + timestamp: timestamp ?? this.timestamp, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); ChatMsgRecord copyWithCompanion(ChatMsgRecordsCompanion data) { return ChatMsgRecord( id: data.id.present ? data.id.value : this.id, @@ -6269,8 +7511,9 @@ class ChatMsgRecord extends DataClass implements Insertable { metaJson: data.metaJson.present ? data.metaJson.value : this.metaJson, extJson: data.extJson.present ? data.extJson.value : this.extJson, replyToId: data.replyToId.present ? data.replyToId.value : this.replyToId, - richContent: - data.richContent.present ? data.richContent.value : this.richContent, + richContent: data.richContent.present + ? data.richContent.value + : this.richContent, ipText: data.ipText.present ? data.ipText.value : this.ipText, ipDetailJson: data.ipDetailJson.present ? data.ipDetailJson.value @@ -6313,28 +7556,28 @@ class ChatMsgRecord extends DataClass implements Insertable { @override int get hashCode => Object.hashAll([ - id, - conversationId, - type, - role, - content, - author, - source, - category, - isRead, - readCount, - metaJson, - extJson, - replyToId, - richContent, - ipText, - ipDetailJson, - isDeleted, - deletedAt, - timestamp, - createdAt, - updatedAt - ]); + id, + conversationId, + type, + role, + content, + author, + source, + category, + isRead, + readCount, + metaJson, + extJson, + replyToId, + richContent, + ipText, + ipDetailJson, + isDeleted, + deletedAt, + timestamp, + createdAt, + updatedAt, + ]); @override bool operator ==(Object other) => identical(this, other) || @@ -6432,14 +7675,14 @@ class ChatMsgRecordsCompanion extends UpdateCompanion { required DateTime createdAt, required DateTime updatedAt, this.rowid = const Value.absent(), - }) : id = Value(id), - conversationId = Value(conversationId), - type = Value(type), - role = Value(role), - content = Value(content), - timestamp = Value(timestamp), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : id = Value(id), + conversationId = Value(conversationId), + type = Value(type), + role = Value(role), + content = Value(content), + timestamp = Value(timestamp), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? conversationId, @@ -6490,29 +7733,30 @@ class ChatMsgRecordsCompanion extends UpdateCompanion { }); } - ChatMsgRecordsCompanion copyWith( - {Value? id, - Value? conversationId, - Value? type, - Value? role, - Value? content, - Value? author, - Value? source, - Value? category, - Value? isRead, - Value? readCount, - Value? metaJson, - Value? extJson, - Value? replyToId, - Value? richContent, - Value? ipText, - Value? ipDetailJson, - Value? isDeleted, - Value? deletedAt, - Value? timestamp, - Value? createdAt, - Value? updatedAt, - Value? rowid}) { + ChatMsgRecordsCompanion copyWith({ + Value? id, + Value? conversationId, + Value? type, + Value? role, + Value? content, + Value? author, + Value? source, + Value? category, + Value? isRead, + Value? readCount, + Value? metaJson, + Value? extJson, + Value? replyToId, + Value? richContent, + Value? ipText, + Value? ipDetailJson, + Value? isDeleted, + Value? deletedAt, + Value? timestamp, + Value? createdAt, + Value? updatedAt, + Value? rowid, + }) { return ChatMsgRecordsCompanion( id: id ?? this.id, conversationId: conversationId ?? this.conversationId, @@ -6650,109 +7894,179 @@ class $ChatAttachmentsTable extends ChatAttachments static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _messageIdMeta = - const VerificationMeta('messageId'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _messageIdMeta = const VerificationMeta( + 'messageId', + ); @override late final GeneratedColumn messageId = GeneratedColumn( - 'message_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _conversationIdMeta = - const VerificationMeta('conversationId'); + 'message_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _conversationIdMeta = const VerificationMeta( + 'conversationId', + ); @override late final GeneratedColumn conversationId = GeneratedColumn( - 'conversation_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _fileNameMeta = - const VerificationMeta('fileName'); + 'conversation_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _fileNameMeta = const VerificationMeta( + 'fileName', + ); @override late final GeneratedColumn fileName = GeneratedColumn( - 'file_name', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _filePathMeta = - const VerificationMeta('filePath'); + 'file_name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _filePathMeta = const VerificationMeta( + 'filePath', + ); @override late final GeneratedColumn filePath = GeneratedColumn( - 'file_path', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _fileTypeMeta = - const VerificationMeta('fileType'); + 'file_path', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _fileTypeMeta = const VerificationMeta( + 'fileType', + ); @override late final GeneratedColumn fileType = GeneratedColumn( - 'file_type', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _fileSizeMeta = - const VerificationMeta('fileSize'); + 'file_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _fileSizeMeta = const VerificationMeta( + 'fileSize', + ); @override late final GeneratedColumn fileSize = GeneratedColumn( - 'file_size', aliasedName, false, - type: DriftSqlType.int, requiredDuringInsert: true); - static const VerificationMeta _thumbnailPathMeta = - const VerificationMeta('thumbnailPath'); + 'file_size', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: true, + ); + static const VerificationMeta _thumbnailPathMeta = const VerificationMeta( + 'thumbnailPath', + ); @override late final GeneratedColumn thumbnailPath = GeneratedColumn( - 'thumbnail_path', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); + 'thumbnail_path', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); static const VerificationMeta _widthMeta = const VerificationMeta('width'); @override late final GeneratedColumn width = GeneratedColumn( - 'width', aliasedName, true, - type: DriftSqlType.int, requiredDuringInsert: false); + 'width', + aliasedName, + true, + type: DriftSqlType.int, + requiredDuringInsert: false, + ); static const VerificationMeta _heightMeta = const VerificationMeta('height'); @override late final GeneratedColumn height = GeneratedColumn( - 'height', aliasedName, true, - type: DriftSqlType.int, requiredDuringInsert: false); - static const VerificationMeta _durationMsMeta = - const VerificationMeta('durationMs'); + 'height', + aliasedName, + true, + type: DriftSqlType.int, + requiredDuringInsert: false, + ); + static const VerificationMeta _durationMsMeta = const VerificationMeta( + 'durationMs', + ); @override late final GeneratedColumn durationMs = GeneratedColumn( - 'duration_ms', aliasedName, true, - type: DriftSqlType.int, requiredDuringInsert: false); - static const VerificationMeta _cloudUrlMeta = - const VerificationMeta('cloudUrl'); + 'duration_ms', + aliasedName, + true, + type: DriftSqlType.int, + requiredDuringInsert: false, + ); + static const VerificationMeta _cloudUrlMeta = const VerificationMeta( + 'cloudUrl', + ); @override late final GeneratedColumn cloudUrl = GeneratedColumn( - 'cloud_url', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _cloudSyncedAtMeta = - const VerificationMeta('cloudSyncedAt'); + 'cloud_url', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _cloudSyncedAtMeta = const VerificationMeta( + 'cloudSyncedAt', + ); @override late final GeneratedColumn cloudSyncedAt = - GeneratedColumn('cloud_synced_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + GeneratedColumn( + 'cloud_synced_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - messageId, - conversationId, - fileName, - filePath, - fileType, - fileSize, - thumbnailPath, - width, - height, - durationMs, - cloudUrl, - cloudSyncedAt, - createdAt - ]; + id, + messageId, + conversationId, + fileName, + filePath, + fileType, + fileSize, + thumbnailPath, + width, + height, + durationMs, + cloudUrl, + cloudSyncedAt, + createdAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'chat_attachments'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -6761,76 +8075,103 @@ class $ChatAttachmentsTable extends ChatAttachments context.missing(_idMeta); } if (data.containsKey('message_id')) { - context.handle(_messageIdMeta, - messageId.isAcceptableOrUnknown(data['message_id']!, _messageIdMeta)); + context.handle( + _messageIdMeta, + messageId.isAcceptableOrUnknown(data['message_id']!, _messageIdMeta), + ); } else if (isInserting) { context.missing(_messageIdMeta); } if (data.containsKey('conversation_id')) { context.handle( + _conversationIdMeta, + conversationId.isAcceptableOrUnknown( + data['conversation_id']!, _conversationIdMeta, - conversationId.isAcceptableOrUnknown( - data['conversation_id']!, _conversationIdMeta)); + ), + ); } else if (isInserting) { context.missing(_conversationIdMeta); } if (data.containsKey('file_name')) { - context.handle(_fileNameMeta, - fileName.isAcceptableOrUnknown(data['file_name']!, _fileNameMeta)); + context.handle( + _fileNameMeta, + fileName.isAcceptableOrUnknown(data['file_name']!, _fileNameMeta), + ); } else if (isInserting) { context.missing(_fileNameMeta); } if (data.containsKey('file_path')) { - context.handle(_filePathMeta, - filePath.isAcceptableOrUnknown(data['file_path']!, _filePathMeta)); + context.handle( + _filePathMeta, + filePath.isAcceptableOrUnknown(data['file_path']!, _filePathMeta), + ); } else if (isInserting) { context.missing(_filePathMeta); } if (data.containsKey('file_type')) { - context.handle(_fileTypeMeta, - fileType.isAcceptableOrUnknown(data['file_type']!, _fileTypeMeta)); + context.handle( + _fileTypeMeta, + fileType.isAcceptableOrUnknown(data['file_type']!, _fileTypeMeta), + ); } else if (isInserting) { context.missing(_fileTypeMeta); } if (data.containsKey('file_size')) { - context.handle(_fileSizeMeta, - fileSize.isAcceptableOrUnknown(data['file_size']!, _fileSizeMeta)); + context.handle( + _fileSizeMeta, + fileSize.isAcceptableOrUnknown(data['file_size']!, _fileSizeMeta), + ); } else if (isInserting) { context.missing(_fileSizeMeta); } if (data.containsKey('thumbnail_path')) { context.handle( + _thumbnailPathMeta, + thumbnailPath.isAcceptableOrUnknown( + data['thumbnail_path']!, _thumbnailPathMeta, - thumbnailPath.isAcceptableOrUnknown( - data['thumbnail_path']!, _thumbnailPathMeta)); + ), + ); } if (data.containsKey('width')) { context.handle( - _widthMeta, width.isAcceptableOrUnknown(data['width']!, _widthMeta)); + _widthMeta, + width.isAcceptableOrUnknown(data['width']!, _widthMeta), + ); } if (data.containsKey('height')) { - context.handle(_heightMeta, - height.isAcceptableOrUnknown(data['height']!, _heightMeta)); + context.handle( + _heightMeta, + height.isAcceptableOrUnknown(data['height']!, _heightMeta), + ); } if (data.containsKey('duration_ms')) { context.handle( - _durationMsMeta, - durationMs.isAcceptableOrUnknown( - data['duration_ms']!, _durationMsMeta)); + _durationMsMeta, + durationMs.isAcceptableOrUnknown(data['duration_ms']!, _durationMsMeta), + ); } if (data.containsKey('cloud_url')) { - context.handle(_cloudUrlMeta, - cloudUrl.isAcceptableOrUnknown(data['cloud_url']!, _cloudUrlMeta)); + context.handle( + _cloudUrlMeta, + cloudUrl.isAcceptableOrUnknown(data['cloud_url']!, _cloudUrlMeta), + ); } if (data.containsKey('cloud_synced_at')) { context.handle( + _cloudSyncedAtMeta, + cloudSyncedAt.isAcceptableOrUnknown( + data['cloud_synced_at']!, _cloudSyncedAtMeta, - cloudSyncedAt.isAcceptableOrUnknown( - data['cloud_synced_at']!, _cloudSyncedAtMeta)); + ), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } @@ -6843,34 +8184,62 @@ class $ChatAttachmentsTable extends ChatAttachments ChatAttachment map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ChatAttachment( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - messageId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}message_id'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + messageId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}message_id'], + )!, conversationId: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}conversation_id'])!, - fileName: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_name'])!, - filePath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_path'])!, - fileType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_type'])!, - fileSize: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}file_size'])!, - thumbnailPath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path']), - width: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}width']), - height: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}height']), - durationMs: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}duration_ms']), - cloudUrl: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}cloud_url']), + DriftSqlType.string, + data['${effectivePrefix}conversation_id'], + )!, + fileName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_name'], + )!, + filePath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_path'], + )!, + fileType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_type'], + )!, + fileSize: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}file_size'], + )!, + thumbnailPath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}thumbnail_path'], + ), + width: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}width'], + ), + height: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}height'], + ), + durationMs: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}duration_ms'], + ), + cloudUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}cloud_url'], + ), cloudSyncedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, data['${effectivePrefix}cloud_synced_at']), - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + DriftSqlType.dateTime, + data['${effectivePrefix}cloud_synced_at'], + ), + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -6895,21 +8264,22 @@ class ChatAttachment extends DataClass implements Insertable { final String? cloudUrl; final DateTime? cloudSyncedAt; final DateTime createdAt; - const ChatAttachment( - {required this.id, - required this.messageId, - required this.conversationId, - required this.fileName, - required this.filePath, - required this.fileType, - required this.fileSize, - this.thumbnailPath, - this.width, - this.height, - this.durationMs, - this.cloudUrl, - this.cloudSyncedAt, - required this.createdAt}); + const ChatAttachment({ + required this.id, + required this.messageId, + required this.conversationId, + required this.fileName, + required this.filePath, + required this.fileType, + required this.fileSize, + this.thumbnailPath, + this.width, + this.height, + this.durationMs, + this.cloudUrl, + this.cloudSyncedAt, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -6954,10 +8324,12 @@ class ChatAttachment extends DataClass implements Insertable { thumbnailPath: thumbnailPath == null && nullToAbsent ? const Value.absent() : Value(thumbnailPath), - width: - width == null && nullToAbsent ? const Value.absent() : Value(width), - height: - height == null && nullToAbsent ? const Value.absent() : Value(height), + width: width == null && nullToAbsent + ? const Value.absent() + : Value(width), + height: height == null && nullToAbsent + ? const Value.absent() + : Value(height), durationMs: durationMs == null && nullToAbsent ? const Value.absent() : Value(durationMs), @@ -6971,8 +8343,10 @@ class ChatAttachment extends DataClass implements Insertable { ); } - factory ChatAttachment.fromJson(Map json, - {ValueSerializer? serializer}) { + factory ChatAttachment.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ChatAttachment( id: serializer.fromJson(json['id']), @@ -7012,39 +8386,41 @@ class ChatAttachment extends DataClass implements Insertable { }; } - ChatAttachment copyWith( - {String? id, - String? messageId, - String? conversationId, - String? fileName, - String? filePath, - String? fileType, - int? fileSize, - Value thumbnailPath = const Value.absent(), - Value width = const Value.absent(), - Value height = const Value.absent(), - Value durationMs = const Value.absent(), - Value cloudUrl = const Value.absent(), - Value cloudSyncedAt = const Value.absent(), - DateTime? createdAt}) => - ChatAttachment( - id: id ?? this.id, - messageId: messageId ?? this.messageId, - conversationId: conversationId ?? this.conversationId, - fileName: fileName ?? this.fileName, - filePath: filePath ?? this.filePath, - fileType: fileType ?? this.fileType, - fileSize: fileSize ?? this.fileSize, - thumbnailPath: - thumbnailPath.present ? thumbnailPath.value : this.thumbnailPath, - width: width.present ? width.value : this.width, - height: height.present ? height.value : this.height, - durationMs: durationMs.present ? durationMs.value : this.durationMs, - cloudUrl: cloudUrl.present ? cloudUrl.value : this.cloudUrl, - cloudSyncedAt: - cloudSyncedAt.present ? cloudSyncedAt.value : this.cloudSyncedAt, - createdAt: createdAt ?? this.createdAt, - ); + ChatAttachment copyWith({ + String? id, + String? messageId, + String? conversationId, + String? fileName, + String? filePath, + String? fileType, + int? fileSize, + Value thumbnailPath = const Value.absent(), + Value width = const Value.absent(), + Value height = const Value.absent(), + Value durationMs = const Value.absent(), + Value cloudUrl = const Value.absent(), + Value cloudSyncedAt = const Value.absent(), + DateTime? createdAt, + }) => ChatAttachment( + id: id ?? this.id, + messageId: messageId ?? this.messageId, + conversationId: conversationId ?? this.conversationId, + fileName: fileName ?? this.fileName, + filePath: filePath ?? this.filePath, + fileType: fileType ?? this.fileType, + fileSize: fileSize ?? this.fileSize, + thumbnailPath: thumbnailPath.present + ? thumbnailPath.value + : this.thumbnailPath, + width: width.present ? width.value : this.width, + height: height.present ? height.value : this.height, + durationMs: durationMs.present ? durationMs.value : this.durationMs, + cloudUrl: cloudUrl.present ? cloudUrl.value : this.cloudUrl, + cloudSyncedAt: cloudSyncedAt.present + ? cloudSyncedAt.value + : this.cloudSyncedAt, + createdAt: createdAt ?? this.createdAt, + ); ChatAttachment copyWithCompanion(ChatAttachmentsCompanion data) { return ChatAttachment( id: data.id.present ? data.id.value : this.id, @@ -7061,8 +8437,9 @@ class ChatAttachment extends DataClass implements Insertable { : this.thumbnailPath, width: data.width.present ? data.width.value : this.width, height: data.height.present ? data.height.value : this.height, - durationMs: - data.durationMs.present ? data.durationMs.value : this.durationMs, + durationMs: data.durationMs.present + ? data.durationMs.value + : this.durationMs, cloudUrl: data.cloudUrl.present ? data.cloudUrl.value : this.cloudUrl, cloudSyncedAt: data.cloudSyncedAt.present ? data.cloudSyncedAt.value @@ -7094,20 +8471,21 @@ class ChatAttachment extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, - messageId, - conversationId, - fileName, - filePath, - fileType, - fileSize, - thumbnailPath, - width, - height, - durationMs, - cloudUrl, - cloudSyncedAt, - createdAt); + id, + messageId, + conversationId, + fileName, + filePath, + fileType, + fileSize, + thumbnailPath, + width, + height, + durationMs, + cloudUrl, + cloudSyncedAt, + createdAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -7177,14 +8555,14 @@ class ChatAttachmentsCompanion extends UpdateCompanion { this.cloudSyncedAt = const Value.absent(), required DateTime createdAt, this.rowid = const Value.absent(), - }) : id = Value(id), - messageId = Value(messageId), - conversationId = Value(conversationId), - fileName = Value(fileName), - filePath = Value(filePath), - fileType = Value(fileType), - fileSize = Value(fileSize), - createdAt = Value(createdAt); + }) : id = Value(id), + messageId = Value(messageId), + conversationId = Value(conversationId), + fileName = Value(fileName), + filePath = Value(filePath), + fileType = Value(fileType), + fileSize = Value(fileSize), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? messageId, @@ -7221,22 +8599,23 @@ class ChatAttachmentsCompanion extends UpdateCompanion { }); } - ChatAttachmentsCompanion copyWith( - {Value? id, - Value? messageId, - Value? conversationId, - Value? fileName, - Value? filePath, - Value? fileType, - Value? fileSize, - Value? thumbnailPath, - Value? width, - Value? height, - Value? durationMs, - Value? cloudUrl, - Value? cloudSyncedAt, - Value? createdAt, - Value? rowid}) { + ChatAttachmentsCompanion copyWith({ + Value? id, + Value? messageId, + Value? conversationId, + Value? fileName, + Value? filePath, + Value? fileType, + Value? fileSize, + Value? thumbnailPath, + Value? width, + Value? height, + Value? durationMs, + Value? cloudUrl, + Value? cloudSyncedAt, + Value? createdAt, + Value? rowid, + }) { return ChatAttachmentsCompanion( id: id ?? this.id, messageId: messageId ?? this.messageId, @@ -7339,42 +8718,72 @@ class $IpLocationCachesTable extends IpLocationCaches static const VerificationMeta _ipMeta = const VerificationMeta('ip'); @override late final GeneratedColumn ip = GeneratedColumn( - 'ip', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'ip', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _cityMeta = const VerificationMeta('city'); @override late final GeneratedColumn city = GeneratedColumn( - 'city', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _provinceMeta = - const VerificationMeta('province'); + 'city', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _provinceMeta = const VerificationMeta( + 'province', + ); @override late final GeneratedColumn province = GeneratedColumn( - 'province', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _fullTextMeta = - const VerificationMeta('fullText'); + 'province', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _fullTextMeta = const VerificationMeta( + 'fullText', + ); @override late final GeneratedColumn fullText = GeneratedColumn( - 'full_text', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _queriedAtMeta = - const VerificationMeta('queriedAt'); + 'full_text', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _queriedAtMeta = const VerificationMeta( + 'queriedAt', + ); @override late final GeneratedColumn queriedAt = GeneratedColumn( - 'queried_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'queried_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override - List get $columns => - [ip, city, province, fullText, queriedAt]; + List get $columns => [ + ip, + city, + province, + fullText, + queriedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'ip_location_caches'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('ip')) { @@ -7384,23 +8793,31 @@ class $IpLocationCachesTable extends IpLocationCaches } if (data.containsKey('city')) { context.handle( - _cityMeta, city.isAcceptableOrUnknown(data['city']!, _cityMeta)); + _cityMeta, + city.isAcceptableOrUnknown(data['city']!, _cityMeta), + ); } else if (isInserting) { context.missing(_cityMeta); } if (data.containsKey('province')) { - context.handle(_provinceMeta, - province.isAcceptableOrUnknown(data['province']!, _provinceMeta)); + context.handle( + _provinceMeta, + province.isAcceptableOrUnknown(data['province']!, _provinceMeta), + ); } if (data.containsKey('full_text')) { - context.handle(_fullTextMeta, - fullText.isAcceptableOrUnknown(data['full_text']!, _fullTextMeta)); + context.handle( + _fullTextMeta, + fullText.isAcceptableOrUnknown(data['full_text']!, _fullTextMeta), + ); } else if (isInserting) { context.missing(_fullTextMeta); } if (data.containsKey('queried_at')) { - context.handle(_queriedAtMeta, - queriedAt.isAcceptableOrUnknown(data['queried_at']!, _queriedAtMeta)); + context.handle( + _queriedAtMeta, + queriedAt.isAcceptableOrUnknown(data['queried_at']!, _queriedAtMeta), + ); } else if (isInserting) { context.missing(_queriedAtMeta); } @@ -7413,16 +8830,26 @@ class $IpLocationCachesTable extends IpLocationCaches IpLocationCache map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return IpLocationCache( - ip: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}ip'])!, - city: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}city'])!, - province: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}province']), - fullText: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}full_text'])!, - queriedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}queried_at'])!, + ip: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}ip'], + )!, + city: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}city'], + )!, + province: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}province'], + ), + fullText: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}full_text'], + )!, + queriedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}queried_at'], + )!, ); } @@ -7438,12 +8865,13 @@ class IpLocationCache extends DataClass implements Insertable { final String? province; final String fullText; final DateTime queriedAt; - const IpLocationCache( - {required this.ip, - required this.city, - this.province, - required this.fullText, - required this.queriedAt}); + const IpLocationCache({ + required this.ip, + required this.city, + this.province, + required this.fullText, + required this.queriedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -7469,8 +8897,10 @@ class IpLocationCache extends DataClass implements Insertable { ); } - factory IpLocationCache.fromJson(Map json, - {ValueSerializer? serializer}) { + factory IpLocationCache.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return IpLocationCache( ip: serializer.fromJson(json['ip']), @@ -7492,19 +8922,19 @@ class IpLocationCache extends DataClass implements Insertable { }; } - IpLocationCache copyWith( - {String? ip, - String? city, - Value province = const Value.absent(), - String? fullText, - DateTime? queriedAt}) => - IpLocationCache( - ip: ip ?? this.ip, - city: city ?? this.city, - province: province.present ? province.value : this.province, - fullText: fullText ?? this.fullText, - queriedAt: queriedAt ?? this.queriedAt, - ); + IpLocationCache copyWith({ + String? ip, + String? city, + Value province = const Value.absent(), + String? fullText, + DateTime? queriedAt, + }) => IpLocationCache( + ip: ip ?? this.ip, + city: city ?? this.city, + province: province.present ? province.value : this.province, + fullText: fullText ?? this.fullText, + queriedAt: queriedAt ?? this.queriedAt, + ); IpLocationCache copyWithCompanion(IpLocationCachesCompanion data) { return IpLocationCache( ip: data.ip.present ? data.ip.value : this.ip, @@ -7562,10 +8992,10 @@ class IpLocationCachesCompanion extends UpdateCompanion { required String fullText, required DateTime queriedAt, this.rowid = const Value.absent(), - }) : ip = Value(ip), - city = Value(city), - fullText = Value(fullText), - queriedAt = Value(queriedAt); + }) : ip = Value(ip), + city = Value(city), + fullText = Value(fullText), + queriedAt = Value(queriedAt); static Insertable custom({ Expression? ip, Expression? city, @@ -7584,13 +9014,14 @@ class IpLocationCachesCompanion extends UpdateCompanion { }); } - IpLocationCachesCompanion copyWith( - {Value? ip, - Value? city, - Value? province, - Value? fullText, - Value? queriedAt, - Value? rowid}) { + IpLocationCachesCompanion copyWith({ + Value? ip, + Value? city, + Value? province, + Value? fullText, + Value? queriedAt, + Value? rowid, + }) { return IpLocationCachesCompanion( ip: ip ?? this.ip, city: city ?? this.city, @@ -7648,123 +9079,206 @@ class $TransferDeviceRecordsTable extends TransferDeviceRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _aliasMeta = const VerificationMeta('alias'); @override late final GeneratedColumn alias = GeneratedColumn( - 'alias', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _deviceModelMeta = - const VerificationMeta('deviceModel'); + 'alias', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _deviceModelMeta = const VerificationMeta( + 'deviceModel', + ); @override late final GeneratedColumn deviceModel = GeneratedColumn( - 'device_model', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _deviceTypeMeta = - const VerificationMeta('deviceType'); + 'device_model', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _deviceTypeMeta = const VerificationMeta( + 'deviceType', + ); @override late final GeneratedColumn deviceType = GeneratedColumn( - 'device_type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('mobile')); + 'device_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('mobile'), + ); static const VerificationMeta _ipMeta = const VerificationMeta('ip'); @override late final GeneratedColumn ip = GeneratedColumn( - 'ip', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); + 'ip', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); static const VerificationMeta _portMeta = const VerificationMeta('port'); @override late final GeneratedColumn port = GeneratedColumn( - 'port', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(53317)); - static const VerificationMeta _pairingMethodMeta = - const VerificationMeta('pairingMethod'); + 'port', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(53317), + ); + static const VerificationMeta _pairingMethodMeta = const VerificationMeta( + 'pairingMethod', + ); @override late final GeneratedColumn pairingMethod = GeneratedColumn( - 'pairing_method', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('lan')); + 'pairing_method', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('lan'), + ); static const VerificationMeta _preferredTransportMeta = const VerificationMeta('preferredTransport'); @override late final GeneratedColumn preferredTransport = - GeneratedColumn('preferred_transport', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('localsend_http')); - static const VerificationMeta _isOnlineMeta = - const VerificationMeta('isOnline'); + GeneratedColumn( + 'preferred_transport', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('localsend_http'), + ); + static const VerificationMeta _isOnlineMeta = const VerificationMeta( + 'isOnline', + ); @override late final GeneratedColumn isOnline = GeneratedColumn( - 'is_online', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_online" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _isVerifiedMeta = - const VerificationMeta('isVerified'); + 'is_online', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_online" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _isVerifiedMeta = const VerificationMeta( + 'isVerified', + ); @override late final GeneratedColumn isVerified = GeneratedColumn( - 'is_verified', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_verified" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _publicKeyMeta = - const VerificationMeta('publicKey'); + 'is_verified', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_verified" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _isFavoriteMeta = const VerificationMeta( + 'isFavorite', + ); + @override + late final GeneratedColumn isFavorite = GeneratedColumn( + 'is_favorite', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_favorite" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _publicKeyMeta = const VerificationMeta( + 'publicKey', + ); @override late final GeneratedColumn publicKey = GeneratedColumn( - 'public_key', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _fingerprintMeta = - const VerificationMeta('fingerprint'); + 'public_key', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _fingerprintMeta = const VerificationMeta( + 'fingerprint', + ); @override late final GeneratedColumn fingerprint = GeneratedColumn( - 'fingerprint', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _lastSeenMeta = - const VerificationMeta('lastSeen'); + 'fingerprint', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _lastSeenMeta = const VerificationMeta( + 'lastSeen', + ); @override late final GeneratedColumn lastSeen = GeneratedColumn( - 'last_seen', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'last_seen', + aliasedName, + false, + type: DriftSqlType.dateTime, + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - alias, - deviceModel, - deviceType, - ip, - port, - pairingMethod, - preferredTransport, - isOnline, - isVerified, - publicKey, - fingerprint, - lastSeen, - createdAt, - updatedAt - ]; + id, + alias, + deviceModel, + deviceType, + ip, + port, + pairingMethod, + preferredTransport, + isOnline, + isVerified, + isFavorite, + publicKey, + fingerprint, + lastSeen, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -7772,8 +9286,9 @@ class $TransferDeviceRecordsTable extends TransferDeviceRecords static const String $name = 'transfer_device_records'; @override VerificationContext validateIntegrity( - Insertable instance, - {bool isInserting = false}) { + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -7783,76 +9298,108 @@ class $TransferDeviceRecordsTable extends TransferDeviceRecords } if (data.containsKey('alias')) { context.handle( - _aliasMeta, alias.isAcceptableOrUnknown(data['alias']!, _aliasMeta)); + _aliasMeta, + alias.isAcceptableOrUnknown(data['alias']!, _aliasMeta), + ); } else if (isInserting) { context.missing(_aliasMeta); } if (data.containsKey('device_model')) { context.handle( + _deviceModelMeta, + deviceModel.isAcceptableOrUnknown( + data['device_model']!, _deviceModelMeta, - deviceModel.isAcceptableOrUnknown( - data['device_model']!, _deviceModelMeta)); + ), + ); } if (data.containsKey('device_type')) { context.handle( - _deviceTypeMeta, - deviceType.isAcceptableOrUnknown( - data['device_type']!, _deviceTypeMeta)); + _deviceTypeMeta, + deviceType.isAcceptableOrUnknown(data['device_type']!, _deviceTypeMeta), + ); } if (data.containsKey('ip')) { context.handle(_ipMeta, ip.isAcceptableOrUnknown(data['ip']!, _ipMeta)); } if (data.containsKey('port')) { context.handle( - _portMeta, port.isAcceptableOrUnknown(data['port']!, _portMeta)); + _portMeta, + port.isAcceptableOrUnknown(data['port']!, _portMeta), + ); } if (data.containsKey('pairing_method')) { context.handle( + _pairingMethodMeta, + pairingMethod.isAcceptableOrUnknown( + data['pairing_method']!, _pairingMethodMeta, - pairingMethod.isAcceptableOrUnknown( - data['pairing_method']!, _pairingMethodMeta)); + ), + ); } if (data.containsKey('preferred_transport')) { context.handle( + _preferredTransportMeta, + preferredTransport.isAcceptableOrUnknown( + data['preferred_transport']!, _preferredTransportMeta, - preferredTransport.isAcceptableOrUnknown( - data['preferred_transport']!, _preferredTransportMeta)); + ), + ); } if (data.containsKey('is_online')) { - context.handle(_isOnlineMeta, - isOnline.isAcceptableOrUnknown(data['is_online']!, _isOnlineMeta)); + context.handle( + _isOnlineMeta, + isOnline.isAcceptableOrUnknown(data['is_online']!, _isOnlineMeta), + ); } if (data.containsKey('is_verified')) { context.handle( - _isVerifiedMeta, - isVerified.isAcceptableOrUnknown( - data['is_verified']!, _isVerifiedMeta)); + _isVerifiedMeta, + isVerified.isAcceptableOrUnknown(data['is_verified']!, _isVerifiedMeta), + ); + } + if (data.containsKey('is_favorite')) { + context.handle( + _isFavoriteMeta, + isFavorite.isAcceptableOrUnknown(data['is_favorite']!, _isFavoriteMeta), + ); } if (data.containsKey('public_key')) { - context.handle(_publicKeyMeta, - publicKey.isAcceptableOrUnknown(data['public_key']!, _publicKeyMeta)); + context.handle( + _publicKeyMeta, + publicKey.isAcceptableOrUnknown(data['public_key']!, _publicKeyMeta), + ); } if (data.containsKey('fingerprint')) { context.handle( + _fingerprintMeta, + fingerprint.isAcceptableOrUnknown( + data['fingerprint']!, _fingerprintMeta, - fingerprint.isAcceptableOrUnknown( - data['fingerprint']!, _fingerprintMeta)); + ), + ); } if (data.containsKey('last_seen')) { - context.handle(_lastSeenMeta, - lastSeen.isAcceptableOrUnknown(data['last_seen']!, _lastSeenMeta)); + context.handle( + _lastSeenMeta, + lastSeen.isAcceptableOrUnknown(data['last_seen']!, _lastSeenMeta), + ); } else if (isInserting) { context.missing(_lastSeenMeta); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -7865,36 +9412,70 @@ class $TransferDeviceRecordsTable extends TransferDeviceRecords TransferDeviceRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return TransferDeviceRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - alias: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}alias'])!, - deviceModel: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}device_model']), - deviceType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}device_type'])!, - ip: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}ip']), - port: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}port'])!, - pairingMethod: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}pairing_method'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + alias: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}alias'], + )!, + deviceModel: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}device_model'], + ), + deviceType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}device_type'], + )!, + ip: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}ip'], + ), + port: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}port'], + )!, + pairingMethod: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}pairing_method'], + )!, preferredTransport: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}preferred_transport'])!, - isOnline: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_online'])!, - isVerified: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_verified'])!, - publicKey: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}public_key']), - fingerprint: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}fingerprint']), - lastSeen: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}last_seen'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + DriftSqlType.string, + data['${effectivePrefix}preferred_transport'], + )!, + isOnline: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_online'], + )!, + isVerified: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_verified'], + )!, + isFavorite: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_favorite'], + )!, + publicKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}public_key'], + ), + fingerprint: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}fingerprint'], + ), + lastSeen: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_seen'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -7916,27 +9497,30 @@ class TransferDeviceRecord extends DataClass final String preferredTransport; final bool isOnline; final bool isVerified; + final bool isFavorite; final String? publicKey; final String? fingerprint; final DateTime lastSeen; final DateTime createdAt; final DateTime updatedAt; - const TransferDeviceRecord( - {required this.id, - required this.alias, - this.deviceModel, - required this.deviceType, - this.ip, - required this.port, - required this.pairingMethod, - required this.preferredTransport, - required this.isOnline, - required this.isVerified, - this.publicKey, - this.fingerprint, - required this.lastSeen, - required this.createdAt, - required this.updatedAt}); + const TransferDeviceRecord({ + required this.id, + required this.alias, + this.deviceModel, + required this.deviceType, + this.ip, + required this.port, + required this.pairingMethod, + required this.preferredTransport, + required this.isOnline, + required this.isVerified, + required this.isFavorite, + this.publicKey, + this.fingerprint, + required this.lastSeen, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -7954,6 +9538,7 @@ class TransferDeviceRecord extends DataClass map['preferred_transport'] = Variable(preferredTransport); map['is_online'] = Variable(isOnline); map['is_verified'] = Variable(isVerified); + map['is_favorite'] = Variable(isFavorite); if (!nullToAbsent || publicKey != null) { map['public_key'] = Variable(publicKey); } @@ -7980,6 +9565,7 @@ class TransferDeviceRecord extends DataClass preferredTransport: Value(preferredTransport), isOnline: Value(isOnline), isVerified: Value(isVerified), + isFavorite: Value(isFavorite), publicKey: publicKey == null && nullToAbsent ? const Value.absent() : Value(publicKey), @@ -7992,8 +9578,10 @@ class TransferDeviceRecord extends DataClass ); } - factory TransferDeviceRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory TransferDeviceRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return TransferDeviceRecord( id: serializer.fromJson(json['id']), @@ -8003,10 +9591,12 @@ class TransferDeviceRecord extends DataClass ip: serializer.fromJson(json['ip']), port: serializer.fromJson(json['port']), pairingMethod: serializer.fromJson(json['pairingMethod']), - preferredTransport: - serializer.fromJson(json['preferredTransport']), + preferredTransport: serializer.fromJson( + json['preferredTransport'], + ), isOnline: serializer.fromJson(json['isOnline']), isVerified: serializer.fromJson(json['isVerified']), + isFavorite: serializer.fromJson(json['isFavorite']), publicKey: serializer.fromJson(json['publicKey']), fingerprint: serializer.fromJson(json['fingerprint']), lastSeen: serializer.fromJson(json['lastSeen']), @@ -8028,6 +9618,7 @@ class TransferDeviceRecord extends DataClass 'preferredTransport': serializer.toJson(preferredTransport), 'isOnline': serializer.toJson(isOnline), 'isVerified': serializer.toJson(isVerified), + 'isFavorite': serializer.toJson(isFavorite), 'publicKey': serializer.toJson(publicKey), 'fingerprint': serializer.toJson(fingerprint), 'lastSeen': serializer.toJson(lastSeen), @@ -8036,47 +9627,51 @@ class TransferDeviceRecord extends DataClass }; } - TransferDeviceRecord copyWith( - {String? id, - String? alias, - Value deviceModel = const Value.absent(), - String? deviceType, - Value ip = const Value.absent(), - int? port, - String? pairingMethod, - String? preferredTransport, - bool? isOnline, - bool? isVerified, - Value publicKey = const Value.absent(), - Value fingerprint = const Value.absent(), - DateTime? lastSeen, - DateTime? createdAt, - DateTime? updatedAt}) => - TransferDeviceRecord( - id: id ?? this.id, - alias: alias ?? this.alias, - deviceModel: deviceModel.present ? deviceModel.value : this.deviceModel, - deviceType: deviceType ?? this.deviceType, - ip: ip.present ? ip.value : this.ip, - port: port ?? this.port, - pairingMethod: pairingMethod ?? this.pairingMethod, - preferredTransport: preferredTransport ?? this.preferredTransport, - isOnline: isOnline ?? this.isOnline, - isVerified: isVerified ?? this.isVerified, - publicKey: publicKey.present ? publicKey.value : this.publicKey, - fingerprint: fingerprint.present ? fingerprint.value : this.fingerprint, - lastSeen: lastSeen ?? this.lastSeen, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + TransferDeviceRecord copyWith({ + String? id, + String? alias, + Value deviceModel = const Value.absent(), + String? deviceType, + Value ip = const Value.absent(), + int? port, + String? pairingMethod, + String? preferredTransport, + bool? isOnline, + bool? isVerified, + bool? isFavorite, + Value publicKey = const Value.absent(), + Value fingerprint = const Value.absent(), + DateTime? lastSeen, + DateTime? createdAt, + DateTime? updatedAt, + }) => TransferDeviceRecord( + id: id ?? this.id, + alias: alias ?? this.alias, + deviceModel: deviceModel.present ? deviceModel.value : this.deviceModel, + deviceType: deviceType ?? this.deviceType, + ip: ip.present ? ip.value : this.ip, + port: port ?? this.port, + pairingMethod: pairingMethod ?? this.pairingMethod, + preferredTransport: preferredTransport ?? this.preferredTransport, + isOnline: isOnline ?? this.isOnline, + isVerified: isVerified ?? this.isVerified, + isFavorite: isFavorite ?? this.isFavorite, + publicKey: publicKey.present ? publicKey.value : this.publicKey, + fingerprint: fingerprint.present ? fingerprint.value : this.fingerprint, + lastSeen: lastSeen ?? this.lastSeen, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); TransferDeviceRecord copyWithCompanion(TransferDeviceRecordsCompanion data) { return TransferDeviceRecord( id: data.id.present ? data.id.value : this.id, alias: data.alias.present ? data.alias.value : this.alias, - deviceModel: - data.deviceModel.present ? data.deviceModel.value : this.deviceModel, - deviceType: - data.deviceType.present ? data.deviceType.value : this.deviceType, + deviceModel: data.deviceModel.present + ? data.deviceModel.value + : this.deviceModel, + deviceType: data.deviceType.present + ? data.deviceType.value + : this.deviceType, ip: data.ip.present ? data.ip.value : this.ip, port: data.port.present ? data.port.value : this.port, pairingMethod: data.pairingMethod.present @@ -8086,11 +9681,16 @@ class TransferDeviceRecord extends DataClass ? data.preferredTransport.value : this.preferredTransport, isOnline: data.isOnline.present ? data.isOnline.value : this.isOnline, - isVerified: - data.isVerified.present ? data.isVerified.value : this.isVerified, + isVerified: data.isVerified.present + ? data.isVerified.value + : this.isVerified, + isFavorite: data.isFavorite.present + ? data.isFavorite.value + : this.isFavorite, publicKey: data.publicKey.present ? data.publicKey.value : this.publicKey, - fingerprint: - data.fingerprint.present ? data.fingerprint.value : this.fingerprint, + fingerprint: data.fingerprint.present + ? data.fingerprint.value + : this.fingerprint, lastSeen: data.lastSeen.present ? data.lastSeen.value : this.lastSeen, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt, @@ -8110,6 +9710,7 @@ class TransferDeviceRecord extends DataClass ..write('preferredTransport: $preferredTransport, ') ..write('isOnline: $isOnline, ') ..write('isVerified: $isVerified, ') + ..write('isFavorite: $isFavorite, ') ..write('publicKey: $publicKey, ') ..write('fingerprint: $fingerprint, ') ..write('lastSeen: $lastSeen, ') @@ -8121,21 +9722,23 @@ class TransferDeviceRecord extends DataClass @override int get hashCode => Object.hash( - id, - alias, - deviceModel, - deviceType, - ip, - port, - pairingMethod, - preferredTransport, - isOnline, - isVerified, - publicKey, - fingerprint, - lastSeen, - createdAt, - updatedAt); + id, + alias, + deviceModel, + deviceType, + ip, + port, + pairingMethod, + preferredTransport, + isOnline, + isVerified, + isFavorite, + publicKey, + fingerprint, + lastSeen, + createdAt, + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -8150,6 +9753,7 @@ class TransferDeviceRecord extends DataClass other.preferredTransport == this.preferredTransport && other.isOnline == this.isOnline && other.isVerified == this.isVerified && + other.isFavorite == this.isFavorite && other.publicKey == this.publicKey && other.fingerprint == this.fingerprint && other.lastSeen == this.lastSeen && @@ -8169,6 +9773,7 @@ class TransferDeviceRecordsCompanion final Value preferredTransport; final Value isOnline; final Value isVerified; + final Value isFavorite; final Value publicKey; final Value fingerprint; final Value lastSeen; @@ -8186,6 +9791,7 @@ class TransferDeviceRecordsCompanion this.preferredTransport = const Value.absent(), this.isOnline = const Value.absent(), this.isVerified = const Value.absent(), + this.isFavorite = const Value.absent(), this.publicKey = const Value.absent(), this.fingerprint = const Value.absent(), this.lastSeen = const Value.absent(), @@ -8204,17 +9810,18 @@ class TransferDeviceRecordsCompanion this.preferredTransport = const Value.absent(), this.isOnline = const Value.absent(), this.isVerified = const Value.absent(), + this.isFavorite = const Value.absent(), this.publicKey = const Value.absent(), this.fingerprint = const Value.absent(), required DateTime lastSeen, required DateTime createdAt, required DateTime updatedAt, this.rowid = const Value.absent(), - }) : id = Value(id), - alias = Value(alias), - lastSeen = Value(lastSeen), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : id = Value(id), + alias = Value(alias), + lastSeen = Value(lastSeen), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? alias, @@ -8226,6 +9833,7 @@ class TransferDeviceRecordsCompanion Expression? preferredTransport, Expression? isOnline, Expression? isVerified, + Expression? isFavorite, Expression? publicKey, Expression? fingerprint, Expression? lastSeen, @@ -8244,6 +9852,7 @@ class TransferDeviceRecordsCompanion if (preferredTransport != null) 'preferred_transport': preferredTransport, if (isOnline != null) 'is_online': isOnline, if (isVerified != null) 'is_verified': isVerified, + if (isFavorite != null) 'is_favorite': isFavorite, if (publicKey != null) 'public_key': publicKey, if (fingerprint != null) 'fingerprint': fingerprint, if (lastSeen != null) 'last_seen': lastSeen, @@ -8253,23 +9862,25 @@ class TransferDeviceRecordsCompanion }); } - TransferDeviceRecordsCompanion copyWith( - {Value? id, - Value? alias, - Value? deviceModel, - Value? deviceType, - Value? ip, - Value? port, - Value? pairingMethod, - Value? preferredTransport, - Value? isOnline, - Value? isVerified, - Value? publicKey, - Value? fingerprint, - Value? lastSeen, - Value? createdAt, - Value? updatedAt, - Value? rowid}) { + TransferDeviceRecordsCompanion copyWith({ + Value? id, + Value? alias, + Value? deviceModel, + Value? deviceType, + Value? ip, + Value? port, + Value? pairingMethod, + Value? preferredTransport, + Value? isOnline, + Value? isVerified, + Value? isFavorite, + Value? publicKey, + Value? fingerprint, + Value? lastSeen, + Value? createdAt, + Value? updatedAt, + Value? rowid, + }) { return TransferDeviceRecordsCompanion( id: id ?? this.id, alias: alias ?? this.alias, @@ -8281,6 +9892,7 @@ class TransferDeviceRecordsCompanion preferredTransport: preferredTransport ?? this.preferredTransport, isOnline: isOnline ?? this.isOnline, isVerified: isVerified ?? this.isVerified, + isFavorite: isFavorite ?? this.isFavorite, publicKey: publicKey ?? this.publicKey, fingerprint: fingerprint ?? this.fingerprint, lastSeen: lastSeen ?? this.lastSeen, @@ -8323,6 +9935,9 @@ class TransferDeviceRecordsCompanion if (isVerified.present) { map['is_verified'] = Variable(isVerified.value); } + if (isFavorite.present) { + map['is_favorite'] = Variable(isFavorite.value); + } if (publicKey.present) { map['public_key'] = Variable(publicKey.value); } @@ -8357,6 +9972,7 @@ class TransferDeviceRecordsCompanion ..write('preferredTransport: $preferredTransport, ') ..write('isOnline: $isOnline, ') ..write('isVerified: $isVerified, ') + ..write('isFavorite: $isFavorite, ') ..write('publicKey: $publicKey, ') ..write('fingerprint: $fingerprint, ') ..write('lastSeen: $lastSeen, ') @@ -8377,174 +9993,270 @@ class $TransferRecordsTable extends TransferRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _sessionIdMeta = - const VerificationMeta('sessionId'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _sessionIdMeta = const VerificationMeta( + 'sessionId', + ); @override late final GeneratedColumn sessionId = GeneratedColumn( - 'session_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'session_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _peerIdMeta = const VerificationMeta('peerId'); @override late final GeneratedColumn peerId = GeneratedColumn( - 'peer_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _peerAliasMeta = - const VerificationMeta('peerAlias'); + 'peer_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _peerAliasMeta = const VerificationMeta( + 'peerAlias', + ); @override late final GeneratedColumn peerAlias = GeneratedColumn( - 'peer_alias', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _transportMeta = - const VerificationMeta('transport'); + 'peer_alias', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _transportMeta = const VerificationMeta( + 'transport', + ); @override late final GeneratedColumn transport = GeneratedColumn( - 'transport', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('localsend_http')); - static const VerificationMeta _directionMeta = - const VerificationMeta('direction'); + 'transport', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('localsend_http'), + ); + static const VerificationMeta _directionMeta = const VerificationMeta( + 'direction', + ); @override late final GeneratedColumn direction = GeneratedColumn( - 'direction', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('send')); + 'direction', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('send'), + ); static const VerificationMeta _statusMeta = const VerificationMeta('status'); @override late final GeneratedColumn status = GeneratedColumn( - 'status', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('waiting')); - static const VerificationMeta _fileNameMeta = - const VerificationMeta('fileName'); + 'status', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('waiting'), + ); + static const VerificationMeta _fileNameMeta = const VerificationMeta( + 'fileName', + ); @override late final GeneratedColumn fileName = GeneratedColumn( - 'file_name', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _fileSizeMeta = - const VerificationMeta('fileSize'); + 'file_name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _fileSizeMeta = const VerificationMeta( + 'fileSize', + ); @override late final GeneratedColumn fileSize = GeneratedColumn( - 'file_size', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _transferredBytesMeta = - const VerificationMeta('transferredBytes'); + 'file_size', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _transferredBytesMeta = const VerificationMeta( + 'transferredBytes', + ); @override late final GeneratedColumn transferredBytes = GeneratedColumn( - 'transferred_bytes', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); + 'transferred_bytes', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); static const VerificationMeta _speedMeta = const VerificationMeta('speed'); @override late final GeneratedColumn speed = GeneratedColumn( - 'speed', aliasedName, false, - type: DriftSqlType.double, - requiredDuringInsert: false, - defaultValue: const Constant(0.0)); - static const VerificationMeta _mimeTypeMeta = - const VerificationMeta('mimeType'); + 'speed', + aliasedName, + false, + type: DriftSqlType.double, + requiredDuringInsert: false, + defaultValue: const Constant(0.0), + ); + static const VerificationMeta _mimeTypeMeta = const VerificationMeta( + 'mimeType', + ); @override late final GeneratedColumn mimeType = GeneratedColumn( - 'mime_type', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _filePathMeta = - const VerificationMeta('filePath'); + 'mime_type', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _filePathMeta = const VerificationMeta( + 'filePath', + ); @override late final GeneratedColumn filePath = GeneratedColumn( - 'file_path', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _thumbnailPathMeta = - const VerificationMeta('thumbnailPath'); + 'file_path', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _thumbnailPathMeta = const VerificationMeta( + 'thumbnailPath', + ); @override late final GeneratedColumn thumbnailPath = GeneratedColumn( - 'thumbnail_path', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _fileSha256Meta = - const VerificationMeta('fileSha256'); + 'thumbnail_path', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _fileSha256Meta = const VerificationMeta( + 'fileSha256', + ); @override late final GeneratedColumn fileSha256 = GeneratedColumn( - 'file_sha256', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _hashVerifiedMeta = - const VerificationMeta('hashVerified'); + 'file_sha256', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _hashVerifiedMeta = const VerificationMeta( + 'hashVerified', + ); @override late final GeneratedColumn hashVerified = GeneratedColumn( - 'hash_verified', aliasedName, true, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: GeneratedColumn.constraintIsAlways( - 'CHECK ("hash_verified" IN (0, 1))')); - static const VerificationMeta _errorMessageMeta = - const VerificationMeta('errorMessage'); + 'hash_verified', + aliasedName, + true, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("hash_verified" IN (0, 1))', + ), + ); + static const VerificationMeta _errorMessageMeta = const VerificationMeta( + 'errorMessage', + ); @override late final GeneratedColumn errorMessage = GeneratedColumn( - 'error_message', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _startTimeMeta = - const VerificationMeta('startTime'); + 'error_message', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _startTimeMeta = const VerificationMeta( + 'startTime', + ); @override late final GeneratedColumn startTime = GeneratedColumn( - 'start_time', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _endTimeMeta = - const VerificationMeta('endTime'); + 'start_time', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + static const VerificationMeta _endTimeMeta = const VerificationMeta( + 'endTime', + ); @override late final GeneratedColumn endTime = GeneratedColumn( - 'end_time', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'end_time', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - sessionId, - peerId, - peerAlias, - transport, - direction, - status, - fileName, - fileSize, - transferredBytes, - speed, - mimeType, - filePath, - thumbnailPath, - fileSha256, - hashVerified, - errorMessage, - startTime, - endTime, - createdAt, - updatedAt - ]; + id, + sessionId, + peerId, + peerAlias, + transport, + direction, + status, + fileName, + fileSize, + transferredBytes, + speed, + mimeType, + filePath, + thumbnailPath, + fileSha256, + hashVerified, + errorMessage, + startTime, + endTime, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'transfer_records'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -8553,104 +10265,146 @@ class $TransferRecordsTable extends TransferRecords context.missing(_idMeta); } if (data.containsKey('session_id')) { - context.handle(_sessionIdMeta, - sessionId.isAcceptableOrUnknown(data['session_id']!, _sessionIdMeta)); + context.handle( + _sessionIdMeta, + sessionId.isAcceptableOrUnknown(data['session_id']!, _sessionIdMeta), + ); } else if (isInserting) { context.missing(_sessionIdMeta); } if (data.containsKey('peer_id')) { - context.handle(_peerIdMeta, - peerId.isAcceptableOrUnknown(data['peer_id']!, _peerIdMeta)); + context.handle( + _peerIdMeta, + peerId.isAcceptableOrUnknown(data['peer_id']!, _peerIdMeta), + ); } else if (isInserting) { context.missing(_peerIdMeta); } if (data.containsKey('peer_alias')) { - context.handle(_peerAliasMeta, - peerAlias.isAcceptableOrUnknown(data['peer_alias']!, _peerAliasMeta)); + context.handle( + _peerAliasMeta, + peerAlias.isAcceptableOrUnknown(data['peer_alias']!, _peerAliasMeta), + ); } if (data.containsKey('transport')) { - context.handle(_transportMeta, - transport.isAcceptableOrUnknown(data['transport']!, _transportMeta)); + context.handle( + _transportMeta, + transport.isAcceptableOrUnknown(data['transport']!, _transportMeta), + ); } if (data.containsKey('direction')) { - context.handle(_directionMeta, - direction.isAcceptableOrUnknown(data['direction']!, _directionMeta)); + context.handle( + _directionMeta, + direction.isAcceptableOrUnknown(data['direction']!, _directionMeta), + ); } if (data.containsKey('status')) { - context.handle(_statusMeta, - status.isAcceptableOrUnknown(data['status']!, _statusMeta)); + context.handle( + _statusMeta, + status.isAcceptableOrUnknown(data['status']!, _statusMeta), + ); } if (data.containsKey('file_name')) { - context.handle(_fileNameMeta, - fileName.isAcceptableOrUnknown(data['file_name']!, _fileNameMeta)); + context.handle( + _fileNameMeta, + fileName.isAcceptableOrUnknown(data['file_name']!, _fileNameMeta), + ); } else if (isInserting) { context.missing(_fileNameMeta); } if (data.containsKey('file_size')) { - context.handle(_fileSizeMeta, - fileSize.isAcceptableOrUnknown(data['file_size']!, _fileSizeMeta)); + context.handle( + _fileSizeMeta, + fileSize.isAcceptableOrUnknown(data['file_size']!, _fileSizeMeta), + ); } if (data.containsKey('transferred_bytes')) { context.handle( + _transferredBytesMeta, + transferredBytes.isAcceptableOrUnknown( + data['transferred_bytes']!, _transferredBytesMeta, - transferredBytes.isAcceptableOrUnknown( - data['transferred_bytes']!, _transferredBytesMeta)); + ), + ); } if (data.containsKey('speed')) { context.handle( - _speedMeta, speed.isAcceptableOrUnknown(data['speed']!, _speedMeta)); + _speedMeta, + speed.isAcceptableOrUnknown(data['speed']!, _speedMeta), + ); } if (data.containsKey('mime_type')) { - context.handle(_mimeTypeMeta, - mimeType.isAcceptableOrUnknown(data['mime_type']!, _mimeTypeMeta)); + context.handle( + _mimeTypeMeta, + mimeType.isAcceptableOrUnknown(data['mime_type']!, _mimeTypeMeta), + ); } if (data.containsKey('file_path')) { - context.handle(_filePathMeta, - filePath.isAcceptableOrUnknown(data['file_path']!, _filePathMeta)); + context.handle( + _filePathMeta, + filePath.isAcceptableOrUnknown(data['file_path']!, _filePathMeta), + ); } if (data.containsKey('thumbnail_path')) { context.handle( + _thumbnailPathMeta, + thumbnailPath.isAcceptableOrUnknown( + data['thumbnail_path']!, _thumbnailPathMeta, - thumbnailPath.isAcceptableOrUnknown( - data['thumbnail_path']!, _thumbnailPathMeta)); + ), + ); } if (data.containsKey('file_sha256')) { context.handle( - _fileSha256Meta, - fileSha256.isAcceptableOrUnknown( - data['file_sha256']!, _fileSha256Meta)); + _fileSha256Meta, + fileSha256.isAcceptableOrUnknown(data['file_sha256']!, _fileSha256Meta), + ); } if (data.containsKey('hash_verified')) { context.handle( + _hashVerifiedMeta, + hashVerified.isAcceptableOrUnknown( + data['hash_verified']!, _hashVerifiedMeta, - hashVerified.isAcceptableOrUnknown( - data['hash_verified']!, _hashVerifiedMeta)); + ), + ); } if (data.containsKey('error_message')) { context.handle( + _errorMessageMeta, + errorMessage.isAcceptableOrUnknown( + data['error_message']!, _errorMessageMeta, - errorMessage.isAcceptableOrUnknown( - data['error_message']!, _errorMessageMeta)); + ), + ); } if (data.containsKey('start_time')) { - context.handle(_startTimeMeta, - startTime.isAcceptableOrUnknown(data['start_time']!, _startTimeMeta)); + context.handle( + _startTimeMeta, + startTime.isAcceptableOrUnknown(data['start_time']!, _startTimeMeta), + ); } else if (isInserting) { context.missing(_startTimeMeta); } if (data.containsKey('end_time')) { - context.handle(_endTimeMeta, - endTime.isAcceptableOrUnknown(data['end_time']!, _endTimeMeta)); + context.handle( + _endTimeMeta, + endTime.isAcceptableOrUnknown(data['end_time']!, _endTimeMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -8663,48 +10417,90 @@ class $TransferRecordsTable extends TransferRecords TransferRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return TransferRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - sessionId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}session_id'])!, - peerId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}peer_id'])!, - peerAlias: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}peer_alias'])!, - transport: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}transport'])!, - direction: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}direction'])!, - status: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}status'])!, - fileName: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_name'])!, - fileSize: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}file_size'])!, - transferredBytes: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}transferred_bytes'])!, - speed: attachedDatabase.typeMapping - .read(DriftSqlType.double, data['${effectivePrefix}speed'])!, - mimeType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}mime_type']), - filePath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_path']), - thumbnailPath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path']), - fileSha256: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_sha256']), - hashVerified: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}hash_verified']), - errorMessage: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}error_message']), - startTime: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}start_time'])!, - endTime: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}end_time']), - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + sessionId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}session_id'], + )!, + peerId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}peer_id'], + )!, + peerAlias: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}peer_alias'], + )!, + transport: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}transport'], + )!, + direction: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}direction'], + )!, + status: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}status'], + )!, + fileName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_name'], + )!, + fileSize: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}file_size'], + )!, + transferredBytes: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}transferred_bytes'], + )!, + speed: attachedDatabase.typeMapping.read( + DriftSqlType.double, + data['${effectivePrefix}speed'], + )!, + mimeType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}mime_type'], + ), + filePath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_path'], + ), + thumbnailPath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}thumbnail_path'], + ), + fileSha256: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_sha256'], + ), + hashVerified: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}hash_verified'], + ), + errorMessage: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}error_message'], + ), + startTime: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}start_time'], + )!, + endTime: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}end_time'], + ), + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -8736,28 +10532,29 @@ class TransferRecord extends DataClass implements Insertable { final DateTime? endTime; final DateTime createdAt; final DateTime updatedAt; - const TransferRecord( - {required this.id, - required this.sessionId, - required this.peerId, - required this.peerAlias, - required this.transport, - required this.direction, - required this.status, - required this.fileName, - required this.fileSize, - required this.transferredBytes, - required this.speed, - this.mimeType, - this.filePath, - this.thumbnailPath, - this.fileSha256, - this.hashVerified, - this.errorMessage, - required this.startTime, - this.endTime, - required this.createdAt, - required this.updatedAt}); + const TransferRecord({ + required this.id, + required this.sessionId, + required this.peerId, + required this.peerAlias, + required this.transport, + required this.direction, + required this.status, + required this.fileName, + required this.fileSize, + required this.transferredBytes, + required this.speed, + this.mimeType, + this.filePath, + this.thumbnailPath, + this.fileSha256, + this.hashVerified, + this.errorMessage, + required this.startTime, + this.endTime, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -8839,8 +10636,10 @@ class TransferRecord extends DataClass implements Insertable { ); } - factory TransferRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory TransferRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return TransferRecord( id: serializer.fromJson(json['id']), @@ -8894,54 +10693,53 @@ class TransferRecord extends DataClass implements Insertable { }; } - TransferRecord copyWith( - {String? id, - String? sessionId, - String? peerId, - String? peerAlias, - String? transport, - String? direction, - String? status, - String? fileName, - int? fileSize, - int? transferredBytes, - double? speed, - Value mimeType = const Value.absent(), - Value filePath = const Value.absent(), - Value thumbnailPath = const Value.absent(), - Value fileSha256 = const Value.absent(), - Value hashVerified = const Value.absent(), - Value errorMessage = const Value.absent(), - DateTime? startTime, - Value endTime = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt}) => - TransferRecord( - id: id ?? this.id, - sessionId: sessionId ?? this.sessionId, - peerId: peerId ?? this.peerId, - peerAlias: peerAlias ?? this.peerAlias, - transport: transport ?? this.transport, - direction: direction ?? this.direction, - status: status ?? this.status, - fileName: fileName ?? this.fileName, - fileSize: fileSize ?? this.fileSize, - transferredBytes: transferredBytes ?? this.transferredBytes, - speed: speed ?? this.speed, - mimeType: mimeType.present ? mimeType.value : this.mimeType, - filePath: filePath.present ? filePath.value : this.filePath, - thumbnailPath: - thumbnailPath.present ? thumbnailPath.value : this.thumbnailPath, - fileSha256: fileSha256.present ? fileSha256.value : this.fileSha256, - hashVerified: - hashVerified.present ? hashVerified.value : this.hashVerified, - errorMessage: - errorMessage.present ? errorMessage.value : this.errorMessage, - startTime: startTime ?? this.startTime, - endTime: endTime.present ? endTime.value : this.endTime, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + TransferRecord copyWith({ + String? id, + String? sessionId, + String? peerId, + String? peerAlias, + String? transport, + String? direction, + String? status, + String? fileName, + int? fileSize, + int? transferredBytes, + double? speed, + Value mimeType = const Value.absent(), + Value filePath = const Value.absent(), + Value thumbnailPath = const Value.absent(), + Value fileSha256 = const Value.absent(), + Value hashVerified = const Value.absent(), + Value errorMessage = const Value.absent(), + DateTime? startTime, + Value endTime = const Value.absent(), + DateTime? createdAt, + DateTime? updatedAt, + }) => TransferRecord( + id: id ?? this.id, + sessionId: sessionId ?? this.sessionId, + peerId: peerId ?? this.peerId, + peerAlias: peerAlias ?? this.peerAlias, + transport: transport ?? this.transport, + direction: direction ?? this.direction, + status: status ?? this.status, + fileName: fileName ?? this.fileName, + fileSize: fileSize ?? this.fileSize, + transferredBytes: transferredBytes ?? this.transferredBytes, + speed: speed ?? this.speed, + mimeType: mimeType.present ? mimeType.value : this.mimeType, + filePath: filePath.present ? filePath.value : this.filePath, + thumbnailPath: thumbnailPath.present + ? thumbnailPath.value + : this.thumbnailPath, + fileSha256: fileSha256.present ? fileSha256.value : this.fileSha256, + hashVerified: hashVerified.present ? hashVerified.value : this.hashVerified, + errorMessage: errorMessage.present ? errorMessage.value : this.errorMessage, + startTime: startTime ?? this.startTime, + endTime: endTime.present ? endTime.value : this.endTime, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); TransferRecord copyWithCompanion(TransferRecordsCompanion data) { return TransferRecord( id: data.id.present ? data.id.value : this.id, @@ -8962,8 +10760,9 @@ class TransferRecord extends DataClass implements Insertable { thumbnailPath: data.thumbnailPath.present ? data.thumbnailPath.value : this.thumbnailPath, - fileSha256: - data.fileSha256.present ? data.fileSha256.value : this.fileSha256, + fileSha256: data.fileSha256.present + ? data.fileSha256.value + : this.fileSha256, hashVerified: data.hashVerified.present ? data.hashVerified.value : this.hashVerified, @@ -9007,28 +10806,28 @@ class TransferRecord extends DataClass implements Insertable { @override int get hashCode => Object.hashAll([ - id, - sessionId, - peerId, - peerAlias, - transport, - direction, - status, - fileName, - fileSize, - transferredBytes, - speed, - mimeType, - filePath, - thumbnailPath, - fileSha256, - hashVerified, - errorMessage, - startTime, - endTime, - createdAt, - updatedAt - ]); + id, + sessionId, + peerId, + peerAlias, + transport, + direction, + status, + fileName, + fileSize, + transferredBytes, + speed, + mimeType, + filePath, + thumbnailPath, + fileSha256, + hashVerified, + errorMessage, + startTime, + endTime, + createdAt, + updatedAt, + ]); @override bool operator ==(Object other) => identical(this, other) || @@ -9126,13 +10925,13 @@ class TransferRecordsCompanion extends UpdateCompanion { required DateTime createdAt, required DateTime updatedAt, this.rowid = const Value.absent(), - }) : id = Value(id), - sessionId = Value(sessionId), - peerId = Value(peerId), - fileName = Value(fileName), - startTime = Value(startTime), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : id = Value(id), + sessionId = Value(sessionId), + peerId = Value(peerId), + fileName = Value(fileName), + startTime = Value(startTime), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? sessionId, @@ -9183,29 +10982,30 @@ class TransferRecordsCompanion extends UpdateCompanion { }); } - TransferRecordsCompanion copyWith( - {Value? id, - Value? sessionId, - Value? peerId, - Value? peerAlias, - Value? transport, - Value? direction, - Value? status, - Value? fileName, - Value? fileSize, - Value? transferredBytes, - Value? speed, - Value? mimeType, - Value? filePath, - Value? thumbnailPath, - Value? fileSha256, - Value? hashVerified, - Value? errorMessage, - Value? startTime, - Value? endTime, - Value? createdAt, - Value? updatedAt, - Value? rowid}) { + TransferRecordsCompanion copyWith({ + Value? id, + Value? sessionId, + Value? peerId, + Value? peerAlias, + Value? transport, + Value? direction, + Value? status, + Value? fileName, + Value? fileSize, + Value? transferredBytes, + Value? speed, + Value? mimeType, + Value? filePath, + Value? thumbnailPath, + Value? fileSha256, + Value? hashVerified, + Value? errorMessage, + Value? startTime, + Value? endTime, + Value? createdAt, + Value? updatedAt, + Value? rowid, + }) { return TransferRecordsCompanion( id: id ?? this.id, sessionId: sessionId ?? this.sessionId, @@ -9343,109 +11143,171 @@ class $PairingRecordsTable extends PairingRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _deviceIdMeta = - const VerificationMeta('deviceId'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _deviceIdMeta = const VerificationMeta( + 'deviceId', + ); @override late final GeneratedColumn deviceId = GeneratedColumn( - 'device_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'device_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _aliasMeta = const VerificationMeta('alias'); @override late final GeneratedColumn alias = GeneratedColumn( - 'alias', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _pairingMethodMeta = - const VerificationMeta('pairingMethod'); + 'alias', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _pairingMethodMeta = const VerificationMeta( + 'pairingMethod', + ); @override late final GeneratedColumn pairingMethod = GeneratedColumn( - 'pairing_method', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('lan')); - static const VerificationMeta _isTrustedMeta = - const VerificationMeta('isTrusted'); + 'pairing_method', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('lan'), + ); + static const VerificationMeta _isTrustedMeta = const VerificationMeta( + 'isTrusted', + ); @override late final GeneratedColumn isTrusted = GeneratedColumn( - 'is_trusted', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_trusted" IN (0, 1))'), - defaultValue: const Constant(false)); + 'is_trusted', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_trusted" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); static const VerificationMeta _ipMeta = const VerificationMeta('ip'); @override late final GeneratedColumn ip = GeneratedColumn( - 'ip', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); + 'ip', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); static const VerificationMeta _portMeta = const VerificationMeta('port'); @override late final GeneratedColumn port = GeneratedColumn( - 'port', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(53317)); - static const VerificationMeta _fingerprintMeta = - const VerificationMeta('fingerprint'); + 'port', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(53317), + ); + static const VerificationMeta _fingerprintMeta = const VerificationMeta( + 'fingerprint', + ); @override late final GeneratedColumn fingerprint = GeneratedColumn( - 'fingerprint', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _publicKeyMeta = - const VerificationMeta('publicKey'); + 'fingerprint', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _publicKeyMeta = const VerificationMeta( + 'publicKey', + ); @override late final GeneratedColumn publicKey = GeneratedColumn( - 'public_key', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _pairedAtMeta = - const VerificationMeta('pairedAt'); + 'public_key', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _pairedAtMeta = const VerificationMeta( + 'pairedAt', + ); @override late final GeneratedColumn pairedAt = GeneratedColumn( - 'paired_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _lastConnectedAtMeta = - const VerificationMeta('lastConnectedAt'); + 'paired_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + static const VerificationMeta _lastConnectedAtMeta = const VerificationMeta( + 'lastConnectedAt', + ); @override late final GeneratedColumn lastConnectedAt = - GeneratedColumn('last_connected_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + GeneratedColumn( + 'last_connected_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - deviceId, - alias, - pairingMethod, - isTrusted, - ip, - port, - fingerprint, - publicKey, - pairedAt, - lastConnectedAt, - createdAt, - updatedAt - ]; + id, + deviceId, + alias, + pairingMethod, + isTrusted, + ip, + port, + fingerprint, + publicKey, + pairedAt, + lastConnectedAt, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'pairing_records'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -9454,65 +11316,90 @@ class $PairingRecordsTable extends PairingRecords context.missing(_idMeta); } if (data.containsKey('device_id')) { - context.handle(_deviceIdMeta, - deviceId.isAcceptableOrUnknown(data['device_id']!, _deviceIdMeta)); + context.handle( + _deviceIdMeta, + deviceId.isAcceptableOrUnknown(data['device_id']!, _deviceIdMeta), + ); } else if (isInserting) { context.missing(_deviceIdMeta); } if (data.containsKey('alias')) { context.handle( - _aliasMeta, alias.isAcceptableOrUnknown(data['alias']!, _aliasMeta)); + _aliasMeta, + alias.isAcceptableOrUnknown(data['alias']!, _aliasMeta), + ); } else if (isInserting) { context.missing(_aliasMeta); } if (data.containsKey('pairing_method')) { context.handle( + _pairingMethodMeta, + pairingMethod.isAcceptableOrUnknown( + data['pairing_method']!, _pairingMethodMeta, - pairingMethod.isAcceptableOrUnknown( - data['pairing_method']!, _pairingMethodMeta)); + ), + ); } if (data.containsKey('is_trusted')) { - context.handle(_isTrustedMeta, - isTrusted.isAcceptableOrUnknown(data['is_trusted']!, _isTrustedMeta)); + context.handle( + _isTrustedMeta, + isTrusted.isAcceptableOrUnknown(data['is_trusted']!, _isTrustedMeta), + ); } if (data.containsKey('ip')) { context.handle(_ipMeta, ip.isAcceptableOrUnknown(data['ip']!, _ipMeta)); } if (data.containsKey('port')) { context.handle( - _portMeta, port.isAcceptableOrUnknown(data['port']!, _portMeta)); + _portMeta, + port.isAcceptableOrUnknown(data['port']!, _portMeta), + ); } if (data.containsKey('fingerprint')) { context.handle( + _fingerprintMeta, + fingerprint.isAcceptableOrUnknown( + data['fingerprint']!, _fingerprintMeta, - fingerprint.isAcceptableOrUnknown( - data['fingerprint']!, _fingerprintMeta)); + ), + ); } if (data.containsKey('public_key')) { - context.handle(_publicKeyMeta, - publicKey.isAcceptableOrUnknown(data['public_key']!, _publicKeyMeta)); + context.handle( + _publicKeyMeta, + publicKey.isAcceptableOrUnknown(data['public_key']!, _publicKeyMeta), + ); } if (data.containsKey('paired_at')) { - context.handle(_pairedAtMeta, - pairedAt.isAcceptableOrUnknown(data['paired_at']!, _pairedAtMeta)); + context.handle( + _pairedAtMeta, + pairedAt.isAcceptableOrUnknown(data['paired_at']!, _pairedAtMeta), + ); } else if (isInserting) { context.missing(_pairedAtMeta); } if (data.containsKey('last_connected_at')) { context.handle( + _lastConnectedAtMeta, + lastConnectedAt.isAcceptableOrUnknown( + data['last_connected_at']!, _lastConnectedAtMeta, - lastConnectedAt.isAcceptableOrUnknown( - data['last_connected_at']!, _lastConnectedAtMeta)); + ), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -9525,32 +11412,58 @@ class $PairingRecordsTable extends PairingRecords PairingRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return PairingRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - deviceId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}device_id'])!, - alias: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}alias'])!, - pairingMethod: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}pairing_method'])!, - isTrusted: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_trusted'])!, - ip: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}ip']), - port: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}port'])!, - fingerprint: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}fingerprint']), - publicKey: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}public_key']), - pairedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}paired_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + deviceId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}device_id'], + )!, + alias: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}alias'], + )!, + pairingMethod: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}pairing_method'], + )!, + isTrusted: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_trusted'], + )!, + ip: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}ip'], + ), + port: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}port'], + )!, + fingerprint: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}fingerprint'], + ), + publicKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}public_key'], + ), + pairedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}paired_at'], + )!, lastConnectedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, data['${effectivePrefix}last_connected_at']), - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + DriftSqlType.dateTime, + data['${effectivePrefix}last_connected_at'], + ), + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -9574,20 +11487,21 @@ class PairingRecord extends DataClass implements Insertable { final DateTime? lastConnectedAt; final DateTime createdAt; final DateTime updatedAt; - const PairingRecord( - {required this.id, - required this.deviceId, - required this.alias, - required this.pairingMethod, - required this.isTrusted, - this.ip, - required this.port, - this.fingerprint, - this.publicKey, - required this.pairedAt, - this.lastConnectedAt, - required this.createdAt, - required this.updatedAt}); + const PairingRecord({ + required this.id, + required this.deviceId, + required this.alias, + required this.pairingMethod, + required this.isTrusted, + this.ip, + required this.port, + this.fingerprint, + this.publicKey, + required this.pairedAt, + this.lastConnectedAt, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -9639,8 +11553,10 @@ class PairingRecord extends DataClass implements Insertable { ); } - factory PairingRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory PairingRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return PairingRecord( id: serializer.fromJson(json['id']), @@ -9678,37 +11594,37 @@ class PairingRecord extends DataClass implements Insertable { }; } - PairingRecord copyWith( - {String? id, - String? deviceId, - String? alias, - String? pairingMethod, - bool? isTrusted, - Value ip = const Value.absent(), - int? port, - Value fingerprint = const Value.absent(), - Value publicKey = const Value.absent(), - DateTime? pairedAt, - Value lastConnectedAt = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt}) => - PairingRecord( - id: id ?? this.id, - deviceId: deviceId ?? this.deviceId, - alias: alias ?? this.alias, - pairingMethod: pairingMethod ?? this.pairingMethod, - isTrusted: isTrusted ?? this.isTrusted, - ip: ip.present ? ip.value : this.ip, - port: port ?? this.port, - fingerprint: fingerprint.present ? fingerprint.value : this.fingerprint, - publicKey: publicKey.present ? publicKey.value : this.publicKey, - pairedAt: pairedAt ?? this.pairedAt, - lastConnectedAt: lastConnectedAt.present - ? lastConnectedAt.value - : this.lastConnectedAt, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + PairingRecord copyWith({ + String? id, + String? deviceId, + String? alias, + String? pairingMethod, + bool? isTrusted, + Value ip = const Value.absent(), + int? port, + Value fingerprint = const Value.absent(), + Value publicKey = const Value.absent(), + DateTime? pairedAt, + Value lastConnectedAt = const Value.absent(), + DateTime? createdAt, + DateTime? updatedAt, + }) => PairingRecord( + id: id ?? this.id, + deviceId: deviceId ?? this.deviceId, + alias: alias ?? this.alias, + pairingMethod: pairingMethod ?? this.pairingMethod, + isTrusted: isTrusted ?? this.isTrusted, + ip: ip.present ? ip.value : this.ip, + port: port ?? this.port, + fingerprint: fingerprint.present ? fingerprint.value : this.fingerprint, + publicKey: publicKey.present ? publicKey.value : this.publicKey, + pairedAt: pairedAt ?? this.pairedAt, + lastConnectedAt: lastConnectedAt.present + ? lastConnectedAt.value + : this.lastConnectedAt, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); PairingRecord copyWithCompanion(PairingRecordsCompanion data) { return PairingRecord( id: data.id.present ? data.id.value : this.id, @@ -9720,8 +11636,9 @@ class PairingRecord extends DataClass implements Insertable { isTrusted: data.isTrusted.present ? data.isTrusted.value : this.isTrusted, ip: data.ip.present ? data.ip.value : this.ip, port: data.port.present ? data.port.value : this.port, - fingerprint: - data.fingerprint.present ? data.fingerprint.value : this.fingerprint, + fingerprint: data.fingerprint.present + ? data.fingerprint.value + : this.fingerprint, publicKey: data.publicKey.present ? data.publicKey.value : this.publicKey, pairedAt: data.pairedAt.present ? data.pairedAt.value : this.pairedAt, lastConnectedAt: data.lastConnectedAt.present @@ -9754,19 +11671,20 @@ class PairingRecord extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, - deviceId, - alias, - pairingMethod, - isTrusted, - ip, - port, - fingerprint, - publicKey, - pairedAt, - lastConnectedAt, - createdAt, - updatedAt); + id, + deviceId, + alias, + pairingMethod, + isTrusted, + ip, + port, + fingerprint, + publicKey, + pairedAt, + lastConnectedAt, + createdAt, + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -9832,12 +11750,12 @@ class PairingRecordsCompanion extends UpdateCompanion { required DateTime createdAt, required DateTime updatedAt, this.rowid = const Value.absent(), - }) : id = Value(id), - deviceId = Value(deviceId), - alias = Value(alias), - pairedAt = Value(pairedAt), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : id = Value(id), + deviceId = Value(deviceId), + alias = Value(alias), + pairedAt = Value(pairedAt), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? deviceId, @@ -9872,21 +11790,22 @@ class PairingRecordsCompanion extends UpdateCompanion { }); } - PairingRecordsCompanion copyWith( - {Value? id, - Value? deviceId, - Value? alias, - Value? pairingMethod, - Value? isTrusted, - Value? ip, - Value? port, - Value? fingerprint, - Value? publicKey, - Value? pairedAt, - Value? lastConnectedAt, - Value? createdAt, - Value? updatedAt, - Value? rowid}) { + PairingRecordsCompanion copyWith({ + Value? id, + Value? deviceId, + Value? alias, + Value? pairingMethod, + Value? isTrusted, + Value? ip, + Value? port, + Value? fingerprint, + Value? publicKey, + Value? pairedAt, + Value? lastConnectedAt, + Value? createdAt, + Value? updatedAt, + Value? rowid, + }) { return PairingRecordsCompanion( id: id ?? this.id, deviceId: deviceId ?? this.deviceId, @@ -9984,178 +11903,291 @@ class $TransferMsgRecordsTable extends TransferMsgRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _sessionIdMeta = - const VerificationMeta('sessionId'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _sessionIdMeta = const VerificationMeta( + 'sessionId', + ); @override late final GeneratedColumn sessionId = GeneratedColumn( - 'session_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'session_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _typeMeta = const VerificationMeta('type'); @override late final GeneratedColumn type = GeneratedColumn( - 'type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('text')); - static const VerificationMeta _contentMeta = - const VerificationMeta('content'); + 'type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('text'), + ); + static const VerificationMeta _contentMeta = const VerificationMeta( + 'content', + ); @override late final GeneratedColumn content = GeneratedColumn( - 'content', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _isRemoteMeta = - const VerificationMeta('isRemote'); + 'content', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _isRemoteMeta = const VerificationMeta( + 'isRemote', + ); @override late final GeneratedColumn isRemote = GeneratedColumn( - 'is_remote', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_remote" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _peerDeviceIdMeta = - const VerificationMeta('peerDeviceId'); + 'is_remote', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_remote" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _peerDeviceIdMeta = const VerificationMeta( + 'peerDeviceId', + ); @override late final GeneratedColumn peerDeviceId = GeneratedColumn( - 'peer_device_id', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _transferTaskIdMeta = - const VerificationMeta('transferTaskId'); + 'peer_device_id', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _transferTaskIdMeta = const VerificationMeta( + 'transferTaskId', + ); @override late final GeneratedColumn transferTaskId = GeneratedColumn( - 'transfer_task_id', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _fileNameMeta = - const VerificationMeta('fileName'); + 'transfer_task_id', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _fileNameMeta = const VerificationMeta( + 'fileName', + ); @override late final GeneratedColumn fileName = GeneratedColumn( - 'file_name', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _fileSizeMeta = - const VerificationMeta('fileSize'); + 'file_name', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _fileSizeMeta = const VerificationMeta( + 'fileSize', + ); @override late final GeneratedColumn fileSize = GeneratedColumn( - 'file_size', aliasedName, true, - type: DriftSqlType.int, requiredDuringInsert: false); - static const VerificationMeta _mimeTypeMeta = - const VerificationMeta('mimeType'); + 'file_size', + aliasedName, + true, + type: DriftSqlType.int, + requiredDuringInsert: false, + ); + static const VerificationMeta _mimeTypeMeta = const VerificationMeta( + 'mimeType', + ); @override late final GeneratedColumn mimeType = GeneratedColumn( - 'mime_type', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _thumbnailPathMeta = - const VerificationMeta('thumbnailPath'); + 'mime_type', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _thumbnailPathMeta = const VerificationMeta( + 'thumbnailPath', + ); @override late final GeneratedColumn thumbnailPath = GeneratedColumn( - 'thumbnail_path', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _filePathMeta = - const VerificationMeta('filePath'); + 'thumbnail_path', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _filePathMeta = const VerificationMeta( + 'filePath', + ); @override late final GeneratedColumn filePath = GeneratedColumn( - 'file_path', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _progressMeta = - const VerificationMeta('progress'); + 'file_path', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _progressMeta = const VerificationMeta( + 'progress', + ); @override late final GeneratedColumn progress = GeneratedColumn( - 'progress', aliasedName, true, - type: DriftSqlType.double, requiredDuringInsert: false); - static const VerificationMeta _transferStatusMeta = - const VerificationMeta('transferStatus'); + 'progress', + aliasedName, + true, + type: DriftSqlType.double, + requiredDuringInsert: false, + ); + static const VerificationMeta _transferStatusMeta = const VerificationMeta( + 'transferStatus', + ); @override late final GeneratedColumn transferStatus = GeneratedColumn( - 'transfer_status', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _deviceAliasMeta = - const VerificationMeta('deviceAlias'); + 'transfer_status', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _deviceAliasMeta = const VerificationMeta( + 'deviceAlias', + ); @override late final GeneratedColumn deviceAlias = GeneratedColumn( - 'device_alias', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _deviceEmojiMeta = - const VerificationMeta('deviceEmoji'); + 'device_alias', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _deviceEmojiMeta = const VerificationMeta( + 'deviceEmoji', + ); @override late final GeneratedColumn deviceEmoji = GeneratedColumn( - 'device_emoji', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _deliveryStatusMeta = - const VerificationMeta('deliveryStatus'); + 'device_emoji', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _deliveryStatusMeta = const VerificationMeta( + 'deliveryStatus', + ); @override late final GeneratedColumn deliveryStatus = GeneratedColumn( - 'delivery_status', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _deliveredAtMeta = - const VerificationMeta('deliveredAt'); + 'delivery_status', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _deliveredAtMeta = const VerificationMeta( + 'deliveredAt', + ); @override late final GeneratedColumn deliveredAt = GeneratedColumn( - 'delivered_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + 'delivered_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); static const VerificationMeta _readAtMeta = const VerificationMeta('readAt'); @override late final GeneratedColumn readAt = GeneratedColumn( - 'read_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _voiceDurationMeta = - const VerificationMeta('voiceDuration'); + 'read_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + static const VerificationMeta _voiceDurationMeta = const VerificationMeta( + 'voiceDuration', + ); @override late final GeneratedColumn voiceDuration = GeneratedColumn( - 'voice_duration', aliasedName, true, - type: DriftSqlType.int, requiredDuringInsert: false); - static const VerificationMeta _voiceWaveformMeta = - const VerificationMeta('voiceWaveform'); + 'voice_duration', + aliasedName, + true, + type: DriftSqlType.int, + requiredDuringInsert: false, + ); + static const VerificationMeta _voiceWaveformMeta = const VerificationMeta( + 'voiceWaveform', + ); @override late final GeneratedColumn voiceWaveform = GeneratedColumn( - 'voice_waveform', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _timestampMeta = - const VerificationMeta('timestamp'); + 'voice_waveform', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _timestampMeta = const VerificationMeta( + 'timestamp', + ); @override late final GeneratedColumn timestamp = GeneratedColumn( - 'timestamp', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'timestamp', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - sessionId, - type, - content, - isRemote, - peerDeviceId, - transferTaskId, - fileName, - fileSize, - mimeType, - thumbnailPath, - filePath, - progress, - transferStatus, - deviceAlias, - deviceEmoji, - deliveryStatus, - deliveredAt, - readAt, - voiceDuration, - voiceWaveform, - timestamp, - createdAt - ]; + id, + sessionId, + type, + content, + isRemote, + peerDeviceId, + transferTaskId, + fileName, + fileSize, + mimeType, + thumbnailPath, + filePath, + progress, + transferStatus, + deviceAlias, + deviceEmoji, + deliveryStatus, + deliveredAt, + readAt, + voiceDuration, + voiceWaveform, + timestamp, + createdAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'transfer_msg_records'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -10164,118 +12196,172 @@ class $TransferMsgRecordsTable extends TransferMsgRecords context.missing(_idMeta); } if (data.containsKey('session_id')) { - context.handle(_sessionIdMeta, - sessionId.isAcceptableOrUnknown(data['session_id']!, _sessionIdMeta)); + context.handle( + _sessionIdMeta, + sessionId.isAcceptableOrUnknown(data['session_id']!, _sessionIdMeta), + ); } else if (isInserting) { context.missing(_sessionIdMeta); } if (data.containsKey('type')) { context.handle( - _typeMeta, type.isAcceptableOrUnknown(data['type']!, _typeMeta)); + _typeMeta, + type.isAcceptableOrUnknown(data['type']!, _typeMeta), + ); } if (data.containsKey('content')) { - context.handle(_contentMeta, - content.isAcceptableOrUnknown(data['content']!, _contentMeta)); + context.handle( + _contentMeta, + content.isAcceptableOrUnknown(data['content']!, _contentMeta), + ); } else if (isInserting) { context.missing(_contentMeta); } if (data.containsKey('is_remote')) { - context.handle(_isRemoteMeta, - isRemote.isAcceptableOrUnknown(data['is_remote']!, _isRemoteMeta)); + context.handle( + _isRemoteMeta, + isRemote.isAcceptableOrUnknown(data['is_remote']!, _isRemoteMeta), + ); } if (data.containsKey('peer_device_id')) { context.handle( + _peerDeviceIdMeta, + peerDeviceId.isAcceptableOrUnknown( + data['peer_device_id']!, _peerDeviceIdMeta, - peerDeviceId.isAcceptableOrUnknown( - data['peer_device_id']!, _peerDeviceIdMeta)); + ), + ); } if (data.containsKey('transfer_task_id')) { context.handle( + _transferTaskIdMeta, + transferTaskId.isAcceptableOrUnknown( + data['transfer_task_id']!, _transferTaskIdMeta, - transferTaskId.isAcceptableOrUnknown( - data['transfer_task_id']!, _transferTaskIdMeta)); + ), + ); } if (data.containsKey('file_name')) { - context.handle(_fileNameMeta, - fileName.isAcceptableOrUnknown(data['file_name']!, _fileNameMeta)); + context.handle( + _fileNameMeta, + fileName.isAcceptableOrUnknown(data['file_name']!, _fileNameMeta), + ); } if (data.containsKey('file_size')) { - context.handle(_fileSizeMeta, - fileSize.isAcceptableOrUnknown(data['file_size']!, _fileSizeMeta)); + context.handle( + _fileSizeMeta, + fileSize.isAcceptableOrUnknown(data['file_size']!, _fileSizeMeta), + ); } if (data.containsKey('mime_type')) { - context.handle(_mimeTypeMeta, - mimeType.isAcceptableOrUnknown(data['mime_type']!, _mimeTypeMeta)); + context.handle( + _mimeTypeMeta, + mimeType.isAcceptableOrUnknown(data['mime_type']!, _mimeTypeMeta), + ); } if (data.containsKey('thumbnail_path')) { context.handle( + _thumbnailPathMeta, + thumbnailPath.isAcceptableOrUnknown( + data['thumbnail_path']!, _thumbnailPathMeta, - thumbnailPath.isAcceptableOrUnknown( - data['thumbnail_path']!, _thumbnailPathMeta)); + ), + ); } if (data.containsKey('file_path')) { - context.handle(_filePathMeta, - filePath.isAcceptableOrUnknown(data['file_path']!, _filePathMeta)); + context.handle( + _filePathMeta, + filePath.isAcceptableOrUnknown(data['file_path']!, _filePathMeta), + ); } if (data.containsKey('progress')) { - context.handle(_progressMeta, - progress.isAcceptableOrUnknown(data['progress']!, _progressMeta)); + context.handle( + _progressMeta, + progress.isAcceptableOrUnknown(data['progress']!, _progressMeta), + ); } if (data.containsKey('transfer_status')) { context.handle( + _transferStatusMeta, + transferStatus.isAcceptableOrUnknown( + data['transfer_status']!, _transferStatusMeta, - transferStatus.isAcceptableOrUnknown( - data['transfer_status']!, _transferStatusMeta)); + ), + ); } if (data.containsKey('device_alias')) { context.handle( + _deviceAliasMeta, + deviceAlias.isAcceptableOrUnknown( + data['device_alias']!, _deviceAliasMeta, - deviceAlias.isAcceptableOrUnknown( - data['device_alias']!, _deviceAliasMeta)); + ), + ); } if (data.containsKey('device_emoji')) { context.handle( + _deviceEmojiMeta, + deviceEmoji.isAcceptableOrUnknown( + data['device_emoji']!, _deviceEmojiMeta, - deviceEmoji.isAcceptableOrUnknown( - data['device_emoji']!, _deviceEmojiMeta)); + ), + ); } if (data.containsKey('delivery_status')) { context.handle( + _deliveryStatusMeta, + deliveryStatus.isAcceptableOrUnknown( + data['delivery_status']!, _deliveryStatusMeta, - deliveryStatus.isAcceptableOrUnknown( - data['delivery_status']!, _deliveryStatusMeta)); + ), + ); } if (data.containsKey('delivered_at')) { context.handle( + _deliveredAtMeta, + deliveredAt.isAcceptableOrUnknown( + data['delivered_at']!, _deliveredAtMeta, - deliveredAt.isAcceptableOrUnknown( - data['delivered_at']!, _deliveredAtMeta)); + ), + ); } if (data.containsKey('read_at')) { - context.handle(_readAtMeta, - readAt.isAcceptableOrUnknown(data['read_at']!, _readAtMeta)); + context.handle( + _readAtMeta, + readAt.isAcceptableOrUnknown(data['read_at']!, _readAtMeta), + ); } if (data.containsKey('voice_duration')) { context.handle( + _voiceDurationMeta, + voiceDuration.isAcceptableOrUnknown( + data['voice_duration']!, _voiceDurationMeta, - voiceDuration.isAcceptableOrUnknown( - data['voice_duration']!, _voiceDurationMeta)); + ), + ); } if (data.containsKey('voice_waveform')) { context.handle( + _voiceWaveformMeta, + voiceWaveform.isAcceptableOrUnknown( + data['voice_waveform']!, _voiceWaveformMeta, - voiceWaveform.isAcceptableOrUnknown( - data['voice_waveform']!, _voiceWaveformMeta)); + ), + ); } if (data.containsKey('timestamp')) { - context.handle(_timestampMeta, - timestamp.isAcceptableOrUnknown(data['timestamp']!, _timestampMeta)); + context.handle( + _timestampMeta, + timestamp.isAcceptableOrUnknown(data['timestamp']!, _timestampMeta), + ); } else if (isInserting) { context.missing(_timestampMeta); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } @@ -10288,52 +12374,98 @@ class $TransferMsgRecordsTable extends TransferMsgRecords TransferMsgRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return TransferMsgRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - sessionId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}session_id'])!, - type: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}type'])!, - content: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content'])!, - isRemote: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_remote'])!, - peerDeviceId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}peer_device_id']), + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + sessionId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}session_id'], + )!, + type: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}type'], + )!, + content: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content'], + )!, + isRemote: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_remote'], + )!, + peerDeviceId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}peer_device_id'], + ), transferTaskId: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}transfer_task_id']), - fileName: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_name']), - fileSize: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}file_size']), - mimeType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}mime_type']), - thumbnailPath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path']), - filePath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_path']), - progress: attachedDatabase.typeMapping - .read(DriftSqlType.double, data['${effectivePrefix}progress']), - transferStatus: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}transfer_status']), - deviceAlias: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}device_alias']), - deviceEmoji: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}device_emoji']), - deliveryStatus: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}delivery_status']), - deliveredAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}delivered_at']), - readAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}read_at']), - voiceDuration: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}voice_duration']), - voiceWaveform: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}voice_waveform']), - timestamp: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}timestamp'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + DriftSqlType.string, + data['${effectivePrefix}transfer_task_id'], + ), + fileName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_name'], + ), + fileSize: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}file_size'], + ), + mimeType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}mime_type'], + ), + thumbnailPath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}thumbnail_path'], + ), + filePath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_path'], + ), + progress: attachedDatabase.typeMapping.read( + DriftSqlType.double, + data['${effectivePrefix}progress'], + ), + transferStatus: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}transfer_status'], + ), + deviceAlias: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}device_alias'], + ), + deviceEmoji: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}device_emoji'], + ), + deliveryStatus: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}delivery_status'], + ), + deliveredAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}delivered_at'], + ), + readAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}read_at'], + ), + voiceDuration: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}voice_duration'], + ), + voiceWaveform: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}voice_waveform'], + ), + timestamp: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}timestamp'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -10368,30 +12500,31 @@ class TransferMsgRecord extends DataClass final String? voiceWaveform; final DateTime timestamp; final DateTime createdAt; - const TransferMsgRecord( - {required this.id, - required this.sessionId, - required this.type, - required this.content, - required this.isRemote, - this.peerDeviceId, - this.transferTaskId, - this.fileName, - this.fileSize, - this.mimeType, - this.thumbnailPath, - this.filePath, - this.progress, - this.transferStatus, - this.deviceAlias, - this.deviceEmoji, - this.deliveryStatus, - this.deliveredAt, - this.readAt, - this.voiceDuration, - this.voiceWaveform, - required this.timestamp, - required this.createdAt}); + const TransferMsgRecord({ + required this.id, + required this.sessionId, + required this.type, + required this.content, + required this.isRemote, + this.peerDeviceId, + this.transferTaskId, + this.fileName, + this.fileSize, + this.mimeType, + this.thumbnailPath, + this.filePath, + this.progress, + this.transferStatus, + this.deviceAlias, + this.deviceEmoji, + this.deliveryStatus, + this.deliveredAt, + this.readAt, + this.voiceDuration, + this.voiceWaveform, + required this.timestamp, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -10499,8 +12632,9 @@ class TransferMsgRecord extends DataClass deliveredAt: deliveredAt == null && nullToAbsent ? const Value.absent() : Value(deliveredAt), - readAt: - readAt == null && nullToAbsent ? const Value.absent() : Value(readAt), + readAt: readAt == null && nullToAbsent + ? const Value.absent() + : Value(readAt), voiceDuration: voiceDuration == null && nullToAbsent ? const Value.absent() : Value(voiceDuration), @@ -10512,8 +12646,10 @@ class TransferMsgRecord extends DataClass ); } - factory TransferMsgRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory TransferMsgRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return TransferMsgRecord( id: serializer.fromJson(json['id']), @@ -10571,62 +12707,67 @@ class TransferMsgRecord extends DataClass }; } - TransferMsgRecord copyWith( - {String? id, - String? sessionId, - String? type, - String? content, - bool? isRemote, - Value peerDeviceId = const Value.absent(), - Value transferTaskId = const Value.absent(), - Value fileName = const Value.absent(), - Value fileSize = const Value.absent(), - Value mimeType = const Value.absent(), - Value thumbnailPath = const Value.absent(), - Value filePath = const Value.absent(), - Value progress = const Value.absent(), - Value transferStatus = const Value.absent(), - Value deviceAlias = const Value.absent(), - Value deviceEmoji = const Value.absent(), - Value deliveryStatus = const Value.absent(), - Value deliveredAt = const Value.absent(), - Value readAt = const Value.absent(), - Value voiceDuration = const Value.absent(), - Value voiceWaveform = const Value.absent(), - DateTime? timestamp, - DateTime? createdAt}) => - TransferMsgRecord( - id: id ?? this.id, - sessionId: sessionId ?? this.sessionId, - type: type ?? this.type, - content: content ?? this.content, - isRemote: isRemote ?? this.isRemote, - peerDeviceId: - peerDeviceId.present ? peerDeviceId.value : this.peerDeviceId, - transferTaskId: - transferTaskId.present ? transferTaskId.value : this.transferTaskId, - fileName: fileName.present ? fileName.value : this.fileName, - fileSize: fileSize.present ? fileSize.value : this.fileSize, - mimeType: mimeType.present ? mimeType.value : this.mimeType, - thumbnailPath: - thumbnailPath.present ? thumbnailPath.value : this.thumbnailPath, - filePath: filePath.present ? filePath.value : this.filePath, - progress: progress.present ? progress.value : this.progress, - transferStatus: - transferStatus.present ? transferStatus.value : this.transferStatus, - deviceAlias: deviceAlias.present ? deviceAlias.value : this.deviceAlias, - deviceEmoji: deviceEmoji.present ? deviceEmoji.value : this.deviceEmoji, - deliveryStatus: - deliveryStatus.present ? deliveryStatus.value : this.deliveryStatus, - deliveredAt: deliveredAt.present ? deliveredAt.value : this.deliveredAt, - readAt: readAt.present ? readAt.value : this.readAt, - voiceDuration: - voiceDuration.present ? voiceDuration.value : this.voiceDuration, - voiceWaveform: - voiceWaveform.present ? voiceWaveform.value : this.voiceWaveform, - timestamp: timestamp ?? this.timestamp, - createdAt: createdAt ?? this.createdAt, - ); + TransferMsgRecord copyWith({ + String? id, + String? sessionId, + String? type, + String? content, + bool? isRemote, + Value peerDeviceId = const Value.absent(), + Value transferTaskId = const Value.absent(), + Value fileName = const Value.absent(), + Value fileSize = const Value.absent(), + Value mimeType = const Value.absent(), + Value thumbnailPath = const Value.absent(), + Value filePath = const Value.absent(), + Value progress = const Value.absent(), + Value transferStatus = const Value.absent(), + Value deviceAlias = const Value.absent(), + Value deviceEmoji = const Value.absent(), + Value deliveryStatus = const Value.absent(), + Value deliveredAt = const Value.absent(), + Value readAt = const Value.absent(), + Value voiceDuration = const Value.absent(), + Value voiceWaveform = const Value.absent(), + DateTime? timestamp, + DateTime? createdAt, + }) => TransferMsgRecord( + id: id ?? this.id, + sessionId: sessionId ?? this.sessionId, + type: type ?? this.type, + content: content ?? this.content, + isRemote: isRemote ?? this.isRemote, + peerDeviceId: peerDeviceId.present ? peerDeviceId.value : this.peerDeviceId, + transferTaskId: transferTaskId.present + ? transferTaskId.value + : this.transferTaskId, + fileName: fileName.present ? fileName.value : this.fileName, + fileSize: fileSize.present ? fileSize.value : this.fileSize, + mimeType: mimeType.present ? mimeType.value : this.mimeType, + thumbnailPath: thumbnailPath.present + ? thumbnailPath.value + : this.thumbnailPath, + filePath: filePath.present ? filePath.value : this.filePath, + progress: progress.present ? progress.value : this.progress, + transferStatus: transferStatus.present + ? transferStatus.value + : this.transferStatus, + deviceAlias: deviceAlias.present ? deviceAlias.value : this.deviceAlias, + deviceEmoji: deviceEmoji.present ? deviceEmoji.value : this.deviceEmoji, + deliveryStatus: deliveryStatus.present + ? deliveryStatus.value + : this.deliveryStatus, + deliveredAt: deliveredAt.present ? deliveredAt.value : this.deliveredAt, + readAt: readAt.present ? readAt.value : this.readAt, + voiceDuration: voiceDuration.present + ? voiceDuration.value + : this.voiceDuration, + voiceWaveform: voiceWaveform.present + ? voiceWaveform.value + : this.voiceWaveform, + timestamp: timestamp ?? this.timestamp, + createdAt: createdAt ?? this.createdAt, + ); TransferMsgRecord copyWithCompanion(TransferMsgRecordsCompanion data) { return TransferMsgRecord( id: data.id.present ? data.id.value : this.id, @@ -10651,15 +12792,18 @@ class TransferMsgRecord extends DataClass transferStatus: data.transferStatus.present ? data.transferStatus.value : this.transferStatus, - deviceAlias: - data.deviceAlias.present ? data.deviceAlias.value : this.deviceAlias, - deviceEmoji: - data.deviceEmoji.present ? data.deviceEmoji.value : this.deviceEmoji, + deviceAlias: data.deviceAlias.present + ? data.deviceAlias.value + : this.deviceAlias, + deviceEmoji: data.deviceEmoji.present + ? data.deviceEmoji.value + : this.deviceEmoji, deliveryStatus: data.deliveryStatus.present ? data.deliveryStatus.value : this.deliveryStatus, - deliveredAt: - data.deliveredAt.present ? data.deliveredAt.value : this.deliveredAt, + deliveredAt: data.deliveredAt.present + ? data.deliveredAt.value + : this.deliveredAt, readAt: data.readAt.present ? data.readAt.value : this.readAt, voiceDuration: data.voiceDuration.present ? data.voiceDuration.value @@ -10704,30 +12848,30 @@ class TransferMsgRecord extends DataClass @override int get hashCode => Object.hashAll([ - id, - sessionId, - type, - content, - isRemote, - peerDeviceId, - transferTaskId, - fileName, - fileSize, - mimeType, - thumbnailPath, - filePath, - progress, - transferStatus, - deviceAlias, - deviceEmoji, - deliveryStatus, - deliveredAt, - readAt, - voiceDuration, - voiceWaveform, - timestamp, - createdAt - ]); + id, + sessionId, + type, + content, + isRemote, + peerDeviceId, + transferTaskId, + fileName, + fileSize, + mimeType, + thumbnailPath, + filePath, + progress, + transferStatus, + deviceAlias, + deviceEmoji, + deliveryStatus, + deliveredAt, + readAt, + voiceDuration, + voiceWaveform, + timestamp, + createdAt, + ]); @override bool operator ==(Object other) => identical(this, other) || @@ -10833,11 +12977,11 @@ class TransferMsgRecordsCompanion extends UpdateCompanion { required DateTime timestamp, required DateTime createdAt, this.rowid = const Value.absent(), - }) : id = Value(id), - sessionId = Value(sessionId), - content = Value(content), - timestamp = Value(timestamp), - createdAt = Value(createdAt); + }) : id = Value(id), + sessionId = Value(sessionId), + content = Value(content), + timestamp = Value(timestamp), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? sessionId, @@ -10892,31 +13036,32 @@ class TransferMsgRecordsCompanion extends UpdateCompanion { }); } - TransferMsgRecordsCompanion copyWith( - {Value? id, - Value? sessionId, - Value? type, - Value? content, - Value? isRemote, - Value? peerDeviceId, - Value? transferTaskId, - Value? fileName, - Value? fileSize, - Value? mimeType, - Value? thumbnailPath, - Value? filePath, - Value? progress, - Value? transferStatus, - Value? deviceAlias, - Value? deviceEmoji, - Value? deliveryStatus, - Value? deliveredAt, - Value? readAt, - Value? voiceDuration, - Value? voiceWaveform, - Value? timestamp, - Value? createdAt, - Value? rowid}) { + TransferMsgRecordsCompanion copyWith({ + Value? id, + Value? sessionId, + Value? type, + Value? content, + Value? isRemote, + Value? peerDeviceId, + Value? transferTaskId, + Value? fileName, + Value? fileSize, + Value? mimeType, + Value? thumbnailPath, + Value? filePath, + Value? progress, + Value? transferStatus, + Value? deviceAlias, + Value? deviceEmoji, + Value? deliveryStatus, + Value? deliveredAt, + Value? readAt, + Value? voiceDuration, + Value? voiceWaveform, + Value? timestamp, + Value? createdAt, + Value? rowid, + }) { return TransferMsgRecordsCompanion( id: id ?? this.id, sessionId: sessionId ?? this.sessionId, @@ -11064,134 +13209,209 @@ class $CloudCacheRecordsTable extends CloudCacheRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _fileNameMeta = - const VerificationMeta('fileName'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _fileNameMeta = const VerificationMeta( + 'fileName', + ); @override late final GeneratedColumn fileName = GeneratedColumn( - 'file_name', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _fileSizeMeta = - const VerificationMeta('fileSize'); + 'file_name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _fileSizeMeta = const VerificationMeta( + 'fileSize', + ); @override late final GeneratedColumn fileSize = GeneratedColumn( - 'file_size', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _mimeTypeMeta = - const VerificationMeta('mimeType'); + 'file_size', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _mimeTypeMeta = const VerificationMeta( + 'mimeType', + ); @override late final GeneratedColumn mimeType = GeneratedColumn( - 'mime_type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('application/octet-stream')); - static const VerificationMeta _localPathMeta = - const VerificationMeta('localPath'); + 'mime_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('application/octet-stream'), + ); + static const VerificationMeta _localPathMeta = const VerificationMeta( + 'localPath', + ); @override late final GeneratedColumn localPath = GeneratedColumn( - 'local_path', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _cloudUrlMeta = - const VerificationMeta('cloudUrl'); + 'local_path', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _cloudUrlMeta = const VerificationMeta( + 'cloudUrl', + ); @override late final GeneratedColumn cloudUrl = GeneratedColumn( - 'cloud_url', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _encryptionKeyMeta = - const VerificationMeta('encryptionKey'); + 'cloud_url', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _encryptionKeyMeta = const VerificationMeta( + 'encryptionKey', + ); @override late final GeneratedColumn encryptionKey = GeneratedColumn( - 'encryption_key', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); + 'encryption_key', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); static const VerificationMeta _ivMeta = const VerificationMeta('iv'); @override late final GeneratedColumn iv = GeneratedColumn( - 'iv', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false); - static const VerificationMeta _uploadStatusMeta = - const VerificationMeta('uploadStatus'); + 'iv', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + static const VerificationMeta _uploadStatusMeta = const VerificationMeta( + 'uploadStatus', + ); @override late final GeneratedColumn uploadStatus = GeneratedColumn( - 'upload_status', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('pending')); - static const VerificationMeta _downloadStatusMeta = - const VerificationMeta('downloadStatus'); + 'upload_status', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('pending'), + ); + static const VerificationMeta _downloadStatusMeta = const VerificationMeta( + 'downloadStatus', + ); @override late final GeneratedColumn downloadStatus = GeneratedColumn( - 'download_status', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('none')); - static const VerificationMeta _expiresAtMeta = - const VerificationMeta('expiresAt'); + 'download_status', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('none'), + ); + static const VerificationMeta _expiresAtMeta = const VerificationMeta( + 'expiresAt', + ); @override late final GeneratedColumn expiresAt = GeneratedColumn( - 'expires_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _uploadedAtMeta = - const VerificationMeta('uploadedAt'); + 'expires_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + static const VerificationMeta _uploadedAtMeta = const VerificationMeta( + 'uploadedAt', + ); @override late final GeneratedColumn uploadedAt = GeneratedColumn( - 'uploaded_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _downloadedAtMeta = - const VerificationMeta('downloadedAt'); + 'uploaded_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + static const VerificationMeta _downloadedAtMeta = const VerificationMeta( + 'downloadedAt', + ); @override late final GeneratedColumn downloadedAt = GeneratedColumn( - 'downloaded_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); - static const VerificationMeta _ownerIdMeta = - const VerificationMeta('ownerId'); + 'downloaded_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + static const VerificationMeta _ownerIdMeta = const VerificationMeta( + 'ownerId', + ); @override late final GeneratedColumn ownerId = GeneratedColumn( - 'owner_id', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'owner_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - fileName, - fileSize, - mimeType, - localPath, - cloudUrl, - encryptionKey, - iv, - uploadStatus, - downloadStatus, - expiresAt, - uploadedAt, - downloadedAt, - ownerId, - createdAt, - updatedAt - ]; + id, + fileName, + fileSize, + mimeType, + localPath, + cloudUrl, + encryptionKey, + iv, + uploadStatus, + downloadStatus, + expiresAt, + uploadedAt, + downloadedAt, + ownerId, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'cloud_cache_records'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -11200,77 +13420,107 @@ class $CloudCacheRecordsTable extends CloudCacheRecords context.missing(_idMeta); } if (data.containsKey('file_name')) { - context.handle(_fileNameMeta, - fileName.isAcceptableOrUnknown(data['file_name']!, _fileNameMeta)); + context.handle( + _fileNameMeta, + fileName.isAcceptableOrUnknown(data['file_name']!, _fileNameMeta), + ); } else if (isInserting) { context.missing(_fileNameMeta); } if (data.containsKey('file_size')) { - context.handle(_fileSizeMeta, - fileSize.isAcceptableOrUnknown(data['file_size']!, _fileSizeMeta)); + context.handle( + _fileSizeMeta, + fileSize.isAcceptableOrUnknown(data['file_size']!, _fileSizeMeta), + ); } if (data.containsKey('mime_type')) { - context.handle(_mimeTypeMeta, - mimeType.isAcceptableOrUnknown(data['mime_type']!, _mimeTypeMeta)); + context.handle( + _mimeTypeMeta, + mimeType.isAcceptableOrUnknown(data['mime_type']!, _mimeTypeMeta), + ); } if (data.containsKey('local_path')) { - context.handle(_localPathMeta, - localPath.isAcceptableOrUnknown(data['local_path']!, _localPathMeta)); + context.handle( + _localPathMeta, + localPath.isAcceptableOrUnknown(data['local_path']!, _localPathMeta), + ); } if (data.containsKey('cloud_url')) { - context.handle(_cloudUrlMeta, - cloudUrl.isAcceptableOrUnknown(data['cloud_url']!, _cloudUrlMeta)); + context.handle( + _cloudUrlMeta, + cloudUrl.isAcceptableOrUnknown(data['cloud_url']!, _cloudUrlMeta), + ); } if (data.containsKey('encryption_key')) { context.handle( + _encryptionKeyMeta, + encryptionKey.isAcceptableOrUnknown( + data['encryption_key']!, _encryptionKeyMeta, - encryptionKey.isAcceptableOrUnknown( - data['encryption_key']!, _encryptionKeyMeta)); + ), + ); } if (data.containsKey('iv')) { context.handle(_ivMeta, iv.isAcceptableOrUnknown(data['iv']!, _ivMeta)); } if (data.containsKey('upload_status')) { context.handle( + _uploadStatusMeta, + uploadStatus.isAcceptableOrUnknown( + data['upload_status']!, _uploadStatusMeta, - uploadStatus.isAcceptableOrUnknown( - data['upload_status']!, _uploadStatusMeta)); + ), + ); } if (data.containsKey('download_status')) { context.handle( + _downloadStatusMeta, + downloadStatus.isAcceptableOrUnknown( + data['download_status']!, _downloadStatusMeta, - downloadStatus.isAcceptableOrUnknown( - data['download_status']!, _downloadStatusMeta)); + ), + ); } if (data.containsKey('expires_at')) { - context.handle(_expiresAtMeta, - expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta)); + context.handle( + _expiresAtMeta, + expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta), + ); } if (data.containsKey('uploaded_at')) { context.handle( - _uploadedAtMeta, - uploadedAt.isAcceptableOrUnknown( - data['uploaded_at']!, _uploadedAtMeta)); + _uploadedAtMeta, + uploadedAt.isAcceptableOrUnknown(data['uploaded_at']!, _uploadedAtMeta), + ); } if (data.containsKey('downloaded_at')) { context.handle( + _downloadedAtMeta, + downloadedAt.isAcceptableOrUnknown( + data['downloaded_at']!, _downloadedAtMeta, - downloadedAt.isAcceptableOrUnknown( - data['downloaded_at']!, _downloadedAtMeta)); + ), + ); } if (data.containsKey('owner_id')) { - context.handle(_ownerIdMeta, - ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta)); + context.handle( + _ownerIdMeta, + ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -11283,38 +13533,70 @@ class $CloudCacheRecordsTable extends CloudCacheRecords CloudCacheRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return CloudCacheRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - fileName: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_name'])!, - fileSize: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}file_size'])!, - mimeType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}mime_type'])!, - localPath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}local_path']), - cloudUrl: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}cloud_url']), - encryptionKey: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}encryption_key']), - iv: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}iv']), - uploadStatus: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}upload_status'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + fileName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_name'], + )!, + fileSize: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}file_size'], + )!, + mimeType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}mime_type'], + )!, + localPath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}local_path'], + ), + cloudUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}cloud_url'], + ), + encryptionKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}encryption_key'], + ), + iv: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}iv'], + ), + uploadStatus: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}upload_status'], + )!, downloadStatus: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}download_status'])!, - expiresAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}expires_at']), - uploadedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}uploaded_at']), - downloadedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}downloaded_at']), - ownerId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}owner_id'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + DriftSqlType.string, + data['${effectivePrefix}download_status'], + )!, + expiresAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}expires_at'], + ), + uploadedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}uploaded_at'], + ), + downloadedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}downloaded_at'], + ), + ownerId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}owner_id'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -11342,23 +13624,24 @@ class CloudCacheRecord extends DataClass final String ownerId; final DateTime createdAt; final DateTime updatedAt; - const CloudCacheRecord( - {required this.id, - required this.fileName, - required this.fileSize, - required this.mimeType, - this.localPath, - this.cloudUrl, - this.encryptionKey, - this.iv, - required this.uploadStatus, - required this.downloadStatus, - this.expiresAt, - this.uploadedAt, - this.downloadedAt, - required this.ownerId, - required this.createdAt, - required this.updatedAt}); + const CloudCacheRecord({ + required this.id, + required this.fileName, + required this.fileSize, + required this.mimeType, + this.localPath, + this.cloudUrl, + this.encryptionKey, + this.iv, + required this.uploadStatus, + required this.downloadStatus, + this.expiresAt, + this.uploadedAt, + this.downloadedAt, + required this.ownerId, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -11428,8 +13711,10 @@ class CloudCacheRecord extends DataClass ); } - factory CloudCacheRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory CloudCacheRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return CloudCacheRecord( id: serializer.fromJson(json['id']), @@ -11473,43 +13758,43 @@ class CloudCacheRecord extends DataClass }; } - CloudCacheRecord copyWith( - {String? id, - String? fileName, - int? fileSize, - String? mimeType, - Value localPath = const Value.absent(), - Value cloudUrl = const Value.absent(), - Value encryptionKey = const Value.absent(), - Value iv = const Value.absent(), - String? uploadStatus, - String? downloadStatus, - Value expiresAt = const Value.absent(), - Value uploadedAt = const Value.absent(), - Value downloadedAt = const Value.absent(), - String? ownerId, - DateTime? createdAt, - DateTime? updatedAt}) => - CloudCacheRecord( - id: id ?? this.id, - fileName: fileName ?? this.fileName, - fileSize: fileSize ?? this.fileSize, - mimeType: mimeType ?? this.mimeType, - localPath: localPath.present ? localPath.value : this.localPath, - cloudUrl: cloudUrl.present ? cloudUrl.value : this.cloudUrl, - encryptionKey: - encryptionKey.present ? encryptionKey.value : this.encryptionKey, - iv: iv.present ? iv.value : this.iv, - uploadStatus: uploadStatus ?? this.uploadStatus, - downloadStatus: downloadStatus ?? this.downloadStatus, - expiresAt: expiresAt.present ? expiresAt.value : this.expiresAt, - uploadedAt: uploadedAt.present ? uploadedAt.value : this.uploadedAt, - downloadedAt: - downloadedAt.present ? downloadedAt.value : this.downloadedAt, - ownerId: ownerId ?? this.ownerId, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + CloudCacheRecord copyWith({ + String? id, + String? fileName, + int? fileSize, + String? mimeType, + Value localPath = const Value.absent(), + Value cloudUrl = const Value.absent(), + Value encryptionKey = const Value.absent(), + Value iv = const Value.absent(), + String? uploadStatus, + String? downloadStatus, + Value expiresAt = const Value.absent(), + Value uploadedAt = const Value.absent(), + Value downloadedAt = const Value.absent(), + String? ownerId, + DateTime? createdAt, + DateTime? updatedAt, + }) => CloudCacheRecord( + id: id ?? this.id, + fileName: fileName ?? this.fileName, + fileSize: fileSize ?? this.fileSize, + mimeType: mimeType ?? this.mimeType, + localPath: localPath.present ? localPath.value : this.localPath, + cloudUrl: cloudUrl.present ? cloudUrl.value : this.cloudUrl, + encryptionKey: encryptionKey.present + ? encryptionKey.value + : this.encryptionKey, + iv: iv.present ? iv.value : this.iv, + uploadStatus: uploadStatus ?? this.uploadStatus, + downloadStatus: downloadStatus ?? this.downloadStatus, + expiresAt: expiresAt.present ? expiresAt.value : this.expiresAt, + uploadedAt: uploadedAt.present ? uploadedAt.value : this.uploadedAt, + downloadedAt: downloadedAt.present ? downloadedAt.value : this.downloadedAt, + ownerId: ownerId ?? this.ownerId, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); CloudCacheRecord copyWithCompanion(CloudCacheRecordsCompanion data) { return CloudCacheRecord( id: data.id.present ? data.id.value : this.id, @@ -11529,8 +13814,9 @@ class CloudCacheRecord extends DataClass ? data.downloadStatus.value : this.downloadStatus, expiresAt: data.expiresAt.present ? data.expiresAt.value : this.expiresAt, - uploadedAt: - data.uploadedAt.present ? data.uploadedAt.value : this.uploadedAt, + uploadedAt: data.uploadedAt.present + ? data.uploadedAt.value + : this.uploadedAt, downloadedAt: data.downloadedAt.present ? data.downloadedAt.value : this.downloadedAt, @@ -11565,22 +13851,23 @@ class CloudCacheRecord extends DataClass @override int get hashCode => Object.hash( - id, - fileName, - fileSize, - mimeType, - localPath, - cloudUrl, - encryptionKey, - iv, - uploadStatus, - downloadStatus, - expiresAt, - uploadedAt, - downloadedAt, - ownerId, - createdAt, - updatedAt); + id, + fileName, + fileSize, + mimeType, + localPath, + cloudUrl, + encryptionKey, + iv, + uploadStatus, + downloadStatus, + expiresAt, + uploadedAt, + downloadedAt, + ownerId, + createdAt, + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -11658,10 +13945,10 @@ class CloudCacheRecordsCompanion extends UpdateCompanion { required DateTime createdAt, required DateTime updatedAt, this.rowid = const Value.absent(), - }) : id = Value(id), - fileName = Value(fileName), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : id = Value(id), + fileName = Value(fileName), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? fileName, @@ -11702,24 +13989,25 @@ class CloudCacheRecordsCompanion extends UpdateCompanion { }); } - CloudCacheRecordsCompanion copyWith( - {Value? id, - Value? fileName, - Value? fileSize, - Value? mimeType, - Value? localPath, - Value? cloudUrl, - Value? encryptionKey, - Value? iv, - Value? uploadStatus, - Value? downloadStatus, - Value? expiresAt, - Value? uploadedAt, - Value? downloadedAt, - Value? ownerId, - Value? createdAt, - Value? updatedAt, - Value? rowid}) { + CloudCacheRecordsCompanion copyWith({ + Value? id, + Value? fileName, + Value? fileSize, + Value? mimeType, + Value? localPath, + Value? cloudUrl, + Value? encryptionKey, + Value? iv, + Value? uploadStatus, + Value? downloadStatus, + Value? expiresAt, + Value? uploadedAt, + Value? downloadedAt, + Value? ownerId, + Value? createdAt, + Value? updatedAt, + Value? rowid, + }) { return CloudCacheRecordsCompanion( id: id ?? this.id, fileName: fileName ?? this.fileName, @@ -11832,74 +14120,106 @@ class $TransferStatsRecordsTable extends TransferStatsRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + 'id', + aliasedName, + false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'PRIMARY KEY AUTOINCREMENT', + ), + ); static const VerificationMeta _dateMeta = const VerificationMeta('date'); @override late final GeneratedColumn date = GeneratedColumn( - 'date', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _totalSentBytesMeta = - const VerificationMeta('totalSentBytes'); + 'date', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _totalSentBytesMeta = const VerificationMeta( + 'totalSentBytes', + ); @override late final GeneratedColumn totalSentBytes = GeneratedColumn( - 'total_sent_bytes', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); + 'total_sent_bytes', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); static const VerificationMeta _totalReceivedBytesMeta = const VerificationMeta('totalReceivedBytes'); @override late final GeneratedColumn totalReceivedBytes = GeneratedColumn( - 'total_received_bytes', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _fileCountMeta = - const VerificationMeta('fileCount'); + 'total_received_bytes', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _fileCountMeta = const VerificationMeta( + 'fileCount', + ); @override late final GeneratedColumn fileCount = GeneratedColumn( - 'file_count', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _avgSpeedMeta = - const VerificationMeta('avgSpeed'); + 'file_count', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _avgSpeedMeta = const VerificationMeta( + 'avgSpeed', + ); @override late final GeneratedColumn avgSpeed = GeneratedColumn( - 'avg_speed', aliasedName, false, - type: DriftSqlType.double, - requiredDuringInsert: false, - defaultValue: const Constant(0.0)); - static const VerificationMeta _transportTypeMeta = - const VerificationMeta('transportType'); + 'avg_speed', + aliasedName, + false, + type: DriftSqlType.double, + requiredDuringInsert: false, + defaultValue: const Constant(0.0), + ); + static const VerificationMeta _transportTypeMeta = const VerificationMeta( + 'transportType', + ); @override late final GeneratedColumn transportType = GeneratedColumn( - 'transport_type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('all')); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'transport_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('all'), + ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - date, - totalSentBytes, - totalReceivedBytes, - fileCount, - avgSpeed, - transportType, - createdAt - ]; + id, + date, + totalSentBytes, + totalReceivedBytes, + fileCount, + avgSpeed, + transportType, + createdAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -11907,8 +14227,9 @@ class $TransferStatsRecordsTable extends TransferStatsRecords static const String $name = 'transfer_stats_records'; @override VerificationContext validateIntegrity( - Insertable instance, - {bool isInserting = false}) { + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -11916,39 +14237,56 @@ class $TransferStatsRecordsTable extends TransferStatsRecords } if (data.containsKey('date')) { context.handle( - _dateMeta, date.isAcceptableOrUnknown(data['date']!, _dateMeta)); + _dateMeta, + date.isAcceptableOrUnknown(data['date']!, _dateMeta), + ); } else if (isInserting) { context.missing(_dateMeta); } if (data.containsKey('total_sent_bytes')) { context.handle( + _totalSentBytesMeta, + totalSentBytes.isAcceptableOrUnknown( + data['total_sent_bytes']!, _totalSentBytesMeta, - totalSentBytes.isAcceptableOrUnknown( - data['total_sent_bytes']!, _totalSentBytesMeta)); + ), + ); } if (data.containsKey('total_received_bytes')) { context.handle( + _totalReceivedBytesMeta, + totalReceivedBytes.isAcceptableOrUnknown( + data['total_received_bytes']!, _totalReceivedBytesMeta, - totalReceivedBytes.isAcceptableOrUnknown( - data['total_received_bytes']!, _totalReceivedBytesMeta)); + ), + ); } if (data.containsKey('file_count')) { - context.handle(_fileCountMeta, - fileCount.isAcceptableOrUnknown(data['file_count']!, _fileCountMeta)); + context.handle( + _fileCountMeta, + fileCount.isAcceptableOrUnknown(data['file_count']!, _fileCountMeta), + ); } if (data.containsKey('avg_speed')) { - context.handle(_avgSpeedMeta, - avgSpeed.isAcceptableOrUnknown(data['avg_speed']!, _avgSpeedMeta)); + context.handle( + _avgSpeedMeta, + avgSpeed.isAcceptableOrUnknown(data['avg_speed']!, _avgSpeedMeta), + ); } if (data.containsKey('transport_type')) { context.handle( + _transportTypeMeta, + transportType.isAcceptableOrUnknown( + data['transport_type']!, _transportTypeMeta, - transportType.isAcceptableOrUnknown( - data['transport_type']!, _transportTypeMeta)); + ), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } @@ -11961,22 +14299,38 @@ class $TransferStatsRecordsTable extends TransferStatsRecords TransferStatsRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return TransferStatsRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - date: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}date'])!, - totalSentBytes: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}total_sent_bytes'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + date: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}date'], + )!, + totalSentBytes: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}total_sent_bytes'], + )!, totalReceivedBytes: attachedDatabase.typeMapping.read( - DriftSqlType.int, data['${effectivePrefix}total_received_bytes'])!, - fileCount: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}file_count'])!, - avgSpeed: attachedDatabase.typeMapping - .read(DriftSqlType.double, data['${effectivePrefix}avg_speed'])!, - transportType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}transport_type'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + DriftSqlType.int, + data['${effectivePrefix}total_received_bytes'], + )!, + fileCount: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}file_count'], + )!, + avgSpeed: attachedDatabase.typeMapping.read( + DriftSqlType.double, + data['${effectivePrefix}avg_speed'], + )!, + transportType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}transport_type'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -11996,15 +14350,16 @@ class TransferStatsRecord extends DataClass final double avgSpeed; final String transportType; final DateTime createdAt; - const TransferStatsRecord( - {required this.id, - required this.date, - required this.totalSentBytes, - required this.totalReceivedBytes, - required this.fileCount, - required this.avgSpeed, - required this.transportType, - required this.createdAt}); + const TransferStatsRecord({ + required this.id, + required this.date, + required this.totalSentBytes, + required this.totalReceivedBytes, + required this.fileCount, + required this.avgSpeed, + required this.transportType, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -12032,8 +14387,10 @@ class TransferStatsRecord extends DataClass ); } - factory TransferStatsRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory TransferStatsRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return TransferStatsRecord( id: serializer.fromJson(json['id']), @@ -12061,25 +14418,25 @@ class TransferStatsRecord extends DataClass }; } - TransferStatsRecord copyWith( - {int? id, - String? date, - int? totalSentBytes, - int? totalReceivedBytes, - int? fileCount, - double? avgSpeed, - String? transportType, - DateTime? createdAt}) => - TransferStatsRecord( - id: id ?? this.id, - date: date ?? this.date, - totalSentBytes: totalSentBytes ?? this.totalSentBytes, - totalReceivedBytes: totalReceivedBytes ?? this.totalReceivedBytes, - fileCount: fileCount ?? this.fileCount, - avgSpeed: avgSpeed ?? this.avgSpeed, - transportType: transportType ?? this.transportType, - createdAt: createdAt ?? this.createdAt, - ); + TransferStatsRecord copyWith({ + int? id, + String? date, + int? totalSentBytes, + int? totalReceivedBytes, + int? fileCount, + double? avgSpeed, + String? transportType, + DateTime? createdAt, + }) => TransferStatsRecord( + id: id ?? this.id, + date: date ?? this.date, + totalSentBytes: totalSentBytes ?? this.totalSentBytes, + totalReceivedBytes: totalReceivedBytes ?? this.totalReceivedBytes, + fileCount: fileCount ?? this.fileCount, + avgSpeed: avgSpeed ?? this.avgSpeed, + transportType: transportType ?? this.transportType, + createdAt: createdAt ?? this.createdAt, + ); TransferStatsRecord copyWithCompanion(TransferStatsRecordsCompanion data) { return TransferStatsRecord( id: data.id.present ? data.id.value : this.id, @@ -12115,8 +14472,16 @@ class TransferStatsRecord extends DataClass } @override - int get hashCode => Object.hash(id, date, totalSentBytes, totalReceivedBytes, - fileCount, avgSpeed, transportType, createdAt); + int get hashCode => Object.hash( + id, + date, + totalSentBytes, + totalReceivedBytes, + fileCount, + avgSpeed, + transportType, + createdAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -12160,8 +14525,8 @@ class TransferStatsRecordsCompanion this.avgSpeed = const Value.absent(), this.transportType = const Value.absent(), required DateTime createdAt, - }) : date = Value(date), - createdAt = Value(createdAt); + }) : date = Value(date), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? date, @@ -12185,15 +14550,16 @@ class TransferStatsRecordsCompanion }); } - TransferStatsRecordsCompanion copyWith( - {Value? id, - Value? date, - Value? totalSentBytes, - Value? totalReceivedBytes, - Value? fileCount, - Value? avgSpeed, - Value? transportType, - Value? createdAt}) { + TransferStatsRecordsCompanion copyWith({ + Value? id, + Value? date, + Value? totalSentBytes, + Value? totalReceivedBytes, + Value? fileCount, + Value? avgSpeed, + Value? transportType, + Value? createdAt, + }) { return TransferStatsRecordsCompanion( id: id ?? this.id, date: date ?? this.date, @@ -12261,65 +14627,105 @@ class $ClipboardRecordsTable extends ClipboardRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _contentMeta = - const VerificationMeta('content'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _contentMeta = const VerificationMeta( + 'content', + ); @override late final GeneratedColumn content = GeneratedColumn( - 'content', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _contentTypeMeta = - const VerificationMeta('contentType'); + 'content', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _contentTypeMeta = const VerificationMeta( + 'contentType', + ); @override late final GeneratedColumn contentType = GeneratedColumn( - 'content_type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('text')); - static const VerificationMeta _sourceDeviceMeta = - const VerificationMeta('sourceDevice'); + 'content_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('text'), + ); + static const VerificationMeta _sourceDeviceMeta = const VerificationMeta( + 'sourceDevice', + ); @override late final GeneratedColumn sourceDevice = GeneratedColumn( - 'source_device', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _deviceIdMeta = - const VerificationMeta('deviceId'); + 'source_device', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _deviceIdMeta = const VerificationMeta( + 'deviceId', + ); @override late final GeneratedColumn deviceId = GeneratedColumn( - 'device_id', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _isPinnedMeta = - const VerificationMeta('isPinned'); + 'device_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _isPinnedMeta = const VerificationMeta( + 'isPinned', + ); @override late final GeneratedColumn isPinned = GeneratedColumn( - 'is_pinned', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_pinned" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'is_pinned', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_pinned" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override - List get $columns => - [id, content, contentType, sourceDevice, deviceId, isPinned, createdAt]; + List get $columns => [ + id, + content, + contentType, + sourceDevice, + deviceId, + isPinned, + createdAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'clipboard_records'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -12328,34 +14734,48 @@ class $ClipboardRecordsTable extends ClipboardRecords context.missing(_idMeta); } if (data.containsKey('content')) { - context.handle(_contentMeta, - content.isAcceptableOrUnknown(data['content']!, _contentMeta)); + context.handle( + _contentMeta, + content.isAcceptableOrUnknown(data['content']!, _contentMeta), + ); } else if (isInserting) { context.missing(_contentMeta); } if (data.containsKey('content_type')) { context.handle( + _contentTypeMeta, + contentType.isAcceptableOrUnknown( + data['content_type']!, _contentTypeMeta, - contentType.isAcceptableOrUnknown( - data['content_type']!, _contentTypeMeta)); + ), + ); } if (data.containsKey('source_device')) { context.handle( + _sourceDeviceMeta, + sourceDevice.isAcceptableOrUnknown( + data['source_device']!, _sourceDeviceMeta, - sourceDevice.isAcceptableOrUnknown( - data['source_device']!, _sourceDeviceMeta)); + ), + ); } if (data.containsKey('device_id')) { - context.handle(_deviceIdMeta, - deviceId.isAcceptableOrUnknown(data['device_id']!, _deviceIdMeta)); + context.handle( + _deviceIdMeta, + deviceId.isAcceptableOrUnknown(data['device_id']!, _deviceIdMeta), + ); } if (data.containsKey('is_pinned')) { - context.handle(_isPinnedMeta, - isPinned.isAcceptableOrUnknown(data['is_pinned']!, _isPinnedMeta)); + context.handle( + _isPinnedMeta, + isPinned.isAcceptableOrUnknown(data['is_pinned']!, _isPinnedMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } @@ -12368,20 +14788,34 @@ class $ClipboardRecordsTable extends ClipboardRecords ClipboardRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ClipboardRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - content: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content'])!, - contentType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}content_type'])!, - sourceDevice: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}source_device'])!, - deviceId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}device_id'])!, - isPinned: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_pinned'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + content: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content'], + )!, + contentType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}content_type'], + )!, + sourceDevice: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}source_device'], + )!, + deviceId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}device_id'], + )!, + isPinned: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_pinned'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -12399,14 +14833,15 @@ class ClipboardRecord extends DataClass implements Insertable { final String deviceId; final bool isPinned; final DateTime createdAt; - const ClipboardRecord( - {required this.id, - required this.content, - required this.contentType, - required this.sourceDevice, - required this.deviceId, - required this.isPinned, - required this.createdAt}); + const ClipboardRecord({ + required this.id, + required this.content, + required this.contentType, + required this.sourceDevice, + required this.deviceId, + required this.isPinned, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -12432,8 +14867,10 @@ class ClipboardRecord extends DataClass implements Insertable { ); } - factory ClipboardRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory ClipboardRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ClipboardRecord( id: serializer.fromJson(json['id']), @@ -12459,29 +14896,30 @@ class ClipboardRecord extends DataClass implements Insertable { }; } - ClipboardRecord copyWith( - {String? id, - String? content, - String? contentType, - String? sourceDevice, - String? deviceId, - bool? isPinned, - DateTime? createdAt}) => - ClipboardRecord( - id: id ?? this.id, - content: content ?? this.content, - contentType: contentType ?? this.contentType, - sourceDevice: sourceDevice ?? this.sourceDevice, - deviceId: deviceId ?? this.deviceId, - isPinned: isPinned ?? this.isPinned, - createdAt: createdAt ?? this.createdAt, - ); + ClipboardRecord copyWith({ + String? id, + String? content, + String? contentType, + String? sourceDevice, + String? deviceId, + bool? isPinned, + DateTime? createdAt, + }) => ClipboardRecord( + id: id ?? this.id, + content: content ?? this.content, + contentType: contentType ?? this.contentType, + sourceDevice: sourceDevice ?? this.sourceDevice, + deviceId: deviceId ?? this.deviceId, + isPinned: isPinned ?? this.isPinned, + createdAt: createdAt ?? this.createdAt, + ); ClipboardRecord copyWithCompanion(ClipboardRecordsCompanion data) { return ClipboardRecord( id: data.id.present ? data.id.value : this.id, content: data.content.present ? data.content.value : this.content, - contentType: - data.contentType.present ? data.contentType.value : this.contentType, + contentType: data.contentType.present + ? data.contentType.value + : this.contentType, sourceDevice: data.sourceDevice.present ? data.sourceDevice.value : this.sourceDevice, @@ -12507,7 +14945,14 @@ class ClipboardRecord extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, content, contentType, sourceDevice, deviceId, isPinned, createdAt); + id, + content, + contentType, + sourceDevice, + deviceId, + isPinned, + createdAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -12549,9 +14994,9 @@ class ClipboardRecordsCompanion extends UpdateCompanion { this.isPinned = const Value.absent(), required DateTime createdAt, this.rowid = const Value.absent(), - }) : id = Value(id), - content = Value(content), - createdAt = Value(createdAt); + }) : id = Value(id), + content = Value(content), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? content, @@ -12574,15 +15019,16 @@ class ClipboardRecordsCompanion extends UpdateCompanion { }); } - ClipboardRecordsCompanion copyWith( - {Value? id, - Value? content, - Value? contentType, - Value? sourceDevice, - Value? deviceId, - Value? isPinned, - Value? createdAt, - Value? rowid}) { + ClipboardRecordsCompanion copyWith({ + Value? id, + Value? content, + Value? contentType, + Value? sourceDevice, + Value? deviceId, + Value? isPinned, + Value? createdAt, + Value? rowid, + }) { return ClipboardRecordsCompanion( id: id ?? this.id, content: content ?? this.content, @@ -12650,66 +15096,108 @@ class $CanvasDocumentsTable extends CanvasDocuments static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _nameMeta = const VerificationMeta('name'); @override late final GeneratedColumn name = GeneratedColumn( - 'name', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _ownerIdMeta = - const VerificationMeta('ownerId'); + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _ownerIdMeta = const VerificationMeta( + 'ownerId', + ); @override late final GeneratedColumn ownerId = GeneratedColumn( - 'owner_id', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); + 'owner_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); static const VerificationMeta _widthMeta = const VerificationMeta('width'); @override late final GeneratedColumn width = GeneratedColumn( - 'width', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(1920)); + 'width', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(1920), + ); static const VerificationMeta _heightMeta = const VerificationMeta('height'); @override late final GeneratedColumn height = GeneratedColumn( - 'height', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(1080)); - static const VerificationMeta _backgroundJsonMeta = - const VerificationMeta('backgroundJson'); + 'height', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(1080), + ); + static const VerificationMeta _backgroundJsonMeta = const VerificationMeta( + 'backgroundJson', + ); @override late final GeneratedColumn backgroundJson = GeneratedColumn( - 'background_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('{}')); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'background_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('{}'), + ); + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override - List get $columns => - [id, name, ownerId, width, height, backgroundJson, createdAt, updatedAt]; + List get $columns => [ + id, + name, + ownerId, + width, + height, + backgroundJson, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'canvas_documents'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -12719,37 +15207,52 @@ class $CanvasDocumentsTable extends CanvasDocuments } if (data.containsKey('name')) { context.handle( - _nameMeta, name.isAcceptableOrUnknown(data['name']!, _nameMeta)); + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); } else if (isInserting) { context.missing(_nameMeta); } if (data.containsKey('owner_id')) { - context.handle(_ownerIdMeta, - ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta)); + context.handle( + _ownerIdMeta, + ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta), + ); } if (data.containsKey('width')) { context.handle( - _widthMeta, width.isAcceptableOrUnknown(data['width']!, _widthMeta)); + _widthMeta, + width.isAcceptableOrUnknown(data['width']!, _widthMeta), + ); } if (data.containsKey('height')) { - context.handle(_heightMeta, - height.isAcceptableOrUnknown(data['height']!, _heightMeta)); + context.handle( + _heightMeta, + height.isAcceptableOrUnknown(data['height']!, _heightMeta), + ); } if (data.containsKey('background_json')) { context.handle( + _backgroundJsonMeta, + backgroundJson.isAcceptableOrUnknown( + data['background_json']!, _backgroundJsonMeta, - backgroundJson.isAcceptableOrUnknown( - data['background_json']!, _backgroundJsonMeta)); + ), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -12762,22 +15265,38 @@ class $CanvasDocumentsTable extends CanvasDocuments CanvasDocument map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return CanvasDocument( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - name: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}name'])!, - ownerId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}owner_id'])!, - width: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}width'])!, - height: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}height'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + ownerId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}owner_id'], + )!, + width: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}width'], + )!, + height: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}height'], + )!, backgroundJson: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}background_json'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + DriftSqlType.string, + data['${effectivePrefix}background_json'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -12796,15 +15315,16 @@ class CanvasDocument extends DataClass implements Insertable { final String backgroundJson; final DateTime createdAt; final DateTime updatedAt; - const CanvasDocument( - {required this.id, - required this.name, - required this.ownerId, - required this.width, - required this.height, - required this.backgroundJson, - required this.createdAt, - required this.updatedAt}); + const CanvasDocument({ + required this.id, + required this.name, + required this.ownerId, + required this.width, + required this.height, + required this.backgroundJson, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -12832,8 +15352,10 @@ class CanvasDocument extends DataClass implements Insertable { ); } - factory CanvasDocument.fromJson(Map json, - {ValueSerializer? serializer}) { + factory CanvasDocument.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return CanvasDocument( id: serializer.fromJson(json['id']), @@ -12861,25 +15383,25 @@ class CanvasDocument extends DataClass implements Insertable { }; } - CanvasDocument copyWith( - {String? id, - String? name, - String? ownerId, - int? width, - int? height, - String? backgroundJson, - DateTime? createdAt, - DateTime? updatedAt}) => - CanvasDocument( - id: id ?? this.id, - name: name ?? this.name, - ownerId: ownerId ?? this.ownerId, - width: width ?? this.width, - height: height ?? this.height, - backgroundJson: backgroundJson ?? this.backgroundJson, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + CanvasDocument copyWith({ + String? id, + String? name, + String? ownerId, + int? width, + int? height, + String? backgroundJson, + DateTime? createdAt, + DateTime? updatedAt, + }) => CanvasDocument( + id: id ?? this.id, + name: name ?? this.name, + ownerId: ownerId ?? this.ownerId, + width: width ?? this.width, + height: height ?? this.height, + backgroundJson: backgroundJson ?? this.backgroundJson, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); CanvasDocument copyWithCompanion(CanvasDocumentsCompanion data) { return CanvasDocument( id: data.id.present ? data.id.value : this.id, @@ -12912,7 +15434,15 @@ class CanvasDocument extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, name, ownerId, width, height, backgroundJson, createdAt, updatedAt); + id, + name, + ownerId, + width, + height, + backgroundJson, + createdAt, + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -12958,10 +15488,10 @@ class CanvasDocumentsCompanion extends UpdateCompanion { required DateTime createdAt, required DateTime updatedAt, this.rowid = const Value.absent(), - }) : id = Value(id), - name = Value(name), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : id = Value(id), + name = Value(name), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? name, @@ -12986,16 +15516,17 @@ class CanvasDocumentsCompanion extends UpdateCompanion { }); } - CanvasDocumentsCompanion copyWith( - {Value? id, - Value? name, - Value? ownerId, - Value? width, - Value? height, - Value? backgroundJson, - Value? createdAt, - Value? updatedAt, - Value? rowid}) { + CanvasDocumentsCompanion copyWith({ + Value? id, + Value? name, + Value? ownerId, + Value? width, + Value? height, + Value? backgroundJson, + Value? createdAt, + Value? updatedAt, + Value? rowid, + }) { return CanvasDocumentsCompanion( id: id ?? this.id, name: name ?? this.name, @@ -13068,73 +15599,109 @@ class $CanvasStrokesTable extends CanvasStrokes static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _documentIdMeta = - const VerificationMeta('documentId'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _documentIdMeta = const VerificationMeta( + 'documentId', + ); @override late final GeneratedColumn documentId = GeneratedColumn( - 'document_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'document_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override late final GeneratedColumn userId = GeneratedColumn( - 'user_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _pointsJsonMeta = - const VerificationMeta('pointsJson'); + 'user_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _pointsJsonMeta = const VerificationMeta( + 'pointsJson', + ); @override late final GeneratedColumn pointsJson = GeneratedColumn( - 'points_json', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'points_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _colorMeta = const VerificationMeta('color'); @override late final GeneratedColumn color = GeneratedColumn( - 'color', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('#000000')); - static const VerificationMeta _strokeWidthMeta = - const VerificationMeta('strokeWidth'); + 'color', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('#000000'), + ); + static const VerificationMeta _strokeWidthMeta = const VerificationMeta( + 'strokeWidth', + ); @override late final GeneratedColumn strokeWidth = GeneratedColumn( - 'stroke_width', aliasedName, false, - type: DriftSqlType.double, - requiredDuringInsert: false, - defaultValue: const Constant(2.0)); - static const VerificationMeta _toolTypeMeta = - const VerificationMeta('toolType'); + 'stroke_width', + aliasedName, + false, + type: DriftSqlType.double, + requiredDuringInsert: false, + defaultValue: const Constant(2.0), + ); + static const VerificationMeta _toolTypeMeta = const VerificationMeta( + 'toolType', + ); @override late final GeneratedColumn toolType = GeneratedColumn( - 'tool_type', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('pen')); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'tool_type', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('pen'), + ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - documentId, - userId, - pointsJson, - color, - strokeWidth, - toolType, - createdAt - ]; + id, + documentId, + userId, + pointsJson, + color, + strokeWidth, + toolType, + createdAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'canvas_strokes'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -13144,43 +15711,54 @@ class $CanvasStrokesTable extends CanvasStrokes } if (data.containsKey('document_id')) { context.handle( - _documentIdMeta, - documentId.isAcceptableOrUnknown( - data['document_id']!, _documentIdMeta)); + _documentIdMeta, + documentId.isAcceptableOrUnknown(data['document_id']!, _documentIdMeta), + ); } else if (isInserting) { context.missing(_documentIdMeta); } if (data.containsKey('user_id')) { - context.handle(_userIdMeta, - userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta)); + context.handle( + _userIdMeta, + userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta), + ); } else if (isInserting) { context.missing(_userIdMeta); } if (data.containsKey('points_json')) { context.handle( - _pointsJsonMeta, - pointsJson.isAcceptableOrUnknown( - data['points_json']!, _pointsJsonMeta)); + _pointsJsonMeta, + pointsJson.isAcceptableOrUnknown(data['points_json']!, _pointsJsonMeta), + ); } else if (isInserting) { context.missing(_pointsJsonMeta); } if (data.containsKey('color')) { context.handle( - _colorMeta, color.isAcceptableOrUnknown(data['color']!, _colorMeta)); + _colorMeta, + color.isAcceptableOrUnknown(data['color']!, _colorMeta), + ); } if (data.containsKey('stroke_width')) { context.handle( + _strokeWidthMeta, + strokeWidth.isAcceptableOrUnknown( + data['stroke_width']!, _strokeWidthMeta, - strokeWidth.isAcceptableOrUnknown( - data['stroke_width']!, _strokeWidthMeta)); + ), + ); } if (data.containsKey('tool_type')) { - context.handle(_toolTypeMeta, - toolType.isAcceptableOrUnknown(data['tool_type']!, _toolTypeMeta)); + context.handle( + _toolTypeMeta, + toolType.isAcceptableOrUnknown(data['tool_type']!, _toolTypeMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } @@ -13193,22 +15771,38 @@ class $CanvasStrokesTable extends CanvasStrokes CanvasStroke map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return CanvasStroke( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - documentId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}document_id'])!, - userId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}user_id'])!, - pointsJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}points_json'])!, - color: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}color'])!, - strokeWidth: attachedDatabase.typeMapping - .read(DriftSqlType.double, data['${effectivePrefix}stroke_width'])!, - toolType: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}tool_type'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + documentId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}document_id'], + )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}user_id'], + )!, + pointsJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}points_json'], + )!, + color: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}color'], + )!, + strokeWidth: attachedDatabase.typeMapping.read( + DriftSqlType.double, + data['${effectivePrefix}stroke_width'], + )!, + toolType: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}tool_type'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -13227,15 +15821,16 @@ class CanvasStroke extends DataClass implements Insertable { final double strokeWidth; final String toolType; final DateTime createdAt; - const CanvasStroke( - {required this.id, - required this.documentId, - required this.userId, - required this.pointsJson, - required this.color, - required this.strokeWidth, - required this.toolType, - required this.createdAt}); + const CanvasStroke({ + required this.id, + required this.documentId, + required this.userId, + required this.pointsJson, + required this.color, + required this.strokeWidth, + required this.toolType, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -13263,8 +15858,10 @@ class CanvasStroke extends DataClass implements Insertable { ); } - factory CanvasStroke.fromJson(Map json, - {ValueSerializer? serializer}) { + factory CanvasStroke.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return CanvasStroke( id: serializer.fromJson(json['id']), @@ -13292,36 +15889,39 @@ class CanvasStroke extends DataClass implements Insertable { }; } - CanvasStroke copyWith( - {String? id, - String? documentId, - String? userId, - String? pointsJson, - String? color, - double? strokeWidth, - String? toolType, - DateTime? createdAt}) => - CanvasStroke( - id: id ?? this.id, - documentId: documentId ?? this.documentId, - userId: userId ?? this.userId, - pointsJson: pointsJson ?? this.pointsJson, - color: color ?? this.color, - strokeWidth: strokeWidth ?? this.strokeWidth, - toolType: toolType ?? this.toolType, - createdAt: createdAt ?? this.createdAt, - ); + CanvasStroke copyWith({ + String? id, + String? documentId, + String? userId, + String? pointsJson, + String? color, + double? strokeWidth, + String? toolType, + DateTime? createdAt, + }) => CanvasStroke( + id: id ?? this.id, + documentId: documentId ?? this.documentId, + userId: userId ?? this.userId, + pointsJson: pointsJson ?? this.pointsJson, + color: color ?? this.color, + strokeWidth: strokeWidth ?? this.strokeWidth, + toolType: toolType ?? this.toolType, + createdAt: createdAt ?? this.createdAt, + ); CanvasStroke copyWithCompanion(CanvasStrokesCompanion data) { return CanvasStroke( id: data.id.present ? data.id.value : this.id, - documentId: - data.documentId.present ? data.documentId.value : this.documentId, + documentId: data.documentId.present + ? data.documentId.value + : this.documentId, userId: data.userId.present ? data.userId.value : this.userId, - pointsJson: - data.pointsJson.present ? data.pointsJson.value : this.pointsJson, + pointsJson: data.pointsJson.present + ? data.pointsJson.value + : this.pointsJson, color: data.color.present ? data.color.value : this.color, - strokeWidth: - data.strokeWidth.present ? data.strokeWidth.value : this.strokeWidth, + strokeWidth: data.strokeWidth.present + ? data.strokeWidth.value + : this.strokeWidth, toolType: data.toolType.present ? data.toolType.value : this.toolType, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, ); @@ -13343,8 +15943,16 @@ class CanvasStroke extends DataClass implements Insertable { } @override - int get hashCode => Object.hash(id, documentId, userId, pointsJson, color, - strokeWidth, toolType, createdAt); + int get hashCode => Object.hash( + id, + documentId, + userId, + pointsJson, + color, + strokeWidth, + toolType, + createdAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -13390,11 +15998,11 @@ class CanvasStrokesCompanion extends UpdateCompanion { this.toolType = const Value.absent(), required DateTime createdAt, this.rowid = const Value.absent(), - }) : id = Value(id), - documentId = Value(documentId), - userId = Value(userId), - pointsJson = Value(pointsJson), - createdAt = Value(createdAt); + }) : id = Value(id), + documentId = Value(documentId), + userId = Value(userId), + pointsJson = Value(pointsJson), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? documentId, @@ -13419,16 +16027,17 @@ class CanvasStrokesCompanion extends UpdateCompanion { }); } - CanvasStrokesCompanion copyWith( - {Value? id, - Value? documentId, - Value? userId, - Value? pointsJson, - Value? color, - Value? strokeWidth, - Value? toolType, - Value? createdAt, - Value? rowid}) { + CanvasStrokesCompanion copyWith({ + Value? id, + Value? documentId, + Value? userId, + Value? pointsJson, + Value? color, + Value? strokeWidth, + Value? toolType, + Value? createdAt, + Value? rowid, + }) { return CanvasStrokesCompanion( id: id ?? this.id, documentId: documentId ?? this.documentId, @@ -13501,77 +16110,116 @@ class $VoiceMessagesTable extends VoiceMessages static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _messageIdMeta = - const VerificationMeta('messageId'); + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _messageIdMeta = const VerificationMeta( + 'messageId', + ); @override late final GeneratedColumn messageId = GeneratedColumn( - 'message_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _sessionIdMeta = - const VerificationMeta('sessionId'); + 'message_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _sessionIdMeta = const VerificationMeta( + 'sessionId', + ); @override late final GeneratedColumn sessionId = GeneratedColumn( - 'session_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _filePathMeta = - const VerificationMeta('filePath'); + 'session_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _filePathMeta = const VerificationMeta( + 'filePath', + ); @override late final GeneratedColumn filePath = GeneratedColumn( - 'file_path', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _durationMeta = - const VerificationMeta('duration'); + 'file_path', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _durationMeta = const VerificationMeta( + 'duration', + ); @override late final GeneratedColumn duration = GeneratedColumn( - 'duration', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _waveformJsonMeta = - const VerificationMeta('waveformJson'); + 'duration', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _waveformJsonMeta = const VerificationMeta( + 'waveformJson', + ); @override late final GeneratedColumn waveformJson = GeneratedColumn( - 'waveform_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('[]')); - static const VerificationMeta _isRemoteMeta = - const VerificationMeta('isRemote'); + 'waveform_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('[]'), + ); + static const VerificationMeta _isRemoteMeta = const VerificationMeta( + 'isRemote', + ); @override late final GeneratedColumn isRemote = GeneratedColumn( - 'is_remote', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_remote" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'is_remote', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_remote" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - messageId, - sessionId, - filePath, - duration, - waveformJson, - isRemote, - createdAt - ]; + id, + messageId, + sessionId, + filePath, + duration, + waveformJson, + isRemote, + createdAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'voice_messages'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -13580,40 +16228,55 @@ class $VoiceMessagesTable extends VoiceMessages context.missing(_idMeta); } if (data.containsKey('message_id')) { - context.handle(_messageIdMeta, - messageId.isAcceptableOrUnknown(data['message_id']!, _messageIdMeta)); + context.handle( + _messageIdMeta, + messageId.isAcceptableOrUnknown(data['message_id']!, _messageIdMeta), + ); } else if (isInserting) { context.missing(_messageIdMeta); } if (data.containsKey('session_id')) { - context.handle(_sessionIdMeta, - sessionId.isAcceptableOrUnknown(data['session_id']!, _sessionIdMeta)); + context.handle( + _sessionIdMeta, + sessionId.isAcceptableOrUnknown(data['session_id']!, _sessionIdMeta), + ); } else if (isInserting) { context.missing(_sessionIdMeta); } if (data.containsKey('file_path')) { - context.handle(_filePathMeta, - filePath.isAcceptableOrUnknown(data['file_path']!, _filePathMeta)); + context.handle( + _filePathMeta, + filePath.isAcceptableOrUnknown(data['file_path']!, _filePathMeta), + ); } else if (isInserting) { context.missing(_filePathMeta); } if (data.containsKey('duration')) { - context.handle(_durationMeta, - duration.isAcceptableOrUnknown(data['duration']!, _durationMeta)); + context.handle( + _durationMeta, + duration.isAcceptableOrUnknown(data['duration']!, _durationMeta), + ); } if (data.containsKey('waveform_json')) { context.handle( + _waveformJsonMeta, + waveformJson.isAcceptableOrUnknown( + data['waveform_json']!, _waveformJsonMeta, - waveformJson.isAcceptableOrUnknown( - data['waveform_json']!, _waveformJsonMeta)); + ), + ); } if (data.containsKey('is_remote')) { - context.handle(_isRemoteMeta, - isRemote.isAcceptableOrUnknown(data['is_remote']!, _isRemoteMeta)); + context.handle( + _isRemoteMeta, + isRemote.isAcceptableOrUnknown(data['is_remote']!, _isRemoteMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); } else if (isInserting) { context.missing(_createdAtMeta); } @@ -13626,22 +16289,38 @@ class $VoiceMessagesTable extends VoiceMessages VoiceMessage map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return VoiceMessage( - id: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}id'])!, - messageId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}message_id'])!, - sessionId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}session_id'])!, - filePath: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}file_path'])!, - duration: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}duration'])!, - waveformJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}waveform_json'])!, - isRemote: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_remote'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + messageId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}message_id'], + )!, + sessionId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}session_id'], + )!, + filePath: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}file_path'], + )!, + duration: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}duration'], + )!, + waveformJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}waveform_json'], + )!, + isRemote: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_remote'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -13660,15 +16339,16 @@ class VoiceMessage extends DataClass implements Insertable { final String waveformJson; final bool isRemote; final DateTime createdAt; - const VoiceMessage( - {required this.id, - required this.messageId, - required this.sessionId, - required this.filePath, - required this.duration, - required this.waveformJson, - required this.isRemote, - required this.createdAt}); + const VoiceMessage({ + required this.id, + required this.messageId, + required this.sessionId, + required this.filePath, + required this.duration, + required this.waveformJson, + required this.isRemote, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -13696,8 +16376,10 @@ class VoiceMessage extends DataClass implements Insertable { ); } - factory VoiceMessage.fromJson(Map json, - {ValueSerializer? serializer}) { + factory VoiceMessage.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return VoiceMessage( id: serializer.fromJson(json['id']), @@ -13725,25 +16407,25 @@ class VoiceMessage extends DataClass implements Insertable { }; } - VoiceMessage copyWith( - {String? id, - String? messageId, - String? sessionId, - String? filePath, - int? duration, - String? waveformJson, - bool? isRemote, - DateTime? createdAt}) => - VoiceMessage( - id: id ?? this.id, - messageId: messageId ?? this.messageId, - sessionId: sessionId ?? this.sessionId, - filePath: filePath ?? this.filePath, - duration: duration ?? this.duration, - waveformJson: waveformJson ?? this.waveformJson, - isRemote: isRemote ?? this.isRemote, - createdAt: createdAt ?? this.createdAt, - ); + VoiceMessage copyWith({ + String? id, + String? messageId, + String? sessionId, + String? filePath, + int? duration, + String? waveformJson, + bool? isRemote, + DateTime? createdAt, + }) => VoiceMessage( + id: id ?? this.id, + messageId: messageId ?? this.messageId, + sessionId: sessionId ?? this.sessionId, + filePath: filePath ?? this.filePath, + duration: duration ?? this.duration, + waveformJson: waveformJson ?? this.waveformJson, + isRemote: isRemote ?? this.isRemote, + createdAt: createdAt ?? this.createdAt, + ); VoiceMessage copyWithCompanion(VoiceMessagesCompanion data) { return VoiceMessage( id: data.id.present ? data.id.value : this.id, @@ -13775,8 +16457,16 @@ class VoiceMessage extends DataClass implements Insertable { } @override - int get hashCode => Object.hash(id, messageId, sessionId, filePath, duration, - waveformJson, isRemote, createdAt); + int get hashCode => Object.hash( + id, + messageId, + sessionId, + filePath, + duration, + waveformJson, + isRemote, + createdAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -13822,11 +16512,11 @@ class VoiceMessagesCompanion extends UpdateCompanion { this.isRemote = const Value.absent(), required DateTime createdAt, this.rowid = const Value.absent(), - }) : id = Value(id), - messageId = Value(messageId), - sessionId = Value(sessionId), - filePath = Value(filePath), - createdAt = Value(createdAt); + }) : id = Value(id), + messageId = Value(messageId), + sessionId = Value(sessionId), + filePath = Value(filePath), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? messageId, @@ -13851,16 +16541,17 @@ class VoiceMessagesCompanion extends UpdateCompanion { }); } - VoiceMessagesCompanion copyWith( - {Value? id, - Value? messageId, - Value? sessionId, - Value? filePath, - Value? duration, - Value? waveformJson, - Value? isRemote, - Value? createdAt, - Value? rowid}) { + VoiceMessagesCompanion copyWith({ + Value? id, + Value? messageId, + Value? sessionId, + Value? filePath, + Value? duration, + Value? waveformJson, + Value? isRemote, + Value? createdAt, + Value? rowid, + }) { return VoiceMessagesCompanion( id: id ?? this.id, messageId: messageId ?? this.messageId, @@ -13933,191 +16624,275 @@ class $FortuneRecordsTable extends FortuneRecords static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + 'id', + aliasedName, + false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'PRIMARY KEY AUTOINCREMENT', + ), + ); static const VerificationMeta _dateMeta = const VerificationMeta('date'); @override late final GeneratedColumn date = GeneratedColumn( - 'date', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'date', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _uidMeta = const VerificationMeta('uid'); @override late final GeneratedColumn uid = GeneratedColumn( - 'uid', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _fortuneLevelMeta = - const VerificationMeta('fortuneLevel'); + 'uid', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _fortuneLevelMeta = const VerificationMeta( + 'fortuneLevel', + ); @override late final GeneratedColumn fortuneLevel = GeneratedColumn( - 'fortune_level', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _fortuneScoreMeta = - const VerificationMeta('fortuneScore'); + 'fortune_level', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _fortuneScoreMeta = const VerificationMeta( + 'fortuneScore', + ); @override late final GeneratedColumn fortuneScore = GeneratedColumn( - 'fortune_score', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _signTextMeta = - const VerificationMeta('signText'); + 'fortune_score', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _signTextMeta = const VerificationMeta( + 'signText', + ); @override late final GeneratedColumn signText = GeneratedColumn( - 'sign_text', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _dimensionsJsonMeta = - const VerificationMeta('dimensionsJson'); + 'sign_text', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _dimensionsJsonMeta = const VerificationMeta( + 'dimensionsJson', + ); @override late final GeneratedColumn dimensionsJson = GeneratedColumn( - 'dimensions_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('{}')); - static const VerificationMeta _luckyJsonMeta = - const VerificationMeta('luckyJson'); + 'dimensions_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('{}'), + ); + static const VerificationMeta _luckyJsonMeta = const VerificationMeta( + 'luckyJson', + ); @override late final GeneratedColumn luckyJson = GeneratedColumn( - 'lucky_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('{}')); - static const VerificationMeta _suitableJsonMeta = - const VerificationMeta('suitableJson'); + 'lucky_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('{}'), + ); + static const VerificationMeta _suitableJsonMeta = const VerificationMeta( + 'suitableJson', + ); @override late final GeneratedColumn suitableJson = GeneratedColumn( - 'suitable_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('[]')); - static const VerificationMeta _unsuitableJsonMeta = - const VerificationMeta('unsuitableJson'); + 'suitable_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('[]'), + ); + static const VerificationMeta _unsuitableJsonMeta = const VerificationMeta( + 'unsuitableJson', + ); @override late final GeneratedColumn unsuitableJson = GeneratedColumn( - 'unsuitable_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('[]')); + 'unsuitable_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('[]'), + ); static const VerificationMeta _themeMeta = const VerificationMeta('theme'); @override late final GeneratedColumn theme = GeneratedColumn( - 'theme', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('ancient')); - static const VerificationMeta _isTodayMeta = - const VerificationMeta('isToday'); + 'theme', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('ancient'), + ); + static const VerificationMeta _isTodayMeta = const VerificationMeta( + 'isToday', + ); @override late final GeneratedColumn isToday = GeneratedColumn( - 'is_today', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_today" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _canRegenerateMeta = - const VerificationMeta('canRegenerate'); + 'is_today', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_today" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _canRegenerateMeta = const VerificationMeta( + 'canRegenerate', + ); @override late final GeneratedColumn canRegenerate = GeneratedColumn( - 'can_regenerate', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: GeneratedColumn.constraintIsAlways( - 'CHECK ("can_regenerate" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _regenCountMeta = - const VerificationMeta('regenCount'); + 'can_regenerate', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("can_regenerate" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _regenCountMeta = const VerificationMeta( + 'regenCount', + ); @override late final GeneratedColumn regenCount = GeneratedColumn( - 'regen_count', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0)); - static const VerificationMeta _imageUrlMeta = - const VerificationMeta('imageUrl'); + 'regen_count', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const Constant(0), + ); + static const VerificationMeta _imageUrlMeta = const VerificationMeta( + 'imageUrl', + ); @override late final GeneratedColumn imageUrl = GeneratedColumn( - 'image_url', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _huangliJsonMeta = - const VerificationMeta('huangliJson'); + 'image_url', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _huangliJsonMeta = const VerificationMeta( + 'huangliJson', + ); @override late final GeneratedColumn huangliJson = GeneratedColumn( - 'huangli_json', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('{}')); + 'huangli_json', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant('{}'), + ); static const VerificationMeta _noteMeta = const VerificationMeta('note'); @override late final GeneratedColumn note = GeneratedColumn( - 'note', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: const Constant('')); - static const VerificationMeta _isEditedMeta = - const VerificationMeta('isEdited'); + 'note', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const Constant(''), + ); + static const VerificationMeta _isEditedMeta = const VerificationMeta( + 'isEdited', + ); @override late final GeneratedColumn isEdited = GeneratedColumn( - 'is_edited', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('CHECK ("is_edited" IN (0, 1))'), - defaultValue: const Constant(false)); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); + 'is_edited', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("is_edited" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + 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'); + '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); + 'updated_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [ - id, - date, - uid, - fortuneLevel, - fortuneScore, - signText, - dimensionsJson, - luckyJson, - suitableJson, - unsuitableJson, - theme, - isToday, - canRegenerate, - regenCount, - imageUrl, - huangliJson, - note, - isEdited, - createdAt, - updatedAt - ]; + id, + date, + uid, + fortuneLevel, + fortuneScore, + signText, + dimensionsJson, + luckyJson, + suitableJson, + unsuitableJson, + theme, + isToday, + canRegenerate, + regenCount, + imageUrl, + huangliJson, + note, + isEdited, + createdAt, + updatedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'fortune_records'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { @@ -14125,99 +16900,142 @@ class $FortuneRecordsTable extends FortuneRecords } if (data.containsKey('date')) { context.handle( - _dateMeta, date.isAcceptableOrUnknown(data['date']!, _dateMeta)); + _dateMeta, + date.isAcceptableOrUnknown(data['date']!, _dateMeta), + ); } else if (isInserting) { context.missing(_dateMeta); } if (data.containsKey('uid')) { context.handle( - _uidMeta, uid.isAcceptableOrUnknown(data['uid']!, _uidMeta)); + _uidMeta, + uid.isAcceptableOrUnknown(data['uid']!, _uidMeta), + ); } if (data.containsKey('fortune_level')) { context.handle( + _fortuneLevelMeta, + fortuneLevel.isAcceptableOrUnknown( + data['fortune_level']!, _fortuneLevelMeta, - fortuneLevel.isAcceptableOrUnknown( - data['fortune_level']!, _fortuneLevelMeta)); + ), + ); } if (data.containsKey('fortune_score')) { context.handle( + _fortuneScoreMeta, + fortuneScore.isAcceptableOrUnknown( + data['fortune_score']!, _fortuneScoreMeta, - fortuneScore.isAcceptableOrUnknown( - data['fortune_score']!, _fortuneScoreMeta)); + ), + ); } if (data.containsKey('sign_text')) { - context.handle(_signTextMeta, - signText.isAcceptableOrUnknown(data['sign_text']!, _signTextMeta)); + context.handle( + _signTextMeta, + signText.isAcceptableOrUnknown(data['sign_text']!, _signTextMeta), + ); } if (data.containsKey('dimensions_json')) { context.handle( + _dimensionsJsonMeta, + dimensionsJson.isAcceptableOrUnknown( + data['dimensions_json']!, _dimensionsJsonMeta, - dimensionsJson.isAcceptableOrUnknown( - data['dimensions_json']!, _dimensionsJsonMeta)); + ), + ); } if (data.containsKey('lucky_json')) { - context.handle(_luckyJsonMeta, - luckyJson.isAcceptableOrUnknown(data['lucky_json']!, _luckyJsonMeta)); + context.handle( + _luckyJsonMeta, + luckyJson.isAcceptableOrUnknown(data['lucky_json']!, _luckyJsonMeta), + ); } if (data.containsKey('suitable_json')) { context.handle( + _suitableJsonMeta, + suitableJson.isAcceptableOrUnknown( + data['suitable_json']!, _suitableJsonMeta, - suitableJson.isAcceptableOrUnknown( - data['suitable_json']!, _suitableJsonMeta)); + ), + ); } if (data.containsKey('unsuitable_json')) { context.handle( + _unsuitableJsonMeta, + unsuitableJson.isAcceptableOrUnknown( + data['unsuitable_json']!, _unsuitableJsonMeta, - unsuitableJson.isAcceptableOrUnknown( - data['unsuitable_json']!, _unsuitableJsonMeta)); + ), + ); } if (data.containsKey('theme')) { context.handle( - _themeMeta, theme.isAcceptableOrUnknown(data['theme']!, _themeMeta)); + _themeMeta, + theme.isAcceptableOrUnknown(data['theme']!, _themeMeta), + ); } if (data.containsKey('is_today')) { - context.handle(_isTodayMeta, - isToday.isAcceptableOrUnknown(data['is_today']!, _isTodayMeta)); + context.handle( + _isTodayMeta, + isToday.isAcceptableOrUnknown(data['is_today']!, _isTodayMeta), + ); } if (data.containsKey('can_regenerate')) { context.handle( + _canRegenerateMeta, + canRegenerate.isAcceptableOrUnknown( + data['can_regenerate']!, _canRegenerateMeta, - canRegenerate.isAcceptableOrUnknown( - data['can_regenerate']!, _canRegenerateMeta)); + ), + ); } if (data.containsKey('regen_count')) { context.handle( - _regenCountMeta, - regenCount.isAcceptableOrUnknown( - data['regen_count']!, _regenCountMeta)); + _regenCountMeta, + regenCount.isAcceptableOrUnknown(data['regen_count']!, _regenCountMeta), + ); } if (data.containsKey('image_url')) { - context.handle(_imageUrlMeta, - imageUrl.isAcceptableOrUnknown(data['image_url']!, _imageUrlMeta)); + context.handle( + _imageUrlMeta, + imageUrl.isAcceptableOrUnknown(data['image_url']!, _imageUrlMeta), + ); } if (data.containsKey('huangli_json')) { context.handle( + _huangliJsonMeta, + huangliJson.isAcceptableOrUnknown( + data['huangli_json']!, _huangliJsonMeta, - huangliJson.isAcceptableOrUnknown( - data['huangli_json']!, _huangliJsonMeta)); + ), + ); } if (data.containsKey('note')) { context.handle( - _noteMeta, note.isAcceptableOrUnknown(data['note']!, _noteMeta)); + _noteMeta, + note.isAcceptableOrUnknown(data['note']!, _noteMeta), + ); } if (data.containsKey('is_edited')) { - context.handle(_isEditedMeta, - isEdited.isAcceptableOrUnknown(data['is_edited']!, _isEditedMeta)); + context.handle( + _isEditedMeta, + isEdited.isAcceptableOrUnknown(data['is_edited']!, _isEditedMeta), + ); } if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + 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)); + context.handle( + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), + ); } else if (isInserting) { context.missing(_updatedAtMeta); } @@ -14230,46 +17048,86 @@ class $FortuneRecordsTable extends FortuneRecords FortuneRecord map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return FortuneRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - date: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}date'])!, - uid: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}uid'])!, - fortuneLevel: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}fortune_level'])!, - fortuneScore: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}fortune_score'])!, - signText: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}sign_text'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + date: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}date'], + )!, + uid: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}uid'], + )!, + fortuneLevel: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}fortune_level'], + )!, + fortuneScore: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}fortune_score'], + )!, + signText: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}sign_text'], + )!, dimensionsJson: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}dimensions_json'])!, - luckyJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}lucky_json'])!, - suitableJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}suitable_json'])!, + DriftSqlType.string, + data['${effectivePrefix}dimensions_json'], + )!, + luckyJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}lucky_json'], + )!, + suitableJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}suitable_json'], + )!, unsuitableJson: attachedDatabase.typeMapping.read( - DriftSqlType.string, data['${effectivePrefix}unsuitable_json'])!, - theme: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}theme'])!, - isToday: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_today'])!, - canRegenerate: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}can_regenerate'])!, - regenCount: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}regen_count'])!, - imageUrl: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}image_url'])!, - huangliJson: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}huangli_json'])!, - note: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}note'])!, - isEdited: attachedDatabase.typeMapping - .read(DriftSqlType.bool, data['${effectivePrefix}is_edited'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, - updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + DriftSqlType.string, + data['${effectivePrefix}unsuitable_json'], + )!, + theme: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}theme'], + )!, + isToday: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_today'], + )!, + canRegenerate: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}can_regenerate'], + )!, + regenCount: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}regen_count'], + )!, + imageUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}image_url'], + )!, + huangliJson: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}huangli_json'], + )!, + note: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}note'], + )!, + isEdited: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}is_edited'], + )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + updatedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}updated_at'], + )!, ); } @@ -14300,27 +17158,28 @@ class FortuneRecord extends DataClass implements Insertable { final bool isEdited; final DateTime createdAt; final DateTime updatedAt; - const FortuneRecord( - {required this.id, - required this.date, - required this.uid, - required this.fortuneLevel, - required this.fortuneScore, - required this.signText, - required this.dimensionsJson, - required this.luckyJson, - required this.suitableJson, - required this.unsuitableJson, - required this.theme, - required this.isToday, - required this.canRegenerate, - required this.regenCount, - required this.imageUrl, - required this.huangliJson, - required this.note, - required this.isEdited, - required this.createdAt, - required this.updatedAt}); + const FortuneRecord({ + required this.id, + required this.date, + required this.uid, + required this.fortuneLevel, + required this.fortuneScore, + required this.signText, + required this.dimensionsJson, + required this.luckyJson, + required this.suitableJson, + required this.unsuitableJson, + required this.theme, + required this.isToday, + required this.canRegenerate, + required this.regenCount, + required this.imageUrl, + required this.huangliJson, + required this.note, + required this.isEdited, + required this.createdAt, + required this.updatedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -14372,8 +17231,10 @@ class FortuneRecord extends DataClass implements Insertable { ); } - factory FortuneRecord.fromJson(Map json, - {ValueSerializer? serializer}) { + factory FortuneRecord.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return FortuneRecord( id: serializer.fromJson(json['id']), @@ -14425,49 +17286,49 @@ class FortuneRecord extends DataClass implements Insertable { }; } - FortuneRecord copyWith( - {int? id, - String? date, - String? uid, - String? fortuneLevel, - int? fortuneScore, - String? signText, - String? dimensionsJson, - String? luckyJson, - String? suitableJson, - String? unsuitableJson, - String? theme, - bool? isToday, - bool? canRegenerate, - int? regenCount, - String? imageUrl, - String? huangliJson, - String? note, - bool? isEdited, - DateTime? createdAt, - DateTime? updatedAt}) => - FortuneRecord( - id: id ?? this.id, - date: date ?? this.date, - uid: uid ?? this.uid, - fortuneLevel: fortuneLevel ?? this.fortuneLevel, - fortuneScore: fortuneScore ?? this.fortuneScore, - signText: signText ?? this.signText, - dimensionsJson: dimensionsJson ?? this.dimensionsJson, - luckyJson: luckyJson ?? this.luckyJson, - suitableJson: suitableJson ?? this.suitableJson, - unsuitableJson: unsuitableJson ?? this.unsuitableJson, - theme: theme ?? this.theme, - isToday: isToday ?? this.isToday, - canRegenerate: canRegenerate ?? this.canRegenerate, - regenCount: regenCount ?? this.regenCount, - imageUrl: imageUrl ?? this.imageUrl, - huangliJson: huangliJson ?? this.huangliJson, - note: note ?? this.note, - isEdited: isEdited ?? this.isEdited, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, - ); + FortuneRecord copyWith({ + int? id, + String? date, + String? uid, + String? fortuneLevel, + int? fortuneScore, + String? signText, + String? dimensionsJson, + String? luckyJson, + String? suitableJson, + String? unsuitableJson, + String? theme, + bool? isToday, + bool? canRegenerate, + int? regenCount, + String? imageUrl, + String? huangliJson, + String? note, + bool? isEdited, + DateTime? createdAt, + DateTime? updatedAt, + }) => FortuneRecord( + id: id ?? this.id, + date: date ?? this.date, + uid: uid ?? this.uid, + fortuneLevel: fortuneLevel ?? this.fortuneLevel, + fortuneScore: fortuneScore ?? this.fortuneScore, + signText: signText ?? this.signText, + dimensionsJson: dimensionsJson ?? this.dimensionsJson, + luckyJson: luckyJson ?? this.luckyJson, + suitableJson: suitableJson ?? this.suitableJson, + unsuitableJson: unsuitableJson ?? this.unsuitableJson, + theme: theme ?? this.theme, + isToday: isToday ?? this.isToday, + canRegenerate: canRegenerate ?? this.canRegenerate, + regenCount: regenCount ?? this.regenCount, + imageUrl: imageUrl ?? this.imageUrl, + huangliJson: huangliJson ?? this.huangliJson, + note: note ?? this.note, + isEdited: isEdited ?? this.isEdited, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + ); FortuneRecord copyWithCompanion(FortuneRecordsCompanion data) { return FortuneRecord( id: data.id.present ? data.id.value : this.id, @@ -14495,11 +17356,13 @@ class FortuneRecord extends DataClass implements Insertable { canRegenerate: data.canRegenerate.present ? data.canRegenerate.value : this.canRegenerate, - regenCount: - data.regenCount.present ? data.regenCount.value : this.regenCount, + regenCount: data.regenCount.present + ? data.regenCount.value + : this.regenCount, imageUrl: data.imageUrl.present ? data.imageUrl.value : this.imageUrl, - huangliJson: - data.huangliJson.present ? data.huangliJson.value : this.huangliJson, + huangliJson: data.huangliJson.present + ? data.huangliJson.value + : this.huangliJson, note: data.note.present ? data.note.value : this.note, isEdited: data.isEdited.present ? data.isEdited.value : this.isEdited, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, @@ -14536,26 +17399,27 @@ class FortuneRecord extends DataClass implements Insertable { @override int get hashCode => Object.hash( - id, - date, - uid, - fortuneLevel, - fortuneScore, - signText, - dimensionsJson, - luckyJson, - suitableJson, - unsuitableJson, - theme, - isToday, - canRegenerate, - regenCount, - imageUrl, - huangliJson, - note, - isEdited, - createdAt, - updatedAt); + id, + date, + uid, + fortuneLevel, + fortuneScore, + signText, + dimensionsJson, + luckyJson, + suitableJson, + unsuitableJson, + theme, + isToday, + canRegenerate, + regenCount, + imageUrl, + huangliJson, + note, + isEdited, + createdAt, + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || @@ -14646,9 +17510,9 @@ class FortuneRecordsCompanion extends UpdateCompanion { this.isEdited = const Value.absent(), required DateTime createdAt, required DateTime updatedAt, - }) : date = Value(date), - createdAt = Value(createdAt), - updatedAt = Value(updatedAt); + }) : date = Value(date), + createdAt = Value(createdAt), + updatedAt = Value(updatedAt); static Insertable custom({ Expression? id, Expression? date, @@ -14695,27 +17559,28 @@ class FortuneRecordsCompanion extends UpdateCompanion { }); } - FortuneRecordsCompanion copyWith( - {Value? id, - Value? date, - Value? uid, - Value? fortuneLevel, - Value? fortuneScore, - Value? signText, - Value? dimensionsJson, - Value? luckyJson, - Value? suitableJson, - Value? unsuitableJson, - Value? theme, - Value? isToday, - Value? canRegenerate, - Value? regenCount, - Value? imageUrl, - Value? huangliJson, - Value? note, - Value? isEdited, - Value? createdAt, - Value? updatedAt}) { + FortuneRecordsCompanion copyWith({ + Value? id, + Value? date, + Value? uid, + Value? fortuneLevel, + Value? fortuneScore, + Value? signText, + Value? dimensionsJson, + Value? luckyJson, + Value? suitableJson, + Value? unsuitableJson, + Value? theme, + Value? isToday, + Value? canRegenerate, + Value? regenCount, + Value? imageUrl, + Value? huangliJson, + Value? note, + Value? isEdited, + Value? createdAt, + Value? updatedAt, + }) { return FortuneRecordsCompanion( id: id ?? this.id, date: date ?? this.date, @@ -14840,18 +17705,28 @@ class $SchemaMigrationsTable extends SchemaMigrations final GeneratedDatabase attachedDatabase; final String? _alias; $SchemaMigrationsTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _versionMeta = - const VerificationMeta('version'); + static const VerificationMeta _versionMeta = const VerificationMeta( + 'version', + ); @override late final GeneratedColumn version = GeneratedColumn( - 'version', aliasedName, false, - type: DriftSqlType.int, requiredDuringInsert: false); - static const VerificationMeta _executedAtMeta = - const VerificationMeta('executedAt'); + 'version', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: false, + ); + static const VerificationMeta _executedAtMeta = const VerificationMeta( + 'executedAt', + ); @override late final GeneratedColumn executedAt = GeneratedColumn( - 'executed_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'executed_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override List get $columns => [version, executedAt]; @override @@ -14860,19 +17735,23 @@ class $SchemaMigrationsTable extends SchemaMigrations String get actualTableName => $name; static const String $name = 'schema_migrations'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('version')) { - context.handle(_versionMeta, - version.isAcceptableOrUnknown(data['version']!, _versionMeta)); + context.handle( + _versionMeta, + version.isAcceptableOrUnknown(data['version']!, _versionMeta), + ); } if (data.containsKey('executed_at')) { context.handle( - _executedAtMeta, - executedAt.isAcceptableOrUnknown( - data['executed_at']!, _executedAtMeta)); + _executedAtMeta, + executedAt.isAcceptableOrUnknown(data['executed_at']!, _executedAtMeta), + ); } else if (isInserting) { context.missing(_executedAtMeta); } @@ -14885,10 +17764,14 @@ class $SchemaMigrationsTable extends SchemaMigrations SchemaMigration map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return SchemaMigration( - version: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}version'])!, - executedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}executed_at'])!, + version: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}version'], + )!, + executedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}executed_at'], + )!, ); } @@ -14917,8 +17800,10 @@ class SchemaMigration extends DataClass implements Insertable { ); } - factory SchemaMigration.fromJson(Map json, - {ValueSerializer? serializer}) { + factory SchemaMigration.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return SchemaMigration( version: serializer.fromJson(json['version']), @@ -14942,8 +17827,9 @@ class SchemaMigration extends DataClass implements Insertable { SchemaMigration copyWithCompanion(SchemaMigrationsCompanion data) { return SchemaMigration( version: data.version.present ? data.version.value : this.version, - executedAt: - data.executedAt.present ? data.executedAt.value : this.executedAt, + executedAt: data.executedAt.present + ? data.executedAt.value + : this.executedAt, ); } @@ -14987,8 +17873,10 @@ class SchemaMigrationsCompanion extends UpdateCompanion { }); } - SchemaMigrationsCompanion copyWith( - {Value? version, Value? executedAt}) { + SchemaMigrationsCompanion copyWith({ + Value? version, + Value? executedAt, + }) { return SchemaMigrationsCompanion( version: version ?? this.version, executedAt: executedAt ?? this.executedAt, @@ -15026,77 +17914,115 @@ class $MigrationErrorsTable extends MigrationErrors static const VerificationMeta _idMeta = const VerificationMeta('id'); @override late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); - static const VerificationMeta _versionMeta = - const VerificationMeta('version'); + 'id', + aliasedName, + false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'PRIMARY KEY AUTOINCREMENT', + ), + ); + static const VerificationMeta _versionMeta = const VerificationMeta( + 'version', + ); @override late final GeneratedColumn version = GeneratedColumn( - 'version', aliasedName, false, - type: DriftSqlType.int, requiredDuringInsert: true); - static const VerificationMeta _errorMessageMeta = - const VerificationMeta('errorMessage'); + 'version', + aliasedName, + false, + type: DriftSqlType.int, + requiredDuringInsert: true, + ); + static const VerificationMeta _errorMessageMeta = const VerificationMeta( + 'errorMessage', + ); @override late final GeneratedColumn errorMessage = GeneratedColumn( - 'error_message', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _errorStackMeta = - const VerificationMeta('errorStack'); + 'error_message', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _errorStackMeta = const VerificationMeta( + 'errorStack', + ); @override late final GeneratedColumn errorStack = GeneratedColumn( - 'error_stack', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _failedAtMeta = - const VerificationMeta('failedAt'); + 'error_stack', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _failedAtMeta = const VerificationMeta( + 'failedAt', + ); @override late final GeneratedColumn failedAt = GeneratedColumn( - 'failed_at', aliasedName, false, - type: DriftSqlType.dateTime, requiredDuringInsert: true); + 'failed_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); @override - List get $columns => - [id, version, errorMessage, errorStack, failedAt]; + List get $columns => [ + id, + version, + errorMessage, + errorStack, + failedAt, + ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; static const String $name = 'migration_errors'; @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { + 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)); } if (data.containsKey('version')) { - context.handle(_versionMeta, - version.isAcceptableOrUnknown(data['version']!, _versionMeta)); + context.handle( + _versionMeta, + version.isAcceptableOrUnknown(data['version']!, _versionMeta), + ); } else if (isInserting) { context.missing(_versionMeta); } if (data.containsKey('error_message')) { context.handle( + _errorMessageMeta, + errorMessage.isAcceptableOrUnknown( + data['error_message']!, _errorMessageMeta, - errorMessage.isAcceptableOrUnknown( - data['error_message']!, _errorMessageMeta)); + ), + ); } else if (isInserting) { context.missing(_errorMessageMeta); } if (data.containsKey('error_stack')) { context.handle( - _errorStackMeta, - errorStack.isAcceptableOrUnknown( - data['error_stack']!, _errorStackMeta)); + _errorStackMeta, + errorStack.isAcceptableOrUnknown(data['error_stack']!, _errorStackMeta), + ); } else if (isInserting) { context.missing(_errorStackMeta); } if (data.containsKey('failed_at')) { - context.handle(_failedAtMeta, - failedAt.isAcceptableOrUnknown(data['failed_at']!, _failedAtMeta)); + context.handle( + _failedAtMeta, + failedAt.isAcceptableOrUnknown(data['failed_at']!, _failedAtMeta), + ); } else if (isInserting) { context.missing(_failedAtMeta); } @@ -15109,16 +18035,26 @@ class $MigrationErrorsTable extends MigrationErrors MigrationError map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return MigrationError( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - version: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}version'])!, - errorMessage: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}error_message'])!, - errorStack: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}error_stack'])!, - failedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}failed_at'])!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + version: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}version'], + )!, + errorMessage: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}error_message'], + )!, + errorStack: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}error_stack'], + )!, + failedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}failed_at'], + )!, ); } @@ -15134,12 +18070,13 @@ class MigrationError extends DataClass implements Insertable { final String errorMessage; final String errorStack; final DateTime failedAt; - const MigrationError( - {required this.id, - required this.version, - required this.errorMessage, - required this.errorStack, - required this.failedAt}); + const MigrationError({ + required this.id, + required this.version, + required this.errorMessage, + required this.errorStack, + required this.failedAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -15161,8 +18098,10 @@ class MigrationError extends DataClass implements Insertable { ); } - factory MigrationError.fromJson(Map json, - {ValueSerializer? serializer}) { + factory MigrationError.fromJson( + Map json, { + ValueSerializer? serializer, + }) { serializer ??= driftRuntimeOptions.defaultSerializer; return MigrationError( id: serializer.fromJson(json['id']), @@ -15184,19 +18123,19 @@ class MigrationError extends DataClass implements Insertable { }; } - MigrationError copyWith( - {int? id, - int? version, - String? errorMessage, - String? errorStack, - DateTime? failedAt}) => - MigrationError( - id: id ?? this.id, - version: version ?? this.version, - errorMessage: errorMessage ?? this.errorMessage, - errorStack: errorStack ?? this.errorStack, - failedAt: failedAt ?? this.failedAt, - ); + MigrationError copyWith({ + int? id, + int? version, + String? errorMessage, + String? errorStack, + DateTime? failedAt, + }) => MigrationError( + id: id ?? this.id, + version: version ?? this.version, + errorMessage: errorMessage ?? this.errorMessage, + errorStack: errorStack ?? this.errorStack, + failedAt: failedAt ?? this.failedAt, + ); MigrationError copyWithCompanion(MigrationErrorsCompanion data) { return MigrationError( id: data.id.present ? data.id.value : this.id, @@ -15204,8 +18143,9 @@ class MigrationError extends DataClass implements Insertable { errorMessage: data.errorMessage.present ? data.errorMessage.value : this.errorMessage, - errorStack: - data.errorStack.present ? data.errorStack.value : this.errorStack, + errorStack: data.errorStack.present + ? data.errorStack.value + : this.errorStack, failedAt: data.failedAt.present ? data.failedAt.value : this.failedAt, ); } @@ -15255,10 +18195,10 @@ class MigrationErrorsCompanion extends UpdateCompanion { required String errorMessage, required String errorStack, required DateTime failedAt, - }) : version = Value(version), - errorMessage = Value(errorMessage), - errorStack = Value(errorStack), - failedAt = Value(failedAt); + }) : version = Value(version), + errorMessage = Value(errorMessage), + errorStack = Value(errorStack), + failedAt = Value(failedAt); static Insertable custom({ Expression? id, Expression? version, @@ -15275,12 +18215,13 @@ class MigrationErrorsCompanion extends UpdateCompanion { }); } - MigrationErrorsCompanion copyWith( - {Value? id, - Value? version, - Value? errorMessage, - Value? errorStack, - Value? failedAt}) { + MigrationErrorsCompanion copyWith({ + Value? id, + Value? version, + Value? errorMessage, + Value? errorStack, + Value? failedAt, + }) { return MigrationErrorsCompanion( id: id ?? this.id, version: version ?? this.version, @@ -15339,19 +18280,23 @@ abstract class _$AppDatabase extends GeneratedDatabase { late final $HanziCachesTable hanziCaches = $HanziCachesTable(this); late final $ShareHistoriesTable shareHistories = $ShareHistoriesTable(this); late final $LearningPlansTable learningPlans = $LearningPlansTable(this); - late final $LearningRecordsTable learningRecords = - $LearningRecordsTable(this); + late final $LearningRecordsTable learningRecords = $LearningRecordsTable( + this, + ); late final $ChatConversationsTable chatConversations = $ChatConversationsTable(this); late final $ChatMsgRecordsTable chatMsgRecords = $ChatMsgRecordsTable(this); - late final $ChatAttachmentsTable chatAttachments = - $ChatAttachmentsTable(this); - late final $IpLocationCachesTable ipLocationCaches = - $IpLocationCachesTable(this); + late final $ChatAttachmentsTable chatAttachments = $ChatAttachmentsTable( + this, + ); + late final $IpLocationCachesTable ipLocationCaches = $IpLocationCachesTable( + this, + ); late final $TransferDeviceRecordsTable transferDeviceRecords = $TransferDeviceRecordsTable(this); - late final $TransferRecordsTable transferRecords = - $TransferRecordsTable(this); + late final $TransferRecordsTable transferRecords = $TransferRecordsTable( + this, + ); late final $PairingRecordsTable pairingRecords = $PairingRecordsTable(this); late final $TransferMsgRecordsTable transferMsgRecords = $TransferMsgRecordsTable(this); @@ -15359,89 +18304,95 @@ abstract class _$AppDatabase extends GeneratedDatabase { $CloudCacheRecordsTable(this); late final $TransferStatsRecordsTable transferStatsRecords = $TransferStatsRecordsTable(this); - late final $ClipboardRecordsTable clipboardRecords = - $ClipboardRecordsTable(this); - late final $CanvasDocumentsTable canvasDocuments = - $CanvasDocumentsTable(this); + late final $ClipboardRecordsTable clipboardRecords = $ClipboardRecordsTable( + this, + ); + late final $CanvasDocumentsTable canvasDocuments = $CanvasDocumentsTable( + this, + ); late final $CanvasStrokesTable canvasStrokes = $CanvasStrokesTable(this); late final $VoiceMessagesTable voiceMessages = $VoiceMessagesTable(this); late final $FortuneRecordsTable fortuneRecords = $FortuneRecordsTable(this); - late final $SchemaMigrationsTable schemaMigrations = - $SchemaMigrationsTable(this); - late final $MigrationErrorsTable migrationErrors = - $MigrationErrorsTable(this); + late final $SchemaMigrationsTable schemaMigrations = $SchemaMigrationsTable( + this, + ); + late final $MigrationErrorsTable migrationErrors = $MigrationErrorsTable( + this, + ); @override Iterable> get allTables => allSchemaEntities.whereType>(); @override List get allSchemaEntities => [ - sentences, - favorites, - readHistory, - cardTemplates, - toolUsageStats, - feedCache, - offlineActionQueue, - hanziCaches, - shareHistories, - learningPlans, - learningRecords, - chatConversations, - chatMsgRecords, - chatAttachments, - ipLocationCaches, - transferDeviceRecords, - transferRecords, - pairingRecords, - transferMsgRecords, - cloudCacheRecords, - transferStatsRecords, - clipboardRecords, - canvasDocuments, - canvasStrokes, - voiceMessages, - fortuneRecords, - schemaMigrations, - migrationErrors - ]; + sentences, + favorites, + readHistory, + cardTemplates, + toolUsageStats, + feedCache, + offlineActionQueue, + hanziCaches, + shareHistories, + learningPlans, + learningRecords, + chatConversations, + chatMsgRecords, + chatAttachments, + ipLocationCaches, + transferDeviceRecords, + transferRecords, + pairingRecords, + transferMsgRecords, + cloudCacheRecords, + transferStatsRecords, + clipboardRecords, + canvasDocuments, + canvasStrokes, + voiceMessages, + fortuneRecords, + schemaMigrations, + migrationErrors, + ]; } -typedef $$SentencesTableCreateCompanionBuilder = SentencesCompanion Function({ - required String id, - required String content, - Value author, - Value source, - Value tags, - Value feedType, - Value feedName, - Value feedIcon, - Value views, - Value imageUrl, - Value isFavorite, - Value isLiked, - Value isRead, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid, -}); -typedef $$SentencesTableUpdateCompanionBuilder = SentencesCompanion Function({ - Value id, - Value content, - Value author, - Value source, - Value tags, - Value feedType, - Value feedName, - Value feedIcon, - Value views, - Value imageUrl, - Value isFavorite, - Value isLiked, - Value isRead, - Value createdAt, - Value updatedAt, - Value rowid, -}); +typedef $$SentencesTableCreateCompanionBuilder = + SentencesCompanion Function({ + required String id, + required String content, + Value author, + Value source, + Value tags, + Value feedType, + Value feedName, + Value feedIcon, + Value views, + Value imageUrl, + Value isFavorite, + Value isLiked, + Value isRead, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid, + }); +typedef $$SentencesTableUpdateCompanionBuilder = + SentencesCompanion Function({ + Value id, + Value content, + Value author, + Value source, + Value tags, + Value feedType, + Value feedName, + Value feedIcon, + Value views, + Value imageUrl, + Value isFavorite, + Value isLiked, + Value isRead, + Value createdAt, + Value updatedAt, + Value rowid, + }); class $$SentencesTableFilterComposer extends Composer<_$AppDatabase, $SentencesTable> { @@ -15453,49 +18404,79 @@ class $$SentencesTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnFilters(column)); + column: $table.content, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get author => $composableBuilder( - column: $table.author, builder: (column) => ColumnFilters(column)); + column: $table.author, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get source => $composableBuilder( - column: $table.source, builder: (column) => ColumnFilters(column)); + column: $table.source, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get tags => $composableBuilder( - column: $table.tags, builder: (column) => ColumnFilters(column)); + column: $table.tags, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get feedType => $composableBuilder( - column: $table.feedType, builder: (column) => ColumnFilters(column)); + column: $table.feedType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get feedName => $composableBuilder( - column: $table.feedName, builder: (column) => ColumnFilters(column)); + column: $table.feedName, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get feedIcon => $composableBuilder( - column: $table.feedIcon, builder: (column) => ColumnFilters(column)); + column: $table.feedIcon, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get views => $composableBuilder( - column: $table.views, builder: (column) => ColumnFilters(column)); + column: $table.views, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get imageUrl => $composableBuilder( - column: $table.imageUrl, builder: (column) => ColumnFilters(column)); + column: $table.imageUrl, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isFavorite => $composableBuilder( - column: $table.isFavorite, builder: (column) => ColumnFilters(column)); + column: $table.isFavorite, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isLiked => $composableBuilder( - column: $table.isLiked, builder: (column) => ColumnFilters(column)); + column: $table.isLiked, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isRead => $composableBuilder( - column: $table.isRead, builder: (column) => ColumnFilters(column)); + column: $table.isRead, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$SentencesTableOrderingComposer @@ -15508,49 +18489,79 @@ class $$SentencesTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnOrderings(column)); + column: $table.content, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get author => $composableBuilder( - column: $table.author, builder: (column) => ColumnOrderings(column)); + column: $table.author, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get source => $composableBuilder( - column: $table.source, builder: (column) => ColumnOrderings(column)); + column: $table.source, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get tags => $composableBuilder( - column: $table.tags, builder: (column) => ColumnOrderings(column)); + column: $table.tags, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get feedType => $composableBuilder( - column: $table.feedType, builder: (column) => ColumnOrderings(column)); + column: $table.feedType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get feedName => $composableBuilder( - column: $table.feedName, builder: (column) => ColumnOrderings(column)); + column: $table.feedName, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get feedIcon => $composableBuilder( - column: $table.feedIcon, builder: (column) => ColumnOrderings(column)); + column: $table.feedIcon, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get views => $composableBuilder( - column: $table.views, builder: (column) => ColumnOrderings(column)); + column: $table.views, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get imageUrl => $composableBuilder( - column: $table.imageUrl, builder: (column) => ColumnOrderings(column)); + column: $table.imageUrl, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isFavorite => $composableBuilder( - column: $table.isFavorite, builder: (column) => ColumnOrderings(column)); + column: $table.isFavorite, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isLiked => $composableBuilder( - column: $table.isLiked, builder: (column) => ColumnOrderings(column)); + column: $table.isLiked, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isRead => $composableBuilder( - column: $table.isRead, builder: (column) => ColumnOrderings(column)); + column: $table.isRead, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$SentencesTableAnnotationComposer @@ -15593,7 +18604,9 @@ class $$SentencesTableAnnotationComposer $composableBuilder(column: $table.imageUrl, builder: (column) => column); GeneratedColumn get isFavorite => $composableBuilder( - column: $table.isFavorite, builder: (column) => column); + column: $table.isFavorite, + builder: (column) => column, + ); GeneratedColumn get isLiked => $composableBuilder(column: $table.isLiked, builder: (column) => column); @@ -15608,20 +18621,24 @@ class $$SentencesTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$SentencesTableTableManager extends RootTableManager< - _$AppDatabase, - $SentencesTable, - Sentence, - $$SentencesTableFilterComposer, - $$SentencesTableOrderingComposer, - $$SentencesTableAnnotationComposer, - $$SentencesTableCreateCompanionBuilder, - $$SentencesTableUpdateCompanionBuilder, - (Sentence, BaseReferences<_$AppDatabase, $SentencesTable, Sentence>), - Sentence, - PrefetchHooks Function()> { +class $$SentencesTableTableManager + extends + RootTableManager< + _$AppDatabase, + $SentencesTable, + Sentence, + $$SentencesTableFilterComposer, + $$SentencesTableOrderingComposer, + $$SentencesTableAnnotationComposer, + $$SentencesTableCreateCompanionBuilder, + $$SentencesTableUpdateCompanionBuilder, + (Sentence, BaseReferences<_$AppDatabase, $SentencesTable, Sentence>), + Sentence, + PrefetchHooks Function() + > { $$SentencesTableTableManager(_$AppDatabase db, $SentencesTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -15630,107 +18647,112 @@ class $$SentencesTableTableManager extends RootTableManager< $$SentencesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$SentencesTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value content = const Value.absent(), - Value author = const Value.absent(), - Value source = const Value.absent(), - Value tags = const Value.absent(), - Value feedType = const Value.absent(), - Value feedName = const Value.absent(), - Value feedIcon = const Value.absent(), - Value views = const Value.absent(), - Value imageUrl = const Value.absent(), - Value isFavorite = const Value.absent(), - Value isLiked = const Value.absent(), - Value isRead = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - SentencesCompanion( - id: id, - content: content, - author: author, - source: source, - tags: tags, - feedType: feedType, - feedName: feedName, - feedIcon: feedIcon, - views: views, - imageUrl: imageUrl, - isFavorite: isFavorite, - isLiked: isLiked, - isRead: isRead, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String content, - Value author = const Value.absent(), - Value source = const Value.absent(), - Value tags = const Value.absent(), - Value feedType = const Value.absent(), - Value feedName = const Value.absent(), - Value feedIcon = const Value.absent(), - Value views = const Value.absent(), - Value imageUrl = const Value.absent(), - Value isFavorite = const Value.absent(), - Value isLiked = const Value.absent(), - Value isRead = const Value.absent(), - required DateTime createdAt, - required DateTime updatedAt, - Value rowid = const Value.absent(), - }) => - SentencesCompanion.insert( - id: id, - content: content, - author: author, - source: source, - tags: tags, - feedType: feedType, - feedName: feedName, - feedIcon: feedIcon, - views: views, - imageUrl: imageUrl, - isFavorite: isFavorite, - isLiked: isLiked, - isRead: isRead, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value content = const Value.absent(), + Value author = const Value.absent(), + Value source = const Value.absent(), + Value tags = const Value.absent(), + Value feedType = const Value.absent(), + Value feedName = const Value.absent(), + Value feedIcon = const Value.absent(), + Value views = const Value.absent(), + Value imageUrl = const Value.absent(), + Value isFavorite = const Value.absent(), + Value isLiked = const Value.absent(), + Value isRead = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => SentencesCompanion( + id: id, + content: content, + author: author, + source: source, + tags: tags, + feedType: feedType, + feedName: feedName, + feedIcon: feedIcon, + views: views, + imageUrl: imageUrl, + isFavorite: isFavorite, + isLiked: isLiked, + isRead: isRead, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String content, + Value author = const Value.absent(), + Value source = const Value.absent(), + Value tags = const Value.absent(), + Value feedType = const Value.absent(), + Value feedName = const Value.absent(), + Value feedIcon = const Value.absent(), + Value views = const Value.absent(), + Value imageUrl = const Value.absent(), + Value isFavorite = const Value.absent(), + Value isLiked = const Value.absent(), + Value isRead = const Value.absent(), + required DateTime createdAt, + required DateTime updatedAt, + Value rowid = const Value.absent(), + }) => SentencesCompanion.insert( + id: id, + content: content, + author: author, + source: source, + tags: tags, + feedType: feedType, + feedName: feedName, + feedIcon: feedIcon, + views: views, + imageUrl: imageUrl, + isFavorite: isFavorite, + isLiked: isLiked, + isRead: isRead, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$SentencesTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $SentencesTable, - Sentence, - $$SentencesTableFilterComposer, - $$SentencesTableOrderingComposer, - $$SentencesTableAnnotationComposer, - $$SentencesTableCreateCompanionBuilder, - $$SentencesTableUpdateCompanionBuilder, - (Sentence, BaseReferences<_$AppDatabase, $SentencesTable, Sentence>), - Sentence, - PrefetchHooks Function()>; -typedef $$FavoritesTableCreateCompanionBuilder = FavoritesCompanion Function({ - required String sentenceId, - required DateTime favoritedAt, - Value rowid, -}); -typedef $$FavoritesTableUpdateCompanionBuilder = FavoritesCompanion Function({ - Value sentenceId, - Value favoritedAt, - Value rowid, -}); +typedef $$SentencesTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $SentencesTable, + Sentence, + $$SentencesTableFilterComposer, + $$SentencesTableOrderingComposer, + $$SentencesTableAnnotationComposer, + $$SentencesTableCreateCompanionBuilder, + $$SentencesTableUpdateCompanionBuilder, + (Sentence, BaseReferences<_$AppDatabase, $SentencesTable, Sentence>), + Sentence, + PrefetchHooks Function() + >; +typedef $$FavoritesTableCreateCompanionBuilder = + FavoritesCompanion Function({ + required String sentenceId, + required DateTime favoritedAt, + Value rowid, + }); +typedef $$FavoritesTableUpdateCompanionBuilder = + FavoritesCompanion Function({ + Value sentenceId, + Value favoritedAt, + Value rowid, + }); class $$FavoritesTableFilterComposer extends Composer<_$AppDatabase, $FavoritesTable> { @@ -15742,10 +18764,14 @@ class $$FavoritesTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get sentenceId => $composableBuilder( - column: $table.sentenceId, builder: (column) => ColumnFilters(column)); + column: $table.sentenceId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get favoritedAt => $composableBuilder( - column: $table.favoritedAt, builder: (column) => ColumnFilters(column)); + column: $table.favoritedAt, + builder: (column) => ColumnFilters(column), + ); } class $$FavoritesTableOrderingComposer @@ -15758,10 +18784,14 @@ class $$FavoritesTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get sentenceId => $composableBuilder( - column: $table.sentenceId, builder: (column) => ColumnOrderings(column)); + column: $table.sentenceId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get favoritedAt => $composableBuilder( - column: $table.favoritedAt, builder: (column) => ColumnOrderings(column)); + column: $table.favoritedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$FavoritesTableAnnotationComposer @@ -15774,26 +18804,34 @@ class $$FavoritesTableAnnotationComposer super.$removeJoinBuilderFromRootComposer, }); GeneratedColumn get sentenceId => $composableBuilder( - column: $table.sentenceId, builder: (column) => column); + column: $table.sentenceId, + builder: (column) => column, + ); GeneratedColumn get favoritedAt => $composableBuilder( - column: $table.favoritedAt, builder: (column) => column); + column: $table.favoritedAt, + builder: (column) => column, + ); } -class $$FavoritesTableTableManager extends RootTableManager< - _$AppDatabase, - $FavoritesTable, - Favorite, - $$FavoritesTableFilterComposer, - $$FavoritesTableOrderingComposer, - $$FavoritesTableAnnotationComposer, - $$FavoritesTableCreateCompanionBuilder, - $$FavoritesTableUpdateCompanionBuilder, - (Favorite, BaseReferences<_$AppDatabase, $FavoritesTable, Favorite>), - Favorite, - PrefetchHooks Function()> { +class $$FavoritesTableTableManager + extends + RootTableManager< + _$AppDatabase, + $FavoritesTable, + Favorite, + $$FavoritesTableFilterComposer, + $$FavoritesTableOrderingComposer, + $$FavoritesTableAnnotationComposer, + $$FavoritesTableCreateCompanionBuilder, + $$FavoritesTableUpdateCompanionBuilder, + (Favorite, BaseReferences<_$AppDatabase, $FavoritesTable, Favorite>), + Favorite, + PrefetchHooks Function() + > { $$FavoritesTableTableManager(_$AppDatabase db, $FavoritesTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -15802,57 +18840,60 @@ class $$FavoritesTableTableManager extends RootTableManager< $$FavoritesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$FavoritesTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value sentenceId = const Value.absent(), - Value favoritedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - FavoritesCompanion( - sentenceId: sentenceId, - favoritedAt: favoritedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String sentenceId, - required DateTime favoritedAt, - Value rowid = const Value.absent(), - }) => - FavoritesCompanion.insert( - sentenceId: sentenceId, - favoritedAt: favoritedAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value sentenceId = const Value.absent(), + Value favoritedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => FavoritesCompanion( + sentenceId: sentenceId, + favoritedAt: favoritedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String sentenceId, + required DateTime favoritedAt, + Value rowid = const Value.absent(), + }) => FavoritesCompanion.insert( + sentenceId: sentenceId, + favoritedAt: favoritedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$FavoritesTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $FavoritesTable, - Favorite, - $$FavoritesTableFilterComposer, - $$FavoritesTableOrderingComposer, - $$FavoritesTableAnnotationComposer, - $$FavoritesTableCreateCompanionBuilder, - $$FavoritesTableUpdateCompanionBuilder, - (Favorite, BaseReferences<_$AppDatabase, $FavoritesTable, Favorite>), - Favorite, - PrefetchHooks Function()>; -typedef $$ReadHistoryTableCreateCompanionBuilder = ReadHistoryCompanion - Function({ - Value id, - required String sentenceId, - required DateTime readAt, -}); -typedef $$ReadHistoryTableUpdateCompanionBuilder = ReadHistoryCompanion - Function({ - Value id, - Value sentenceId, - Value readAt, -}); +typedef $$FavoritesTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $FavoritesTable, + Favorite, + $$FavoritesTableFilterComposer, + $$FavoritesTableOrderingComposer, + $$FavoritesTableAnnotationComposer, + $$FavoritesTableCreateCompanionBuilder, + $$FavoritesTableUpdateCompanionBuilder, + (Favorite, BaseReferences<_$AppDatabase, $FavoritesTable, Favorite>), + Favorite, + PrefetchHooks Function() + >; +typedef $$ReadHistoryTableCreateCompanionBuilder = + ReadHistoryCompanion Function({ + Value id, + required String sentenceId, + required DateTime readAt, + }); +typedef $$ReadHistoryTableUpdateCompanionBuilder = + ReadHistoryCompanion Function({ + Value id, + Value sentenceId, + Value readAt, + }); class $$ReadHistoryTableFilterComposer extends Composer<_$AppDatabase, $ReadHistoryTable> { @@ -15864,13 +18905,19 @@ class $$ReadHistoryTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get sentenceId => $composableBuilder( - column: $table.sentenceId, builder: (column) => ColumnFilters(column)); + column: $table.sentenceId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get readAt => $composableBuilder( - column: $table.readAt, builder: (column) => ColumnFilters(column)); + column: $table.readAt, + builder: (column) => ColumnFilters(column), + ); } class $$ReadHistoryTableOrderingComposer @@ -15883,13 +18930,19 @@ class $$ReadHistoryTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get sentenceId => $composableBuilder( - column: $table.sentenceId, builder: (column) => ColumnOrderings(column)); + column: $table.sentenceId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get readAt => $composableBuilder( - column: $table.readAt, builder: (column) => ColumnOrderings(column)); + column: $table.readAt, + builder: (column) => ColumnOrderings(column), + ); } class $$ReadHistoryTableAnnotationComposer @@ -15905,29 +18958,35 @@ class $$ReadHistoryTableAnnotationComposer $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumn get sentenceId => $composableBuilder( - column: $table.sentenceId, builder: (column) => column); + column: $table.sentenceId, + builder: (column) => column, + ); GeneratedColumn get readAt => $composableBuilder(column: $table.readAt, builder: (column) => column); } -class $$ReadHistoryTableTableManager extends RootTableManager< - _$AppDatabase, - $ReadHistoryTable, - ReadHistoryData, - $$ReadHistoryTableFilterComposer, - $$ReadHistoryTableOrderingComposer, - $$ReadHistoryTableAnnotationComposer, - $$ReadHistoryTableCreateCompanionBuilder, - $$ReadHistoryTableUpdateCompanionBuilder, - ( - ReadHistoryData, - BaseReferences<_$AppDatabase, $ReadHistoryTable, ReadHistoryData> - ), - ReadHistoryData, - PrefetchHooks Function()> { +class $$ReadHistoryTableTableManager + extends + RootTableManager< + _$AppDatabase, + $ReadHistoryTable, + ReadHistoryData, + $$ReadHistoryTableFilterComposer, + $$ReadHistoryTableOrderingComposer, + $$ReadHistoryTableAnnotationComposer, + $$ReadHistoryTableCreateCompanionBuilder, + $$ReadHistoryTableUpdateCompanionBuilder, + ( + ReadHistoryData, + BaseReferences<_$AppDatabase, $ReadHistoryTable, ReadHistoryData>, + ), + ReadHistoryData, + PrefetchHooks Function() + > { $$ReadHistoryTableTableManager(_$AppDatabase db, $ReadHistoryTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -15936,70 +18995,73 @@ class $$ReadHistoryTableTableManager extends RootTableManager< $$ReadHistoryTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$ReadHistoryTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value sentenceId = const Value.absent(), - Value readAt = const Value.absent(), - }) => - ReadHistoryCompanion( - id: id, - sentenceId: sentenceId, - readAt: readAt, - ), - createCompanionCallback: ({ - Value id = const Value.absent(), - required String sentenceId, - required DateTime readAt, - }) => - ReadHistoryCompanion.insert( - id: id, - sentenceId: sentenceId, - readAt: readAt, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value sentenceId = const Value.absent(), + Value readAt = const Value.absent(), + }) => ReadHistoryCompanion( + id: id, + sentenceId: sentenceId, + readAt: readAt, + ), + createCompanionCallback: + ({ + Value id = const Value.absent(), + required String sentenceId, + required DateTime readAt, + }) => ReadHistoryCompanion.insert( + id: id, + sentenceId: sentenceId, + readAt: readAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$ReadHistoryTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $ReadHistoryTable, - ReadHistoryData, - $$ReadHistoryTableFilterComposer, - $$ReadHistoryTableOrderingComposer, - $$ReadHistoryTableAnnotationComposer, - $$ReadHistoryTableCreateCompanionBuilder, - $$ReadHistoryTableUpdateCompanionBuilder, - ( +typedef $$ReadHistoryTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $ReadHistoryTable, ReadHistoryData, - BaseReferences<_$AppDatabase, $ReadHistoryTable, ReadHistoryData> - ), - ReadHistoryData, - PrefetchHooks Function()>; -typedef $$CardTemplatesTableCreateCompanionBuilder = CardTemplatesCompanion - Function({ - required String id, - required String name, - required String type, - required String configJson, - Value thumbnailPath, - Value isPreset, - required DateTime createdAt, - Value rowid, -}); -typedef $$CardTemplatesTableUpdateCompanionBuilder = CardTemplatesCompanion - Function({ - Value id, - Value name, - Value type, - Value configJson, - Value thumbnailPath, - Value isPreset, - Value createdAt, - Value rowid, -}); + $$ReadHistoryTableFilterComposer, + $$ReadHistoryTableOrderingComposer, + $$ReadHistoryTableAnnotationComposer, + $$ReadHistoryTableCreateCompanionBuilder, + $$ReadHistoryTableUpdateCompanionBuilder, + ( + ReadHistoryData, + BaseReferences<_$AppDatabase, $ReadHistoryTable, ReadHistoryData>, + ), + ReadHistoryData, + PrefetchHooks Function() + >; +typedef $$CardTemplatesTableCreateCompanionBuilder = + CardTemplatesCompanion Function({ + required String id, + required String name, + required String type, + required String configJson, + Value thumbnailPath, + Value isPreset, + required DateTime createdAt, + Value rowid, + }); +typedef $$CardTemplatesTableUpdateCompanionBuilder = + CardTemplatesCompanion Function({ + Value id, + Value name, + Value type, + Value configJson, + Value thumbnailPath, + Value isPreset, + Value createdAt, + Value rowid, + }); class $$CardTemplatesTableFilterComposer extends Composer<_$AppDatabase, $CardTemplatesTable> { @@ -16011,25 +19073,39 @@ class $$CardTemplatesTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get name => $composableBuilder( - column: $table.name, builder: (column) => ColumnFilters(column)); + column: $table.name, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get type => $composableBuilder( - column: $table.type, builder: (column) => ColumnFilters(column)); + column: $table.type, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get configJson => $composableBuilder( - column: $table.configJson, builder: (column) => ColumnFilters(column)); + column: $table.configJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, builder: (column) => ColumnFilters(column)); + column: $table.thumbnailPath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isPreset => $composableBuilder( - column: $table.isPreset, builder: (column) => ColumnFilters(column)); + column: $table.isPreset, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); } class $$CardTemplatesTableOrderingComposer @@ -16042,26 +19118,39 @@ class $$CardTemplatesTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get name => $composableBuilder( - column: $table.name, builder: (column) => ColumnOrderings(column)); + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get type => $composableBuilder( - column: $table.type, builder: (column) => ColumnOrderings(column)); + column: $table.type, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get configJson => $composableBuilder( - column: $table.configJson, builder: (column) => ColumnOrderings(column)); + column: $table.configJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, - builder: (column) => ColumnOrderings(column)); + column: $table.thumbnailPath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isPreset => $composableBuilder( - column: $table.isPreset, builder: (column) => ColumnOrderings(column)); + column: $table.isPreset, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$CardTemplatesTableAnnotationComposer @@ -16083,10 +19172,14 @@ class $$CardTemplatesTableAnnotationComposer $composableBuilder(column: $table.type, builder: (column) => column); GeneratedColumn get configJson => $composableBuilder( - column: $table.configJson, builder: (column) => column); + column: $table.configJson, + builder: (column) => column, + ); GeneratedColumn get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, builder: (column) => column); + column: $table.thumbnailPath, + builder: (column) => column, + ); GeneratedColumn get isPreset => $composableBuilder(column: $table.isPreset, builder: (column) => column); @@ -16095,23 +19188,27 @@ class $$CardTemplatesTableAnnotationComposer $composableBuilder(column: $table.createdAt, builder: (column) => column); } -class $$CardTemplatesTableTableManager extends RootTableManager< - _$AppDatabase, - $CardTemplatesTable, - CardTemplate, - $$CardTemplatesTableFilterComposer, - $$CardTemplatesTableOrderingComposer, - $$CardTemplatesTableAnnotationComposer, - $$CardTemplatesTableCreateCompanionBuilder, - $$CardTemplatesTableUpdateCompanionBuilder, - ( - CardTemplate, - BaseReferences<_$AppDatabase, $CardTemplatesTable, CardTemplate> - ), - CardTemplate, - PrefetchHooks Function()> { +class $$CardTemplatesTableTableManager + extends + RootTableManager< + _$AppDatabase, + $CardTemplatesTable, + CardTemplate, + $$CardTemplatesTableFilterComposer, + $$CardTemplatesTableOrderingComposer, + $$CardTemplatesTableAnnotationComposer, + $$CardTemplatesTableCreateCompanionBuilder, + $$CardTemplatesTableUpdateCompanionBuilder, + ( + CardTemplate, + BaseReferences<_$AppDatabase, $CardTemplatesTable, CardTemplate>, + ), + CardTemplate, + PrefetchHooks Function() + > { $$CardTemplatesTableTableManager(_$AppDatabase db, $CardTemplatesTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -16120,86 +19217,89 @@ class $$CardTemplatesTableTableManager extends RootTableManager< $$CardTemplatesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$CardTemplatesTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value name = const Value.absent(), - Value type = const Value.absent(), - Value configJson = const Value.absent(), - Value thumbnailPath = const Value.absent(), - Value isPreset = const Value.absent(), - Value createdAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - CardTemplatesCompanion( - id: id, - name: name, - type: type, - configJson: configJson, - thumbnailPath: thumbnailPath, - isPreset: isPreset, - createdAt: createdAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String name, - required String type, - required String configJson, - Value thumbnailPath = const Value.absent(), - Value isPreset = const Value.absent(), - required DateTime createdAt, - Value rowid = const Value.absent(), - }) => - CardTemplatesCompanion.insert( - id: id, - name: name, - type: type, - configJson: configJson, - thumbnailPath: thumbnailPath, - isPreset: isPreset, - createdAt: createdAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value type = const Value.absent(), + Value configJson = const Value.absent(), + Value thumbnailPath = const Value.absent(), + Value isPreset = const Value.absent(), + Value createdAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => CardTemplatesCompanion( + id: id, + name: name, + type: type, + configJson: configJson, + thumbnailPath: thumbnailPath, + isPreset: isPreset, + createdAt: createdAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String name, + required String type, + required String configJson, + Value thumbnailPath = const Value.absent(), + Value isPreset = const Value.absent(), + required DateTime createdAt, + Value rowid = const Value.absent(), + }) => CardTemplatesCompanion.insert( + id: id, + name: name, + type: type, + configJson: configJson, + thumbnailPath: thumbnailPath, + isPreset: isPreset, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$CardTemplatesTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $CardTemplatesTable, - CardTemplate, - $$CardTemplatesTableFilterComposer, - $$CardTemplatesTableOrderingComposer, - $$CardTemplatesTableAnnotationComposer, - $$CardTemplatesTableCreateCompanionBuilder, - $$CardTemplatesTableUpdateCompanionBuilder, - ( +typedef $$CardTemplatesTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $CardTemplatesTable, CardTemplate, - BaseReferences<_$AppDatabase, $CardTemplatesTable, CardTemplate> - ), - CardTemplate, - PrefetchHooks Function()>; -typedef $$ToolUsageStatsTableCreateCompanionBuilder = ToolUsageStatsCompanion - Function({ - required String toolId, - Value toolName, - Value useCount, - required DateTime lastUsedAt, - required DateTime createdAt, - Value rowid, -}); -typedef $$ToolUsageStatsTableUpdateCompanionBuilder = ToolUsageStatsCompanion - Function({ - Value toolId, - Value toolName, - Value useCount, - Value lastUsedAt, - Value createdAt, - Value rowid, -}); + $$CardTemplatesTableFilterComposer, + $$CardTemplatesTableOrderingComposer, + $$CardTemplatesTableAnnotationComposer, + $$CardTemplatesTableCreateCompanionBuilder, + $$CardTemplatesTableUpdateCompanionBuilder, + ( + CardTemplate, + BaseReferences<_$AppDatabase, $CardTemplatesTable, CardTemplate>, + ), + CardTemplate, + PrefetchHooks Function() + >; +typedef $$ToolUsageStatsTableCreateCompanionBuilder = + ToolUsageStatsCompanion Function({ + required String toolId, + Value toolName, + Value useCount, + required DateTime lastUsedAt, + required DateTime createdAt, + Value rowid, + }); +typedef $$ToolUsageStatsTableUpdateCompanionBuilder = + ToolUsageStatsCompanion Function({ + Value toolId, + Value toolName, + Value useCount, + Value lastUsedAt, + Value createdAt, + Value rowid, + }); class $$ToolUsageStatsTableFilterComposer extends Composer<_$AppDatabase, $ToolUsageStatsTable> { @@ -16211,19 +19311,29 @@ class $$ToolUsageStatsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get toolId => $composableBuilder( - column: $table.toolId, builder: (column) => ColumnFilters(column)); + column: $table.toolId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get toolName => $composableBuilder( - column: $table.toolName, builder: (column) => ColumnFilters(column)); + column: $table.toolName, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get useCount => $composableBuilder( - column: $table.useCount, builder: (column) => ColumnFilters(column)); + column: $table.useCount, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get lastUsedAt => $composableBuilder( - column: $table.lastUsedAt, builder: (column) => ColumnFilters(column)); + column: $table.lastUsedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); } class $$ToolUsageStatsTableOrderingComposer @@ -16236,19 +19346,29 @@ class $$ToolUsageStatsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get toolId => $composableBuilder( - column: $table.toolId, builder: (column) => ColumnOrderings(column)); + column: $table.toolId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get toolName => $composableBuilder( - column: $table.toolName, builder: (column) => ColumnOrderings(column)); + column: $table.toolName, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get useCount => $composableBuilder( - column: $table.useCount, builder: (column) => ColumnOrderings(column)); + column: $table.useCount, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get lastUsedAt => $composableBuilder( - column: $table.lastUsedAt, builder: (column) => ColumnOrderings(column)); + column: $table.lastUsedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$ToolUsageStatsTableAnnotationComposer @@ -16270,30 +19390,37 @@ class $$ToolUsageStatsTableAnnotationComposer $composableBuilder(column: $table.useCount, builder: (column) => column); GeneratedColumn get lastUsedAt => $composableBuilder( - column: $table.lastUsedAt, builder: (column) => column); + column: $table.lastUsedAt, + builder: (column) => column, + ); GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); } -class $$ToolUsageStatsTableTableManager extends RootTableManager< - _$AppDatabase, - $ToolUsageStatsTable, - ToolUsageStat, - $$ToolUsageStatsTableFilterComposer, - $$ToolUsageStatsTableOrderingComposer, - $$ToolUsageStatsTableAnnotationComposer, - $$ToolUsageStatsTableCreateCompanionBuilder, - $$ToolUsageStatsTableUpdateCompanionBuilder, - ( - ToolUsageStat, - BaseReferences<_$AppDatabase, $ToolUsageStatsTable, ToolUsageStat> - ), - ToolUsageStat, - PrefetchHooks Function()> { +class $$ToolUsageStatsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $ToolUsageStatsTable, + ToolUsageStat, + $$ToolUsageStatsTableFilterComposer, + $$ToolUsageStatsTableOrderingComposer, + $$ToolUsageStatsTableAnnotationComposer, + $$ToolUsageStatsTableCreateCompanionBuilder, + $$ToolUsageStatsTableUpdateCompanionBuilder, + ( + ToolUsageStat, + BaseReferences<_$AppDatabase, $ToolUsageStatsTable, ToolUsageStat>, + ), + ToolUsageStat, + PrefetchHooks Function() + > { $$ToolUsageStatsTableTableManager( - _$AppDatabase db, $ToolUsageStatsTable table) - : super(TableManagerState( + _$AppDatabase db, + $ToolUsageStatsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -16302,98 +19429,103 @@ class $$ToolUsageStatsTableTableManager extends RootTableManager< $$ToolUsageStatsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$ToolUsageStatsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value toolId = const Value.absent(), - Value toolName = const Value.absent(), - Value useCount = const Value.absent(), - Value lastUsedAt = const Value.absent(), - Value createdAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - ToolUsageStatsCompanion( - toolId: toolId, - toolName: toolName, - useCount: useCount, - lastUsedAt: lastUsedAt, - createdAt: createdAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String toolId, - Value toolName = const Value.absent(), - Value useCount = const Value.absent(), - required DateTime lastUsedAt, - required DateTime createdAt, - Value rowid = const Value.absent(), - }) => - ToolUsageStatsCompanion.insert( - toolId: toolId, - toolName: toolName, - useCount: useCount, - lastUsedAt: lastUsedAt, - createdAt: createdAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value toolId = const Value.absent(), + Value toolName = const Value.absent(), + Value useCount = const Value.absent(), + Value lastUsedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => ToolUsageStatsCompanion( + toolId: toolId, + toolName: toolName, + useCount: useCount, + lastUsedAt: lastUsedAt, + createdAt: createdAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String toolId, + Value toolName = const Value.absent(), + Value useCount = const Value.absent(), + required DateTime lastUsedAt, + required DateTime createdAt, + Value rowid = const Value.absent(), + }) => ToolUsageStatsCompanion.insert( + toolId: toolId, + toolName: toolName, + useCount: useCount, + lastUsedAt: lastUsedAt, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$ToolUsageStatsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $ToolUsageStatsTable, - ToolUsageStat, - $$ToolUsageStatsTableFilterComposer, - $$ToolUsageStatsTableOrderingComposer, - $$ToolUsageStatsTableAnnotationComposer, - $$ToolUsageStatsTableCreateCompanionBuilder, - $$ToolUsageStatsTableUpdateCompanionBuilder, - ( +typedef $$ToolUsageStatsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $ToolUsageStatsTable, ToolUsageStat, - BaseReferences<_$AppDatabase, $ToolUsageStatsTable, ToolUsageStat> - ), - ToolUsageStat, - PrefetchHooks Function()>; -typedef $$FeedCacheTableCreateCompanionBuilder = FeedCacheCompanion Function({ - required String id, - required String content, - Value author, - Value source, - Value feedType, - Value channel, - Value summary, - Value imageUrl, - Value likes, - Value views, - Value isLiked, - Value isFavorited, - Value isBookmarked, - Value cachePriority, - required DateTime cachedAt, - required DateTime expiresAt, - Value rowid, -}); -typedef $$FeedCacheTableUpdateCompanionBuilder = FeedCacheCompanion Function({ - Value id, - Value content, - Value author, - Value source, - Value feedType, - Value channel, - Value summary, - Value imageUrl, - Value likes, - Value views, - Value isLiked, - Value isFavorited, - Value isBookmarked, - Value cachePriority, - Value cachedAt, - Value expiresAt, - Value rowid, -}); + $$ToolUsageStatsTableFilterComposer, + $$ToolUsageStatsTableOrderingComposer, + $$ToolUsageStatsTableAnnotationComposer, + $$ToolUsageStatsTableCreateCompanionBuilder, + $$ToolUsageStatsTableUpdateCompanionBuilder, + ( + ToolUsageStat, + BaseReferences<_$AppDatabase, $ToolUsageStatsTable, ToolUsageStat>, + ), + ToolUsageStat, + PrefetchHooks Function() + >; +typedef $$FeedCacheTableCreateCompanionBuilder = + FeedCacheCompanion Function({ + required String id, + required String content, + Value author, + Value source, + Value feedType, + Value channel, + Value summary, + Value imageUrl, + Value likes, + Value views, + Value isLiked, + Value isFavorited, + Value isBookmarked, + Value cachePriority, + required DateTime cachedAt, + required DateTime expiresAt, + Value rowid, + }); +typedef $$FeedCacheTableUpdateCompanionBuilder = + FeedCacheCompanion Function({ + Value id, + Value content, + Value author, + Value source, + Value feedType, + Value channel, + Value summary, + Value imageUrl, + Value likes, + Value views, + Value isLiked, + Value isFavorited, + Value isBookmarked, + Value cachePriority, + Value cachedAt, + Value expiresAt, + Value rowid, + }); class $$FeedCacheTableFilterComposer extends Composer<_$AppDatabase, $FeedCacheTable> { @@ -16405,52 +19537,84 @@ class $$FeedCacheTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnFilters(column)); + column: $table.content, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get author => $composableBuilder( - column: $table.author, builder: (column) => ColumnFilters(column)); + column: $table.author, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get source => $composableBuilder( - column: $table.source, builder: (column) => ColumnFilters(column)); + column: $table.source, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get feedType => $composableBuilder( - column: $table.feedType, builder: (column) => ColumnFilters(column)); + column: $table.feedType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get channel => $composableBuilder( - column: $table.channel, builder: (column) => ColumnFilters(column)); + column: $table.channel, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get summary => $composableBuilder( - column: $table.summary, builder: (column) => ColumnFilters(column)); + column: $table.summary, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get imageUrl => $composableBuilder( - column: $table.imageUrl, builder: (column) => ColumnFilters(column)); + column: $table.imageUrl, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get likes => $composableBuilder( - column: $table.likes, builder: (column) => ColumnFilters(column)); + column: $table.likes, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get views => $composableBuilder( - column: $table.views, builder: (column) => ColumnFilters(column)); + column: $table.views, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isLiked => $composableBuilder( - column: $table.isLiked, builder: (column) => ColumnFilters(column)); + column: $table.isLiked, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isFavorited => $composableBuilder( - column: $table.isFavorited, builder: (column) => ColumnFilters(column)); + column: $table.isFavorited, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isBookmarked => $composableBuilder( - column: $table.isBookmarked, builder: (column) => ColumnFilters(column)); + column: $table.isBookmarked, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get cachePriority => $composableBuilder( - column: $table.cachePriority, builder: (column) => ColumnFilters(column)); + column: $table.cachePriority, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get cachedAt => $composableBuilder( - column: $table.cachedAt, builder: (column) => ColumnFilters(column)); + column: $table.cachedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get expiresAt => $composableBuilder( - column: $table.expiresAt, builder: (column) => ColumnFilters(column)); + column: $table.expiresAt, + builder: (column) => ColumnFilters(column), + ); } class $$FeedCacheTableOrderingComposer @@ -16463,54 +19627,84 @@ class $$FeedCacheTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnOrderings(column)); + column: $table.content, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get author => $composableBuilder( - column: $table.author, builder: (column) => ColumnOrderings(column)); + column: $table.author, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get source => $composableBuilder( - column: $table.source, builder: (column) => ColumnOrderings(column)); + column: $table.source, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get feedType => $composableBuilder( - column: $table.feedType, builder: (column) => ColumnOrderings(column)); + column: $table.feedType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get channel => $composableBuilder( - column: $table.channel, builder: (column) => ColumnOrderings(column)); + column: $table.channel, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get summary => $composableBuilder( - column: $table.summary, builder: (column) => ColumnOrderings(column)); + column: $table.summary, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get imageUrl => $composableBuilder( - column: $table.imageUrl, builder: (column) => ColumnOrderings(column)); + column: $table.imageUrl, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get likes => $composableBuilder( - column: $table.likes, builder: (column) => ColumnOrderings(column)); + column: $table.likes, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get views => $composableBuilder( - column: $table.views, builder: (column) => ColumnOrderings(column)); + column: $table.views, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isLiked => $composableBuilder( - column: $table.isLiked, builder: (column) => ColumnOrderings(column)); + column: $table.isLiked, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isFavorited => $composableBuilder( - column: $table.isFavorited, builder: (column) => ColumnOrderings(column)); + column: $table.isFavorited, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isBookmarked => $composableBuilder( - column: $table.isBookmarked, - builder: (column) => ColumnOrderings(column)); + column: $table.isBookmarked, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get cachePriority => $composableBuilder( - column: $table.cachePriority, - builder: (column) => ColumnOrderings(column)); + column: $table.cachePriority, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get cachedAt => $composableBuilder( - column: $table.cachedAt, builder: (column) => ColumnOrderings(column)); + column: $table.cachedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get expiresAt => $composableBuilder( - column: $table.expiresAt, builder: (column) => ColumnOrderings(column)); + column: $table.expiresAt, + builder: (column) => ColumnOrderings(column), + ); } class $$FeedCacheTableAnnotationComposer @@ -16556,13 +19750,19 @@ class $$FeedCacheTableAnnotationComposer $composableBuilder(column: $table.isLiked, builder: (column) => column); GeneratedColumn get isFavorited => $composableBuilder( - column: $table.isFavorited, builder: (column) => column); + column: $table.isFavorited, + builder: (column) => column, + ); GeneratedColumn get isBookmarked => $composableBuilder( - column: $table.isBookmarked, builder: (column) => column); + column: $table.isBookmarked, + builder: (column) => column, + ); GeneratedColumn get cachePriority => $composableBuilder( - column: $table.cachePriority, builder: (column) => column); + column: $table.cachePriority, + builder: (column) => column, + ); GeneratedColumn get cachedAt => $composableBuilder(column: $table.cachedAt, builder: (column) => column); @@ -16571,23 +19771,27 @@ class $$FeedCacheTableAnnotationComposer $composableBuilder(column: $table.expiresAt, builder: (column) => column); } -class $$FeedCacheTableTableManager extends RootTableManager< - _$AppDatabase, - $FeedCacheTable, - FeedCacheData, - $$FeedCacheTableFilterComposer, - $$FeedCacheTableOrderingComposer, - $$FeedCacheTableAnnotationComposer, - $$FeedCacheTableCreateCompanionBuilder, - $$FeedCacheTableUpdateCompanionBuilder, - ( - FeedCacheData, - BaseReferences<_$AppDatabase, $FeedCacheTable, FeedCacheData> - ), - FeedCacheData, - PrefetchHooks Function()> { +class $$FeedCacheTableTableManager + extends + RootTableManager< + _$AppDatabase, + $FeedCacheTable, + FeedCacheData, + $$FeedCacheTableFilterComposer, + $$FeedCacheTableOrderingComposer, + $$FeedCacheTableAnnotationComposer, + $$FeedCacheTableCreateCompanionBuilder, + $$FeedCacheTableUpdateCompanionBuilder, + ( + FeedCacheData, + BaseReferences<_$AppDatabase, $FeedCacheTable, FeedCacheData>, + ), + FeedCacheData, + PrefetchHooks Function() + > { $$FeedCacheTableTableManager(_$AppDatabase db, $FeedCacheTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -16596,124 +19800,127 @@ class $$FeedCacheTableTableManager extends RootTableManager< $$FeedCacheTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$FeedCacheTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value content = const Value.absent(), - Value author = const Value.absent(), - Value source = const Value.absent(), - Value feedType = const Value.absent(), - Value channel = const Value.absent(), - Value summary = const Value.absent(), - Value imageUrl = const Value.absent(), - Value likes = const Value.absent(), - Value views = const Value.absent(), - Value isLiked = const Value.absent(), - Value isFavorited = const Value.absent(), - Value isBookmarked = const Value.absent(), - Value cachePriority = const Value.absent(), - Value cachedAt = const Value.absent(), - Value expiresAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - FeedCacheCompanion( - id: id, - content: content, - author: author, - source: source, - feedType: feedType, - channel: channel, - summary: summary, - imageUrl: imageUrl, - likes: likes, - views: views, - isLiked: isLiked, - isFavorited: isFavorited, - isBookmarked: isBookmarked, - cachePriority: cachePriority, - cachedAt: cachedAt, - expiresAt: expiresAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String content, - Value author = const Value.absent(), - Value source = const Value.absent(), - Value feedType = const Value.absent(), - Value channel = const Value.absent(), - Value summary = const Value.absent(), - Value imageUrl = const Value.absent(), - Value likes = const Value.absent(), - Value views = const Value.absent(), - Value isLiked = const Value.absent(), - Value isFavorited = const Value.absent(), - Value isBookmarked = const Value.absent(), - Value cachePriority = const Value.absent(), - required DateTime cachedAt, - required DateTime expiresAt, - Value rowid = const Value.absent(), - }) => - FeedCacheCompanion.insert( - id: id, - content: content, - author: author, - source: source, - feedType: feedType, - channel: channel, - summary: summary, - imageUrl: imageUrl, - likes: likes, - views: views, - isLiked: isLiked, - isFavorited: isFavorited, - isBookmarked: isBookmarked, - cachePriority: cachePriority, - cachedAt: cachedAt, - expiresAt: expiresAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value content = const Value.absent(), + Value author = const Value.absent(), + Value source = const Value.absent(), + Value feedType = const Value.absent(), + Value channel = const Value.absent(), + Value summary = const Value.absent(), + Value imageUrl = const Value.absent(), + Value likes = const Value.absent(), + Value views = const Value.absent(), + Value isLiked = const Value.absent(), + Value isFavorited = const Value.absent(), + Value isBookmarked = const Value.absent(), + Value cachePriority = const Value.absent(), + Value cachedAt = const Value.absent(), + Value expiresAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => FeedCacheCompanion( + id: id, + content: content, + author: author, + source: source, + feedType: feedType, + channel: channel, + summary: summary, + imageUrl: imageUrl, + likes: likes, + views: views, + isLiked: isLiked, + isFavorited: isFavorited, + isBookmarked: isBookmarked, + cachePriority: cachePriority, + cachedAt: cachedAt, + expiresAt: expiresAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String content, + Value author = const Value.absent(), + Value source = const Value.absent(), + Value feedType = const Value.absent(), + Value channel = const Value.absent(), + Value summary = const Value.absent(), + Value imageUrl = const Value.absent(), + Value likes = const Value.absent(), + Value views = const Value.absent(), + Value isLiked = const Value.absent(), + Value isFavorited = const Value.absent(), + Value isBookmarked = const Value.absent(), + Value cachePriority = const Value.absent(), + required DateTime cachedAt, + required DateTime expiresAt, + Value rowid = const Value.absent(), + }) => FeedCacheCompanion.insert( + id: id, + content: content, + author: author, + source: source, + feedType: feedType, + channel: channel, + summary: summary, + imageUrl: imageUrl, + likes: likes, + views: views, + isLiked: isLiked, + isFavorited: isFavorited, + isBookmarked: isBookmarked, + cachePriority: cachePriority, + cachedAt: cachedAt, + expiresAt: expiresAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$FeedCacheTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $FeedCacheTable, - FeedCacheData, - $$FeedCacheTableFilterComposer, - $$FeedCacheTableOrderingComposer, - $$FeedCacheTableAnnotationComposer, - $$FeedCacheTableCreateCompanionBuilder, - $$FeedCacheTableUpdateCompanionBuilder, - ( +typedef $$FeedCacheTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $FeedCacheTable, FeedCacheData, - BaseReferences<_$AppDatabase, $FeedCacheTable, FeedCacheData> - ), - FeedCacheData, - PrefetchHooks Function()>; -typedef $$OfflineActionQueueTableCreateCompanionBuilder - = OfflineActionQueueCompanion Function({ - Value id, - required String feedId, - required String actionType, - Value payload, - Value retryCount, - required DateTime createdAt, - Value lastAttemptAt, -}); -typedef $$OfflineActionQueueTableUpdateCompanionBuilder - = OfflineActionQueueCompanion Function({ - Value id, - Value feedId, - Value actionType, - Value payload, - Value retryCount, - Value createdAt, - Value lastAttemptAt, -}); + $$FeedCacheTableFilterComposer, + $$FeedCacheTableOrderingComposer, + $$FeedCacheTableAnnotationComposer, + $$FeedCacheTableCreateCompanionBuilder, + $$FeedCacheTableUpdateCompanionBuilder, + ( + FeedCacheData, + BaseReferences<_$AppDatabase, $FeedCacheTable, FeedCacheData>, + ), + FeedCacheData, + PrefetchHooks Function() + >; +typedef $$OfflineActionQueueTableCreateCompanionBuilder = + OfflineActionQueueCompanion Function({ + Value id, + required String feedId, + required String actionType, + Value payload, + Value retryCount, + required DateTime createdAt, + Value lastAttemptAt, + }); +typedef $$OfflineActionQueueTableUpdateCompanionBuilder = + OfflineActionQueueCompanion Function({ + Value id, + Value feedId, + Value actionType, + Value payload, + Value retryCount, + Value createdAt, + Value lastAttemptAt, + }); class $$OfflineActionQueueTableFilterComposer extends Composer<_$AppDatabase, $OfflineActionQueueTable> { @@ -16725,25 +19932,39 @@ class $$OfflineActionQueueTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get feedId => $composableBuilder( - column: $table.feedId, builder: (column) => ColumnFilters(column)); + column: $table.feedId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get actionType => $composableBuilder( - column: $table.actionType, builder: (column) => ColumnFilters(column)); + column: $table.actionType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get payload => $composableBuilder( - column: $table.payload, builder: (column) => ColumnFilters(column)); + column: $table.payload, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get retryCount => $composableBuilder( - column: $table.retryCount, builder: (column) => ColumnFilters(column)); + column: $table.retryCount, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get lastAttemptAt => $composableBuilder( - column: $table.lastAttemptAt, builder: (column) => ColumnFilters(column)); + column: $table.lastAttemptAt, + builder: (column) => ColumnFilters(column), + ); } class $$OfflineActionQueueTableOrderingComposer @@ -16756,26 +19977,39 @@ class $$OfflineActionQueueTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get feedId => $composableBuilder( - column: $table.feedId, builder: (column) => ColumnOrderings(column)); + column: $table.feedId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get actionType => $composableBuilder( - column: $table.actionType, builder: (column) => ColumnOrderings(column)); + column: $table.actionType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get payload => $composableBuilder( - column: $table.payload, builder: (column) => ColumnOrderings(column)); + column: $table.payload, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get retryCount => $composableBuilder( - column: $table.retryCount, builder: (column) => ColumnOrderings(column)); + column: $table.retryCount, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get lastAttemptAt => $composableBuilder( - column: $table.lastAttemptAt, - builder: (column) => ColumnOrderings(column)); + column: $table.lastAttemptAt, + builder: (column) => ColumnOrderings(column), + ); } class $$OfflineActionQueueTableAnnotationComposer @@ -16794,40 +20028,54 @@ class $$OfflineActionQueueTableAnnotationComposer $composableBuilder(column: $table.feedId, builder: (column) => column); GeneratedColumn get actionType => $composableBuilder( - column: $table.actionType, builder: (column) => column); + column: $table.actionType, + builder: (column) => column, + ); GeneratedColumn get payload => $composableBuilder(column: $table.payload, builder: (column) => column); GeneratedColumn get retryCount => $composableBuilder( - column: $table.retryCount, builder: (column) => column); + column: $table.retryCount, + builder: (column) => column, + ); GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); GeneratedColumn get lastAttemptAt => $composableBuilder( - column: $table.lastAttemptAt, builder: (column) => column); + column: $table.lastAttemptAt, + builder: (column) => column, + ); } -class $$OfflineActionQueueTableTableManager extends RootTableManager< - _$AppDatabase, - $OfflineActionQueueTable, - OfflineActionQueueData, - $$OfflineActionQueueTableFilterComposer, - $$OfflineActionQueueTableOrderingComposer, - $$OfflineActionQueueTableAnnotationComposer, - $$OfflineActionQueueTableCreateCompanionBuilder, - $$OfflineActionQueueTableUpdateCompanionBuilder, - ( - OfflineActionQueueData, - BaseReferences<_$AppDatabase, $OfflineActionQueueTable, - OfflineActionQueueData> - ), - OfflineActionQueueData, - PrefetchHooks Function()> { +class $$OfflineActionQueueTableTableManager + extends + RootTableManager< + _$AppDatabase, + $OfflineActionQueueTable, + OfflineActionQueueData, + $$OfflineActionQueueTableFilterComposer, + $$OfflineActionQueueTableOrderingComposer, + $$OfflineActionQueueTableAnnotationComposer, + $$OfflineActionQueueTableCreateCompanionBuilder, + $$OfflineActionQueueTableUpdateCompanionBuilder, + ( + OfflineActionQueueData, + BaseReferences< + _$AppDatabase, + $OfflineActionQueueTable, + OfflineActionQueueData + >, + ), + OfflineActionQueueData, + PrefetchHooks Function() + > { $$OfflineActionQueueTableTableManager( - _$AppDatabase db, $OfflineActionQueueTable table) - : super(TableManagerState( + _$AppDatabase db, + $OfflineActionQueueTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -16836,86 +20084,94 @@ class $$OfflineActionQueueTableTableManager extends RootTableManager< $$OfflineActionQueueTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$OfflineActionQueueTableAnnotationComposer( - $db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value feedId = const Value.absent(), - Value actionType = const Value.absent(), - Value payload = const Value.absent(), - Value retryCount = const Value.absent(), - Value createdAt = const Value.absent(), - Value lastAttemptAt = const Value.absent(), - }) => - OfflineActionQueueCompanion( - id: id, - feedId: feedId, - actionType: actionType, - payload: payload, - retryCount: retryCount, - createdAt: createdAt, - lastAttemptAt: lastAttemptAt, - ), - createCompanionCallback: ({ - Value id = const Value.absent(), - required String feedId, - required String actionType, - Value payload = const Value.absent(), - Value retryCount = const Value.absent(), - required DateTime createdAt, - Value lastAttemptAt = const Value.absent(), - }) => - OfflineActionQueueCompanion.insert( - id: id, - feedId: feedId, - actionType: actionType, - payload: payload, - retryCount: retryCount, - createdAt: createdAt, - lastAttemptAt: lastAttemptAt, - ), + $db: db, + $table: table, + ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value feedId = const Value.absent(), + Value actionType = const Value.absent(), + Value payload = const Value.absent(), + Value retryCount = const Value.absent(), + Value createdAt = const Value.absent(), + Value lastAttemptAt = const Value.absent(), + }) => OfflineActionQueueCompanion( + id: id, + feedId: feedId, + actionType: actionType, + payload: payload, + retryCount: retryCount, + createdAt: createdAt, + lastAttemptAt: lastAttemptAt, + ), + createCompanionCallback: + ({ + Value id = const Value.absent(), + required String feedId, + required String actionType, + Value payload = const Value.absent(), + Value retryCount = const Value.absent(), + required DateTime createdAt, + Value lastAttemptAt = const Value.absent(), + }) => OfflineActionQueueCompanion.insert( + id: id, + feedId: feedId, + actionType: actionType, + payload: payload, + retryCount: retryCount, + createdAt: createdAt, + lastAttemptAt: lastAttemptAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$OfflineActionQueueTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $OfflineActionQueueTable, - OfflineActionQueueData, - $$OfflineActionQueueTableFilterComposer, - $$OfflineActionQueueTableOrderingComposer, - $$OfflineActionQueueTableAnnotationComposer, - $$OfflineActionQueueTableCreateCompanionBuilder, - $$OfflineActionQueueTableUpdateCompanionBuilder, - ( +typedef $$OfflineActionQueueTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $OfflineActionQueueTable, OfflineActionQueueData, - BaseReferences<_$AppDatabase, $OfflineActionQueueTable, - OfflineActionQueueData> - ), - OfflineActionQueueData, - PrefetchHooks Function()>; -typedef $$HanziCachesTableCreateCompanionBuilder = HanziCachesCompanion - Function({ - required String cacheKey, - required String queryType, - required String keyword, - required String resultJson, - required DateTime cachedAt, - required DateTime expiresAt, - Value rowid, -}); -typedef $$HanziCachesTableUpdateCompanionBuilder = HanziCachesCompanion - Function({ - Value cacheKey, - Value queryType, - Value keyword, - Value resultJson, - Value cachedAt, - Value expiresAt, - Value rowid, -}); + $$OfflineActionQueueTableFilterComposer, + $$OfflineActionQueueTableOrderingComposer, + $$OfflineActionQueueTableAnnotationComposer, + $$OfflineActionQueueTableCreateCompanionBuilder, + $$OfflineActionQueueTableUpdateCompanionBuilder, + ( + OfflineActionQueueData, + BaseReferences< + _$AppDatabase, + $OfflineActionQueueTable, + OfflineActionQueueData + >, + ), + OfflineActionQueueData, + PrefetchHooks Function() + >; +typedef $$HanziCachesTableCreateCompanionBuilder = + HanziCachesCompanion Function({ + required String cacheKey, + required String queryType, + required String keyword, + required String resultJson, + required DateTime cachedAt, + required DateTime expiresAt, + Value rowid, + }); +typedef $$HanziCachesTableUpdateCompanionBuilder = + HanziCachesCompanion Function({ + Value cacheKey, + Value queryType, + Value keyword, + Value resultJson, + Value cachedAt, + Value expiresAt, + Value rowid, + }); class $$HanziCachesTableFilterComposer extends Composer<_$AppDatabase, $HanziCachesTable> { @@ -16927,22 +20183,34 @@ class $$HanziCachesTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get cacheKey => $composableBuilder( - column: $table.cacheKey, builder: (column) => ColumnFilters(column)); + column: $table.cacheKey, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get queryType => $composableBuilder( - column: $table.queryType, builder: (column) => ColumnFilters(column)); + column: $table.queryType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get keyword => $composableBuilder( - column: $table.keyword, builder: (column) => ColumnFilters(column)); + column: $table.keyword, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get resultJson => $composableBuilder( - column: $table.resultJson, builder: (column) => ColumnFilters(column)); + column: $table.resultJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get cachedAt => $composableBuilder( - column: $table.cachedAt, builder: (column) => ColumnFilters(column)); + column: $table.cachedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get expiresAt => $composableBuilder( - column: $table.expiresAt, builder: (column) => ColumnFilters(column)); + column: $table.expiresAt, + builder: (column) => ColumnFilters(column), + ); } class $$HanziCachesTableOrderingComposer @@ -16955,22 +20223,34 @@ class $$HanziCachesTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get cacheKey => $composableBuilder( - column: $table.cacheKey, builder: (column) => ColumnOrderings(column)); + column: $table.cacheKey, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get queryType => $composableBuilder( - column: $table.queryType, builder: (column) => ColumnOrderings(column)); + column: $table.queryType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get keyword => $composableBuilder( - column: $table.keyword, builder: (column) => ColumnOrderings(column)); + column: $table.keyword, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get resultJson => $composableBuilder( - column: $table.resultJson, builder: (column) => ColumnOrderings(column)); + column: $table.resultJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get cachedAt => $composableBuilder( - column: $table.cachedAt, builder: (column) => ColumnOrderings(column)); + column: $table.cachedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get expiresAt => $composableBuilder( - column: $table.expiresAt, builder: (column) => ColumnOrderings(column)); + column: $table.expiresAt, + builder: (column) => ColumnOrderings(column), + ); } class $$HanziCachesTableAnnotationComposer @@ -16992,7 +20272,9 @@ class $$HanziCachesTableAnnotationComposer $composableBuilder(column: $table.keyword, builder: (column) => column); GeneratedColumn get resultJson => $composableBuilder( - column: $table.resultJson, builder: (column) => column); + column: $table.resultJson, + builder: (column) => column, + ); GeneratedColumn get cachedAt => $composableBuilder(column: $table.cachedAt, builder: (column) => column); @@ -17001,20 +20283,27 @@ class $$HanziCachesTableAnnotationComposer $composableBuilder(column: $table.expiresAt, builder: (column) => column); } -class $$HanziCachesTableTableManager extends RootTableManager< - _$AppDatabase, - $HanziCachesTable, - HanziCache, - $$HanziCachesTableFilterComposer, - $$HanziCachesTableOrderingComposer, - $$HanziCachesTableAnnotationComposer, - $$HanziCachesTableCreateCompanionBuilder, - $$HanziCachesTableUpdateCompanionBuilder, - (HanziCache, BaseReferences<_$AppDatabase, $HanziCachesTable, HanziCache>), - HanziCache, - PrefetchHooks Function()> { +class $$HanziCachesTableTableManager + extends + RootTableManager< + _$AppDatabase, + $HanziCachesTable, + HanziCache, + $$HanziCachesTableFilterComposer, + $$HanziCachesTableOrderingComposer, + $$HanziCachesTableAnnotationComposer, + $$HanziCachesTableCreateCompanionBuilder, + $$HanziCachesTableUpdateCompanionBuilder, + ( + HanziCache, + BaseReferences<_$AppDatabase, $HanziCachesTable, HanziCache>, + ), + HanziCache, + PrefetchHooks Function() + > { $$HanziCachesTableTableManager(_$AppDatabase db, $HanziCachesTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -17023,93 +20312,99 @@ class $$HanziCachesTableTableManager extends RootTableManager< $$HanziCachesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$HanziCachesTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value cacheKey = const Value.absent(), - Value queryType = const Value.absent(), - Value keyword = const Value.absent(), - Value resultJson = const Value.absent(), - Value cachedAt = const Value.absent(), - Value expiresAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - HanziCachesCompanion( - cacheKey: cacheKey, - queryType: queryType, - keyword: keyword, - resultJson: resultJson, - cachedAt: cachedAt, - expiresAt: expiresAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String cacheKey, - required String queryType, - required String keyword, - required String resultJson, - required DateTime cachedAt, - required DateTime expiresAt, - Value rowid = const Value.absent(), - }) => - HanziCachesCompanion.insert( - cacheKey: cacheKey, - queryType: queryType, - keyword: keyword, - resultJson: resultJson, - cachedAt: cachedAt, - expiresAt: expiresAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value cacheKey = const Value.absent(), + Value queryType = const Value.absent(), + Value keyword = const Value.absent(), + Value resultJson = const Value.absent(), + Value cachedAt = const Value.absent(), + Value expiresAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => HanziCachesCompanion( + cacheKey: cacheKey, + queryType: queryType, + keyword: keyword, + resultJson: resultJson, + cachedAt: cachedAt, + expiresAt: expiresAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String cacheKey, + required String queryType, + required String keyword, + required String resultJson, + required DateTime cachedAt, + required DateTime expiresAt, + Value rowid = const Value.absent(), + }) => HanziCachesCompanion.insert( + cacheKey: cacheKey, + queryType: queryType, + keyword: keyword, + resultJson: resultJson, + cachedAt: cachedAt, + expiresAt: expiresAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$HanziCachesTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $HanziCachesTable, - HanziCache, - $$HanziCachesTableFilterComposer, - $$HanziCachesTableOrderingComposer, - $$HanziCachesTableAnnotationComposer, - $$HanziCachesTableCreateCompanionBuilder, - $$HanziCachesTableUpdateCompanionBuilder, - (HanziCache, BaseReferences<_$AppDatabase, $HanziCachesTable, HanziCache>), - HanziCache, - PrefetchHooks Function()>; -typedef $$ShareHistoriesTableCreateCompanionBuilder = ShareHistoriesCompanion - Function({ - Value id, - Value contentId, - Value scene, - required String shareType, - Value title, - required String content, - Value author, - Value source, - Value shareSource, - Value note, - Value tags, - Value imageUrl, - required DateTime sharedAt, -}); -typedef $$ShareHistoriesTableUpdateCompanionBuilder = ShareHistoriesCompanion - Function({ - Value id, - Value contentId, - Value scene, - Value shareType, - Value title, - Value content, - Value author, - Value source, - Value shareSource, - Value note, - Value tags, - Value imageUrl, - Value sharedAt, -}); +typedef $$HanziCachesTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $HanziCachesTable, + HanziCache, + $$HanziCachesTableFilterComposer, + $$HanziCachesTableOrderingComposer, + $$HanziCachesTableAnnotationComposer, + $$HanziCachesTableCreateCompanionBuilder, + $$HanziCachesTableUpdateCompanionBuilder, + ( + HanziCache, + BaseReferences<_$AppDatabase, $HanziCachesTable, HanziCache>, + ), + HanziCache, + PrefetchHooks Function() + >; +typedef $$ShareHistoriesTableCreateCompanionBuilder = + ShareHistoriesCompanion Function({ + Value id, + Value contentId, + Value scene, + required String shareType, + Value title, + required String content, + Value author, + Value source, + Value shareSource, + Value note, + Value tags, + Value imageUrl, + required DateTime sharedAt, + }); +typedef $$ShareHistoriesTableUpdateCompanionBuilder = + ShareHistoriesCompanion Function({ + Value id, + Value contentId, + Value scene, + Value shareType, + Value title, + Value content, + Value author, + Value source, + Value shareSource, + Value note, + Value tags, + Value imageUrl, + Value sharedAt, + }); class $$ShareHistoriesTableFilterComposer extends Composer<_$AppDatabase, $ShareHistoriesTable> { @@ -17121,43 +20416,69 @@ class $$ShareHistoriesTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get contentId => $composableBuilder( - column: $table.contentId, builder: (column) => ColumnFilters(column)); + column: $table.contentId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get scene => $composableBuilder( - column: $table.scene, builder: (column) => ColumnFilters(column)); + column: $table.scene, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get shareType => $composableBuilder( - column: $table.shareType, builder: (column) => ColumnFilters(column)); + column: $table.shareType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get title => $composableBuilder( - column: $table.title, builder: (column) => ColumnFilters(column)); + column: $table.title, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnFilters(column)); + column: $table.content, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get author => $composableBuilder( - column: $table.author, builder: (column) => ColumnFilters(column)); + column: $table.author, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get source => $composableBuilder( - column: $table.source, builder: (column) => ColumnFilters(column)); + column: $table.source, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get shareSource => $composableBuilder( - column: $table.shareSource, builder: (column) => ColumnFilters(column)); + column: $table.shareSource, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get note => $composableBuilder( - column: $table.note, builder: (column) => ColumnFilters(column)); + column: $table.note, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get tags => $composableBuilder( - column: $table.tags, builder: (column) => ColumnFilters(column)); + column: $table.tags, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get imageUrl => $composableBuilder( - column: $table.imageUrl, builder: (column) => ColumnFilters(column)); + column: $table.imageUrl, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get sharedAt => $composableBuilder( - column: $table.sharedAt, builder: (column) => ColumnFilters(column)); + column: $table.sharedAt, + builder: (column) => ColumnFilters(column), + ); } class $$ShareHistoriesTableOrderingComposer @@ -17170,43 +20491,69 @@ class $$ShareHistoriesTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get contentId => $composableBuilder( - column: $table.contentId, builder: (column) => ColumnOrderings(column)); + column: $table.contentId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get scene => $composableBuilder( - column: $table.scene, builder: (column) => ColumnOrderings(column)); + column: $table.scene, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get shareType => $composableBuilder( - column: $table.shareType, builder: (column) => ColumnOrderings(column)); + column: $table.shareType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get title => $composableBuilder( - column: $table.title, builder: (column) => ColumnOrderings(column)); + column: $table.title, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnOrderings(column)); + column: $table.content, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get author => $composableBuilder( - column: $table.author, builder: (column) => ColumnOrderings(column)); + column: $table.author, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get source => $composableBuilder( - column: $table.source, builder: (column) => ColumnOrderings(column)); + column: $table.source, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get shareSource => $composableBuilder( - column: $table.shareSource, builder: (column) => ColumnOrderings(column)); + column: $table.shareSource, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get note => $composableBuilder( - column: $table.note, builder: (column) => ColumnOrderings(column)); + column: $table.note, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get tags => $composableBuilder( - column: $table.tags, builder: (column) => ColumnOrderings(column)); + column: $table.tags, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get imageUrl => $composableBuilder( - column: $table.imageUrl, builder: (column) => ColumnOrderings(column)); + column: $table.imageUrl, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get sharedAt => $composableBuilder( - column: $table.sharedAt, builder: (column) => ColumnOrderings(column)); + column: $table.sharedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$ShareHistoriesTableAnnotationComposer @@ -17243,7 +20590,9 @@ class $$ShareHistoriesTableAnnotationComposer $composableBuilder(column: $table.source, builder: (column) => column); GeneratedColumn get shareSource => $composableBuilder( - column: $table.shareSource, builder: (column) => column); + column: $table.shareSource, + builder: (column) => column, + ); GeneratedColumn get note => $composableBuilder(column: $table.note, builder: (column) => column); @@ -17258,24 +20607,29 @@ class $$ShareHistoriesTableAnnotationComposer $composableBuilder(column: $table.sharedAt, builder: (column) => column); } -class $$ShareHistoriesTableTableManager extends RootTableManager< - _$AppDatabase, - $ShareHistoriesTable, - ShareHistory, - $$ShareHistoriesTableFilterComposer, - $$ShareHistoriesTableOrderingComposer, - $$ShareHistoriesTableAnnotationComposer, - $$ShareHistoriesTableCreateCompanionBuilder, - $$ShareHistoriesTableUpdateCompanionBuilder, - ( - ShareHistory, - BaseReferences<_$AppDatabase, $ShareHistoriesTable, ShareHistory> - ), - ShareHistory, - PrefetchHooks Function()> { +class $$ShareHistoriesTableTableManager + extends + RootTableManager< + _$AppDatabase, + $ShareHistoriesTable, + ShareHistory, + $$ShareHistoriesTableFilterComposer, + $$ShareHistoriesTableOrderingComposer, + $$ShareHistoriesTableAnnotationComposer, + $$ShareHistoriesTableCreateCompanionBuilder, + $$ShareHistoriesTableUpdateCompanionBuilder, + ( + ShareHistory, + BaseReferences<_$AppDatabase, $ShareHistoriesTable, ShareHistory>, + ), + ShareHistory, + PrefetchHooks Function() + > { $$ShareHistoriesTableTableManager( - _$AppDatabase db, $ShareHistoriesTable table) - : super(TableManagerState( + _$AppDatabase db, + $ShareHistoriesTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -17284,118 +20638,121 @@ class $$ShareHistoriesTableTableManager extends RootTableManager< $$ShareHistoriesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$ShareHistoriesTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value contentId = const Value.absent(), - Value scene = const Value.absent(), - Value shareType = const Value.absent(), - Value title = const Value.absent(), - Value content = const Value.absent(), - Value author = const Value.absent(), - Value source = const Value.absent(), - Value shareSource = const Value.absent(), - Value note = const Value.absent(), - Value tags = const Value.absent(), - Value imageUrl = const Value.absent(), - Value sharedAt = const Value.absent(), - }) => - ShareHistoriesCompanion( - id: id, - contentId: contentId, - scene: scene, - shareType: shareType, - title: title, - content: content, - author: author, - source: source, - shareSource: shareSource, - note: note, - tags: tags, - imageUrl: imageUrl, - sharedAt: sharedAt, - ), - createCompanionCallback: ({ - Value id = const Value.absent(), - Value contentId = const Value.absent(), - Value scene = const Value.absent(), - required String shareType, - Value title = const Value.absent(), - required String content, - Value author = const Value.absent(), - Value source = const Value.absent(), - Value shareSource = const Value.absent(), - Value note = const Value.absent(), - Value tags = const Value.absent(), - Value imageUrl = const Value.absent(), - required DateTime sharedAt, - }) => - ShareHistoriesCompanion.insert( - id: id, - contentId: contentId, - scene: scene, - shareType: shareType, - title: title, - content: content, - author: author, - source: source, - shareSource: shareSource, - note: note, - tags: tags, - imageUrl: imageUrl, - sharedAt: sharedAt, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value contentId = const Value.absent(), + Value scene = const Value.absent(), + Value shareType = const Value.absent(), + Value title = const Value.absent(), + Value content = const Value.absent(), + Value author = const Value.absent(), + Value source = const Value.absent(), + Value shareSource = const Value.absent(), + Value note = const Value.absent(), + Value tags = const Value.absent(), + Value imageUrl = const Value.absent(), + Value sharedAt = const Value.absent(), + }) => ShareHistoriesCompanion( + id: id, + contentId: contentId, + scene: scene, + shareType: shareType, + title: title, + content: content, + author: author, + source: source, + shareSource: shareSource, + note: note, + tags: tags, + imageUrl: imageUrl, + sharedAt: sharedAt, + ), + createCompanionCallback: + ({ + Value id = const Value.absent(), + Value contentId = const Value.absent(), + Value scene = const Value.absent(), + required String shareType, + Value title = const Value.absent(), + required String content, + Value author = const Value.absent(), + Value source = const Value.absent(), + Value shareSource = const Value.absent(), + Value note = const Value.absent(), + Value tags = const Value.absent(), + Value imageUrl = const Value.absent(), + required DateTime sharedAt, + }) => ShareHistoriesCompanion.insert( + id: id, + contentId: contentId, + scene: scene, + shareType: shareType, + title: title, + content: content, + author: author, + source: source, + shareSource: shareSource, + note: note, + tags: tags, + imageUrl: imageUrl, + sharedAt: sharedAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$ShareHistoriesTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $ShareHistoriesTable, - ShareHistory, - $$ShareHistoriesTableFilterComposer, - $$ShareHistoriesTableOrderingComposer, - $$ShareHistoriesTableAnnotationComposer, - $$ShareHistoriesTableCreateCompanionBuilder, - $$ShareHistoriesTableUpdateCompanionBuilder, - ( +typedef $$ShareHistoriesTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $ShareHistoriesTable, ShareHistory, - BaseReferences<_$AppDatabase, $ShareHistoriesTable, ShareHistory> - ), - ShareHistory, - PrefetchHooks Function()>; -typedef $$LearningPlansTableCreateCompanionBuilder = LearningPlansCompanion - Function({ - Value id, - required String title, - Value description, - Value category, - Value dailyGoal, - Value streakDays, - Value totalCompleted, - Value isActive, - required DateTime startDate, - Value endDate, - required DateTime createdAt, - required DateTime updatedAt, -}); -typedef $$LearningPlansTableUpdateCompanionBuilder = LearningPlansCompanion - Function({ - Value id, - Value title, - Value description, - Value category, - Value dailyGoal, - Value streakDays, - Value totalCompleted, - Value isActive, - Value startDate, - Value endDate, - Value createdAt, - Value updatedAt, -}); + $$ShareHistoriesTableFilterComposer, + $$ShareHistoriesTableOrderingComposer, + $$ShareHistoriesTableAnnotationComposer, + $$ShareHistoriesTableCreateCompanionBuilder, + $$ShareHistoriesTableUpdateCompanionBuilder, + ( + ShareHistory, + BaseReferences<_$AppDatabase, $ShareHistoriesTable, ShareHistory>, + ), + ShareHistory, + PrefetchHooks Function() + >; +typedef $$LearningPlansTableCreateCompanionBuilder = + LearningPlansCompanion Function({ + Value id, + required String title, + Value description, + Value category, + Value dailyGoal, + Value streakDays, + Value totalCompleted, + Value isActive, + required DateTime startDate, + Value endDate, + required DateTime createdAt, + required DateTime updatedAt, + }); +typedef $$LearningPlansTableUpdateCompanionBuilder = + LearningPlansCompanion Function({ + Value id, + Value title, + Value description, + Value category, + Value dailyGoal, + Value streakDays, + Value totalCompleted, + Value isActive, + Value startDate, + Value endDate, + Value createdAt, + Value updatedAt, + }); class $$LearningPlansTableFilterComposer extends Composer<_$AppDatabase, $LearningPlansTable> { @@ -17407,41 +20764,64 @@ class $$LearningPlansTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get title => $composableBuilder( - column: $table.title, builder: (column) => ColumnFilters(column)); + column: $table.title, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get description => $composableBuilder( - column: $table.description, builder: (column) => ColumnFilters(column)); + column: $table.description, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get category => $composableBuilder( - column: $table.category, builder: (column) => ColumnFilters(column)); + column: $table.category, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get dailyGoal => $composableBuilder( - column: $table.dailyGoal, builder: (column) => ColumnFilters(column)); + column: $table.dailyGoal, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get streakDays => $composableBuilder( - column: $table.streakDays, builder: (column) => ColumnFilters(column)); + column: $table.streakDays, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get totalCompleted => $composableBuilder( - column: $table.totalCompleted, - builder: (column) => ColumnFilters(column)); + column: $table.totalCompleted, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isActive => $composableBuilder( - column: $table.isActive, builder: (column) => ColumnFilters(column)); + column: $table.isActive, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get startDate => $composableBuilder( - column: $table.startDate, builder: (column) => ColumnFilters(column)); + column: $table.startDate, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get endDate => $composableBuilder( - column: $table.endDate, builder: (column) => ColumnFilters(column)); + column: $table.endDate, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$LearningPlansTableOrderingComposer @@ -17454,41 +20834,64 @@ class $$LearningPlansTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get title => $composableBuilder( - column: $table.title, builder: (column) => ColumnOrderings(column)); + column: $table.title, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get description => $composableBuilder( - column: $table.description, builder: (column) => ColumnOrderings(column)); + column: $table.description, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get category => $composableBuilder( - column: $table.category, builder: (column) => ColumnOrderings(column)); + column: $table.category, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get dailyGoal => $composableBuilder( - column: $table.dailyGoal, builder: (column) => ColumnOrderings(column)); + column: $table.dailyGoal, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get streakDays => $composableBuilder( - column: $table.streakDays, builder: (column) => ColumnOrderings(column)); + column: $table.streakDays, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get totalCompleted => $composableBuilder( - column: $table.totalCompleted, - builder: (column) => ColumnOrderings(column)); + column: $table.totalCompleted, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isActive => $composableBuilder( - column: $table.isActive, builder: (column) => ColumnOrderings(column)); + column: $table.isActive, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get startDate => $composableBuilder( - column: $table.startDate, builder: (column) => ColumnOrderings(column)); + column: $table.startDate, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get endDate => $composableBuilder( - column: $table.endDate, builder: (column) => ColumnOrderings(column)); + column: $table.endDate, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$LearningPlansTableAnnotationComposer @@ -17507,7 +20910,9 @@ class $$LearningPlansTableAnnotationComposer $composableBuilder(column: $table.title, builder: (column) => column); GeneratedColumn get description => $composableBuilder( - column: $table.description, builder: (column) => column); + column: $table.description, + builder: (column) => column, + ); GeneratedColumn get category => $composableBuilder(column: $table.category, builder: (column) => column); @@ -17516,10 +20921,14 @@ class $$LearningPlansTableAnnotationComposer $composableBuilder(column: $table.dailyGoal, builder: (column) => column); GeneratedColumn get streakDays => $composableBuilder( - column: $table.streakDays, builder: (column) => column); + column: $table.streakDays, + builder: (column) => column, + ); GeneratedColumn get totalCompleted => $composableBuilder( - column: $table.totalCompleted, builder: (column) => column); + column: $table.totalCompleted, + builder: (column) => column, + ); GeneratedColumn get isActive => $composableBuilder(column: $table.isActive, builder: (column) => column); @@ -17537,23 +20946,27 @@ class $$LearningPlansTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$LearningPlansTableTableManager extends RootTableManager< - _$AppDatabase, - $LearningPlansTable, - LearningPlan, - $$LearningPlansTableFilterComposer, - $$LearningPlansTableOrderingComposer, - $$LearningPlansTableAnnotationComposer, - $$LearningPlansTableCreateCompanionBuilder, - $$LearningPlansTableUpdateCompanionBuilder, - ( - LearningPlan, - BaseReferences<_$AppDatabase, $LearningPlansTable, LearningPlan> - ), - LearningPlan, - PrefetchHooks Function()> { +class $$LearningPlansTableTableManager + extends + RootTableManager< + _$AppDatabase, + $LearningPlansTable, + LearningPlan, + $$LearningPlansTableFilterComposer, + $$LearningPlansTableOrderingComposer, + $$LearningPlansTableAnnotationComposer, + $$LearningPlansTableCreateCompanionBuilder, + $$LearningPlansTableUpdateCompanionBuilder, + ( + LearningPlan, + BaseReferences<_$AppDatabase, $LearningPlansTable, LearningPlan>, + ), + LearningPlan, + PrefetchHooks Function() + > { $$LearningPlansTableTableManager(_$AppDatabase db, $LearningPlansTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -17562,106 +20975,109 @@ class $$LearningPlansTableTableManager extends RootTableManager< $$LearningPlansTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$LearningPlansTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value title = const Value.absent(), - Value description = const Value.absent(), - Value category = const Value.absent(), - Value dailyGoal = const Value.absent(), - Value streakDays = const Value.absent(), - Value totalCompleted = const Value.absent(), - Value isActive = const Value.absent(), - Value startDate = const Value.absent(), - Value endDate = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - }) => - LearningPlansCompanion( - id: id, - title: title, - description: description, - category: category, - dailyGoal: dailyGoal, - streakDays: streakDays, - totalCompleted: totalCompleted, - isActive: isActive, - startDate: startDate, - endDate: endDate, - createdAt: createdAt, - updatedAt: updatedAt, - ), - createCompanionCallback: ({ - Value id = const Value.absent(), - required String title, - Value description = const Value.absent(), - Value category = const Value.absent(), - Value dailyGoal = const Value.absent(), - Value streakDays = const Value.absent(), - Value totalCompleted = const Value.absent(), - Value isActive = const Value.absent(), - required DateTime startDate, - Value endDate = const Value.absent(), - required DateTime createdAt, - required DateTime updatedAt, - }) => - LearningPlansCompanion.insert( - id: id, - title: title, - description: description, - category: category, - dailyGoal: dailyGoal, - streakDays: streakDays, - totalCompleted: totalCompleted, - isActive: isActive, - startDate: startDate, - endDate: endDate, - createdAt: createdAt, - updatedAt: updatedAt, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value title = const Value.absent(), + Value description = const Value.absent(), + Value category = const Value.absent(), + Value dailyGoal = const Value.absent(), + Value streakDays = const Value.absent(), + Value totalCompleted = const Value.absent(), + Value isActive = const Value.absent(), + Value startDate = const Value.absent(), + Value endDate = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + }) => LearningPlansCompanion( + id: id, + title: title, + description: description, + category: category, + dailyGoal: dailyGoal, + streakDays: streakDays, + totalCompleted: totalCompleted, + isActive: isActive, + startDate: startDate, + endDate: endDate, + createdAt: createdAt, + updatedAt: updatedAt, + ), + createCompanionCallback: + ({ + Value id = const Value.absent(), + required String title, + Value description = const Value.absent(), + Value category = const Value.absent(), + Value dailyGoal = const Value.absent(), + Value streakDays = const Value.absent(), + Value totalCompleted = const Value.absent(), + Value isActive = const Value.absent(), + required DateTime startDate, + Value endDate = const Value.absent(), + required DateTime createdAt, + required DateTime updatedAt, + }) => LearningPlansCompanion.insert( + id: id, + title: title, + description: description, + category: category, + dailyGoal: dailyGoal, + streakDays: streakDays, + totalCompleted: totalCompleted, + isActive: isActive, + startDate: startDate, + endDate: endDate, + createdAt: createdAt, + updatedAt: updatedAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$LearningPlansTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $LearningPlansTable, - LearningPlan, - $$LearningPlansTableFilterComposer, - $$LearningPlansTableOrderingComposer, - $$LearningPlansTableAnnotationComposer, - $$LearningPlansTableCreateCompanionBuilder, - $$LearningPlansTableUpdateCompanionBuilder, - ( +typedef $$LearningPlansTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $LearningPlansTable, LearningPlan, - BaseReferences<_$AppDatabase, $LearningPlansTable, LearningPlan> - ), - LearningPlan, - PrefetchHooks Function()>; -typedef $$LearningRecordsTableCreateCompanionBuilder = LearningRecordsCompanion - Function({ - Value id, - required int planId, - Value contentId, - Value contentType, - Value title, - Value note, - Value durationSeconds, - required DateTime completedAt, -}); -typedef $$LearningRecordsTableUpdateCompanionBuilder = LearningRecordsCompanion - Function({ - Value id, - Value planId, - Value contentId, - Value contentType, - Value title, - Value note, - Value durationSeconds, - Value completedAt, -}); + $$LearningPlansTableFilterComposer, + $$LearningPlansTableOrderingComposer, + $$LearningPlansTableAnnotationComposer, + $$LearningPlansTableCreateCompanionBuilder, + $$LearningPlansTableUpdateCompanionBuilder, + ( + LearningPlan, + BaseReferences<_$AppDatabase, $LearningPlansTable, LearningPlan>, + ), + LearningPlan, + PrefetchHooks Function() + >; +typedef $$LearningRecordsTableCreateCompanionBuilder = + LearningRecordsCompanion Function({ + Value id, + required int planId, + Value contentId, + Value contentType, + Value title, + Value note, + Value durationSeconds, + required DateTime completedAt, + }); +typedef $$LearningRecordsTableUpdateCompanionBuilder = + LearningRecordsCompanion Function({ + Value id, + Value planId, + Value contentId, + Value contentType, + Value title, + Value note, + Value durationSeconds, + Value completedAt, + }); class $$LearningRecordsTableFilterComposer extends Composer<_$AppDatabase, $LearningRecordsTable> { @@ -17673,29 +21089,44 @@ class $$LearningRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get planId => $composableBuilder( - column: $table.planId, builder: (column) => ColumnFilters(column)); + column: $table.planId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get contentId => $composableBuilder( - column: $table.contentId, builder: (column) => ColumnFilters(column)); + column: $table.contentId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get contentType => $composableBuilder( - column: $table.contentType, builder: (column) => ColumnFilters(column)); + column: $table.contentType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get title => $composableBuilder( - column: $table.title, builder: (column) => ColumnFilters(column)); + column: $table.title, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get note => $composableBuilder( - column: $table.note, builder: (column) => ColumnFilters(column)); + column: $table.note, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get durationSeconds => $composableBuilder( - column: $table.durationSeconds, - builder: (column) => ColumnFilters(column)); + column: $table.durationSeconds, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get completedAt => $composableBuilder( - column: $table.completedAt, builder: (column) => ColumnFilters(column)); + column: $table.completedAt, + builder: (column) => ColumnFilters(column), + ); } class $$LearningRecordsTableOrderingComposer @@ -17708,29 +21139,44 @@ class $$LearningRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get planId => $composableBuilder( - column: $table.planId, builder: (column) => ColumnOrderings(column)); + column: $table.planId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get contentId => $composableBuilder( - column: $table.contentId, builder: (column) => ColumnOrderings(column)); + column: $table.contentId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get contentType => $composableBuilder( - column: $table.contentType, builder: (column) => ColumnOrderings(column)); + column: $table.contentType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get title => $composableBuilder( - column: $table.title, builder: (column) => ColumnOrderings(column)); + column: $table.title, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get note => $composableBuilder( - column: $table.note, builder: (column) => ColumnOrderings(column)); + column: $table.note, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get durationSeconds => $composableBuilder( - column: $table.durationSeconds, - builder: (column) => ColumnOrderings(column)); + column: $table.durationSeconds, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get completedAt => $composableBuilder( - column: $table.completedAt, builder: (column) => ColumnOrderings(column)); + column: $table.completedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$LearningRecordsTableAnnotationComposer @@ -17752,7 +21198,9 @@ class $$LearningRecordsTableAnnotationComposer $composableBuilder(column: $table.contentId, builder: (column) => column); GeneratedColumn get contentType => $composableBuilder( - column: $table.contentType, builder: (column) => column); + column: $table.contentType, + builder: (column) => column, + ); GeneratedColumn get title => $composableBuilder(column: $table.title, builder: (column) => column); @@ -17761,30 +21209,43 @@ class $$LearningRecordsTableAnnotationComposer $composableBuilder(column: $table.note, builder: (column) => column); GeneratedColumn get durationSeconds => $composableBuilder( - column: $table.durationSeconds, builder: (column) => column); + column: $table.durationSeconds, + builder: (column) => column, + ); GeneratedColumn get completedAt => $composableBuilder( - column: $table.completedAt, builder: (column) => column); + column: $table.completedAt, + builder: (column) => column, + ); } -class $$LearningRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $LearningRecordsTable, - LearningRecord, - $$LearningRecordsTableFilterComposer, - $$LearningRecordsTableOrderingComposer, - $$LearningRecordsTableAnnotationComposer, - $$LearningRecordsTableCreateCompanionBuilder, - $$LearningRecordsTableUpdateCompanionBuilder, - ( - LearningRecord, - BaseReferences<_$AppDatabase, $LearningRecordsTable, LearningRecord> - ), - LearningRecord, - PrefetchHooks Function()> { +class $$LearningRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $LearningRecordsTable, + LearningRecord, + $$LearningRecordsTableFilterComposer, + $$LearningRecordsTableOrderingComposer, + $$LearningRecordsTableAnnotationComposer, + $$LearningRecordsTableCreateCompanionBuilder, + $$LearningRecordsTableUpdateCompanionBuilder, + ( + LearningRecord, + BaseReferences< + _$AppDatabase, + $LearningRecordsTable, + LearningRecord + >, + ), + LearningRecord, + PrefetchHooks Function() + > { $$LearningRecordsTableTableManager( - _$AppDatabase db, $LearningRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $LearningRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -17793,108 +21254,111 @@ class $$LearningRecordsTableTableManager extends RootTableManager< $$LearningRecordsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$LearningRecordsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value planId = const Value.absent(), - Value contentId = const Value.absent(), - Value contentType = const Value.absent(), - Value title = const Value.absent(), - Value note = const Value.absent(), - Value durationSeconds = const Value.absent(), - Value completedAt = const Value.absent(), - }) => - LearningRecordsCompanion( - id: id, - planId: planId, - contentId: contentId, - contentType: contentType, - title: title, - note: note, - durationSeconds: durationSeconds, - completedAt: completedAt, - ), - createCompanionCallback: ({ - Value id = const Value.absent(), - required int planId, - Value contentId = const Value.absent(), - Value contentType = const Value.absent(), - Value title = const Value.absent(), - Value note = const Value.absent(), - Value durationSeconds = const Value.absent(), - required DateTime completedAt, - }) => - LearningRecordsCompanion.insert( - id: id, - planId: planId, - contentId: contentId, - contentType: contentType, - title: title, - note: note, - durationSeconds: durationSeconds, - completedAt: completedAt, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value planId = const Value.absent(), + Value contentId = const Value.absent(), + Value contentType = const Value.absent(), + Value title = const Value.absent(), + Value note = const Value.absent(), + Value durationSeconds = const Value.absent(), + Value completedAt = const Value.absent(), + }) => LearningRecordsCompanion( + id: id, + planId: planId, + contentId: contentId, + contentType: contentType, + title: title, + note: note, + durationSeconds: durationSeconds, + completedAt: completedAt, + ), + createCompanionCallback: + ({ + Value id = const Value.absent(), + required int planId, + Value contentId = const Value.absent(), + Value contentType = const Value.absent(), + Value title = const Value.absent(), + Value note = const Value.absent(), + Value durationSeconds = const Value.absent(), + required DateTime completedAt, + }) => LearningRecordsCompanion.insert( + id: id, + planId: planId, + contentId: contentId, + contentType: contentType, + title: title, + note: note, + durationSeconds: durationSeconds, + completedAt: completedAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$LearningRecordsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $LearningRecordsTable, - LearningRecord, - $$LearningRecordsTableFilterComposer, - $$LearningRecordsTableOrderingComposer, - $$LearningRecordsTableAnnotationComposer, - $$LearningRecordsTableCreateCompanionBuilder, - $$LearningRecordsTableUpdateCompanionBuilder, - ( +typedef $$LearningRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $LearningRecordsTable, LearningRecord, - BaseReferences<_$AppDatabase, $LearningRecordsTable, LearningRecord> - ), - LearningRecord, - PrefetchHooks Function()>; -typedef $$ChatConversationsTableCreateCompanionBuilder - = ChatConversationsCompanion Function({ - required String id, - Value emoji, - required String name, - Value description, - Value bgImagePath, - Value categoriesJson, - Value settingsJson, - Value isPinned, - Value isHidden, - Value isMuted, - Value lastMessageText, - Value lastMessageAt, - Value unreadCount, - Value syncMode, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid, -}); -typedef $$ChatConversationsTableUpdateCompanionBuilder - = ChatConversationsCompanion Function({ - Value id, - Value emoji, - Value name, - Value description, - Value bgImagePath, - Value categoriesJson, - Value settingsJson, - Value isPinned, - Value isHidden, - Value isMuted, - Value lastMessageText, - Value lastMessageAt, - Value unreadCount, - Value syncMode, - Value createdAt, - Value updatedAt, - Value rowid, -}); + $$LearningRecordsTableFilterComposer, + $$LearningRecordsTableOrderingComposer, + $$LearningRecordsTableAnnotationComposer, + $$LearningRecordsTableCreateCompanionBuilder, + $$LearningRecordsTableUpdateCompanionBuilder, + ( + LearningRecord, + BaseReferences<_$AppDatabase, $LearningRecordsTable, LearningRecord>, + ), + LearningRecord, + PrefetchHooks Function() + >; +typedef $$ChatConversationsTableCreateCompanionBuilder = + ChatConversationsCompanion Function({ + required String id, + Value emoji, + required String name, + Value description, + Value bgImagePath, + Value categoriesJson, + Value settingsJson, + Value isPinned, + Value isHidden, + Value isMuted, + Value lastMessageText, + Value lastMessageAt, + Value unreadCount, + Value syncMode, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid, + }); +typedef $$ChatConversationsTableUpdateCompanionBuilder = + ChatConversationsCompanion Function({ + Value id, + Value emoji, + Value name, + Value description, + Value bgImagePath, + Value categoriesJson, + Value settingsJson, + Value isPinned, + Value isHidden, + Value isMuted, + Value lastMessageText, + Value lastMessageAt, + Value unreadCount, + Value syncMode, + Value createdAt, + Value updatedAt, + Value rowid, + }); class $$ChatConversationsTableFilterComposer extends Composer<_$AppDatabase, $ChatConversationsTable> { @@ -17906,54 +21370,84 @@ class $$ChatConversationsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get emoji => $composableBuilder( - column: $table.emoji, builder: (column) => ColumnFilters(column)); + column: $table.emoji, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get name => $composableBuilder( - column: $table.name, builder: (column) => ColumnFilters(column)); + column: $table.name, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get description => $composableBuilder( - column: $table.description, builder: (column) => ColumnFilters(column)); + column: $table.description, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get bgImagePath => $composableBuilder( - column: $table.bgImagePath, builder: (column) => ColumnFilters(column)); + column: $table.bgImagePath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get categoriesJson => $composableBuilder( - column: $table.categoriesJson, - builder: (column) => ColumnFilters(column)); + column: $table.categoriesJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get settingsJson => $composableBuilder( - column: $table.settingsJson, builder: (column) => ColumnFilters(column)); + column: $table.settingsJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isPinned => $composableBuilder( - column: $table.isPinned, builder: (column) => ColumnFilters(column)); + column: $table.isPinned, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isHidden => $composableBuilder( - column: $table.isHidden, builder: (column) => ColumnFilters(column)); + column: $table.isHidden, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isMuted => $composableBuilder( - column: $table.isMuted, builder: (column) => ColumnFilters(column)); + column: $table.isMuted, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get lastMessageText => $composableBuilder( - column: $table.lastMessageText, - builder: (column) => ColumnFilters(column)); + column: $table.lastMessageText, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get lastMessageAt => $composableBuilder( - column: $table.lastMessageAt, builder: (column) => ColumnFilters(column)); + column: $table.lastMessageAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get unreadCount => $composableBuilder( - column: $table.unreadCount, builder: (column) => ColumnFilters(column)); + column: $table.unreadCount, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get syncMode => $composableBuilder( - column: $table.syncMode, builder: (column) => ColumnFilters(column)); + column: $table.syncMode, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$ChatConversationsTableOrderingComposer @@ -17966,56 +21460,84 @@ class $$ChatConversationsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get emoji => $composableBuilder( - column: $table.emoji, builder: (column) => ColumnOrderings(column)); + column: $table.emoji, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get name => $composableBuilder( - column: $table.name, builder: (column) => ColumnOrderings(column)); + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get description => $composableBuilder( - column: $table.description, builder: (column) => ColumnOrderings(column)); + column: $table.description, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get bgImagePath => $composableBuilder( - column: $table.bgImagePath, builder: (column) => ColumnOrderings(column)); + column: $table.bgImagePath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get categoriesJson => $composableBuilder( - column: $table.categoriesJson, - builder: (column) => ColumnOrderings(column)); + column: $table.categoriesJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get settingsJson => $composableBuilder( - column: $table.settingsJson, - builder: (column) => ColumnOrderings(column)); + column: $table.settingsJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isPinned => $composableBuilder( - column: $table.isPinned, builder: (column) => ColumnOrderings(column)); + column: $table.isPinned, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isHidden => $composableBuilder( - column: $table.isHidden, builder: (column) => ColumnOrderings(column)); + column: $table.isHidden, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isMuted => $composableBuilder( - column: $table.isMuted, builder: (column) => ColumnOrderings(column)); + column: $table.isMuted, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get lastMessageText => $composableBuilder( - column: $table.lastMessageText, - builder: (column) => ColumnOrderings(column)); + column: $table.lastMessageText, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get lastMessageAt => $composableBuilder( - column: $table.lastMessageAt, - builder: (column) => ColumnOrderings(column)); + column: $table.lastMessageAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get unreadCount => $composableBuilder( - column: $table.unreadCount, builder: (column) => ColumnOrderings(column)); + column: $table.unreadCount, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get syncMode => $composableBuilder( - column: $table.syncMode, builder: (column) => ColumnOrderings(column)); + column: $table.syncMode, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$ChatConversationsTableAnnotationComposer @@ -18037,16 +21559,24 @@ class $$ChatConversationsTableAnnotationComposer $composableBuilder(column: $table.name, builder: (column) => column); GeneratedColumn get description => $composableBuilder( - column: $table.description, builder: (column) => column); + column: $table.description, + builder: (column) => column, + ); GeneratedColumn get bgImagePath => $composableBuilder( - column: $table.bgImagePath, builder: (column) => column); + column: $table.bgImagePath, + builder: (column) => column, + ); GeneratedColumn get categoriesJson => $composableBuilder( - column: $table.categoriesJson, builder: (column) => column); + column: $table.categoriesJson, + builder: (column) => column, + ); GeneratedColumn get settingsJson => $composableBuilder( - column: $table.settingsJson, builder: (column) => column); + column: $table.settingsJson, + builder: (column) => column, + ); GeneratedColumn get isPinned => $composableBuilder(column: $table.isPinned, builder: (column) => column); @@ -18058,13 +21588,19 @@ class $$ChatConversationsTableAnnotationComposer $composableBuilder(column: $table.isMuted, builder: (column) => column); GeneratedColumn get lastMessageText => $composableBuilder( - column: $table.lastMessageText, builder: (column) => column); + column: $table.lastMessageText, + builder: (column) => column, + ); GeneratedColumn get lastMessageAt => $composableBuilder( - column: $table.lastMessageAt, builder: (column) => column); + column: $table.lastMessageAt, + builder: (column) => column, + ); GeneratedColumn get unreadCount => $composableBuilder( - column: $table.unreadCount, builder: (column) => column); + column: $table.unreadCount, + builder: (column) => column, + ); GeneratedColumn get syncMode => $composableBuilder(column: $table.syncMode, builder: (column) => column); @@ -18076,24 +21612,33 @@ class $$ChatConversationsTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$ChatConversationsTableTableManager extends RootTableManager< - _$AppDatabase, - $ChatConversationsTable, - ChatConversation, - $$ChatConversationsTableFilterComposer, - $$ChatConversationsTableOrderingComposer, - $$ChatConversationsTableAnnotationComposer, - $$ChatConversationsTableCreateCompanionBuilder, - $$ChatConversationsTableUpdateCompanionBuilder, - ( - ChatConversation, - BaseReferences<_$AppDatabase, $ChatConversationsTable, ChatConversation> - ), - ChatConversation, - PrefetchHooks Function()> { +class $$ChatConversationsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $ChatConversationsTable, + ChatConversation, + $$ChatConversationsTableFilterComposer, + $$ChatConversationsTableOrderingComposer, + $$ChatConversationsTableAnnotationComposer, + $$ChatConversationsTableCreateCompanionBuilder, + $$ChatConversationsTableUpdateCompanionBuilder, + ( + ChatConversation, + BaseReferences< + _$AppDatabase, + $ChatConversationsTable, + ChatConversation + >, + ), + ChatConversation, + PrefetchHooks Function() + > { $$ChatConversationsTableTableManager( - _$AppDatabase db, $ChatConversationsTable table) - : super(TableManagerState( + _$AppDatabase db, + $ChatConversationsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -18102,155 +21647,164 @@ class $$ChatConversationsTableTableManager extends RootTableManager< $$ChatConversationsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$ChatConversationsTableAnnotationComposer( - $db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value emoji = const Value.absent(), - Value name = const Value.absent(), - Value description = const Value.absent(), - Value bgImagePath = const Value.absent(), - Value categoriesJson = const Value.absent(), - Value settingsJson = const Value.absent(), - Value isPinned = const Value.absent(), - Value isHidden = const Value.absent(), - Value isMuted = const Value.absent(), - Value lastMessageText = const Value.absent(), - Value lastMessageAt = const Value.absent(), - Value unreadCount = const Value.absent(), - Value syncMode = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - ChatConversationsCompanion( - id: id, - emoji: emoji, - name: name, - description: description, - bgImagePath: bgImagePath, - categoriesJson: categoriesJson, - settingsJson: settingsJson, - isPinned: isPinned, - isHidden: isHidden, - isMuted: isMuted, - lastMessageText: lastMessageText, - lastMessageAt: lastMessageAt, - unreadCount: unreadCount, - syncMode: syncMode, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - Value emoji = const Value.absent(), - required String name, - Value description = const Value.absent(), - Value bgImagePath = const Value.absent(), - Value categoriesJson = const Value.absent(), - Value settingsJson = const Value.absent(), - Value isPinned = const Value.absent(), - Value isHidden = const Value.absent(), - Value isMuted = const Value.absent(), - Value lastMessageText = const Value.absent(), - Value lastMessageAt = const Value.absent(), - Value unreadCount = const Value.absent(), - Value syncMode = const Value.absent(), - required DateTime createdAt, - required DateTime updatedAt, - Value rowid = const Value.absent(), - }) => - ChatConversationsCompanion.insert( - id: id, - emoji: emoji, - name: name, - description: description, - bgImagePath: bgImagePath, - categoriesJson: categoriesJson, - settingsJson: settingsJson, - isPinned: isPinned, - isHidden: isHidden, - isMuted: isMuted, - lastMessageText: lastMessageText, - lastMessageAt: lastMessageAt, - unreadCount: unreadCount, - syncMode: syncMode, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), + $db: db, + $table: table, + ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value emoji = const Value.absent(), + Value name = const Value.absent(), + Value description = const Value.absent(), + Value bgImagePath = const Value.absent(), + Value categoriesJson = const Value.absent(), + Value settingsJson = const Value.absent(), + Value isPinned = const Value.absent(), + Value isHidden = const Value.absent(), + Value isMuted = const Value.absent(), + Value lastMessageText = const Value.absent(), + Value lastMessageAt = const Value.absent(), + Value unreadCount = const Value.absent(), + Value syncMode = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => ChatConversationsCompanion( + id: id, + emoji: emoji, + name: name, + description: description, + bgImagePath: bgImagePath, + categoriesJson: categoriesJson, + settingsJson: settingsJson, + isPinned: isPinned, + isHidden: isHidden, + isMuted: isMuted, + lastMessageText: lastMessageText, + lastMessageAt: lastMessageAt, + unreadCount: unreadCount, + syncMode: syncMode, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + Value emoji = const Value.absent(), + required String name, + Value description = const Value.absent(), + Value bgImagePath = const Value.absent(), + Value categoriesJson = const Value.absent(), + Value settingsJson = const Value.absent(), + Value isPinned = const Value.absent(), + Value isHidden = const Value.absent(), + Value isMuted = const Value.absent(), + Value lastMessageText = const Value.absent(), + Value lastMessageAt = const Value.absent(), + Value unreadCount = const Value.absent(), + Value syncMode = const Value.absent(), + required DateTime createdAt, + required DateTime updatedAt, + Value rowid = const Value.absent(), + }) => ChatConversationsCompanion.insert( + id: id, + emoji: emoji, + name: name, + description: description, + bgImagePath: bgImagePath, + categoriesJson: categoriesJson, + settingsJson: settingsJson, + isPinned: isPinned, + isHidden: isHidden, + isMuted: isMuted, + lastMessageText: lastMessageText, + lastMessageAt: lastMessageAt, + unreadCount: unreadCount, + syncMode: syncMode, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$ChatConversationsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $ChatConversationsTable, - ChatConversation, - $$ChatConversationsTableFilterComposer, - $$ChatConversationsTableOrderingComposer, - $$ChatConversationsTableAnnotationComposer, - $$ChatConversationsTableCreateCompanionBuilder, - $$ChatConversationsTableUpdateCompanionBuilder, - ( +typedef $$ChatConversationsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $ChatConversationsTable, ChatConversation, - BaseReferences<_$AppDatabase, $ChatConversationsTable, ChatConversation> - ), - ChatConversation, - PrefetchHooks Function()>; -typedef $$ChatMsgRecordsTableCreateCompanionBuilder = ChatMsgRecordsCompanion - Function({ - required String id, - required String conversationId, - required String type, - required String role, - required String content, - Value author, - Value source, - Value category, - Value isRead, - Value readCount, - Value metaJson, - Value extJson, - Value replyToId, - Value richContent, - Value ipText, - Value ipDetailJson, - Value isDeleted, - Value deletedAt, - required DateTime timestamp, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid, -}); -typedef $$ChatMsgRecordsTableUpdateCompanionBuilder = ChatMsgRecordsCompanion - Function({ - Value id, - Value conversationId, - Value type, - Value role, - Value content, - Value author, - Value source, - Value category, - Value isRead, - Value readCount, - Value metaJson, - Value extJson, - Value replyToId, - Value richContent, - Value ipText, - Value ipDetailJson, - Value isDeleted, - Value deletedAt, - Value timestamp, - Value createdAt, - Value updatedAt, - Value rowid, -}); + $$ChatConversationsTableFilterComposer, + $$ChatConversationsTableOrderingComposer, + $$ChatConversationsTableAnnotationComposer, + $$ChatConversationsTableCreateCompanionBuilder, + $$ChatConversationsTableUpdateCompanionBuilder, + ( + ChatConversation, + BaseReferences< + _$AppDatabase, + $ChatConversationsTable, + ChatConversation + >, + ), + ChatConversation, + PrefetchHooks Function() + >; +typedef $$ChatMsgRecordsTableCreateCompanionBuilder = + ChatMsgRecordsCompanion Function({ + required String id, + required String conversationId, + required String type, + required String role, + required String content, + Value author, + Value source, + Value category, + Value isRead, + Value readCount, + Value metaJson, + Value extJson, + Value replyToId, + Value richContent, + Value ipText, + Value ipDetailJson, + Value isDeleted, + Value deletedAt, + required DateTime timestamp, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid, + }); +typedef $$ChatMsgRecordsTableUpdateCompanionBuilder = + ChatMsgRecordsCompanion Function({ + Value id, + Value conversationId, + Value type, + Value role, + Value content, + Value author, + Value source, + Value category, + Value isRead, + Value readCount, + Value metaJson, + Value extJson, + Value replyToId, + Value richContent, + Value ipText, + Value ipDetailJson, + Value isDeleted, + Value deletedAt, + Value timestamp, + Value createdAt, + Value updatedAt, + Value rowid, + }); class $$ChatMsgRecordsTableFilterComposer extends Composer<_$AppDatabase, $ChatMsgRecordsTable> { @@ -18262,68 +21816,109 @@ class $$ChatMsgRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get conversationId => $composableBuilder( - column: $table.conversationId, - builder: (column) => ColumnFilters(column)); + column: $table.conversationId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get type => $composableBuilder( - column: $table.type, builder: (column) => ColumnFilters(column)); + column: $table.type, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get role => $composableBuilder( - column: $table.role, builder: (column) => ColumnFilters(column)); + column: $table.role, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnFilters(column)); + column: $table.content, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get author => $composableBuilder( - column: $table.author, builder: (column) => ColumnFilters(column)); + column: $table.author, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get source => $composableBuilder( - column: $table.source, builder: (column) => ColumnFilters(column)); + column: $table.source, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get category => $composableBuilder( - column: $table.category, builder: (column) => ColumnFilters(column)); + column: $table.category, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isRead => $composableBuilder( - column: $table.isRead, builder: (column) => ColumnFilters(column)); + column: $table.isRead, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get readCount => $composableBuilder( - column: $table.readCount, builder: (column) => ColumnFilters(column)); + column: $table.readCount, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get metaJson => $composableBuilder( - column: $table.metaJson, builder: (column) => ColumnFilters(column)); + column: $table.metaJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get extJson => $composableBuilder( - column: $table.extJson, builder: (column) => ColumnFilters(column)); + column: $table.extJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get replyToId => $composableBuilder( - column: $table.replyToId, builder: (column) => ColumnFilters(column)); + column: $table.replyToId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get richContent => $composableBuilder( - column: $table.richContent, builder: (column) => ColumnFilters(column)); + column: $table.richContent, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get ipText => $composableBuilder( - column: $table.ipText, builder: (column) => ColumnFilters(column)); + column: $table.ipText, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get ipDetailJson => $composableBuilder( - column: $table.ipDetailJson, builder: (column) => ColumnFilters(column)); + column: $table.ipDetailJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isDeleted => $composableBuilder( - column: $table.isDeleted, builder: (column) => ColumnFilters(column)); + column: $table.isDeleted, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deletedAt => $composableBuilder( - column: $table.deletedAt, builder: (column) => ColumnFilters(column)); + column: $table.deletedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get timestamp => $composableBuilder( - column: $table.timestamp, builder: (column) => ColumnFilters(column)); + column: $table.timestamp, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$ChatMsgRecordsTableOrderingComposer @@ -18336,69 +21931,109 @@ class $$ChatMsgRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get conversationId => $composableBuilder( - column: $table.conversationId, - builder: (column) => ColumnOrderings(column)); + column: $table.conversationId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get type => $composableBuilder( - column: $table.type, builder: (column) => ColumnOrderings(column)); + column: $table.type, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get role => $composableBuilder( - column: $table.role, builder: (column) => ColumnOrderings(column)); + column: $table.role, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnOrderings(column)); + column: $table.content, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get author => $composableBuilder( - column: $table.author, builder: (column) => ColumnOrderings(column)); + column: $table.author, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get source => $composableBuilder( - column: $table.source, builder: (column) => ColumnOrderings(column)); + column: $table.source, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get category => $composableBuilder( - column: $table.category, builder: (column) => ColumnOrderings(column)); + column: $table.category, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isRead => $composableBuilder( - column: $table.isRead, builder: (column) => ColumnOrderings(column)); + column: $table.isRead, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get readCount => $composableBuilder( - column: $table.readCount, builder: (column) => ColumnOrderings(column)); + column: $table.readCount, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get metaJson => $composableBuilder( - column: $table.metaJson, builder: (column) => ColumnOrderings(column)); + column: $table.metaJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get extJson => $composableBuilder( - column: $table.extJson, builder: (column) => ColumnOrderings(column)); + column: $table.extJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get replyToId => $composableBuilder( - column: $table.replyToId, builder: (column) => ColumnOrderings(column)); + column: $table.replyToId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get richContent => $composableBuilder( - column: $table.richContent, builder: (column) => ColumnOrderings(column)); + column: $table.richContent, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get ipText => $composableBuilder( - column: $table.ipText, builder: (column) => ColumnOrderings(column)); + column: $table.ipText, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get ipDetailJson => $composableBuilder( - column: $table.ipDetailJson, - builder: (column) => ColumnOrderings(column)); + column: $table.ipDetailJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isDeleted => $composableBuilder( - column: $table.isDeleted, builder: (column) => ColumnOrderings(column)); + column: $table.isDeleted, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deletedAt => $composableBuilder( - column: $table.deletedAt, builder: (column) => ColumnOrderings(column)); + column: $table.deletedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get timestamp => $composableBuilder( - column: $table.timestamp, builder: (column) => ColumnOrderings(column)); + column: $table.timestamp, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$ChatMsgRecordsTableAnnotationComposer @@ -18414,7 +22049,9 @@ class $$ChatMsgRecordsTableAnnotationComposer $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumn get conversationId => $composableBuilder( - column: $table.conversationId, builder: (column) => column); + column: $table.conversationId, + builder: (column) => column, + ); GeneratedColumn get type => $composableBuilder(column: $table.type, builder: (column) => column); @@ -18450,13 +22087,17 @@ class $$ChatMsgRecordsTableAnnotationComposer $composableBuilder(column: $table.replyToId, builder: (column) => column); GeneratedColumn get richContent => $composableBuilder( - column: $table.richContent, builder: (column) => column); + column: $table.richContent, + builder: (column) => column, + ); GeneratedColumn get ipText => $composableBuilder(column: $table.ipText, builder: (column) => column); GeneratedColumn get ipDetailJson => $composableBuilder( - column: $table.ipDetailJson, builder: (column) => column); + column: $table.ipDetailJson, + builder: (column) => column, + ); GeneratedColumn get isDeleted => $composableBuilder(column: $table.isDeleted, builder: (column) => column); @@ -18474,24 +22115,29 @@ class $$ChatMsgRecordsTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$ChatMsgRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $ChatMsgRecordsTable, - ChatMsgRecord, - $$ChatMsgRecordsTableFilterComposer, - $$ChatMsgRecordsTableOrderingComposer, - $$ChatMsgRecordsTableAnnotationComposer, - $$ChatMsgRecordsTableCreateCompanionBuilder, - $$ChatMsgRecordsTableUpdateCompanionBuilder, - ( - ChatMsgRecord, - BaseReferences<_$AppDatabase, $ChatMsgRecordsTable, ChatMsgRecord> - ), - ChatMsgRecord, - PrefetchHooks Function()> { +class $$ChatMsgRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $ChatMsgRecordsTable, + ChatMsgRecord, + $$ChatMsgRecordsTableFilterComposer, + $$ChatMsgRecordsTableOrderingComposer, + $$ChatMsgRecordsTableAnnotationComposer, + $$ChatMsgRecordsTableCreateCompanionBuilder, + $$ChatMsgRecordsTableUpdateCompanionBuilder, + ( + ChatMsgRecord, + BaseReferences<_$AppDatabase, $ChatMsgRecordsTable, ChatMsgRecord>, + ), + ChatMsgRecord, + PrefetchHooks Function() + > { $$ChatMsgRecordsTableTableManager( - _$AppDatabase db, $ChatMsgRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $ChatMsgRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -18500,160 +22146,163 @@ class $$ChatMsgRecordsTableTableManager extends RootTableManager< $$ChatMsgRecordsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$ChatMsgRecordsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value conversationId = const Value.absent(), - Value type = const Value.absent(), - Value role = const Value.absent(), - Value content = const Value.absent(), - Value author = const Value.absent(), - Value source = const Value.absent(), - Value category = const Value.absent(), - Value isRead = const Value.absent(), - Value readCount = const Value.absent(), - Value metaJson = const Value.absent(), - Value extJson = const Value.absent(), - Value replyToId = const Value.absent(), - Value richContent = const Value.absent(), - Value ipText = const Value.absent(), - Value ipDetailJson = const Value.absent(), - Value isDeleted = const Value.absent(), - Value deletedAt = const Value.absent(), - Value timestamp = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - ChatMsgRecordsCompanion( - id: id, - conversationId: conversationId, - type: type, - role: role, - content: content, - author: author, - source: source, - category: category, - isRead: isRead, - readCount: readCount, - metaJson: metaJson, - extJson: extJson, - replyToId: replyToId, - richContent: richContent, - ipText: ipText, - ipDetailJson: ipDetailJson, - isDeleted: isDeleted, - deletedAt: deletedAt, - timestamp: timestamp, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String conversationId, - required String type, - required String role, - required String content, - Value author = const Value.absent(), - Value source = const Value.absent(), - Value category = const Value.absent(), - Value isRead = const Value.absent(), - Value readCount = const Value.absent(), - Value metaJson = const Value.absent(), - Value extJson = const Value.absent(), - Value replyToId = const Value.absent(), - Value richContent = const Value.absent(), - Value ipText = const Value.absent(), - Value ipDetailJson = const Value.absent(), - Value isDeleted = const Value.absent(), - Value deletedAt = const Value.absent(), - required DateTime timestamp, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid = const Value.absent(), - }) => - ChatMsgRecordsCompanion.insert( - id: id, - conversationId: conversationId, - type: type, - role: role, - content: content, - author: author, - source: source, - category: category, - isRead: isRead, - readCount: readCount, - metaJson: metaJson, - extJson: extJson, - replyToId: replyToId, - richContent: richContent, - ipText: ipText, - ipDetailJson: ipDetailJson, - isDeleted: isDeleted, - deletedAt: deletedAt, - timestamp: timestamp, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value conversationId = const Value.absent(), + Value type = const Value.absent(), + Value role = const Value.absent(), + Value content = const Value.absent(), + Value author = const Value.absent(), + Value source = const Value.absent(), + Value category = const Value.absent(), + Value isRead = const Value.absent(), + Value readCount = const Value.absent(), + Value metaJson = const Value.absent(), + Value extJson = const Value.absent(), + Value replyToId = const Value.absent(), + Value richContent = const Value.absent(), + Value ipText = const Value.absent(), + Value ipDetailJson = const Value.absent(), + Value isDeleted = const Value.absent(), + Value deletedAt = const Value.absent(), + Value timestamp = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => ChatMsgRecordsCompanion( + id: id, + conversationId: conversationId, + type: type, + role: role, + content: content, + author: author, + source: source, + category: category, + isRead: isRead, + readCount: readCount, + metaJson: metaJson, + extJson: extJson, + replyToId: replyToId, + richContent: richContent, + ipText: ipText, + ipDetailJson: ipDetailJson, + isDeleted: isDeleted, + deletedAt: deletedAt, + timestamp: timestamp, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String conversationId, + required String type, + required String role, + required String content, + Value author = const Value.absent(), + Value source = const Value.absent(), + Value category = const Value.absent(), + Value isRead = const Value.absent(), + Value readCount = const Value.absent(), + Value metaJson = const Value.absent(), + Value extJson = const Value.absent(), + Value replyToId = const Value.absent(), + Value richContent = const Value.absent(), + Value ipText = const Value.absent(), + Value ipDetailJson = const Value.absent(), + Value isDeleted = const Value.absent(), + Value deletedAt = const Value.absent(), + required DateTime timestamp, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid = const Value.absent(), + }) => ChatMsgRecordsCompanion.insert( + id: id, + conversationId: conversationId, + type: type, + role: role, + content: content, + author: author, + source: source, + category: category, + isRead: isRead, + readCount: readCount, + metaJson: metaJson, + extJson: extJson, + replyToId: replyToId, + richContent: richContent, + ipText: ipText, + ipDetailJson: ipDetailJson, + isDeleted: isDeleted, + deletedAt: deletedAt, + timestamp: timestamp, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$ChatMsgRecordsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $ChatMsgRecordsTable, - ChatMsgRecord, - $$ChatMsgRecordsTableFilterComposer, - $$ChatMsgRecordsTableOrderingComposer, - $$ChatMsgRecordsTableAnnotationComposer, - $$ChatMsgRecordsTableCreateCompanionBuilder, - $$ChatMsgRecordsTableUpdateCompanionBuilder, - ( +typedef $$ChatMsgRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $ChatMsgRecordsTable, ChatMsgRecord, - BaseReferences<_$AppDatabase, $ChatMsgRecordsTable, ChatMsgRecord> - ), - ChatMsgRecord, - PrefetchHooks Function()>; -typedef $$ChatAttachmentsTableCreateCompanionBuilder = ChatAttachmentsCompanion - Function({ - required String id, - required String messageId, - required String conversationId, - required String fileName, - required String filePath, - required String fileType, - required int fileSize, - Value thumbnailPath, - Value width, - Value height, - Value durationMs, - Value cloudUrl, - Value cloudSyncedAt, - required DateTime createdAt, - Value rowid, -}); -typedef $$ChatAttachmentsTableUpdateCompanionBuilder = ChatAttachmentsCompanion - Function({ - Value id, - Value messageId, - Value conversationId, - Value fileName, - Value filePath, - Value fileType, - Value fileSize, - Value thumbnailPath, - Value width, - Value height, - Value durationMs, - Value cloudUrl, - Value cloudSyncedAt, - Value createdAt, - Value rowid, -}); + $$ChatMsgRecordsTableFilterComposer, + $$ChatMsgRecordsTableOrderingComposer, + $$ChatMsgRecordsTableAnnotationComposer, + $$ChatMsgRecordsTableCreateCompanionBuilder, + $$ChatMsgRecordsTableUpdateCompanionBuilder, + ( + ChatMsgRecord, + BaseReferences<_$AppDatabase, $ChatMsgRecordsTable, ChatMsgRecord>, + ), + ChatMsgRecord, + PrefetchHooks Function() + >; +typedef $$ChatAttachmentsTableCreateCompanionBuilder = + ChatAttachmentsCompanion Function({ + required String id, + required String messageId, + required String conversationId, + required String fileName, + required String filePath, + required String fileType, + required int fileSize, + Value thumbnailPath, + Value width, + Value height, + Value durationMs, + Value cloudUrl, + Value cloudSyncedAt, + required DateTime createdAt, + Value rowid, + }); +typedef $$ChatAttachmentsTableUpdateCompanionBuilder = + ChatAttachmentsCompanion Function({ + Value id, + Value messageId, + Value conversationId, + Value fileName, + Value filePath, + Value fileType, + Value fileSize, + Value thumbnailPath, + Value width, + Value height, + Value durationMs, + Value cloudUrl, + Value cloudSyncedAt, + Value createdAt, + Value rowid, + }); class $$ChatAttachmentsTableFilterComposer extends Composer<_$AppDatabase, $ChatAttachmentsTable> { @@ -18665,47 +22314,74 @@ class $$ChatAttachmentsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get messageId => $composableBuilder( - column: $table.messageId, builder: (column) => ColumnFilters(column)); + column: $table.messageId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get conversationId => $composableBuilder( - column: $table.conversationId, - builder: (column) => ColumnFilters(column)); + column: $table.conversationId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileName => $composableBuilder( - column: $table.fileName, builder: (column) => ColumnFilters(column)); + column: $table.fileName, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get filePath => $composableBuilder( - column: $table.filePath, builder: (column) => ColumnFilters(column)); + column: $table.filePath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileType => $composableBuilder( - column: $table.fileType, builder: (column) => ColumnFilters(column)); + column: $table.fileType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileSize => $composableBuilder( - column: $table.fileSize, builder: (column) => ColumnFilters(column)); + column: $table.fileSize, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, builder: (column) => ColumnFilters(column)); + column: $table.thumbnailPath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get width => $composableBuilder( - column: $table.width, builder: (column) => ColumnFilters(column)); + column: $table.width, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get height => $composableBuilder( - column: $table.height, builder: (column) => ColumnFilters(column)); + column: $table.height, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get durationMs => $composableBuilder( - column: $table.durationMs, builder: (column) => ColumnFilters(column)); + column: $table.durationMs, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get cloudUrl => $composableBuilder( - column: $table.cloudUrl, builder: (column) => ColumnFilters(column)); + column: $table.cloudUrl, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get cloudSyncedAt => $composableBuilder( - column: $table.cloudSyncedAt, builder: (column) => ColumnFilters(column)); + column: $table.cloudSyncedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); } class $$ChatAttachmentsTableOrderingComposer @@ -18718,49 +22394,74 @@ class $$ChatAttachmentsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get messageId => $composableBuilder( - column: $table.messageId, builder: (column) => ColumnOrderings(column)); + column: $table.messageId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get conversationId => $composableBuilder( - column: $table.conversationId, - builder: (column) => ColumnOrderings(column)); + column: $table.conversationId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileName => $composableBuilder( - column: $table.fileName, builder: (column) => ColumnOrderings(column)); + column: $table.fileName, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get filePath => $composableBuilder( - column: $table.filePath, builder: (column) => ColumnOrderings(column)); + column: $table.filePath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileType => $composableBuilder( - column: $table.fileType, builder: (column) => ColumnOrderings(column)); + column: $table.fileType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileSize => $composableBuilder( - column: $table.fileSize, builder: (column) => ColumnOrderings(column)); + column: $table.fileSize, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, - builder: (column) => ColumnOrderings(column)); + column: $table.thumbnailPath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get width => $composableBuilder( - column: $table.width, builder: (column) => ColumnOrderings(column)); + column: $table.width, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get height => $composableBuilder( - column: $table.height, builder: (column) => ColumnOrderings(column)); + column: $table.height, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get durationMs => $composableBuilder( - column: $table.durationMs, builder: (column) => ColumnOrderings(column)); + column: $table.durationMs, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get cloudUrl => $composableBuilder( - column: $table.cloudUrl, builder: (column) => ColumnOrderings(column)); + column: $table.cloudUrl, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get cloudSyncedAt => $composableBuilder( - column: $table.cloudSyncedAt, - builder: (column) => ColumnOrderings(column)); + column: $table.cloudSyncedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$ChatAttachmentsTableAnnotationComposer @@ -18779,7 +22480,9 @@ class $$ChatAttachmentsTableAnnotationComposer $composableBuilder(column: $table.messageId, builder: (column) => column); GeneratedColumn get conversationId => $composableBuilder( - column: $table.conversationId, builder: (column) => column); + column: $table.conversationId, + builder: (column) => column, + ); GeneratedColumn get fileName => $composableBuilder(column: $table.fileName, builder: (column) => column); @@ -18794,7 +22497,9 @@ class $$ChatAttachmentsTableAnnotationComposer $composableBuilder(column: $table.fileSize, builder: (column) => column); GeneratedColumn get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, builder: (column) => column); + column: $table.thumbnailPath, + builder: (column) => column, + ); GeneratedColumn get width => $composableBuilder(column: $table.width, builder: (column) => column); @@ -18803,36 +22508,49 @@ class $$ChatAttachmentsTableAnnotationComposer $composableBuilder(column: $table.height, builder: (column) => column); GeneratedColumn get durationMs => $composableBuilder( - column: $table.durationMs, builder: (column) => column); + column: $table.durationMs, + builder: (column) => column, + ); GeneratedColumn get cloudUrl => $composableBuilder(column: $table.cloudUrl, builder: (column) => column); GeneratedColumn get cloudSyncedAt => $composableBuilder( - column: $table.cloudSyncedAt, builder: (column) => column); + column: $table.cloudSyncedAt, + builder: (column) => column, + ); GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); } -class $$ChatAttachmentsTableTableManager extends RootTableManager< - _$AppDatabase, - $ChatAttachmentsTable, - ChatAttachment, - $$ChatAttachmentsTableFilterComposer, - $$ChatAttachmentsTableOrderingComposer, - $$ChatAttachmentsTableAnnotationComposer, - $$ChatAttachmentsTableCreateCompanionBuilder, - $$ChatAttachmentsTableUpdateCompanionBuilder, - ( - ChatAttachment, - BaseReferences<_$AppDatabase, $ChatAttachmentsTable, ChatAttachment> - ), - ChatAttachment, - PrefetchHooks Function()> { +class $$ChatAttachmentsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $ChatAttachmentsTable, + ChatAttachment, + $$ChatAttachmentsTableFilterComposer, + $$ChatAttachmentsTableOrderingComposer, + $$ChatAttachmentsTableAnnotationComposer, + $$ChatAttachmentsTableCreateCompanionBuilder, + $$ChatAttachmentsTableUpdateCompanionBuilder, + ( + ChatAttachment, + BaseReferences< + _$AppDatabase, + $ChatAttachmentsTable, + ChatAttachment + >, + ), + ChatAttachment, + PrefetchHooks Function() + > { $$ChatAttachmentsTableTableManager( - _$AppDatabase db, $ChatAttachmentsTable table) - : super(TableManagerState( + _$AppDatabase db, + $ChatAttachmentsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -18841,114 +22559,117 @@ class $$ChatAttachmentsTableTableManager extends RootTableManager< $$ChatAttachmentsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$ChatAttachmentsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value messageId = const Value.absent(), - Value conversationId = const Value.absent(), - Value fileName = const Value.absent(), - Value filePath = const Value.absent(), - Value fileType = const Value.absent(), - Value fileSize = const Value.absent(), - Value thumbnailPath = const Value.absent(), - Value width = const Value.absent(), - Value height = const Value.absent(), - Value durationMs = const Value.absent(), - Value cloudUrl = const Value.absent(), - Value cloudSyncedAt = const Value.absent(), - Value createdAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - ChatAttachmentsCompanion( - id: id, - messageId: messageId, - conversationId: conversationId, - fileName: fileName, - filePath: filePath, - fileType: fileType, - fileSize: fileSize, - thumbnailPath: thumbnailPath, - width: width, - height: height, - durationMs: durationMs, - cloudUrl: cloudUrl, - cloudSyncedAt: cloudSyncedAt, - createdAt: createdAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String messageId, - required String conversationId, - required String fileName, - required String filePath, - required String fileType, - required int fileSize, - Value thumbnailPath = const Value.absent(), - Value width = const Value.absent(), - Value height = const Value.absent(), - Value durationMs = const Value.absent(), - Value cloudUrl = const Value.absent(), - Value cloudSyncedAt = const Value.absent(), - required DateTime createdAt, - Value rowid = const Value.absent(), - }) => - ChatAttachmentsCompanion.insert( - id: id, - messageId: messageId, - conversationId: conversationId, - fileName: fileName, - filePath: filePath, - fileType: fileType, - fileSize: fileSize, - thumbnailPath: thumbnailPath, - width: width, - height: height, - durationMs: durationMs, - cloudUrl: cloudUrl, - cloudSyncedAt: cloudSyncedAt, - createdAt: createdAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value messageId = const Value.absent(), + Value conversationId = const Value.absent(), + Value fileName = const Value.absent(), + Value filePath = const Value.absent(), + Value fileType = const Value.absent(), + Value fileSize = const Value.absent(), + Value thumbnailPath = const Value.absent(), + Value width = const Value.absent(), + Value height = const Value.absent(), + Value durationMs = const Value.absent(), + Value cloudUrl = const Value.absent(), + Value cloudSyncedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => ChatAttachmentsCompanion( + id: id, + messageId: messageId, + conversationId: conversationId, + fileName: fileName, + filePath: filePath, + fileType: fileType, + fileSize: fileSize, + thumbnailPath: thumbnailPath, + width: width, + height: height, + durationMs: durationMs, + cloudUrl: cloudUrl, + cloudSyncedAt: cloudSyncedAt, + createdAt: createdAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String messageId, + required String conversationId, + required String fileName, + required String filePath, + required String fileType, + required int fileSize, + Value thumbnailPath = const Value.absent(), + Value width = const Value.absent(), + Value height = const Value.absent(), + Value durationMs = const Value.absent(), + Value cloudUrl = const Value.absent(), + Value cloudSyncedAt = const Value.absent(), + required DateTime createdAt, + Value rowid = const Value.absent(), + }) => ChatAttachmentsCompanion.insert( + id: id, + messageId: messageId, + conversationId: conversationId, + fileName: fileName, + filePath: filePath, + fileType: fileType, + fileSize: fileSize, + thumbnailPath: thumbnailPath, + width: width, + height: height, + durationMs: durationMs, + cloudUrl: cloudUrl, + cloudSyncedAt: cloudSyncedAt, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$ChatAttachmentsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $ChatAttachmentsTable, - ChatAttachment, - $$ChatAttachmentsTableFilterComposer, - $$ChatAttachmentsTableOrderingComposer, - $$ChatAttachmentsTableAnnotationComposer, - $$ChatAttachmentsTableCreateCompanionBuilder, - $$ChatAttachmentsTableUpdateCompanionBuilder, - ( +typedef $$ChatAttachmentsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $ChatAttachmentsTable, ChatAttachment, - BaseReferences<_$AppDatabase, $ChatAttachmentsTable, ChatAttachment> - ), - ChatAttachment, - PrefetchHooks Function()>; -typedef $$IpLocationCachesTableCreateCompanionBuilder - = IpLocationCachesCompanion Function({ - required String ip, - required String city, - Value province, - required String fullText, - required DateTime queriedAt, - Value rowid, -}); -typedef $$IpLocationCachesTableUpdateCompanionBuilder - = IpLocationCachesCompanion Function({ - Value ip, - Value city, - Value province, - Value fullText, - Value queriedAt, - Value rowid, -}); + $$ChatAttachmentsTableFilterComposer, + $$ChatAttachmentsTableOrderingComposer, + $$ChatAttachmentsTableAnnotationComposer, + $$ChatAttachmentsTableCreateCompanionBuilder, + $$ChatAttachmentsTableUpdateCompanionBuilder, + ( + ChatAttachment, + BaseReferences<_$AppDatabase, $ChatAttachmentsTable, ChatAttachment>, + ), + ChatAttachment, + PrefetchHooks Function() + >; +typedef $$IpLocationCachesTableCreateCompanionBuilder = + IpLocationCachesCompanion Function({ + required String ip, + required String city, + Value province, + required String fullText, + required DateTime queriedAt, + Value rowid, + }); +typedef $$IpLocationCachesTableUpdateCompanionBuilder = + IpLocationCachesCompanion Function({ + Value ip, + Value city, + Value province, + Value fullText, + Value queriedAt, + Value rowid, + }); class $$IpLocationCachesTableFilterComposer extends Composer<_$AppDatabase, $IpLocationCachesTable> { @@ -18960,19 +22681,29 @@ class $$IpLocationCachesTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get ip => $composableBuilder( - column: $table.ip, builder: (column) => ColumnFilters(column)); + column: $table.ip, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get city => $composableBuilder( - column: $table.city, builder: (column) => ColumnFilters(column)); + column: $table.city, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get province => $composableBuilder( - column: $table.province, builder: (column) => ColumnFilters(column)); + column: $table.province, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fullText => $composableBuilder( - column: $table.fullText, builder: (column) => ColumnFilters(column)); + column: $table.fullText, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get queriedAt => $composableBuilder( - column: $table.queriedAt, builder: (column) => ColumnFilters(column)); + column: $table.queriedAt, + builder: (column) => ColumnFilters(column), + ); } class $$IpLocationCachesTableOrderingComposer @@ -18985,19 +22716,29 @@ class $$IpLocationCachesTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get ip => $composableBuilder( - column: $table.ip, builder: (column) => ColumnOrderings(column)); + column: $table.ip, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get city => $composableBuilder( - column: $table.city, builder: (column) => ColumnOrderings(column)); + column: $table.city, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get province => $composableBuilder( - column: $table.province, builder: (column) => ColumnOrderings(column)); + column: $table.province, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fullText => $composableBuilder( - column: $table.fullText, builder: (column) => ColumnOrderings(column)); + column: $table.fullText, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get queriedAt => $composableBuilder( - column: $table.queriedAt, builder: (column) => ColumnOrderings(column)); + column: $table.queriedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$IpLocationCachesTableAnnotationComposer @@ -19025,24 +22766,33 @@ class $$IpLocationCachesTableAnnotationComposer $composableBuilder(column: $table.queriedAt, builder: (column) => column); } -class $$IpLocationCachesTableTableManager extends RootTableManager< - _$AppDatabase, - $IpLocationCachesTable, - IpLocationCache, - $$IpLocationCachesTableFilterComposer, - $$IpLocationCachesTableOrderingComposer, - $$IpLocationCachesTableAnnotationComposer, - $$IpLocationCachesTableCreateCompanionBuilder, - $$IpLocationCachesTableUpdateCompanionBuilder, - ( - IpLocationCache, - BaseReferences<_$AppDatabase, $IpLocationCachesTable, IpLocationCache> - ), - IpLocationCache, - PrefetchHooks Function()> { +class $$IpLocationCachesTableTableManager + extends + RootTableManager< + _$AppDatabase, + $IpLocationCachesTable, + IpLocationCache, + $$IpLocationCachesTableFilterComposer, + $$IpLocationCachesTableOrderingComposer, + $$IpLocationCachesTableAnnotationComposer, + $$IpLocationCachesTableCreateCompanionBuilder, + $$IpLocationCachesTableUpdateCompanionBuilder, + ( + IpLocationCache, + BaseReferences< + _$AppDatabase, + $IpLocationCachesTable, + IpLocationCache + >, + ), + IpLocationCache, + PrefetchHooks Function() + > { $$IpLocationCachesTableTableManager( - _$AppDatabase db, $IpLocationCachesTable table) - : super(TableManagerState( + _$AppDatabase db, + $IpLocationCachesTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -19051,98 +22801,103 @@ class $$IpLocationCachesTableTableManager extends RootTableManager< $$IpLocationCachesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$IpLocationCachesTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value ip = const Value.absent(), - Value city = const Value.absent(), - Value province = const Value.absent(), - Value fullText = const Value.absent(), - Value queriedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - IpLocationCachesCompanion( - ip: ip, - city: city, - province: province, - fullText: fullText, - queriedAt: queriedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String ip, - required String city, - Value province = const Value.absent(), - required String fullText, - required DateTime queriedAt, - Value rowid = const Value.absent(), - }) => - IpLocationCachesCompanion.insert( - ip: ip, - city: city, - province: province, - fullText: fullText, - queriedAt: queriedAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value ip = const Value.absent(), + Value city = const Value.absent(), + Value province = const Value.absent(), + Value fullText = const Value.absent(), + Value queriedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => IpLocationCachesCompanion( + ip: ip, + city: city, + province: province, + fullText: fullText, + queriedAt: queriedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String ip, + required String city, + Value province = const Value.absent(), + required String fullText, + required DateTime queriedAt, + Value rowid = const Value.absent(), + }) => IpLocationCachesCompanion.insert( + ip: ip, + city: city, + province: province, + fullText: fullText, + queriedAt: queriedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$IpLocationCachesTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $IpLocationCachesTable, - IpLocationCache, - $$IpLocationCachesTableFilterComposer, - $$IpLocationCachesTableOrderingComposer, - $$IpLocationCachesTableAnnotationComposer, - $$IpLocationCachesTableCreateCompanionBuilder, - $$IpLocationCachesTableUpdateCompanionBuilder, - ( +typedef $$IpLocationCachesTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $IpLocationCachesTable, IpLocationCache, - BaseReferences<_$AppDatabase, $IpLocationCachesTable, IpLocationCache> - ), - IpLocationCache, - PrefetchHooks Function()>; -typedef $$TransferDeviceRecordsTableCreateCompanionBuilder - = TransferDeviceRecordsCompanion Function({ - required String id, - required String alias, - Value deviceModel, - Value deviceType, - Value ip, - Value port, - Value pairingMethod, - Value preferredTransport, - Value isOnline, - Value isVerified, - Value publicKey, - Value fingerprint, - required DateTime lastSeen, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid, -}); -typedef $$TransferDeviceRecordsTableUpdateCompanionBuilder - = TransferDeviceRecordsCompanion Function({ - Value id, - Value alias, - Value deviceModel, - Value deviceType, - Value ip, - Value port, - Value pairingMethod, - Value preferredTransport, - Value isOnline, - Value isVerified, - Value publicKey, - Value fingerprint, - Value lastSeen, - Value createdAt, - Value updatedAt, - Value rowid, -}); + $$IpLocationCachesTableFilterComposer, + $$IpLocationCachesTableOrderingComposer, + $$IpLocationCachesTableAnnotationComposer, + $$IpLocationCachesTableCreateCompanionBuilder, + $$IpLocationCachesTableUpdateCompanionBuilder, + ( + IpLocationCache, + BaseReferences<_$AppDatabase, $IpLocationCachesTable, IpLocationCache>, + ), + IpLocationCache, + PrefetchHooks Function() + >; +typedef $$TransferDeviceRecordsTableCreateCompanionBuilder = + TransferDeviceRecordsCompanion Function({ + required String id, + required String alias, + Value deviceModel, + Value deviceType, + Value ip, + Value port, + Value pairingMethod, + Value preferredTransport, + Value isOnline, + Value isVerified, + Value isFavorite, + Value publicKey, + Value fingerprint, + required DateTime lastSeen, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid, + }); +typedef $$TransferDeviceRecordsTableUpdateCompanionBuilder = + TransferDeviceRecordsCompanion Function({ + Value id, + Value alias, + Value deviceModel, + Value deviceType, + Value ip, + Value port, + Value pairingMethod, + Value preferredTransport, + Value isOnline, + Value isVerified, + Value isFavorite, + Value publicKey, + Value fingerprint, + Value lastSeen, + Value createdAt, + Value updatedAt, + Value rowid, + }); class $$TransferDeviceRecordsTableFilterComposer extends Composer<_$AppDatabase, $TransferDeviceRecordsTable> { @@ -19154,50 +22909,84 @@ class $$TransferDeviceRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get alias => $composableBuilder( - column: $table.alias, builder: (column) => ColumnFilters(column)); + column: $table.alias, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deviceModel => $composableBuilder( - column: $table.deviceModel, builder: (column) => ColumnFilters(column)); + column: $table.deviceModel, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deviceType => $composableBuilder( - column: $table.deviceType, builder: (column) => ColumnFilters(column)); + column: $table.deviceType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get ip => $composableBuilder( - column: $table.ip, builder: (column) => ColumnFilters(column)); + column: $table.ip, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get port => $composableBuilder( - column: $table.port, builder: (column) => ColumnFilters(column)); + column: $table.port, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get pairingMethod => $composableBuilder( - column: $table.pairingMethod, builder: (column) => ColumnFilters(column)); + column: $table.pairingMethod, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get preferredTransport => $composableBuilder( - column: $table.preferredTransport, - builder: (column) => ColumnFilters(column)); + column: $table.preferredTransport, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isOnline => $composableBuilder( - column: $table.isOnline, builder: (column) => ColumnFilters(column)); + column: $table.isOnline, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isVerified => $composableBuilder( - column: $table.isVerified, builder: (column) => ColumnFilters(column)); + column: $table.isVerified, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get isFavorite => $composableBuilder( + column: $table.isFavorite, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get publicKey => $composableBuilder( - column: $table.publicKey, builder: (column) => ColumnFilters(column)); + column: $table.publicKey, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fingerprint => $composableBuilder( - column: $table.fingerprint, builder: (column) => ColumnFilters(column)); + column: $table.fingerprint, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get lastSeen => $composableBuilder( - column: $table.lastSeen, builder: (column) => ColumnFilters(column)); + column: $table.lastSeen, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$TransferDeviceRecordsTableOrderingComposer @@ -19210,51 +22999,84 @@ class $$TransferDeviceRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get alias => $composableBuilder( - column: $table.alias, builder: (column) => ColumnOrderings(column)); + column: $table.alias, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deviceModel => $composableBuilder( - column: $table.deviceModel, builder: (column) => ColumnOrderings(column)); + column: $table.deviceModel, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deviceType => $composableBuilder( - column: $table.deviceType, builder: (column) => ColumnOrderings(column)); + column: $table.deviceType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get ip => $composableBuilder( - column: $table.ip, builder: (column) => ColumnOrderings(column)); + column: $table.ip, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get port => $composableBuilder( - column: $table.port, builder: (column) => ColumnOrderings(column)); + column: $table.port, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get pairingMethod => $composableBuilder( - column: $table.pairingMethod, - builder: (column) => ColumnOrderings(column)); + column: $table.pairingMethod, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get preferredTransport => $composableBuilder( - column: $table.preferredTransport, - builder: (column) => ColumnOrderings(column)); + column: $table.preferredTransport, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isOnline => $composableBuilder( - column: $table.isOnline, builder: (column) => ColumnOrderings(column)); + column: $table.isOnline, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isVerified => $composableBuilder( - column: $table.isVerified, builder: (column) => ColumnOrderings(column)); + column: $table.isVerified, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get isFavorite => $composableBuilder( + column: $table.isFavorite, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get publicKey => $composableBuilder( - column: $table.publicKey, builder: (column) => ColumnOrderings(column)); + column: $table.publicKey, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fingerprint => $composableBuilder( - column: $table.fingerprint, builder: (column) => ColumnOrderings(column)); + column: $table.fingerprint, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get lastSeen => $composableBuilder( - column: $table.lastSeen, builder: (column) => ColumnOrderings(column)); + column: $table.lastSeen, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$TransferDeviceRecordsTableAnnotationComposer @@ -19273,10 +23095,14 @@ class $$TransferDeviceRecordsTableAnnotationComposer $composableBuilder(column: $table.alias, builder: (column) => column); GeneratedColumn get deviceModel => $composableBuilder( - column: $table.deviceModel, builder: (column) => column); + column: $table.deviceModel, + builder: (column) => column, + ); GeneratedColumn get deviceType => $composableBuilder( - column: $table.deviceType, builder: (column) => column); + column: $table.deviceType, + builder: (column) => column, + ); GeneratedColumn get ip => $composableBuilder(column: $table.ip, builder: (column) => column); @@ -19285,22 +23111,35 @@ class $$TransferDeviceRecordsTableAnnotationComposer $composableBuilder(column: $table.port, builder: (column) => column); GeneratedColumn get pairingMethod => $composableBuilder( - column: $table.pairingMethod, builder: (column) => column); + column: $table.pairingMethod, + builder: (column) => column, + ); GeneratedColumn get preferredTransport => $composableBuilder( - column: $table.preferredTransport, builder: (column) => column); + column: $table.preferredTransport, + builder: (column) => column, + ); GeneratedColumn get isOnline => $composableBuilder(column: $table.isOnline, builder: (column) => column); GeneratedColumn get isVerified => $composableBuilder( - column: $table.isVerified, builder: (column) => column); + column: $table.isVerified, + builder: (column) => column, + ); + + GeneratedColumn get isFavorite => $composableBuilder( + column: $table.isFavorite, + builder: (column) => column, + ); GeneratedColumn get publicKey => $composableBuilder(column: $table.publicKey, builder: (column) => column); GeneratedColumn get fingerprint => $composableBuilder( - column: $table.fingerprint, builder: (column) => column); + column: $table.fingerprint, + builder: (column) => column, + ); GeneratedColumn get lastSeen => $composableBuilder(column: $table.lastSeen, builder: (column) => column); @@ -19312,182 +23151,205 @@ class $$TransferDeviceRecordsTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$TransferDeviceRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $TransferDeviceRecordsTable, - TransferDeviceRecord, - $$TransferDeviceRecordsTableFilterComposer, - $$TransferDeviceRecordsTableOrderingComposer, - $$TransferDeviceRecordsTableAnnotationComposer, - $$TransferDeviceRecordsTableCreateCompanionBuilder, - $$TransferDeviceRecordsTableUpdateCompanionBuilder, - ( - TransferDeviceRecord, - BaseReferences<_$AppDatabase, $TransferDeviceRecordsTable, - TransferDeviceRecord> - ), - TransferDeviceRecord, - PrefetchHooks Function()> { +class $$TransferDeviceRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $TransferDeviceRecordsTable, + TransferDeviceRecord, + $$TransferDeviceRecordsTableFilterComposer, + $$TransferDeviceRecordsTableOrderingComposer, + $$TransferDeviceRecordsTableAnnotationComposer, + $$TransferDeviceRecordsTableCreateCompanionBuilder, + $$TransferDeviceRecordsTableUpdateCompanionBuilder, + ( + TransferDeviceRecord, + BaseReferences< + _$AppDatabase, + $TransferDeviceRecordsTable, + TransferDeviceRecord + >, + ), + TransferDeviceRecord, + PrefetchHooks Function() + > { $$TransferDeviceRecordsTableTableManager( - _$AppDatabase db, $TransferDeviceRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $TransferDeviceRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => $$TransferDeviceRecordsTableFilterComposer( - $db: db, $table: table), + $db: db, + $table: table, + ), createOrderingComposer: () => $$TransferDeviceRecordsTableOrderingComposer( - $db: db, $table: table), + $db: db, + $table: table, + ), createComputedFieldComposer: () => $$TransferDeviceRecordsTableAnnotationComposer( - $db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value alias = const Value.absent(), - Value deviceModel = const Value.absent(), - Value deviceType = const Value.absent(), - Value ip = const Value.absent(), - Value port = const Value.absent(), - Value pairingMethod = const Value.absent(), - Value preferredTransport = const Value.absent(), - Value isOnline = const Value.absent(), - Value isVerified = const Value.absent(), - Value publicKey = const Value.absent(), - Value fingerprint = const Value.absent(), - Value lastSeen = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - TransferDeviceRecordsCompanion( - id: id, - alias: alias, - deviceModel: deviceModel, - deviceType: deviceType, - ip: ip, - port: port, - pairingMethod: pairingMethod, - preferredTransport: preferredTransport, - isOnline: isOnline, - isVerified: isVerified, - publicKey: publicKey, - fingerprint: fingerprint, - lastSeen: lastSeen, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String alias, - Value deviceModel = const Value.absent(), - Value deviceType = const Value.absent(), - Value ip = const Value.absent(), - Value port = const Value.absent(), - Value pairingMethod = const Value.absent(), - Value preferredTransport = const Value.absent(), - Value isOnline = const Value.absent(), - Value isVerified = const Value.absent(), - Value publicKey = const Value.absent(), - Value fingerprint = const Value.absent(), - required DateTime lastSeen, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid = const Value.absent(), - }) => - TransferDeviceRecordsCompanion.insert( - id: id, - alias: alias, - deviceModel: deviceModel, - deviceType: deviceType, - ip: ip, - port: port, - pairingMethod: pairingMethod, - preferredTransport: preferredTransport, - isOnline: isOnline, - isVerified: isVerified, - publicKey: publicKey, - fingerprint: fingerprint, - lastSeen: lastSeen, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), + $db: db, + $table: table, + ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value alias = const Value.absent(), + Value deviceModel = const Value.absent(), + Value deviceType = const Value.absent(), + Value ip = const Value.absent(), + Value port = const Value.absent(), + Value pairingMethod = const Value.absent(), + Value preferredTransport = const Value.absent(), + Value isOnline = const Value.absent(), + Value isVerified = const Value.absent(), + Value isFavorite = const Value.absent(), + Value publicKey = const Value.absent(), + Value fingerprint = const Value.absent(), + Value lastSeen = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => TransferDeviceRecordsCompanion( + id: id, + alias: alias, + deviceModel: deviceModel, + deviceType: deviceType, + ip: ip, + port: port, + pairingMethod: pairingMethod, + preferredTransport: preferredTransport, + isOnline: isOnline, + isVerified: isVerified, + isFavorite: isFavorite, + publicKey: publicKey, + fingerprint: fingerprint, + lastSeen: lastSeen, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String alias, + Value deviceModel = const Value.absent(), + Value deviceType = const Value.absent(), + Value ip = const Value.absent(), + Value port = const Value.absent(), + Value pairingMethod = const Value.absent(), + Value preferredTransport = const Value.absent(), + Value isOnline = const Value.absent(), + Value isVerified = const Value.absent(), + Value isFavorite = const Value.absent(), + Value publicKey = const Value.absent(), + Value fingerprint = const Value.absent(), + required DateTime lastSeen, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid = const Value.absent(), + }) => TransferDeviceRecordsCompanion.insert( + id: id, + alias: alias, + deviceModel: deviceModel, + deviceType: deviceType, + ip: ip, + port: port, + pairingMethod: pairingMethod, + preferredTransport: preferredTransport, + isOnline: isOnline, + isVerified: isVerified, + isFavorite: isFavorite, + publicKey: publicKey, + fingerprint: fingerprint, + lastSeen: lastSeen, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$TransferDeviceRecordsTableProcessedTableManager - = ProcessedTableManager< - _$AppDatabase, - $TransferDeviceRecordsTable, +typedef $$TransferDeviceRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $TransferDeviceRecordsTable, + TransferDeviceRecord, + $$TransferDeviceRecordsTableFilterComposer, + $$TransferDeviceRecordsTableOrderingComposer, + $$TransferDeviceRecordsTableAnnotationComposer, + $$TransferDeviceRecordsTableCreateCompanionBuilder, + $$TransferDeviceRecordsTableUpdateCompanionBuilder, + ( TransferDeviceRecord, - $$TransferDeviceRecordsTableFilterComposer, - $$TransferDeviceRecordsTableOrderingComposer, - $$TransferDeviceRecordsTableAnnotationComposer, - $$TransferDeviceRecordsTableCreateCompanionBuilder, - $$TransferDeviceRecordsTableUpdateCompanionBuilder, - ( - TransferDeviceRecord, - BaseReferences<_$AppDatabase, $TransferDeviceRecordsTable, - TransferDeviceRecord> - ), - TransferDeviceRecord, - PrefetchHooks Function()>; -typedef $$TransferRecordsTableCreateCompanionBuilder = TransferRecordsCompanion - Function({ - required String id, - required String sessionId, - required String peerId, - Value peerAlias, - Value transport, - Value direction, - Value status, - required String fileName, - Value fileSize, - Value transferredBytes, - Value speed, - Value mimeType, - Value filePath, - Value thumbnailPath, - Value fileSha256, - Value hashVerified, - Value errorMessage, - required DateTime startTime, - Value endTime, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid, -}); -typedef $$TransferRecordsTableUpdateCompanionBuilder = TransferRecordsCompanion - Function({ - Value id, - Value sessionId, - Value peerId, - Value peerAlias, - Value transport, - Value direction, - Value status, - Value fileName, - Value fileSize, - Value transferredBytes, - Value speed, - Value mimeType, - Value filePath, - Value thumbnailPath, - Value fileSha256, - Value hashVerified, - Value errorMessage, - Value startTime, - Value endTime, - Value createdAt, - Value updatedAt, - Value rowid, -}); + BaseReferences< + _$AppDatabase, + $TransferDeviceRecordsTable, + TransferDeviceRecord + >, + ), + TransferDeviceRecord, + PrefetchHooks Function() + >; +typedef $$TransferRecordsTableCreateCompanionBuilder = + TransferRecordsCompanion Function({ + required String id, + required String sessionId, + required String peerId, + Value peerAlias, + Value transport, + Value direction, + Value status, + required String fileName, + Value fileSize, + Value transferredBytes, + Value speed, + Value mimeType, + Value filePath, + Value thumbnailPath, + Value fileSha256, + Value hashVerified, + Value errorMessage, + required DateTime startTime, + Value endTime, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid, + }); +typedef $$TransferRecordsTableUpdateCompanionBuilder = + TransferRecordsCompanion Function({ + Value id, + Value sessionId, + Value peerId, + Value peerAlias, + Value transport, + Value direction, + Value status, + Value fileName, + Value fileSize, + Value transferredBytes, + Value speed, + Value mimeType, + Value filePath, + Value thumbnailPath, + Value fileSha256, + Value hashVerified, + Value errorMessage, + Value startTime, + Value endTime, + Value createdAt, + Value updatedAt, + Value rowid, + }); class $$TransferRecordsTableFilterComposer extends Composer<_$AppDatabase, $TransferRecordsTable> { @@ -19499,68 +23361,109 @@ class $$TransferRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get sessionId => $composableBuilder( - column: $table.sessionId, builder: (column) => ColumnFilters(column)); + column: $table.sessionId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get peerId => $composableBuilder( - column: $table.peerId, builder: (column) => ColumnFilters(column)); + column: $table.peerId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get peerAlias => $composableBuilder( - column: $table.peerAlias, builder: (column) => ColumnFilters(column)); + column: $table.peerAlias, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get transport => $composableBuilder( - column: $table.transport, builder: (column) => ColumnFilters(column)); + column: $table.transport, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get direction => $composableBuilder( - column: $table.direction, builder: (column) => ColumnFilters(column)); + column: $table.direction, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get status => $composableBuilder( - column: $table.status, builder: (column) => ColumnFilters(column)); + column: $table.status, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileName => $composableBuilder( - column: $table.fileName, builder: (column) => ColumnFilters(column)); + column: $table.fileName, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileSize => $composableBuilder( - column: $table.fileSize, builder: (column) => ColumnFilters(column)); + column: $table.fileSize, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get transferredBytes => $composableBuilder( - column: $table.transferredBytes, - builder: (column) => ColumnFilters(column)); + column: $table.transferredBytes, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get speed => $composableBuilder( - column: $table.speed, builder: (column) => ColumnFilters(column)); + column: $table.speed, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get mimeType => $composableBuilder( - column: $table.mimeType, builder: (column) => ColumnFilters(column)); + column: $table.mimeType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get filePath => $composableBuilder( - column: $table.filePath, builder: (column) => ColumnFilters(column)); + column: $table.filePath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, builder: (column) => ColumnFilters(column)); + column: $table.thumbnailPath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileSha256 => $composableBuilder( - column: $table.fileSha256, builder: (column) => ColumnFilters(column)); + column: $table.fileSha256, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get hashVerified => $composableBuilder( - column: $table.hashVerified, builder: (column) => ColumnFilters(column)); + column: $table.hashVerified, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get errorMessage => $composableBuilder( - column: $table.errorMessage, builder: (column) => ColumnFilters(column)); + column: $table.errorMessage, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get startTime => $composableBuilder( - column: $table.startTime, builder: (column) => ColumnFilters(column)); + column: $table.startTime, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get endTime => $composableBuilder( - column: $table.endTime, builder: (column) => ColumnFilters(column)); + column: $table.endTime, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$TransferRecordsTableOrderingComposer @@ -19573,71 +23476,109 @@ class $$TransferRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get sessionId => $composableBuilder( - column: $table.sessionId, builder: (column) => ColumnOrderings(column)); + column: $table.sessionId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get peerId => $composableBuilder( - column: $table.peerId, builder: (column) => ColumnOrderings(column)); + column: $table.peerId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get peerAlias => $composableBuilder( - column: $table.peerAlias, builder: (column) => ColumnOrderings(column)); + column: $table.peerAlias, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get transport => $composableBuilder( - column: $table.transport, builder: (column) => ColumnOrderings(column)); + column: $table.transport, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get direction => $composableBuilder( - column: $table.direction, builder: (column) => ColumnOrderings(column)); + column: $table.direction, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get status => $composableBuilder( - column: $table.status, builder: (column) => ColumnOrderings(column)); + column: $table.status, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileName => $composableBuilder( - column: $table.fileName, builder: (column) => ColumnOrderings(column)); + column: $table.fileName, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileSize => $composableBuilder( - column: $table.fileSize, builder: (column) => ColumnOrderings(column)); + column: $table.fileSize, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get transferredBytes => $composableBuilder( - column: $table.transferredBytes, - builder: (column) => ColumnOrderings(column)); + column: $table.transferredBytes, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get speed => $composableBuilder( - column: $table.speed, builder: (column) => ColumnOrderings(column)); + column: $table.speed, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get mimeType => $composableBuilder( - column: $table.mimeType, builder: (column) => ColumnOrderings(column)); + column: $table.mimeType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get filePath => $composableBuilder( - column: $table.filePath, builder: (column) => ColumnOrderings(column)); + column: $table.filePath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, - builder: (column) => ColumnOrderings(column)); + column: $table.thumbnailPath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileSha256 => $composableBuilder( - column: $table.fileSha256, builder: (column) => ColumnOrderings(column)); + column: $table.fileSha256, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get hashVerified => $composableBuilder( - column: $table.hashVerified, - builder: (column) => ColumnOrderings(column)); + column: $table.hashVerified, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get errorMessage => $composableBuilder( - column: $table.errorMessage, - builder: (column) => ColumnOrderings(column)); + column: $table.errorMessage, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get startTime => $composableBuilder( - column: $table.startTime, builder: (column) => ColumnOrderings(column)); + column: $table.startTime, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get endTime => $composableBuilder( - column: $table.endTime, builder: (column) => ColumnOrderings(column)); + column: $table.endTime, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$TransferRecordsTableAnnotationComposer @@ -19677,7 +23618,9 @@ class $$TransferRecordsTableAnnotationComposer $composableBuilder(column: $table.fileSize, builder: (column) => column); GeneratedColumn get transferredBytes => $composableBuilder( - column: $table.transferredBytes, builder: (column) => column); + column: $table.transferredBytes, + builder: (column) => column, + ); GeneratedColumn get speed => $composableBuilder(column: $table.speed, builder: (column) => column); @@ -19689,16 +23632,24 @@ class $$TransferRecordsTableAnnotationComposer $composableBuilder(column: $table.filePath, builder: (column) => column); GeneratedColumn get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, builder: (column) => column); + column: $table.thumbnailPath, + builder: (column) => column, + ); GeneratedColumn get fileSha256 => $composableBuilder( - column: $table.fileSha256, builder: (column) => column); + column: $table.fileSha256, + builder: (column) => column, + ); GeneratedColumn get hashVerified => $composableBuilder( - column: $table.hashVerified, builder: (column) => column); + column: $table.hashVerified, + builder: (column) => column, + ); GeneratedColumn get errorMessage => $composableBuilder( - column: $table.errorMessage, builder: (column) => column); + column: $table.errorMessage, + builder: (column) => column, + ); GeneratedColumn get startTime => $composableBuilder(column: $table.startTime, builder: (column) => column); @@ -19713,24 +23664,33 @@ class $$TransferRecordsTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$TransferRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $TransferRecordsTable, - TransferRecord, - $$TransferRecordsTableFilterComposer, - $$TransferRecordsTableOrderingComposer, - $$TransferRecordsTableAnnotationComposer, - $$TransferRecordsTableCreateCompanionBuilder, - $$TransferRecordsTableUpdateCompanionBuilder, - ( - TransferRecord, - BaseReferences<_$AppDatabase, $TransferRecordsTable, TransferRecord> - ), - TransferRecord, - PrefetchHooks Function()> { +class $$TransferRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $TransferRecordsTable, + TransferRecord, + $$TransferRecordsTableFilterComposer, + $$TransferRecordsTableOrderingComposer, + $$TransferRecordsTableAnnotationComposer, + $$TransferRecordsTableCreateCompanionBuilder, + $$TransferRecordsTableUpdateCompanionBuilder, + ( + TransferRecord, + BaseReferences< + _$AppDatabase, + $TransferRecordsTable, + TransferRecord + >, + ), + TransferRecord, + PrefetchHooks Function() + > { $$TransferRecordsTableTableManager( - _$AppDatabase db, $TransferRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $TransferRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -19739,158 +23699,161 @@ class $$TransferRecordsTableTableManager extends RootTableManager< $$TransferRecordsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$TransferRecordsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value sessionId = const Value.absent(), - Value peerId = const Value.absent(), - Value peerAlias = const Value.absent(), - Value transport = const Value.absent(), - Value direction = const Value.absent(), - Value status = const Value.absent(), - Value fileName = const Value.absent(), - Value fileSize = const Value.absent(), - Value transferredBytes = const Value.absent(), - Value speed = const Value.absent(), - Value mimeType = const Value.absent(), - Value filePath = const Value.absent(), - Value thumbnailPath = const Value.absent(), - Value fileSha256 = const Value.absent(), - Value hashVerified = const Value.absent(), - Value errorMessage = const Value.absent(), - Value startTime = const Value.absent(), - Value endTime = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - TransferRecordsCompanion( - id: id, - sessionId: sessionId, - peerId: peerId, - peerAlias: peerAlias, - transport: transport, - direction: direction, - status: status, - fileName: fileName, - fileSize: fileSize, - transferredBytes: transferredBytes, - speed: speed, - mimeType: mimeType, - filePath: filePath, - thumbnailPath: thumbnailPath, - fileSha256: fileSha256, - hashVerified: hashVerified, - errorMessage: errorMessage, - startTime: startTime, - endTime: endTime, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String sessionId, - required String peerId, - Value peerAlias = const Value.absent(), - Value transport = const Value.absent(), - Value direction = const Value.absent(), - Value status = const Value.absent(), - required String fileName, - Value fileSize = const Value.absent(), - Value transferredBytes = const Value.absent(), - Value speed = const Value.absent(), - Value mimeType = const Value.absent(), - Value filePath = const Value.absent(), - Value thumbnailPath = const Value.absent(), - Value fileSha256 = const Value.absent(), - Value hashVerified = const Value.absent(), - Value errorMessage = const Value.absent(), - required DateTime startTime, - Value endTime = const Value.absent(), - required DateTime createdAt, - required DateTime updatedAt, - Value rowid = const Value.absent(), - }) => - TransferRecordsCompanion.insert( - id: id, - sessionId: sessionId, - peerId: peerId, - peerAlias: peerAlias, - transport: transport, - direction: direction, - status: status, - fileName: fileName, - fileSize: fileSize, - transferredBytes: transferredBytes, - speed: speed, - mimeType: mimeType, - filePath: filePath, - thumbnailPath: thumbnailPath, - fileSha256: fileSha256, - hashVerified: hashVerified, - errorMessage: errorMessage, - startTime: startTime, - endTime: endTime, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value sessionId = const Value.absent(), + Value peerId = const Value.absent(), + Value peerAlias = const Value.absent(), + Value transport = const Value.absent(), + Value direction = const Value.absent(), + Value status = const Value.absent(), + Value fileName = const Value.absent(), + Value fileSize = const Value.absent(), + Value transferredBytes = const Value.absent(), + Value speed = const Value.absent(), + Value mimeType = const Value.absent(), + Value filePath = const Value.absent(), + Value thumbnailPath = const Value.absent(), + Value fileSha256 = const Value.absent(), + Value hashVerified = const Value.absent(), + Value errorMessage = const Value.absent(), + Value startTime = const Value.absent(), + Value endTime = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => TransferRecordsCompanion( + id: id, + sessionId: sessionId, + peerId: peerId, + peerAlias: peerAlias, + transport: transport, + direction: direction, + status: status, + fileName: fileName, + fileSize: fileSize, + transferredBytes: transferredBytes, + speed: speed, + mimeType: mimeType, + filePath: filePath, + thumbnailPath: thumbnailPath, + fileSha256: fileSha256, + hashVerified: hashVerified, + errorMessage: errorMessage, + startTime: startTime, + endTime: endTime, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String sessionId, + required String peerId, + Value peerAlias = const Value.absent(), + Value transport = const Value.absent(), + Value direction = const Value.absent(), + Value status = const Value.absent(), + required String fileName, + Value fileSize = const Value.absent(), + Value transferredBytes = const Value.absent(), + Value speed = const Value.absent(), + Value mimeType = const Value.absent(), + Value filePath = const Value.absent(), + Value thumbnailPath = const Value.absent(), + Value fileSha256 = const Value.absent(), + Value hashVerified = const Value.absent(), + Value errorMessage = const Value.absent(), + required DateTime startTime, + Value endTime = const Value.absent(), + required DateTime createdAt, + required DateTime updatedAt, + Value rowid = const Value.absent(), + }) => TransferRecordsCompanion.insert( + id: id, + sessionId: sessionId, + peerId: peerId, + peerAlias: peerAlias, + transport: transport, + direction: direction, + status: status, + fileName: fileName, + fileSize: fileSize, + transferredBytes: transferredBytes, + speed: speed, + mimeType: mimeType, + filePath: filePath, + thumbnailPath: thumbnailPath, + fileSha256: fileSha256, + hashVerified: hashVerified, + errorMessage: errorMessage, + startTime: startTime, + endTime: endTime, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$TransferRecordsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $TransferRecordsTable, - TransferRecord, - $$TransferRecordsTableFilterComposer, - $$TransferRecordsTableOrderingComposer, - $$TransferRecordsTableAnnotationComposer, - $$TransferRecordsTableCreateCompanionBuilder, - $$TransferRecordsTableUpdateCompanionBuilder, - ( +typedef $$TransferRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $TransferRecordsTable, TransferRecord, - BaseReferences<_$AppDatabase, $TransferRecordsTable, TransferRecord> - ), - TransferRecord, - PrefetchHooks Function()>; -typedef $$PairingRecordsTableCreateCompanionBuilder = PairingRecordsCompanion - Function({ - required String id, - required String deviceId, - required String alias, - Value pairingMethod, - Value isTrusted, - Value ip, - Value port, - Value fingerprint, - Value publicKey, - required DateTime pairedAt, - Value lastConnectedAt, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid, -}); -typedef $$PairingRecordsTableUpdateCompanionBuilder = PairingRecordsCompanion - Function({ - Value id, - Value deviceId, - Value alias, - Value pairingMethod, - Value isTrusted, - Value ip, - Value port, - Value fingerprint, - Value publicKey, - Value pairedAt, - Value lastConnectedAt, - Value createdAt, - Value updatedAt, - Value rowid, -}); + $$TransferRecordsTableFilterComposer, + $$TransferRecordsTableOrderingComposer, + $$TransferRecordsTableAnnotationComposer, + $$TransferRecordsTableCreateCompanionBuilder, + $$TransferRecordsTableUpdateCompanionBuilder, + ( + TransferRecord, + BaseReferences<_$AppDatabase, $TransferRecordsTable, TransferRecord>, + ), + TransferRecord, + PrefetchHooks Function() + >; +typedef $$PairingRecordsTableCreateCompanionBuilder = + PairingRecordsCompanion Function({ + required String id, + required String deviceId, + required String alias, + Value pairingMethod, + Value isTrusted, + Value ip, + Value port, + Value fingerprint, + Value publicKey, + required DateTime pairedAt, + Value lastConnectedAt, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid, + }); +typedef $$PairingRecordsTableUpdateCompanionBuilder = + PairingRecordsCompanion Function({ + Value id, + Value deviceId, + Value alias, + Value pairingMethod, + Value isTrusted, + Value ip, + Value port, + Value fingerprint, + Value publicKey, + Value pairedAt, + Value lastConnectedAt, + Value createdAt, + Value updatedAt, + Value rowid, + }); class $$PairingRecordsTableFilterComposer extends Composer<_$AppDatabase, $PairingRecordsTable> { @@ -19902,44 +23865,69 @@ class $$PairingRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deviceId => $composableBuilder( - column: $table.deviceId, builder: (column) => ColumnFilters(column)); + column: $table.deviceId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get alias => $composableBuilder( - column: $table.alias, builder: (column) => ColumnFilters(column)); + column: $table.alias, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get pairingMethod => $composableBuilder( - column: $table.pairingMethod, builder: (column) => ColumnFilters(column)); + column: $table.pairingMethod, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isTrusted => $composableBuilder( - column: $table.isTrusted, builder: (column) => ColumnFilters(column)); + column: $table.isTrusted, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get ip => $composableBuilder( - column: $table.ip, builder: (column) => ColumnFilters(column)); + column: $table.ip, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get port => $composableBuilder( - column: $table.port, builder: (column) => ColumnFilters(column)); + column: $table.port, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fingerprint => $composableBuilder( - column: $table.fingerprint, builder: (column) => ColumnFilters(column)); + column: $table.fingerprint, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get publicKey => $composableBuilder( - column: $table.publicKey, builder: (column) => ColumnFilters(column)); + column: $table.publicKey, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get pairedAt => $composableBuilder( - column: $table.pairedAt, builder: (column) => ColumnFilters(column)); + column: $table.pairedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get lastConnectedAt => $composableBuilder( - column: $table.lastConnectedAt, - builder: (column) => ColumnFilters(column)); + column: $table.lastConnectedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$PairingRecordsTableOrderingComposer @@ -19952,45 +23940,69 @@ class $$PairingRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deviceId => $composableBuilder( - column: $table.deviceId, builder: (column) => ColumnOrderings(column)); + column: $table.deviceId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get alias => $composableBuilder( - column: $table.alias, builder: (column) => ColumnOrderings(column)); + column: $table.alias, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get pairingMethod => $composableBuilder( - column: $table.pairingMethod, - builder: (column) => ColumnOrderings(column)); + column: $table.pairingMethod, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isTrusted => $composableBuilder( - column: $table.isTrusted, builder: (column) => ColumnOrderings(column)); + column: $table.isTrusted, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get ip => $composableBuilder( - column: $table.ip, builder: (column) => ColumnOrderings(column)); + column: $table.ip, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get port => $composableBuilder( - column: $table.port, builder: (column) => ColumnOrderings(column)); + column: $table.port, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fingerprint => $composableBuilder( - column: $table.fingerprint, builder: (column) => ColumnOrderings(column)); + column: $table.fingerprint, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get publicKey => $composableBuilder( - column: $table.publicKey, builder: (column) => ColumnOrderings(column)); + column: $table.publicKey, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get pairedAt => $composableBuilder( - column: $table.pairedAt, builder: (column) => ColumnOrderings(column)); + column: $table.pairedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get lastConnectedAt => $composableBuilder( - column: $table.lastConnectedAt, - builder: (column) => ColumnOrderings(column)); + column: $table.lastConnectedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$PairingRecordsTableAnnotationComposer @@ -20012,7 +24024,9 @@ class $$PairingRecordsTableAnnotationComposer $composableBuilder(column: $table.alias, builder: (column) => column); GeneratedColumn get pairingMethod => $composableBuilder( - column: $table.pairingMethod, builder: (column) => column); + column: $table.pairingMethod, + builder: (column) => column, + ); GeneratedColumn get isTrusted => $composableBuilder(column: $table.isTrusted, builder: (column) => column); @@ -20024,7 +24038,9 @@ class $$PairingRecordsTableAnnotationComposer $composableBuilder(column: $table.port, builder: (column) => column); GeneratedColumn get fingerprint => $composableBuilder( - column: $table.fingerprint, builder: (column) => column); + column: $table.fingerprint, + builder: (column) => column, + ); GeneratedColumn get publicKey => $composableBuilder(column: $table.publicKey, builder: (column) => column); @@ -20033,7 +24049,9 @@ class $$PairingRecordsTableAnnotationComposer $composableBuilder(column: $table.pairedAt, builder: (column) => column); GeneratedColumn get lastConnectedAt => $composableBuilder( - column: $table.lastConnectedAt, builder: (column) => column); + column: $table.lastConnectedAt, + builder: (column) => column, + ); GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); @@ -20042,24 +24060,29 @@ class $$PairingRecordsTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$PairingRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $PairingRecordsTable, - PairingRecord, - $$PairingRecordsTableFilterComposer, - $$PairingRecordsTableOrderingComposer, - $$PairingRecordsTableAnnotationComposer, - $$PairingRecordsTableCreateCompanionBuilder, - $$PairingRecordsTableUpdateCompanionBuilder, - ( - PairingRecord, - BaseReferences<_$AppDatabase, $PairingRecordsTable, PairingRecord> - ), - PairingRecord, - PrefetchHooks Function()> { +class $$PairingRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $PairingRecordsTable, + PairingRecord, + $$PairingRecordsTableFilterComposer, + $$PairingRecordsTableOrderingComposer, + $$PairingRecordsTableAnnotationComposer, + $$PairingRecordsTableCreateCompanionBuilder, + $$PairingRecordsTableUpdateCompanionBuilder, + ( + PairingRecord, + BaseReferences<_$AppDatabase, $PairingRecordsTable, PairingRecord>, + ), + PairingRecord, + PrefetchHooks Function() + > { $$PairingRecordsTableTableManager( - _$AppDatabase db, $PairingRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $PairingRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -20068,146 +24091,149 @@ class $$PairingRecordsTableTableManager extends RootTableManager< $$PairingRecordsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$PairingRecordsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value deviceId = const Value.absent(), - Value alias = const Value.absent(), - Value pairingMethod = const Value.absent(), - Value isTrusted = const Value.absent(), - Value ip = const Value.absent(), - Value port = const Value.absent(), - Value fingerprint = const Value.absent(), - Value publicKey = const Value.absent(), - Value pairedAt = const Value.absent(), - Value lastConnectedAt = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - PairingRecordsCompanion( - id: id, - deviceId: deviceId, - alias: alias, - pairingMethod: pairingMethod, - isTrusted: isTrusted, - ip: ip, - port: port, - fingerprint: fingerprint, - publicKey: publicKey, - pairedAt: pairedAt, - lastConnectedAt: lastConnectedAt, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String deviceId, - required String alias, - Value pairingMethod = const Value.absent(), - Value isTrusted = const Value.absent(), - Value ip = const Value.absent(), - Value port = const Value.absent(), - Value fingerprint = const Value.absent(), - Value publicKey = const Value.absent(), - required DateTime pairedAt, - Value lastConnectedAt = const Value.absent(), - required DateTime createdAt, - required DateTime updatedAt, - Value rowid = const Value.absent(), - }) => - PairingRecordsCompanion.insert( - id: id, - deviceId: deviceId, - alias: alias, - pairingMethod: pairingMethod, - isTrusted: isTrusted, - ip: ip, - port: port, - fingerprint: fingerprint, - publicKey: publicKey, - pairedAt: pairedAt, - lastConnectedAt: lastConnectedAt, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value deviceId = const Value.absent(), + Value alias = const Value.absent(), + Value pairingMethod = const Value.absent(), + Value isTrusted = const Value.absent(), + Value ip = const Value.absent(), + Value port = const Value.absent(), + Value fingerprint = const Value.absent(), + Value publicKey = const Value.absent(), + Value pairedAt = const Value.absent(), + Value lastConnectedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => PairingRecordsCompanion( + id: id, + deviceId: deviceId, + alias: alias, + pairingMethod: pairingMethod, + isTrusted: isTrusted, + ip: ip, + port: port, + fingerprint: fingerprint, + publicKey: publicKey, + pairedAt: pairedAt, + lastConnectedAt: lastConnectedAt, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String deviceId, + required String alias, + Value pairingMethod = const Value.absent(), + Value isTrusted = const Value.absent(), + Value ip = const Value.absent(), + Value port = const Value.absent(), + Value fingerprint = const Value.absent(), + Value publicKey = const Value.absent(), + required DateTime pairedAt, + Value lastConnectedAt = const Value.absent(), + required DateTime createdAt, + required DateTime updatedAt, + Value rowid = const Value.absent(), + }) => PairingRecordsCompanion.insert( + id: id, + deviceId: deviceId, + alias: alias, + pairingMethod: pairingMethod, + isTrusted: isTrusted, + ip: ip, + port: port, + fingerprint: fingerprint, + publicKey: publicKey, + pairedAt: pairedAt, + lastConnectedAt: lastConnectedAt, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$PairingRecordsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $PairingRecordsTable, - PairingRecord, - $$PairingRecordsTableFilterComposer, - $$PairingRecordsTableOrderingComposer, - $$PairingRecordsTableAnnotationComposer, - $$PairingRecordsTableCreateCompanionBuilder, - $$PairingRecordsTableUpdateCompanionBuilder, - ( +typedef $$PairingRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $PairingRecordsTable, PairingRecord, - BaseReferences<_$AppDatabase, $PairingRecordsTable, PairingRecord> - ), - PairingRecord, - PrefetchHooks Function()>; -typedef $$TransferMsgRecordsTableCreateCompanionBuilder - = TransferMsgRecordsCompanion Function({ - required String id, - required String sessionId, - Value type, - required String content, - Value isRemote, - Value peerDeviceId, - Value transferTaskId, - Value fileName, - Value fileSize, - Value mimeType, - Value thumbnailPath, - Value filePath, - Value progress, - Value transferStatus, - Value deviceAlias, - Value deviceEmoji, - Value deliveryStatus, - Value deliveredAt, - Value readAt, - Value voiceDuration, - Value voiceWaveform, - required DateTime timestamp, - required DateTime createdAt, - Value rowid, -}); -typedef $$TransferMsgRecordsTableUpdateCompanionBuilder - = TransferMsgRecordsCompanion Function({ - Value id, - Value sessionId, - Value type, - Value content, - Value isRemote, - Value peerDeviceId, - Value transferTaskId, - Value fileName, - Value fileSize, - Value mimeType, - Value thumbnailPath, - Value filePath, - Value progress, - Value transferStatus, - Value deviceAlias, - Value deviceEmoji, - Value deliveryStatus, - Value deliveredAt, - Value readAt, - Value voiceDuration, - Value voiceWaveform, - Value timestamp, - Value createdAt, - Value rowid, -}); + $$PairingRecordsTableFilterComposer, + $$PairingRecordsTableOrderingComposer, + $$PairingRecordsTableAnnotationComposer, + $$PairingRecordsTableCreateCompanionBuilder, + $$PairingRecordsTableUpdateCompanionBuilder, + ( + PairingRecord, + BaseReferences<_$AppDatabase, $PairingRecordsTable, PairingRecord>, + ), + PairingRecord, + PrefetchHooks Function() + >; +typedef $$TransferMsgRecordsTableCreateCompanionBuilder = + TransferMsgRecordsCompanion Function({ + required String id, + required String sessionId, + Value type, + required String content, + Value isRemote, + Value peerDeviceId, + Value transferTaskId, + Value fileName, + Value fileSize, + Value mimeType, + Value thumbnailPath, + Value filePath, + Value progress, + Value transferStatus, + Value deviceAlias, + Value deviceEmoji, + Value deliveryStatus, + Value deliveredAt, + Value readAt, + Value voiceDuration, + Value voiceWaveform, + required DateTime timestamp, + required DateTime createdAt, + Value rowid, + }); +typedef $$TransferMsgRecordsTableUpdateCompanionBuilder = + TransferMsgRecordsCompanion Function({ + Value id, + Value sessionId, + Value type, + Value content, + Value isRemote, + Value peerDeviceId, + Value transferTaskId, + Value fileName, + Value fileSize, + Value mimeType, + Value thumbnailPath, + Value filePath, + Value progress, + Value transferStatus, + Value deviceAlias, + Value deviceEmoji, + Value deliveryStatus, + Value deliveredAt, + Value readAt, + Value voiceDuration, + Value voiceWaveform, + Value timestamp, + Value createdAt, + Value rowid, + }); class $$TransferMsgRecordsTableFilterComposer extends Composer<_$AppDatabase, $TransferMsgRecordsTable> { @@ -20219,76 +24245,119 @@ class $$TransferMsgRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get sessionId => $composableBuilder( - column: $table.sessionId, builder: (column) => ColumnFilters(column)); + column: $table.sessionId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get type => $composableBuilder( - column: $table.type, builder: (column) => ColumnFilters(column)); + column: $table.type, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnFilters(column)); + column: $table.content, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isRemote => $composableBuilder( - column: $table.isRemote, builder: (column) => ColumnFilters(column)); + column: $table.isRemote, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get peerDeviceId => $composableBuilder( - column: $table.peerDeviceId, builder: (column) => ColumnFilters(column)); + column: $table.peerDeviceId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get transferTaskId => $composableBuilder( - column: $table.transferTaskId, - builder: (column) => ColumnFilters(column)); + column: $table.transferTaskId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileName => $composableBuilder( - column: $table.fileName, builder: (column) => ColumnFilters(column)); + column: $table.fileName, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileSize => $composableBuilder( - column: $table.fileSize, builder: (column) => ColumnFilters(column)); + column: $table.fileSize, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get mimeType => $composableBuilder( - column: $table.mimeType, builder: (column) => ColumnFilters(column)); + column: $table.mimeType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, builder: (column) => ColumnFilters(column)); + column: $table.thumbnailPath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get filePath => $composableBuilder( - column: $table.filePath, builder: (column) => ColumnFilters(column)); + column: $table.filePath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get progress => $composableBuilder( - column: $table.progress, builder: (column) => ColumnFilters(column)); + column: $table.progress, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get transferStatus => $composableBuilder( - column: $table.transferStatus, - builder: (column) => ColumnFilters(column)); + column: $table.transferStatus, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deviceAlias => $composableBuilder( - column: $table.deviceAlias, builder: (column) => ColumnFilters(column)); + column: $table.deviceAlias, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deviceEmoji => $composableBuilder( - column: $table.deviceEmoji, builder: (column) => ColumnFilters(column)); + column: $table.deviceEmoji, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deliveryStatus => $composableBuilder( - column: $table.deliveryStatus, - builder: (column) => ColumnFilters(column)); + column: $table.deliveryStatus, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deliveredAt => $composableBuilder( - column: $table.deliveredAt, builder: (column) => ColumnFilters(column)); + column: $table.deliveredAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get readAt => $composableBuilder( - column: $table.readAt, builder: (column) => ColumnFilters(column)); + column: $table.readAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get voiceDuration => $composableBuilder( - column: $table.voiceDuration, builder: (column) => ColumnFilters(column)); + column: $table.voiceDuration, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get voiceWaveform => $composableBuilder( - column: $table.voiceWaveform, builder: (column) => ColumnFilters(column)); + column: $table.voiceWaveform, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get timestamp => $composableBuilder( - column: $table.timestamp, builder: (column) => ColumnFilters(column)); + column: $table.timestamp, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); } class $$TransferMsgRecordsTableOrderingComposer @@ -20301,80 +24370,119 @@ class $$TransferMsgRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get sessionId => $composableBuilder( - column: $table.sessionId, builder: (column) => ColumnOrderings(column)); + column: $table.sessionId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get type => $composableBuilder( - column: $table.type, builder: (column) => ColumnOrderings(column)); + column: $table.type, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnOrderings(column)); + column: $table.content, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isRemote => $composableBuilder( - column: $table.isRemote, builder: (column) => ColumnOrderings(column)); + column: $table.isRemote, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get peerDeviceId => $composableBuilder( - column: $table.peerDeviceId, - builder: (column) => ColumnOrderings(column)); + column: $table.peerDeviceId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get transferTaskId => $composableBuilder( - column: $table.transferTaskId, - builder: (column) => ColumnOrderings(column)); + column: $table.transferTaskId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileName => $composableBuilder( - column: $table.fileName, builder: (column) => ColumnOrderings(column)); + column: $table.fileName, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileSize => $composableBuilder( - column: $table.fileSize, builder: (column) => ColumnOrderings(column)); + column: $table.fileSize, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get mimeType => $composableBuilder( - column: $table.mimeType, builder: (column) => ColumnOrderings(column)); + column: $table.mimeType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, - builder: (column) => ColumnOrderings(column)); + column: $table.thumbnailPath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get filePath => $composableBuilder( - column: $table.filePath, builder: (column) => ColumnOrderings(column)); + column: $table.filePath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get progress => $composableBuilder( - column: $table.progress, builder: (column) => ColumnOrderings(column)); + column: $table.progress, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get transferStatus => $composableBuilder( - column: $table.transferStatus, - builder: (column) => ColumnOrderings(column)); + column: $table.transferStatus, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deviceAlias => $composableBuilder( - column: $table.deviceAlias, builder: (column) => ColumnOrderings(column)); + column: $table.deviceAlias, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deviceEmoji => $composableBuilder( - column: $table.deviceEmoji, builder: (column) => ColumnOrderings(column)); + column: $table.deviceEmoji, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deliveryStatus => $composableBuilder( - column: $table.deliveryStatus, - builder: (column) => ColumnOrderings(column)); + column: $table.deliveryStatus, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deliveredAt => $composableBuilder( - column: $table.deliveredAt, builder: (column) => ColumnOrderings(column)); + column: $table.deliveredAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get readAt => $composableBuilder( - column: $table.readAt, builder: (column) => ColumnOrderings(column)); + column: $table.readAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get voiceDuration => $composableBuilder( - column: $table.voiceDuration, - builder: (column) => ColumnOrderings(column)); + column: $table.voiceDuration, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get voiceWaveform => $composableBuilder( - column: $table.voiceWaveform, - builder: (column) => ColumnOrderings(column)); + column: $table.voiceWaveform, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get timestamp => $composableBuilder( - column: $table.timestamp, builder: (column) => ColumnOrderings(column)); + column: $table.timestamp, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$TransferMsgRecordsTableAnnotationComposer @@ -20402,10 +24510,14 @@ class $$TransferMsgRecordsTableAnnotationComposer $composableBuilder(column: $table.isRemote, builder: (column) => column); GeneratedColumn get peerDeviceId => $composableBuilder( - column: $table.peerDeviceId, builder: (column) => column); + column: $table.peerDeviceId, + builder: (column) => column, + ); GeneratedColumn get transferTaskId => $composableBuilder( - column: $table.transferTaskId, builder: (column) => column); + column: $table.transferTaskId, + builder: (column) => column, + ); GeneratedColumn get fileName => $composableBuilder(column: $table.fileName, builder: (column) => column); @@ -20417,7 +24529,9 @@ class $$TransferMsgRecordsTableAnnotationComposer $composableBuilder(column: $table.mimeType, builder: (column) => column); GeneratedColumn get thumbnailPath => $composableBuilder( - column: $table.thumbnailPath, builder: (column) => column); + column: $table.thumbnailPath, + builder: (column) => column, + ); GeneratedColumn get filePath => $composableBuilder(column: $table.filePath, builder: (column) => column); @@ -20426,28 +24540,42 @@ class $$TransferMsgRecordsTableAnnotationComposer $composableBuilder(column: $table.progress, builder: (column) => column); GeneratedColumn get transferStatus => $composableBuilder( - column: $table.transferStatus, builder: (column) => column); + column: $table.transferStatus, + builder: (column) => column, + ); GeneratedColumn get deviceAlias => $composableBuilder( - column: $table.deviceAlias, builder: (column) => column); + column: $table.deviceAlias, + builder: (column) => column, + ); GeneratedColumn get deviceEmoji => $composableBuilder( - column: $table.deviceEmoji, builder: (column) => column); + column: $table.deviceEmoji, + builder: (column) => column, + ); GeneratedColumn get deliveryStatus => $composableBuilder( - column: $table.deliveryStatus, builder: (column) => column); + column: $table.deliveryStatus, + builder: (column) => column, + ); GeneratedColumn get deliveredAt => $composableBuilder( - column: $table.deliveredAt, builder: (column) => column); + column: $table.deliveredAt, + builder: (column) => column, + ); GeneratedColumn get readAt => $composableBuilder(column: $table.readAt, builder: (column) => column); GeneratedColumn get voiceDuration => $composableBuilder( - column: $table.voiceDuration, builder: (column) => column); + column: $table.voiceDuration, + builder: (column) => column, + ); GeneratedColumn get voiceWaveform => $composableBuilder( - column: $table.voiceWaveform, builder: (column) => column); + column: $table.voiceWaveform, + builder: (column) => column, + ); GeneratedColumn get timestamp => $composableBuilder(column: $table.timestamp, builder: (column) => column); @@ -20456,24 +24584,33 @@ class $$TransferMsgRecordsTableAnnotationComposer $composableBuilder(column: $table.createdAt, builder: (column) => column); } -class $$TransferMsgRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $TransferMsgRecordsTable, - TransferMsgRecord, - $$TransferMsgRecordsTableFilterComposer, - $$TransferMsgRecordsTableOrderingComposer, - $$TransferMsgRecordsTableAnnotationComposer, - $$TransferMsgRecordsTableCreateCompanionBuilder, - $$TransferMsgRecordsTableUpdateCompanionBuilder, - ( - TransferMsgRecord, - BaseReferences<_$AppDatabase, $TransferMsgRecordsTable, TransferMsgRecord> - ), - TransferMsgRecord, - PrefetchHooks Function()> { +class $$TransferMsgRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $TransferMsgRecordsTable, + TransferMsgRecord, + $$TransferMsgRecordsTableFilterComposer, + $$TransferMsgRecordsTableOrderingComposer, + $$TransferMsgRecordsTableAnnotationComposer, + $$TransferMsgRecordsTableCreateCompanionBuilder, + $$TransferMsgRecordsTableUpdateCompanionBuilder, + ( + TransferMsgRecord, + BaseReferences< + _$AppDatabase, + $TransferMsgRecordsTable, + TransferMsgRecord + >, + ), + TransferMsgRecord, + PrefetchHooks Function() + > { $$TransferMsgRecordsTableTableManager( - _$AppDatabase db, $TransferMsgRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $TransferMsgRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -20482,173 +24619,182 @@ class $$TransferMsgRecordsTableTableManager extends RootTableManager< $$TransferMsgRecordsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$TransferMsgRecordsTableAnnotationComposer( - $db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value sessionId = const Value.absent(), - Value type = const Value.absent(), - Value content = const Value.absent(), - Value isRemote = const Value.absent(), - Value peerDeviceId = const Value.absent(), - Value transferTaskId = const Value.absent(), - Value fileName = const Value.absent(), - Value fileSize = const Value.absent(), - Value mimeType = const Value.absent(), - Value thumbnailPath = const Value.absent(), - Value filePath = const Value.absent(), - Value progress = const Value.absent(), - Value transferStatus = const Value.absent(), - Value deviceAlias = const Value.absent(), - Value deviceEmoji = const Value.absent(), - Value deliveryStatus = const Value.absent(), - Value deliveredAt = const Value.absent(), - Value readAt = const Value.absent(), - Value voiceDuration = const Value.absent(), - Value voiceWaveform = const Value.absent(), - Value timestamp = const Value.absent(), - Value createdAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - TransferMsgRecordsCompanion( - id: id, - sessionId: sessionId, - type: type, - content: content, - isRemote: isRemote, - peerDeviceId: peerDeviceId, - transferTaskId: transferTaskId, - fileName: fileName, - fileSize: fileSize, - mimeType: mimeType, - thumbnailPath: thumbnailPath, - filePath: filePath, - progress: progress, - transferStatus: transferStatus, - deviceAlias: deviceAlias, - deviceEmoji: deviceEmoji, - deliveryStatus: deliveryStatus, - deliveredAt: deliveredAt, - readAt: readAt, - voiceDuration: voiceDuration, - voiceWaveform: voiceWaveform, - timestamp: timestamp, - createdAt: createdAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String sessionId, - Value type = const Value.absent(), - required String content, - Value isRemote = const Value.absent(), - Value peerDeviceId = const Value.absent(), - Value transferTaskId = const Value.absent(), - Value fileName = const Value.absent(), - Value fileSize = const Value.absent(), - Value mimeType = const Value.absent(), - Value thumbnailPath = const Value.absent(), - Value filePath = const Value.absent(), - Value progress = const Value.absent(), - Value transferStatus = const Value.absent(), - Value deviceAlias = const Value.absent(), - Value deviceEmoji = const Value.absent(), - Value deliveryStatus = const Value.absent(), - Value deliveredAt = const Value.absent(), - Value readAt = const Value.absent(), - Value voiceDuration = const Value.absent(), - Value voiceWaveform = const Value.absent(), - required DateTime timestamp, - required DateTime createdAt, - Value rowid = const Value.absent(), - }) => - TransferMsgRecordsCompanion.insert( - id: id, - sessionId: sessionId, - type: type, - content: content, - isRemote: isRemote, - peerDeviceId: peerDeviceId, - transferTaskId: transferTaskId, - fileName: fileName, - fileSize: fileSize, - mimeType: mimeType, - thumbnailPath: thumbnailPath, - filePath: filePath, - progress: progress, - transferStatus: transferStatus, - deviceAlias: deviceAlias, - deviceEmoji: deviceEmoji, - deliveryStatus: deliveryStatus, - deliveredAt: deliveredAt, - readAt: readAt, - voiceDuration: voiceDuration, - voiceWaveform: voiceWaveform, - timestamp: timestamp, - createdAt: createdAt, - rowid: rowid, - ), + $db: db, + $table: table, + ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value sessionId = const Value.absent(), + Value type = const Value.absent(), + Value content = const Value.absent(), + Value isRemote = const Value.absent(), + Value peerDeviceId = const Value.absent(), + Value transferTaskId = const Value.absent(), + Value fileName = const Value.absent(), + Value fileSize = const Value.absent(), + Value mimeType = const Value.absent(), + Value thumbnailPath = const Value.absent(), + Value filePath = const Value.absent(), + Value progress = const Value.absent(), + Value transferStatus = const Value.absent(), + Value deviceAlias = const Value.absent(), + Value deviceEmoji = const Value.absent(), + Value deliveryStatus = const Value.absent(), + Value deliveredAt = const Value.absent(), + Value readAt = const Value.absent(), + Value voiceDuration = const Value.absent(), + Value voiceWaveform = const Value.absent(), + Value timestamp = const Value.absent(), + Value createdAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => TransferMsgRecordsCompanion( + id: id, + sessionId: sessionId, + type: type, + content: content, + isRemote: isRemote, + peerDeviceId: peerDeviceId, + transferTaskId: transferTaskId, + fileName: fileName, + fileSize: fileSize, + mimeType: mimeType, + thumbnailPath: thumbnailPath, + filePath: filePath, + progress: progress, + transferStatus: transferStatus, + deviceAlias: deviceAlias, + deviceEmoji: deviceEmoji, + deliveryStatus: deliveryStatus, + deliveredAt: deliveredAt, + readAt: readAt, + voiceDuration: voiceDuration, + voiceWaveform: voiceWaveform, + timestamp: timestamp, + createdAt: createdAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String sessionId, + Value type = const Value.absent(), + required String content, + Value isRemote = const Value.absent(), + Value peerDeviceId = const Value.absent(), + Value transferTaskId = const Value.absent(), + Value fileName = const Value.absent(), + Value fileSize = const Value.absent(), + Value mimeType = const Value.absent(), + Value thumbnailPath = const Value.absent(), + Value filePath = const Value.absent(), + Value progress = const Value.absent(), + Value transferStatus = const Value.absent(), + Value deviceAlias = const Value.absent(), + Value deviceEmoji = const Value.absent(), + Value deliveryStatus = const Value.absent(), + Value deliveredAt = const Value.absent(), + Value readAt = const Value.absent(), + Value voiceDuration = const Value.absent(), + Value voiceWaveform = const Value.absent(), + required DateTime timestamp, + required DateTime createdAt, + Value rowid = const Value.absent(), + }) => TransferMsgRecordsCompanion.insert( + id: id, + sessionId: sessionId, + type: type, + content: content, + isRemote: isRemote, + peerDeviceId: peerDeviceId, + transferTaskId: transferTaskId, + fileName: fileName, + fileSize: fileSize, + mimeType: mimeType, + thumbnailPath: thumbnailPath, + filePath: filePath, + progress: progress, + transferStatus: transferStatus, + deviceAlias: deviceAlias, + deviceEmoji: deviceEmoji, + deliveryStatus: deliveryStatus, + deliveredAt: deliveredAt, + readAt: readAt, + voiceDuration: voiceDuration, + voiceWaveform: voiceWaveform, + timestamp: timestamp, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$TransferMsgRecordsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $TransferMsgRecordsTable, - TransferMsgRecord, - $$TransferMsgRecordsTableFilterComposer, - $$TransferMsgRecordsTableOrderingComposer, - $$TransferMsgRecordsTableAnnotationComposer, - $$TransferMsgRecordsTableCreateCompanionBuilder, - $$TransferMsgRecordsTableUpdateCompanionBuilder, - ( +typedef $$TransferMsgRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $TransferMsgRecordsTable, TransferMsgRecord, - BaseReferences<_$AppDatabase, $TransferMsgRecordsTable, TransferMsgRecord> - ), - TransferMsgRecord, - PrefetchHooks Function()>; -typedef $$CloudCacheRecordsTableCreateCompanionBuilder - = CloudCacheRecordsCompanion Function({ - required String id, - required String fileName, - Value fileSize, - Value mimeType, - Value localPath, - Value cloudUrl, - Value encryptionKey, - Value iv, - Value uploadStatus, - Value downloadStatus, - Value expiresAt, - Value uploadedAt, - Value downloadedAt, - Value ownerId, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid, -}); -typedef $$CloudCacheRecordsTableUpdateCompanionBuilder - = CloudCacheRecordsCompanion Function({ - Value id, - Value fileName, - Value fileSize, - Value mimeType, - Value localPath, - Value cloudUrl, - Value encryptionKey, - Value iv, - Value uploadStatus, - Value downloadStatus, - Value expiresAt, - Value uploadedAt, - Value downloadedAt, - Value ownerId, - Value createdAt, - Value updatedAt, - Value rowid, -}); + $$TransferMsgRecordsTableFilterComposer, + $$TransferMsgRecordsTableOrderingComposer, + $$TransferMsgRecordsTableAnnotationComposer, + $$TransferMsgRecordsTableCreateCompanionBuilder, + $$TransferMsgRecordsTableUpdateCompanionBuilder, + ( + TransferMsgRecord, + BaseReferences< + _$AppDatabase, + $TransferMsgRecordsTable, + TransferMsgRecord + >, + ), + TransferMsgRecord, + PrefetchHooks Function() + >; +typedef $$CloudCacheRecordsTableCreateCompanionBuilder = + CloudCacheRecordsCompanion Function({ + required String id, + required String fileName, + Value fileSize, + Value mimeType, + Value localPath, + Value cloudUrl, + Value encryptionKey, + Value iv, + Value uploadStatus, + Value downloadStatus, + Value expiresAt, + Value uploadedAt, + Value downloadedAt, + Value ownerId, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid, + }); +typedef $$CloudCacheRecordsTableUpdateCompanionBuilder = + CloudCacheRecordsCompanion Function({ + Value id, + Value fileName, + Value fileSize, + Value mimeType, + Value localPath, + Value cloudUrl, + Value encryptionKey, + Value iv, + Value uploadStatus, + Value downloadStatus, + Value expiresAt, + Value uploadedAt, + Value downloadedAt, + Value ownerId, + Value createdAt, + Value updatedAt, + Value rowid, + }); class $$CloudCacheRecordsTableFilterComposer extends Composer<_$AppDatabase, $CloudCacheRecordsTable> { @@ -20660,53 +24806,84 @@ class $$CloudCacheRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileName => $composableBuilder( - column: $table.fileName, builder: (column) => ColumnFilters(column)); + column: $table.fileName, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileSize => $composableBuilder( - column: $table.fileSize, builder: (column) => ColumnFilters(column)); + column: $table.fileSize, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get mimeType => $composableBuilder( - column: $table.mimeType, builder: (column) => ColumnFilters(column)); + column: $table.mimeType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get localPath => $composableBuilder( - column: $table.localPath, builder: (column) => ColumnFilters(column)); + column: $table.localPath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get cloudUrl => $composableBuilder( - column: $table.cloudUrl, builder: (column) => ColumnFilters(column)); + column: $table.cloudUrl, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get encryptionKey => $composableBuilder( - column: $table.encryptionKey, builder: (column) => ColumnFilters(column)); + column: $table.encryptionKey, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get iv => $composableBuilder( - column: $table.iv, builder: (column) => ColumnFilters(column)); + column: $table.iv, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get uploadStatus => $composableBuilder( - column: $table.uploadStatus, builder: (column) => ColumnFilters(column)); + column: $table.uploadStatus, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get downloadStatus => $composableBuilder( - column: $table.downloadStatus, - builder: (column) => ColumnFilters(column)); + column: $table.downloadStatus, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get expiresAt => $composableBuilder( - column: $table.expiresAt, builder: (column) => ColumnFilters(column)); + column: $table.expiresAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get uploadedAt => $composableBuilder( - column: $table.uploadedAt, builder: (column) => ColumnFilters(column)); + column: $table.uploadedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get downloadedAt => $composableBuilder( - column: $table.downloadedAt, builder: (column) => ColumnFilters(column)); + column: $table.downloadedAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get ownerId => $composableBuilder( - column: $table.ownerId, builder: (column) => ColumnFilters(column)); + column: $table.ownerId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$CloudCacheRecordsTableOrderingComposer @@ -20719,56 +24896,84 @@ class $$CloudCacheRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileName => $composableBuilder( - column: $table.fileName, builder: (column) => ColumnOrderings(column)); + column: $table.fileName, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileSize => $composableBuilder( - column: $table.fileSize, builder: (column) => ColumnOrderings(column)); + column: $table.fileSize, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get mimeType => $composableBuilder( - column: $table.mimeType, builder: (column) => ColumnOrderings(column)); + column: $table.mimeType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get localPath => $composableBuilder( - column: $table.localPath, builder: (column) => ColumnOrderings(column)); + column: $table.localPath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get cloudUrl => $composableBuilder( - column: $table.cloudUrl, builder: (column) => ColumnOrderings(column)); + column: $table.cloudUrl, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get encryptionKey => $composableBuilder( - column: $table.encryptionKey, - builder: (column) => ColumnOrderings(column)); + column: $table.encryptionKey, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get iv => $composableBuilder( - column: $table.iv, builder: (column) => ColumnOrderings(column)); + column: $table.iv, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get uploadStatus => $composableBuilder( - column: $table.uploadStatus, - builder: (column) => ColumnOrderings(column)); + column: $table.uploadStatus, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get downloadStatus => $composableBuilder( - column: $table.downloadStatus, - builder: (column) => ColumnOrderings(column)); + column: $table.downloadStatus, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get expiresAt => $composableBuilder( - column: $table.expiresAt, builder: (column) => ColumnOrderings(column)); + column: $table.expiresAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get uploadedAt => $composableBuilder( - column: $table.uploadedAt, builder: (column) => ColumnOrderings(column)); + column: $table.uploadedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get downloadedAt => $composableBuilder( - column: $table.downloadedAt, - builder: (column) => ColumnOrderings(column)); + column: $table.downloadedAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get ownerId => $composableBuilder( - column: $table.ownerId, builder: (column) => ColumnOrderings(column)); + column: $table.ownerId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$CloudCacheRecordsTableAnnotationComposer @@ -20799,25 +25004,35 @@ class $$CloudCacheRecordsTableAnnotationComposer $composableBuilder(column: $table.cloudUrl, builder: (column) => column); GeneratedColumn get encryptionKey => $composableBuilder( - column: $table.encryptionKey, builder: (column) => column); + column: $table.encryptionKey, + builder: (column) => column, + ); GeneratedColumn get iv => $composableBuilder(column: $table.iv, builder: (column) => column); GeneratedColumn get uploadStatus => $composableBuilder( - column: $table.uploadStatus, builder: (column) => column); + column: $table.uploadStatus, + builder: (column) => column, + ); GeneratedColumn get downloadStatus => $composableBuilder( - column: $table.downloadStatus, builder: (column) => column); + column: $table.downloadStatus, + builder: (column) => column, + ); GeneratedColumn get expiresAt => $composableBuilder(column: $table.expiresAt, builder: (column) => column); GeneratedColumn get uploadedAt => $composableBuilder( - column: $table.uploadedAt, builder: (column) => column); + column: $table.uploadedAt, + builder: (column) => column, + ); GeneratedColumn get downloadedAt => $composableBuilder( - column: $table.downloadedAt, builder: (column) => column); + column: $table.downloadedAt, + builder: (column) => column, + ); GeneratedColumn get ownerId => $composableBuilder(column: $table.ownerId, builder: (column) => column); @@ -20829,24 +25044,33 @@ class $$CloudCacheRecordsTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$CloudCacheRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $CloudCacheRecordsTable, - CloudCacheRecord, - $$CloudCacheRecordsTableFilterComposer, - $$CloudCacheRecordsTableOrderingComposer, - $$CloudCacheRecordsTableAnnotationComposer, - $$CloudCacheRecordsTableCreateCompanionBuilder, - $$CloudCacheRecordsTableUpdateCompanionBuilder, - ( - CloudCacheRecord, - BaseReferences<_$AppDatabase, $CloudCacheRecordsTable, CloudCacheRecord> - ), - CloudCacheRecord, - PrefetchHooks Function()> { +class $$CloudCacheRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $CloudCacheRecordsTable, + CloudCacheRecord, + $$CloudCacheRecordsTableFilterComposer, + $$CloudCacheRecordsTableOrderingComposer, + $$CloudCacheRecordsTableAnnotationComposer, + $$CloudCacheRecordsTableCreateCompanionBuilder, + $$CloudCacheRecordsTableUpdateCompanionBuilder, + ( + CloudCacheRecord, + BaseReferences< + _$AppDatabase, + $CloudCacheRecordsTable, + CloudCacheRecord + >, + ), + CloudCacheRecord, + PrefetchHooks Function() + > { $$CloudCacheRecordsTableTableManager( - _$AppDatabase db, $CloudCacheRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $CloudCacheRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -20855,127 +25079,136 @@ class $$CloudCacheRecordsTableTableManager extends RootTableManager< $$CloudCacheRecordsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$CloudCacheRecordsTableAnnotationComposer( - $db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value fileName = const Value.absent(), - Value fileSize = const Value.absent(), - Value mimeType = const Value.absent(), - Value localPath = const Value.absent(), - Value cloudUrl = const Value.absent(), - Value encryptionKey = const Value.absent(), - Value iv = const Value.absent(), - Value uploadStatus = const Value.absent(), - Value downloadStatus = const Value.absent(), - Value expiresAt = const Value.absent(), - Value uploadedAt = const Value.absent(), - Value downloadedAt = const Value.absent(), - Value ownerId = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - CloudCacheRecordsCompanion( - id: id, - fileName: fileName, - fileSize: fileSize, - mimeType: mimeType, - localPath: localPath, - cloudUrl: cloudUrl, - encryptionKey: encryptionKey, - iv: iv, - uploadStatus: uploadStatus, - downloadStatus: downloadStatus, - expiresAt: expiresAt, - uploadedAt: uploadedAt, - downloadedAt: downloadedAt, - ownerId: ownerId, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String fileName, - Value fileSize = const Value.absent(), - Value mimeType = const Value.absent(), - Value localPath = const Value.absent(), - Value cloudUrl = const Value.absent(), - Value encryptionKey = const Value.absent(), - Value iv = const Value.absent(), - Value uploadStatus = const Value.absent(), - Value downloadStatus = const Value.absent(), - Value expiresAt = const Value.absent(), - Value uploadedAt = const Value.absent(), - Value downloadedAt = const Value.absent(), - Value ownerId = const Value.absent(), - required DateTime createdAt, - required DateTime updatedAt, - Value rowid = const Value.absent(), - }) => - CloudCacheRecordsCompanion.insert( - id: id, - fileName: fileName, - fileSize: fileSize, - mimeType: mimeType, - localPath: localPath, - cloudUrl: cloudUrl, - encryptionKey: encryptionKey, - iv: iv, - uploadStatus: uploadStatus, - downloadStatus: downloadStatus, - expiresAt: expiresAt, - uploadedAt: uploadedAt, - downloadedAt: downloadedAt, - ownerId: ownerId, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), + $db: db, + $table: table, + ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value fileName = const Value.absent(), + Value fileSize = const Value.absent(), + Value mimeType = const Value.absent(), + Value localPath = const Value.absent(), + Value cloudUrl = const Value.absent(), + Value encryptionKey = const Value.absent(), + Value iv = const Value.absent(), + Value uploadStatus = const Value.absent(), + Value downloadStatus = const Value.absent(), + Value expiresAt = const Value.absent(), + Value uploadedAt = const Value.absent(), + Value downloadedAt = const Value.absent(), + Value ownerId = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => CloudCacheRecordsCompanion( + id: id, + fileName: fileName, + fileSize: fileSize, + mimeType: mimeType, + localPath: localPath, + cloudUrl: cloudUrl, + encryptionKey: encryptionKey, + iv: iv, + uploadStatus: uploadStatus, + downloadStatus: downloadStatus, + expiresAt: expiresAt, + uploadedAt: uploadedAt, + downloadedAt: downloadedAt, + ownerId: ownerId, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String fileName, + Value fileSize = const Value.absent(), + Value mimeType = const Value.absent(), + Value localPath = const Value.absent(), + Value cloudUrl = const Value.absent(), + Value encryptionKey = const Value.absent(), + Value iv = const Value.absent(), + Value uploadStatus = const Value.absent(), + Value downloadStatus = const Value.absent(), + Value expiresAt = const Value.absent(), + Value uploadedAt = const Value.absent(), + Value downloadedAt = const Value.absent(), + Value ownerId = const Value.absent(), + required DateTime createdAt, + required DateTime updatedAt, + Value rowid = const Value.absent(), + }) => CloudCacheRecordsCompanion.insert( + id: id, + fileName: fileName, + fileSize: fileSize, + mimeType: mimeType, + localPath: localPath, + cloudUrl: cloudUrl, + encryptionKey: encryptionKey, + iv: iv, + uploadStatus: uploadStatus, + downloadStatus: downloadStatus, + expiresAt: expiresAt, + uploadedAt: uploadedAt, + downloadedAt: downloadedAt, + ownerId: ownerId, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$CloudCacheRecordsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $CloudCacheRecordsTable, - CloudCacheRecord, - $$CloudCacheRecordsTableFilterComposer, - $$CloudCacheRecordsTableOrderingComposer, - $$CloudCacheRecordsTableAnnotationComposer, - $$CloudCacheRecordsTableCreateCompanionBuilder, - $$CloudCacheRecordsTableUpdateCompanionBuilder, - ( +typedef $$CloudCacheRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $CloudCacheRecordsTable, CloudCacheRecord, - BaseReferences<_$AppDatabase, $CloudCacheRecordsTable, CloudCacheRecord> - ), - CloudCacheRecord, - PrefetchHooks Function()>; -typedef $$TransferStatsRecordsTableCreateCompanionBuilder - = TransferStatsRecordsCompanion Function({ - Value id, - required String date, - Value totalSentBytes, - Value totalReceivedBytes, - Value fileCount, - Value avgSpeed, - Value transportType, - required DateTime createdAt, -}); -typedef $$TransferStatsRecordsTableUpdateCompanionBuilder - = TransferStatsRecordsCompanion Function({ - Value id, - Value date, - Value totalSentBytes, - Value totalReceivedBytes, - Value fileCount, - Value avgSpeed, - Value transportType, - Value createdAt, -}); + $$CloudCacheRecordsTableFilterComposer, + $$CloudCacheRecordsTableOrderingComposer, + $$CloudCacheRecordsTableAnnotationComposer, + $$CloudCacheRecordsTableCreateCompanionBuilder, + $$CloudCacheRecordsTableUpdateCompanionBuilder, + ( + CloudCacheRecord, + BaseReferences< + _$AppDatabase, + $CloudCacheRecordsTable, + CloudCacheRecord + >, + ), + CloudCacheRecord, + PrefetchHooks Function() + >; +typedef $$TransferStatsRecordsTableCreateCompanionBuilder = + TransferStatsRecordsCompanion Function({ + Value id, + required String date, + Value totalSentBytes, + Value totalReceivedBytes, + Value fileCount, + Value avgSpeed, + Value transportType, + required DateTime createdAt, + }); +typedef $$TransferStatsRecordsTableUpdateCompanionBuilder = + TransferStatsRecordsCompanion Function({ + Value id, + Value date, + Value totalSentBytes, + Value totalReceivedBytes, + Value fileCount, + Value avgSpeed, + Value transportType, + Value createdAt, + }); class $$TransferStatsRecordsTableFilterComposer extends Composer<_$AppDatabase, $TransferStatsRecordsTable> { @@ -20987,30 +25220,44 @@ class $$TransferStatsRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get date => $composableBuilder( - column: $table.date, builder: (column) => ColumnFilters(column)); + column: $table.date, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get totalSentBytes => $composableBuilder( - column: $table.totalSentBytes, - builder: (column) => ColumnFilters(column)); + column: $table.totalSentBytes, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get totalReceivedBytes => $composableBuilder( - column: $table.totalReceivedBytes, - builder: (column) => ColumnFilters(column)); + column: $table.totalReceivedBytes, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fileCount => $composableBuilder( - column: $table.fileCount, builder: (column) => ColumnFilters(column)); + column: $table.fileCount, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get avgSpeed => $composableBuilder( - column: $table.avgSpeed, builder: (column) => ColumnFilters(column)); + column: $table.avgSpeed, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get transportType => $composableBuilder( - column: $table.transportType, builder: (column) => ColumnFilters(column)); + column: $table.transportType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); } class $$TransferStatsRecordsTableOrderingComposer @@ -21023,31 +25270,44 @@ class $$TransferStatsRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get date => $composableBuilder( - column: $table.date, builder: (column) => ColumnOrderings(column)); + column: $table.date, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get totalSentBytes => $composableBuilder( - column: $table.totalSentBytes, - builder: (column) => ColumnOrderings(column)); + column: $table.totalSentBytes, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get totalReceivedBytes => $composableBuilder( - column: $table.totalReceivedBytes, - builder: (column) => ColumnOrderings(column)); + column: $table.totalReceivedBytes, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fileCount => $composableBuilder( - column: $table.fileCount, builder: (column) => ColumnOrderings(column)); + column: $table.fileCount, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get avgSpeed => $composableBuilder( - column: $table.avgSpeed, builder: (column) => ColumnOrderings(column)); + column: $table.avgSpeed, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get transportType => $composableBuilder( - column: $table.transportType, - builder: (column) => ColumnOrderings(column)); + column: $table.transportType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$TransferStatsRecordsTableAnnotationComposer @@ -21066,10 +25326,14 @@ class $$TransferStatsRecordsTableAnnotationComposer $composableBuilder(column: $table.date, builder: (column) => column); GeneratedColumn get totalSentBytes => $composableBuilder( - column: $table.totalSentBytes, builder: (column) => column); + column: $table.totalSentBytes, + builder: (column) => column, + ); GeneratedColumn get totalReceivedBytes => $composableBuilder( - column: $table.totalReceivedBytes, builder: (column) => column); + column: $table.totalReceivedBytes, + builder: (column) => column, + ); GeneratedColumn get fileCount => $composableBuilder(column: $table.fileCount, builder: (column) => column); @@ -21078,127 +25342,146 @@ class $$TransferStatsRecordsTableAnnotationComposer $composableBuilder(column: $table.avgSpeed, builder: (column) => column); GeneratedColumn get transportType => $composableBuilder( - column: $table.transportType, builder: (column) => column); + column: $table.transportType, + builder: (column) => column, + ); GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); } -class $$TransferStatsRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $TransferStatsRecordsTable, - TransferStatsRecord, - $$TransferStatsRecordsTableFilterComposer, - $$TransferStatsRecordsTableOrderingComposer, - $$TransferStatsRecordsTableAnnotationComposer, - $$TransferStatsRecordsTableCreateCompanionBuilder, - $$TransferStatsRecordsTableUpdateCompanionBuilder, - ( - TransferStatsRecord, - BaseReferences<_$AppDatabase, $TransferStatsRecordsTable, - TransferStatsRecord> - ), - TransferStatsRecord, - PrefetchHooks Function()> { +class $$TransferStatsRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $TransferStatsRecordsTable, + TransferStatsRecord, + $$TransferStatsRecordsTableFilterComposer, + $$TransferStatsRecordsTableOrderingComposer, + $$TransferStatsRecordsTableAnnotationComposer, + $$TransferStatsRecordsTableCreateCompanionBuilder, + $$TransferStatsRecordsTableUpdateCompanionBuilder, + ( + TransferStatsRecord, + BaseReferences< + _$AppDatabase, + $TransferStatsRecordsTable, + TransferStatsRecord + >, + ), + TransferStatsRecord, + PrefetchHooks Function() + > { $$TransferStatsRecordsTableTableManager( - _$AppDatabase db, $TransferStatsRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $TransferStatsRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => $$TransferStatsRecordsTableFilterComposer($db: db, $table: table), createOrderingComposer: () => $$TransferStatsRecordsTableOrderingComposer( - $db: db, $table: table), + $db: db, + $table: table, + ), createComputedFieldComposer: () => $$TransferStatsRecordsTableAnnotationComposer( - $db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value date = const Value.absent(), - Value totalSentBytes = const Value.absent(), - Value totalReceivedBytes = const Value.absent(), - Value fileCount = const Value.absent(), - Value avgSpeed = const Value.absent(), - Value transportType = const Value.absent(), - Value createdAt = const Value.absent(), - }) => - TransferStatsRecordsCompanion( - id: id, - date: date, - totalSentBytes: totalSentBytes, - totalReceivedBytes: totalReceivedBytes, - fileCount: fileCount, - avgSpeed: avgSpeed, - transportType: transportType, - createdAt: createdAt, - ), - createCompanionCallback: ({ - Value id = const Value.absent(), - required String date, - Value totalSentBytes = const Value.absent(), - Value totalReceivedBytes = const Value.absent(), - Value fileCount = const Value.absent(), - Value avgSpeed = const Value.absent(), - Value transportType = const Value.absent(), - required DateTime createdAt, - }) => - TransferStatsRecordsCompanion.insert( - id: id, - date: date, - totalSentBytes: totalSentBytes, - totalReceivedBytes: totalReceivedBytes, - fileCount: fileCount, - avgSpeed: avgSpeed, - transportType: transportType, - createdAt: createdAt, - ), + $db: db, + $table: table, + ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value date = const Value.absent(), + Value totalSentBytes = const Value.absent(), + Value totalReceivedBytes = const Value.absent(), + Value fileCount = const Value.absent(), + Value avgSpeed = const Value.absent(), + Value transportType = const Value.absent(), + Value createdAt = const Value.absent(), + }) => TransferStatsRecordsCompanion( + id: id, + date: date, + totalSentBytes: totalSentBytes, + totalReceivedBytes: totalReceivedBytes, + fileCount: fileCount, + avgSpeed: avgSpeed, + transportType: transportType, + createdAt: createdAt, + ), + createCompanionCallback: + ({ + Value id = const Value.absent(), + required String date, + Value totalSentBytes = const Value.absent(), + Value totalReceivedBytes = const Value.absent(), + Value fileCount = const Value.absent(), + Value avgSpeed = const Value.absent(), + Value transportType = const Value.absent(), + required DateTime createdAt, + }) => TransferStatsRecordsCompanion.insert( + id: id, + date: date, + totalSentBytes: totalSentBytes, + totalReceivedBytes: totalReceivedBytes, + fileCount: fileCount, + avgSpeed: avgSpeed, + transportType: transportType, + createdAt: createdAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$TransferStatsRecordsTableProcessedTableManager - = ProcessedTableManager< - _$AppDatabase, - $TransferStatsRecordsTable, +typedef $$TransferStatsRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $TransferStatsRecordsTable, + TransferStatsRecord, + $$TransferStatsRecordsTableFilterComposer, + $$TransferStatsRecordsTableOrderingComposer, + $$TransferStatsRecordsTableAnnotationComposer, + $$TransferStatsRecordsTableCreateCompanionBuilder, + $$TransferStatsRecordsTableUpdateCompanionBuilder, + ( TransferStatsRecord, - $$TransferStatsRecordsTableFilterComposer, - $$TransferStatsRecordsTableOrderingComposer, - $$TransferStatsRecordsTableAnnotationComposer, - $$TransferStatsRecordsTableCreateCompanionBuilder, - $$TransferStatsRecordsTableUpdateCompanionBuilder, - ( - TransferStatsRecord, - BaseReferences<_$AppDatabase, $TransferStatsRecordsTable, - TransferStatsRecord> - ), - TransferStatsRecord, - PrefetchHooks Function()>; -typedef $$ClipboardRecordsTableCreateCompanionBuilder - = ClipboardRecordsCompanion Function({ - required String id, - required String content, - Value contentType, - Value sourceDevice, - Value deviceId, - Value isPinned, - required DateTime createdAt, - Value rowid, -}); -typedef $$ClipboardRecordsTableUpdateCompanionBuilder - = ClipboardRecordsCompanion Function({ - Value id, - Value content, - Value contentType, - Value sourceDevice, - Value deviceId, - Value isPinned, - Value createdAt, - Value rowid, -}); + BaseReferences< + _$AppDatabase, + $TransferStatsRecordsTable, + TransferStatsRecord + >, + ), + TransferStatsRecord, + PrefetchHooks Function() + >; +typedef $$ClipboardRecordsTableCreateCompanionBuilder = + ClipboardRecordsCompanion Function({ + required String id, + required String content, + Value contentType, + Value sourceDevice, + Value deviceId, + Value isPinned, + required DateTime createdAt, + Value rowid, + }); +typedef $$ClipboardRecordsTableUpdateCompanionBuilder = + ClipboardRecordsCompanion Function({ + Value id, + Value content, + Value contentType, + Value sourceDevice, + Value deviceId, + Value isPinned, + Value createdAt, + Value rowid, + }); class $$ClipboardRecordsTableFilterComposer extends Composer<_$AppDatabase, $ClipboardRecordsTable> { @@ -21210,25 +25493,39 @@ class $$ClipboardRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnFilters(column)); + column: $table.content, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get contentType => $composableBuilder( - column: $table.contentType, builder: (column) => ColumnFilters(column)); + column: $table.contentType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get sourceDevice => $composableBuilder( - column: $table.sourceDevice, builder: (column) => ColumnFilters(column)); + column: $table.sourceDevice, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get deviceId => $composableBuilder( - column: $table.deviceId, builder: (column) => ColumnFilters(column)); + column: $table.deviceId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isPinned => $composableBuilder( - column: $table.isPinned, builder: (column) => ColumnFilters(column)); + column: $table.isPinned, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); } class $$ClipboardRecordsTableOrderingComposer @@ -21241,26 +25538,39 @@ class $$ClipboardRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get content => $composableBuilder( - column: $table.content, builder: (column) => ColumnOrderings(column)); + column: $table.content, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get contentType => $composableBuilder( - column: $table.contentType, builder: (column) => ColumnOrderings(column)); + column: $table.contentType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get sourceDevice => $composableBuilder( - column: $table.sourceDevice, - builder: (column) => ColumnOrderings(column)); + column: $table.sourceDevice, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get deviceId => $composableBuilder( - column: $table.deviceId, builder: (column) => ColumnOrderings(column)); + column: $table.deviceId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isPinned => $composableBuilder( - column: $table.isPinned, builder: (column) => ColumnOrderings(column)); + column: $table.isPinned, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$ClipboardRecordsTableAnnotationComposer @@ -21279,10 +25589,14 @@ class $$ClipboardRecordsTableAnnotationComposer $composableBuilder(column: $table.content, builder: (column) => column); GeneratedColumn get contentType => $composableBuilder( - column: $table.contentType, builder: (column) => column); + column: $table.contentType, + builder: (column) => column, + ); GeneratedColumn get sourceDevice => $composableBuilder( - column: $table.sourceDevice, builder: (column) => column); + column: $table.sourceDevice, + builder: (column) => column, + ); GeneratedColumn get deviceId => $composableBuilder(column: $table.deviceId, builder: (column) => column); @@ -21294,24 +25608,33 @@ class $$ClipboardRecordsTableAnnotationComposer $composableBuilder(column: $table.createdAt, builder: (column) => column); } -class $$ClipboardRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $ClipboardRecordsTable, - ClipboardRecord, - $$ClipboardRecordsTableFilterComposer, - $$ClipboardRecordsTableOrderingComposer, - $$ClipboardRecordsTableAnnotationComposer, - $$ClipboardRecordsTableCreateCompanionBuilder, - $$ClipboardRecordsTableUpdateCompanionBuilder, - ( - ClipboardRecord, - BaseReferences<_$AppDatabase, $ClipboardRecordsTable, ClipboardRecord> - ), - ClipboardRecord, - PrefetchHooks Function()> { +class $$ClipboardRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $ClipboardRecordsTable, + ClipboardRecord, + $$ClipboardRecordsTableFilterComposer, + $$ClipboardRecordsTableOrderingComposer, + $$ClipboardRecordsTableAnnotationComposer, + $$ClipboardRecordsTableCreateCompanionBuilder, + $$ClipboardRecordsTableUpdateCompanionBuilder, + ( + ClipboardRecord, + BaseReferences< + _$AppDatabase, + $ClipboardRecordsTable, + ClipboardRecord + >, + ), + ClipboardRecord, + PrefetchHooks Function() + > { $$ClipboardRecordsTableTableManager( - _$AppDatabase db, $ClipboardRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $ClipboardRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -21320,92 +25643,95 @@ class $$ClipboardRecordsTableTableManager extends RootTableManager< $$ClipboardRecordsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$ClipboardRecordsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value content = const Value.absent(), - Value contentType = const Value.absent(), - Value sourceDevice = const Value.absent(), - Value deviceId = const Value.absent(), - Value isPinned = const Value.absent(), - Value createdAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - ClipboardRecordsCompanion( - id: id, - content: content, - contentType: contentType, - sourceDevice: sourceDevice, - deviceId: deviceId, - isPinned: isPinned, - createdAt: createdAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String content, - Value contentType = const Value.absent(), - Value sourceDevice = const Value.absent(), - Value deviceId = const Value.absent(), - Value isPinned = const Value.absent(), - required DateTime createdAt, - Value rowid = const Value.absent(), - }) => - ClipboardRecordsCompanion.insert( - id: id, - content: content, - contentType: contentType, - sourceDevice: sourceDevice, - deviceId: deviceId, - isPinned: isPinned, - createdAt: createdAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value content = const Value.absent(), + Value contentType = const Value.absent(), + Value sourceDevice = const Value.absent(), + Value deviceId = const Value.absent(), + Value isPinned = const Value.absent(), + Value createdAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => ClipboardRecordsCompanion( + id: id, + content: content, + contentType: contentType, + sourceDevice: sourceDevice, + deviceId: deviceId, + isPinned: isPinned, + createdAt: createdAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String content, + Value contentType = const Value.absent(), + Value sourceDevice = const Value.absent(), + Value deviceId = const Value.absent(), + Value isPinned = const Value.absent(), + required DateTime createdAt, + Value rowid = const Value.absent(), + }) => ClipboardRecordsCompanion.insert( + id: id, + content: content, + contentType: contentType, + sourceDevice: sourceDevice, + deviceId: deviceId, + isPinned: isPinned, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$ClipboardRecordsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $ClipboardRecordsTable, - ClipboardRecord, - $$ClipboardRecordsTableFilterComposer, - $$ClipboardRecordsTableOrderingComposer, - $$ClipboardRecordsTableAnnotationComposer, - $$ClipboardRecordsTableCreateCompanionBuilder, - $$ClipboardRecordsTableUpdateCompanionBuilder, - ( +typedef $$ClipboardRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $ClipboardRecordsTable, ClipboardRecord, - BaseReferences<_$AppDatabase, $ClipboardRecordsTable, ClipboardRecord> - ), - ClipboardRecord, - PrefetchHooks Function()>; -typedef $$CanvasDocumentsTableCreateCompanionBuilder = CanvasDocumentsCompanion - Function({ - required String id, - required String name, - Value ownerId, - Value width, - Value height, - Value backgroundJson, - required DateTime createdAt, - required DateTime updatedAt, - Value rowid, -}); -typedef $$CanvasDocumentsTableUpdateCompanionBuilder = CanvasDocumentsCompanion - Function({ - Value id, - Value name, - Value ownerId, - Value width, - Value height, - Value backgroundJson, - Value createdAt, - Value updatedAt, - Value rowid, -}); + $$ClipboardRecordsTableFilterComposer, + $$ClipboardRecordsTableOrderingComposer, + $$ClipboardRecordsTableAnnotationComposer, + $$ClipboardRecordsTableCreateCompanionBuilder, + $$ClipboardRecordsTableUpdateCompanionBuilder, + ( + ClipboardRecord, + BaseReferences<_$AppDatabase, $ClipboardRecordsTable, ClipboardRecord>, + ), + ClipboardRecord, + PrefetchHooks Function() + >; +typedef $$CanvasDocumentsTableCreateCompanionBuilder = + CanvasDocumentsCompanion Function({ + required String id, + required String name, + Value ownerId, + Value width, + Value height, + Value backgroundJson, + required DateTime createdAt, + required DateTime updatedAt, + Value rowid, + }); +typedef $$CanvasDocumentsTableUpdateCompanionBuilder = + CanvasDocumentsCompanion Function({ + Value id, + Value name, + Value ownerId, + Value width, + Value height, + Value backgroundJson, + Value createdAt, + Value updatedAt, + Value rowid, + }); class $$CanvasDocumentsTableFilterComposer extends Composer<_$AppDatabase, $CanvasDocumentsTable> { @@ -21417,29 +25743,44 @@ class $$CanvasDocumentsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get name => $composableBuilder( - column: $table.name, builder: (column) => ColumnFilters(column)); + column: $table.name, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get ownerId => $composableBuilder( - column: $table.ownerId, builder: (column) => ColumnFilters(column)); + column: $table.ownerId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get width => $composableBuilder( - column: $table.width, builder: (column) => ColumnFilters(column)); + column: $table.width, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get height => $composableBuilder( - column: $table.height, builder: (column) => ColumnFilters(column)); + column: $table.height, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get backgroundJson => $composableBuilder( - column: $table.backgroundJson, - builder: (column) => ColumnFilters(column)); + column: $table.backgroundJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$CanvasDocumentsTableOrderingComposer @@ -21452,29 +25793,44 @@ class $$CanvasDocumentsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get name => $composableBuilder( - column: $table.name, builder: (column) => ColumnOrderings(column)); + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get ownerId => $composableBuilder( - column: $table.ownerId, builder: (column) => ColumnOrderings(column)); + column: $table.ownerId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get width => $composableBuilder( - column: $table.width, builder: (column) => ColumnOrderings(column)); + column: $table.width, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get height => $composableBuilder( - column: $table.height, builder: (column) => ColumnOrderings(column)); + column: $table.height, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get backgroundJson => $composableBuilder( - column: $table.backgroundJson, - builder: (column) => ColumnOrderings(column)); + column: $table.backgroundJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$CanvasDocumentsTableAnnotationComposer @@ -21502,7 +25858,9 @@ class $$CanvasDocumentsTableAnnotationComposer $composableBuilder(column: $table.height, builder: (column) => column); GeneratedColumn get backgroundJson => $composableBuilder( - column: $table.backgroundJson, builder: (column) => column); + column: $table.backgroundJson, + builder: (column) => column, + ); GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); @@ -21511,24 +25869,33 @@ class $$CanvasDocumentsTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$CanvasDocumentsTableTableManager extends RootTableManager< - _$AppDatabase, - $CanvasDocumentsTable, - CanvasDocument, - $$CanvasDocumentsTableFilterComposer, - $$CanvasDocumentsTableOrderingComposer, - $$CanvasDocumentsTableAnnotationComposer, - $$CanvasDocumentsTableCreateCompanionBuilder, - $$CanvasDocumentsTableUpdateCompanionBuilder, - ( - CanvasDocument, - BaseReferences<_$AppDatabase, $CanvasDocumentsTable, CanvasDocument> - ), - CanvasDocument, - PrefetchHooks Function()> { +class $$CanvasDocumentsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $CanvasDocumentsTable, + CanvasDocument, + $$CanvasDocumentsTableFilterComposer, + $$CanvasDocumentsTableOrderingComposer, + $$CanvasDocumentsTableAnnotationComposer, + $$CanvasDocumentsTableCreateCompanionBuilder, + $$CanvasDocumentsTableUpdateCompanionBuilder, + ( + CanvasDocument, + BaseReferences< + _$AppDatabase, + $CanvasDocumentsTable, + CanvasDocument + >, + ), + CanvasDocument, + PrefetchHooks Function() + > { $$CanvasDocumentsTableTableManager( - _$AppDatabase db, $CanvasDocumentsTable table) - : super(TableManagerState( + _$AppDatabase db, + $CanvasDocumentsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -21537,96 +25904,99 @@ class $$CanvasDocumentsTableTableManager extends RootTableManager< $$CanvasDocumentsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$CanvasDocumentsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value name = const Value.absent(), - Value ownerId = const Value.absent(), - Value width = const Value.absent(), - Value height = const Value.absent(), - Value backgroundJson = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - CanvasDocumentsCompanion( - id: id, - name: name, - ownerId: ownerId, - width: width, - height: height, - backgroundJson: backgroundJson, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String name, - Value ownerId = const Value.absent(), - Value width = const Value.absent(), - Value height = const Value.absent(), - Value backgroundJson = const Value.absent(), - required DateTime createdAt, - required DateTime updatedAt, - Value rowid = const Value.absent(), - }) => - CanvasDocumentsCompanion.insert( - id: id, - name: name, - ownerId: ownerId, - width: width, - height: height, - backgroundJson: backgroundJson, - createdAt: createdAt, - updatedAt: updatedAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value ownerId = const Value.absent(), + Value width = const Value.absent(), + Value height = const Value.absent(), + Value backgroundJson = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => CanvasDocumentsCompanion( + id: id, + name: name, + ownerId: ownerId, + width: width, + height: height, + backgroundJson: backgroundJson, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String name, + Value ownerId = const Value.absent(), + Value width = const Value.absent(), + Value height = const Value.absent(), + Value backgroundJson = const Value.absent(), + required DateTime createdAt, + required DateTime updatedAt, + Value rowid = const Value.absent(), + }) => CanvasDocumentsCompanion.insert( + id: id, + name: name, + ownerId: ownerId, + width: width, + height: height, + backgroundJson: backgroundJson, + createdAt: createdAt, + updatedAt: updatedAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$CanvasDocumentsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $CanvasDocumentsTable, - CanvasDocument, - $$CanvasDocumentsTableFilterComposer, - $$CanvasDocumentsTableOrderingComposer, - $$CanvasDocumentsTableAnnotationComposer, - $$CanvasDocumentsTableCreateCompanionBuilder, - $$CanvasDocumentsTableUpdateCompanionBuilder, - ( +typedef $$CanvasDocumentsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $CanvasDocumentsTable, CanvasDocument, - BaseReferences<_$AppDatabase, $CanvasDocumentsTable, CanvasDocument> - ), - CanvasDocument, - PrefetchHooks Function()>; -typedef $$CanvasStrokesTableCreateCompanionBuilder = CanvasStrokesCompanion - Function({ - required String id, - required String documentId, - required String userId, - required String pointsJson, - Value color, - Value strokeWidth, - Value toolType, - required DateTime createdAt, - Value rowid, -}); -typedef $$CanvasStrokesTableUpdateCompanionBuilder = CanvasStrokesCompanion - Function({ - Value id, - Value documentId, - Value userId, - Value pointsJson, - Value color, - Value strokeWidth, - Value toolType, - Value createdAt, - Value rowid, -}); + $$CanvasDocumentsTableFilterComposer, + $$CanvasDocumentsTableOrderingComposer, + $$CanvasDocumentsTableAnnotationComposer, + $$CanvasDocumentsTableCreateCompanionBuilder, + $$CanvasDocumentsTableUpdateCompanionBuilder, + ( + CanvasDocument, + BaseReferences<_$AppDatabase, $CanvasDocumentsTable, CanvasDocument>, + ), + CanvasDocument, + PrefetchHooks Function() + >; +typedef $$CanvasStrokesTableCreateCompanionBuilder = + CanvasStrokesCompanion Function({ + required String id, + required String documentId, + required String userId, + required String pointsJson, + Value color, + Value strokeWidth, + Value toolType, + required DateTime createdAt, + Value rowid, + }); +typedef $$CanvasStrokesTableUpdateCompanionBuilder = + CanvasStrokesCompanion Function({ + Value id, + Value documentId, + Value userId, + Value pointsJson, + Value color, + Value strokeWidth, + Value toolType, + Value createdAt, + Value rowid, + }); class $$CanvasStrokesTableFilterComposer extends Composer<_$AppDatabase, $CanvasStrokesTable> { @@ -21638,28 +26008,44 @@ class $$CanvasStrokesTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get documentId => $composableBuilder( - column: $table.documentId, builder: (column) => ColumnFilters(column)); + column: $table.documentId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get userId => $composableBuilder( - column: $table.userId, builder: (column) => ColumnFilters(column)); + column: $table.userId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get pointsJson => $composableBuilder( - column: $table.pointsJson, builder: (column) => ColumnFilters(column)); + column: $table.pointsJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get color => $composableBuilder( - column: $table.color, builder: (column) => ColumnFilters(column)); + column: $table.color, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get strokeWidth => $composableBuilder( - column: $table.strokeWidth, builder: (column) => ColumnFilters(column)); + column: $table.strokeWidth, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get toolType => $composableBuilder( - column: $table.toolType, builder: (column) => ColumnFilters(column)); + column: $table.toolType, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); } class $$CanvasStrokesTableOrderingComposer @@ -21672,28 +26058,44 @@ class $$CanvasStrokesTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get documentId => $composableBuilder( - column: $table.documentId, builder: (column) => ColumnOrderings(column)); + column: $table.documentId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get userId => $composableBuilder( - column: $table.userId, builder: (column) => ColumnOrderings(column)); + column: $table.userId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get pointsJson => $composableBuilder( - column: $table.pointsJson, builder: (column) => ColumnOrderings(column)); + column: $table.pointsJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get color => $composableBuilder( - column: $table.color, builder: (column) => ColumnOrderings(column)); + column: $table.color, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get strokeWidth => $composableBuilder( - column: $table.strokeWidth, builder: (column) => ColumnOrderings(column)); + column: $table.strokeWidth, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get toolType => $composableBuilder( - column: $table.toolType, builder: (column) => ColumnOrderings(column)); + column: $table.toolType, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$CanvasStrokesTableAnnotationComposer @@ -21709,19 +26111,25 @@ class $$CanvasStrokesTableAnnotationComposer $composableBuilder(column: $table.id, builder: (column) => column); GeneratedColumn get documentId => $composableBuilder( - column: $table.documentId, builder: (column) => column); + column: $table.documentId, + builder: (column) => column, + ); GeneratedColumn get userId => $composableBuilder(column: $table.userId, builder: (column) => column); GeneratedColumn get pointsJson => $composableBuilder( - column: $table.pointsJson, builder: (column) => column); + column: $table.pointsJson, + builder: (column) => column, + ); GeneratedColumn get color => $composableBuilder(column: $table.color, builder: (column) => column); GeneratedColumn get strokeWidth => $composableBuilder( - column: $table.strokeWidth, builder: (column) => column); + column: $table.strokeWidth, + builder: (column) => column, + ); GeneratedColumn get toolType => $composableBuilder(column: $table.toolType, builder: (column) => column); @@ -21730,23 +26138,27 @@ class $$CanvasStrokesTableAnnotationComposer $composableBuilder(column: $table.createdAt, builder: (column) => column); } -class $$CanvasStrokesTableTableManager extends RootTableManager< - _$AppDatabase, - $CanvasStrokesTable, - CanvasStroke, - $$CanvasStrokesTableFilterComposer, - $$CanvasStrokesTableOrderingComposer, - $$CanvasStrokesTableAnnotationComposer, - $$CanvasStrokesTableCreateCompanionBuilder, - $$CanvasStrokesTableUpdateCompanionBuilder, - ( - CanvasStroke, - BaseReferences<_$AppDatabase, $CanvasStrokesTable, CanvasStroke> - ), - CanvasStroke, - PrefetchHooks Function()> { +class $$CanvasStrokesTableTableManager + extends + RootTableManager< + _$AppDatabase, + $CanvasStrokesTable, + CanvasStroke, + $$CanvasStrokesTableFilterComposer, + $$CanvasStrokesTableOrderingComposer, + $$CanvasStrokesTableAnnotationComposer, + $$CanvasStrokesTableCreateCompanionBuilder, + $$CanvasStrokesTableUpdateCompanionBuilder, + ( + CanvasStroke, + BaseReferences<_$AppDatabase, $CanvasStrokesTable, CanvasStroke>, + ), + CanvasStroke, + PrefetchHooks Function() + > { $$CanvasStrokesTableTableManager(_$AppDatabase db, $CanvasStrokesTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -21755,96 +26167,99 @@ class $$CanvasStrokesTableTableManager extends RootTableManager< $$CanvasStrokesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$CanvasStrokesTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value documentId = const Value.absent(), - Value userId = const Value.absent(), - Value pointsJson = const Value.absent(), - Value color = const Value.absent(), - Value strokeWidth = const Value.absent(), - Value toolType = const Value.absent(), - Value createdAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - CanvasStrokesCompanion( - id: id, - documentId: documentId, - userId: userId, - pointsJson: pointsJson, - color: color, - strokeWidth: strokeWidth, - toolType: toolType, - createdAt: createdAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String documentId, - required String userId, - required String pointsJson, - Value color = const Value.absent(), - Value strokeWidth = const Value.absent(), - Value toolType = const Value.absent(), - required DateTime createdAt, - Value rowid = const Value.absent(), - }) => - CanvasStrokesCompanion.insert( - id: id, - documentId: documentId, - userId: userId, - pointsJson: pointsJson, - color: color, - strokeWidth: strokeWidth, - toolType: toolType, - createdAt: createdAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value documentId = const Value.absent(), + Value userId = const Value.absent(), + Value pointsJson = const Value.absent(), + Value color = const Value.absent(), + Value strokeWidth = const Value.absent(), + Value toolType = const Value.absent(), + Value createdAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => CanvasStrokesCompanion( + id: id, + documentId: documentId, + userId: userId, + pointsJson: pointsJson, + color: color, + strokeWidth: strokeWidth, + toolType: toolType, + createdAt: createdAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String documentId, + required String userId, + required String pointsJson, + Value color = const Value.absent(), + Value strokeWidth = const Value.absent(), + Value toolType = const Value.absent(), + required DateTime createdAt, + Value rowid = const Value.absent(), + }) => CanvasStrokesCompanion.insert( + id: id, + documentId: documentId, + userId: userId, + pointsJson: pointsJson, + color: color, + strokeWidth: strokeWidth, + toolType: toolType, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$CanvasStrokesTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $CanvasStrokesTable, - CanvasStroke, - $$CanvasStrokesTableFilterComposer, - $$CanvasStrokesTableOrderingComposer, - $$CanvasStrokesTableAnnotationComposer, - $$CanvasStrokesTableCreateCompanionBuilder, - $$CanvasStrokesTableUpdateCompanionBuilder, - ( +typedef $$CanvasStrokesTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $CanvasStrokesTable, CanvasStroke, - BaseReferences<_$AppDatabase, $CanvasStrokesTable, CanvasStroke> - ), - CanvasStroke, - PrefetchHooks Function()>; -typedef $$VoiceMessagesTableCreateCompanionBuilder = VoiceMessagesCompanion - Function({ - required String id, - required String messageId, - required String sessionId, - required String filePath, - Value duration, - Value waveformJson, - Value isRemote, - required DateTime createdAt, - Value rowid, -}); -typedef $$VoiceMessagesTableUpdateCompanionBuilder = VoiceMessagesCompanion - Function({ - Value id, - Value messageId, - Value sessionId, - Value filePath, - Value duration, - Value waveformJson, - Value isRemote, - Value createdAt, - Value rowid, -}); + $$CanvasStrokesTableFilterComposer, + $$CanvasStrokesTableOrderingComposer, + $$CanvasStrokesTableAnnotationComposer, + $$CanvasStrokesTableCreateCompanionBuilder, + $$CanvasStrokesTableUpdateCompanionBuilder, + ( + CanvasStroke, + BaseReferences<_$AppDatabase, $CanvasStrokesTable, CanvasStroke>, + ), + CanvasStroke, + PrefetchHooks Function() + >; +typedef $$VoiceMessagesTableCreateCompanionBuilder = + VoiceMessagesCompanion Function({ + required String id, + required String messageId, + required String sessionId, + required String filePath, + Value duration, + Value waveformJson, + Value isRemote, + required DateTime createdAt, + Value rowid, + }); +typedef $$VoiceMessagesTableUpdateCompanionBuilder = + VoiceMessagesCompanion Function({ + Value id, + Value messageId, + Value sessionId, + Value filePath, + Value duration, + Value waveformJson, + Value isRemote, + Value createdAt, + Value rowid, + }); class $$VoiceMessagesTableFilterComposer extends Composer<_$AppDatabase, $VoiceMessagesTable> { @@ -21856,28 +26271,44 @@ class $$VoiceMessagesTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get messageId => $composableBuilder( - column: $table.messageId, builder: (column) => ColumnFilters(column)); + column: $table.messageId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get sessionId => $composableBuilder( - column: $table.sessionId, builder: (column) => ColumnFilters(column)); + column: $table.sessionId, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get filePath => $composableBuilder( - column: $table.filePath, builder: (column) => ColumnFilters(column)); + column: $table.filePath, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get duration => $composableBuilder( - column: $table.duration, builder: (column) => ColumnFilters(column)); + column: $table.duration, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get waveformJson => $composableBuilder( - column: $table.waveformJson, builder: (column) => ColumnFilters(column)); + column: $table.waveformJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isRemote => $composableBuilder( - column: $table.isRemote, builder: (column) => ColumnFilters(column)); + column: $table.isRemote, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); } class $$VoiceMessagesTableOrderingComposer @@ -21890,29 +26321,44 @@ class $$VoiceMessagesTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get messageId => $composableBuilder( - column: $table.messageId, builder: (column) => ColumnOrderings(column)); + column: $table.messageId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get sessionId => $composableBuilder( - column: $table.sessionId, builder: (column) => ColumnOrderings(column)); + column: $table.sessionId, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get filePath => $composableBuilder( - column: $table.filePath, builder: (column) => ColumnOrderings(column)); + column: $table.filePath, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get duration => $composableBuilder( - column: $table.duration, builder: (column) => ColumnOrderings(column)); + column: $table.duration, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get waveformJson => $composableBuilder( - column: $table.waveformJson, - builder: (column) => ColumnOrderings(column)); + column: $table.waveformJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isRemote => $composableBuilder( - column: $table.isRemote, builder: (column) => ColumnOrderings(column)); + column: $table.isRemote, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$VoiceMessagesTableAnnotationComposer @@ -21940,7 +26386,9 @@ class $$VoiceMessagesTableAnnotationComposer $composableBuilder(column: $table.duration, builder: (column) => column); GeneratedColumn get waveformJson => $composableBuilder( - column: $table.waveformJson, builder: (column) => column); + column: $table.waveformJson, + builder: (column) => column, + ); GeneratedColumn get isRemote => $composableBuilder(column: $table.isRemote, builder: (column) => column); @@ -21949,23 +26397,27 @@ class $$VoiceMessagesTableAnnotationComposer $composableBuilder(column: $table.createdAt, builder: (column) => column); } -class $$VoiceMessagesTableTableManager extends RootTableManager< - _$AppDatabase, - $VoiceMessagesTable, - VoiceMessage, - $$VoiceMessagesTableFilterComposer, - $$VoiceMessagesTableOrderingComposer, - $$VoiceMessagesTableAnnotationComposer, - $$VoiceMessagesTableCreateCompanionBuilder, - $$VoiceMessagesTableUpdateCompanionBuilder, - ( - VoiceMessage, - BaseReferences<_$AppDatabase, $VoiceMessagesTable, VoiceMessage> - ), - VoiceMessage, - PrefetchHooks Function()> { +class $$VoiceMessagesTableTableManager + extends + RootTableManager< + _$AppDatabase, + $VoiceMessagesTable, + VoiceMessage, + $$VoiceMessagesTableFilterComposer, + $$VoiceMessagesTableOrderingComposer, + $$VoiceMessagesTableAnnotationComposer, + $$VoiceMessagesTableCreateCompanionBuilder, + $$VoiceMessagesTableUpdateCompanionBuilder, + ( + VoiceMessage, + BaseReferences<_$AppDatabase, $VoiceMessagesTable, VoiceMessage>, + ), + VoiceMessage, + PrefetchHooks Function() + > { $$VoiceMessagesTableTableManager(_$AppDatabase db, $VoiceMessagesTable table) - : super(TableManagerState( + : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -21974,118 +26426,121 @@ class $$VoiceMessagesTableTableManager extends RootTableManager< $$VoiceMessagesTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$VoiceMessagesTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value messageId = const Value.absent(), - Value sessionId = const Value.absent(), - Value filePath = const Value.absent(), - Value duration = const Value.absent(), - Value waveformJson = const Value.absent(), - Value isRemote = const Value.absent(), - Value createdAt = const Value.absent(), - Value rowid = const Value.absent(), - }) => - VoiceMessagesCompanion( - id: id, - messageId: messageId, - sessionId: sessionId, - filePath: filePath, - duration: duration, - waveformJson: waveformJson, - isRemote: isRemote, - createdAt: createdAt, - rowid: rowid, - ), - createCompanionCallback: ({ - required String id, - required String messageId, - required String sessionId, - required String filePath, - Value duration = const Value.absent(), - Value waveformJson = const Value.absent(), - Value isRemote = const Value.absent(), - required DateTime createdAt, - Value rowid = const Value.absent(), - }) => - VoiceMessagesCompanion.insert( - id: id, - messageId: messageId, - sessionId: sessionId, - filePath: filePath, - duration: duration, - waveformJson: waveformJson, - isRemote: isRemote, - createdAt: createdAt, - rowid: rowid, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value messageId = const Value.absent(), + Value sessionId = const Value.absent(), + Value filePath = const Value.absent(), + Value duration = const Value.absent(), + Value waveformJson = const Value.absent(), + Value isRemote = const Value.absent(), + Value createdAt = const Value.absent(), + Value rowid = const Value.absent(), + }) => VoiceMessagesCompanion( + id: id, + messageId: messageId, + sessionId: sessionId, + filePath: filePath, + duration: duration, + waveformJson: waveformJson, + isRemote: isRemote, + createdAt: createdAt, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String messageId, + required String sessionId, + required String filePath, + Value duration = const Value.absent(), + Value waveformJson = const Value.absent(), + Value isRemote = const Value.absent(), + required DateTime createdAt, + Value rowid = const Value.absent(), + }) => VoiceMessagesCompanion.insert( + id: id, + messageId: messageId, + sessionId: sessionId, + filePath: filePath, + duration: duration, + waveformJson: waveformJson, + isRemote: isRemote, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$VoiceMessagesTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $VoiceMessagesTable, - VoiceMessage, - $$VoiceMessagesTableFilterComposer, - $$VoiceMessagesTableOrderingComposer, - $$VoiceMessagesTableAnnotationComposer, - $$VoiceMessagesTableCreateCompanionBuilder, - $$VoiceMessagesTableUpdateCompanionBuilder, - ( +typedef $$VoiceMessagesTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $VoiceMessagesTable, VoiceMessage, - BaseReferences<_$AppDatabase, $VoiceMessagesTable, VoiceMessage> - ), - VoiceMessage, - PrefetchHooks Function()>; -typedef $$FortuneRecordsTableCreateCompanionBuilder = FortuneRecordsCompanion - Function({ - Value id, - required String date, - Value uid, - Value fortuneLevel, - Value fortuneScore, - Value signText, - Value dimensionsJson, - Value luckyJson, - Value suitableJson, - Value unsuitableJson, - Value theme, - Value isToday, - Value canRegenerate, - Value regenCount, - Value imageUrl, - Value huangliJson, - Value note, - Value isEdited, - required DateTime createdAt, - required DateTime updatedAt, -}); -typedef $$FortuneRecordsTableUpdateCompanionBuilder = FortuneRecordsCompanion - Function({ - Value id, - Value date, - Value uid, - Value fortuneLevel, - Value fortuneScore, - Value signText, - Value dimensionsJson, - Value luckyJson, - Value suitableJson, - Value unsuitableJson, - Value theme, - Value isToday, - Value canRegenerate, - Value regenCount, - Value imageUrl, - Value huangliJson, - Value note, - Value isEdited, - Value createdAt, - Value updatedAt, -}); + $$VoiceMessagesTableFilterComposer, + $$VoiceMessagesTableOrderingComposer, + $$VoiceMessagesTableAnnotationComposer, + $$VoiceMessagesTableCreateCompanionBuilder, + $$VoiceMessagesTableUpdateCompanionBuilder, + ( + VoiceMessage, + BaseReferences<_$AppDatabase, $VoiceMessagesTable, VoiceMessage>, + ), + VoiceMessage, + PrefetchHooks Function() + >; +typedef $$FortuneRecordsTableCreateCompanionBuilder = + FortuneRecordsCompanion Function({ + Value id, + required String date, + Value uid, + Value fortuneLevel, + Value fortuneScore, + Value signText, + Value dimensionsJson, + Value luckyJson, + Value suitableJson, + Value unsuitableJson, + Value theme, + Value isToday, + Value canRegenerate, + Value regenCount, + Value imageUrl, + Value huangliJson, + Value note, + Value isEdited, + required DateTime createdAt, + required DateTime updatedAt, + }); +typedef $$FortuneRecordsTableUpdateCompanionBuilder = + FortuneRecordsCompanion Function({ + Value id, + Value date, + Value uid, + Value fortuneLevel, + Value fortuneScore, + Value signText, + Value dimensionsJson, + Value luckyJson, + Value suitableJson, + Value unsuitableJson, + Value theme, + Value isToday, + Value canRegenerate, + Value regenCount, + Value imageUrl, + Value huangliJson, + Value note, + Value isEdited, + Value createdAt, + Value updatedAt, + }); class $$FortuneRecordsTableFilterComposer extends Composer<_$AppDatabase, $FortuneRecordsTable> { @@ -22097,66 +26552,104 @@ class $$FortuneRecordsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get date => $composableBuilder( - column: $table.date, builder: (column) => ColumnFilters(column)); + column: $table.date, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get uid => $composableBuilder( - column: $table.uid, builder: (column) => ColumnFilters(column)); + column: $table.uid, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fortuneLevel => $composableBuilder( - column: $table.fortuneLevel, builder: (column) => ColumnFilters(column)); + column: $table.fortuneLevel, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get fortuneScore => $composableBuilder( - column: $table.fortuneScore, builder: (column) => ColumnFilters(column)); + column: $table.fortuneScore, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get signText => $composableBuilder( - column: $table.signText, builder: (column) => ColumnFilters(column)); + column: $table.signText, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get dimensionsJson => $composableBuilder( - column: $table.dimensionsJson, - builder: (column) => ColumnFilters(column)); + column: $table.dimensionsJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get luckyJson => $composableBuilder( - column: $table.luckyJson, builder: (column) => ColumnFilters(column)); + column: $table.luckyJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get suitableJson => $composableBuilder( - column: $table.suitableJson, builder: (column) => ColumnFilters(column)); + column: $table.suitableJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get unsuitableJson => $composableBuilder( - column: $table.unsuitableJson, - builder: (column) => ColumnFilters(column)); + column: $table.unsuitableJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get theme => $composableBuilder( - column: $table.theme, builder: (column) => ColumnFilters(column)); + column: $table.theme, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isToday => $composableBuilder( - column: $table.isToday, builder: (column) => ColumnFilters(column)); + column: $table.isToday, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get canRegenerate => $composableBuilder( - column: $table.canRegenerate, builder: (column) => ColumnFilters(column)); + column: $table.canRegenerate, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get regenCount => $composableBuilder( - column: $table.regenCount, builder: (column) => ColumnFilters(column)); + column: $table.regenCount, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get imageUrl => $composableBuilder( - column: $table.imageUrl, builder: (column) => ColumnFilters(column)); + column: $table.imageUrl, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get huangliJson => $composableBuilder( - column: $table.huangliJson, builder: (column) => ColumnFilters(column)); + column: $table.huangliJson, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get note => $composableBuilder( - column: $table.note, builder: (column) => ColumnFilters(column)); + column: $table.note, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get isEdited => $composableBuilder( - column: $table.isEdited, builder: (column) => ColumnFilters(column)); + column: $table.isEdited, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnFilters(column)); + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnFilters(column)); + column: $table.updatedAt, + builder: (column) => ColumnFilters(column), + ); } class $$FortuneRecordsTableOrderingComposer @@ -22169,70 +26662,104 @@ class $$FortuneRecordsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get date => $composableBuilder( - column: $table.date, builder: (column) => ColumnOrderings(column)); + column: $table.date, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get uid => $composableBuilder( - column: $table.uid, builder: (column) => ColumnOrderings(column)); + column: $table.uid, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fortuneLevel => $composableBuilder( - column: $table.fortuneLevel, - builder: (column) => ColumnOrderings(column)); + column: $table.fortuneLevel, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get fortuneScore => $composableBuilder( - column: $table.fortuneScore, - builder: (column) => ColumnOrderings(column)); + column: $table.fortuneScore, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get signText => $composableBuilder( - column: $table.signText, builder: (column) => ColumnOrderings(column)); + column: $table.signText, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get dimensionsJson => $composableBuilder( - column: $table.dimensionsJson, - builder: (column) => ColumnOrderings(column)); + column: $table.dimensionsJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get luckyJson => $composableBuilder( - column: $table.luckyJson, builder: (column) => ColumnOrderings(column)); + column: $table.luckyJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get suitableJson => $composableBuilder( - column: $table.suitableJson, - builder: (column) => ColumnOrderings(column)); + column: $table.suitableJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get unsuitableJson => $composableBuilder( - column: $table.unsuitableJson, - builder: (column) => ColumnOrderings(column)); + column: $table.unsuitableJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get theme => $composableBuilder( - column: $table.theme, builder: (column) => ColumnOrderings(column)); + column: $table.theme, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isToday => $composableBuilder( - column: $table.isToday, builder: (column) => ColumnOrderings(column)); + column: $table.isToday, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get canRegenerate => $composableBuilder( - column: $table.canRegenerate, - builder: (column) => ColumnOrderings(column)); + column: $table.canRegenerate, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get regenCount => $composableBuilder( - column: $table.regenCount, builder: (column) => ColumnOrderings(column)); + column: $table.regenCount, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get imageUrl => $composableBuilder( - column: $table.imageUrl, builder: (column) => ColumnOrderings(column)); + column: $table.imageUrl, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get huangliJson => $composableBuilder( - column: $table.huangliJson, builder: (column) => ColumnOrderings(column)); + column: $table.huangliJson, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get note => $composableBuilder( - column: $table.note, builder: (column) => ColumnOrderings(column)); + column: $table.note, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get isEdited => $composableBuilder( - column: $table.isEdited, builder: (column) => ColumnOrderings(column)); + column: $table.isEdited, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get createdAt => $composableBuilder( - column: $table.createdAt, builder: (column) => ColumnOrderings(column)); + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get updatedAt => $composableBuilder( - column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); + column: $table.updatedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$FortuneRecordsTableAnnotationComposer @@ -22254,25 +26781,35 @@ class $$FortuneRecordsTableAnnotationComposer $composableBuilder(column: $table.uid, builder: (column) => column); GeneratedColumn get fortuneLevel => $composableBuilder( - column: $table.fortuneLevel, builder: (column) => column); + column: $table.fortuneLevel, + builder: (column) => column, + ); GeneratedColumn get fortuneScore => $composableBuilder( - column: $table.fortuneScore, builder: (column) => column); + column: $table.fortuneScore, + builder: (column) => column, + ); GeneratedColumn get signText => $composableBuilder(column: $table.signText, builder: (column) => column); GeneratedColumn get dimensionsJson => $composableBuilder( - column: $table.dimensionsJson, builder: (column) => column); + column: $table.dimensionsJson, + builder: (column) => column, + ); GeneratedColumn get luckyJson => $composableBuilder(column: $table.luckyJson, builder: (column) => column); GeneratedColumn get suitableJson => $composableBuilder( - column: $table.suitableJson, builder: (column) => column); + column: $table.suitableJson, + builder: (column) => column, + ); GeneratedColumn get unsuitableJson => $composableBuilder( - column: $table.unsuitableJson, builder: (column) => column); + column: $table.unsuitableJson, + builder: (column) => column, + ); GeneratedColumn get theme => $composableBuilder(column: $table.theme, builder: (column) => column); @@ -22281,16 +26818,22 @@ class $$FortuneRecordsTableAnnotationComposer $composableBuilder(column: $table.isToday, builder: (column) => column); GeneratedColumn get canRegenerate => $composableBuilder( - column: $table.canRegenerate, builder: (column) => column); + column: $table.canRegenerate, + builder: (column) => column, + ); GeneratedColumn get regenCount => $composableBuilder( - column: $table.regenCount, builder: (column) => column); + column: $table.regenCount, + builder: (column) => column, + ); GeneratedColumn get imageUrl => $composableBuilder(column: $table.imageUrl, builder: (column) => column); GeneratedColumn get huangliJson => $composableBuilder( - column: $table.huangliJson, builder: (column) => column); + column: $table.huangliJson, + builder: (column) => column, + ); GeneratedColumn get note => $composableBuilder(column: $table.note, builder: (column) => column); @@ -22305,24 +26848,29 @@ class $$FortuneRecordsTableAnnotationComposer $composableBuilder(column: $table.updatedAt, builder: (column) => column); } -class $$FortuneRecordsTableTableManager extends RootTableManager< - _$AppDatabase, - $FortuneRecordsTable, - FortuneRecord, - $$FortuneRecordsTableFilterComposer, - $$FortuneRecordsTableOrderingComposer, - $$FortuneRecordsTableAnnotationComposer, - $$FortuneRecordsTableCreateCompanionBuilder, - $$FortuneRecordsTableUpdateCompanionBuilder, - ( - FortuneRecord, - BaseReferences<_$AppDatabase, $FortuneRecordsTable, FortuneRecord> - ), - FortuneRecord, - PrefetchHooks Function()> { +class $$FortuneRecordsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $FortuneRecordsTable, + FortuneRecord, + $$FortuneRecordsTableFilterComposer, + $$FortuneRecordsTableOrderingComposer, + $$FortuneRecordsTableAnnotationComposer, + $$FortuneRecordsTableCreateCompanionBuilder, + $$FortuneRecordsTableUpdateCompanionBuilder, + ( + FortuneRecord, + BaseReferences<_$AppDatabase, $FortuneRecordsTable, FortuneRecord>, + ), + FortuneRecord, + PrefetchHooks Function() + > { $$FortuneRecordsTableTableManager( - _$AppDatabase db, $FortuneRecordsTable table) - : super(TableManagerState( + _$AppDatabase db, + $FortuneRecordsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -22331,126 +26879,129 @@ class $$FortuneRecordsTableTableManager extends RootTableManager< $$FortuneRecordsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$FortuneRecordsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value date = const Value.absent(), - Value uid = const Value.absent(), - Value fortuneLevel = const Value.absent(), - Value fortuneScore = const Value.absent(), - Value signText = const Value.absent(), - Value dimensionsJson = const Value.absent(), - Value luckyJson = const Value.absent(), - Value suitableJson = const Value.absent(), - Value unsuitableJson = const Value.absent(), - Value theme = const Value.absent(), - Value isToday = const Value.absent(), - Value canRegenerate = const Value.absent(), - Value regenCount = const Value.absent(), - Value imageUrl = const Value.absent(), - Value huangliJson = const Value.absent(), - Value note = const Value.absent(), - Value isEdited = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), - }) => - FortuneRecordsCompanion( - id: id, - date: date, - uid: uid, - fortuneLevel: fortuneLevel, - fortuneScore: fortuneScore, - signText: signText, - dimensionsJson: dimensionsJson, - luckyJson: luckyJson, - suitableJson: suitableJson, - unsuitableJson: unsuitableJson, - theme: theme, - isToday: isToday, - canRegenerate: canRegenerate, - regenCount: regenCount, - imageUrl: imageUrl, - huangliJson: huangliJson, - note: note, - isEdited: isEdited, - createdAt: createdAt, - updatedAt: updatedAt, - ), - createCompanionCallback: ({ - Value id = const Value.absent(), - required String date, - Value uid = const Value.absent(), - Value fortuneLevel = const Value.absent(), - Value fortuneScore = const Value.absent(), - Value signText = const Value.absent(), - Value dimensionsJson = const Value.absent(), - Value luckyJson = const Value.absent(), - Value suitableJson = const Value.absent(), - Value unsuitableJson = const Value.absent(), - Value theme = const Value.absent(), - Value isToday = const Value.absent(), - Value canRegenerate = const Value.absent(), - Value regenCount = const Value.absent(), - Value imageUrl = const Value.absent(), - Value huangliJson = const Value.absent(), - Value note = const Value.absent(), - Value isEdited = const Value.absent(), - required DateTime createdAt, - required DateTime updatedAt, - }) => - FortuneRecordsCompanion.insert( - id: id, - date: date, - uid: uid, - fortuneLevel: fortuneLevel, - fortuneScore: fortuneScore, - signText: signText, - dimensionsJson: dimensionsJson, - luckyJson: luckyJson, - suitableJson: suitableJson, - unsuitableJson: unsuitableJson, - theme: theme, - isToday: isToday, - canRegenerate: canRegenerate, - regenCount: regenCount, - imageUrl: imageUrl, - huangliJson: huangliJson, - note: note, - isEdited: isEdited, - createdAt: createdAt, - updatedAt: updatedAt, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value date = const Value.absent(), + Value uid = const Value.absent(), + Value fortuneLevel = const Value.absent(), + Value fortuneScore = const Value.absent(), + Value signText = const Value.absent(), + Value dimensionsJson = const Value.absent(), + Value luckyJson = const Value.absent(), + Value suitableJson = const Value.absent(), + Value unsuitableJson = const Value.absent(), + Value theme = const Value.absent(), + Value isToday = const Value.absent(), + Value canRegenerate = const Value.absent(), + Value regenCount = const Value.absent(), + Value imageUrl = const Value.absent(), + Value huangliJson = const Value.absent(), + Value note = const Value.absent(), + Value isEdited = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), + }) => FortuneRecordsCompanion( + id: id, + date: date, + uid: uid, + fortuneLevel: fortuneLevel, + fortuneScore: fortuneScore, + signText: signText, + dimensionsJson: dimensionsJson, + luckyJson: luckyJson, + suitableJson: suitableJson, + unsuitableJson: unsuitableJson, + theme: theme, + isToday: isToday, + canRegenerate: canRegenerate, + regenCount: regenCount, + imageUrl: imageUrl, + huangliJson: huangliJson, + note: note, + isEdited: isEdited, + createdAt: createdAt, + updatedAt: updatedAt, + ), + createCompanionCallback: + ({ + Value id = const Value.absent(), + required String date, + Value uid = const Value.absent(), + Value fortuneLevel = const Value.absent(), + Value fortuneScore = const Value.absent(), + Value signText = const Value.absent(), + Value dimensionsJson = const Value.absent(), + Value luckyJson = const Value.absent(), + Value suitableJson = const Value.absent(), + Value unsuitableJson = const Value.absent(), + Value theme = const Value.absent(), + Value isToday = const Value.absent(), + Value canRegenerate = const Value.absent(), + Value regenCount = const Value.absent(), + Value imageUrl = const Value.absent(), + Value huangliJson = const Value.absent(), + Value note = const Value.absent(), + Value isEdited = const Value.absent(), + required DateTime createdAt, + required DateTime updatedAt, + }) => FortuneRecordsCompanion.insert( + id: id, + date: date, + uid: uid, + fortuneLevel: fortuneLevel, + fortuneScore: fortuneScore, + signText: signText, + dimensionsJson: dimensionsJson, + luckyJson: luckyJson, + suitableJson: suitableJson, + unsuitableJson: unsuitableJson, + theme: theme, + isToday: isToday, + canRegenerate: canRegenerate, + regenCount: regenCount, + imageUrl: imageUrl, + huangliJson: huangliJson, + note: note, + isEdited: isEdited, + createdAt: createdAt, + updatedAt: updatedAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$FortuneRecordsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $FortuneRecordsTable, - FortuneRecord, - $$FortuneRecordsTableFilterComposer, - $$FortuneRecordsTableOrderingComposer, - $$FortuneRecordsTableAnnotationComposer, - $$FortuneRecordsTableCreateCompanionBuilder, - $$FortuneRecordsTableUpdateCompanionBuilder, - ( +typedef $$FortuneRecordsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $FortuneRecordsTable, FortuneRecord, - BaseReferences<_$AppDatabase, $FortuneRecordsTable, FortuneRecord> - ), - FortuneRecord, - PrefetchHooks Function()>; -typedef $$SchemaMigrationsTableCreateCompanionBuilder - = SchemaMigrationsCompanion Function({ - Value version, - required DateTime executedAt, -}); -typedef $$SchemaMigrationsTableUpdateCompanionBuilder - = SchemaMigrationsCompanion Function({ - Value version, - Value executedAt, -}); + $$FortuneRecordsTableFilterComposer, + $$FortuneRecordsTableOrderingComposer, + $$FortuneRecordsTableAnnotationComposer, + $$FortuneRecordsTableCreateCompanionBuilder, + $$FortuneRecordsTableUpdateCompanionBuilder, + ( + FortuneRecord, + BaseReferences<_$AppDatabase, $FortuneRecordsTable, FortuneRecord>, + ), + FortuneRecord, + PrefetchHooks Function() + >; +typedef $$SchemaMigrationsTableCreateCompanionBuilder = + SchemaMigrationsCompanion Function({ + Value version, + required DateTime executedAt, + }); +typedef $$SchemaMigrationsTableUpdateCompanionBuilder = + SchemaMigrationsCompanion Function({ + Value version, + Value executedAt, + }); class $$SchemaMigrationsTableFilterComposer extends Composer<_$AppDatabase, $SchemaMigrationsTable> { @@ -22462,10 +27013,14 @@ class $$SchemaMigrationsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get version => $composableBuilder( - column: $table.version, builder: (column) => ColumnFilters(column)); + column: $table.version, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get executedAt => $composableBuilder( - column: $table.executedAt, builder: (column) => ColumnFilters(column)); + column: $table.executedAt, + builder: (column) => ColumnFilters(column), + ); } class $$SchemaMigrationsTableOrderingComposer @@ -22478,10 +27033,14 @@ class $$SchemaMigrationsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get version => $composableBuilder( - column: $table.version, builder: (column) => ColumnOrderings(column)); + column: $table.version, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get executedAt => $composableBuilder( - column: $table.executedAt, builder: (column) => ColumnOrderings(column)); + column: $table.executedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$SchemaMigrationsTableAnnotationComposer @@ -22497,27 +27056,38 @@ class $$SchemaMigrationsTableAnnotationComposer $composableBuilder(column: $table.version, builder: (column) => column); GeneratedColumn get executedAt => $composableBuilder( - column: $table.executedAt, builder: (column) => column); + column: $table.executedAt, + builder: (column) => column, + ); } -class $$SchemaMigrationsTableTableManager extends RootTableManager< - _$AppDatabase, - $SchemaMigrationsTable, - SchemaMigration, - $$SchemaMigrationsTableFilterComposer, - $$SchemaMigrationsTableOrderingComposer, - $$SchemaMigrationsTableAnnotationComposer, - $$SchemaMigrationsTableCreateCompanionBuilder, - $$SchemaMigrationsTableUpdateCompanionBuilder, - ( - SchemaMigration, - BaseReferences<_$AppDatabase, $SchemaMigrationsTable, SchemaMigration> - ), - SchemaMigration, - PrefetchHooks Function()> { +class $$SchemaMigrationsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $SchemaMigrationsTable, + SchemaMigration, + $$SchemaMigrationsTableFilterComposer, + $$SchemaMigrationsTableOrderingComposer, + $$SchemaMigrationsTableAnnotationComposer, + $$SchemaMigrationsTableCreateCompanionBuilder, + $$SchemaMigrationsTableUpdateCompanionBuilder, + ( + SchemaMigration, + BaseReferences< + _$AppDatabase, + $SchemaMigrationsTable, + SchemaMigration + >, + ), + SchemaMigration, + PrefetchHooks Function() + > { $$SchemaMigrationsTableTableManager( - _$AppDatabase db, $SchemaMigrationsTable table) - : super(TableManagerState( + _$AppDatabase db, + $SchemaMigrationsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -22526,60 +27096,63 @@ class $$SchemaMigrationsTableTableManager extends RootTableManager< $$SchemaMigrationsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$SchemaMigrationsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value version = const Value.absent(), - Value executedAt = const Value.absent(), - }) => - SchemaMigrationsCompanion( - version: version, - executedAt: executedAt, - ), - createCompanionCallback: ({ - Value version = const Value.absent(), - required DateTime executedAt, - }) => - SchemaMigrationsCompanion.insert( - version: version, - executedAt: executedAt, - ), + updateCompanionCallback: + ({ + Value version = const Value.absent(), + Value executedAt = const Value.absent(), + }) => SchemaMigrationsCompanion( + version: version, + executedAt: executedAt, + ), + createCompanionCallback: + ({ + Value version = const Value.absent(), + required DateTime executedAt, + }) => SchemaMigrationsCompanion.insert( + version: version, + executedAt: executedAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$SchemaMigrationsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $SchemaMigrationsTable, - SchemaMigration, - $$SchemaMigrationsTableFilterComposer, - $$SchemaMigrationsTableOrderingComposer, - $$SchemaMigrationsTableAnnotationComposer, - $$SchemaMigrationsTableCreateCompanionBuilder, - $$SchemaMigrationsTableUpdateCompanionBuilder, - ( +typedef $$SchemaMigrationsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $SchemaMigrationsTable, SchemaMigration, - BaseReferences<_$AppDatabase, $SchemaMigrationsTable, SchemaMigration> - ), - SchemaMigration, - PrefetchHooks Function()>; -typedef $$MigrationErrorsTableCreateCompanionBuilder = MigrationErrorsCompanion - Function({ - Value id, - required int version, - required String errorMessage, - required String errorStack, - required DateTime failedAt, -}); -typedef $$MigrationErrorsTableUpdateCompanionBuilder = MigrationErrorsCompanion - Function({ - Value id, - Value version, - Value errorMessage, - Value errorStack, - Value failedAt, -}); + $$SchemaMigrationsTableFilterComposer, + $$SchemaMigrationsTableOrderingComposer, + $$SchemaMigrationsTableAnnotationComposer, + $$SchemaMigrationsTableCreateCompanionBuilder, + $$SchemaMigrationsTableUpdateCompanionBuilder, + ( + SchemaMigration, + BaseReferences<_$AppDatabase, $SchemaMigrationsTable, SchemaMigration>, + ), + SchemaMigration, + PrefetchHooks Function() + >; +typedef $$MigrationErrorsTableCreateCompanionBuilder = + MigrationErrorsCompanion Function({ + Value id, + required int version, + required String errorMessage, + required String errorStack, + required DateTime failedAt, + }); +typedef $$MigrationErrorsTableUpdateCompanionBuilder = + MigrationErrorsCompanion Function({ + Value id, + Value version, + Value errorMessage, + Value errorStack, + Value failedAt, + }); class $$MigrationErrorsTableFilterComposer extends Composer<_$AppDatabase, $MigrationErrorsTable> { @@ -22591,19 +27164,29 @@ class $$MigrationErrorsTableFilterComposer super.$removeJoinBuilderFromRootComposer, }); ColumnFilters get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnFilters(column)); + column: $table.id, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get version => $composableBuilder( - column: $table.version, builder: (column) => ColumnFilters(column)); + column: $table.version, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get errorMessage => $composableBuilder( - column: $table.errorMessage, builder: (column) => ColumnFilters(column)); + column: $table.errorMessage, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get errorStack => $composableBuilder( - column: $table.errorStack, builder: (column) => ColumnFilters(column)); + column: $table.errorStack, + builder: (column) => ColumnFilters(column), + ); ColumnFilters get failedAt => $composableBuilder( - column: $table.failedAt, builder: (column) => ColumnFilters(column)); + column: $table.failedAt, + builder: (column) => ColumnFilters(column), + ); } class $$MigrationErrorsTableOrderingComposer @@ -22616,20 +27199,29 @@ class $$MigrationErrorsTableOrderingComposer super.$removeJoinBuilderFromRootComposer, }); ColumnOrderings get id => $composableBuilder( - column: $table.id, builder: (column) => ColumnOrderings(column)); + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get version => $composableBuilder( - column: $table.version, builder: (column) => ColumnOrderings(column)); + column: $table.version, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get errorMessage => $composableBuilder( - column: $table.errorMessage, - builder: (column) => ColumnOrderings(column)); + column: $table.errorMessage, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get errorStack => $composableBuilder( - column: $table.errorStack, builder: (column) => ColumnOrderings(column)); + column: $table.errorStack, + builder: (column) => ColumnOrderings(column), + ); ColumnOrderings get failedAt => $composableBuilder( - column: $table.failedAt, builder: (column) => ColumnOrderings(column)); + column: $table.failedAt, + builder: (column) => ColumnOrderings(column), + ); } class $$MigrationErrorsTableAnnotationComposer @@ -22648,33 +27240,46 @@ class $$MigrationErrorsTableAnnotationComposer $composableBuilder(column: $table.version, builder: (column) => column); GeneratedColumn get errorMessage => $composableBuilder( - column: $table.errorMessage, builder: (column) => column); + column: $table.errorMessage, + builder: (column) => column, + ); GeneratedColumn get errorStack => $composableBuilder( - column: $table.errorStack, builder: (column) => column); + column: $table.errorStack, + builder: (column) => column, + ); GeneratedColumn get failedAt => $composableBuilder(column: $table.failedAt, builder: (column) => column); } -class $$MigrationErrorsTableTableManager extends RootTableManager< - _$AppDatabase, - $MigrationErrorsTable, - MigrationError, - $$MigrationErrorsTableFilterComposer, - $$MigrationErrorsTableOrderingComposer, - $$MigrationErrorsTableAnnotationComposer, - $$MigrationErrorsTableCreateCompanionBuilder, - $$MigrationErrorsTableUpdateCompanionBuilder, - ( - MigrationError, - BaseReferences<_$AppDatabase, $MigrationErrorsTable, MigrationError> - ), - MigrationError, - PrefetchHooks Function()> { +class $$MigrationErrorsTableTableManager + extends + RootTableManager< + _$AppDatabase, + $MigrationErrorsTable, + MigrationError, + $$MigrationErrorsTableFilterComposer, + $$MigrationErrorsTableOrderingComposer, + $$MigrationErrorsTableAnnotationComposer, + $$MigrationErrorsTableCreateCompanionBuilder, + $$MigrationErrorsTableUpdateCompanionBuilder, + ( + MigrationError, + BaseReferences< + _$AppDatabase, + $MigrationErrorsTable, + MigrationError + >, + ), + MigrationError, + PrefetchHooks Function() + > { $$MigrationErrorsTableTableManager( - _$AppDatabase db, $MigrationErrorsTable table) - : super(TableManagerState( + _$AppDatabase db, + $MigrationErrorsTable table, + ) : super( + TableManagerState( db: db, table: table, createFilteringComposer: () => @@ -22683,56 +27288,59 @@ class $$MigrationErrorsTableTableManager extends RootTableManager< $$MigrationErrorsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => $$MigrationErrorsTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: ({ - Value id = const Value.absent(), - Value version = const Value.absent(), - Value errorMessage = const Value.absent(), - Value errorStack = const Value.absent(), - Value failedAt = const Value.absent(), - }) => - MigrationErrorsCompanion( - id: id, - version: version, - errorMessage: errorMessage, - errorStack: errorStack, - failedAt: failedAt, - ), - createCompanionCallback: ({ - Value id = const Value.absent(), - required int version, - required String errorMessage, - required String errorStack, - required DateTime failedAt, - }) => - MigrationErrorsCompanion.insert( - id: id, - version: version, - errorMessage: errorMessage, - errorStack: errorStack, - failedAt: failedAt, - ), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value version = const Value.absent(), + Value errorMessage = const Value.absent(), + Value errorStack = const Value.absent(), + Value failedAt = const Value.absent(), + }) => MigrationErrorsCompanion( + id: id, + version: version, + errorMessage: errorMessage, + errorStack: errorStack, + failedAt: failedAt, + ), + createCompanionCallback: + ({ + Value id = const Value.absent(), + required int version, + required String errorMessage, + required String errorStack, + required DateTime failedAt, + }) => MigrationErrorsCompanion.insert( + id: id, + version: version, + errorMessage: errorMessage, + errorStack: errorStack, + failedAt: failedAt, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), prefetchHooksCallback: null, - )); + ), + ); } -typedef $$MigrationErrorsTableProcessedTableManager = ProcessedTableManager< - _$AppDatabase, - $MigrationErrorsTable, - MigrationError, - $$MigrationErrorsTableFilterComposer, - $$MigrationErrorsTableOrderingComposer, - $$MigrationErrorsTableAnnotationComposer, - $$MigrationErrorsTableCreateCompanionBuilder, - $$MigrationErrorsTableUpdateCompanionBuilder, - ( +typedef $$MigrationErrorsTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $MigrationErrorsTable, MigrationError, - BaseReferences<_$AppDatabase, $MigrationErrorsTable, MigrationError> - ), - MigrationError, - PrefetchHooks Function()>; + $$MigrationErrorsTableFilterComposer, + $$MigrationErrorsTableOrderingComposer, + $$MigrationErrorsTableAnnotationComposer, + $$MigrationErrorsTableCreateCompanionBuilder, + $$MigrationErrorsTableUpdateCompanionBuilder, + ( + MigrationError, + BaseReferences<_$AppDatabase, $MigrationErrorsTable, MigrationError>, + ), + MigrationError, + PrefetchHooks Function() + >; class $AppDatabaseManager { final _$AppDatabase _db; diff --git a/lib/core/utils/isolate_stub.dart b/lib/core/utils/isolate_stub.dart new file mode 100644 index 00000000..31491ff1 --- /dev/null +++ b/lib/core/utils/isolate_stub.dart @@ -0,0 +1,24 @@ +/// ============================================================ +/// 闲言APP — Isolate Web Stub +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: Web端dart:isolate不可用，提供空实现 +/// 上次更新: 初始创建，提供Isolate/RawReceivePort空实现 +/// ============================================================ + +class Isolate { + static _IsolateCurrent get current => _IsolateCurrent(); +} + +class _IsolateCurrent { + void addErrorListener(Object port) {} +} + +class RawReceivePort { + RawReceivePort([Function? handler]); + SendPort get sendPort => SendPort(); +} + +class SendPort { + void send(Object? message) {} +} diff --git a/lib/core/utils/path_provider_native.dart b/lib/core/utils/path_provider_native.dart new file mode 100644 index 00000000..980a5756 --- /dev/null +++ b/lib/core/utils/path_provider_native.dart @@ -0,0 +1,25 @@ +/// ============================================================ +/// 闲言APP — path_provider 原生实现 +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: 原生平台使用path_provider获取目录路径 +/// 上次更新: 初始创建 +/// ============================================================ + +import 'package:path_provider/path_provider.dart'; + +Future getAppDirPathImpl() async { + try { + return (await getApplicationDocumentsDirectory()).path; + } catch (_) { + return null; + } +} + +Future getTempDirPathImpl() async { + try { + return (await getTemporaryDirectory()).path; + } catch (_) { + return null; + } +} diff --git a/lib/core/utils/path_provider_stub.dart b/lib/core/utils/path_provider_stub.dart new file mode 100644 index 00000000..407feef8 --- /dev/null +++ b/lib/core/utils/path_provider_stub.dart @@ -0,0 +1,11 @@ +/// ============================================================ +/// 闲言APP — path_provider Web Stub +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: Web端path_provider不可用，提供空实现返回null +/// 上次更新: 初始创建 +/// ============================================================ + +Future getAppDirPathImpl() async => null; + +Future getTempDirPathImpl() async => null; diff --git a/lib/core/utils/platform_utils.dart b/lib/core/utils/platform_utils.dart index b298cd0b..4f1cc182 100644 --- a/lib/core/utils/platform_utils.dart +++ b/lib/core/utils/platform_utils.dart @@ -1,13 +1,15 @@ /// ============================================================ /// 闲言APP — 平台工具类 /// 创建时间: 2026-04-25 -/// 更新时间: 2026-05-18 +/// 更新时间: 2026-05-20 /// 作用: 封装平台相关操作，隔离dart:io/dart:html，支持鸿蒙 -/// 上次更新: 增加鸿蒙端设备特性检测(毛玻璃/动画/折叠屏) +/// 上次更新: 增加safeGetAppDir/safeGetTempDir安全路径获取(Web端返回null) /// ============================================================ import 'package:flutter/widgets.dart'; import 'platform_io_stub.dart' if (dart.library.io) 'platform_io_native.dart'; +import 'path_provider_stub.dart' + if (dart.library.io) 'path_provider_native.dart'; bool get isWeb => isWebImpl; bool get isOhos => isOhosImpl; @@ -23,6 +25,12 @@ bool get supportsFilesystem => supportsFilesystemImpl; bool get supportsGPU3D => supportsGPU3DImpl; bool get supportsWebView3D => supportsWebView3DImpl; +/// 安全获取应用文档目录路径(Web端返回null) +Future get safeAppDirPath => getAppDirPathImpl(); + +/// 安全获取临时目录路径(Web端返回null) +Future get safeTempDirPath => getTempDirPathImpl(); + /// 鸿蒙端设备特性检测 class OhosDeviceCapabilities { OhosDeviceCapabilities._(); diff --git a/lib/editor/pages/editor/pro_editor_page.dart b/lib/editor/pages/editor/pro_editor_page.dart index 9c519976..f1ae281b 100644 --- a/lib/editor/pages/editor/pro_editor_page.dart +++ b/lib/editor/pages/editor/pro_editor_page.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — ProImageEditor 包装页 // 创建时间: 2026-04-23 -// 更新时间: 2026-05-05 +// 更新时间: 2026-05-20 // 作用: ProImageEditor 的闲言APP包装页，全新iOS 26风格 -// 上次更新: 修复描边坐标偏移(globalToLocal两步转换)+文本编辑器用selectedLayerNotifier回退取TextLayer +// 上次更新: 画布背景改透明+ColoredBox提供背景色，配合CanvasStyleMiddleware裁剪修复 // ============================================================ import 'dart:convert'; @@ -15,6 +15,7 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:pro_image_editor/pro_image_editor.dart' as pro; import 'package:xianyan/core/router/editor_router.dart'; +import 'package:xianyan/editor/services/core/canvas_style_middleware.dart'; import 'package:xianyan/editor/services/core/pro_editor_bridge.dart'; import 'package:xianyan/editor/services/core/editor_theme_notifier.dart'; import 'package:xianyan/editor/widgets/controls/editor_system_ui.dart'; @@ -365,6 +366,8 @@ class ProEditorPageState extends State } } + String? latestDeltaJson; + showCupertinoModalPopup( context: context, builder: (_) => SizedBox( @@ -373,8 +376,45 @@ class ProEditorPageState extends State initialDeltaJson: initialDeltaJson, onDone: () { Navigator.pop(context); + + final deltaJson = latestDeltaJson; + if (deltaJson == null || deltaJson.isEmpty) return; + + final editorState = _editorKey.currentState; + if (editorState == null) return; + + try { + final deltaOps = jsonDecode(deltaJson) as List; + final plainText = deltaOps + .whereType>() + .where((op) => op.containsKey('insert')) + .map((op) { + final v = op['insert']; + return v is String ? v : ''; + }) + .join() + .trim(); + if (plainText.isEmpty) return; + + if (textLayer != null) { + textLayer.text = plainText; + editorState.setState(() {}); + } else { + editorState.addLayer( + pro.TextLayer( + text: plainText, + color: const Color(0xFFFFFFFF), + background: Colors.transparent, + align: TextAlign.center, + offset: const Offset(0.5, 0.3), + ), + ); + } + } catch (_) {} }, onChanged: (deltaJson) { + latestDeltaJson = deltaJson; + if (textLayer == null) return; final editorState = _editorKey.currentState; if (editorState == null) return; @@ -434,10 +474,10 @@ class ProEditorPageState extends State final safeBottom = MediaQuery.of(context).viewPadding.bottom; final configs = ProEditorBridge.buildConfigs( context: context, - canvasStyle: _canvasStyle, bodyItemsBuilder: (editor, stream) => _buildMainBodyWidgets(editor, stream, safeTop, safeBottom), onCloseWarning: handleCloseWarning, + canvasBackground: Colors.transparent, ); return MediaQuery.removeViewPadding( @@ -453,94 +493,103 @@ class ProEditorPageState extends State padding: const EdgeInsets.all(8), child: RepaintBoundary( key: _repaintKey, - child: pro.ProImageEditor.memory( - widget.imageBytes, - key: _editorKey, - configs: configs, - callbacks: pro.ProImageEditorCallbacks( - onImageEditingComplete: onEditingComplete, - onCloseEditor: (mode) => Navigator.of(context).pop(), - mainEditorCallbacks: pro.MainEditorCallbacks( - onCreateTextLayer: - widget.initialText != null && - widget.initialText!.isNotEmpty - ? () async => pro.TextLayer( - text: widget.initialText!, - color: const Color(0xFFFFFFFF), - background: Colors.transparent, - align: TextAlign.center, - offset: const Offset(0.5, 0.3), - ) - : null, - onLayerTapUp: (layer) => _onLayerTapUp(layer), - onScaleStart: (_) { - if (!_isLayerDragging) { - setState(() => _isLayerDragging = true); - } - }, - onScaleUpdate: (details) { - final editorState = _editorKey.currentState; - final layer = editorState?.selectedLayer; - if (layer != null) { - final layerBox = - layer.key.currentContext?.findRenderObject() - as RenderBox?; - final overlayBox = - _overlayStackKey.currentContext - ?.findRenderObject() - as RenderBox?; - if (layerBox != null && - layerBox.hasSize && - overlayBox != null) { - final globalTopLeft = layerBox.localToGlobal( - Offset.zero, - ); - final globalBottomRight = layerBox.localToGlobal( - Offset( - layerBox.size.width, - layerBox.size.height, - ), - ); - final localTopLeft = overlayBox.globalToLocal( - globalTopLeft, - ); - final localBottomRight = overlayBox.globalToLocal( - globalBottomRight, - ); - final size = Size( - (localBottomRight.dx - localTopLeft.dx).abs(), - (localBottomRight.dy - localTopLeft.dy).abs(), - ); - setState(() { - _draggingLayerRect = localTopLeft & size; - }); - } - } - }, - onScaleEnd: (_) { - if (_isLayerDragging) { - setState(() { - _isLayerDragging = false; - _draggingLayerRect = null; - }); - } - }, - onLongPress: () { - EditorThemeNotifier.instance.toggleDarkLight(); - }, - onEditorZoomScaleStart: (_) { - if (!_isPinching) { - setState(() => _isPinching = true); - } - }, - onEditorZoomScaleEnd: (_) { - if (_isPinching) { - setState(() => _isPinching = false); - } - }, - onEditorZoomMatrix4Change: (matrix) { - _zoomScaleNotifier.value = matrix.getMaxScaleOnAxis(); - }, + child: CanvasStyleMiddleware( + style: _canvasStyle, + child: ColoredBox( + color: p.bgCanvas, + child: pro.ProImageEditor.memory( + widget.imageBytes, + key: _editorKey, + configs: configs, + callbacks: pro.ProImageEditorCallbacks( + onImageEditingComplete: onEditingComplete, + onCloseEditor: (mode) => Navigator.of(context).pop(), + mainEditorCallbacks: pro.MainEditorCallbacks( + onCreateTextLayer: + widget.initialText != null && + widget.initialText!.isNotEmpty + ? () async => pro.TextLayer( + text: widget.initialText!, + color: const Color(0xFFFFFFFF), + background: Colors.transparent, + align: TextAlign.center, + offset: const Offset(0.5, 0.3), + ) + : null, + onLayerTapUp: (layer) => _onLayerTapUp(layer), + onScaleStart: (_) { + if (!_isLayerDragging) { + setState(() => _isLayerDragging = true); + } + }, + onScaleUpdate: (details) { + final editorState = _editorKey.currentState; + final layer = editorState?.selectedLayer; + if (layer != null) { + final layerBox = + layer.key.currentContext?.findRenderObject() + as RenderBox?; + final overlayBox = + _overlayStackKey.currentContext + ?.findRenderObject() + as RenderBox?; + if (layerBox != null && + layerBox.hasSize && + overlayBox != null) { + final globalTopLeft = layerBox.localToGlobal( + Offset.zero, + ); + final globalBottomRight = layerBox + .localToGlobal( + Offset( + layerBox.size.width, + layerBox.size.height, + ), + ); + final localTopLeft = overlayBox.globalToLocal( + globalTopLeft, + ); + final localBottomRight = overlayBox + .globalToLocal(globalBottomRight); + final size = Size( + (localBottomRight.dx - localTopLeft.dx) + .abs(), + (localBottomRight.dy - localTopLeft.dy) + .abs(), + ); + setState(() { + _draggingLayerRect = localTopLeft & size; + }); + } + } + }, + onScaleEnd: (_) { + if (_isLayerDragging) { + setState(() { + _isLayerDragging = false; + _draggingLayerRect = null; + }); + } + }, + onLongPress: () { + EditorThemeNotifier.instance.toggleDarkLight(); + }, + onEditorZoomScaleStart: (_) { + if (!_isPinching) { + setState(() => _isPinching = true); + } + }, + onEditorZoomScaleEnd: (_) { + if (_isPinching) { + setState(() => _isPinching = false); + } + }, + onEditorZoomMatrix4Change: (matrix) { + _zoomScaleNotifier.value = matrix + .getMaxScaleOnAxis(); + }, + ), + ), ), ), ), diff --git a/lib/editor/services/core/canvas_style_middleware.dart b/lib/editor/services/core/canvas_style_middleware.dart new file mode 100644 index 00000000..647caca8 --- /dev/null +++ b/lib/editor/services/core/canvas_style_middleware.dart @@ -0,0 +1,200 @@ +// ============================================================ +// 闲言APP — 画布样式中间件 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 通过包裹ProImageEditor实现画布样式实时预览 +// 圆角/边框/阴影/叠层/外边距，无需魔改三方库 +// 上次更新: 重构渲染层级 — ClipRRect直接裁剪child，样式作用于画布本身 +// ============================================================ +// +// 设计原理: +// ProImageEditorState 没有 didUpdateWidget， +// 导致 wrapBody 回调在 configs 变更后不会更新。 +// 因此本中间件在父级直接包裹 ProImageEditor， +// 通过 setState 驱动重建，确保样式始终跟随 _canvasStyle。 +// +// 渲染层级 (从内到外): +// 1. child — ProImageEditor 编辑器本体 (背景已透明) +// 2. clipRadius — ClipRRect 圆角裁剪 (直接裁剪child) +// 3. border — 边框 (紧贴裁剪后的画布边缘) +// 4. shadow — BoxShadow 阴影 (基于裁剪后画布生成) +// 5. stackLayers — Stack 叠层卡片 +// 6. outerMargin — Padding 外边距 +// +// 关键: ProImageEditor 的 Scaffold 背景需设为透明， +// 画布背景色由外层 ColoredBox 提供， +// 这样 ClipRRect 才能正确裁剪整个画布内容。 +// +// 导出路径: +// 编辑时预览 → 本中间件 (实时渲染) +// 导出时后处理 → ExportService.applyCanvasStyle() (dart:ui 精确渲染) +// ============================================================ + +import 'package:dotted_border/dotted_border.dart'; +import 'package:flutter/material.dart'; + +import 'package:pro_image_editor/core/models/canvas_style_model.dart'; + +class CanvasStyleMiddleware extends StatelessWidget { + const CanvasStyleMiddleware({ + super.key, + required this.style, + required this.child, + }); + + final CanvasStyleModel style; + final Widget child; + + @override + Widget build(BuildContext context) { + final radius = style.borderRadius.clamp(0.0, 80.0); + final borderRad = BorderRadius.circular(radius); + + final hasAnyStyle = + radius > 0 || + style.hasBorder || + style.hasShadow || + style.hasStack || + (style.hasOuterMargin && style.outerMargin > 0); + + if (!hasAnyStyle) return child; + + Widget result = child; + + if (radius > 0) { + result = ClipRRect(borderRadius: borderRad, child: result); + } + + if (style.hasBorder) { + result = _buildBorder(result, borderRad); + } + + if (style.hasShadow) { + result = Container( + decoration: BoxDecoration( + borderRadius: borderRad, + boxShadow: [ + BoxShadow( + color: Colors.black.withValues(alpha: style.shadowOpacity), + blurRadius: style.shadowBlur, + spreadRadius: style.shadowSpread, + offset: Offset(style.shadowOffsetX, style.shadowOffsetY), + ), + ], + ), + child: result, + ); + } + + if (style.hasStack && style.stackLayers > 1) { + result = _buildStackLayers(result, borderRad); + } + + if (style.hasOuterMargin && style.outerMargin > 0) { + result = Padding( + padding: EdgeInsets.all(style.outerMargin), + child: result, + ); + } + + return result; + } + + Widget _buildStackLayers(Widget content, BorderRadius borderRad) { + final children = []; + + for (int i = style.stackLayers; i >= 1; i--) { + final offset = style.stackDistance * i; + final dx = _stackOffsetX(offset); + final dy = _stackOffsetY(offset); + + children.add( + Transform.translate( + offset: Offset(dx, dy), + child: Container( + decoration: BoxDecoration( + color: Colors.white.withValues(alpha: 0.15), + borderRadius: borderRad, + border: style.hasBorder + ? Border.all( + color: style.borderColor.withValues(alpha: 0.2), + width: style.borderWidth * 0.5, + ) + : null, + ), + ), + ), + ); + } + + children.add(content); + + return Stack( + alignment: style.stackPosition.alignment, + clipBehavior: Clip.none, + children: children, + ); + } + + double _stackOffsetX(double offset) { + final pos = style.stackPosition; + if (pos == CanvasStackPosition.left || + pos == CanvasStackPosition.topLeft || + pos == CanvasStackPosition.centerLeft || + pos == CanvasStackPosition.bottomLeft) { + return -offset; + } + if (pos == CanvasStackPosition.right || + pos == CanvasStackPosition.topRight || + pos == CanvasStackPosition.centerRight || + pos == CanvasStackPosition.bottomRight) { + return offset; + } + return 0.0; + } + + double _stackOffsetY(double offset) { + final pos = style.stackPosition; + if (pos == CanvasStackPosition.top || + pos == CanvasStackPosition.topLeft || + pos == CanvasStackPosition.topCenter || + pos == CanvasStackPosition.topRight) { + return -offset; + } + if (pos == CanvasStackPosition.bottom || + pos == CanvasStackPosition.bottomLeft || + pos == CanvasStackPosition.bottomCenter || + pos == CanvasStackPosition.bottomRight) { + return offset; + } + return 0.0; + } + + Widget _buildBorder(Widget content, BorderRadius borderRad) { + if (style.borderStyle == CanvasBorderStyle.dashed || + style.borderStyle == CanvasBorderStyle.dotted) { + final dashPattern = style.borderStyle == CanvasBorderStyle.dashed + ? const [6.0, 4.0] + : const [2.0, 3.0]; + return DottedBorder( + options: RoundedRectDottedBorderOptions( + dashPattern: dashPattern, + strokeWidth: style.borderWidth, + color: style.borderColor, + radius: Radius.circular(borderRad.topLeft.x), + padding: EdgeInsets.zero, + strokeCap: StrokeCap.round, + ), + child: content, + ); + } + + return Container( + decoration: BoxDecoration( + borderRadius: borderRad, + border: Border.all(color: style.borderColor, width: style.borderWidth), + ), + child: content, + ); + } +} diff --git a/lib/editor/services/core/pro_editor_bridge.dart b/lib/editor/services/core/pro_editor_bridge.dart index 46f13e36..d189e30e 100644 --- a/lib/editor/services/core/pro_editor_bridge.dart +++ b/lib/editor/services/core/pro_editor_bridge.dart @@ -1,8 +1,9 @@ // ============================================================ // 闲言APP — ProImageEditor 桥接层 // 创建时间: 2026-04-23 -// 更新时间: 2026-05-05 -// 上次更新: buildConfigs接受CanvasStyleModel(圆角+边框+阴影+叠层) +// 更新时间: 2026-05-20 +// 上次更新: 移除wrapBody方案，画布样式改由CanvasStyleMiddleware中间件实现； +// 新增canvasBackground参数支持透明画布背景 // ============================================================ import 'dart:ui' as ui; @@ -17,7 +18,6 @@ import 'package:pro_image_editor/designs/frosted_glass/frosted_glass.dart'; import 'package:xianyan/core/theme/app_radius.dart'; import 'package:xianyan/core/theme/app_spacing.dart'; import 'package:xianyan/editor/models/editor_models.dart'; -import 'package:pro_image_editor/core/models/canvas_style_model.dart'; import 'package:xianyan/editor/services/core/editor_theme_notifier.dart'; import 'package:xianyan/editor/services/core/sticker_config_builder.dart'; import 'package:xianyan/editor/services/core/widget_layer_factory.dart'; @@ -102,7 +102,6 @@ class ProEditorBridge { /// 构建 ProImageEditorConfigs — Cupertino + iOS风格 + 中文 static pro.ProImageEditorConfigs buildConfigs({ required BuildContext context, - CanvasStyleModel? canvasStyle, List? additionalFonts, List Function( pro.ProImageEditorState editor, @@ -110,6 +109,7 @@ class ProEditorBridge { )? bodyItemsBuilder, Future Function(pro.ProImageEditorState editor)? onCloseWarning, + Color? canvasBackground, }) { final isDark = CupertinoTheme.brightnessOf(context) == Brightness.dark; @@ -140,9 +140,6 @@ class ProEditorBridge { builder: (_) => SizedBox(key: key, height: 0), ), bodyItems: bodyItemsBuilder, - wrapBody: (editor, rebuildStream, content) { - return content; - }, closeWarningDialog: onCloseWarning ?? (editor) async { @@ -169,7 +166,8 @@ class ProEditorBridge { }, ), style: pro.MainEditorStyle( - background: EditorThemeNotifier.instance.palette.bgCanvas, + background: + canvasBackground ?? EditorThemeNotifier.instance.palette.bgCanvas, uiOverlayStyle: SystemUiOverlayStyle( statusBarColor: const Color(0x00000000), statusBarIconBrightness: EditorThemeNotifier.instance.isDark diff --git a/lib/editor/services/export/export_service.dart b/lib/editor/services/export/export_service.dart index 153061fd..82655823 100644 --- a/lib/editor/services/export/export_service.dart +++ b/lib/editor/services/export/export_service.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 导出服务 // 创建时间: 2026-04-20 -// 更新时间: 2026-05-05 +// 更新时间: 2026-05-20 // 作用: 截图导出 + 保存相册 + 系统分享 + WidgetLayer合成导出 + 压缩导出 -// 上次更新: 新增 applyCanvasStyle 画布样式后处理(边框+阴影+叠层+圆角) +// 上次更新: 验证applyCanvasStyle渲染层级与CanvasStyleMiddleware一致 // ============================================================ import 'dart:typed_data'; diff --git a/lib/editor/widgets/controls/editor_bottom_toolbar_v2.dart b/lib/editor/widgets/controls/editor_bottom_toolbar_v2.dart index 21d3981f..8c19aa4c 100644 --- a/lib/editor/widgets/controls/editor_bottom_toolbar_v2.dart +++ b/lib/editor/widgets/controls/editor_bottom_toolbar_v2.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 编辑器底部工具栏 v2 // 创建时间: 2026-05-03 -// 更新时间: 2026-05-04 +// 更新时间: 2026-05-20 // 作用: Tab分类+工具按钮+分割线+状态行+Home指示条 -// 上次更新: emoji→Icon全量替换，使用EditorIconData映射表 +// 上次更新: 图片格式信息→提示词按钮+新增onShowPromptPanel回调 // ============================================================ import 'dart:typed_data'; @@ -15,7 +15,6 @@ import 'package:pro_image_editor/pro_image_editor.dart' as pro; import 'package:xianyan/editor/services/core/color_tokens.dart'; import 'package:xianyan/editor/services/core/editor_theme_notifier.dart'; import 'package:xianyan/editor/widgets/controls/editor_icon.dart'; -import 'package:xianyan/editor/services/image/image_info_service.dart'; class _ToolDef { const _ToolDef({ @@ -68,6 +67,7 @@ class EditorBottomToolbarV2 extends StatefulWidget { this.onShowLayerPanel, this.onShowEmojiIconGrid, this.onShowRichTextEditor, + this.onShowPromptPanel, }); final pro.ProImageEditorState editor; @@ -94,6 +94,7 @@ class EditorBottomToolbarV2 extends StatefulWidget { final VoidCallback? onShowLayerPanel; final VoidCallback? onShowEmojiIconGrid; final VoidCallback? onShowRichTextEditor; + final VoidCallback? onShowPromptPanel; @override State createState() => _EditorBottomToolbarV2State(); @@ -104,7 +105,6 @@ class _EditorBottomToolbarV2State extends State int _activeTab = 0; int _activeToolIndex = -1; bool _showDebugInfo = false; - ImageInfoResult? _imageInfo; late PageController _pageController; late List<_ToolTab> _tabs; @@ -112,7 +112,6 @@ class _EditorBottomToolbarV2State extends State @override void initState() { super.initState(); - _loadImageInfo(); _initTabs(); _pageController = PageController(initialPage: _activeTab); } @@ -248,15 +247,9 @@ class _EditorBottomToolbarV2State extends State ]; } - void _loadImageInfo() { - final info = ImageInfoService.getImageInfoFromBytes(widget.imageBytes); - if (mounted) setState(() => _imageInfo = info); - } - @override void didUpdateWidget(covariant EditorBottomToolbarV2 oldWidget) { super.didUpdateWidget(oldWidget); - if (widget.imageBytes != oldWidget.imageBytes) _loadImageInfo(); _initTabs(); } @@ -464,17 +457,12 @@ class _EditorBottomToolbarV2State extends State } Widget _buildImageInfo(EditorPalette p) { - if (_imageInfo == null) return const SizedBox.shrink(); - return Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text(_imageInfo!.formatEmoji, style: const TextStyle(fontSize: 10)), - const SizedBox(width: 3), - Text( - '${_imageInfo!.format} · ${_imageInfo!.sizeText}', - style: TextStyle(color: p.textHint, fontSize: 10), - ), - ], + return _StatusChip( + iconName: 'textformat', + label: '提示词', + isActive: false, + palette: p, + onTap: () => widget.onShowPromptPanel?.call(), ); } diff --git a/lib/features/collaboration/screen_share/pages/screen_share_page.dart b/lib/features/collaboration/screen_share/pages/screen_share_page.dart index 34f44c26..31919c81 100644 --- a/lib/features/collaboration/screen_share/pages/screen_share_page.dart +++ b/lib/features/collaboration/screen_share/pages/screen_share_page.dart @@ -1,14 +1,15 @@ // ============================================================ // 闲言APP — 屏幕共享观看页面 // 创建时间: 2026-05-14 -// 更新时间: 2026-05-19 -// 作用: 屏幕共享观看界面 — 帧图像显示/热区覆盖/远程输入/计时/授权 -// 上次更新: v14.13.0 重构为InApp截图流显示，替代Texture/RTCVideoView +// 更新时间: 2026-05-20 +// 作用: 屏幕共享观看界面 — 帧图像显示/WebRTC流显示/热区覆盖/远程输入/计时/授权 +// 上次更新: v14.32.0 修复观看端找不到结束按钮的问题，为观看端新增底部控制栏，增大导航栏结束按钮点击区域 // ============================================================ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_webrtc/flutter_webrtc.dart'; import 'package:xianyan/core/theme/app_radius.dart'; import 'package:xianyan/core/theme/app_spacing.dart'; @@ -131,21 +132,27 @@ class _ScreenSharePageState extends ConsumerState { ), const SizedBox(width: AppSpacing.sm), GestureDetector( + behavior: HitTestBehavior.opaque, onTap: _showStopConfirmDialog, - child: Container( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.sm, - vertical: AppSpacing.xs, - ), - decoration: BoxDecoration( - color: ext.errorColor.withValues(alpha: 0.1), - borderRadius: AppRadius.pillBorder, - ), - child: Text( - '结束', - style: AppTypography.caption1.copyWith( - color: ext.errorColor, - fontWeight: FontWeight.w600, + child: ConstrainedBox( + constraints: const BoxConstraints(minWidth: 44, minHeight: 44), + child: Center( + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + decoration: BoxDecoration( + color: ext.errorColor.withValues(alpha: 0.1), + borderRadius: AppRadius.pillBorder, + ), + child: Text( + '结束', + style: AppTypography.caption1.copyWith( + color: ext.errorColor, + fontWeight: FontWeight.w600, + ), + ), ), ), ), @@ -161,6 +168,7 @@ class _ScreenSharePageState extends ConsumerState { Expanded(child: _buildVideoArea(ext, state)), if (state.frameCount > 0) _buildFrameInfoBar(ext, state), if (state.isViewing) _buildHotZoneLegend(ext, state), + if (state.isViewing) _buildViewingControls(ext, state), if (state.isSharing) _buildSharingControls(ext, state), ], ); @@ -303,6 +311,9 @@ class _ScreenSharePageState extends ConsumerState { Widget _buildVideoContent(AppThemeExtension ext, ScreenShareState state) { if (state.isSharing) { + if (state.localStream != null) { + return _buildStreamView(ext, state.localStream!); + } if (state.currentFrame != null) { return _buildFrameView(ext, state.currentFrame!); } @@ -327,6 +338,9 @@ class _ScreenSharePageState extends ConsumerState { } if (state.isViewing) { + if (state.remoteStream != null) { + return _buildStreamView(ext, state.remoteStream!); + } if (state.currentFrame != null) { return _buildFrameView(ext, state.currentFrame!); } @@ -358,6 +372,32 @@ class _ScreenSharePageState extends ConsumerState { ); } + Widget _buildStreamView(AppThemeExtension ext, MediaStream stream) { + final renderer = RTCVideoRenderer(); + return FutureBuilder( + future: renderer.initialize(), + builder: (context, snapshot) { + if (snapshot.connectionState != ConnectionState.done) { + return Container( + color: ext.bgElevated, + child: Center(child: CupertinoActivityIndicator(color: ext.accent)), + ); + } + renderer.srcObject = stream; + return Container( + color: ext.bgElevated, + child: InteractiveViewer( + minScale: 0.5, + maxScale: 3.0, + child: Center( + child: RTCVideoView(renderer), + ), + ), + ); + }, + ); + } + Widget _buildFrameView(AppThemeExtension ext, CapturedFrame frame) { return Container( color: ext.bgElevated, @@ -551,6 +591,43 @@ class _ScreenSharePageState extends ConsumerState { ); } + Widget _buildViewingControls(AppThemeExtension ext, ScreenShareState state) { + return Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.md, + ), + decoration: BoxDecoration( + color: ext.bgCard, + border: Border(top: BorderSide(color: ext.bgElevated, width: 0.5)), + ), + child: SizedBox( + width: double.infinity, + child: CupertinoButton( + color: ext.errorColor, + borderRadius: AppRadius.lgBorder, + padding: const EdgeInsets.symmetric(vertical: AppSpacing.md), + onPressed: _showStopConfirmDialog, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + const Text('🛑', style: TextStyle(fontSize: 18)), + const SizedBox(width: AppSpacing.sm), + Text( + '结束观看', + style: AppTypography.body.copyWith( + color: CupertinoColors.white, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ), + ); + } + Widget _buildSharingControls(AppThemeExtension ext, ScreenShareState state) { return Container( padding: const EdgeInsets.symmetric( diff --git a/lib/features/collaboration/screen_share/providers/screen_share_provider.dart b/lib/features/collaboration/screen_share/providers/screen_share_provider.dart index e26382f4..7dc65b28 100644 --- a/lib/features/collaboration/screen_share/providers/screen_share_provider.dart +++ b/lib/features/collaboration/screen_share/providers/screen_share_provider.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 屏幕共享Riverpod状态管理 // 创建时间: 2026-05-14 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: ScreenShareState + ScreenShareNotifier，管理共享/观看/热区/操作日志/视频流 -// 上次更新: v14.0.0 新增remoteStream/localStream状态，监听WebRTC视频流 +// 上次更新: v14.31.0 remoteStream/localStream已在ScreenSharePage中正确渲染 // ============================================================ import 'dart:async'; diff --git a/lib/features/file_transfer/database/transfer_database.dart b/lib/features/file_transfer/database/transfer_database.dart index 46e8faf6..13aa187d 100644 --- a/lib/features/file_transfer/database/transfer_database.dart +++ b/lib/features/file_transfer/database/transfer_database.dart @@ -3,7 +3,7 @@ // 创建时间: 2026-05-09 // 更新时间: 2026-05-14 // 作用: 文件传输助手数据库CRUD操作 — 设备/记录/配对/消息/云端暂存/离线队列 -// 上次更新: v6.4.0 新增离线队列CRUD方法(自定义SQL) +// 上次更新: v6.5.0 _rowToDevice/insertDevice/updateDevice支持isFavorite字段 // ============================================================ import 'package:drift/drift.dart'; @@ -41,6 +41,7 @@ class TransferDatabase { preferredTransport: Value(device.preferredTransport.id), isOnline: Value(device.isOnline), isVerified: Value(device.isVerified), + isFavorite: Value(device.isFavorite), publicKey: Value(device.publicKey), fingerprint: Value(device.fingerprint), lastSeen: device.lastSeen, @@ -76,6 +77,7 @@ class TransferDatabase { String? ip, bool? isOnline, bool? isVerified, + bool? isFavorite, }) async { await (_db.update( _db.transferDeviceRecords, @@ -87,6 +89,9 @@ class TransferDatabase { isVerified: isVerified != null ? Value(isVerified) : const Value.absent(), + isFavorite: isFavorite != null + ? Value(isFavorite) + : const Value.absent(), lastSeen: Value(DateTime.now()), updatedAt: Value(DateTime.now()), ), @@ -124,6 +129,7 @@ class TransferDatabase { lastSeen: row.lastSeen, isOnline: row.isOnline, isVerified: row.isVerified, + isFavorite: row.isFavorite, publicKey: row.publicKey, fingerprint: row.fingerprint, ); diff --git a/lib/features/file_transfer/models/transfer_device.dart b/lib/features/file_transfer/models/transfer_device.dart index 74d52dd8..f6b6f701 100644 --- a/lib/features/file_transfer/models/transfer_device.dart +++ b/lib/features/file_transfer/models/transfer_device.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 传输设备模型 // 创建时间: 2026-05-09 -// 更新时间: 2026-05-15 +// 更新时间: 2026-05-20 // 作用: 文件传输助手远程设备数据模型 — 设备信息/配对状态/传输偏好 -// 上次更新: v12.19.0 新增accountAlias字段，displayAlias优先使用账号昵称 +// 上次更新: 删除fromJsonWithDefaults重复代码(与fromJson完全重复且缺少字段)，统一使用fromJson // ============================================================ import 'transfer_enums.dart'; @@ -63,7 +63,7 @@ class TransferDevice { return alias.isNotEmpty ? alias : 'Web浏览器'; if (alias != '闲言设备' && alias != '未知设备') return alias; final parts = []; - if (deviceModel != null && deviceModel!.isNotEmpty) { + if (deviceModel != null && deviceModel!.isNotEmpty && deviceModel != 'localhost') { parts.add(deviceModel!); } if (parts.isNotEmpty) return parts.join(' · '); @@ -177,30 +177,6 @@ class TransferDevice { ); } - factory TransferDevice.fromJsonWithDefaults(Map json) { - return TransferDevice( - id: json['id'] as String? ?? '', - alias: json['alias'] as String? ?? '未知设备', - deviceModel: json['deviceModel'] as String?, - deviceType: DeviceType.fromId(json['deviceType'] as String? ?? 'mobile'), - ip: json['ip'] as String?, - port: json['port'] as int? ?? 53317, - pairingMethod: PairingMethod.fromId( - json['pairingMethod'] as String? ?? 'lan', - ), - preferredTransport: TransportType.fromId( - json['preferredTransport'] as String? ?? 'localsend_http', - ), - lastSeen: json['lastSeen'] != null - ? DateTime.parse(json['lastSeen'] as String) - : DateTime.now(), - isOnline: json['isOnline'] as bool? ?? false, - isVerified: json['isVerified'] as bool? ?? false, - publicKey: json['publicKey'] as String?, - fingerprint: json['fingerprint'] as String?, - ); - } - factory TransferDevice.fromAnnounce( Map announce, String sourceIp, diff --git a/lib/features/file_transfer/presentation/pages/device_pairing_page.dart b/lib/features/file_transfer/presentation/pages/device_pairing_page.dart index 78dceeb6..afc5d8f1 100644 --- a/lib/features/file_transfer/presentation/pages/device_pairing_page.dart +++ b/lib/features/file_transfer/presentation/pages/device_pairing_page.dart @@ -440,7 +440,7 @@ class _DevicePairingPageState extends ConsumerState void _startHarmonyNearbyPairing() { if (!PlatformHelper.isHarmonyOS) return; - ref.read(deviceDiscoveryProvider.notifier).startScan({PairingMethod.lan}); + ref.read(deviceDiscoveryProvider.notifier).startScan({PairingMethod.harmonyNearby}); } void _startAccountPairing() { diff --git a/lib/features/file_transfer/presentation/pages/file_transfer_device_actions.dart b/lib/features/file_transfer/presentation/pages/file_transfer_device_actions.dart index a7a16691..c137e9d4 100644 --- a/lib/features/file_transfer/presentation/pages/file_transfer_device_actions.dart +++ b/lib/features/file_transfer/presentation/pages/file_transfer_device_actions.dart @@ -1,14 +1,19 @@ // ============================================================ // 闲言APP — 文件传输设备操作 Mixin // 创建时间: 2026-05-12 -// 更新时间: 2026-05-15 +// 更新时间: 2026-05-20 // 作用: 文件传输助手设备相关操作（上下文菜单/重命名/详情/消息/配对管理/我的设备卡片） -// 上次更新: v12.19.0 本机设备灰色样式+账号昵称显示+移除IP行 +// 上次更新: 实现二维码分享功能(使用QrPairingService生成配对载荷+QrImageView渲染+复制配对信息) // ============================================================ +import 'dart:convert'; + import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:file_picker/file_picker.dart'; +import 'package:qr_flutter/qr_flutter.dart'; import 'package:xianyan/core/theme/app_theme.dart'; import 'package:xianyan/core/theme/app_spacing.dart'; @@ -16,6 +21,7 @@ import 'package:xianyan/core/theme/app_typography.dart'; import 'package:xianyan/core/theme/app_radius.dart'; import 'package:xianyan/features/file_transfer/models/models.dart'; import 'package:xianyan/features/file_transfer/providers/providers.dart'; +import 'package:xianyan/features/file_transfer/services/discovery/qr_pairing_service.dart'; import 'package:xianyan/shared/widgets/app_toast.dart'; mixin FileTransferDeviceActions @@ -330,19 +336,152 @@ mixin FileTransferDeviceActions } void _setDeviceFavorite(TransferDevice device) { - ref - .read(transferProvider.notifier) - .updatePeerStatus( - device.id, - (ref.read(transferProvider).peerStatuses[device.id] ?? - const PeerStatus()) - .copyWith(connectionState: PeerConnectionState.paired), - ); - AppToast.showSuccess(device.isFavorite ? '已取消收藏' : '已收藏设备'); + final newFavorite = !device.isFavorite; + ref.read(transferProvider.notifier).toggleDeviceFavorite(device.id); + AppToast.showSuccess(newFavorite ? '⭐ 已收藏设备' : '☆ 已取消收藏'); } void _shareDeviceViaQr(TransferDevice device) { - AppToast.showInfo('二维码分享功能开发中...'); + final ext = AppTheme.ext(context); + final state = ref.read(transferProvider); + final localFp = state.localFingerprint; + + final qrService = QrPairingService(); + final qrPayload = qrService.generateQrPayload( + ip: device.ip ?? '', + port: device.port, + alias: device.alias, + fingerprint: device.fingerprint ?? localFp ?? device.id, + method: device.pairingMethod, + ); + + final displayAlias = + state.peerStatuses[device.id]?.customAlias ?? device.displayAlias; + + showCupertinoDialog( + context: context, + builder: (ctx) => CupertinoAlertDialog( + title: Text('分享设备二维码', style: TextStyle(color: ext.textPrimary)), + content: Padding( + padding: const EdgeInsets.symmetric(vertical: AppSpacing.md), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + padding: const EdgeInsets.all(AppSpacing.md), + decoration: BoxDecoration( + color: ext.isDark + ? CupertinoColors.white.withValues(alpha: 0.95) + : CupertinoColors.white, + borderRadius: AppRadius.lgBorder, + boxShadow: [ + BoxShadow( + color: ext.isDark + ? const Color(0xFFFFFFFF).withValues(alpha: 0.05) + : const Color(0xFF000000).withValues(alpha: 0.08), + blurRadius: 16, + offset: const Offset(0, 4), + ), + ], + ), + child: QrImageView( + data: qrPayload, + size: 200, + eyeStyle: QrEyeStyle( + eyeShape: QrEyeShape.square, + color: ext.isDark + ? const Color(0xFF1C1C1E) + : const Color(0xFF000000), + ), + dataModuleStyle: QrDataModuleStyle( + dataModuleShape: QrDataModuleShape.square, + color: ext.isDark + ? const Color(0xFF1C1C1E) + : const Color(0xFF000000), + ), + ), + ), + const SizedBox(height: AppSpacing.sm), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + device.displayEmoji, + style: const TextStyle(fontSize: 16), + ), + const SizedBox(width: 4), + Flexible( + child: Text( + displayAlias, + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + const SizedBox(height: AppSpacing.xs), + Text( + '让对方扫描此二维码即可配对', + style: AppTypography.footnote.copyWith( + color: ext.textHint, + ), + textAlign: TextAlign.center, + ), + const SizedBox(height: AppSpacing.xs), + Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.sm, + vertical: AppSpacing.xs, + ), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + ), + child: Text( + '⏱ 二维码有效期 ${QrPairingService.qrExpiry.inMinutes} 分钟', + style: AppTypography.caption2.copyWith( + color: ext.textHint, + ), + ), + ), + ], + ), + ), + actions: [ + CupertinoDialogAction( + onPressed: () { + Navigator.pop(ctx); + _copyQrPayload(qrPayload); + }, + child: const Text('复制配对信息'), + ), + CupertinoDialogAction( + isDefaultAction: true, + onPressed: () => Navigator.pop(ctx), + child: const Text('关闭'), + ), + ], + ), + ); + } + + void _copyQrPayload(String payload) { + try { + final data = jsonDecode(payload) as Map; + final ip = data['ip'] as String? ?? ''; + final port = data['port'] as int? ?? 53317; + final alias = data['alias'] as String? ?? ''; + final fp = data['fp'] as String? ?? ''; + final readable = '闲言设备配对\n名称: $alias\nIP: $ip:$port\n指纹: $fp'; + Clipboard.setData(ClipboardData(text: readable)); + AppToast.showSuccess('📋 配对信息已复制到剪贴板'); + } catch (_) { + Clipboard.setData(ClipboardData(text: payload)); + AppToast.showSuccess('📋 配对信息已复制到剪贴板'); + } } void _unpairDevice(TransferDevice device) { @@ -671,8 +810,15 @@ mixin FileTransferDeviceActions } Future _sendFileToMyDevice(TransferDevice device) async { + final result = await FilePicker.platform.pickFiles(); + if (result == null || result.files.isEmpty) return; + final filePath = result.files.single.path; + if (filePath == null || filePath.isEmpty) { + AppToast.showWarning('无法获取文件路径'); + return; + } ref .read(transferProvider.notifier) - .sendFileToMyDevice(device: device, filePath: ''); + .sendFileToMyDevice(device: device, filePath: filePath); } } diff --git a/lib/features/file_transfer/presentation/pages/file_transfer_discovery_tab.dart b/lib/features/file_transfer/presentation/pages/file_transfer_discovery_tab.dart index aabc17e8..5ee87a26 100644 --- a/lib/features/file_transfer/presentation/pages/file_transfer_discovery_tab.dart +++ b/lib/features/file_transfer/presentation/pages/file_transfer_discovery_tab.dart @@ -3,7 +3,7 @@ // 创建时间: 2026-05-15 // 更新时间: 2026-05-15 // 作用: 从file_transfer_page.dart拆分 — 发现设备Tab的UI构建 -// 上次更新: v6.8.0 局域网访问横幅增加二维码弹窗 +// 上次更新: v6.8.1 修复双数据源设备列表问题，合并transferProvider和discoveryProvider的设备 // ============================================================ import 'package:flutter/cupertino.dart'; @@ -30,6 +30,14 @@ mixin FileTransferDiscoveryTab Widget buildDevicesTab(AppThemeExtension ext, TransferState state) { final discoveryState = ref.watch(deviceDiscoveryProvider); + final transferDeviceIds = + state.discoveredDevices.map((d) => d.id).toSet(); + final mergedDevices = [ + ...state.discoveredDevices, + ...discoveryState.discoveredDevices + .where((d) => !transferDeviceIds.contains(d.id)), + ]; + return CustomScrollView( slivers: [ SliverToBoxAdapter( @@ -43,12 +51,12 @@ mixin FileTransferDiscoveryTab child: buildLanAccessBanner(ext, state.lanAccessUrl!), ), SliverToBoxAdapter(child: buildDiscoveryControls(ext, discoveryState)), - if (discoveryState.discoveredDevices.isEmpty) + if (mergedDevices.isEmpty) SliverFillRemaining(child: buildEmptyDevices(ext, discoveryState)) else SliverList( delegate: SliverChildBuilderDelegate((context, index) { - final device = discoveryState.discoveredDevices[index]; + final device = mergedDevices[index]; final paired = state.isPairedWith(device.id); final pairing = state.isPairing(device.id); final customAlias = state.peerStatuses[device.id]?.customAlias; @@ -61,7 +69,7 @@ mixin FileTransferDiscoveryTab isPairing: pairing, customAlias: customAlias, ); - }, childCount: discoveryState.discoveredDevices.length), + }, childCount: mergedDevices.length), ), const SliverPadding(padding: EdgeInsets.only(bottom: 80)), ], diff --git a/lib/features/file_transfer/presentation/pages/file_transfer_page.dart b/lib/features/file_transfer/presentation/pages/file_transfer_page.dart index 3f51fb24..7f4dfb0e 100644 --- a/lib/features/file_transfer/presentation/pages/file_transfer_page.dart +++ b/lib/features/file_transfer/presentation/pages/file_transfer_page.dart @@ -3,7 +3,7 @@ // 创建时间: 2026-05-09 // 更新时间: 2026-05-15 // 作用: 文件传输助手入口 — 设备发现/我的设备/配对/传输管理/聊天入口 -// 上次更新: 拆分为多个Mixin文件 — discovery/my_devices/records/debug_panel +// 上次更新: 新增initialTab参数支持从设置页直接跳转到指定Tab // ============================================================ import 'package:flutter/cupertino.dart'; @@ -25,7 +25,9 @@ import 'package:xianyan/features/file_transfer/presentation/pages/file_transfer_ import 'package:xianyan/features/file_transfer/presentation/pages/file_transfer_debug_panel.dart'; class FileTransferPage extends ConsumerStatefulWidget { - const FileTransferPage({super.key}); + final int initialTab; + + const FileTransferPage({super.key, this.initialTab = 0}); @override ConsumerState createState() => _FileTransferPageState(); @@ -44,7 +46,11 @@ class _FileTransferPageState extends ConsumerState @override void initState() { super.initState(); - _tabController = TabController(length: 3, vsync: this); + _tabController = TabController( + length: 3, + vsync: this, + initialIndex: widget.initialTab.clamp(0, 2), + ); } @override diff --git a/lib/features/file_transfer/presentation/pages/pairing_code_tab.dart b/lib/features/file_transfer/presentation/pages/pairing_code_tab.dart index d38577c2..7695198a 100644 --- a/lib/features/file_transfer/presentation/pages/pairing_code_tab.dart +++ b/lib/features/file_transfer/presentation/pages/pairing_code_tab.dart @@ -1,12 +1,13 @@ // ============================================================ // 闲言APP — 配对码Tab // 创建时间: 2026-05-19 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: 配对码生成与输入配对流程 -// 上次更新: v13.9.0 GlassContainer统一风格 + 配对成功庆祝动画 + 触觉反馈 +// 上次更新: v13.10.0 配对码改为4位纯数字 // ============================================================ import 'dart:async'; +import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; @@ -21,6 +22,9 @@ import 'package:xianyan/core/services/device/haptic_service.dart'; import 'package:xianyan/core/utils/interaction_animations.dart'; import 'package:xianyan/shared/widgets/glass_container.dart'; import 'package:xianyan/features/file_transfer/providers/providers.dart'; +import 'package:xianyan/features/file_transfer/models/transfer_device.dart'; +import 'package:xianyan/features/file_transfer/models/transfer_enums.dart'; +import 'package:xianyan/features/file_transfer/presentation/pages/transfer_chat_page.dart'; class PairingCodeTab extends ConsumerStatefulWidget { const PairingCodeTab({super.key}); @@ -36,10 +40,10 @@ class _PairingCodeTabState extends ConsumerState { int _countdownSeconds = 300; final List _codeControllers = List.generate( - 6, + 4, (_) => TextEditingController(), ); - final List _focusNodes = List.generate(6, (_) => FocusNode()); + final List _focusNodes = List.generate(4, (_) => FocusNode()); StreamSubscription>? _pairingSub; Timer? _countdownTimer; @@ -109,6 +113,7 @@ class _PairingCodeTabState extends ConsumerState { void _onPairingMatched(Map event) { final peerAlias = event['alias'] as String? ?? '对方设备'; + final peerId = event['from'] as String? ?? event['peerId'] as String? ?? 'unknown'; if (!mounted) return; final ext = AppTheme.ext(context); @@ -148,7 +153,22 @@ class _PairingCodeTabState extends ConsumerState { isDefaultAction: true, onPressed: () { Navigator.pop(ctx); - Navigator.of(context).pop(); + final peerDevice = TransferDevice( + id: peerId, + alias: peerAlias, + deviceType: DeviceType.mobile, + port: 53317, + pairingMethod: PairingMethod.account, + preferredTransport: TransportType.wsRelay, + lastSeen: DateTime.now(), + isOnline: true, + isVerified: true, + ); + Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => TransferChatPage(peerDevice: peerDevice), + ), + ); }, child: const Text('开始聊天'), ), @@ -168,9 +188,15 @@ class _PairingCodeTabState extends ConsumerState { setState(() => _isGenerating = true); try { + final random = Random.secure(); + final localCode = List.generate( + 4, + (_) => random.nextInt(10), + ).join(); await signaling.createPairingCode( alias: ref.read(transferSettingsProvider).deviceName, deviceType: 'mobile', + pairingCode: localCode, ); } catch (e) { if (!mounted) return; @@ -180,9 +206,9 @@ class _PairingCodeTabState extends ConsumerState { } Future _joinWithCode() async { - final code = _codeControllers.map((c) => c.text.trim().toUpperCase()).join(); - if (code.length != 6) { - _showAlert('输入不完整', '请输入6位配对码'); + final code = _codeControllers.map((c) => c.text.trim()).join(); + if (code.length != 4) { + _showAlert('输入不完整', '请输入4位配对码'); return; } @@ -203,12 +229,12 @@ class _PairingCodeTabState extends ConsumerState { } void _onCodeFieldChanged(int index, String value) { - if (value.isNotEmpty && index < 5) { + if (value.isNotEmpty && index < 3) { _focusNodes[index + 1].requestFocus(); } - if (index == 5 && value.isNotEmpty) { + if (index == 3 && value.isNotEmpty) { final code = _codeControllers.map((c) => c.text.trim()).join(); - if (code.length == 6) { + if (code.length == 4) { FocusScope.of(context).unfocus(); _joinWithCode(); } @@ -314,7 +340,7 @@ class _PairingCodeTabState extends ConsumerState { ), const SizedBox(height: AppSpacing.sm), Text( - '生成6位配对码，让对方输入即可配对', + '生成配对码，让对方输入即可配对', style: AppTypography.footnote.copyWith(color: ext.textSecondary), ), const SizedBox(height: AppSpacing.lg), @@ -475,13 +501,13 @@ class _PairingCodeTabState extends ConsumerState { ), const SizedBox(height: AppSpacing.sm), Text( - '输入对方提供的6位配对码', + '输入对方提供的4位数字配对码', style: AppTypography.footnote.copyWith(color: ext.textSecondary), ), const SizedBox(height: AppSpacing.lg), Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: List.generate(6, (index) { + children: List.generate(4, (index) { return SizedBox( width: 44, height: 56, @@ -514,9 +540,9 @@ class _PairingCodeTabState extends ConsumerState { padding: const EdgeInsets.symmetric(vertical: AppSpacing.sm), onChanged: (value) => _onCodeFieldChanged(index, value), inputFormatters: [ - FilteringTextInputFormatter.allow(RegExp(r'[a-zA-Z0-9]')), + FilteringTextInputFormatter.allow(RegExp(r'[0-9]')), ], - textCapitalization: TextCapitalization.characters, + keyboardType: TextInputType.number, ), ); }), diff --git a/lib/features/file_transfer/presentation/pages/qr_code_tab.dart b/lib/features/file_transfer/presentation/pages/qr_code_tab.dart index f2dfc6c0..b6ae0621 100644 --- a/lib/features/file_transfer/presentation/pages/qr_code_tab.dart +++ b/lib/features/file_transfer/presentation/pages/qr_code_tab.dart @@ -22,6 +22,9 @@ import 'package:xianyan/core/services/device/haptic_service.dart'; import 'package:xianyan/core/utils/interaction_animations.dart'; import 'package:xianyan/shared/widgets/glass_container.dart'; import 'package:xianyan/features/file_transfer/providers/providers.dart'; +import 'package:xianyan/features/file_transfer/models/transfer_device.dart'; +import 'package:xianyan/features/file_transfer/models/transfer_enums.dart'; +import 'package:xianyan/features/file_transfer/presentation/pages/transfer_chat_page.dart'; class QrCodeTab extends ConsumerStatefulWidget { const QrCodeTab({super.key}); @@ -67,6 +70,7 @@ class _QrCodeTabState extends ConsumerState { void _onPairingMatched(Map event) { final peerAlias = event['alias'] as String? ?? '对方设备'; + final peerId = event['from'] as String? ?? event['peerId'] as String? ?? 'unknown'; if (!mounted) return; setState(() { @@ -106,7 +110,22 @@ class _QrCodeTabState extends ConsumerState { isDefaultAction: true, onPressed: () { Navigator.pop(ctx); - Navigator.of(context).pop(); + final peerDevice = TransferDevice( + id: peerId, + alias: peerAlias, + deviceType: DeviceType.mobile, + port: 53317, + pairingMethod: PairingMethod.account, + preferredTransport: TransportType.wsRelay, + lastSeen: DateTime.now(), + isOnline: true, + isVerified: true, + ); + Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => TransferChatPage(peerDevice: peerDevice), + ), + ); }, child: const Text('开始聊天'), ), diff --git a/lib/features/file_transfer/presentation/pages/radar_scan_tab.dart b/lib/features/file_transfer/presentation/pages/radar_scan_tab.dart index 2d892419..a45aa60b 100644 --- a/lib/features/file_transfer/presentation/pages/radar_scan_tab.dart +++ b/lib/features/file_transfer/presentation/pages/radar_scan_tab.dart @@ -20,6 +20,9 @@ import 'package:xianyan/core/services/device/haptic_service.dart'; import 'package:xianyan/core/utils/interaction_animations.dart'; import 'package:xianyan/shared/widgets/glass_container.dart'; import 'package:xianyan/features/file_transfer/providers/providers.dart'; +import 'package:xianyan/features/file_transfer/models/transfer_device.dart'; +import 'package:xianyan/features/file_transfer/models/transfer_enums.dart'; +import 'package:xianyan/features/file_transfer/presentation/pages/transfer_chat_page.dart'; import 'package:xianyan/shared/widgets/empty_state.dart'; class RadarScanTab extends ConsumerStatefulWidget { @@ -56,7 +59,10 @@ class _RadarScanTabState extends ConsumerState { } void _listenRadarEvents() { - final signaling = ref.read(transferProvider.notifier).pairingService.signalingService; + final signaling = ref + .read(transferProvider.notifier) + .pairingService + .signalingService; _radarSub = signaling.onRadarDevicesChanged.listen((devices) { if (!mounted) return; setState(() { @@ -71,7 +77,10 @@ class _RadarScanTabState extends ConsumerState { } void _listenPairingEvents() { - final signaling = ref.read(transferProvider.notifier).pairingService.signalingService; + final signaling = ref + .read(transferProvider.notifier) + .pairingService + .signalingService; _pairingSub = signaling.onPairingCodeEvent.listen((event) { if (!mounted) return; final type = event['type'] as String? ?? ''; @@ -93,6 +102,8 @@ class _RadarScanTabState extends ConsumerState { void _onPairingMatched(Map event) { final peerAlias = event['alias'] as String? ?? '对方设备'; + final peerId = + event['from'] as String? ?? event['peerId'] as String? ?? 'unknown'; if (!mounted) return; setState(() => _isScanning = false); @@ -114,14 +125,21 @@ class _RadarScanTabState extends ConsumerState { children: [ Text('🎉', style: AppTypography.title2), const SizedBox(width: AppSpacing.sm), - Text('配对成功', style: AppTypography.headline.copyWith(color: ext.textPrimary)), + Text( + '配对成功', + style: AppTypography.headline.copyWith( + color: ext.textPrimary, + ), + ), ], ), content: Padding( padding: const EdgeInsets.only(top: AppSpacing.sm), child: Text( '已与 $peerAlias 建立连接', - style: AppTypography.footnote.copyWith(color: ext.textSecondary), + style: AppTypography.footnote.copyWith( + color: ext.textSecondary, + ), ), ), actions: [ @@ -129,7 +147,22 @@ class _RadarScanTabState extends ConsumerState { isDefaultAction: true, onPressed: () { Navigator.pop(ctx); - Navigator.of(context).pop(); + final peerDevice = TransferDevice( + id: peerId, + alias: peerAlias, + deviceType: DeviceType.mobile, + port: 53317, + pairingMethod: PairingMethod.account, + preferredTransport: TransportType.wsRelay, + lastSeen: DateTime.now(), + isOnline: true, + isVerified: true, + ); + Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => TransferChatPage(peerDevice: peerDevice), + ), + ); }, child: const Text('开始聊天'), ), @@ -141,7 +174,10 @@ class _RadarScanTabState extends ConsumerState { } Future _startRadarScan() async { - final signaling = ref.read(transferProvider.notifier).pairingService.signalingService; + final signaling = ref + .read(transferProvider.notifier) + .pairingService + .signalingService; if (!signaling.isConnected) { _showAlert('未连接', '请先连接信令服务器'); return; @@ -155,9 +191,7 @@ class _RadarScanTabState extends ConsumerState { try { final settings = ref.read(transferSettingsProvider); - await signaling.radarBroadcast( - alias: settings.deviceName, - ); + await signaling.radarBroadcast(alias: settings.deviceName); await signaling.radarScan(); _startEmptyStateTimer(); } catch (e) { @@ -174,13 +208,17 @@ class _RadarScanTabState extends ConsumerState { Future _onDeviceTap(Map device) async { final ext = AppTheme.ext(context); - final deviceId = device['deviceId'] as String? ?? device['from'] as String? ?? ''; + final deviceId = + device['deviceId'] as String? ?? device['from'] as String? ?? ''; final alias = device['alias'] as String? ?? '未知设备'; final confirmed = await showCupertinoDialog( context: context, builder: (ctx) => CupertinoAlertDialog( - title: Text('🔗 配对请求', style: AppTypography.headline.copyWith(color: ext.textPrimary)), + title: Text( + '🔗 配对请求', + style: AppTypography.headline.copyWith(color: ext.textPrimary), + ), content: Padding( padding: const EdgeInsets.only(top: AppSpacing.sm), child: Text( @@ -204,7 +242,10 @@ class _RadarScanTabState extends ConsumerState { if (confirmed != true || !mounted) return; - final signaling = ref.read(transferProvider.notifier).pairingService.signalingService; + final signaling = ref + .read(transferProvider.notifier) + .pairingService + .signalingService; try { await signaling.joinPairingCode(deviceId); } catch (e) { @@ -304,20 +345,20 @@ class _RadarScanTabState extends ConsumerState { _buildStaticCircle(ext, 100, 0.08), ], Container( - width: 20, - height: 20, - decoration: BoxDecoration( - color: ext.accent, - shape: BoxShape.circle, - boxShadow: [ - BoxShadow( - color: ext.accent.withValues(alpha: 0.4), - blurRadius: 12, - spreadRadius: 2, + width: 20, + height: 20, + decoration: BoxDecoration( + color: ext.accent, + shape: BoxShape.circle, + boxShadow: [ + BoxShadow( + color: ext.accent.withValues(alpha: 0.4), + blurRadius: 12, + spreadRadius: 2, + ), + ], ), - ], - ), - ) + ) .animate(onPlay: (c) => c.repeat()) .scale( begin: const Offset(1.0, 1.0), @@ -336,18 +377,23 @@ class _RadarScanTabState extends ConsumerState { ); } - Widget _buildRadarCircle(AppThemeExtension ext, double size, double alpha, int delay) { + Widget _buildRadarCircle( + AppThemeExtension ext, + double size, + double alpha, + int delay, + ) { return Container( - width: size, - height: size, - decoration: BoxDecoration( - shape: BoxShape.circle, - border: Border.all( - color: ext.accent.withValues(alpha: alpha), - width: 1.5, - ), - ), - ) + width: size, + height: size, + decoration: BoxDecoration( + shape: BoxShape.circle, + border: Border.all( + color: ext.accent.withValues(alpha: alpha), + width: 1.5, + ), + ), + ) .animate(onPlay: (c) => c.repeat()) .fadeIn(duration: 1500.ms, delay: delay.ms) .scale( @@ -366,9 +412,7 @@ class _RadarScanTabState extends ConsumerState { height: size, decoration: BoxDecoration( shape: BoxShape.circle, - border: Border.all( - color: ext.accent.withValues(alpha: alpha), - ), + border: Border.all(color: ext.accent.withValues(alpha: alpha)), ), ); } @@ -383,7 +427,11 @@ class _RadarScanTabState extends ConsumerState { child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(CupertinoIcons.antenna_radiowaves_left_right, size: 18, color: ext.textOnAccent), + Icon( + CupertinoIcons.antenna_radiowaves_left_right, + size: 18, + color: ext.textOnAccent, + ), const SizedBox(width: AppSpacing.sm), Text( '📡 开始扫描', @@ -432,7 +480,10 @@ class _RadarScanTabState extends ConsumerState { ), const SizedBox(width: AppSpacing.sm), Container( - padding: const EdgeInsets.symmetric(horizontal: AppSpacing.sm, vertical: 2), + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.sm, + vertical: 2, + ), decoration: BoxDecoration( color: ext.successColor.withValues(alpha: 0.12), borderRadius: AppRadius.pillBorder, @@ -450,7 +501,8 @@ class _RadarScanTabState extends ConsumerState { const SizedBox(height: AppSpacing.md), ...orderedKeys.map((key) { final devices = groups[key]; - if (devices == null || devices.isEmpty) return const SizedBox.shrink(); + if (devices == null || devices.isEmpty) + return const SizedBox.shrink(); final (label, subtitle) = _matchTypeLabel(key); return _buildDeviceGroup(ext, key, label, subtitle, devices); }), @@ -477,10 +529,13 @@ class _RadarScanTabState extends ConsumerState { padding: const EdgeInsets.only(bottom: AppSpacing.sm), child: Row( children: [ - Text(label, style: AppTypography.subhead.copyWith( - color: ext.textSecondary, - fontWeight: FontWeight.w600, - )), + Text( + label, + style: AppTypography.subhead.copyWith( + color: ext.textSecondary, + fontWeight: FontWeight.w600, + ), + ), const SizedBox(width: AppSpacing.xs), Text( subtitle, @@ -495,7 +550,11 @@ class _RadarScanTabState extends ConsumerState { ); } - Widget _buildDeviceCard(AppThemeExtension ext, Map device, String matchType) { + Widget _buildDeviceCard( + AppThemeExtension ext, + Map device, + String matchType, + ) { final alias = device['alias'] as String? ?? '未知设备'; final ipCity = device['ipCity'] as String? ?? ''; final icon = _matchTypeIcon(matchType); @@ -515,9 +574,7 @@ class _RadarScanTabState extends ConsumerState { color: ext.accent.withValues(alpha: 0.1), borderRadius: AppRadius.mdBorder, ), - child: Center( - child: Icon(icon, size: 22, color: ext.accent), - ), + child: Center(child: Icon(icon, size: 22, color: ext.accent)), ), const SizedBox(width: AppSpacing.md), Expanded( @@ -535,13 +592,19 @@ class _RadarScanTabState extends ConsumerState { const SizedBox(height: 2), Text( '📍 $ipCity', - style: AppTypography.caption1.copyWith(color: ext.textSecondary), + style: AppTypography.caption1.copyWith( + color: ext.textSecondary, + ), ), ], ], ), ), - Icon(CupertinoIcons.chevron_right, color: ext.iconSecondary, size: 18), + Icon( + CupertinoIcons.chevron_right, + color: ext.iconSecondary, + size: 18, + ), ], ), ), diff --git a/lib/features/file_transfer/presentation/pages/transfer_chat_file_send.dart b/lib/features/file_transfer/presentation/pages/transfer_chat_file_send.dart index 8625453c..5accfd78 100644 --- a/lib/features/file_transfer/presentation/pages/transfer_chat_file_send.dart +++ b/lib/features/file_transfer/presentation/pages/transfer_chat_file_send.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 传输聊天页面·文件发送与操作逻辑 // 创建时间: 2026-05-19 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: 聊天页文件发送相关逻辑(选择/离线/大文件确认/拖拽/语音/画布/安全横幅/离线队列/分享/打开) -// 上次更新: Web平台适配 — 跳过File().lengthSync()等不支持操作 +// 上次更新: v14.31.0 修复画布按钮信令未连接时完全阻止的问题，改为允许本地模式打开 // ============================================================ part of 'transfer_chat_page.dart'; @@ -457,17 +457,19 @@ extension _TransferChatFileSendExt on _TransferChatPageState { void _showOfflineSendDialog(List filePaths) { final ext = Theme.of(context).extension(); + final primaryColor = ext?.textPrimary ?? CupertinoColors.label; + final secondaryColor = ext?.textSecondary ?? CupertinoColors.secondaryLabel; showCupertinoDialog( context: context, builder: (ctx) => CupertinoAlertDialog( - title: Text('对方当前离线', style: TextStyle(color: ext?.textPrimary)), + title: Text('对方当前离线', style: TextStyle(color: primaryColor)), content: Text( '${widget.peerDevice.displayAlias} 当前不在线\n\n' '可选择以下方式处理文件：\n' '• 暂存云端：对方上线后自动拉取(24h)\n' '• 离线队列：对方上线后自动重发\n\n' '云端文件将端到端加密，服务器无法解密', - style: TextStyle(color: ext?.textSecondary), + style: TextStyle(color: secondaryColor), ), actions: [ CupertinoDialogAction( @@ -525,13 +527,49 @@ extension _TransferChatFileSendExt on _TransferChatPageState { void _openCanvas() { final notifier = ref.read(transferProvider.notifier); final signaling = notifier.pairingService.signalingService; - if (!signaling.isConnected) { - AppToast.showWarning('信令未连接，无法使用协作画布'); - return; - } final canvasId = 'canvas-${widget.peerDevice.id}-${DateTime.now().millisecondsSinceEpoch}'; final userId = ref.read(authProvider).user?.id.toString() ?? ''; + + if (!signaling.isConnected) { + final ext = AppTheme.ext(context); + showCupertinoDialog( + context: context, + builder: (ctx) => CupertinoAlertDialog( + title: Text('🎨 协作画布', style: TextStyle(color: ext.textPrimary)), + content: Text( + '信令服务未连接，实时协作功能暂不可用\n\n' + '你可以先在本地使用画布，待连接恢复后自动同步', + style: TextStyle(color: ext.textSecondary), + ), + actions: [ + CupertinoDialogAction( + isDestructiveAction: true, + onPressed: () => Navigator.pop(ctx), + child: const Text('取消'), + ), + CupertinoDialogAction( + isDefaultAction: true, + onPressed: () { + Navigator.pop(ctx); + Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => CanvasPage( + canvasId: canvasId, + peerDeviceId: widget.peerDevice.id, + userId: userId, + ), + ), + ); + }, + child: const Text('本地打开'), + ), + ], + ), + ); + return; + } + Navigator.of(context).push( CupertinoPageRoute( builder: (_) => CanvasPage( diff --git a/lib/features/file_transfer/presentation/pages/transfer_chat_page.dart b/lib/features/file_transfer/presentation/pages/transfer_chat_page.dart index 7b209fe7..f6e94489 100644 --- a/lib/features/file_transfer/presentation/pages/transfer_chat_page.dart +++ b/lib/features/file_transfer/presentation/pages/transfer_chat_page.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 传输聊天页面 // 创建时间: 2026-05-09 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: 与对端设备的聊天界面 — 消息列表/输入发送/网络状态/速度图表/已读回执 -// 上次更新: v14.1.0 拆分为3文件: 主页面+屏幕共享(transfer_chat_screen_share)+文件发送(transfer_chat_file_send) +// 上次更新: 修复firstWhere无orElse导致StateError，改用firstWhereOrNull // ============================================================ import 'dart:async'; @@ -19,6 +19,7 @@ import 'package:visibility_detector/visibility_detector.dart'; import 'package:dotted_border/dotted_border.dart'; import 'package:share_plus/share_plus.dart'; import 'package:url_launcher/url_launcher.dart' as url_launcher; +import 'package:collection/collection.dart'; import 'package:xianyan/core/theme/app_radius.dart'; import 'package:xianyan/core/theme/app_theme.dart'; @@ -96,6 +97,7 @@ class _TransferChatPageState extends ConsumerState { }); WidgetsBinding.instance.addPostFrameCallback((_) { if (!mounted) return; + ref.read(transferProvider.notifier).ensureDeviceKnown(widget.peerDevice); ref .read(transferProvider.notifier) .setCurrentSession('session-${widget.peerDevice.id}'); @@ -318,8 +320,9 @@ class _TransferChatPageState extends ConsumerState { HapticService.error(); } } else { - final prevMsg = prevMsgs.firstWhere((m) => m.id == msg.id); - if (msg.isFileMessage && + final prevMsg = prevMsgs.firstWhereOrNull((m) => m.id == msg.id); + if (prevMsg != null && + msg.isFileMessage && prevMsg.transferStatus != msg.transferStatus) { if (msg.transferStatus == TransferTaskStatus.completed) { HapticService.success(); @@ -383,67 +386,79 @@ class _TransferChatPageState extends ConsumerState { mainAxisSize: MainAxisSize.min, children: [ GestureDetector( + behavior: HitTestBehavior.opaque, onTap: _openCanvas, - child: Container( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.sm, - vertical: AppSpacing.xs, - ), - decoration: BoxDecoration( - color: ext.accent.withValues(alpha: 0.1), - borderRadius: AppRadius.pillBorder, - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - const Text('🎨', style: TextStyle(fontSize: 14)), - const SizedBox(width: 3), - Text( - '画布', - style: AppTypography.caption1.copyWith( - color: ext.accent, - fontWeight: FontWeight.w600, + child: ConstrainedBox( + constraints: const BoxConstraints(minWidth: 44, minHeight: 44), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.sm, + vertical: AppSpacing.xs, + ), + decoration: BoxDecoration( + color: ext.accent.withValues(alpha: 0.1), + borderRadius: AppRadius.pillBorder, + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + const Text('🎨', style: TextStyle(fontSize: 14)), + const SizedBox(width: 3), + Text( + '画布', + style: AppTypography.caption1.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), ), - ), - ], + ], + ), ), ), ), const SizedBox(width: AppSpacing.sm), GestureDetector( + behavior: HitTestBehavior.opaque, onTap: _showScreenShareOptions, - child: Container( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.sm, - vertical: AppSpacing.xs, - ), - decoration: BoxDecoration( - color: ext.infoColor.withValues(alpha: 0.1), - borderRadius: AppRadius.pillBorder, - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - const Text('📺', style: TextStyle(fontSize: 14)), - const SizedBox(width: 3), - Text( - '屏幕', - style: AppTypography.caption1.copyWith( - color: ext.infoColor, - fontWeight: FontWeight.w600, + child: ConstrainedBox( + constraints: const BoxConstraints(minWidth: 44, minHeight: 44), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.sm, + vertical: AppSpacing.xs, + ), + decoration: BoxDecoration( + color: ext.infoColor.withValues(alpha: 0.1), + borderRadius: AppRadius.pillBorder, + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + const Text('📺', style: TextStyle(fontSize: 14)), + const SizedBox(width: 3), + Text( + '屏幕', + style: AppTypography.caption1.copyWith( + color: ext.infoColor, + fontWeight: FontWeight.w600, + ), ), - ), - ], + ], + ), ), ), ), const SizedBox(width: AppSpacing.sm), GestureDetector( + behavior: HitTestBehavior.opaque, onTap: () => _showPeerInfo(ext), - child: Icon( - CupertinoIcons.info_circle, - color: ext.iconSecondary, - size: 22, + child: ConstrainedBox( + constraints: const BoxConstraints(minWidth: 44, minHeight: 44), + child: Icon( + CupertinoIcons.info_circle, + color: ext.iconSecondary, + size: 22, + ), ), ), ], diff --git a/lib/features/file_transfer/presentation/pages/transfer_settings_page.dart b/lib/features/file_transfer/presentation/pages/transfer_settings_page.dart index 894a016a..4fd5f5fd 100644 --- a/lib/features/file_transfer/presentation/pages/transfer_settings_page.dart +++ b/lib/features/file_transfer/presentation/pages/transfer_settings_page.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 传输设置页面 // 创建时间: 2026-05-10 -// 更新时间: 2026-05-13 +// 更新时间: 2026-05-20 // 作用: 文件传输助手设置页 — 传输偏好/安全与隐私/网络/配对/缓存/高级 -// 上次更新: v6.1.0 新增安全与隐私分组(消息加密+算法选择+密钥协商) +// 上次更新: 修复4个低优先级问题：调试开关连接provider+导航调试面板、加密算法改为静态展示、信令状态动态化、移除fromJsonWithDefaults // ============================================================ import 'package:flutter/cupertino.dart'; @@ -17,6 +17,8 @@ import 'package:xianyan/shared/widgets/app_toast.dart'; import 'package:xianyan/features/file_transfer/providers/providers.dart'; import 'package:xianyan/features/file_transfer/models/models.dart'; import 'package:xianyan/features/file_transfer/presentation/pages/transfer_stats_page.dart'; +import 'package:xianyan/features/file_transfer/presentation/pages/file_transfer_page.dart'; +import 'package:xianyan/features/file_transfer/presentation/pages/file_transfer_debug_panel.dart'; class TransferSettingsPage extends ConsumerStatefulWidget { const TransferSettingsPage({super.key}); @@ -112,7 +114,14 @@ class _TransferSettingsPageState extends ConsumerState { icon: CupertinoIcons.doc_text, title: '传输记录', value: '查看历史', - onTap: () => _clearTransferRecords(), + onTap: () { + Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => const FileTransferPage(initialTab: 2), + ), + ); + }, + onLongPress: () => _clearTransferRecords(), ), _buildNavigationTile( ext, @@ -139,12 +148,27 @@ class _TransferSettingsPageState extends ConsumerState { value: settings.encryptMessages, onChanged: (v) => _onEncryptMessagesChanged(ext, v), ), - _buildNavigationTile( - ext, - icon: CupertinoIcons.number, - title: '加密算法', - value: settings.encryptionAlgorithm, - onTap: () => _showEncryptionAlgorithmPicker(ext), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + child: Row( + children: [ + Icon(CupertinoIcons.number, size: 20, color: ext.iconSecondary), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: Text( + '加密算法', + style: AppTypography.subhead.copyWith(color: ext.textPrimary), + ), + ), + Text( + settings.encryptionAlgorithm, + style: AppTypography.caption1.copyWith(color: ext.textHint), + ), + ], + ), ), _buildNavigationTile( ext, @@ -218,7 +242,13 @@ class _TransferSettingsPageState extends ConsumerState { ext, icon: CupertinoIcons.globe, title: '信令服务器', - value: 'wss://tools.wktyl.com:9443', + value: ref + .read(transferProvider.notifier) + .pairingService + .signalingService + .isConnected + ? '🟢 已连接' + : '🔴 未连接', onTap: () => _showSignalingConfig(ext), ), _buildNavigationTile( @@ -233,8 +263,17 @@ class _TransferSettingsPageState extends ConsumerState { icon: CupertinoIcons.ant, title: '调试模式', subtitle: '显示调试面板和日志', - value: false, - onChanged: (v) {}, + value: settings.debugMode, + onChanged: (v) { + settingsNotifier.setDebugMode(v); + if (v) { + Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => const _DebugPanelPage(), + ), + ); + } + }, ), ]), const SizedBox(height: AppSpacing.xl), @@ -341,9 +380,11 @@ class _TransferSettingsPageState extends ConsumerState { required String title, required String value, required VoidCallback onTap, + VoidCallback? onLongPress, }) { return GestureDetector( onTap: onTap, + onLongPress: onLongPress, behavior: HitTestBehavior.opaque, child: Padding( padding: const EdgeInsets.symmetric( @@ -658,15 +699,21 @@ class _TransferSettingsPageState extends ConsumerState { // ============================================================ void _showSignalingConfig(AppThemeExtension ext) { + final isConnected = ref + .read(transferProvider.notifier) + .pairingService + .signalingService + .isConnected; + final settings = ref.read(transferSettingsProvider); showCupertinoDialog( context: context, builder: (ctx) => CupertinoAlertDialog( title: const Text('信令服务器'), - content: const Text( + content: Text( '当前信令服务器:\n' - 'wss://tools.wktyl.com:9443\n\n' + '${settings.signalingServerUrl}\n\n' '协议: xianyan-v1, localsend-v2\n' - '状态: 已连接', + '状态: ${isConnected ? '🟢 已连接' : '🔴 未连接'}', ), actions: [ CupertinoDialogAction( @@ -754,62 +801,6 @@ class _TransferSettingsPageState extends ConsumerState { } } - void _showEncryptionAlgorithmPicker(AppThemeExtension ext) { - const algorithms = ['AES-256-CBC']; - final current = ref.read(transferSettingsProvider).encryptionAlgorithm; - showCupertinoDialog( - context: context, - builder: (ctx) => CupertinoAlertDialog( - title: const Text('加密算法'), - content: Column( - children: algorithms.map((algo) { - final isSelected = algo == current; - return GestureDetector( - onTap: () { - ref - .read(transferSettingsProvider.notifier) - .setEncryptionAlgorithm(algo); - Navigator.pop(ctx); - }, - child: Padding( - padding: const EdgeInsets.symmetric(vertical: AppSpacing.sm), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - algo, - style: AppTypography.subhead.copyWith( - color: isSelected ? ext.accent : ext.textPrimary, - fontWeight: isSelected - ? FontWeight.w600 - : FontWeight.normal, - ), - ), - if (isSelected) ...[ - const SizedBox(width: AppSpacing.xs), - Icon( - CupertinoIcons.checkmark_alt, - size: 16, - color: ext.accent, - ), - ], - ], - ), - ), - ); - }).toList(), - ), - actions: [ - CupertinoDialogAction( - isDefaultAction: true, - onPressed: () => Navigator.pop(ctx), - child: const Text('取消'), - ), - ], - ), - ); - } - void _regenerateEncryptionKey(AppThemeExtension ext) { showCupertinoDialog( context: context, @@ -974,3 +965,104 @@ class _TransferSettingsPageState extends ConsumerState { return '${date.year}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}'; } } + +// ============================================================ +// 调试面板页面 — 开启调试模式后导航到此页 +// ============================================================ + +class _DebugPanelPage extends ConsumerStatefulWidget { + const _DebugPanelPage(); + + @override + ConsumerState<_DebugPanelPage> createState() => _DebugPanelPageState(); +} + +class _DebugPanelPageState extends ConsumerState<_DebugPanelPage> + with FileTransferDebugPanel<_DebugPanelPage> { + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + return CupertinoPageScaffold( + backgroundColor: ext.bgPrimary, + navigationBar: CupertinoNavigationBar( + backgroundColor: ext.bgPrimary.withValues(alpha: 0.85), + border: null, + middle: Text( + '🐛 调试面板', + style: AppTypography.headline.copyWith(color: ext.textPrimary), + ), + ), + child: SafeArea( + child: ListView( + padding: const EdgeInsets.all(AppSpacing.md), + children: [ + _buildDebugActionTile( + ext, + icon: CupertinoIcons.arrow_down_doc, + title: '📥 模拟接收文件', + onTap: simulateIncomingTransfer, + ), + _buildDebugActionTile( + ext, + icon: CupertinoIcons.search, + title: '🔍 模拟设备发现', + onTap: simulateDeviceDiscovery, + ), + _buildDebugActionTile( + ext, + icon: CupertinoIcons.globe, + title: '🌐 模拟WebRTC连接', + onTap: simulateWebRtcConnection, + ), + _buildDebugActionTile( + ext, + icon: CupertinoIcons.chart_bar, + title: '📊 打印传输状态', + onTap: printTransferState, + ), + const SizedBox(height: AppSpacing.lg), + Center( + child: Text( + '调试功能仅供开发测试使用', + style: AppTypography.caption2.copyWith(color: ext.textHint), + ), + ), + ], + ), + ), + ); + } + + Widget _buildDebugActionTile( + AppThemeExtension ext, { + required IconData icon, + required String title, + required VoidCallback onTap, + }) { + return Padding( + padding: const EdgeInsets.only(bottom: AppSpacing.sm), + child: GestureDetector( + onTap: onTap, + child: Container( + padding: const EdgeInsets.all(AppSpacing.md), + decoration: BoxDecoration( + color: ext.bgCard, + borderRadius: AppRadius.lgBorder, + ), + child: Row( + children: [ + Icon(icon, size: 22, color: ext.accent), + const SizedBox(width: AppSpacing.sm), + Text( + title, + style: AppTypography.subhead.copyWith(color: ext.textPrimary), + ), + const Spacer(), + Icon(CupertinoIcons.chevron_right, color: ext.textHint, size: 14), + ], + ), + ), + ), + ); + } +} diff --git a/lib/features/file_transfer/providers/device_discovery_provider.dart b/lib/features/file_transfer/providers/device_discovery_provider.dart index 6cd01142..8ef7c777 100644 --- a/lib/features/file_transfer/providers/device_discovery_provider.dart +++ b/lib/features/file_transfer/providers/device_discovery_provider.dart @@ -73,7 +73,7 @@ class DeviceDiscoveryState { discoveredDevices: discoveredDevices ?? this.discoveredDevices, isScanning: isScanning ?? this.isScanning, scanProgress: scanProgress ?? this.scanProgress, - errorMessage: errorMessage, + errorMessage: errorMessage ?? this.errorMessage, isBluetoothAvailable: isBluetoothAvailable ?? this.isBluetoothAvailable, isNfcAvailable: isNfcAvailable ?? this.isNfcAvailable, isUsbAvailable: isUsbAvailable ?? this.isUsbAvailable, diff --git a/lib/features/file_transfer/providers/transfer_notifier.dart b/lib/features/file_transfer/providers/transfer_notifier.dart index 64713674..9154cf8c 100644 --- a/lib/features/file_transfer/providers/transfer_notifier.dart +++ b/lib/features/file_transfer/providers/transfer_notifier.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 文件传输助手状态管理 // 创建时间: 2026-05-09 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: 传输任务状态+消息+进度+Drift持久化+送达回执+handler委托+离线队列+USB发现+屏幕共享 -// 上次更新: v13.7.0 新增addCanvasInviteMessage方法 +// 上次更新: v14.37.0 修复消息重复插入风险(添加_addMessageDedup去重)，新增toggleDeviceFavorite方法实现收藏功能 // ============================================================ import 'dart:async'; @@ -13,6 +13,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:uuid/uuid.dart'; import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/core/services/device/device_info_service.dart'; import 'package:xianyan/shared/widgets/app_toast.dart'; import 'package:xianyan/features/auth/providers/auth_provider.dart'; import 'package:xianyan/features/file_transfer/models/models.dart'; @@ -46,16 +47,15 @@ class TransferNotifier extends Notifier { } final _uuid = const Uuid(); - // ignore: unused_field - final bool _mounted = true; + bool _mounted = false; bool get mounted => _mounted; String get _deviceId => ref.read(authProvider).user?.id.toString() ?? 'unknown'; final PairingService _pairingService = PairingService(); - late final WsRelayService _wsRelayService; - late final TransportRouter _transportRouter; - late final DeliveryReceiptService _deliveryReceiptService; + WsRelayService? _wsRelayService; + TransportRouter? _transportRouter; + DeliveryReceiptService? _deliveryReceiptService; final CacheManagerService _cacheManager = CacheManagerService(); final TransferDatabase _db = TransferDatabase.instance; final CloudCacheService _cloudCacheService = CloudCacheService(); @@ -63,12 +63,12 @@ class TransferNotifier extends Notifier { MessageEncryptionService(); final UsbDiscoveryService _usbDiscoveryService = UsbDiscoveryService(); - late final TransferPairingHandler _pairingHandler; - late final TransferSignalingHandler _signalingHandler; - late final TransferMessageHandler _messageHandler; - late final TransferCloudHandler _cloudHandler; - late final TransferFileHandler _fileHandler; - late final TransferOfflineHandler _offlineHandler; + TransferPairingHandler? _pairingHandler; + TransferSignalingHandler? _signalingHandler; + TransferMessageHandler? _messageHandler; + TransferCloudHandler? _cloudHandler; + TransferFileHandler? _fileHandler; + TransferOfflineHandler? _offlineHandler; StreamSubscription? _localSendMessageSub; StreamSubscription? _nearbyMessageSub; @@ -79,30 +79,32 @@ class TransferNotifier extends Notifier { static const int _pageSize = 50; PairingService get pairingService => _pairingService; - TransportRouter get transportRouter => _transportRouter; - WsRelayService get wsRelayService => _wsRelayService; - DeliveryReceiptService get deliveryReceiptService => _deliveryReceiptService; + TransportRouter get transportRouter => _transportRouter!; + WsRelayService get wsRelayService => _wsRelayService!; + DeliveryReceiptService get deliveryReceiptService => _deliveryReceiptService!; OfflineQueueService get offlineQueueService => - _offlineHandler.offlineQueueService; + _offlineHandler!.offlineQueueService; MessageEncryptionService get encryptionService => _encryptionService; Future _init() async { + _mounted = true; try { + await DeviceInfoService.initCache(); + _wsRelayService = WsRelayService( signalingService: _pairingService.signalingService, ); - _wsRelayService.onTextReceived = _handleWsRelayText; - _wsRelayService.onFileReceived = _handleWsRelayFile; - _wsRelayService.onFileMetaReceived = _handleWsRelayFileMeta; - _wsRelayService.onFileChunkReceived = _handleWsRelayFileChunk; - _wsRelayService.onFileError = _handleWsRelayFileError; + _wsRelayService!.onTextReceived = _handleWsRelayText; + _wsRelayService!.onFileReceived = _handleWsRelayFile; + _wsRelayService!.onFileMetaReceived = _handleWsRelayFileMeta; + _wsRelayService!.onFileChunkReceived = _handleWsRelayFileChunk; + _wsRelayService!.onFileError = _handleWsRelayFileError; - _transportRouter = TransportRouter(wsRelayService: _wsRelayService); + _transportRouter = TransportRouter(wsRelayService: _wsRelayService!); - // 设置本机设备指纹标识 if (mounted) { state = state.copyWith( - localFingerprint: _transportRouter.localSendService.fingerprint, + localFingerprint: _transportRouter!.localSendService.fingerprint, ); } @@ -115,10 +117,10 @@ class TransferNotifier extends Notifier { reader: () => state, isMounted: () => mounted, db: _db, - transportRouter: _transportRouter, - wsRelayService: _wsRelayService, + transportRouter: _transportRouter!, + wsRelayService: _wsRelayService!, signalingService: _pairingService.signalingService, - deliveryReceiptService: _deliveryReceiptService, + deliveryReceiptService: _deliveryReceiptService!, encryptionService: _encryptionService, getDeviceId: () => _deviceId, getDeviceAlias: () => ref.read(transferSettingsProvider).deviceName, @@ -130,7 +132,7 @@ class TransferNotifier extends Notifier { _cloudHandler = TransferCloudHandler( updater: _emitUpdate, reader: () => state, - addSystemMessage: _messageHandler.addSystemMessage, + addSystemMessage: _messageHandler!.addSystemMessage, isMounted: () => mounted, cloudCacheService: _cloudCacheService, signalingService: _pairingService.signalingService, @@ -143,10 +145,10 @@ class TransferNotifier extends Notifier { isMounted: () => mounted, uuid: _uuid, db: _db, - transportRouter: _transportRouter, - wsRelayService: _wsRelayService, - addSystemMessage: _messageHandler.addSystemMessage, - addFileMessage: _messageHandler.addFileMessage, + transportRouter: _transportRouter!, + wsRelayService: _wsRelayService!, + addSystemMessage: _messageHandler!.addSystemMessage, + addFileMessage: _messageHandler!.addFileMessage, probePeer: _probePeer, ensureHttpServerRunning: _ensureHttpServerRunning, getDeviceId: () => _deviceId, @@ -165,16 +167,16 @@ class TransferNotifier extends Notifier { reader: () => state, isMounted: () => mounted, db: _db, - addSystemMessage: _messageHandler.addSystemMessage, + addSystemMessage: _messageHandler!.addSystemMessage, sendTextMessage: ({required peer, required text}) => - _messageHandler.sendTextMessage(peer: peer, text: text), + _messageHandler!.sendTextMessage(peer: peer, text: text), sendFiles: sendFiles, ); - _fileHandler.enqueueOfflineFile = _offlineHandler.enqueueOfflineFile; - _fileHandler.uploadToCloudCache = + _fileHandler!.enqueueOfflineFile = _offlineHandler!.enqueueOfflineFile; + _fileHandler!.uploadToCloudCache = ({required file, required fromId, required toId, expireHours = 24}) => - _cloudHandler.uploadToCloudCache( + _cloudHandler!.uploadToCloudCache( file: file, fromId: fromId, toId: toId, @@ -184,9 +186,9 @@ class TransferNotifier extends Notifier { _pairingHandler = TransferPairingHandler( updater: _emitUpdate, reader: () => state, - addSystemMessage: _messageHandler.addSystemMessage, + addSystemMessage: _messageHandler!.addSystemMessage, pairingService: _pairingService, - transportRouter: _transportRouter, + transportRouter: _transportRouter!, db: _db, ensureHttpServerRunning: _ensureHttpServerRunning, probePeer: _probePeer, @@ -198,19 +200,19 @@ class TransferNotifier extends Notifier { _signalingHandler = TransferSignalingHandler( updater: _emitUpdate, reader: () => state, - addSystemMessage: _messageHandler.addSystemMessage, - addFileMessage: _messageHandler.addFileMessage, - updateFileMessageProgress: _fileHandler.updateFileMessageProgress, - addTask: _fileHandler.addTask, - replaceTask: _fileHandler.replaceTask, - lookupMimeType: _fileHandler.resolveMimeType, + addSystemMessage: _messageHandler!.addSystemMessage, + addFileMessage: _messageHandler!.addFileMessage, + updateFileMessageProgress: _fileHandler!.updateFileMessageProgress, + addTask: _fileHandler!.addTask, + replaceTask: _fileHandler!.replaceTask, + lookupMimeType: _fileHandler!.resolveMimeType, isMounted: () => mounted, db: _db, encryptionService: _encryptionService, - onWsRelayMessage: _wsRelayService.handleWsRelayMessage, + onWsRelayMessage: _wsRelayService!.handleWsRelayMessage, onCloudCacheNotify: handleCloudCacheNotify, markAsDelivered: (peerDeviceId, messageId) { - _deliveryReceiptService.markAsDelivered(peerDeviceId, messageId); + _deliveryReceiptService!.markAsDelivered(peerDeviceId, messageId); }, onScreenShareOffer: (from, sessionId, hotZonesData) { _handleScreenShareOffer(from, sessionId, hotZonesData); @@ -231,9 +233,9 @@ class TransferNotifier extends Notifier { await _loadPairedDevices(); await _loadRecentMessages(); - _offlineHandler.init(); + _offlineHandler?.init(); _setupListeners(); - _fileHandler.setupTransportListeners(); + _fileHandler?.setupTransportListeners(); await _ensureHttpServerRunning(); _autoConnectSignaling(); await _encryptionService.initialize(); @@ -253,7 +255,7 @@ class TransferNotifier extends Notifier { void _setupListeners() { ref.listen(authProvider, (prev, next) { if (!mounted) return; - _signalingHandler.onAuthStateChanged( + _signalingHandler!.onAuthStateChanged( prev, next, _pairingService.signalingService, @@ -265,30 +267,30 @@ class TransferNotifier extends Notifier { _encryptionService.setEnabled(next.encryptMessages); }); - _pairingHandler.setupListeners(); - _signalingHandler.setupMyDevicesListener(_pairingService.signalingService); - _signalingHandler.setupConnectionChangeListener( + _pairingHandler!.setupListeners(); + _signalingHandler!.setupMyDevicesListener(_pairingService.signalingService); + _signalingHandler!.setupConnectionChangeListener( + _pairingService.signalingService, + ); + _signalingHandler!.ensureSignalingListener( _pairingService.signalingService, ); - _signalingHandler.ensureSignalingListener(_pairingService.signalingService); - _localSendMessageSub = _transportRouter.localSendService.onIncomingMessage + _localSendMessageSub = _transportRouter!.localSendService.onIncomingMessage .listen((TransferMessage msg) { Future.microtask(() async { if (!mounted) return; final processedMsg = await _processIncomingMessage(msg); if (processedMsg == null) return; - state = state.copyWith( - messages: [processedMsg, ...state.messages], - ); + if (!_addMessageDedup(processedMsg)) return; _db.insertMessage(processedMsg); if (processedMsg.type == TransferMessageType.pairingAccept) { - _messageHandler.addSystemMessage( + _messageHandler!.addSystemMessage( '🎉 ${processedMsg.deviceAlias ?? "对方"} 与你配对成功！', ); - _messageHandler.addSystemMessage('💡 现在可以互发消息和文件了'); + _messageHandler!.addSystemMessage('💡 现在可以互发消息和文件了'); AppToast.showSuccess( '${processedMsg.deviceAlias ?? "对方"} 与你配对成功！', ); @@ -297,7 +299,7 @@ class TransferNotifier extends Notifier { AppToast.showInfo( '${processedMsg.deviceAlias ?? "对方"}: ${processedMsg.content.length > 30 ? processedMsg.content.substring(0, 30) + "..." : processedMsg.content}', ); - _deliveryReceiptService.markAsDelivered( + _deliveryReceiptService!.markAsDelivered( processedMsg.peerDeviceId ?? '', processedMsg.id, ); @@ -305,9 +307,9 @@ class TransferNotifier extends Notifier { }); }); - _deliveryReceiptService.startListening(); - _signalingHandler.setupReceiptListener(_deliveryReceiptService); - _signalingHandler.setupDeviceOnlineListener( + _deliveryReceiptService!.startListening(); + _signalingHandler!.setupReceiptListener(_deliveryReceiptService!); + _signalingHandler!.setupDeviceOnlineListener( _pairingService.signalingService, ); @@ -316,7 +318,7 @@ class TransferNotifier extends Notifier { if (event.isOnline) { Future.microtask(() { if (!mounted) return; - _offlineHandler.onDeviceCameOnline(event.deviceId); + _offlineHandler!.onDeviceCameOnline(event.deviceId); }); } }); @@ -350,7 +352,7 @@ class TransferNotifier extends Notifier { } void _setupNearbyServiceListeners() { - final nearby = _transportRouter.nearbyServiceAdapter; + final nearby = _transportRouter!.nearbyServiceAdapter; _nearbyMessageSub = nearby.onIncomingMessage.listen((msg) { Future.microtask(() async { @@ -358,9 +360,7 @@ class TransferNotifier extends Notifier { final processedMsg = await _processIncomingMessage(msg); if (processedMsg == null) return; - state = state.copyWith( - messages: [processedMsg, ...state.messages], - ); + if (!_addMessageDedup(processedMsg)) return; _db.insertMessage(processedMsg); if (processedMsg.type == TransferMessageType.text) { @@ -383,7 +383,7 @@ class TransferNotifier extends Notifier { discoveredDevices: [...state.discoveredDevices, ...newDevices], ); for (final d in newDevices) { - _messageHandler.addSystemMessage( + _messageHandler!.addSystemMessage( '📶 发现Wi-Fi Direct设备: ${d.displayAlias}', ); } @@ -413,7 +413,7 @@ class TransferNotifier extends Notifier { state = state.copyWith( discoveredDevices: [...state.discoveredDevices, transferDevice], ); - _messageHandler.addSystemMessage( + _messageHandler!.addSystemMessage( '🔌 发现USB设备: ${device.deviceName} (${device.usbVersion.label})', ); } @@ -430,7 +430,7 @@ class TransferNotifier extends Notifier { .where((d) => d.id != deviceId) .toList(); state = state.copyWith(discoveredDevices: updated); - _messageHandler.addSystemMessage('🔌 USB设备已断开: ${device.deviceName}'); + _messageHandler!.addSystemMessage('🔌 USB设备已断开: ${device.deviceName}'); }); }); } @@ -439,6 +439,16 @@ class TransferNotifier extends Notifier { if (mounted) state = fn(state); } + /// 基于messageId的去重插入，防止_localSendMessageSub与_nearbyMessageSub重复插入同一条消息 + bool _addMessageDedup(TransferMessage msg) { + if (state.messages.any((m) => m.id == msg.id)) { + Log.w('TransferNotifier: 重复消息已跳过, id=${msg.id}'); + return false; + } + state = state.copyWith(messages: [msg, ...state.messages]); + return true; + } + void _syncEncryptionSettings() { final settings = ref.read(transferSettingsProvider); _encryptionService.setEnabled(settings.encryptMessages); @@ -448,17 +458,32 @@ class TransferNotifier extends Notifier { // 设备发现 + Wi-Fi Direct + USB + 配对 — 委托 pairingHandler / fileHandler // ============================================================ + void ensureDeviceKnown(TransferDevice device) { + final exists = + state.discoveredDevices.any((d) => d.id == device.id) || + state.myDevices.any((d) => d.id == device.id) || + state.pairedDevices.any((p) => p.deviceId == device.id); + if (!exists) { + state = state.copyWith( + discoveredDevices: [device, ...state.discoveredDevices], + ); + Log.i( + 'TransferNotifier: ensureDeviceKnown — registered ${device.id} (${device.alias})', + ); + } + } + Future startDiscovery(Set methods) => - _pairingHandler.startDiscovery(methods); - Future stopDiscovery() => _pairingHandler.stopDiscovery(); + _pairingHandler!.startDiscovery(methods); + Future stopDiscovery() => _pairingHandler!.stopDiscovery(); Future startWifiDirectDiscovery() => - _fileHandler.startWifiDirectDiscovery(); + _fileHandler!.startWifiDirectDiscovery(); Future stopWifiDirectDiscovery() => - _fileHandler.stopWifiDirectDiscovery(); + _fileHandler!.stopWifiDirectDiscovery(); Future connectWifiDirect(String deviceId) => - _fileHandler.connectWifiDirect(deviceId); - Future disconnectWifiDirect() => _fileHandler.disconnectWifiDirect(); + _fileHandler!.connectWifiDirect(deviceId); + Future disconnectWifiDirect() => _fileHandler!.disconnectWifiDirect(); Future startUsbMonitoring() => _usbDiscoveryService.startMonitoring(); Future stopUsbMonitoring() => _usbDiscoveryService.stopMonitoring(); @@ -469,18 +494,18 @@ class TransferNotifier extends Notifier { Future sendFilesUsb({ required UsbDevice usbDevice, required List filePaths, - }) => _fileHandler.sendFilesUsb(usbDevice: usbDevice, filePaths: filePaths); + }) => _fileHandler!.sendFilesUsb(usbDevice: usbDevice, filePaths: filePaths); Future pairWithDevice(TransferDevice device) => - _pairingHandler.pairWithDevice(device); + _pairingHandler!.pairWithDevice(device); Future pairWithQrCode(String qrPayload) => - _pairingHandler.pairWithQrCode(qrPayload); + _pairingHandler!.pairWithQrCode(qrPayload); Future pairWithManualIp(String ip, {int port = 53317}) => - _pairingHandler.pairWithManualIp(ip, port: port); + _pairingHandler!.pairWithManualIp(ip, port: port); Future removePairing(String deviceId) => - _pairingHandler.removePairing(deviceId); - void unpairDevice(String deviceId) => _pairingHandler.unpairDevice(deviceId); - Future removeAllPairings() => _pairingHandler.removeAllPairings(); + _pairingHandler!.removePairing(deviceId); + void unpairDevice(String deviceId) => _pairingHandler!.unpairDevice(deviceId); + Future removeAllPairings() => _pairingHandler!.removeAllPairings(); // ============================================================ // 传输 + 消息 + 任务控制 — 委托 fileHandler / messageHandler / offlineHandler @@ -490,7 +515,7 @@ class TransferNotifier extends Notifier { required TransferDevice peer, required List filePaths, bool forceCloudCache = false, - }) => _fileHandler.sendFiles( + }) => _fileHandler!.sendFiles( peer: peer, filePaths: filePaths, forceCloudCache: forceCloudCache, @@ -505,7 +530,7 @@ class TransferNotifier extends Notifier { (peer.ip == null || peer.ip!.isEmpty) && !_pairingService.signalingService.isConnected; if (isOffline) { - await _offlineHandler.enqueueOfflineMessage( + await _offlineHandler!.enqueueOfflineMessage( targetDeviceId: peer.id, content: text, deviceAlias: peer.alias, @@ -513,13 +538,13 @@ class TransferNotifier extends Notifier { AppToast.showInfo('对方离线，消息已暂存'); return; } - await _messageHandler.sendTextMessage(peer: peer, text: text); + await _messageHandler!.sendTextMessage(peer: peer, text: text); } Future sendVoiceMessage({ required TransferDevice peer, required VoiceMessageData voiceData, - }) => _messageHandler.sendVoiceMessage(peer: peer, voiceData: voiceData); + }) => _messageHandler!.sendVoiceMessage(peer: peer, voiceData: voiceData); void addCanvasInviteMessage({ required String canvasId, @@ -550,8 +575,9 @@ class TransferNotifier extends Notifier { _db.insertMessage(msg); Log.i('TransferNotifier: added canvas invite for canvasId=$canvasId'); } + Future markMessageAsRead(String messageId, String peerDeviceId) => - _messageHandler.markMessageAsRead(messageId, peerDeviceId); + _messageHandler!.markMessageAsRead(messageId, peerDeviceId); void deleteMessage(String messageId) { final updated = state.messages.where((m) => m.id != messageId).toList(); @@ -559,19 +585,19 @@ class TransferNotifier extends Notifier { _db.deleteMessage(messageId); } - Future cancelTask(String taskId) => _fileHandler.cancelTask(taskId); - Future pauseTask(String taskId) => _fileHandler.pauseTask(taskId); - Future resumeTask(String taskId) => _fileHandler.resumeTask(taskId); - Future retryTask(String taskId) => _fileHandler.retryTask(taskId); + Future cancelTask(String taskId) => _fileHandler!.cancelTask(taskId); + Future pauseTask(String taskId) => _fileHandler!.pauseTask(taskId); + Future resumeTask(String taskId) => _fileHandler!.resumeTask(taskId); + Future retryTask(String taskId) => _fileHandler!.retryTask(taskId); void addSimulatedTask(TransferTask task) => - _fileHandler.addSimulatedTask(task); + _fileHandler!.addSimulatedTask(task); Future enqueueOfflineMessage({ required String targetDeviceId, required String content, String? messageId, String? deviceAlias, - }) => _offlineHandler.enqueueOfflineMessage( + }) => _offlineHandler!.enqueueOfflineMessage( targetDeviceId: targetDeviceId, content: content, messageId: messageId, @@ -583,7 +609,7 @@ class TransferNotifier extends Notifier { required String fileName, int? fileSize, String? deviceAlias, - }) => _offlineHandler.enqueueOfflineFile( + }) => _offlineHandler!.enqueueOfflineFile( targetDeviceId: targetDeviceId, filePath: filePath, fileName: fileName, @@ -591,19 +617,20 @@ class TransferNotifier extends Notifier { deviceAlias: deviceAlias, ); Future clearOfflineQueueForDevice(String deviceId) => - _offlineHandler.clearOfflineQueueForDevice(deviceId); + _offlineHandler!.clearOfflineQueueForDevice(deviceId); // ============================================================ // 信令 + WsRelay — 委托 signalingHandler // ============================================================ void _autoConnectSignaling() { - _signalingHandler.autoConnectSignaling( + _signalingHandler!.autoConnectSignaling( signaling: _pairingService.signalingService, - transportRouter: _transportRouter, + transportRouter: _transportRouter!, deviceId: _deviceId, authState: ref.read(authProvider), settingsState: ref.read(transferSettingsProvider), + deviceModel: DeviceInfoService.cachedDeviceModel, ); } @@ -615,9 +642,9 @@ class TransferNotifier extends Notifier { String? ipCity, String? ipRange, }) async { - await _signalingHandler.connectSignaling( + await _signalingHandler!.connectSignaling( signaling: _pairingService.signalingService, - transportRouter: _transportRouter, + transportRouter: _transportRouter!, deviceId: _deviceId, serverUrl: serverUrl, alias: alias, @@ -625,18 +652,20 @@ class TransferNotifier extends Notifier { userId: userId, ipCity: ipCity, ipRange: ipRange, + deviceModel: DeviceInfoService.cachedDeviceModel, ); } Future disconnectSignaling() => - _signalingHandler.disconnectSignaling(_pairingService.signalingService); + _signalingHandler!.disconnectSignaling(_pairingService.signalingService); - Future discoverMyDevices() => _signalingHandler.discoverMyDevices( + Future discoverMyDevices() => _signalingHandler!.discoverMyDevices( signaling: _pairingService.signalingService, authState: ref.read(authProvider), - transportRouter: _transportRouter, + transportRouter: _transportRouter!, deviceId: _deviceId, settingsState: ref.read(transferSettingsProvider), + deviceModel: DeviceInfoService.cachedDeviceModel, ); Future sendFileToMyDevice({ @@ -644,85 +673,85 @@ class TransferNotifier extends Notifier { required String filePath, }) async { if (!mounted) return; - _messageHandler.addSystemMessage( + _messageHandler!.addSystemMessage( '📤 正在向我的设备 ${device.displayAlias} 发送文件...', ); await sendFiles(peer: device, filePaths: [filePath]); } Future initiateWebRtcCall(String targetId) => - _signalingHandler.initiateWebRtcCall( + _signalingHandler!.initiateWebRtcCall( signaling: _pairingService.signalingService, - transportRouter: _transportRouter, + transportRouter: _transportRouter!, targetId: targetId, ); void _handleWsRelayText(String fromId, String text) => - _signalingHandler.handleWsRelayText(fromId, text); + _signalingHandler!.handleWsRelayText(fromId, text); void _handleWsRelayFileMeta( String fromId, String fileName, int totalChunks, - ) => _signalingHandler.handleWsRelayFileMeta(fromId, fileName, totalChunks); + ) => _signalingHandler!.handleWsRelayFileMeta(fromId, fileName, totalChunks); void _handleWsRelayFileChunk( String fromId, String taskId, int receivedChunks, int totalChunks, - ) => _signalingHandler.handleWsRelayFileChunk( + ) => _signalingHandler!.handleWsRelayFileChunk( fromId, taskId, receivedChunks, totalChunks, ); void _handleWsRelayFile(WsRelayReceivedFile file) => - _signalingHandler.handleWsRelayFile(file); + _signalingHandler!.handleWsRelayFile(file); void _handleWsRelayFileError(String fromId, String taskId, String reason) => - _signalingHandler.handleWsRelayFileError(fromId, taskId, reason); + _signalingHandler!.handleWsRelayFileError(fromId, taskId, reason); // ============================================================ // 热点 + 云端暂存 + 缓存管理 // ============================================================ - Future startHotspot() => _pairingHandler.startHotspot(); - Future stopHotspot() => _pairingHandler.stopHotspot(); + Future startHotspot() => _pairingHandler!.startHotspot(); + Future stopHotspot() => _pairingHandler!.stopHotspot(); Future uploadToCloudCache({ required File file, required String fromId, required String toId, int expireHours = 24, - }) => _cloudHandler.uploadToCloudCache( + }) => _cloudHandler!.uploadToCloudCache( file: file, fromId: fromId, toId: toId, expireHours: expireHours, ); Future checkAndDownloadPendingCache(String userId) => - _cloudHandler.checkAndDownloadPendingCache(userId); + _cloudHandler!.checkAndDownloadPendingCache(userId); Future downloadFromCloudCache({ required CloudCacheRecord record, required String deviceId, String? savePath, - }) => _cloudHandler.downloadFromCloudCache( + }) => _cloudHandler!.downloadFromCloudCache( record: record, deviceId: deviceId, savePath: savePath, ); Future downloadAllPendingCache(String deviceId) => - _cloudHandler.downloadAllPendingCache(deviceId); + _cloudHandler!.downloadAllPendingCache(deviceId); void handleCloudCacheNotify(Map payload) => - _cloudHandler.handleCloudCacheNotify(payload); + _cloudHandler!.handleCloudCacheNotify(payload); Future getCacheSize() async => await _cacheManager.getTotalCacheSize(); Future clearCache() async { await _cacheManager.clearAll(); - _messageHandler.addSystemMessage('🗑️ 缓存已清理'); + _messageHandler!.addSystemMessage('🗑️ 缓存已清理'); } Future cleanOldRecords({int keepDays = 30}) async { await _cacheManager.cleanOldRecords(keepDays: keepDays); - _messageHandler.addSystemMessage('🗑️ 已清理 $keepDays 天前的记录'); + _messageHandler!.addSystemMessage('🗑️ 已清理 $keepDays 天前的记录'); } // ============================================================ @@ -762,7 +791,7 @@ class TransferNotifier extends Notifier { } await _db.updateDevice(deviceId, alias: newAlias); - _messageHandler.addSystemMessage('✏️ 设备已重命名为 $newAlias'); + _messageHandler!.addSystemMessage('✏️ 设备已重命名为 $newAlias'); Log.i('Transfer: Device renamed: $deviceId -> $newAlias'); } @@ -770,6 +799,49 @@ class TransferNotifier extends Notifier { return state.peerStatuses[deviceId]?.customAlias; } + /// 切换设备收藏状态，同步更新内存和数据库 + Future toggleDeviceFavorite(String deviceId) async { + final discoveredIdx = state.discoveredDevices.indexWhere( + (d) => d.id == deviceId, + ); + final myDeviceIdx = state.myDevices.indexWhere((d) => d.id == deviceId); + + TransferDevice? device; + if (discoveredIdx >= 0) { + device = state.discoveredDevices[discoveredIdx]; + } else if (myDeviceIdx >= 0) { + device = state.myDevices[myDeviceIdx]; + } + if (device == null) { + Log.w('TransferNotifier: toggleDeviceFavorite 未找到设备 $deviceId'); + return; + } + + final newFavorite = !device.isFavorite; + final updatedDevice = device.copyWith(isFavorite: newFavorite); + + if (discoveredIdx >= 0) { + final updatedList = List.from(state.discoveredDevices); + updatedList[discoveredIdx] = updatedDevice; + state = state.copyWith(discoveredDevices: updatedList); + } + if (myDeviceIdx >= 0) { + final updatedList = List.from(state.myDevices); + updatedList[myDeviceIdx] = updatedDevice; + state = state.copyWith(myDevices: updatedList); + } + + await _db.updateDevice(deviceId, isFavorite: newFavorite); + _messageHandler!.addSystemMessage( + newFavorite + ? '⭐ 已收藏 ${updatedDevice.displayAlias}' + : '☆ 已取消收藏 ${updatedDevice.displayAlias}', + ); + Log.i( + 'TransferNotifier: toggleDeviceFavorite $deviceId -> isFavorite=$newFavorite', + ); + } + // ============================================================ // 数据加载 // ============================================================ @@ -841,9 +913,9 @@ class TransferNotifier extends Notifier { // ============================================================ Future _ensureHttpServerRunning() async { - if (_transportRouter.localSendService.isHttpServerRunning) return; + if (_transportRouter!.localSendService.isHttpServerRunning) return; try { - await _transportRouter.localSendService.startHttpServer(); + await _transportRouter!.localSendService.startHttpServer(); Log.i('Transfer: HTTP server auto-started'); await _updateLanAccessUrl(); } catch (e) { @@ -853,9 +925,9 @@ class TransferNotifier extends Notifier { Future _updateLanAccessUrl() async { try { - final localIp = await _transportRouter.localSendService.getLocalIp(); + final localIp = await _transportRouter!.localSendService.getLocalIp(); if (localIp != null && localIp.isNotEmpty && mounted) { - final port = _transportRouter.localSendService.config.port; + final port = _transportRouter!.localSendService.config.port; final url = 'http://$localIp:$port'; state = state.copyWith(lanAccessUrl: url); Log.i('Transfer: LAN access URL updated: $url'); @@ -883,12 +955,12 @@ class TransferNotifier extends Notifier { Future _notifyPeerPaired(TransferDevice device) async { if (device.ip == null || device.ip!.isEmpty) return; try { - final result = await _transportRouter.localSendService + final result = await _transportRouter!.localSendService .sendPairingNotification( ip: device.ip!, port: device.port, - alias: _transportRouter.localSendService.config.alias, - fingerprint: _transportRouter.localSendService.fingerprint, + alias: _transportRouter!.localSendService.config.alias, + fingerprint: _transportRouter!.localSendService.fingerprint, ); if (result) { Log.i('Transfer: Pairing notification sent to ${device.alias}'); @@ -926,13 +998,13 @@ class TransferNotifier extends Notifier { void _handleScreenShareAnswer(String from, String sessionId) { if (!mounted) return; - _messageHandler.addSystemMessage('📺 对方已接受屏幕共享'); + _messageHandler!.addSystemMessage('📺 对方已接受屏幕共享'); Log.i('Transfer: ScreenShareAnswer from=$from sessionId=$sessionId'); } void _handleScreenShareStop(String from, String sessionId) { if (!mounted) return; - _messageHandler.addSystemMessage('📺 对方已停止屏幕共享'); + _messageHandler!.addSystemMessage('📺 对方已停止屏幕共享'); Log.i('Transfer: ScreenShareStop from=$from sessionId=$sessionId'); } @@ -952,7 +1024,7 @@ class TransferNotifier extends Notifier { Map candidate, ) { Log.i('Transfer: ScreenShareIceCandidate from=$from'); - _transportRouter.webRtcService.addScreenShareIceCandidate(candidate); + _transportRouter!.webRtcService.addScreenShareIceCandidate(candidate); } void clearPendingScreenShareOffer() { @@ -971,7 +1043,7 @@ class TransferNotifier extends Notifier { payload: {'sessionId': offer.sessionId}, ), ); - _messageHandler.addSystemMessage('📺 已接受屏幕共享请求'); + _messageHandler!.addSystemMessage('📺 已接受屏幕共享请求'); state = state.copyWith(pendingScreenShareOffer: null); Log.i('Transfer: ScreenShareOffer accepted, sessionId=${offer.sessionId}'); } @@ -979,25 +1051,26 @@ class TransferNotifier extends Notifier { void rejectScreenShareOffer() { final offer = state.pendingScreenShareOffer; if (offer == null) return; - _messageHandler.addSystemMessage('📺 已拒绝屏幕共享请求'); + _messageHandler!.addSystemMessage('📺 已拒绝屏幕共享请求'); state = state.copyWith(pendingScreenShareOffer: null); Log.i('Transfer: ScreenShareOffer rejected, sessionId=${offer.sessionId}'); } void _onDispose() { + _mounted = false; _localSendMessageSub?.cancel(); _nearbyMessageSub?.cancel(); _nearbyDevicesSub?.cancel(); _usbDeviceFoundSub?.cancel(); _usbDeviceRemovedSub?.cancel(); - _fileHandler.dispose(); - _offlineHandler.dispose(); - _pairingHandler.dispose(); - _signalingHandler.dispose(); - _deliveryReceiptService.dispose(); + _fileHandler?.dispose(); + _offlineHandler?.dispose(); + _pairingHandler?.dispose(); + _signalingHandler?.dispose(); + _deliveryReceiptService?.dispose(); _pairingService.dispose(); - _wsRelayService.dispose(); - _transportRouter.nearbyServiceAdapter.dispose(); + _wsRelayService?.dispose(); + _transportRouter?.nearbyServiceAdapter.dispose(); _usbDiscoveryService.dispose(); } } diff --git a/lib/features/file_transfer/providers/transfer_signaling_handler.dart b/lib/features/file_transfer/providers/transfer_signaling_handler.dart index 450baa01..0e32c87f 100644 --- a/lib/features/file_transfer/providers/transfer_signaling_handler.dart +++ b/lib/features/file_transfer/providers/transfer_signaling_handler.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 传输信令处理器 // 创建时间: 2026-05-12 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: 信令/WebRTC/WsRelay/设备发现/送达回执/ECDH密钥交换/屏幕共享处理 — 从TransferNotifier拆分 -// 上次更新: v13.8.0 updateFileMessageProgress签名增加errorMessage/handleWsRelayFileError同步更新消息失败状态 +// 上次更新: v14.31.0 connectSignaling/autoConnectSignaling/discoverMyDevices增加deviceModel参数 // ============================================================ import 'dart:async'; @@ -285,6 +285,7 @@ class TransferSignalingHandler { String? userId, String? ipCity, String? ipRange, + String? deviceModel, }) async { addSystemMessage('🔗 正在连接信令服务器...'); AppToast.showInfo('正在连接信令服务器...'); @@ -300,6 +301,7 @@ class TransferSignalingHandler { userId: userId, ipCity: ipCity, ipRange: ipRange, + deviceModel: deviceModel, ); addSystemMessage('✅ 信令服务器已连接'); AppToast.showSuccess('信令服务器已连接'); @@ -323,6 +325,7 @@ class TransferSignalingHandler { required String deviceId, required AuthState authState, required TransferSettings settingsState, + String? deviceModel, }) { ensureSignalingListener(signaling); if (signaling.isConnected) { @@ -341,6 +344,7 @@ class TransferSignalingHandler { userId: userId, fingerprint: fingerprint, serverUrl: settingsState.signalingServerUrl, + deviceModel: deviceModel, ) .timeout( const Duration(seconds: 8), @@ -389,6 +393,7 @@ class TransferSignalingHandler { TransportRouter? transportRouter, String? deviceId, TransferSettings? settingsState, + String? deviceModel, }) async { if (!signaling.isConnected) { Log.w('Transfer: discoverMyDevices - signaling not connected, attempting auto-connect'); @@ -409,6 +414,7 @@ class TransferSignalingHandler { userId: userId, fingerprint: fingerprint, serverUrl: settingsState?.signalingServerUrl, + deviceModel: deviceModel, ).timeout(const Duration(seconds: 8)); } catch (e) { Log.e('Transfer: discoverMyDevices auto-connect failed: $e'); diff --git a/lib/features/file_transfer/services/signaling_service.dart b/lib/features/file_transfer/services/signaling_service.dart index dc925055..b3d097e7 100644 --- a/lib/features/file_transfer/services/signaling_service.dart +++ b/lib/features/file_transfer/services/signaling_service.dart @@ -1,10 +1,10 @@ // ============================================================ // 闲言APP — WebSocket信令+消息中转服务 // 创建时间: 2026-05-09 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: WebRTC信令中转+文本消息互发+设备发现+协议协商+WebSocket中转 // 参考 SnapDrop WebSocket 中转 + LocalSend Signaling 协议 -// 上次更新: v13.2.0 新增配对码/雷达扫描/屏幕共享信令方法 +// 上次更新: v14.31.0 connect/updateUserId支持传入deviceModel替代Platform.localHostname // ============================================================ import 'dart:async'; @@ -195,6 +195,7 @@ class SignalingService { String? _userId; String? _ipCity; String? _ipRange; + String? _deviceModel; String? get deviceId => _deviceId; String? get userId => _userId; @@ -254,6 +255,7 @@ class SignalingService { String? userId, String? ipCity, String? ipRange, + String? deviceModel, }) async { _deviceId = deviceId; _alias = alias; @@ -261,6 +263,7 @@ class SignalingService { _userId = userId; _ipCity = ipCity; _ipRange = ipRange; + _deviceModel = deviceModel; try { Log.i('Signaling: Connecting to $serverUrl...'); @@ -315,7 +318,7 @@ class SignalingService { 'alias': alias ?? '闲言设备', 'fingerprint': fingerprint ?? '', 'deviceType': 'mobile', - 'deviceModel': Platform.localHostname, + 'deviceModel': _deviceModel ?? Platform.localHostname, if (userId != null) 'userId': userId, if (ipCity != null) 'ipCity': ipCity, if (ipRange != null) 'ipRange': ipRange, @@ -324,7 +327,7 @@ class SignalingService { _send(registerMsg); Log.i( - 'Signaling: Connected and registered (userId=$userId, alias=$alias, ipCity=$_ipCity)', + 'Signaling: Connected and registered (userId=$userId, alias=$alias, deviceModel=${_deviceModel ?? Platform.localHostname}, ipCity=$_ipCity)', ); } catch (e) { _isConnected = false; @@ -363,7 +366,7 @@ class SignalingService { 'alias': _alias ?? '闲言设备', 'fingerprint': _fingerprint ?? '', 'deviceType': 'mobile', - 'deviceModel': Platform.localHostname, + 'deviceModel': _deviceModel ?? Platform.localHostname, 'userId': userId, if (_ipCity != null) 'ipCity': _ipCity, if (_ipRange != null) 'ipRange': _ipRange, @@ -417,6 +420,7 @@ class SignalingService { userId: _userId, ipCity: _ipCity, ipRange: _ipRange, + deviceModel: _deviceModel, ), ).catchError((Object e) { Log.w('Signaling: Reconnect attempt failed: $e'); @@ -595,7 +599,7 @@ class SignalingService { _send(msg); } - Future createPairingCode({String? alias, String? deviceType}) async { + Future createPairingCode({String? alias, String? deviceType, String? pairingCode}) async { if (!_isConnected || _deviceId == null) { throw StateError('Signaling not connected'); } @@ -605,6 +609,7 @@ class SignalingService { payload: { if (alias != null) 'alias': alias, if (deviceType != null) 'deviceType': deviceType, + if (pairingCode != null) 'pairingCode': pairingCode, }, ); _send(msg); diff --git a/lib/features/file_transfer/services/transport/localsend_service.dart b/lib/features/file_transfer/services/transport/localsend_service.dart index e59c288a..c14ae0ee 100644 --- a/lib/features/file_transfer/services/transport/localsend_service.dart +++ b/lib/features/file_transfer/services/transport/localsend_service.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — LocalSend协议服务 // 创建时间: 2026-05-09 -// 更新时间: 2026-05-14 +// 更新时间: 2026-05-20 // 作用: 自主实现LocalSend Protocol v2.1 — UDP多播发现+shelf HTTP REST传输 -// 上次更新: 集成WebTransferHandler，支持Web端文件传输路由(F10) +// 上次更新: v14.36.0 getLocalIp修复鸿蒙端IP字节序反转+NetworkInterface备选方案 // ============================================================ import 'package:xianyan/core/utils/pattern_utils.dart'; @@ -22,6 +22,7 @@ import 'package:shelf/shelf_io.dart' as shelf_io; import 'package:shelf_router/shelf_router.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/core/services/device/device_info_service.dart'; import '../../models/transfer_enums.dart'; import '../../models/transfer_device.dart'; @@ -64,6 +65,10 @@ class LocalSendConfig { static String _generateDefaultAlias() { try { + final cachedName = DeviceInfoService.cachedDeviceName; + if (cachedName != null && cachedName.isNotEmpty && cachedName != 'Unknown') { + return '闲言·$cachedName'; + } final hostname = Platform.localHostname; if (hostname.isNotEmpty && hostname != 'localhost') { return '闲言·$hostname'; @@ -74,6 +79,10 @@ class LocalSendConfig { static String _detectDeviceModel() { try { + final cachedModel = DeviceInfoService.cachedDeviceModel; + if (cachedModel != null && cachedModel.isNotEmpty && cachedModel != 'Unknown') { + return cachedModel; + } if (pu.isOhos) return 'HarmonyOS'; if (Platform.isAndroid) return 'Android'; if (Platform.isIOS) return 'iOS'; @@ -180,13 +189,55 @@ class LocalSendService { if (_localIp != null) return _localIp; try { final info = NetworkInfo(); - _localIp = await info.getWifiIP(); + final wifiIp = await info.getWifiIP(); + if (wifiIp != null && wifiIp.isNotEmpty) { + _localIp = _fixReversedIp(wifiIp); + } } catch (e) { Log.w('LocalSend: Failed to get WiFi IP: $e'); } + if (_localIp == null) { + try { + final interfaces = await NetworkInterface.list(); + for (final iface in interfaces) { + for (final addr in iface.addresses) { + if (addr.type == InternetAddressType.IPv4 && !addr.isLoopback) { + _localIp = addr.address; + break; + } + } + if (_localIp != null) break; + } + } catch (e) { + Log.w('LocalSend: NetworkInterface fallback failed: $e'); + } + } return _localIp; } + String _fixReversedIp(String ip) { + final parts = ip.split('.'); + if (parts.length != 4) return ip; + final reversed = parts.reversed.join('.'); + final privatePrefixes = [ + '192.168.', + '10.', + '172.16.', + '172.17.', + '172.18.', + '172.19.', + '172.2', + '172.3', + ]; + final reversedIsPrivate = privatePrefixes.any((p) => reversed.startsWith(p)); + final originalIsPrivate = privatePrefixes.any((p) => ip.startsWith(p)); + if (reversedIsPrivate && !originalIsPrivate) { + Log.i('LocalSend: Detected reversed IP $ip -> $reversed (HarmonyOS byte-order issue)'); + return reversed; + } + return ip; + } + Map buildAnnounceMessage() { return MulticastDto( alias: config.alias, diff --git a/lib/features/home/presentation/date_config_sheet.dart b/lib/features/home/presentation/date_config_sheet.dart new file mode 100644 index 00000000..27ca5556 --- /dev/null +++ b/lib/features/home/presentation/date_config_sheet.dart @@ -0,0 +1,552 @@ +// 闲言APP — 闲言拾光栏配置弹窗 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 配置AppBar拾光栏的显示项、自定义文案、轮播开关、角色拾光介绍 +// 上次更新: 修复输入法遮挡自定义文案输入框(viewInsets.bottom) + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart' + show LinearProgressIndicator, AlwaysStoppedAnimation; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; + +import '../../../core/constants/character_name.dart'; +import '../../../core/services/weather/weather_info_provider.dart'; +import '../../../core/theme/app_radius.dart'; +import '../../../core/theme/app_spacing.dart'; +import '../../../core/theme/app_theme.dart'; +import '../../../core/theme/app_typography.dart'; +import '../../../features/home/providers/character_tips_provider.dart'; +import '../../../features/home/providers/character_mood_provider.dart'; +import '../../../features/settings/providers/date_display_provider.dart'; +import '../../../features/settings/providers/theme_settings_provider.dart'; +import '../../../shared/widgets/appbar_character_sprite.dart'; +import '../../../shared/widgets/appbar_date_display.dart'; + +class DateConfigSheet extends ConsumerStatefulWidget { + const DateConfigSheet({super.key}); + + @override + ConsumerState createState() => _DateConfigSheetState(); +} + +class _DateConfigSheetState extends ConsumerState { + late TextEditingController _customTextController; + + static const _itemDefs = <({String key, String label, String emoji})>[ + (key: DateDisplayItemKey.date, label: '日期', emoji: '📅'), + (key: DateDisplayItemKey.weather, label: '天气', emoji: '🌤'), + (key: DateDisplayItemKey.temp, label: '温度', emoji: '🌡'), + (key: DateDisplayItemKey.city, label: '城市', emoji: '📍'), + (key: DateDisplayItemKey.device, label: '设备', emoji: '📱'), + (key: DateDisplayItemKey.battery, label: '电量', emoji: '🔋'), + (key: DateDisplayItemKey.ip, label: 'IP', emoji: '🌐'), + (key: DateDisplayItemKey.custom, label: '自定义', emoji: '✏️'), + ]; + + @override + void initState() { + super.initState(); + final config = ref.read(dateDisplayProvider); + _customTextController = TextEditingController(text: config.customText); + } + + @override + void dispose() { + _customTextController.dispose(); + super.dispose(); + } + + String _formatDate(BuildContext context) { + final now = DateTime.now(); + try { + return DateFormat.MMMd( + Localizations.localeOf(context).toString(), + ).format(now); + } catch (_) { + return '${now.month}月${now.day}日'; + } + } + + Widget _buildCharacterProfile(AppThemeExtension ext) { + final characterId = ref.watch( + themeSettingsProvider.select((s) => s.tabCharacterStyleId), + ); + final animIntensity = ref.watch( + themeSettingsProvider.select( + (s) => s.animationIntensity.durationMultiplier, + ), + ); + final moodState = ref.watch(characterMoodProvider); + + return Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: Container( + padding: const EdgeInsets.all(AppSpacing.md), + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + ext.accent.withValues(alpha: 0.08), + ext.accent.withValues(alpha: 0.03), + ], + ), + borderRadius: AppRadius.lgBorder, + border: Border.all( + color: ext.accent.withValues(alpha: 0.12), + width: 0.5, + ), + ), + child: Row( + children: [ + SizedBox( + width: 56, + height: 56, + child: AppBarCharacterSprite( + characterId: characterId, + animationIntensity: animIntensity, + mood: moodState.mood, + size: 56, + ), + ), + const SizedBox(width: AppSpacing.md), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + CharacterName.givenName, + style: AppTypography.title3.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w700, + ), + ), + const SizedBox(width: AppSpacing.xs), + Container( + padding: const EdgeInsets.symmetric( + horizontal: 6, + vertical: 2, + ), + decoration: BoxDecoration( + color: ext.accent.withValues(alpha: 0.15), + borderRadius: AppRadius.fullBorder, + ), + child: Text( + 'Lv.${moodState.level}', + style: AppTypography.caption2.copyWith( + color: ext.accent, + fontWeight: FontWeight.w700, + ), + ), + ), + const SizedBox(width: AppSpacing.xs), + Container( + padding: const EdgeInsets.symmetric( + horizontal: 6, + vertical: 2, + ), + decoration: BoxDecoration( + color: ext.accent.withValues(alpha: 0.12), + borderRadius: AppRadius.fullBorder, + ), + child: Text( + CharacterName.renameHint, + style: AppTypography.caption2.copyWith( + color: ext.accent, + fontWeight: FontWeight.w500, + ), + ), + ), + ], + ), + const SizedBox(height: 2), + Text( + CharacterName.fullName, + style: AppTypography.caption1.copyWith( + color: ext.textSecondary, + ), + ), + const SizedBox(height: 4), + Text( + CharacterName.introduction, + style: AppTypography.footnote.copyWith( + color: ext.textHint, + height: 1.4, + ), + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), + const SizedBox(height: 6), + Row( + children: [ + Expanded( + child: ClipRRect( + borderRadius: AppRadius.fullBorder, + child: LinearProgressIndicator( + value: moodState.levelProgress, + backgroundColor: ext.bgSecondary, + valueColor: AlwaysStoppedAnimation(ext.accent), + minHeight: 4, + ), + ), + ), + const SizedBox(width: 8), + Text( + '${moodState.exp} EXP', + style: AppTypography.caption2.copyWith( + color: ext.textHint, + ), + ), + ], + ), + ], + ), + ), + ], + ), + ), + ); + } + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + final config = ref.watch(dateDisplayProvider); + final notifier = ref.read(dateDisplayProvider.notifier); + final weatherState = ref.watch(weatherInfoProvider); + final weatherBrief = weatherState.brief; + final ipCache = ref.watch(ipCacheProvider); + final tipsState = ref.watch(characterTipsProvider); + + final valueMap = { + DateDisplayItemKey.date: _formatDate(context), + DateDisplayItemKey.weather: weatherBrief?.icon ?? '--', + DateDisplayItemKey.temp: weatherBrief?.temp ?? '--', + DateDisplayItemKey.city: weatherBrief?.city ?? '--', + DateDisplayItemKey.device: 'iPhone', + DateDisplayItemKey.battery: '85%', + DateDisplayItemKey.ip: ipCache?.displayCity ?? '--', + DateDisplayItemKey.custom: config.customText.isNotEmpty + ? '"${config.customText}"' + : '--', + }; + + return Padding( + padding: const EdgeInsets.only(top: 16), + child: Container( + constraints: BoxConstraints( + maxHeight: MediaQuery.sizeOf(context).height * 0.75, + ), + decoration: BoxDecoration( + color: ext.bgElevated, + borderRadius: const BorderRadius.vertical(top: Radius.circular(20)), + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox( + height: 52, + child: Stack( + alignment: Alignment.center, + children: [ + Container( + width: 36, + height: 4, + margin: const EdgeInsets.only(top: 8), + decoration: BoxDecoration( + color: ext.textHint.withValues(alpha: 0.3), + borderRadius: AppRadius.fullBorder, + ), + ), + Positioned( + top: 8, + right: AppSpacing.md, + child: GestureDetector( + onTap: () => Navigator.of(context).pop(), + child: Container( + padding: const EdgeInsets.all(AppSpacing.xs), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.fullBorder, + ), + child: Icon( + CupertinoIcons.xmark, + size: 14, + color: ext.textSecondary, + ), + ), + ), + ), + ], + ), + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: Row( + children: [ + const Text('⚙️', style: TextStyle(fontSize: 18)), + const SizedBox(width: AppSpacing.xs), + Text( + '${CharacterName.barFullName}配置', + style: AppTypography.headline.copyWith( + color: ext.textPrimary, + ), + ), + ], + ), + ), + const SizedBox(height: AppSpacing.md), + _buildCharacterProfile(ext), + const SizedBox(height: AppSpacing.md), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: Text( + '选择要在${CharacterName.barName}显示的信息（最多3项）', + style: AppTypography.subhead.copyWith(color: ext.textSecondary), + ), + ), + const SizedBox(height: AppSpacing.md), + Flexible( + child: ListView.separated( + shrinkWrap: true, + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + physics: const ClampingScrollPhysics(), + itemCount: _itemDefs.length, + separatorBuilder: (_, __) => SizedBox( + height: 1, + child: Container( + margin: const EdgeInsets.only(left: 40), + color: ext.textHint.withValues(alpha: 0.08), + ), + ), + itemBuilder: (context, index) { + final item = _itemDefs[index]; + final isEnabled = config.enabledItems.contains(item.key); + final isCustom = item.key == DateDisplayItemKey.custom; + + return _ConfigItemRow( + emoji: item.emoji, + label: item.label, + valueText: valueMap[item.key] ?? '--', + isEnabled: isEnabled, + ext: ext, + onChanged: (value) { + notifier.toggleItem(item.key); + }, + trailing: isCustom + ? SizedBox( + width: 100, + child: CupertinoTextField( + controller: _customTextController, + placeholder: '输入文案', + placeholderStyle: AppTypography.caption1.copyWith( + color: ext.textHint, + ), + style: AppTypography.caption1.copyWith( + color: ext.textPrimary, + ), + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.sm, + vertical: AppSpacing.xs, + ), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.smBorder, + ), + maxLength: 14, + onChanged: (text) { + notifier.setCustomText(text); + }, + ), + ) + : null, + ); + }, + ), + ), + const SizedBox(height: AppSpacing.md), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + children: [ + const Text('🔄', style: TextStyle(fontSize: 14)), + const SizedBox(width: AppSpacing.xs), + Text( + '长文本轮播', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + ), + ), + ], + ), + CupertinoSwitch( + value: config.marqueeEnabled, + activeTrackColor: ext.accent, + onChanged: (value) { + notifier.setMarqueeEnabled(value); + }, + ), + ], + ), + ), + ), + const SizedBox(height: AppSpacing.md), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: Text( + '💡 拾光Tips', + style: AppTypography.subhead.copyWith(color: ext.textPrimary), + ), + ), + const SizedBox(height: AppSpacing.xs), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: Text( + '点击角色时弹出消息气泡', + style: AppTypography.caption1.copyWith( + color: ext.textSecondary, + ), + ), + ), + const SizedBox(height: AppSpacing.sm), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: Wrap( + spacing: 8, + runSpacing: 8, + children: TipsCategory.values.map((cat) { + final isEnabled = tipsState.enabledCategories.contains(cat); + return GestureDetector( + onTap: () => ref + .read(characterTipsProvider.notifier) + .toggleCategory(cat), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 12, + vertical: 6, + ), + decoration: BoxDecoration( + color: isEnabled + ? ext.accent.withValues(alpha: 0.12) + : ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + border: Border.all( + color: isEnabled + ? ext.accent.withValues(alpha: 0.3) + : ext.textHint.withValues(alpha: 0.15), + width: 0.5, + ), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text(cat.emoji, style: const TextStyle(fontSize: 14)), + const SizedBox(width: 4), + Text( + cat.label, + style: AppTypography.caption1.copyWith( + color: isEnabled ? ext.accent : ext.textSecondary, + fontWeight: isEnabled + ? FontWeight.w600 + : FontWeight.normal, + ), + ), + if (isEnabled) ...[ + const SizedBox(width: 4), + Icon( + CupertinoIcons.checkmark_circle_fill, + size: 14, + color: ext.accent, + ), + ], + ], + ), + ), + ); + }).toList(), + ), + ), + SizedBox( + height: + AppSpacing.md + + MediaQuery.viewPaddingOf(context).bottom + + MediaQuery.of(context).viewInsets.bottom, + ), + ], + ), + ), + ); + } +} + +class _ConfigItemRow extends StatelessWidget { + const _ConfigItemRow({ + required this.emoji, + required this.label, + required this.valueText, + required this.isEnabled, + required this.ext, + required this.onChanged, + this.trailing, + }); + + final String emoji; + final String label; + final String valueText; + final bool isEnabled; + final AppThemeExtension ext; + final ValueChanged onChanged; + final Widget? trailing; + + @override + Widget build(BuildContext context) { + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => onChanged(!isEnabled), + child: Padding( + padding: const EdgeInsets.symmetric(vertical: AppSpacing.sm), + child: Row( + children: [ + Text(emoji, style: const TextStyle(fontSize: 18)), + const SizedBox(width: AppSpacing.sm), + Text( + label, + style: AppTypography.subhead.copyWith(color: ext.textPrimary), + ), + const Spacer(), + if (trailing == null) + Text( + valueText, + style: AppTypography.footnote.copyWith( + color: ext.textSecondary, + ), + ), + if (trailing != null) trailing!, + const SizedBox(width: AppSpacing.xs), + CupertinoSwitch( + value: isEnabled, + activeTrackColor: ext.accent, + onChanged: onChanged, + ), + ], + ), + ), + ); + } +} diff --git a/lib/features/home/presentation/home_daily_card.dart b/lib/features/home/presentation/home_daily_card.dart index 4ac5a29e..bb9f3a53 100644 --- a/lib/features/home/presentation/home_daily_card.dart +++ b/lib/features/home/presentation/home_daily_card.dart @@ -16,6 +16,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_card_swiper/flutter_card_swiper.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_tilt/flutter_tilt.dart'; import 'package:heroine/heroine.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -291,71 +292,86 @@ class _DailyCardState extends ConsumerState Widget build(BuildContext context) { final ext = widget.ext; + Widget content; if (_cards.isEmpty) { - return _buildSingleCard(widget.state.dailySentence, ext); - } - - if (_allCardsSwiped) { - return SizedBox(height: 240, child: _buildLoadingCard(ext)); - } - - return SizedBox( - height: 240, - child: Listener( - onPointerDown: _onPointerDown, - onPointerMove: _onPointerMove, - onPointerUp: _onPointerUp, - child: CardSwiper( - key: ValueKey('card_swiper_$_dataVersion'), - controller: _controller, - cardsCount: _cards.length, - numberOfCardsDisplayed: _cards.length.clamp(1, 3), - isLoop: false, - duration: const Duration(milliseconds: 500), - scale: 0.88, - backCardOffset: const Offset(12, 20), - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.xs, - vertical: 4, + content = _buildSingleCard(widget.state.dailySentence, ext); + } else if (_allCardsSwiped) { + content = SizedBox(height: 240, child: _buildLoadingCard(ext)); + } else { + content = SizedBox( + height: 240, + child: Listener( + onPointerDown: _onPointerDown, + onPointerMove: _onPointerMove, + onPointerUp: _onPointerUp, + child: CardSwiper( + key: ValueKey('card_swiper_$_dataVersion'), + controller: _controller, + cardsCount: _cards.length, + numberOfCardsDisplayed: _cards.length.clamp(1, 3), + isLoop: false, + duration: const Duration(milliseconds: 500), + scale: 0.88, + backCardOffset: const Offset(12, 20), + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.xs, + vertical: 4, + ), + onSwipe: _onSwipe, + onEnd: () { + Log.i('DailyCard: 所有卡片已滑完, 触发加载更多'); + setState(() => _allCardsSwiped = true); + if (widget.onLoadMore != null) { + widget.onLoadMore!(); + } + }, + cardBuilder: (context, index, hPct, vPct) { + final sentence = _cards[index % _cards.length]; + final isFront = index == _frontCardIndex; + Widget card = _buildSwipableCard(sentence, ext, hPct, vPct); + if (isFront && (_isDragging || _isBouncing)) { + card = Transform( + transform: _buildDragTransform(), + alignment: Alignment.center, + child: card, + ); + } + if (isFront && _showSwipeHint) { + card = AnimatedBuilder( + animation: _shakeController, + builder: (context, child) { + final t = _shakeController.value; + const shakeCount = 2; + final offset = sin(t * shakeCount * 2 * pi) * 8 * (1 - t); + return Transform.translate( + offset: Offset(offset, 0), + child: child, + ); + }, + child: card, + ); + } + return card; + }, ), - onSwipe: _onSwipe, - onEnd: () { - Log.i('DailyCard: 所有卡片已滑完, 触发加载更多'); - setState(() => _allCardsSwiped = true); - if (widget.onLoadMore != null) { - widget.onLoadMore!(); - } - }, - cardBuilder: (context, index, hPct, vPct) { - final sentence = _cards[index % _cards.length]; - final isFront = index == _frontCardIndex; - Widget card = _buildSwipableCard(sentence, ext, hPct, vPct); - if (isFront && (_isDragging || _isBouncing)) { - card = Transform( - transform: _buildDragTransform(), - alignment: Alignment.center, - child: card, - ); - } - if (isFront && _showSwipeHint) { - card = AnimatedBuilder( - animation: _shakeController, - builder: (context, child) { - final t = _shakeController.value; - const shakeCount = 2; - final offset = sin(t * shakeCount * 2 * pi) * 8 * (1 - t); - return Transform.translate( - offset: Offset(offset, 0), - child: child, - ); - }, - child: card, - ); - } - return card; - }, ), + ); + } + + return Tilt.base( + borderRadius: BorderRadius.circular(16), + tiltConfig: const TiltConfig( + angle: 8, + enableReverse: true, + moveDuration: Duration(milliseconds: 200), ), + lightConfig: const LightConfig(maxIntensity: 0.06), + shadowConfig: const ShadowBaseConfig( + color: Colors.black, + maxIntensity: 0.15, + offsetInitial: Offset(0, 8), + ), + child: content, ); } diff --git a/lib/features/home/presentation/home_page.dart b/lib/features/home/presentation/home_page.dart index 4546378f..1540868b 100644 --- a/lib/features/home/presentation/home_page.dart +++ b/lib/features/home/presentation/home_page.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 首页 // 创建时间: 2026-04-20 -// 更新时间: 2026-05-04 +// 更新时间: 2026-05-20 // 作用: 句子阅读主页面，展示每日推荐 + 分类筛选 + 句子流 -// 上次更新: 滚动浏览自动标记已读+记录阅读历史 +// 上次更新: NFC初始化+TTS说话联动+屏幕常亮阅读模式滚动检测 // ============================================================ import 'dart:async'; @@ -12,32 +12,49 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:lottie/lottie.dart'; import 'package:xianyan/core/router/app_nav_extension.dart'; import 'package:heroine/heroine.dart'; -import 'package:intl/intl.dart'; import 'package:sliver_tools/sliver_tools.dart'; import 'package:stupid_simple_sheet/stupid_simple_sheet.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; +import '../../../core/constants/character_name.dart'; import '../../../core/theme/app_theme.dart'; import '../../../core/theme/app_spacing.dart'; import '../../../core/theme/app_typography.dart'; import '../../../core/theme/app_radius.dart'; import '../../../core/router/app_router.dart'; +import '../../../core/services/audio/sfx_service.dart'; +import '../../../core/services/device/shake_detector.dart'; +import '../../../core/services/device/battery_info_service.dart'; import '../../../shared/widgets/glass_container.dart'; import '../../../shared/widgets/bottom_sheet.dart'; import '../../../shared/widgets/app_slidable.dart'; import '../../../shared/widgets/app_toast.dart'; import '../../../shared/widgets/skeleton.dart'; +import '../../../shared/widgets/appbar_character_sprite.dart'; +import '../../../shared/widgets/appbar_date_display.dart'; +import '../../../shared/widgets/character_tip_bubble.dart'; +import '../../../core/services/audio/tts_service.dart'; +import '../../../core/services/nfc/nfc_share_service.dart'; import '../../../core/utils/interaction_animations.dart'; import '../../../core/utils/sheet_animation_notifier.dart'; import '../../../core/utils/platform_feature_guard.dart'; +import '../providers/character_tips_provider.dart'; +import '../providers/character_mood_provider.dart'; import '../providers/home_provider.dart'; import '../../../features/source/providers/source_provider.dart'; +import '../../../features/settings/providers/theme_settings_provider.dart'; +import '../../../features/settings/providers/general_settings_provider.dart'; import 'home_daily_card.dart'; +import 'home_refresh_indicator.dart'; import 'home_sentence_card.dart'; import 'home_square_header.dart'; +import 'home_tool_center.dart'; import 'widgets/quick_card_sheet.dart'; import 'providers/sentence_detail_sheet.dart'; +import 'date_config_sheet.dart'; /// 首页 — 句子阅读主页面 class HomePage extends ConsumerStatefulWidget { @@ -49,20 +66,100 @@ class HomePage extends ConsumerStatefulWidget { class _HomePageState extends ConsumerState { final ScrollController _scrollController = ScrollController(); + final _characterKey = GlobalKey(); double _hDragAccum = 0; double _vDragAccum = 0; bool _hDragActive = false; bool _scrollLocked = false; int _slidableOpenCount = 0; bool _slidableJustOpened = false; + bool _isSwitchingChannel = false; + StreamSubscription? _batterySubscription; + StreamSubscription? _ttsSubscription; + Timer? _readingTimer; + bool _isReading = false; static const double _categorySwipeThreshold = 120.0; + @override + void initState() { + super.initState(); + WidgetsBinding.instance.addPostFrameCallback((_) { + if (ref.read(generalSettingsProvider).shakeToSwitch) { + ShakeDetector.instance.start(onShakeCallback: _onShake); + } + }); + BatteryInfoService.instance.init(); + NfcShareService.instance.checkAvailability(); + _batterySubscription = BatteryInfoService.instance.onBatteryChanged.listen(( + info, + ) { + if (!info.isLow) return; + _characterKey.currentState?.triggerExpression( + CharacterExpression.worried, + ); + final message = info.isCritical ? '电量很低了！快充电 🔴' : '电量不多了哦，记得充电 💛'; + ref + .read(characterTipsProvider.notifier) + .showTip(TipsCategory.easterEgg, message); + }); + _ttsSubscription = TtsService.instance.onStateChanged.listen((ttsState) { + if (!mounted) return; + if (ttsState == TtsState.speaking) { + _characterKey.currentState?.triggerExpression( + CharacterExpression.speaking, + ); + } else if (ttsState == TtsState.paused || ttsState == TtsState.idle) { + _characterKey.currentState?.triggerExpression( + CharacterExpression.smile, + ); + } + }); + _scrollController.addListener(_onScrollForReading); + } + @override void dispose() { + _batterySubscription?.cancel(); + _ttsSubscription?.cancel(); + _readingTimer?.cancel(); + WakelockPlus.disable(); + ShakeDetector.instance.stop(); + _scrollController.removeListener(_onScrollForReading); _scrollController.dispose(); super.dispose(); } + void _onShake() { + ref.read(homeProvider.notifier).refreshDailySentences(); + _characterKey.currentState?.triggerExpression(CharacterExpression.dizzy); + SfxService.instance.play(SfxType.shake); + } + + void _onScrollForReading() { + final mode = ref.read(generalSettingsProvider).screenAlwaysOn; + if (mode != 1) return; + if (_isReading) { + _isReading = false; + WakelockPlus.disable(); + } + _readingTimer?.cancel(); + _readingTimer = Timer(const Duration(seconds: 5), () { + if (mounted && ref.read(generalSettingsProvider).screenAlwaysOn == 1) { + _isReading = true; + WakelockPlus.enable(); + } + }); + } + + void _onChannelSwitch(String? code) { + if (_isSwitchingChannel) return; + setState(() => _isSwitchingChannel = true); + ref.read(homeProvider.notifier).selectType(code); + Future.delayed(const Duration(milliseconds: 600), () { + if (mounted) setState(() => _isSwitchingChannel = false); + }); + } + void _handlePointerDown(PointerDownEvent event) { _hDragAccum = 0; _vDragAccum = 0; @@ -103,6 +200,9 @@ class _HomePageState extends ConsumerState { Widget build(BuildContext context) { final ext = AppTheme.ext(context); final state = ref.watch(homeProvider); + final characterId = ref.watch( + themeSettingsProvider.select((s) => s.tabCharacterStyleId), + ); ref.listen(sourceProvider, (prev, next) { if (prev?.disabledKeys != next.disabledKeys) { @@ -124,6 +224,20 @@ class _HomePageState extends ConsumerState { } }); + final alwaysOn = ref.watch( + generalSettingsProvider.select((s) => s.screenAlwaysOn), + ); + switch (alwaysOn) { + case 0: + WakelockPlus.disable(); + _readingTimer?.cancel(); + _isReading = false; + case 1: + break; + case 2: + WakelockPlus.enable(); + } + final Widget scaffold = CupertinoPageScaffold( backgroundColor: ext.bgPrimary, child: SafeArea( @@ -132,308 +246,395 @@ class _HomePageState extends ConsumerState { onPointerDown: _handlePointerDown, onPointerMove: _handlePointerMove, onPointerUp: _handlePointerUp, - child: CustomScrollView( - controller: _scrollController, - physics: _scrollLocked - ? const NeverScrollableScrollPhysics() - : const BouncingScrollPhysics(), - slivers: [ - // 离线提示 - if (state.isOffline) - SliverToBoxAdapter( - child: Container( - margin: const EdgeInsets.symmetric( - horizontal: AppSpacing.md, - vertical: AppSpacing.xs, + child: HomeRefreshIndicator( + onRefresh: () => ref.read(homeProvider.notifier).refresh(), + characterId: characterId, + child: CustomScrollView( + controller: _scrollController, + physics: _scrollLocked + ? const NeverScrollableScrollPhysics() + : const BouncingScrollPhysics(), + slivers: [ + // 离线提示 + if (state.isOffline) + SliverToBoxAdapter( + child: Container( + margin: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.xs, + ), + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + decoration: BoxDecoration( + color: CupertinoColors.systemYellow.withValues( + alpha: 0.15, + ), + borderRadius: AppRadius.mdBorder, + ), + child: Row( + children: [ + const Text('📡', style: TextStyle(fontSize: 14)), + const SizedBox(width: AppSpacing.xs), + Text( + '离线模式 — 展示缓存数据', + style: AppTypography.caption1.copyWith( + color: ext.textSecondary, + ), + ), + ], + ), ), + ), + + // 顶部标题栏 + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: 4, + ), + child: Row( + children: [ + // 左侧：角色 + 闲言标题 + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Stack( + clipBehavior: Clip.none, + children: [ + AppBarCharacterSprite( + key: _characterKey, + characterId: characterId, + animationIntensity: ref.watch( + themeSettingsProvider.select( + (s) => s + .animationIntensity + .durationMultiplier, + ), + ), + mood: ref.watch( + characterMoodProvider.select((s) => s.mood), + ), + onTap: () { + ref + .read(characterTipsProvider.notifier) + .generateTip(characterId); + if (TtsService.instance.isAvailable && + state.dailySentence != null) { + TtsService.instance.speak( + state.dailySentence!.text, + ); + } + }, + onDoubleTap: () { + ref + .read(characterTipsProvider.notifier) + .generateTip(characterId); + if (TtsService.instance.isSpeaking) { + TtsService.instance.stop(); + } + }, + ), + Positioned( + left: 0, + bottom: 52, + child: CharacterTipBubble( + characterId: characterId, + ), + ), + ], + ), + const SizedBox(width: AppSpacing.sm), + GestureDetector( + onTap: () => + _characterKey.currentState?.lookAtTitle(), + child: Text( + CharacterName.appBarTitle, + style: AppTypography.title1.copyWith( + color: ext.textPrimary, + ), + ), + ), + ], + ), + const Spacer(), + // 中间：拾光栏 + AppBarDateDisplay( + onTap: () => _showDateConfigSheet(context), + ), + const Spacer(), + // 右侧：搜索按钮 + BounceButton( + onTap: () => context.appPush(AppRoutes.search), + child: Heroine( + tag: 'search-icon', + child: Container( + padding: const EdgeInsets.all(AppSpacing.sm), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.fullBorder, + ), + child: Icon( + CupertinoIcons.search, + size: 20, + color: ext.iconSecondary, + ), + ), + ), + ), + ], + ), + ).safeFadeIn(duration: 300.ms), + ), + + // 每日推荐卡片 + SliverToBoxAdapter( + child: (state.isForceLoading && state.dailySentence == null) + ? const DailyCardSkeleton() + : Padding( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + child: DailyCard( + ext: ext, + state: state, + onScrollLockChanged: (locked) { + setState(() => _scrollLocked = locked); + }, + onLike: (sentence) => ref + .read(homeProvider.notifier) + .toggleLike(sentence.id), + onFavorite: (sentence) => ref + .read(homeProvider.notifier) + .toggleFavorite(sentence.id), + onLoadMore: () => ref + .read(homeProvider.notifier) + .refreshDailySentences(), + onTap: (sentence) => + _showDailyDetailSheet(sentence, ext, ref), + ), + ).safeFadeInSlideY(duration: 300.ms, delay: 100.ms), + ), + + // 操作按钮行：创作卡片 / 编辑此句 + SliverToBoxAdapter( + child: Padding( padding: const EdgeInsets.symmetric( horizontal: AppSpacing.md, vertical: AppSpacing.sm, ), - decoration: BoxDecoration( - color: CupertinoColors.systemYellow.withValues( - alpha: 0.15, - ), - borderRadius: AppRadius.mdBorder, - ), child: Row( children: [ - const Text('📡', style: TextStyle(fontSize: 14)), - const SizedBox(width: AppSpacing.xs), - Text( - '离线模式 — 展示缓存数据', - style: AppTypography.caption1.copyWith( - color: ext.textSecondary, + Expanded( + child: BounceButton( + onTap: () { + final text = + state.dailySentence?.text ?? + '生活不是等待暴风雨过去，而是学会在雨中翩翩起舞。'; + _showQuickCard(context, text); + }, + child: GlassContainer( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + '🎨', + style: TextStyle(fontSize: 20), + ), + const SizedBox(width: AppSpacing.xs), + Text( + '创作卡片', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ), + ), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: BounceButton( + onTap: () { + final text = + state.dailySentence?.text ?? + '生活不是等待暴风雨过去，而是学会在雨中翩翩起舞。'; + context.appPush( + '${AppRoutes.editor}?text=${Uri.encodeComponent(text)}', + ); + }, + child: GlassContainer( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + '📝', + style: TextStyle(fontSize: 20), + ), + const SizedBox(width: AppSpacing.xs), + Text( + '编辑此句', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), ), ), ], ), + ).safeFadeInSlideY(duration: 300.ms, delay: 200.ms), + ), + + // 句子广场吸顶 Header — Feed频道 + SliverPinnedHeader( + child: SquareHeaderContent( + ext: ext, + selectedType: state.selectedType, + channels: state.channels, + currentSort: state.currentSort, + onRefresh: () => ref.read(homeProvider.notifier).refresh(), + onSelectType: (code) => _onChannelSwitch(code), + onSortChanged: (sort) => + ref.read(homeProvider.notifier).changeSort(sort), + onSwipeLeft: () => _swipeToNextCategory(), + onSwipeRight: () => _swipeToPrevCategory(), + onScrollToTop: () { + if (_scrollController.hasClients) { + _scrollController.animateTo( + 0, + duration: const Duration(milliseconds: 800), + curve: Curves.easeInOutCubic, + ); + } + }, + onToolCenter: () => _showToolCenter(context), ), ), - // 顶部标题栏 - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.md, - vertical: 4, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - '🏠 闲言', - style: AppTypography.title1.copyWith( - color: ext.textPrimary, - ), + // 句子列表 + if (_isSwitchingChannel) + SliverFillRemaining( + child: Center( + child: Lottie.asset( + 'assets/animations/spin.json', + width: 120, + height: 120, + errorBuilder: (_, __, ___) => + const CupertinoActivityIndicator(), ), - Text( - DateFormat.MMMd().format(DateTime.now()), - style: AppTypography.footnote.copyWith( - color: ext.textSecondary, - ), - ), - BounceButton( - onTap: () => context.appPush(AppRoutes.search), - child: Heroine( - tag: 'search-icon', - child: Container( - padding: const EdgeInsets.all(AppSpacing.sm), - decoration: BoxDecoration( - color: ext.bgSecondary, - borderRadius: AppRadius.fullBorder, - ), - child: Icon( - CupertinoIcons.search, - size: 20, - color: ext.iconSecondary, + ), + ) + else if (state.isForceLoading && state.sentences.isEmpty) + const SliverToBoxAdapter(child: FeedSentenceSkeleton()) + else if (!state.isLoading && + !state.isForceLoading && + state.sentences.isEmpty) + SliverFillRemaining( + child: Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Lottie.asset( + 'assets/animations/star.json', + width: 150, + height: 150, + errorBuilder: (_, __, ___) => const Text( + '📭', + style: TextStyle(fontSize: 48), ), ), - ), + const SizedBox(height: AppSpacing.md), + Text( + '暂无句子', + style: AppTypography.headline.copyWith( + color: ext.textSecondary, + ), + ), + const SizedBox(height: AppSpacing.sm), + Text( + '下拉刷新试试', + style: AppTypography.subhead.copyWith( + color: ext.textHint, + ), + ), + const SizedBox(height: AppSpacing.md), + CupertinoButton( + color: ext.accent, + borderRadius: AppRadius.mdBorder, + onPressed: () => + ref.read(homeProvider.notifier).refresh(), + child: const Text('刷新'), + ), + ], ), - ], - ), - ).safeFadeIn(duration: 300.ms), - ), + ), + ) + else + SliverPadding( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + ), + sliver: SliverList( + key: ValueKey('sentences_${state.selectedType}'), + delegate: SliverChildBuilderDelegate((context, index) { + if (index >= state.sentences.length) { + if (state.hasMore) { + ref.read(homeProvider.notifier).loadMore(); + return _LoadingSkeletonCard(ext: ext, index: 0); + } + return _buildListBottom(state, ext, ref); + } - // 每日推荐卡片 - SliverToBoxAdapter( - child: (state.isForceLoading && state.dailySentence == null) - ? const DailyCardSkeleton() - : Padding( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.md, - vertical: AppSpacing.sm, - ), - child: DailyCard( + ref.read(homeProvider.notifier).checkPreload(index); + final sentence = state.sentences[index]; + final showSkeleton = state.isForceLoading; + return _SentenceCardWithSkeleton( + sentence: sentence, ext: ext, - state: state, - onScrollLockChanged: (locked) { - setState(() => _scrollLocked = locked); - }, - onLike: (sentence) => ref + showSkeleton: showSkeleton, + onLike: () => ref .read(homeProvider.notifier) .toggleLike(sentence.id), - onFavorite: (sentence) => ref + onFavorite: () => ref .read(homeProvider.notifier) .toggleFavorite(sentence.id), - onLoadMore: () => ref + onReadLater: () => ref .read(homeProvider.notifier) - .refreshDailySentences(), - onTap: (sentence) => - _showDailyDetailSheet(sentence, ext, ref), - ), - ).safeFadeInSlideY(duration: 300.ms, delay: 100.ms), - ), - - // 操作按钮行：创作卡片 / 编辑此句 - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.md, - vertical: AppSpacing.sm, - ), - child: Row( - children: [ - Expanded( - child: BounceButton( - onTap: () { - final text = - state.dailySentence?.text ?? - '生活不是等待暴风雨过去，而是学会在雨中翩翩起舞。'; - _showQuickCard(context, text); + .toggleReadLater(sentence.id), + onTap: () => ref + .read(homeProvider.notifier) + .markRead(sentence.id), + slidableOpenChanged: (opened) { + setState(() { + if (opened) { + _slidableOpenCount++; + _hDragAccum = 0; + _slidableJustOpened = true; + } else { + _slidableOpenCount = (_slidableOpenCount - 1) + .clamp(0, 999); + } + }); }, - child: GlassContainer( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - '🎨', - style: TextStyle(fontSize: 20), - ), - const SizedBox(width: AppSpacing.xs), - Text( - '创作卡片', - style: AppTypography.subhead.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - ), - ), - ), - const SizedBox(width: AppSpacing.sm), - Expanded( - child: BounceButton( - onTap: () { - final text = - state.dailySentence?.text ?? - '生活不是等待暴风雨过去，而是学会在雨中翩翩起舞。'; - context.appPush( - '${AppRoutes.editor}?text=${Uri.encodeComponent(text)}', - ); - }, - child: GlassContainer( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - '📝', - style: TextStyle(fontSize: 20), - ), - const SizedBox(width: AppSpacing.xs), - Text( - '编辑此句', - style: AppTypography.subhead.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - ), - ), - ), - ], - ), - ).safeFadeInSlideY(duration: 300.ms, delay: 200.ms), - ), - - // 句子广场吸顶 Header — Feed频道 - SliverPinnedHeader( - child: SquareHeaderContent( - ext: ext, - selectedType: state.selectedType, - channels: state.channels, - currentSort: state.currentSort, - onRefresh: () => ref.read(homeProvider.notifier).refresh(), - onSelectType: (code) => - ref.read(homeProvider.notifier).selectType(code), - onSortChanged: (sort) => - ref.read(homeProvider.notifier).changeSort(sort), - onSwipeLeft: () => _swipeToNextCategory(), - onSwipeRight: () => _swipeToPrevCategory(), - onScrollToTop: () { - if (_scrollController.hasClients) { - _scrollController.animateTo( - 0, - duration: const Duration(milliseconds: 800), - curve: Curves.easeInOutCubic, - ); - } - }, - ), - ), - - // 句子列表 - if (state.isForceLoading && state.sentences.isEmpty) - const SliverToBoxAdapter(child: FeedSentenceSkeleton()) - else if (!state.isLoading && - !state.isForceLoading && - state.sentences.isEmpty) - SliverFillRemaining( - child: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - const Text('📭', style: TextStyle(fontSize: 48)), - const SizedBox(height: AppSpacing.md), - Text( - '暂无句子', - style: AppTypography.title3.copyWith( - color: ext.textSecondary, - ), - ), - const SizedBox(height: AppSpacing.md), - CupertinoButton( - color: ext.accent, - borderRadius: AppRadius.mdBorder, - onPressed: () => - ref.read(homeProvider.notifier).refresh(), - child: const Text('刷新'), - ), - ], + index: index, + accent: ext.accent, + ); + }, childCount: state.sentences.length + 1), ), ), - ) - else - SliverPadding( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.md, - ), - sliver: SliverList( - key: ValueKey('sentences_${state.selectedType}'), - delegate: SliverChildBuilderDelegate((context, index) { - if (index >= state.sentences.length) { - if (state.hasMore) { - ref.read(homeProvider.notifier).loadMore(); - return _LoadingSkeletonCard(ext: ext, index: 0); - } - return _buildListBottom(state, ext, ref); - } - ref.read(homeProvider.notifier).checkPreload(index); - final sentence = state.sentences[index]; - final showSkeleton = state.isForceLoading; - return _SentenceCardWithSkeleton( - sentence: sentence, - ext: ext, - showSkeleton: showSkeleton, - onLike: () => ref - .read(homeProvider.notifier) - .toggleLike(sentence.id), - onFavorite: () => ref - .read(homeProvider.notifier) - .toggleFavorite(sentence.id), - onReadLater: () => ref - .read(homeProvider.notifier) - .toggleReadLater(sentence.id), - onTap: () => ref - .read(homeProvider.notifier) - .markRead(sentence.id), - slidableOpenChanged: (opened) { - setState(() { - if (opened) { - _slidableOpenCount++; - _hDragAccum = 0; - _slidableJustOpened = true; - } else { - _slidableOpenCount = (_slidableOpenCount - 1) - .clamp(0, 999); - } - }); - }, - index: index, - accent: ext.accent, - ); - }, childCount: state.sentences.length + 1), - ), - ), - - const SliverToBoxAdapter(child: SizedBox(height: 140)), - ], + const SliverToBoxAdapter(child: SizedBox(height: 140)), + ], + ), ), ), ), @@ -500,22 +701,24 @@ class _HomePageState extends ConsumerState { } void _swipeToNextCategory() { + if (_isSwitchingChannel) return; final state = ref.read(homeProvider); final allTypes = [null, ...state.channels.map((c) => c.key)]; var currentIdx = allTypes.indexOf(state.selectedType); if (currentIdx < 0) currentIdx = 0; if (currentIdx < allTypes.length - 1) { - ref.read(homeProvider.notifier).selectType(allTypes[currentIdx + 1]); + _onChannelSwitch(allTypes[currentIdx + 1]); } } void _swipeToPrevCategory() { + if (_isSwitchingChannel) return; final state = ref.read(homeProvider); final allTypes = [null, ...state.channels.map((c) => c.key)]; var currentIdx = allTypes.indexOf(state.selectedType); if (currentIdx < 0) currentIdx = 0; if (currentIdx > 0) { - ref.read(homeProvider.notifier).selectType(allTypes[currentIdx - 1]); + _onChannelSwitch(allTypes[currentIdx - 1]); } } @@ -536,6 +739,20 @@ class _HomePageState extends ConsumerState { ref.read(homeProvider.notifier).toggleReadLater(sentence.id), ); } + + void _showDateConfigSheet(BuildContext context) { + AppBottomSheet.showCustom( + context: context, + builder: (_) => const DateConfigSheet(), + ); + } + + void _showToolCenter(BuildContext context) { + AppBottomSheet.showCustom( + context: context, + builder: (_) => const HomeToolCenter(), + ); + } } void _showQuickCard(BuildContext context, String text) { diff --git a/lib/features/home/presentation/home_refresh_indicator.dart b/lib/features/home/presentation/home_refresh_indicator.dart new file mode 100644 index 00000000..3a537ba7 --- /dev/null +++ b/lib/features/home/presentation/home_refresh_indicator.dart @@ -0,0 +1,109 @@ +// ============================================================ +// 闲言APP — 主页自定义下拉刷新指示器 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 拾光角色下拉刷新动画，角色表情随进度变化 +// 上次更新: 初始版本 +// ============================================================ + +import 'package:custom_refresh_indicator/custom_refresh_indicator.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:xianyan/core/theme/app_theme.dart'; +import 'package:xianyan/core/theme/app_typography.dart'; +import 'package:xianyan/shared/widgets/appbar_character_sprite.dart'; + +class HomeRefreshIndicator extends ConsumerWidget { + const HomeRefreshIndicator({ + super.key, + required this.child, + required this.onRefresh, + required this.characterId, + }); + + final Widget child; + final Future Function() onRefresh; + final String characterId; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final ext = AppTheme.ext(context); + + return CustomRefreshIndicator( + onRefresh: onRefresh, + offsetToArmed: 80, + builder: (context, child, controller) { + return Stack( + alignment: Alignment.topCenter, + children: [ + Transform.translate( + offset: Offset(0, controller.value.clamp(0.0, 1.5) * 80), + child: child, + ), + if (controller.value > 0) + Positioned( + top: 8, + child: _buildIndicatorContent(controller, ext), + ), + ], + ); + }, + child: child, + ); + } + + Widget _buildIndicatorContent( + IndicatorController controller, + AppThemeExtension ext, + ) { + final expression = _getExpression(controller); + final String text; + switch (controller.state) { + case IndicatorState.armed: + case IndicatorState.settling: + case IndicatorState.loading: + text = '刷新中...'; + case IndicatorState.complete: + text = '刷新完成 ✓'; + case IndicatorState.finalizing: + text = '刷新完成 ✓'; + default: + final v = (controller.value.clamp(0.0, 1.0) * 100).round(); + text = '$v%'; + } + + return Opacity( + opacity: controller.value.clamp(0.0, 1.0), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + AppBarCharacterSprite( + characterId: characterId, + expression: expression, + ), + const SizedBox(width: 8), + Text( + text, + style: AppTypography.caption1.copyWith(color: ext.textSecondary), + ), + ], + ), + ); + } + + CharacterExpression _getExpression(IndicatorController controller) { + if (controller.state == IndicatorState.loading) { + return CharacterExpression.think; + } + if (controller.state == IndicatorState.complete || + controller.state == IndicatorState.finalizing) { + return CharacterExpression.smile; + } + + final v = controller.value.clamp(0.0, 1.0); + if (v < 0.3) return CharacterExpression.idle; + if (v < 0.6) return CharacterExpression.surprise; + if (v < 0.9) return CharacterExpression.pout; + return CharacterExpression.blink; + } +} diff --git a/lib/features/home/presentation/home_sentence_card.dart b/lib/features/home/presentation/home_sentence_card.dart index 0769800c..8a768b3f 100644 --- a/lib/features/home/presentation/home_sentence_card.dart +++ b/lib/features/home/presentation/home_sentence_card.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 首页句子卡片 // 创建时间: 2026-04-27 -// 更新时间: 2026-05-14 +// 更新时间: 2026-05-20 // 作用: 句子广场列表中的句子卡片，Feed数据适配 + 互动操作 -// 上次更新: 修复空白卡片问题，添加类型感知占位提示 +// 上次更新: 新增 Shader 特效背景支持 // ============================================================ import 'package:flutter/cupertino.dart'; @@ -17,6 +17,8 @@ import 'package:xianyan/core/utils/interaction_animations.dart'; import 'package:xianyan/features/home/models/feed_model.dart'; import 'package:xianyan/features/home/providers/home_provider.dart'; import 'package:xianyan/features/home/presentation/providers/sentence_detail_sheet.dart'; +import 'package:xianyan/features/settings/providers/general_settings_provider.dart'; +import 'package:xianyan/shared/widgets/shader_card_background.dart'; class SentenceCard extends ConsumerStatefulWidget { const SentenceCard({ @@ -51,6 +53,9 @@ class _SentenceCardState extends ConsumerState { @override Widget build(BuildContext context) { final accentColor = _generateAccentColor(); + final shaderEnabled = ref.watch( + generalSettingsProvider.select((s) => s.shaderBackground), + ); return PressableCard( onTap: () { @@ -63,39 +68,52 @@ class _SentenceCardState extends ConsumerState { ), child: Container( decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - accentColor.withValues(alpha: 0.08), - accentColor.withValues(alpha: 0.02), - ], - ), + gradient: shaderEnabled + ? null + : LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + accentColor.withValues(alpha: 0.08), + accentColor.withValues(alpha: 0.02), + ], + ), borderRadius: AppRadius.lgBorder, ), - child: IntrinsicHeight( - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, + child: ClipRRect( + borderRadius: AppRadius.lgBorder, + child: Stack( children: [ - _buildAccentBar(accentColor), - Expanded( - child: Padding( - padding: const EdgeInsets.fromLTRB( - AppSpacing.xs, - AppSpacing.sm, - AppSpacing.sm, - AppSpacing.sm, - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - _buildFeedHeader(), - _buildSentenceText(), - const SizedBox(height: AppSpacing.sm), - _buildStatsRow(), - _buildActionRow(), - ], - ), + if (shaderEnabled) + const Positioned.fill( + child: ShaderCardBackground(), + ), + IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _buildAccentBar(accentColor), + Expanded( + child: Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.xs, + AppSpacing.sm, + AppSpacing.sm, + AppSpacing.sm, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildFeedHeader(), + _buildSentenceText(), + const SizedBox(height: AppSpacing.sm), + _buildStatsRow(), + _buildActionRow(), + ], + ), + ), + ), + ], ), ), ], diff --git a/lib/features/home/presentation/home_square_header.dart b/lib/features/home/presentation/home_square_header.dart index ff48337d..48f062f7 100644 --- a/lib/features/home/presentation/home_square_header.dart +++ b/lib/features/home/presentation/home_square_header.dart @@ -28,6 +28,7 @@ class SquareHeaderContent extends StatefulWidget { this.onScrollToTop, this.onSwipeLeft, this.onSwipeRight, + this.onToolCenter, }); final AppThemeExtension ext; @@ -40,6 +41,7 @@ class SquareHeaderContent extends StatefulWidget { final VoidCallback? onScrollToTop; final VoidCallback? onSwipeLeft; final VoidCallback? onSwipeRight; + final VoidCallback? onToolCenter; @override State createState() => _SquareHeaderContentState(); @@ -129,6 +131,16 @@ class _SquareHeaderContentState extends State { ), ), ), + if (widget.onToolCenter != null) + CupertinoButton( + padding: EdgeInsets.zero, + onPressed: widget.onToolCenter, + child: Icon( + CupertinoIcons.grid, + size: 20, + color: widget.ext.iconSecondary, + ), + ), if (widget.onScrollToTop != null) CupertinoButton( padding: EdgeInsets.zero, diff --git a/lib/features/home/presentation/home_tool_center.dart b/lib/features/home/presentation/home_tool_center.dart new file mode 100644 index 00000000..9f1d7a70 --- /dev/null +++ b/lib/features/home/presentation/home_tool_center.dart @@ -0,0 +1,207 @@ +// ============================================================ +// 闲言APP — 主页工具中心面板 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 下拉展开的快捷工具面板 +// 上次更新: 初始版本 +// ============================================================ + +import 'package:flutter/cupertino.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:xianyan/core/theme/app_theme.dart'; +import 'package:xianyan/core/theme/app_spacing.dart'; +import 'package:xianyan/core/theme/app_typography.dart'; +import 'package:xianyan/core/theme/app_radius.dart'; +import 'package:xianyan/core/router/app_router.dart'; +import 'package:xianyan/core/router/app_nav_extension.dart'; +import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/features/settings/providers/theme_settings_provider.dart'; +import 'package:xianyan/shared/widgets/app_toast.dart'; +import 'package:xianyan/shared/widgets/bottom_sheet.dart'; +import 'package:xianyan/features/home/presentation/nearby_users_sheet.dart'; + +class _ToolItem { + const _ToolItem({ + required this.emoji, + required this.title, + required this.subtitle, + this.route, + this.action, + }); + + final String emoji; + final String title; + final String subtitle; + final String? route; + final VoidCallback? action; +} + +class HomeToolCenter extends ConsumerStatefulWidget { + const HomeToolCenter({super.key}); + + @override + ConsumerState createState() => _HomeToolCenterState(); +} + +class _HomeToolCenterState extends ConsumerState { + void _onTts() { + AppToast.showInfo('🔊 朗读模式开发中'); + Log.i('工具中心: 朗读模式'); + } + + void _onDarkMode() { + final current = ref.read(themeSettingsProvider); + final isDark = current.isDark; + final newMode = isDark ? AppThemeMode.light : AppThemeMode.dark; + ref.read(themeSettingsProvider.notifier).setThemeMode(newMode); + AppToast.showSuccess(isDark ? '☀️ 已切换日间模式' : '🌙 已切换夜间模式'); + Log.i('工具中心: 切换主题 → ${newMode.label}'); + } + + void _onShake() { + AppToast.showInfo('🤝 摇一摇开发中'); + Log.i('工具中心: 摇一摇'); + } + + void _onScanner() { + AppToast.showInfo('📷 扫一扫开发中'); + Log.i('工具中心: 扫一扫'); + } + + void _onNearby() { + Navigator.pop(context); + AppBottomSheet.showCustom( + context: context, + builder: (_) => const NearbyUsersSheet(), + ); + } + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + + final tools = [ + _ToolItem( + emoji: '📷', + title: '扫一扫', + subtitle: '扫描二维码', + action: _onScanner, + ), + _ToolItem( + emoji: '📡', + title: '附近的人', + subtitle: '发现附近用户', + action: _onNearby, + ), + const _ToolItem( + emoji: '📡', + title: '传输助手', + subtitle: '文件互传', + route: AppRoutes.fileTransfer, + ), + _ToolItem(emoji: '🔊', title: '朗读模式', subtitle: '语音朗读句子', action: _onTts), + _ToolItem( + emoji: '🌙', + title: '深色模式', + subtitle: '切换主题', + action: _onDarkMode, + ), + _ToolItem(emoji: '🤝', title: '摇一摇', subtitle: '换一句', action: _onShake), + const _ToolItem( + emoji: '⚙️', + title: '更多', + subtitle: '设置', + route: AppRoutes.moreSettings, + ), + ]; + + return Container( + padding: const EdgeInsets.all(AppSpacing.md), + decoration: BoxDecoration( + color: ext.bgPrimary.withValues(alpha: 0.95), + borderRadius: const BorderRadius.vertical(top: Radius.circular(20)), + border: Border(top: BorderSide(color: ext.overlaySubtle, width: 0.5)), + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + width: 36, + height: 5, + decoration: BoxDecoration( + color: ext.textHint.withValues(alpha: 0.3), + borderRadius: BorderRadius.circular(3), + ), + ), + const SizedBox(height: AppSpacing.md), + Row( + children: [ + Text( + '🧰 工具中心', + style: AppTypography.headline.copyWith(color: ext.textPrimary), + ), + const Spacer(), + Text( + '下滑收起', + style: AppTypography.caption2.copyWith(color: ext.textHint), + ), + ], + ), + const SizedBox(height: AppSpacing.md), + GridView.count( + crossAxisCount: 3, + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + mainAxisSpacing: AppSpacing.sm, + crossAxisSpacing: AppSpacing.sm, + childAspectRatio: 1.1, + children: tools.map((tool) => _buildToolCard(tool, ext)).toList(), + ), + ], + ), + ); + } + + Widget _buildToolCard(_ToolItem tool, AppThemeExtension ext) { + return GestureDetector( + onTap: () { + if (tool.route != null) { + Navigator.of(context).pop(); + context.appPush(tool.route!); + return; + } + tool.action?.call(); + }, + child: Container( + padding: const EdgeInsets.all(AppSpacing.sm), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.lgBorder, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text(tool.emoji, style: const TextStyle(fontSize: 28)), + const SizedBox(height: 4), + Text( + tool.title, + style: AppTypography.caption1.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: 2), + Text( + tool.subtitle, + style: AppTypography.caption2.copyWith( + color: ext.textHint, + fontSize: 10, + ), + overflow: TextOverflow.ellipsis, + ), + ], + ), + ), + ); + } +} diff --git a/lib/features/home/presentation/nearby_users_sheet.dart b/lib/features/home/presentation/nearby_users_sheet.dart new file mode 100644 index 00000000..835998a5 --- /dev/null +++ b/lib/features/home/presentation/nearby_users_sheet.dart @@ -0,0 +1,343 @@ +// ============================================================ +// 闲言APP — 附近用户Sheet +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 显示附近使用闲言的用户列表 +// 上次更新: 初始版本 +// ============================================================ + +import 'dart:async'; + +import 'package:flutter/cupertino.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:xianyan/core/theme/app_theme.dart'; +import 'package:xianyan/core/theme/app_spacing.dart'; +import 'package:xianyan/core/theme/app_typography.dart'; +import 'package:xianyan/core/theme/app_radius.dart'; +import 'package:xianyan/core/services/bluetooth/nearby_discovery_service.dart'; +import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/shared/widgets/app_toast.dart'; + +class NearbyUsersSheet extends ConsumerStatefulWidget { + const NearbyUsersSheet({super.key}); + + @override + ConsumerState createState() => _NearbyUsersSheetState(); +} + +class _NearbyUsersSheetState extends ConsumerState { + final _service = NearbyDiscoveryService.instance; + List _users = []; + bool _isScanning = false; + bool _isAvailable = false; + StreamSubscription>? _usersSub; + StreamSubscription? _scanningSub; + + @override + void initState() { + super.initState(); + _checkAndInit(); + } + + Future _checkAndInit() async { + final available = await _service.checkAvailability(); + if (!mounted) return; + setState(() => _isAvailable = available); + + _usersSub = _service.onUsersChanged.listen((users) { + if (mounted) setState(() => _users = users); + }); + + _scanningSub = _service.onScanningChanged.listen((scanning) { + if (mounted) setState(() => _isScanning = scanning); + }); + } + + @override + void dispose() { + _usersSub?.cancel(); + _scanningSub?.cancel(); + _service.stopScan(); + super.dispose(); + } + + Future _toggleScan() async { + if (_isScanning) { + await _service.stopScan(); + } else { + if (!_isAvailable) { + AppToast.showWarning('📡 请先开启蓝牙'); + final available = await _service.checkAvailability(); + if (mounted) setState(() => _isAvailable = available); + if (!available) return; + } + await _service.startScan(); + } + } + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + + return Container( + constraints: BoxConstraints( + maxHeight: MediaQuery.sizeOf(context).height * 0.7, + ), + decoration: BoxDecoration( + color: ext.bgElevated, + borderRadius: const BorderRadius.vertical(top: Radius.circular(20)), + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + _buildHandle(ext), + _buildHeader(ext), + _buildScanButton(ext), + const SizedBox(height: AppSpacing.sm), + Expanded(child: _buildUserList(ext)), + SizedBox(height: MediaQuery.of(context).padding.bottom + 8), + ], + ), + ); + } + + Widget _buildHandle(AppThemeExtension ext) { + return Padding( + padding: const EdgeInsets.only(top: 8, bottom: 4), + child: Container( + width: 36, + height: 5, + decoration: BoxDecoration( + color: ext.textHint.withValues(alpha: 0.3), + borderRadius: BorderRadius.circular(3), + ), + ), + ); + } + + Widget _buildHeader(AppThemeExtension ext) { + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + const Text('📡', style: TextStyle(fontSize: 22)), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: Text( + '附近的人', + style: AppTypography.headline.copyWith( + color: ext.textPrimary, + ), + ), + ), + if (_isScanning) + CupertinoActivityIndicator(radius: 8, color: ext.accent), + ], + ), + const SizedBox(height: 4), + Text( + '发现附近也在使用闲言的用户', + style: AppTypography.caption1.copyWith(color: ext.textHint), + ), + ], + ), + ); + } + + Widget _buildScanButton(AppThemeExtension ext) { + return Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: SizedBox( + width: double.infinity, + child: CupertinoButton( + padding: const EdgeInsets.symmetric(vertical: AppSpacing.sm), + color: _isScanning + ? ext.bgSecondary + : ext.accent, + borderRadius: AppRadius.lgBorder, + onPressed: _toggleScan, + child: Text( + _isScanning ? '停止扫描' : '开始扫描', + style: AppTypography.subhead.copyWith( + color: _isScanning ? ext.textSecondary : CupertinoColors.white, + fontWeight: FontWeight.w600, + ), + ), + ), + ), + ); + } + + Widget _buildUserList(AppThemeExtension ext) { + if (!_isAvailable) { + return _buildEmptyState( + ext, + emoji: '📵', + title: '蓝牙不可用', + subtitle: '请开启蓝牙后重试', + ); + } + + if (_isScanning && _users.isEmpty) { + return Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + const CupertinoActivityIndicator(radius: 14), + const SizedBox(height: AppSpacing.md), + Text( + '正在搜索附近的闲言用户...', + style: AppTypography.subhead.copyWith(color: ext.textHint), + ), + ], + ), + ); + } + + if (_users.isEmpty) { + return _buildEmptyState( + ext, + emoji: '🔍', + title: '暂未发现附近用户', + subtitle: '点击"开始扫描"搜索附近的人', + ); + } + + return ListView.separated( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + itemCount: _users.length, + separatorBuilder: (_, __) => const SizedBox(height: AppSpacing.xs), + itemBuilder: (context, index) => _buildUserCard(ext, _users[index]), + ); + } + + Widget _buildEmptyState( + AppThemeExtension ext, { + required String emoji, + required String title, + required String subtitle, + }) { + return Center( + child: Padding( + padding: const EdgeInsets.all(AppSpacing.xl), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text(emoji, style: const TextStyle(fontSize: 48)), + const SizedBox(height: AppSpacing.md), + Text( + title, + style: AppTypography.subhead.copyWith(color: ext.textPrimary), + ), + const SizedBox(height: 4), + Text( + subtitle, + style: AppTypography.caption1.copyWith(color: ext.textHint), + textAlign: TextAlign.center, + ), + ], + ), + ), + ); + } + + Widget _buildUserCard(AppThemeExtension ext, NearbyUser user) { + return GestureDetector( + onTap: () => _onUserTap(user), + child: Container( + padding: const EdgeInsets.all(AppSpacing.md), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.lgBorder, + ), + child: Row( + children: [ + _buildAvatar(ext, user), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + user.displayName, + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + if (user.currentSentenceContent != null) ...[ + const SizedBox(height: 2), + Text( + '「${user.currentSentenceContent!}」', + style: AppTypography.caption1.copyWith( + color: ext.textSecondary, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ], + ], + ), + ), + const SizedBox(width: AppSpacing.sm), + _buildDistanceChip(ext, user), + ], + ), + ), + ); + } + + Widget _buildAvatar(AppThemeExtension ext, NearbyUser user) { + final emojis = ['😊', '😎', '🤗', '😄', '🥳', '🙂', '🧑', '👋']; + final index = user.deviceId.hashCode.abs() % emojis.length; + + return Container( + width: 44, + height: 44, + decoration: BoxDecoration( + color: ext.accent.withValues(alpha: 0.1), + borderRadius: BorderRadius.circular(22), + ), + child: Center( + child: Text(emojis[index], style: const TextStyle(fontSize: 22)), + ), + ); + } + + Widget _buildDistanceChip(AppThemeExtension ext, NearbyUser user) { + return Container( + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + decoration: BoxDecoration( + color: ext.accent.withValues(alpha: 0.1), + borderRadius: AppRadius.pillBorder, + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(CupertinoIcons.location_solid, size: 12, color: ext.accent), + const SizedBox(width: 3), + Text( + user.distanceText, + style: AppTypography.caption2.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ); + } + + void _onUserTap(NearbyUser user) { + AppToast.showInfo('💬 分享句子功能开发中'); + Log.i('NearbyUsers: Tapped user ${user.displayName}'); + } +} diff --git a/lib/features/home/presentation/providers/sentence_detail_sheet.dart b/lib/features/home/presentation/providers/sentence_detail_sheet.dart index 808d8c58..ef1e4fa5 100644 --- a/lib/features/home/presentation/providers/sentence_detail_sheet.dart +++ b/lib/features/home/presentation/providers/sentence_detail_sheet.dart @@ -25,6 +25,9 @@ import 'package:xianyan/shared/widgets/share_sheet.dart'; import 'package:xianyan/features/home/providers/daily_card_style_provider.dart'; import 'package:xianyan/features/user_center/providers/interaction_provider.dart'; import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/core/services/audio/tts_service.dart'; +import 'package:xianyan/shared/widgets/tts_player_bar.dart'; +import 'package:xianyan/core/services/nfc/nfc_share_service.dart'; class SentenceDetailSheet { static void show({ @@ -88,6 +91,7 @@ class _SentenceDetailContentState extends ConsumerState<_SentenceDetailContent> { FeedItem? _detailItem; bool _loadingDetail = false; + bool _showTtsPlayer = false; HomeSentence get sentence => widget.sentence; AppThemeExtension get ext => widget.ext; @@ -160,6 +164,11 @@ class _SentenceDetailContentState _buildPrimaryAction(), const SizedBox(height: AppSpacing.sm), _buildDangerActions(), + if (_showTtsPlayer) + Padding( + padding: const EdgeInsets.only(top: AppSpacing.sm), + child: TtsPlayerBar(text: sentence.text), + ), SizedBox(height: MediaQuery.of(context).padding.bottom + 16), ], ), @@ -573,10 +582,55 @@ class _SentenceDetailContentState child: Text('🎨 创作', style: TextStyle(color: ext.textPrimary)), ), ), + const SizedBox(width: 8), + if (TtsService.instance.isAvailable) + Expanded( + child: CupertinoButton( + color: ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + onPressed: _toggleTtsPlayer, + child: Text('🔊 朗读', style: TextStyle(color: ext.textPrimary)), + ), + ), + if (TtsService.instance.isAvailable && + NfcShareService.instance.isAvailable) + const SizedBox(width: 8), + if (NfcShareService.instance.isAvailable) + Expanded( + child: CupertinoButton( + color: ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + onPressed: () => _shareViaNfc(sentence), + child: Text('📡 NFC', style: TextStyle(color: ext.textPrimary)), + ), + ), ], ); } + void _toggleTtsPlayer() { + setState(() => _showTtsPlayer = true); + TtsService.instance.speak(sentence.text); + } + + Future _shareViaNfc(HomeSentence s) async { + try { + await NfcShareService.instance.shareSentence( + sentenceId: s.id, + content: s.text, + author: s.author, + ); + if (mounted) { + AppToast.showSuccess('📡 NFC分享成功'); + } + } catch (e) { + Log.e('NFC分享失败: $e'); + if (mounted) { + AppToast.showError('NFC分享失败'); + } + } + } + void _showTagDialog(int feedId, String targetType) { final controller = TextEditingController(); showCupertinoDialog( diff --git a/lib/features/home/providers/character_mood_provider.dart b/lib/features/home/providers/character_mood_provider.dart new file mode 100644 index 00000000..ff6b47fd --- /dev/null +++ b/lib/features/home/providers/character_mood_provider.dart @@ -0,0 +1,193 @@ +// ============================================================ +// 闲言APP — 角色拾光情绪系统 Provider +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 管理角色情绪状态、经验值、等级 +// 上次更新: 初始版本 — 情绪+成长系统 +// ============================================================ + +import 'dart:math' as math; + +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:xianyan/core/storage/app_kv_store.dart'; +import 'package:xianyan/core/utils/logger.dart'; + +enum CharacterMood { + happy('开心', '😊', 0.8), + neutral('平静', '😐', 0.5), + bored('无聊', '😴', 0.3), + sleepy('困倦', '🥱', 0.2), + excited('兴奋', '🤩', 1.0), + worried('担忧', '😟', 0.4); + + const CharacterMood(this.label, this.emoji, this.energy); + + final String label; + final String emoji; + final double energy; +} + +class CharacterMoodState { + const CharacterMoodState({ + this.mood = CharacterMood.neutral, + this.exp = 0, + this.totalInteractions = 0, + this.lastInteractionTime, + this.moodValue = 0.5, + }); + + final CharacterMood mood; + final int exp; + final int totalInteractions; + final DateTime? lastInteractionTime; + final double moodValue; + + int get level => exp <= 0 ? 1 : (math.log(exp) / math.log(2)).floor() + 1; + int get expForNextLevel => math.pow(2, level).toInt(); + int get expInCurrentLevel => exp - math.pow(2, level - 1).toInt(); + double get levelProgress => level <= 1 + ? (exp / expForNextLevel).clamp(0.0, 1.0) + : (expInCurrentLevel / + (expForNextLevel - math.pow(2, level - 1).toInt())) + .clamp(0.0, 1.0); + + CharacterMoodState copyWith({ + CharacterMood? mood, + int? exp, + int? totalInteractions, + DateTime? lastInteractionTime, + double? moodValue, + }) { + return CharacterMoodState( + mood: mood ?? this.mood, + exp: exp ?? this.exp, + totalInteractions: totalInteractions ?? this.totalInteractions, + lastInteractionTime: lastInteractionTime ?? this.lastInteractionTime, + moodValue: moodValue ?? this.moodValue, + ); + } +} + +class CharacterMoodNotifier extends Notifier { + static const _keyMood = 'character_mood_value'; + static const _keyExp = 'character_exp'; + static const _keyTotalInteractions = 'character_total_interactions'; + static const _keyLastInteraction = 'character_last_interaction_time'; + + @override + CharacterMoodState build() { + final moodVal = AppKVStore.getDouble(_keyMood) ?? 0.5; + final exp = AppKVStore.getInt(_keyExp) ?? 0; + final total = AppKVStore.getInt(_keyTotalInteractions) ?? 0; + final lastStr = AppKVStore.getString(_keyLastInteraction); + final lastTime = lastStr != null ? DateTime.tryParse(lastStr) : null; + + final initialState = CharacterMoodState( + moodValue: moodVal, + exp: exp, + totalInteractions: total, + lastInteractionTime: lastTime, + mood: _calculateMood(moodVal, lastTime), + ); + + Future.microtask(() => _checkTimeBasedMood()); + + return initialState; + } + + void recordAction(String action) { + final double delta = switch (action) { + 'like' => 0.05, + 'favorite' => 0.08, + 'read' => 0.03, + 'share' => 0.06, + 'create' => 0.1, + 'daily_checkin' => 0.07, + _ => 0.02, + }; + + final newMoodValue = (state.moodValue + delta).clamp(0.0, 1.0); + final newExp = state.exp + 1; + final newTotal = state.totalInteractions + 1; + final now = DateTime.now(); + + state = state.copyWith( + moodValue: newMoodValue, + exp: newExp, + totalInteractions: newTotal, + lastInteractionTime: now, + mood: _calculateMood(newMoodValue, now), + ); + + _persist(); + Log.d('角色情绪记录: action=$action, moodValue=$newMoodValue, exp=$newExp'); + } + + void decayMood() { + final lastTime = state.lastInteractionTime; + if (lastTime == null) return; + + final elapsed = DateTime.now().difference(lastTime); + double decay = 0.0; + if (elapsed.inMinutes > 30) decay = 0.05; + if (elapsed.inHours > 1) decay = 0.1; + if (elapsed.inHours > 2) decay = 0.2; + if (elapsed.inHours > 6) decay = 0.4; + + if (decay > 0) { + final newMoodValue = (state.moodValue - decay).clamp(0.0, 1.0); + state = state.copyWith( + moodValue: newMoodValue, + mood: _calculateMood(newMoodValue, DateTime.now()), + ); + _persist(); + Log.d('角色情绪衰减: decay=$decay, moodValue=$newMoodValue'); + } + } + + void _checkTimeBasedMood() { + final hour = DateTime.now().hour; + if (hour >= 22 || hour < 6) { + if (state.mood != CharacterMood.sleepy) { + state = state.copyWith(mood: CharacterMood.sleepy); + } + } else if (state.mood == CharacterMood.sleepy) { + state = state.copyWith( + mood: _calculateMood(state.moodValue, state.lastInteractionTime), + ); + } + } + + CharacterMood _calculateMood(double value, DateTime? lastTime) { + final hour = DateTime.now().hour; + if (hour >= 22 || hour < 6) return CharacterMood.sleepy; + + if (lastTime != null) { + final elapsed = DateTime.now().difference(lastTime); + if (elapsed.inHours > 2) return CharacterMood.bored; + } + + if (value >= 0.8) return CharacterMood.excited; + if (value >= 0.6) return CharacterMood.happy; + if (value >= 0.4) return CharacterMood.neutral; + if (value >= 0.2) return CharacterMood.bored; + return CharacterMood.bored; + } + + void _persist() { + AppKVStore.setDouble(_keyMood, state.moodValue); + AppKVStore.setInt(_keyExp, state.exp); + AppKVStore.setInt(_keyTotalInteractions, state.totalInteractions); + if (state.lastInteractionTime != null) { + AppKVStore.setString( + _keyLastInteraction, + state.lastInteractionTime!.toIso8601String(), + ); + } + } +} + +final characterMoodProvider = + NotifierProvider( + CharacterMoodNotifier.new, +); diff --git a/lib/features/home/providers/character_tips_provider.dart b/lib/features/home/providers/character_tips_provider.dart new file mode 100644 index 00000000..77fd9d9e --- /dev/null +++ b/lib/features/home/providers/character_tips_provider.dart @@ -0,0 +1,359 @@ +// ============================================================ +// 闲言APP — 角色拾光Tips气泡 Provider +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 管理角色点击后的Tips气泡内容（时段/场景/彩蛋/账户） +// 上次更新: Tips关联情绪系统，mood影响时段问候文案 +// ============================================================ + +import 'dart:math' as math; + +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:xianyan/core/services/data/jinrishici_sdk_service.dart'; +import 'package:xianyan/core/storage/app_kv_store.dart'; +import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/features/home/providers/character_mood_provider.dart'; +import 'package:xianyan/features/statistics/providers/user_stats_provider.dart'; + +// ============================================================ +// Tips 类别枚举 +// ============================================================ + +enum TipsCategory { + timeSlot('时段', '🕐'), + scene('场景', '📜'), + easterEgg('彩蛋', '🥚'), + account('账户', '📊'); + + const TipsCategory(this.label, this.emoji); + final String label; + final String emoji; +} + +// ============================================================ +// Tips 数据类 +// ============================================================ + +class CharacterTip { + const CharacterTip({ + required this.category, + required this.content, + required this.source, + }); + final TipsCategory category; + final String content; + final String source; +} + +// ============================================================ +// Tips 状态 +// ============================================================ + +class CharacterTipsState { + const CharacterTipsState({ + this.currentTip, + this.isExpanded = false, + this.isLoading = false, + this.enabledCategories = const { + TipsCategory.timeSlot, + TipsCategory.scene, + TipsCategory.easterEgg, + TipsCategory.account, + }, + }); + + final CharacterTip? currentTip; + final bool isExpanded; + final bool isLoading; + final Set enabledCategories; + + CharacterTipsState copyWith({ + CharacterTip? currentTip, + bool clearCurrentTip = false, + bool? isExpanded, + bool? isLoading, + Set? enabledCategories, + }) { + return CharacterTipsState( + currentTip: clearCurrentTip ? null : (currentTip ?? this.currentTip), + isExpanded: isExpanded ?? this.isExpanded, + isLoading: isLoading ?? this.isLoading, + enabledCategories: enabledCategories ?? this.enabledCategories, + ); + } +} + +// ============================================================ +// Tips Notifier +// ============================================================ + +class CharacterTipsNotifier extends Notifier { + static const String _categoriesKey = 'character_tips_categories'; + static const String _sceneTimeKey = 'character_tips_scene_time'; + static const String _firstLaunchTimeKey = 'app_first_launch_time'; + + @override + CharacterTipsState build() { + Set categories = { + TipsCategory.timeSlot, + TipsCategory.scene, + TipsCategory.easterEgg, + TipsCategory.account, + }; + try { + final raw = AppKVStore.getString(_categoriesKey); + if (raw != null && raw.isNotEmpty) { + final list = raw.split(',').where((e) => e.isNotEmpty).toList(); + final parsed = {}; + for (final name in list) { + final cat = TipsCategory.values + .where((c) => c.name == name) + .firstOrNull; + if (cat != null) parsed.add(cat); + } + if (parsed.isNotEmpty) categories = parsed; + } + } catch (e) { + Log.w('CharacterTips: 类别配置读取失败 $e'); + } + _ensureFirstLaunchTime(); + return CharacterTipsState(enabledCategories: categories); + } + + void _ensureFirstLaunchTime() { + final existing = AppKVStore.getString(_firstLaunchTimeKey); + if (existing == null || existing.isEmpty) { + AppKVStore.setString( + _firstLaunchTimeKey, + DateTime.now().toIso8601String(), + ); + } + } + + void toggleCategory(TipsCategory cat) { + final updated = Set.from(state.enabledCategories); + if (updated.contains(cat)) { + if (updated.length <= 1) return; + updated.remove(cat); + } else { + updated.add(cat); + } + state = state.copyWith(enabledCategories: updated); + try { + AppKVStore.setString( + _categoriesKey, + updated.map((c) => c.name).join(','), + ); + } catch (e) { + Log.e('CharacterTips: 类别配置保存失败 $e'); + } + } + + Future generateTip(String characterId) async { + if (state.isLoading) return; + state = state.copyWith(isLoading: true); + + final enabled = state.enabledCategories.toList(); + if (enabled.isEmpty) { + state = state.copyWith(isLoading: false); + return; + } + + final chosen = enabled[math.Random().nextInt(enabled.length)]; + String content; + String source; + + switch (chosen) { + case TipsCategory.timeSlot: + final mood = ref.read(characterMoodProvider).mood; + content = _generateTimeSlotTip(mood); + source = '时段问候'; + case TipsCategory.scene: + content = await _generateSceneTip(); + source = '今日诗词'; + case TipsCategory.easterEgg: + content = _generateEasterEggTip(); + source = '拾光彩蛋'; + case TipsCategory.account: + content = await _generateAccountTip(); + source = '账户统计'; + } + + state = state.copyWith( + currentTip: CharacterTip( + category: chosen, + content: content, + source: source, + ), + isExpanded: true, + isLoading: false, + ); + + Future.delayed(const Duration(seconds: 3), () { + if (state.isExpanded) { + state = state.copyWith(isExpanded: false); + } + }); + } + + void dismissTip() { + state = state.copyWith(isExpanded: false); + } + + void showTip(TipsCategory category, String content) { + state = state.copyWith( + currentTip: CharacterTip( + category: category, + content: content, + source: 'system', + ), + isExpanded: true, + ); + Future.delayed(const Duration(seconds: 3), () { + if (state.isExpanded) { + state = state.copyWith(isExpanded: false); + } + }); + } + + String _generateTimeSlotTip([CharacterMood? mood]) { + if (mood != null && mood != CharacterMood.neutral) { + final moodPrefix = switch (mood) { + CharacterMood.happy => '今天心情不错呢~ ', + CharacterMood.excited => '好兴奋！一起来读点什么吧 ', + CharacterMood.bored => '好无聊，来读点什么吧 ', + CharacterMood.sleepy => '困了...但还是想陪你 ', + CharacterMood.worried => '有点担心你... ', + CharacterMood.neutral => '', + }; + if (moodPrefix.isNotEmpty) return moodPrefix.trimRight(); + } + final hour = DateTime.now().hour; + if (hour >= 5 && hour < 8) { + return '早上了，新的一天从阅读开始 🌅'; + } else if (hour >= 8 && hour < 11) { + return '上午好，拾光陪你读书 ☀️'; + } else if (hour >= 11 && hour < 13) { + return '中午了，休息一下再继续吧 🌤'; + } else if (hour >= 13 && hour < 17) { + return '下午好，来一句好句提提神 💪'; + } else if (hour >= 17 && hour < 19) { + return '傍晚了，今天的夕阳一定很美 🌇'; + } else if (hour >= 19 && hour < 22) { + return '晚上好，睡前读一段好文 🌙'; + } else if (hour >= 22) { + return '夜深了，早点休息哦 💤'; + } else { + return '这么晚了还在看？注意休息 🌃'; + } + } + + Future _generateSceneTip() async { + try { + final lastTimeStr = AppKVStore.getString(_sceneTimeKey); + if (lastTimeStr != null && lastTimeStr.isNotEmpty) { + final lastTime = DateTime.tryParse(lastTimeStr); + if (lastTime != null) { + final diff = DateTime.now().difference(lastTime); + if (diff.inHours < 1) { + return '刚刚读过诗了，过会儿再来 📖'; + } + } + } + + final result = await JinrishiciSdkService.fetchSentence(); + if (result != null) { + final data = result['data'] as Map?; + String? content; + if (data != null) { + content = data['content'] as String?; + } + if (content != null && content.isNotEmpty) { + if (content.length > 20) { + content = '${content.substring(0, 20)}…'; + } + AppKVStore.setString(_sceneTimeKey, DateTime.now().toIso8601String()); + return content; + } + } + } catch (e) { + Log.w('CharacterTips: 诗词获取失败 $e'); + } + return '今天没有找到合适的诗 📭'; + } + + String _generateEasterEggTip() { + int days = 1; + try { + final firstLaunchStr = AppKVStore.getString(_firstLaunchTimeKey); + if (firstLaunchStr != null && firstLaunchStr.isNotEmpty) { + final firstLaunch = DateTime.tryParse(firstLaunchStr); + if (firstLaunch != null) { + days = DateTime.now().difference(firstLaunch).inDays; + if (days < 1) days = 1; + } + } + } catch (_) {} + + if (days % 365 == 0 && days >= 365) { + return '一年了！拾光永远陪伴你 💎'; + } else if (days % 100 == 0 && days >= 100) { + return '百日坚持！了不起 🏅'; + } else if (days % 30 == 0 && days >= 30) { + return '一个月了！你是真正的阅读者 🌟'; + } else if (days % 7 == 0 && days >= 7) { + return '一周纪念！拾光为你骄傲 🎊'; + } + + final tips = [ + '你已经和拾光相伴 $days 天了 🎉', + '第 $days 天，每一天都值得记录 ✨', + '拾光记得，你已坚持 $days 天 🏆', + '$days 天的阅读旅程，继续加油 🚀', + ]; + return tips[math.Random().nextInt(tips.length)]; + } + + Future _generateAccountTip() async { + try { + final statsState = ref.read(userStatsProvider); + final learning = statsState.learningOverview; + final favorite = statsState.favoriteOverview; + + final totalViews = learning?.totalViews ?? 0; + final totalFavorites = favorite?.totalFavorites ?? 0; + + if (totalViews == 0 && totalFavorites == 0) { + return '还没有数据，去读点什么吧 📚'; + } + + final tips = []; + if (totalFavorites > 0) { + tips.add('你已收藏了 $totalFavorites 条好句 📌'); + } + if (totalViews > 0) { + tips.add('累计阅读 $totalViews 条，继续加油 📖'); + } + if (totalFavorites > 0 && totalViews > 0) { + tips.add('写了 ${totalFavorites + totalViews} 条记录，真棒 ✍️'); + } + + if (tips.isEmpty) { + return '还没有数据，去读点什么吧 📚'; + } + return tips[math.Random().nextInt(tips.length)]; + } catch (e) { + Log.w('CharacterTips: 账户统计读取失败 $e'); + return '还没有数据，去读点什么吧 📚'; + } + } +} + +// ============================================================ +// Provider +// ============================================================ + +final characterTipsProvider = + NotifierProvider( + CharacterTipsNotifier.new, + ); diff --git a/lib/features/home/providers/home_feed_mixin.dart b/lib/features/home/providers/home_feed_mixin.dart index 1d2e195f..aa93ca62 100644 --- a/lib/features/home/providers/home_feed_mixin.dart +++ b/lib/features/home/providers/home_feed_mixin.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 首页Feed数据拉取Mixin /// 创建时间: 2026-05-12 -/// 更新时间: 2026-05-13 +/// 更新时间: 2026-05-20 /// 作用: 频道/每日推荐/列表/降级/缓存的拉取逻辑 -/// 上次更新: 新增fetchRefreshSentences调用refresh_content接口; fetchNewSentences传递seen_ids +/// 上次更新: fetchDailySentence成功后同步推送拾光角色小组件数据 /// ============================================================ import 'dart:convert'; @@ -13,6 +13,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../core/storage/app_kv_store.dart'; import '../../../core/storage/database/app_database.dart'; import '../../../core/utils/logger.dart'; +import '../../../core/services/data/home_widget_service.dart'; import '../../../editor/services/core/hitokoto_service.dart'; import '../../../shared/widgets/app_toast.dart'; import '../models/feed_model.dart'; @@ -91,7 +92,9 @@ mixin HomeFeedMixin on Notifier { ) .toList(); - final unique = newSentences.where((s) => !allSeenIds.contains(s.id)).toList(); + final unique = newSentences + .where((s) => !allSeenIds.contains(s.id)) + .toList(); if (unique.isEmpty) { Log.w('fetchRefreshSentences: 去重后为空, 使用原始列表'); @@ -322,6 +325,7 @@ mixin HomeFeedMixin on Notifier { dailySentence: dailyList.first, dailySentences: dailyList, ); + _syncDailyWithCharacterWidget(dailyList.first); return; } @@ -414,6 +418,7 @@ mixin HomeFeedMixin on Notifier { dailySentence: finalList.first, dailySentences: finalList, ); + _syncDailyWithCharacterWidget(finalList.first); } else { Log.w('refreshDailySentences: fetchMix返回空, 降级fetchRecommend'); await fetchDailySentenceFallback(); @@ -441,6 +446,7 @@ mixin HomeFeedMixin on Notifier { dailySentence: dailyList.first, dailySentences: dailyList, ); + _syncDailyWithCharacterWidget(dailyList.first); return; } } catch (e) { @@ -451,7 +457,9 @@ mixin HomeFeedMixin on Notifier { final quote = await HitokotoService.fetch(); if (quote != null) { Log.i('fetchDailySentenceFallback: Hitokoto降级成功'); - state = state.copyWith(dailySentence: HomeSentence.fromHitokoto(quote)); + final sentence = HomeSentence.fromHitokoto(quote); + state = state.copyWith(dailySentence: sentence); + _syncDailyWithCharacterWidget(sentence); } } catch (e) { Log.e('Hitokoto降级也失败', e); @@ -756,4 +764,32 @@ mixin HomeFeedMixin on Notifier { Log.e('句子缓存写入失败', e); } } + + void _syncDailyWithCharacterWidget(HomeSentence sentence) { + try { + final moodStr = AppKVStore.getString('character_mood_value'); + String moodName = 'neutral'; + if (moodStr != null) { + final v = double.tryParse(moodStr) ?? 0.5; + if (v >= 0.8) + moodName = 'excited'; + else if (v >= 0.6) + moodName = 'happy'; + else if (v >= 0.4) + moodName = 'neutral'; + else if (v >= 0.2) + moodName = 'bored'; + else + moodName = 'bored'; + } + HomeWidgetService.instance.updateDailyWithCharacter( + content: sentence.text, + author: sentence.author, + sentenceId: sentence.id, + mood: moodName, + ); + } catch (e) { + Log.e('同步拾光角色小组件失败', e); + } + } } diff --git a/lib/features/home/providers/home_interaction_mixin.dart b/lib/features/home/providers/home_interaction_mixin.dart index 5bc698f0..587c1f96 100644 --- a/lib/features/home/providers/home_interaction_mixin.dart +++ b/lib/features/home/providers/home_interaction_mixin.dart @@ -1,25 +1,31 @@ /// ============================================================ /// 闲言APP — 首页互动操作Mixin /// 创建时间: 2026-05-12 -/// 更新时间: 2026-05-12 +/// 更新时间: 2026-05-20 /// 作用: 点赞/收藏/稍后读/已读/评分/屏蔽/举报/不感兴趣/阅读时长 -/// 上次更新: 从home_provider.dart拆分，增加防抖保护和mounted检查 +/// 上次更新: 修复mounted字段+互动通知情绪系统+recordAction接入 /// ============================================================ import 'package:flutter_riverpod/flutter_riverpod.dart'; +import '../../../core/services/audio/sfx_service.dart'; import '../../../core/storage/database/app_database.dart'; import '../../../core/utils/logger.dart'; import '../../inspiration/providers/chat_provider.dart'; import '../../inspiration/services/chat_message_service.dart'; import '../services/feed_service.dart'; +import 'character_mood_provider.dart'; import 'home_sentence_model.dart'; import 'home_state.dart'; mixin HomeInteractionMixin on Notifier { - // ignore: unused_field - final bool _mounted = true; + bool _mounted = true; bool get mounted => _mounted; + + void markDisposed() { + _mounted = false; + } + AppDatabase get interactionDb; Set get togglingIds; @@ -42,6 +48,10 @@ mixin HomeInteractionMixin on Notifier { final oldValue = sentence.isLiked; if (!mounted) return; updateSentence(id, (s) => s.copyWith(isLiked: !s.isLiked)); + SfxService.instance.play(oldValue ? SfxType.unlike : SfxType.like); + ref + .read(characterMoodProvider.notifier) + .recordAction(oldValue ? 'unlike' : 'like'); try { await interactionDb.toggleLike(id); @@ -92,6 +102,12 @@ mixin HomeInteractionMixin on Notifier { final oldValue = sentence.isFavorited; if (!mounted) return; updateSentence(id, (s) => s.copyWith(isFavorited: !s.isFavorited)); + SfxService.instance.play( + oldValue ? SfxType.unfavorite : SfxType.favorite, + ); + ref + .read(characterMoodProvider.notifier) + .recordAction(oldValue ? 'unfavorite' : 'favorite'); try { await interactionDb.toggleFavorite(id); diff --git a/lib/features/home/providers/home_provider.dart b/lib/features/home/providers/home_provider.dart index d0691829..1490b491 100644 --- a/lib/features/home/providers/home_provider.dart +++ b/lib/features/home/providers/home_provider.dart @@ -114,6 +114,7 @@ class HomeNotifier extends Notifier HomeNotifier(); void _onDispose() { + markDisposed(); _connectivityStream = null; } diff --git a/lib/features/home/services/cache_service.dart b/lib/features/home/services/cache_service.dart index 0321c813..2b5c91cc 100644 --- a/lib/features/home/services/cache_service.dart +++ b/lib/features/home/services/cache_service.dart @@ -1,22 +1,22 @@ /// ============================================================ /// 闲言APP — 缓存服务 /// 创建时间: 2026-04-28 -/// 更新时间: 2026-05-15 +/// 更新时间: 2026-05-20 /// 作用: 统一缓存读写、统计、清理、策略管理 -/// 上次更新: 新增稍后读缓存管理方法(getReadlaterCacheSize/cleanReadlaterCache/clearReadlaterData) +/// 上次更新: 修复Web端path_provider MissingPluginException(使用safeAppDirPath) /// ============================================================ import 'dart:io'; import 'package:drift/drift.dart'; import 'package:hive_flutter/hive_flutter.dart'; -import 'package:path_provider/path_provider.dart'; import 'package:sqflite/sqflite.dart' show Sqflite; import '../../../core/storage/app_kv_store.dart'; import '../../../core/storage/cache_config.dart'; import '../../../core/storage/database/app_database.dart'; import '../../../core/utils/logger.dart'; +import '../../../core/utils/platform_utils.dart' as pu; import '../models/feed_model.dart'; import '../services/offline_manager.dart'; @@ -25,6 +25,9 @@ class CacheService { static final AppDatabase _db = AppDatabase.instance; + /// 安全获取应用文档目录路径(Web端返回null) + static Future _safeAppDirPath() => pu.safeAppDirPath; + // ---- 缓存配置 ---- static CacheConfig _config = const CacheConfig(); @@ -127,10 +130,10 @@ class CacheService { HiveBoxNames.offlineQueue, ); - final appDocDir = await getApplicationDocumentsDirectory(); - final dbFileSize = await _getFileSize( - '${appDocDir.path}/app_database.sqlite', - ); + final appDocPath = await _safeAppDirPath(); + final dbFileSize = appDocPath != null + ? await _getFileSize('$appDocPath/app_database.sqlite') + : 0; final totalSizeBytes = hiveFeedCacheSize + hiveOfflineQueueSize + dbFileSize; @@ -138,9 +141,13 @@ class CacheService { final chatConvCount = await _getChatConversationCount(); final chatMsgCount = await _getChatMessageCount(); final chatAttachCount = await _getChatAttachmentCount(); - final chatAttachSize = await _getChatAttachmentDirSize(appDocDir.path); + final chatAttachSize = appDocPath != null + ? await _getChatAttachmentDirSize(appDocPath) + : 0; final chatTrashCount = await _getChatTrashCount(); - final chatTrashSize = await _getChatTrashDirSize(appDocDir.path); + final chatTrashSize = appDocPath != null + ? await _getChatTrashDirSize(appDocPath) + : 0; final readlaterSize = await getReadlaterCacheSize(); @@ -206,8 +213,9 @@ class CacheService { 'DELETE FROM chat_msg_records WHERE is_deleted = 1 AND updated_at < ?', [Variable.withInt(cutoff.millisecondsSinceEpoch)], ); - final appDocDir = await getApplicationDocumentsDirectory(); - final trashDir = Directory('${appDocDir.path}/chat_trash'); + final appDocPath = await _safeAppDirPath(); + if (appDocPath == null) return; + final trashDir = Directory('$appDocPath/chat_trash'); if (await trashDir.exists()) { await trashDir.delete(recursive: true); } @@ -219,8 +227,9 @@ class CacheService { static Future cleanChatThumbnails() async { try { - final appDocDir = await getApplicationDocumentsDirectory(); - final attachDir = Directory('${appDocDir.path}/chat_attachments'); + final appDocPath = await _safeAppDirPath(); + if (appDocPath == null) return; + final attachDir = Directory('$appDocPath/chat_attachments'); if (await attachDir.exists()) { await for (final entity in attachDir.list(recursive: true)) { if (entity is File) { @@ -242,12 +251,13 @@ class CacheService { await _db.executor.runCustom('DELETE FROM chat_attachments'); await _db.executor.runCustom('DELETE FROM chat_msg_records'); await _db.executor.runCustom('DELETE FROM chat_conversations'); - final appDocDir = await getApplicationDocumentsDirectory(); - final attachDir = Directory('${appDocDir.path}/chat_attachments'); + final appDocPath = await _safeAppDirPath(); + if (appDocPath == null) return; + final attachDir = Directory('$appDocPath/chat_attachments'); if (await attachDir.exists()) { await attachDir.delete(recursive: true); } - final trashDir = Directory('${appDocDir.path}/chat_trash'); + final trashDir = Directory('$appDocPath/chat_trash'); if (await trashDir.exists()) { await trashDir.delete(recursive: true); } @@ -271,23 +281,25 @@ class CacheService { final msgCount = Sqflite.firstIntValue(msgRows) ?? 0; totalSize += msgCount * 512; - final appDocDir = await getApplicationDocumentsDirectory(); - final readlaterDir = Directory( - '${appDocDir.path}/chat_attachments/readlater', - ); - if (await readlaterDir.exists()) { - await for (final entity in readlaterDir.list(recursive: true)) { - if (entity is File) { - totalSize += await entity.length(); + final appDocPath = await _safeAppDirPath(); + if (appDocPath != null) { + final readlaterDir = Directory( + '$appDocPath/chat_attachments/readlater', + ); + if (await readlaterDir.exists()) { + await for (final entity in readlaterDir.list(recursive: true)) { + if (entity is File) { + totalSize += await entity.length(); + } } } - } - final syncDir = Directory('${appDocDir.path}/readlater_sync'); - if (await syncDir.exists()) { - await for (final entity in syncDir.list(recursive: true)) { - if (entity is File) { - totalSize += await entity.length(); + final syncDir = Directory('$appDocPath/readlater_sync'); + if (await syncDir.exists()) { + await for (final entity in syncDir.list(recursive: true)) { + if (entity is File) { + totalSize += await entity.length(); + } } } } @@ -302,11 +314,10 @@ class CacheService { /// 清理稍后读缓存（缩略图/附件，保留消息记录） static Future cleanReadlaterCache() async { try { - final appDocDir = await getApplicationDocumentsDirectory(); + final appDocPath = await _safeAppDirPath(); + if (appDocPath == null) return; - final readlaterDir = Directory( - '${appDocDir.path}/chat_attachments/readlater', - ); + final readlaterDir = Directory('$appDocPath/chat_attachments/readlater'); if (await readlaterDir.exists()) { await for (final entity in readlaterDir.list(recursive: true)) { if (entity is File) { @@ -318,7 +329,7 @@ class CacheService { } } - final syncDir = Directory('${appDocDir.path}/readlater_sync'); + final syncDir = Directory('$appDocPath/readlater_sync'); if (await syncDir.exists()) { await syncDir.delete(recursive: true); } @@ -341,15 +352,14 @@ class CacheService { [], ); - final appDocDir = await getApplicationDocumentsDirectory(); - final readlaterDir = Directory( - '${appDocDir.path}/chat_attachments/readlater', - ); + final appDocPath = await _safeAppDirPath(); + if (appDocPath == null) return; + final readlaterDir = Directory('$appDocPath/chat_attachments/readlater'); if (await readlaterDir.exists()) { await readlaterDir.delete(recursive: true); } - final syncDir = Directory('${appDocDir.path}/readlater_sync'); + final syncDir = Directory('$appDocPath/readlater_sync'); if (await syncDir.exists()) { await syncDir.delete(recursive: true); } diff --git a/lib/features/inspiration/presentation/pages/translate/translate_page.dart b/lib/features/inspiration/presentation/pages/translate/translate_page.dart index ceb9ac1c..0e82a9bb 100644 --- a/lib/features/inspiration/presentation/pages/translate/translate_page.dart +++ b/lib/features/inspiration/presentation/pages/translate/translate_page.dart @@ -1,9 +1,9 @@ // ============================================================ // 闲言APP — 翻译助手主页面 // 创建时间: 2026-05-19 -// 更新时间: 2026-05-19 +// 更新时间: 2026-05-20 // 作用: 翻译助手会话流页面，语言选择+消息列表+输入发送+设置 -// 上次更新: 初始创建 +// 上次更新: 修复布局溢出和重复ref.watch导致卡死的问题 // ============================================================ import 'dart:async'; @@ -80,7 +80,12 @@ class _TranslatePageState extends ConsumerState { @override Widget build(BuildContext context) { final ext = AppTheme.ext(context); - final state = ref.watch(translateProvider); + TranslateState state; + try { + state = ref.watch(translateProvider); + } catch (e) { + state = const TranslateState(); + } return CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( @@ -98,8 +103,8 @@ class _TranslatePageState extends ConsumerState { GestureDetector( onTap: () => _showHistory(context), child: Container( - width: 32, - height: 32, + width: 28, + height: 28, decoration: BoxDecoration( color: ext.bgSecondary, borderRadius: AppRadius.mdBorder, @@ -107,17 +112,17 @@ class _TranslatePageState extends ConsumerState { child: Center( child: Text( '📋', - style: TextStyle(fontSize: 16, color: ext.iconSecondary), + style: TextStyle(fontSize: 14, color: ext.iconSecondary), ), ), ), ), - const SizedBox(width: AppSpacing.sm), + const SizedBox(width: AppSpacing.xs), GestureDetector( onTap: () => context.appPush(AppRoutes.translateSettings), child: Container( - width: 32, - height: 32, + width: 28, + height: 28, decoration: BoxDecoration( color: ext.bgSecondary, borderRadius: AppRadius.mdBorder, @@ -125,7 +130,7 @@ class _TranslatePageState extends ConsumerState { child: Center( child: Text( '⚙️', - style: TextStyle(fontSize: 16, color: ext.iconSecondary), + style: TextStyle(fontSize: 14, color: ext.iconSecondary), ), ), ), @@ -137,8 +142,8 @@ class _TranslatePageState extends ConsumerState { bottom: false, child: Column( children: [ - _buildLangPairBar(ext), - _buildLangChipBar(ext), + _buildLangPairBar(ext, state), + _buildLangChipBar(ext, state), Expanded(child: _buildMessageArea(ext, state)), _buildInputBar(ext, state), ], @@ -147,12 +152,13 @@ class _TranslatePageState extends ConsumerState { ); } - Widget _buildLangPairBar(AppThemeExtension ext) { - final state = ref.watch(translateProvider); - final sourceLang = state.sourceLang == 'auto' + Widget _buildLangPairBar(AppThemeExtension ext, TranslateState state) { + final sourceLangCode = state.sourceLang; + final targetLangCode = state.targetLang; + final sourceLang = sourceLangCode == 'auto' ? TranslateLanguage.autoDetect - : TranslateLanguage.findByCode(state.sourceLang); - final targetLang = TranslateLanguage.findByCode(state.targetLang); + : TranslateLanguage.findByCode(sourceLangCode); + final targetLang = TranslateLanguage.findByCode(targetLangCode); return Padding( padding: const EdgeInsets.symmetric( @@ -239,12 +245,11 @@ class _TranslatePageState extends ConsumerState { ); } - Widget _buildLangChipBar(AppThemeExtension ext) { - final state = ref.watch(translateProvider); + Widget _buildLangChipBar(AppThemeExtension ext, TranslateState state) { final popularLangs = TranslateLanguage.popular; return Container( - height: 44, + constraints: const BoxConstraints(minHeight: 40, maxHeight: 48), padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs), decoration: BoxDecoration( color: ext.bgSecondary, @@ -252,32 +257,35 @@ class _TranslatePageState extends ConsumerState { bottom: BorderSide(color: ext.overlaySubtle, width: 0.5), ), ), - child: ListView.separated( - scrollDirection: Axis.horizontal, - padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), - itemCount: popularLangs.length + 1, - separatorBuilder: (_, __) => const SizedBox(width: AppSpacing.sm), - itemBuilder: (context, index) { - if (index == popularLangs.length) { + child: SizedBox( + height: 36, + child: ListView.separated( + scrollDirection: Axis.horizontal, + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + itemCount: popularLangs.length + 1, + separatorBuilder: (_, __) => const SizedBox(width: AppSpacing.sm), + itemBuilder: (context, index) { + if (index == popularLangs.length) { + return _buildLangChip( + ext, + flag: '🌍', + name: '更多', + isSelected: false, + onTap: () => _showTargetLangPicker(ext), + ); + } + final lang = popularLangs[index]; + final isSelected = state.targetLang == lang.code; return _buildLangChip( ext, - flag: '🌍', - name: '更多', - isSelected: false, - onTap: () => _showTargetLangPicker(ext), + flag: lang.flag, + name: lang.name, + isSelected: isSelected, + onTap: () => + ref.read(translateProvider.notifier).setTargetLang(lang.code), ); - } - final lang = popularLangs[index]; - final isSelected = state.targetLang == lang.code; - return _buildLangChip( - ext, - flag: lang.flag, - name: lang.name, - isSelected: isSelected, - onTap: () => - ref.read(translateProvider.notifier).setTargetLang(lang.code), - ); - }, + }, + ), ), ); } @@ -294,7 +302,7 @@ class _TranslatePageState extends ConsumerState { child: AnimatedContainer( duration: const Duration(milliseconds: 250), curve: Curves.easeOutCubic, - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4), decoration: BoxDecoration( color: isSelected ? ext.accent : ext.bgCard, borderRadius: AppRadius.fullBorder, @@ -570,9 +578,16 @@ class _TranslatePageState extends ConsumerState { bottomLeft: Radius.circular(4), bottomRight: Radius.circular(18), ), - child: SelectableText( - msg.content, - style: TextStyle(fontSize: 15, color: ext.textPrimary, height: 1.5), + child: Material( + color: Colors.transparent, + child: SelectableText( + msg.content, + style: TextStyle( + fontSize: 15, + color: ext.textPrimary, + height: 1.5, + ), + ), ), ), const SizedBox(height: 4), @@ -727,12 +742,13 @@ class _TranslatePageState extends ConsumerState { } Widget _buildInputBar(AppThemeExtension ext, TranslateState state) { + final bottomPadding = MediaQuery.viewPaddingOf(context).bottom; return Container( - padding: const EdgeInsets.fromLTRB( + padding: EdgeInsets.fromLTRB( AppSpacing.md, AppSpacing.sm, AppSpacing.md, - AppSpacing.lg, + AppSpacing.sm + bottomPadding, ), decoration: BoxDecoration( color: ext.bgPrimary, @@ -753,7 +769,7 @@ class _TranslatePageState extends ConsumerState { crossAxisAlignment: CrossAxisAlignment.end, children: [ Expanded( - child: TextField( + child: CupertinoTextField( controller: _inputController, focusNode: _focusNode, maxLines: null, @@ -764,13 +780,10 @@ class _TranslatePageState extends ConsumerState { color: ext.textPrimary, fontFamily: ext.fontFamily, ), - decoration: InputDecoration( - hintText: '输入需要翻译的文本...', - hintStyle: TextStyle(color: ext.textHint), - border: InputBorder.none, - contentPadding: const EdgeInsets.symmetric(vertical: 6), - isDense: true, - ), + placeholder: '输入需要翻译的文本...', + placeholderStyle: TextStyle(color: ext.textHint), + decoration: const BoxDecoration(), + padding: const EdgeInsets.symmetric(vertical: 6), ), ), const SizedBox(width: AppSpacing.xs), diff --git a/lib/features/inspiration/providers/translate_provider.dart b/lib/features/inspiration/providers/translate_provider.dart index 375cd367..64546eb7 100644 --- a/lib/features/inspiration/providers/translate_provider.dart +++ b/lib/features/inspiration/providers/translate_provider.dart @@ -82,13 +82,17 @@ class TranslateState { } class TranslateNotifier extends Notifier { - final List _builtInApis = [ - BingTranslateService(), - MyMemoryTranslateService(), - AppWorldsTranslateService(), - GoogleTranslateService(), - LibreTranslateService(), - ]; + List? _builtInApisCache; + + List get _builtInApis { + return _builtInApisCache ??= [ + BingTranslateService(), + MyMemoryTranslateService(), + AppWorldsTranslateService(), + GoogleTranslateService(), + LibreTranslateService(), + ]; + } static const _fallbackOrder = [ 'bing', @@ -115,7 +119,10 @@ class TranslateNotifier extends Notifier { for (final api in apis) { if (api.id == id) return api; } - return _builtInApis.first; + if (_builtInApis.isNotEmpty) { + return _builtInApis.first; + } + return BingTranslateService(); } void setTargetLang(String lang) { @@ -137,6 +144,11 @@ class TranslateNotifier extends Notifier { final targetLang = state.targetLang; final sourceLang = state.sourceLang; + final sourceLangInfo = sourceLang == 'auto' + ? null + : TranslateLanguage.findByCode(sourceLang); + final targetLangInfo = TranslateLanguage.findByCode(targetLang); + final userMsg = TranslateMessage( id: 'user_${DateTime.now().millisecondsSinceEpoch}', sessionId: 'default', @@ -144,11 +156,9 @@ class TranslateNotifier extends Notifier { content: text, createdAt: DateTime.now(), sourceLang: sourceLang == 'auto' ? null : sourceLang, - sourceLangName: sourceLang == 'auto' - ? null - : TranslateLanguage.findByCode(sourceLang)?.name, + sourceLangName: sourceLangInfo?.name, targetLang: targetLang, - targetLangName: TranslateLanguage.findByCode(targetLang)?.name, + targetLangName: targetLangInfo?.name, ); final assistantMsg = TranslateMessage( @@ -159,7 +169,7 @@ class TranslateNotifier extends Notifier { createdAt: DateTime.now(), sourceLang: sourceLang == 'auto' ? null : sourceLang, targetLang: targetLang, - targetLangName: TranslateLanguage.findByCode(targetLang)?.name, + targetLangName: targetLangInfo?.name, autoDetected: sourceLang == 'auto' && settings.autoDetect, status: TranslateStatus.translating, ); @@ -252,7 +262,10 @@ class TranslateNotifier extends Notifier { targetLang: targetLang, sourceLang: effectiveSourceLang, ); - return result; + if (result.translatedText.isNotEmpty) { + return result; + } + throw Exception('翻译结果为空'); } catch (e) { lastError = Exception(e.toString()); debugPrint('[$apiId] 翻译失败，尝试下一个: $e'); @@ -271,6 +284,7 @@ class TranslateNotifier extends Notifier { final userMsgIdx = idx - 1; if (userMsgIdx < 0) return; final userMsg = state.messages[userMsgIdx]; + if (userMsg.content.trim().isEmpty) return; final updatedMessages = [...state.messages]; updatedMessages[idx] = failedMsg.copyWith( diff --git a/lib/features/inspiration/services/appworlds_translate_service.dart b/lib/features/inspiration/services/appworlds_translate_service.dart index ea9559f9..c508f991 100644 --- a/lib/features/inspiration/services/appworlds_translate_service.dart +++ b/lib/features/inspiration/services/appworlds_translate_service.dart @@ -66,7 +66,10 @@ class AppWorldsTranslateService implements TranslateApiService { _lastRequestTime = DateTime.now(); stopwatch.stop(); - final data = response.data!; + final data = response.data; + if (data == null) { + throw Exception('AppWorlds翻译响应为空'); + } final code = data['code']; if (code != 200 && code != '200') { diff --git a/lib/features/inspiration/services/bing_translate_service.dart b/lib/features/inspiration/services/bing_translate_service.dart index 7f942264..727f462c 100644 --- a/lib/features/inspiration/services/bing_translate_service.dart +++ b/lib/features/inspiration/services/bing_translate_service.dart @@ -94,19 +94,22 @@ class BingTranslateService implements TranslateApiService { stopwatch.stop(); - final data = response.data!; - if (data.isEmpty) { + final data = response.data; + if (data == null || data.isEmpty) { throw Exception('Bing翻译响应为空'); } - final firstResult = data[0] as Map; - final translations = firstResult['translations'] as List; - if (translations.isEmpty) { + final firstResult = data[0]; + if (firstResult is! Map) { + throw Exception('Bing翻译响应格式异常'); + } + final translationsRaw = firstResult['translations']; + if (translationsRaw is! List || translationsRaw.isEmpty) { throw Exception('Bing翻译结果为空'); } final translatedText = - (translations[0] as Map)['text'] as String? ?? ''; + (translationsRaw[0] as Map?)?['text'] as String? ?? ''; String? detectedLang; String? detectedLangName; diff --git a/lib/features/inspiration/services/custom_translate_service.dart b/lib/features/inspiration/services/custom_translate_service.dart index 1334bc50..19c089c8 100644 --- a/lib/features/inspiration/services/custom_translate_service.dart +++ b/lib/features/inspiration/services/custom_translate_service.dart @@ -123,12 +123,15 @@ class CustomTranslateService implements TranslateApiService { if (_config.responseFormat == CustomApiResponseFormat.plain) { translatedText = response.data?.toString() ?? ''; } else { - final data = response.data as Map; - final extracted = _extractByPath(data, _config.responseTextPath); + final rawData = response.data; + if (rawData is! Map) { + throw Exception('自定义API响应格式异常: 期望JSON对象'); + } + final extracted = _extractByPath(rawData, _config.responseTextPath); translatedText = extracted?.toString() ?? ''; if (_config.supportsAutoDetect) { - final detected = _extractByPath(data, _config.detectedLangPath); + final detected = _extractByPath(rawData, _config.detectedLangPath); if (detected != null) { detectedLang = detected.toString(); detectedLangName = detectedLang; diff --git a/lib/features/inspiration/services/google_translate_service.dart b/lib/features/inspiration/services/google_translate_service.dart index 68c9b63b..0d96c15c 100644 --- a/lib/features/inspiration/services/google_translate_service.dart +++ b/lib/features/inspiration/services/google_translate_service.dart @@ -60,11 +60,18 @@ class GoogleTranslateService implements TranslateApiService { stopwatch.stop(); - final data = response.data!; + final data = response.data; + if (data == null || data.isEmpty) { + throw Exception('Google翻译响应为空'); + } + final translatedParts = []; - for (final part in data[0] as List) { - if (part is List && part.isNotEmpty) { - translatedParts.add(part[0].toString()); + final firstPart = data[0]; + if (firstPart is List) { + for (final part in firstPart) { + if (part is List && part.isNotEmpty) { + translatedParts.add(part[0].toString()); + } } } @@ -76,6 +83,10 @@ class GoogleTranslateService implements TranslateApiService { detectedLangName = lang?.name ?? detectedLang; } + if (translatedParts.isEmpty) { + throw Exception('Google翻译结果为空'); + } + return TranslateResult( translatedText: translatedParts.join(), detectedLang: detectedLang, diff --git a/lib/features/inspiration/services/libre_translate_service.dart b/lib/features/inspiration/services/libre_translate_service.dart index f5a22da0..ddc3920f 100644 --- a/lib/features/inspiration/services/libre_translate_service.dart +++ b/lib/features/inspiration/services/libre_translate_service.dart @@ -57,7 +57,10 @@ class LibreTranslateService implements TranslateApiService { stopwatch.stop(); - final data = response.data!; + final data = response.data; + if (data == null) { + throw Exception('LibreTranslate翻译响应为空'); + } final translatedText = data['translatedText'] as String? ?? ''; String? detectedLang; diff --git a/lib/features/inspiration/services/mymemory_translate_service.dart b/lib/features/inspiration/services/mymemory_translate_service.dart index 9875bd31..90fb11ac 100644 --- a/lib/features/inspiration/services/mymemory_translate_service.dart +++ b/lib/features/inspiration/services/mymemory_translate_service.dart @@ -55,7 +55,10 @@ class MyMemoryTranslateService implements TranslateApiService { stopwatch.stop(); - final data = response.data!; + final data = response.data; + if (data == null) { + throw Exception('MyMemory翻译响应为空'); + } final responseData = data['responseData'] as Map?; if (responseData == null) { throw Exception('MyMemory翻译响应格式异常'); diff --git a/lib/features/inspiration/services/translate_dio_client.dart b/lib/features/inspiration/services/translate_dio_client.dart index 313234a9..9189fa65 100644 --- a/lib/features/inspiration/services/translate_dio_client.dart +++ b/lib/features/inspiration/services/translate_dio_client.dart @@ -21,11 +21,13 @@ class TranslateDioClient { }, ), ); - _dio.interceptors.add( - LogInterceptor( - logPrint: (obj) => Log.d('[TranslateDio] $obj'), - ), - ); + try { + _dio.interceptors.add( + LogInterceptor( + logPrint: (obj) => Log.d('[TranslateDio] $obj'), + ), + ); + } catch (_) {} } static final TranslateDioClient _instance = TranslateDioClient._(); diff --git a/lib/features/poetry/presentation/poetry_page.dart b/lib/features/poetry/presentation/poetry_page.dart index 3d09604b..721882fe 100644 --- a/lib/features/poetry/presentation/poetry_page.dart +++ b/lib/features/poetry/presentation/poetry_page.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 今日诗词页面 /// 创建时间: 2026-05-02 -/// 更新时间: 2026-05-19 +/// 更新时间: 2026-05-20 /// 作用: 今日诗词SDK展示 — 聊天样式交互 -/// 上次更新: 重构为聊天样式页面，支持动态主题+设置入口 +/// 上次更新: 支持诗词历史记录，刷新追加而非替换整个页面 /// ============================================================ import 'package:flutter/cupertino.dart'; @@ -12,6 +12,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:xianyan/core/router/app_nav_extension.dart'; +import '../../../core/router/app_router.dart'; import '../../../core/theme/app_radius.dart'; import '../../../core/theme/app_spacing.dart'; import '../../../core/theme/app_theme.dart'; @@ -57,54 +58,65 @@ class _PoetryPageState extends ConsumerState { super.dispose(); } - List<_ChatMessage> _buildMessages( - JinrishiciPoetry poetry, - JinrishiciUserInfo? userInfo, - ) { + List<_ChatMessage> _buildMessages(PoetryState poetryState) { final messages = <_ChatMessage>[]; + final allPoetries = [...poetryState.poetryHistory, poetryState.currentPoetry]; + final userInfo = poetryState.userInfo; - messages.add( - const _ChatMessage(type: 'system', content: '今日诗词推荐', time: '09:00'), - ); - messages.add( - _ChatMessage( - type: 'poetry', - content: poetry.content.cleanHtml, - poetry: poetry, - time: '09:00', - ), - ); + for (var i = 0; i < allPoetries.length; i++) { + final poetry = allPoetries[i]; + final index = i + 1; + + if (index == 1) { + messages.add( + const _ChatMessage(type: 'system', content: '今日诗词推荐', time: '09:00'), + ); + } else { + messages.add( + _ChatMessage(type: 'system', content: '第${index}首推荐 🔄', time: '09:0${index - 1}'), + ); + } - if (poetry.recommendedReason.isNotEmpty) { messages.add( _ChatMessage( - type: 'reason', - content: poetry.recommendedReason, - time: '09:01', + type: 'poetry', + content: poetry.content.cleanHtml, + poetry: poetry, + time: '09:0${index - 1}', ), ); - } - if (poetry.matchTags.isNotEmpty) { - messages.add( - _ChatMessage( - type: 'tags', - content: poetry.matchTags.join(', '), - tags: poetry.matchTags, - time: '09:01', - ), - ); - } + if (poetry.recommendedReason.isNotEmpty) { + messages.add( + _ChatMessage( + type: 'reason', + content: poetry.recommendedReason, + time: '09:0${index - 1}', + ), + ); + } - if (poetry.translate.isNotEmpty) { - messages.add( - _ChatMessage( - type: 'translate', - content: poetry.translate.join('\n'), - translates: poetry.translate, - time: '09:02', - ), - ); + if (poetry.matchTags.isNotEmpty) { + messages.add( + _ChatMessage( + type: 'tags', + content: poetry.matchTags.join(', '), + tags: poetry.matchTags, + time: '09:0${index - 1}', + ), + ); + } + + if (poetry.translate.isNotEmpty) { + messages.add( + _ChatMessage( + type: 'translate', + content: poetry.translate.join('\n'), + translates: poetry.translate, + time: '09:0${index - 1}', + ), + ); + } } if (userInfo != null && userInfo.region.isNotEmpty) { @@ -174,10 +186,11 @@ class _PoetryPageState extends ConsumerState { switch (action) { case 'refresh': ref.read(poetryProvider.notifier).refresh(); + _scrollToBottom(); break; case 'copy': final state = ref.read(poetryProvider); - final poetry = state.poetry ?? JinrishiciPoetry.empty(); + final poetry = state.currentPoetry; Clipboard.setData( ClipboardData(text: '${poetry.content.cleanHtml}\n——${poetry.authorLabel}'), ); @@ -202,7 +215,7 @@ class _PoetryPageState extends ConsumerState { mainAxisSize: MainAxisSize.min, children: [ GestureDetector( - onTap: () => context.appPush('/poetry/settings'), + onTap: () => context.appPush(AppRoutes.poetrySettings), child: Icon( CupertinoIcons.settings, size: 20, @@ -242,8 +255,7 @@ class _PoetryPageState extends ConsumerState { } Widget _buildChatList(PoetryState state, AppThemeExtension ext) { - final poetry = state.poetry ?? JinrishiciPoetry.empty(); - final messages = _buildMessages(poetry, state.userInfo); + final messages = _buildMessages(state); return ListView.builder( controller: _scrollController, diff --git a/lib/features/poetry/providers/poetry_provider.dart b/lib/features/poetry/providers/poetry_provider.dart index a317198d..34202333 100644 --- a/lib/features/poetry/providers/poetry_provider.dart +++ b/lib/features/poetry/providers/poetry_provider.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 今日诗词状态管理 /// 创建时间: 2026-05-02 -/// 更新时间: 2026-05-02 +/// 更新时间: 2026-05-20 /// 作用: 今日诗词数据 + 用户信息状态 -/// 上次更新: 初始创建 +/// 上次更新: 支持诗词历史记录，刷新追加而非替换 /// ============================================================ import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -16,24 +16,30 @@ class PoetryState { const PoetryState({ this.poetry, this.userInfo, + this.poetryHistory = const [], this.isLoading = true, this.error, }); final JinrishiciPoetry? poetry; final JinrishiciUserInfo? userInfo; + final List poetryHistory; final bool isLoading; final String? error; + JinrishiciPoetry get currentPoetry => poetry ?? JinrishiciPoetry.empty(); + PoetryState copyWith({ JinrishiciPoetry? poetry, JinrishiciUserInfo? userInfo, + List? poetryHistory, bool? isLoading, String? error, }) { return PoetryState( poetry: poetry ?? this.poetry, userInfo: userInfo ?? this.userInfo, + poetryHistory: poetryHistory ?? this.poetryHistory, isLoading: isLoading ?? this.isLoading, error: error, ); @@ -55,12 +61,21 @@ class PoetryNotifier extends Notifier { PoetryService.fetchUserInfo(), ]); + final newPoetry = results[0] as JinrishiciPoetry; + final newUserInfo = results[1] as JinrishiciUserInfo; + + final updatedHistory = List.from(state.poetryHistory); + if (state.poetry != null) { + updatedHistory.add(state.poetry!); + } + state = state.copyWith( - poetry: results[0] as JinrishiciPoetry, - userInfo: results[1] as JinrishiciUserInfo, + poetry: newPoetry, + userInfo: newUserInfo, + poetryHistory: updatedHistory, isLoading: false, ); - Log.i('今日诗词加载成功'); + Log.i('今日诗词加载成功，历史记录: ${updatedHistory.length}首'); } catch (e) { Log.e('今日诗词加载失败', e); state = state.copyWith(isLoading: false, error: e.toString()); diff --git a/lib/features/profile/presentation/profile_page.dart b/lib/features/profile/presentation/profile_page.dart index 3c09c213..7ec67857 100644 --- a/lib/features/profile/presentation/profile_page.dart +++ b/lib/features/profile/presentation/profile_page.dart @@ -314,7 +314,7 @@ class _ProfilePageState extends ConsumerState { color: ext.textSecondary, ), ), - onTap: () => context.appPush('/settings/language'), + onTap: () => context.appPush(AppRoutes.languageSettings), ), _SettingsDivider(ext: ext), _SettingRow( diff --git a/lib/features/settings/presentation/data_management_page.dart b/lib/features/settings/presentation/data_management_page.dart index 5a9b4c3b..0ffdb820 100644 --- a/lib/features/settings/presentation/data_management_page.dart +++ b/lib/features/settings/presentation/data_management_page.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 数据管理页面 /// 创建时间: 2026-04-28 -/// 更新时间: 2026-05-04 +/// 更新时间: 2026-05-20 /// 作用: 真实存储统计+分类详情+分类清理+空间可视化+完整导出导入+自动备份 -/// 上次更新: 增加自动备份功能(BackupService)+备份管理UI +/// 上次更新: 修复Web端path_provider MissingPluginException(增加isWeb守卫) /// ============================================================ import 'dart:convert'; @@ -17,7 +17,6 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:archive/archive.dart'; import 'package:cross_file/cross_file.dart'; import 'package:crypto/crypto.dart'; -import 'package:path_provider/path_provider.dart'; import 'package:share_plus/share_plus.dart' as share_plus; import 'package:file_picker/file_picker.dart'; import 'package:hive/hive.dart'; @@ -29,6 +28,7 @@ import '../../../core/theme/app_spacing.dart'; import '../../../core/theme/app_typography.dart'; import '../../../core/theme/app_radius.dart'; import '../../../core/utils/logger.dart'; +import '../../../core/utils/platform_utils.dart' as pu; import '../../../shared/widgets/app_toast.dart'; import '../../../shared/widgets/glass_container.dart'; import '../../../shared/widgets/responsive_layout.dart'; @@ -1261,9 +1261,13 @@ class _DataManagementPageState extends ConsumerState { return; } - final dir = await getApplicationDocumentsDirectory(); + final dirPath = await pu.safeAppDirPath; + if (dirPath == null) { + AppToast.showError('Web端暂不支持数据导出'); + return; + } final timestamp = DateTime.now().millisecondsSinceEpoch; - final file = File('${dir.path}/xianyan_export_$timestamp.xypk'); + final file = File('$dirPath/xianyan_export_$timestamp.xypk'); await file.writeAsBytes(zipBytes); if (mounted) { diff --git a/lib/features/settings/presentation/font/font_comparison_page.dart b/lib/features/settings/presentation/font/font_comparison_page.dart new file mode 100644 index 00000000..b67289d3 --- /dev/null +++ b/lib/features/settings/presentation/font/font_comparison_page.dart @@ -0,0 +1,229 @@ +/// ============================================================ +/// 闲言APP — 字体对比模式页面 +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: 左右分屏对比两种字体的渲染效果 +/// 上次更新: 响应式布局(宽屏Row/窄屏Column) +/// ============================================================ + +import 'package:flutter/cupertino.dart'; + +import '../../../../core/theme/app_radius.dart'; +import '../../../../core/theme/app_spacing.dart'; +import '../../../../core/theme/app_theme.dart'; +import '../../../../core/theme/app_typography.dart'; +import '../font_models.dart'; + +/// 字体对比模式页面 +/// +/// 左右分屏对比两种字体的渲染效果，支持字号滑块和自定义预览文本。 +class FontComparisonPage extends StatefulWidget { + const FontComparisonPage({ + super.key, + required this.fontA, + required this.fontB, + }); + + final FontInfo fontA; + final FontInfo fontB; + + @override + State createState() => _FontComparisonPageState(); +} + +class _FontComparisonPageState extends State { + double _fontSize = 20.0; + final _previewController = TextEditingController( + text: '闲言 AaBbCc 你好世界 0123456789', + ); + + @override + void dispose() { + _previewController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + + return CupertinoPageScaffold( + backgroundColor: ext.bgPrimary, + navigationBar: CupertinoNavigationBar( + middle: Text( + '字体对比', + style: AppTypography.title3.copyWith(color: ext.textPrimary), + ), + backgroundColor: ext.bgElevated.withValues(alpha: 0.85), + border: null, + leading: CupertinoButton( + padding: EdgeInsets.zero, + onPressed: () => Navigator.of(context).pop(), + child: Icon(CupertinoIcons.back, color: ext.textPrimary), + ), + ), + child: SafeArea( + child: Column( + children: [ + _buildFontSizeSlider(ext), + _buildPreviewInput(ext), + const SizedBox(height: AppSpacing.sm), + Expanded( + child: LayoutBuilder( + builder: (context, constraints) { + final isWide = constraints.maxWidth > 600; + if (isWide) { + return Row( + children: [ + Expanded(child: _buildFontPanel(ext, widget.fontA)), + Container( + width: 1, + color: ext.textHint.withValues(alpha: 0.15), + ), + Expanded(child: _buildFontPanel(ext, widget.fontB)), + ], + ); + } else { + return Column( + children: [ + Expanded(child: _buildFontPanel(ext, widget.fontA)), + Container( + height: 1, + color: ext.textHint.withValues(alpha: 0.15), + ), + Expanded(child: _buildFontPanel(ext, widget.fontB)), + ], + ); + } + }, + ), + ), + ], + ), + ), + ); + } + + /// 字号滑块 + Widget _buildFontSizeSlider(AppThemeExtension ext) { + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + child: Row( + children: [ + Icon( + CupertinoIcons.textformat_size, + size: 16, + color: ext.textSecondary, + ), + const SizedBox(width: AppSpacing.xs), + Text( + '字号', + style: AppTypography.caption1.copyWith(color: ext.textSecondary), + ), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: CupertinoSlider( + value: _fontSize, + min: 12, + max: 48, + divisions: 36, + activeColor: ext.accent, + onChanged: (v) => setState(() => _fontSize = v), + ), + ), + Text( + _fontSize.round().toString(), + style: AppTypography.caption1.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ); + } + + /// 自定义预览文本输入框 + Widget _buildPreviewInput(AppThemeExtension ext) { + return Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: CupertinoTextField( + controller: _previewController, + placeholder: '输入自定义预览文本', + placeholderStyle: AppTypography.caption1.copyWith( + color: ext.textHint, + ), + style: AppTypography.subhead.copyWith(color: ext.textPrimary), + padding: const EdgeInsets.all(10), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + ), + onChanged: (_) => setState(() {}), + ), + ); + } + + /// 单侧字体面板 + Widget _buildFontPanel(AppThemeExtension ext, FontInfo font) { + return Container( + color: ext.bgSecondary, + padding: const EdgeInsets.all(AppSpacing.md), + child: ListView( + children: [ + Text( + font.name, + style: AppTypography.subhead.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: AppSpacing.sm), + if (_previewController.text.isNotEmpty) + Text( + _previewController.text, + style: TextStyle( + fontSize: _fontSize, + fontFamily: font.fontFamily, + color: ext.textPrimary, + height: 1.5, + ), + ), + const SizedBox(height: AppSpacing.md), + Text( + '天地玄黄，宇宙洪荒。', + style: TextStyle( + fontSize: _fontSize * 0.8, + fontFamily: font.fontFamily, + color: ext.textSecondary, + height: 1.5, + ), + ), + const SizedBox(height: AppSpacing.sm), + Text( + 'The quick brown fox jumps over the lazy dog.', + style: TextStyle( + fontSize: _fontSize * 0.7, + fontFamily: font.fontFamily, + color: ext.textSecondary, + height: 1.5, + ), + ), + const SizedBox(height: AppSpacing.sm), + Text( + '0123456789', + style: TextStyle( + fontSize: _fontSize * 0.7, + fontFamily: font.fontFamily, + color: ext.textHint, + height: 1.5, + ), + ), + ], + ), + ); + } +} diff --git a/lib/features/settings/presentation/font/font_preview_sheet.dart b/lib/features/settings/presentation/font/font_preview_sheet.dart new file mode 100644 index 00000000..188850c7 --- /dev/null +++ b/lib/features/settings/presentation/font/font_preview_sheet.dart @@ -0,0 +1,279 @@ +/// ============================================================ +/// 闲言APP — 字体预览大图 Sheet +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: 半屏面板展示字体预览(自定义文本+字号滑块+中英文预览) +/// 上次更新: 增加Heroine过渡动画 +/// ============================================================ + +import 'package:flutter/cupertino.dart'; +import 'package:heroine/heroine.dart'; + +import '../../../../core/theme/app_radius.dart'; +import '../../../../core/theme/app_spacing.dart'; +import '../../../../core/theme/app_theme.dart'; +import '../../../../core/theme/app_typography.dart'; +import '../../../../shared/widgets/bottom_sheet.dart'; +import '../font_models.dart'; + +/// 字体预览大图 Sheet +/// +/// 半屏面板，展示大段中英文预览 + 自定义预览文本 + 字号滑块。 +/// 使用 [AppBottomSheet.showHalf] 弹出，支持拖拽到不同高度。 +class FontPreviewSheet extends StatefulWidget { + const FontPreviewSheet({super.key, required this.font}); + + final FontInfo font; + + /// 弹出字体预览半屏面板 + static Future show(BuildContext context, FontInfo font) { + return AppBottomSheet.showHalf( + context: context, + builder: (_) => FontPreviewSheet(font: font), + ); + } + + @override + State createState() => _FontPreviewSheetState(); +} + +class _FontPreviewSheetState extends State { + double _fontSize = 20.0; + final _previewController = TextEditingController( + text: '闲言 AaBbCc 你好世界', + ); + + @override + void dispose() { + _previewController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + + return SingleChildScrollView( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // 标题栏 + _buildHeader(ext), + const SizedBox(height: AppSpacing.sm), + + // 自定义预览文本输入框 + _buildPreviewInput(ext), + const SizedBox(height: AppSpacing.sm), + + // 字号滑块 + _buildFontSizeSlider(ext), + const SizedBox(height: AppSpacing.md), + + // 预览区域 + _buildPreviewArea(ext), + const SizedBox(height: AppSpacing.md), + + // 字体信息 + _buildFontInfo(ext), + const SizedBox(height: AppSpacing.lg), + ], + ), + ); + } + + /// 标题栏: 字体名称 + 关闭按钮 + Widget _buildHeader(AppThemeExtension ext) { + return Row( + children: [ + Expanded( + child: Heroine( + tag: 'font-preview-${widget.font.fontFamily}', + child: Text( + widget.font.name, + style: AppTypography.headline.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w700, + ), + ), + ), + ), + CupertinoButton( + padding: EdgeInsets.zero, + onPressed: () => Navigator.pop(context), + child: Icon( + CupertinoIcons.xmark_circle_fill, + size: 28, + color: ext.textHint, + ), + ), + ], + ); + } + + /// 自定义预览文本输入框 + Widget _buildPreviewInput(AppThemeExtension ext) { + return CupertinoTextField( + controller: _previewController, + placeholder: '输入自定义预览文本', + placeholderStyle: AppTypography.subhead.copyWith( + color: ext.textHint, + ), + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontFamily: widget.font.fontFamily, + ), + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + ), + onChanged: (_) => setState(() {}), + ); + } + + /// 字号滑块 + Widget _buildFontSizeSlider(AppThemeExtension ext) { + return Row( + children: [ + Icon(CupertinoIcons.textformat_size, size: 16, color: ext.textSecondary), + const SizedBox(width: AppSpacing.xs), + Text( + '字号', + style: AppTypography.caption1.copyWith(color: ext.textSecondary), + ), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: CupertinoSlider( + value: _fontSize, + min: 12, + max: 48, + divisions: 36, + activeColor: ext.accent, + onChanged: (v) => setState(() => _fontSize = v), + ), + ), + Text( + _fontSize.round().toString(), + style: AppTypography.caption1.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ); + } + + /// 预览区域: 自定义文本 + 中文经典 + 英文 + 数字 + Widget _buildPreviewArea(AppThemeExtension ext) { + return Container( + width: double.infinity, + padding: const EdgeInsets.all(AppSpacing.md), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.lgBorder, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // 自定义文本预览 + if (_previewController.text.isNotEmpty) + Text( + _previewController.text, + style: TextStyle( + fontSize: _fontSize, + fontFamily: widget.font.fontFamily, + color: ext.textPrimary, + height: 1.5, + ), + ), + const SizedBox(height: AppSpacing.md), + + // 中文经典预览 + Text( + '天地玄黄，宇宙洪荒。日月盈昃，辰宿列张。', + style: TextStyle( + fontSize: _fontSize * 0.85, + fontFamily: widget.font.fontFamily, + color: ext.textSecondary, + height: 1.5, + ), + ), + const SizedBox(height: AppSpacing.sm), + + // 英文预览 + Text( + 'The quick brown fox jumps over the lazy dog.', + style: TextStyle( + fontSize: _fontSize * 0.75, + fontFamily: widget.font.fontFamily, + color: ext.textSecondary, + height: 1.5, + ), + ), + const SizedBox(height: AppSpacing.sm), + + // 数字预览 + Text( + '0123456789 !@#\$%^&*()', + style: TextStyle( + fontSize: _fontSize * 0.75, + fontFamily: widget.font.fontFamily, + color: ext.textHint, + height: 1.5, + ), + ), + ], + ), + ); + } + + /// 字体信息行 + Widget _buildFontInfo(AppThemeExtension ext) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _infoRow(ext, CupertinoIcons.textformat_abc, '字体族', widget.font.fontFamily), + if (widget.font.fileSize != null) + _infoRow(ext, CupertinoIcons.doc_text, '文件大小', formatFileSize(widget.font.fileSize!)), + _infoRow( + ext, + widget.font.isBuiltIn ? CupertinoIcons.lock_shield : CupertinoIcons.arrow_down_circle, + '类型', + widget.font.isBuiltIn ? '内置字体' : '自定义字体', + ), + ], + ); + } + + /// 单行信息展示 + Widget _infoRow(AppThemeExtension ext, IconData icon, String label, String value) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 2), + child: Row( + children: [ + Icon(icon, size: 14, color: ext.textHint), + const SizedBox(width: AppSpacing.xs), + Text( + label, + style: AppTypography.caption1.copyWith(color: ext.textHint), + ), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: Text( + value, + style: AppTypography.caption1.copyWith( + color: ext.textSecondary, + fontWeight: FontWeight.w500, + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/features/settings/presentation/font_management_notifier.dart b/lib/features/settings/presentation/font_management_notifier.dart new file mode 100644 index 00000000..d565eec2 --- /dev/null +++ b/lib/features/settings/presentation/font_management_notifier.dart @@ -0,0 +1,948 @@ +/// ============================================================ +/// 闲言APP — 字体管理 Notifier +/// 创建时间: 2026-04-28 +/// 更新时间: 2026-05-20 +/// 作用: 字体导入/下载/删除/切换/动态加载等业务逻辑 +/// 上次更新: 修复审计问题(downloadUrl/hasDownloadError/收藏恢复/空指针防护/持久化/重复检查) +/// ============================================================ + +import 'dart:convert'; +import 'dart:io'; + +import 'package:archive/archive.dart'; +import 'package:audioplayers/audioplayers.dart'; +import 'package:dio/dio.dart'; +import 'package:file_picker/file_picker.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:share_plus/share_plus.dart'; + +import '../../../core/storage/app_kv_store.dart'; +import '../../../core/utils/logger.dart'; +import '../../../core/utils/platform_utils.dart' as pu; +import '../../../shared/widgets/app_toast.dart'; +import '../services/font_sync_service.dart'; +import '../providers/theme_settings_provider.dart'; +import 'font_models.dart'; + +/// 字体管理 Notifier +class FontManagementNotifier extends Notifier { + @override + FontManagementState build() { + Future.microtask(() => _init()); + return const FontManagementState(); + } + + /// 设置搜索关键词 + void setSearchQuery(String query) { + state = state.copyWith(searchQuery: query); + } + + /// 下拉刷新：重新加载所有字体数据 + Future refresh() async { + state = state.copyWith(isLoading: true, searchQuery: ''); + try { + final installedFonts = _loadInstalledFontsFromKV(); + final localFonts = await _scanLocalFonts(); + final favoriteIds = _loadFavoritesFromKV(); + final allFonts = [..._builtInFonts, ...installedFonts, ...localFonts].map( + (f) { + if (favoriteIds.contains(f.fontFamily)) { + return f.copyWith(isFavorite: true); + } + return f; + }, + ).toList(); + final onlineFonts = _buildOnlineFonts(installedFonts, localFonts); + state = state.copyWith( + fonts: allFonts, + onlineFonts: onlineFonts, + isLoading: false, + ); + await _loadDynamicFonts(installedFonts); + await _loadDynamicFonts(localFonts); + } catch (e) { + Log.e('字体刷新失败', e); + state = state.copyWith(isLoading: false); + } + } + + static const _kvKeyActiveFont = 'font_active_family'; + static const _kvKeyInstalledFonts = 'font_installed_list'; + static const _kvKeyDeletedFonts = 'font_deleted_families'; + + static final _dio = Dio( + BaseOptions( + connectTimeout: const Duration(seconds: 30), + receiveTimeout: const Duration(minutes: 5), + sendTimeout: const Duration(seconds: 30), + headers: { + 'User-Agent': + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36', + 'Accept': '*/*', + }, + ), + ); + + /// 字体切换音效播放器 + static final _audioPlayer = AudioPlayer(); + + /// 播放字体切换音效 + Future _playSwitchSound() async { + try { + await _audioPlayer.play(AssetSource('sounds/font_switch.mp3')); + } catch (e) { + Log.d('字体切换音效播放失败(可忽略): $e'); + } + } + + /// 初始化字体数据 + Future _init() async { + state = state.copyWith(isLoading: true); + try { + final activeFont = AppKVStore.getString(_kvKeyActiveFont) ?? 'Inter'; + final installedFonts = _loadInstalledFontsFromKV(); + final localFonts = await _scanLocalFonts(); + + final favoriteIds = _loadFavoritesFromKV(); + final allFonts = [..._builtInFonts, ...installedFonts, ...localFonts].map( + (f) { + if (favoriteIds.contains(f.fontFamily)) { + return f.copyWith(isFavorite: true); + } + return f; + }, + ).toList(); + + final onlineFonts = _buildOnlineFonts(installedFonts, localFonts); + + state = state.copyWith( + fonts: allFonts, + onlineFonts: onlineFonts, + isLoading: false, + activeFontFamily: activeFont, + ); + + await _loadDynamicFonts(installedFonts); + await _loadDynamicFonts(localFonts); + + _loadOnlineFontsFromRemote(); + } catch (e) { + Log.e('字体初始化失败', e); + state = state.copyWith(isLoading: false); + } + } + + /// 内置字体列表（基于 builtInFontConfigs 动态生成） + List get _builtInFonts => builtInFontConfigs + .map( + (c) => FontInfo( + name: c.name, + fontFamily: c.fontFamily, + path: '', + isBuiltIn: true, + ), + ) + .toList(); + + /// 从 KV 存储加载已安装字体列表（JSON格式，兼容旧|分隔符格式迁移） + List _loadInstalledFontsFromKV() { + final raw = AppKVStore.getString(_kvKeyInstalledFonts); + if (raw == null || raw.isEmpty) return []; + try { + final list = jsonDecode(raw) as List; + return list + .map((e) => FontInfo.fromJson(e as Map)) + .toList(); + } catch (e) { + Log.e('字体列表JSON解析失败，尝试旧格式迁移', e); + return _migrateFromOldFormat(); + } + } + + /// 旧格式迁移：从 | 分隔符格式迁移到 JSON + List _migrateFromOldFormat() { + final raw = AppKVStore.getStringList(_kvKeyInstalledFonts) ?? []; + final fonts = raw + .map((entry) { + final parts = entry.split('|'); + if (parts.length >= 3) { + return FontInfo( + name: parts[0], + fontFamily: parts[1], + path: parts[2], + isDownloaded: true, + fileSize: parts.length >= 4 ? int.tryParse(parts[3]) : null, + ); + } + return null; + }) + .whereType() + .toList(); + if (fonts.isNotEmpty) _saveInstalledFontsToKV(fonts); + return fonts; + } + + /// 扫描本地字体目录 + Future> _scanLocalFonts() async { + if (pu.isWeb) return []; + try { + final dir = await getApplicationDocumentsDirectory(); + final fontDir = Directory('${dir.path}/fonts'); + final List fonts = []; + + if (await fontDir.exists()) { + await for (final entity in fontDir.list()) { + if (entity is File) { + final ext = entity.path.toLowerCase(); + if (ext.endsWith('.ttf') || ext.endsWith('.otf')) { + final fileName = entity.path.split(Platform.pathSeparator).last; + final name = fileName.replaceAll(RegExp(r'\.(ttf|otf)$'), ''); + final fontFamily = name.replaceAll(' ', ''); + final size = await entity.length(); + fonts.add( + FontInfo( + name: name, + fontFamily: fontFamily, + path: entity.path, + isDownloaded: true, + fileSize: size, + ), + ); + } + } + } + } + + return fonts; + } catch (e) { + Log.e('扫描本地字体失败', e); + return []; + } + } + + /// 构建在线字体列表(标记已安装状态) + List _buildOnlineFonts( + List installed, + List local, + ) { + final allCustomFamilies = { + ...installed, + ...local, + }.map((f) => f.fontFamily).toSet(); + + return onlineFontData.map((data) { + final fontFamily = data.$2; + final isInstalled = allCustomFamilies.contains(fontFamily); + return FontInfo( + name: data.$1, + fontFamily: fontFamily, + path: '', + downloadUrl: data.$3, + isDownloaded: isInstalled, + iconEmoji: data.$4, + ); + }).toList(); + } + + /// 从Supabase远程加载在线字体列表 + Future _loadOnlineFontsFromRemote() async { + try { + final List entries = + await FontSyncService.fetchOnlineFonts(); + if (entries.isEmpty) return; + final allCustomFamilies = state.fonts + .where((f) => !f.isBuiltIn && f.isDownloaded) + .map((f) => f.fontFamily) + .toSet(); + final onlineFonts = entries + .map( + (OnlineFontEntry e) => e.toFontInfo( + isDownloaded: allCustomFamilies.contains(e.fontFamily), + ), + ) + .toList(); + state = state.copyWith(onlineFonts: onlineFonts); + } catch (e) { + Log.e('远程字体列表加载失败', e); + } + } + + /// 加载Google Font字体 + Future loadGoogleFont(String fontName) async { + try { + final textStyle = GoogleFonts.getFont(fontName); + final fontFamily = textStyle.fontFamily; + if (fontFamily == null) { + AppToast.showWarning('字体加载失败'); + return; + } + + final existing = state.fonts + .where((f) => f.fontFamily == fontFamily) + .firstOrNull; + if (existing != null) { + AppToast.showInfo('$fontName 已安装'); + setActiveFont(fontFamily); + return; + } + + final newFont = FontInfo( + name: fontName, + fontFamily: fontFamily, + path: 'google_fonts://$fontName', + isDownloaded: true, + category: 'google', + ); + + final updatedFonts = List.from(state.fonts)..add(newFont); + state = state.copyWith(fonts: updatedFonts); + _saveInstalledFontsToKV( + updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), + ); + AppToast.showSuccess('$fontName 加载成功'); + } catch (e) { + Log.e('Google Font 加载失败: $fontName', e); + AppToast.showError('字体加载失败，请检查网络'); + } + } + + /// 动态加载字体到引擎 + Future _loadDynamicFonts(List fonts) async { + final deletedFamilies = AppKVStore.getStringList(_kvKeyDeletedFonts) ?? []; + for (final font in fonts) { + if (font.path.isNotEmpty && + font.isDownloaded && + !deletedFamilies.contains(font.fontFamily)) { + await _loadFontIntoEngine(font.fontFamily, font.path); + } + } + } + + /// 校验字体文件头是否为有效 TTF/OTF + static bool _isValidFontFile(Uint8List bytes) { + if (bytes.length < 4) return false; + final h = bytes; + return (h[0] == 0x00 && h[1] == 0x01 && h[2] == 0x00 && h[3] == 0x00) || + (h[0] == 0x4F && h[1] == 0x54 && h[2] == 0x54 && h[3] == 0x4F); + } + + /// 将字体文件加载到 Flutter 引擎 + Future _loadFontIntoEngine(String fontFamily, String path) async { + try { + final file = File(path); + if (!await file.exists()) return false; + + final bytes = await file.readAsBytes(); + if (!_isValidFontFile(bytes)) { + Log.e('字体格式无效 [$fontFamily]: 文件头非 TTF/OTF 格式'); + return false; + } + final loader = FontLoader(fontFamily); + loader.addFont( + Future.value(ByteData.sublistView(Uint8List.fromList(bytes))), + ); + await loader.load(); + Log.i('字体加载成功: $fontFamily ($path)'); + return true; + } on FileSystemException catch (e) { + Log.e('字体文件系统错误 [$fontFamily]: ${e.message}', e); + return false; + } on OutOfMemoryError catch (e) { + Log.e('字体内存不足 [$fontFamily]: 文件可能过大', e); + return false; + } on FormatException catch (e) { + Log.e('字体格式无效 [$fontFamily]: ${e.message}', e); + return false; + } catch (e) { + Log.e('字体加载未知异常 [$fontFamily]', e); + return false; + } + } + + /// 统一获取字体目录（自动创建） + Future _getFontDirectory() async { + if (pu.isWeb) throw UnsupportedError('Web端不支持字体管理'); + final dir = await getApplicationDocumentsDirectory(); + final fontDir = Directory('${dir.path}/fonts'); + if (!await fontDir.exists()) { + await fontDir.create(recursive: true); + } + return fontDir; + } + + /// 下载在线字体 + Future downloadFont(int index) async { + if (index < 0 || index >= state.onlineFonts.length) return; + if (pu.isWeb) { + AppToast.showInfo('Web端暂不支持字体下载'); + return; + } + + final onlineFont = state.onlineFonts[index]; + if (onlineFont.isDownloaded) { + AppToast.showSuccess('${onlineFont.name} 已安装'); + return; + } + if (onlineFont.isDownloading) return; + + if (state.downloadQueue.length >= 3) { + AppToast.showWarning('最多同时下载 3 个字体，请稍候'); + return; + } + + final newQueue = Set.from(state.downloadQueue)..add(index); + + final newOnlineFonts = List.from(state.onlineFonts); + newOnlineFonts[index] = onlineFont.copyWith( + isDownloading: true, + downloadProgress: 0.0, + hasDownloadError: false, + ); + state = state.copyWith( + onlineFonts: newOnlineFonts, + downloadQueue: newQueue, + ); + + try { + final fontDir = await _getFontDirectory(); + + final downloadUrl = state.onlineFonts[index].downloadUrl; + final urlPath = downloadUrl.isNotEmpty + ? downloadUrl + : onlineFontData[index].$3; + final urlExt = urlPath.contains('.') ? urlPath.split('.').last : 'ttf'; + final fileName = '${onlineFont.fontFamily}.$urlExt'; + final savePath = '${fontDir.path}${Platform.pathSeparator}$fileName'; + + await _dio.download( + urlPath, + savePath, + onReceiveProgress: (received, total) { + if (total > 0) { + final progress = received / total; + final updated = List.from(state.onlineFonts); + updated[index] = state.onlineFonts[index].copyWith( + downloadProgress: progress, + ); + state = state.copyWith(onlineFonts: updated); + } + }, + ); + + final loaded = await _loadFontIntoEngine(onlineFont.fontFamily, savePath); + + if (loaded) { + final fileSize = await File(savePath).length(); + final newFont = FontInfo( + name: onlineFont.name, + fontFamily: onlineFont.fontFamily, + path: savePath, + isDownloaded: true, + fileSize: fileSize, + ); + + final updatedOnlineFonts = List.from(state.onlineFonts); + updatedOnlineFonts[index] = newFont.copyWith( + isDownloading: false, + downloadProgress: 1.0, + ); + + final updatedFonts = List.from(state.fonts)..add(newFont); + + state = state.copyWith( + fonts: updatedFonts, + onlineFonts: updatedOnlineFonts, + downloadQueue: Set.from(state.downloadQueue)..remove(index), + ); + + _saveInstalledFontsToKV( + updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), + ); + + _removeFromDeletedList(onlineFont.fontFamily); + + AppToast.showSuccess('${onlineFont.name} 下载安装成功 ✅'); + } else { + _resetDownloadState(index, '${onlineFont.name} 加载失败'); + } + } on DioException catch (e) { + Log.e('字体下载失败: ${onlineFont.name}', e); + _resetDownloadState(index, '下载失败: ${e.message ?? '网络错误'}'); + } catch (e) { + Log.e('字体安装异常: ${onlineFont.name}', e); + _resetDownloadState(index, '安装失败: $e'); + } + } + + /// 重置下载状态 + void _resetDownloadState(int index, String errorMsg) { + if (index < 0 || index >= state.onlineFonts.length) return; + final updated = List.from(state.onlineFonts); + updated[index] = state.onlineFonts[index].copyWith( + isDownloading: false, + hasDownloadError: true, + ); + state = state.copyWith( + onlineFonts: updated, + downloadQueue: Set.from(state.downloadQueue)..remove(index), + ); + AppToast.showError(errorMsg); + } + + /// 重试下载字体 + void retryDownload(int index) { + if (index < 0 || index >= state.onlineFonts.length) return; + final updated = List.from(state.onlineFonts); + updated[index] = state.onlineFonts[index].copyWith( + isDownloading: false, + hasDownloadError: false, + ); + state = state.copyWith(onlineFonts: updated); + downloadFont(index); + } + + /// 从文件选择器导入字体 + Future importFont() async { + if (pu.isWeb) { + AppToast.showInfo('Web端暂不支持字体导入'); + return; + } + try { + final result = await FilePicker.platform.pickFiles( + type: FileType.custom, + allowedExtensions: ['ttf', 'otf'], + allowMultiple: true, + ); + + if (result == null || result.files.isEmpty) return; + + final fontDir = await _getFontDirectory(); + + int successCount = 0; + for (final platformFile in result.files) { + final filePath = platformFile.path; + if (filePath == null) continue; + + final sourceFile = File(filePath); + if (!await sourceFile.exists()) continue; + + final fileName = platformFile.name; + final name = fileName.replaceAll(RegExp(r'\.(ttf|otf)$'), ''); + final fontFamily = name.replaceAll(' ', ''); + final destPath = '${fontDir.path}${Platform.pathSeparator}$fileName'; + + if (await File(destPath).exists()) { + await File(destPath).delete(); + } + await sourceFile.copy(destPath); + + final loaded = await _loadFontIntoEngine(fontFamily, destPath); + if (loaded) { + final fileSize = await File(destPath).length(); + final newFont = FontInfo( + name: name, + fontFamily: fontFamily, + path: destPath, + isDownloaded: true, + fileSize: fileSize, + ); + + final existingIndex = state.fonts.indexWhere( + (f) => f.fontFamily == fontFamily, + ); + final updatedFonts = List.from(state.fonts); + if (existingIndex >= 0) { + updatedFonts[existingIndex] = newFont; + } else { + updatedFonts.add(newFont); + } + + state = state.copyWith(fonts: updatedFonts); + _saveInstalledFontsToKV( + updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), + ); + _removeFromDeletedList(fontFamily); + successCount++; + } + } + + if (successCount > 0) { + AppToast.showSuccess('成功导入 $successCount 个字体 ✅'); + } else { + AppToast.showError('字体导入失败'); + } + } catch (e) { + Log.e('字体导入失败', e); + AppToast.showError('导入失败: $e'); + } + } + + /// 从URL下载字体 + Future downloadFontFromUrl(String url, {String? name}) async { + if (pu.isWeb) { + AppToast.showInfo('Web端暂不支持字体下载'); + return; + } + try { + final fontDir = await _getFontDirectory(); + + final uri = Uri.parse(url); + final urlFileName = uri.pathSegments.isNotEmpty + ? uri.pathSegments.last + : 'custom_font.ttf'; + final ext = urlFileName.contains('.') + ? urlFileName.split('.').last + : 'ttf'; + + String fontFamily = name?.isNotEmpty == true + ? name! + : urlFileName + .replaceAll('.$ext', '') + .replaceAll(RegExp(r'[^a-zA-Z0-9_]'), '_'); + if (fontFamily.isEmpty) + fontFamily = 'CustomFont_${DateTime.now().millisecondsSinceEpoch}'; + + final displayName = name?.isNotEmpty == true ? name! : fontFamily; + + state = state.copyWith( + isUrlDownloading: true, + urlDownloadProgress: 0.0, + urlDownloadName: displayName, + ); + + final fileName = '$fontFamily.$ext'; + final savePath = '${fontDir.path}${Platform.pathSeparator}$fileName'; + + await _dio.download( + url, + savePath, + onReceiveProgress: (received, total) { + if (total > 0) { + final progress = received / total; + state = state.copyWith(urlDownloadProgress: progress); + } + }, + ); + + final loaded = await _loadFontIntoEngine(fontFamily, savePath); + + if (loaded) { + final fileSize = await File(savePath).length(); + final newFont = FontInfo( + name: displayName, + fontFamily: fontFamily, + path: savePath, + isDownloaded: true, + fileSize: fileSize, + ); + + final updatedFonts = List.from(state.fonts); + final existingIndex = updatedFonts.indexWhere( + (f) => f.fontFamily == fontFamily, + ); + if (existingIndex >= 0) { + updatedFonts[existingIndex] = newFont; + } else { + updatedFonts.add(newFont); + } + state = state.copyWith( + fonts: updatedFonts, + isUrlDownloading: false, + urlDownloadProgress: 1.0, + ); + + _saveInstalledFontsToKV( + updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), + ); + + _removeFromDeletedList(fontFamily); + + AppToast.showSuccess('$displayName 下载安装成功 ✅'); + } else { + final file = File(savePath); + if (await file.exists()) await file.delete(); + state = state.copyWith( + isUrlDownloading: false, + urlDownloadProgress: 0.0, + ); + AppToast.showError('字体加载失败，文件可能不是有效的字体格式'); + } + } on DioException catch (e) { + Log.e('URL字体下载失败', e); + state = state.copyWith(isUrlDownloading: false, urlDownloadProgress: 0.0); + AppToast.showError('下载失败: ${e.message ?? '网络错误'}'); + } catch (e) { + Log.e('URL字体下载异常', e); + state = state.copyWith(isUrlDownloading: false, urlDownloadProgress: 0.0); + AppToast.showError('下载失败: $e'); + } + } + + /// 删除字体 + Future deleteFont(String fontFamily, String path) async { + if (pu.isWeb) return; + try { + final file = File(path); + if (await file.exists()) { + await file.delete(); + } + + final updatedFonts = state.fonts + .where((f) => f.fontFamily != fontFamily) + .toList(); + + final updatedOnlineFonts = state.onlineFonts.map((f) { + if (f.fontFamily == fontFamily) { + return f.copyWith( + isDownloaded: false, + isDownloading: false, + downloadProgress: 0.0, + ); + } + return f; + }).toList(); + + if (state.activeFontFamily == fontFamily) { + setActiveFont('Inter'); + } + + state = state.copyWith( + fonts: updatedFonts, + onlineFonts: updatedOnlineFonts, + ); + _saveInstalledFontsToKV( + updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), + ); + + _recordDeletedFont(fontFamily); + + AppToast.showSuccess('字体已删除 🗑️'); + } catch (e) { + Log.e('字体删除失败', e); + AppToast.showError('删除失败'); + } + } + + /// 批量删除字体 + Future deleteFonts(List fontFamilies) async { + for (final family in fontFamilies) { + final font = state.fonts.firstWhere( + (f) => f.fontFamily == family, + orElse: () => const FontInfo(name: '', fontFamily: '', path: ''), + ); + if (font.path.isNotEmpty) { + await deleteFont(family, font.path); + } + } + } + + /// ZIP字体包导入 + Future importFontZip() async { + if (pu.isWeb) { + AppToast.showInfo('Web端不支持字体导入'); + return; + } + try { + final result = await FilePicker.platform.pickFiles( + type: FileType.custom, + allowedExtensions: ['zip'], + ); + if (result == null || result.files.isEmpty) return; + + final filePath = result.files.first.path; + if (filePath == null) return; + + final bytes = await File(filePath).readAsBytes(); + final archive = ZipDecoder().decodeBytes(bytes); + + final fontDir = await _getFontDirectory(); + int count = 0; + + for (final file in archive) { + if (file.isFile) { + final name = file.name.toLowerCase(); + if (name.endsWith('.ttf') || name.endsWith('.otf')) { + final fileName = file.name.split('/').last; + final outputPath = + '${fontDir.path}${Platform.pathSeparator}$fileName'; + await File(outputPath).writeAsBytes(file.content as List); + + final fontFamily = fileName.replaceAll(RegExp(r'\.(ttf|otf)$'), ''); + final loaded = await _loadFontIntoEngine(fontFamily, outputPath); + if (!loaded) continue; + + _removeFromDeletedList(fontFamily); + + final newFont = FontInfo( + name: fontFamily, + fontFamily: fontFamily, + path: outputPath, + isDownloaded: true, + fileSize: await File(outputPath).length(), + ); + + final existingIndex = state.fonts.indexWhere( + (f) => f.fontFamily == fontFamily, + ); + final updatedFonts = List.from(state.fonts); + if (existingIndex >= 0) { + updatedFonts[existingIndex] = newFont; + } else { + updatedFonts.add(newFont); + } + + state = state.copyWith(fonts: updatedFonts); + count++; + } + } + } + + if (count > 0) { + final allInstalled = state.fonts + .where((f) => !f.isBuiltIn && f.isDownloaded) + .toList(); + _saveInstalledFontsToKV(allInstalled); + AppToast.showSuccess('成功导入 $count 个字体 📦'); + } else { + AppToast.showWarning('ZIP包中未找到 .ttf 或 .otf 字体文件'); + } + } catch (e) { + Log.e('ZIP字体导入失败', e); + AppToast.showError('导入失败: $e'); + } + } + + /// 字体分享 + Future shareFont(FontInfo font) async { + try { + if (font.path.isNotEmpty && !pu.isWeb) { + await SharePlus.instance.share(ShareParams(files: [XFile(font.path)])); + } else { + await SharePlus.instance.share(ShareParams(text: '推荐字体: ${font.name}')); + } + } catch (e) { + Log.e('字体分享失败', e); + AppToast.showError('分享失败'); + } + } + + /// 设置当前活跃字体 + void setActiveFont(String fontFamily) async { + state = state.copyWith(activeFontFamily: fontFamily); + AppKVStore.setString(_kvKeyActiveFont, fontFamily); + + final isBuiltIn = _builtInFonts.any((f) => f.fontFamily == fontFamily); + if (isBuiltIn) { + ref.read(themeSettingsProvider.notifier).setCustomFontFamily(''); + final fontStyleId = _builtInFonts + .firstWhere( + (f) => f.fontFamily == fontFamily, + orElse: () => const FontInfo( + name: '', + fontFamily: 'Inter', + path: '', + isBuiltIn: true, + ), + ) + .fontFamily; + final config = builtInFontConfigs + .where((c) => c.fontFamily == fontStyleId) + .firstOrNull; + final id = config?.styleId ?? 'system'; + ref.read(themeSettingsProvider.notifier).setFontStyle(id); + } else { + final fontInfo = state.fonts.firstWhere( + (f) => f.fontFamily == fontFamily, + orElse: () => const FontInfo(name: '', fontFamily: '', path: ''), + ); + if (fontInfo.path.isEmpty && + !fontInfo.path.startsWith('google_fonts://')) { + AppToast.showError('字体文件不存在，切换失败'); + return; + } + if (fontInfo.path.isNotEmpty) { + await _loadFontIntoEngine(fontFamily, fontInfo.path); + } + _applyCustomFont(fontFamily); + } + + final fontName = state.fonts + .firstWhere( + (f) => f.fontFamily == fontFamily, + orElse: () => const FontInfo(name: '未知', fontFamily: '', path: ''), + ) + .name; + AppToast.showSuccess('已切换为 $fontName ✨'); + _playSwitchSound(); + } + + /// 应用自定义字体 + void _applyCustomFont(String fontFamily) { + try { + ref.read(themeSettingsProvider.notifier).setCustomFontFamily(fontFamily); + Log.i('自定义字体已应用: $fontFamily (通过 customFontFamily 传递给主题系统)'); + } catch (e) { + Log.e('自定义字体应用失败', e); + } + } + + /// 保存已安装字体列表到 KV 存储（JSON格式） + void _saveInstalledFontsToKV(List fonts) { + final json = jsonEncode(fonts.map((f) => f.toJson()).toList()); + AppKVStore.setString(_kvKeyInstalledFonts, json); + } + + /// 切换字体收藏状态 + void toggleFavorite(String fontFamily) { + final updatedFonts = state.fonts.map((f) { + if (f.fontFamily == fontFamily) { + return f.copyWith(isFavorite: !f.isFavorite); + } + return f; + }).toList(); + state = state.copyWith(fonts: updatedFonts); + _saveInstalledFontsToKV( + updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), + ); + _saveFavoritesToKV(updatedFonts); + } + + /// 保存收藏列表到 KV 存储 + void _saveFavoritesToKV(List fonts) { + final favIds = fonts + .where((f) => f.isFavorite) + .map((f) => f.fontFamily) + .toList(); + AppKVStore.setStringList('font_favorites', favIds); + } + + /// 从 KV 存储加载收藏列表 + List _loadFavoritesFromKV() { + return AppKVStore.getStringList('font_favorites') ?? []; + } + + /// 记录已删除字体到 KV 存储 + void _recordDeletedFont(String fontFamily) { + final deleted = AppKVStore.getStringList(_kvKeyDeletedFonts) ?? []; + if (!deleted.contains(fontFamily)) { + deleted.add(fontFamily); + AppKVStore.setStringList(_kvKeyDeletedFonts, deleted); + } + } + + /// 从已删除列表中移除字体 + void _removeFromDeletedList(String fontFamily) { + final deleted = AppKVStore.getStringList(_kvKeyDeletedFonts) ?? []; + deleted.remove(fontFamily); + AppKVStore.setStringList(_kvKeyDeletedFonts, deleted); + } +} + +/// 字体管理 Provider +final fontManagementProvider = + NotifierProvider( + FontManagementNotifier.new, + ); diff --git a/lib/features/settings/presentation/font_management_page.dart b/lib/features/settings/presentation/font_management_page.dart index 7444403a..499648a3 100644 --- a/lib/features/settings/presentation/font_management_page.dart +++ b/lib/features/settings/presentation/font_management_page.dart @@ -1,743 +1,75 @@ /// ============================================================ /// 闲言APP — 字体管理页面 /// 创建时间: 2026-04-28 -/// 更新时间: 2026-04-29 -/// 作用: 导入字体、下载字体、管理字体、动态加载、主题集成 -/// 上次更新: 完善字体下载/导入/动态加载/主题集成功能 +/// 更新时间: 2026-05-20 +/// 作用: 字体管理主页面入口，组合子组件，支持动态主题 +/// 上次更新: 字体对比模式+字体切换音效 /// ============================================================ -import 'dart:io'; - -import 'package:dio/dio.dart'; -import 'package:file_picker/file_picker.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:path_provider/path_provider.dart'; +import 'package:custom_refresh_indicator/custom_refresh_indicator.dart'; -import '../../../core/storage/app_kv_store.dart'; -import '../../../core/theme/app_radius.dart'; import '../../../core/theme/app_spacing.dart'; import '../../../core/theme/app_theme.dart'; import '../../../core/theme/app_typography.dart'; -import '../../../core/utils/logger.dart'; -import '../../../features/settings/providers/theme_settings_provider.dart'; -import '../../../shared/widgets/glass_container.dart'; -import '../../../shared/widgets/app_toast.dart'; - -/// 字体信息模型 -class FontInfo { - const FontInfo({ - required this.name, - required this.fontFamily, - required this.path, - this.isBuiltIn = false, - this.isDownloaded = false, - this.isDownloading = false, - this.downloadProgress = 0.0, - this.previewText = '闲言 AaBbCc 你好世界', - this.fileSize, - }); - - final String name; - final String fontFamily; - final String path; - final bool isBuiltIn; - final bool isDownloaded; - final bool isDownloading; - final double downloadProgress; - final String previewText; - final int? fileSize; - - FontInfo copyWith({ - String? name, - String? fontFamily, - String? path, - bool? isBuiltIn, - bool? isDownloaded, - bool? isDownloading, - double? downloadProgress, - String? previewText, - int? fileSize, - }) { - return FontInfo( - name: name ?? this.name, - fontFamily: fontFamily ?? this.fontFamily, - path: path ?? this.path, - isBuiltIn: isBuiltIn ?? this.isBuiltIn, - isDownloaded: isDownloaded ?? this.isDownloaded, - isDownloading: isDownloading ?? this.isDownloading, - downloadProgress: downloadProgress ?? this.downloadProgress, - previewText: previewText ?? this.previewText, - fileSize: fileSize ?? this.fileSize, - ); - } -} - -/// 字体管理状态 -class FontManagementState { - const FontManagementState({ - this.fonts = const [], - this.onlineFonts = const [], - this.isLoading = false, - this.activeFontFamily = 'Inter', - this.urlDownloadProgress = 0.0, - this.isUrlDownloading = false, - this.urlDownloadName = '', - }); - - final List fonts; - final List onlineFonts; - final bool isLoading; - final String activeFontFamily; - final double urlDownloadProgress; - final bool isUrlDownloading; - final String urlDownloadName; - - FontManagementState copyWith({ - List? fonts, - List? onlineFonts, - bool? isLoading, - String? activeFontFamily, - double? urlDownloadProgress, - bool? isUrlDownloading, - String? urlDownloadName, - }) { - return FontManagementState( - fonts: fonts ?? this.fonts, - onlineFonts: onlineFonts ?? this.onlineFonts, - isLoading: isLoading ?? this.isLoading, - activeFontFamily: activeFontFamily ?? this.activeFontFamily, - urlDownloadProgress: urlDownloadProgress ?? this.urlDownloadProgress, - isUrlDownloading: isUrlDownloading ?? this.isUrlDownloading, - urlDownloadName: urlDownloadName ?? this.urlDownloadName, - ); - } -} - -String _formatFileSize(int bytes) { - if (bytes < 1024) return '$bytes B'; - if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} KB'; - return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB'; -} - -/// 在线字体数据 -const _onlineFontData = [ - ( - '霞鹜文楷', - 'LXGWWenKai', - 'https://cdn.jsdelivr.net/gh/lxgw/LxgwWenKai/fonts/LXGWWenKai-Regular.ttf', - '🖋️', - ), - ( - '阿里巴巴普惠体', - 'AlibabaPuHuiTi', - 'https://fonts.alicdn.com/font/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-55-Regular.ttf', - '💼', - ), - ( - '站酷快乐体', - 'ZCOOLKuaiLe', - 'https://cdn.jsdelivr.net/gh/googlefonts/zcool-kuaile/fonts/ttf/ZCOOLKuaiLe-Regular.ttf', - '🎉', - ), - ( - '站酷小薇', - 'ZCOOLXiaoWei', - 'https://cdn.jsdelivr.net/gh/googlefonts/zcool-xiaowei/fonts/ZCOOLXiaoWei-Regular.ttf', - '🌸', - ), - ( - '思源黑体', - 'NotoSansSC', - 'https://cdn.jsdelivr.net/gh/notofonts/noto-cjk/Sans/OTF/SimplifiedChinese/NotoSansCJKsc-Regular.otf', - '📐', - ), - ( - '思源宋体', - 'NotoSerifSC', - 'https://cdn.jsdelivr.net/gh/notofonts/noto-cjk/Serif/OTF/SimplifiedChinese/NotoSerifCJKsc-Regular.otf', - '📜', - ), -]; - -/// 字体管理 Notifier -class FontManagementNotifier extends Notifier { - @override - FontManagementState build() { - Future.microtask(() => _init()); - return const FontManagementState(); - } - - static const _kvKeyActiveFont = 'font_active_family'; - static const _kvKeyInstalledFonts = 'font_installed_list'; - - static final _dio = Dio( - BaseOptions( - connectTimeout: const Duration(seconds: 30), - receiveTimeout: const Duration(minutes: 5), - sendTimeout: const Duration(seconds: 30), - headers: { - 'User-Agent': - 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36', - 'Accept': '*/*', - }, - ), - ); - - Future _init() async { - state = state.copyWith(isLoading: true); - try { - final activeFont = AppKVStore.getString(_kvKeyActiveFont) ?? 'Inter'; - final installedFonts = _loadInstalledFontsFromKV(); - final localFonts = await _scanLocalFonts(); - - final allFonts = [..._builtInFonts, ...installedFonts, ...localFonts]; - - final onlineFonts = _buildOnlineFonts(installedFonts, localFonts); - - state = state.copyWith( - fonts: allFonts, - onlineFonts: onlineFonts, - isLoading: false, - activeFontFamily: activeFont, - ); - - await _loadDynamicFonts(installedFonts); - await _loadDynamicFonts(localFonts); - } catch (e) { - Log.e('字体初始化失败', e); - state = state.copyWith(isLoading: false); - } - } - - List get _builtInFonts => [ - const FontInfo( - name: '系统默认', - fontFamily: 'Inter', - path: '', - isBuiltIn: true, - ), - const FontInfo( - name: '衬线体', - fontFamily: 'NotoSerif', - path: '', - isBuiltIn: true, - ), - const FontInfo( - name: '等宽体', - fontFamily: 'RobotoMono', - path: '', - isBuiltIn: true, - ), - const FontInfo(name: '圆体', fontFamily: 'Nunito', path: '', isBuiltIn: true), - ]; - - List _loadInstalledFontsFromKV() { - final raw = AppKVStore.getStringList(_kvKeyInstalledFonts) ?? []; - return raw - .map((entry) { - final parts = entry.split('|'); - if (parts.length >= 3) { - return FontInfo( - name: parts[0], - fontFamily: parts[1], - path: parts[2], - isDownloaded: true, - fileSize: parts.length >= 4 ? int.tryParse(parts[3]) : null, - ); - } - return null; - }) - .whereType() - .toList(); - } - - Future> _scanLocalFonts() async { - final dir = await getApplicationDocumentsDirectory(); - final fontDir = Directory('${dir.path}/fonts'); - final List fonts = []; - - if (await fontDir.exists()) { - await for (final entity in fontDir.list()) { - if (entity is File) { - final ext = entity.path.toLowerCase(); - if (ext.endsWith('.ttf') || ext.endsWith('.otf')) { - final fileName = entity.path.split(Platform.pathSeparator).last; - final name = fileName.replaceAll(RegExp(r'\.(ttf|otf)$'), ''); - final fontFamily = name.replaceAll(' ', ''); - final size = await entity.length(); - fonts.add( - FontInfo( - name: name, - fontFamily: fontFamily, - path: entity.path, - isDownloaded: true, - fileSize: size, - ), - ); - } - } - } - } - - return fonts; - } - - List _buildOnlineFonts( - List installed, - List local, - ) { - final installedFamilies = { - ...installed.map((f) => f.fontFamily), - ...local.map((f) => f.fontFamily), - }; - - return _onlineFontData.map((data) { - final isInstalled = installedFamilies.contains(data.$2); - return FontInfo( - name: data.$1, - fontFamily: data.$2, - path: '', - isDownloaded: isInstalled, - ); - }).toList(); - } - - Future _loadDynamicFonts(List fonts) async { - for (final font in fonts) { - if (font.path.isNotEmpty && font.isDownloaded) { - await _loadFontIntoEngine(font.fontFamily, font.path); - } - } - } - - static bool _isValidFontFile(Uint8List bytes) { - if (bytes.length < 4) return false; - final h = bytes; - return (h[0] == 0x00 && h[1] == 0x01 && h[2] == 0x00 && h[3] == 0x00) || - (h[0] == 0x4F && h[1] == 0x54 && h[2] == 0x54 && h[3] == 0x4F); - } - - Future _loadFontIntoEngine(String fontFamily, String path) async { - try { - final file = File(path); - if (!await file.exists()) return false; - - final bytes = await file.readAsBytes(); - if (!_isValidFontFile(bytes)) { - Log.e('字体格式无效 [$fontFamily]: 文件头非 TTF/OTF 格式'); - return false; - } - final loader = FontLoader(fontFamily); - loader.addFont( - Future.value(ByteData.sublistView(Uint8List.fromList(bytes))), - ); - await loader.load(); - Log.i('字体加载成功: $fontFamily ($path)'); - return true; - } on FileSystemException catch (e) { - Log.e('字体文件系统错误 [$fontFamily]: ${e.message}', e); - return false; - } on OutOfMemoryError catch (e) { - Log.e('字体内存不足 [$fontFamily]: 文件可能过大', e); - return false; - } on FormatException catch (e) { - Log.e('字体格式无效 [$fontFamily]: ${e.message}', e); - return false; - } catch (e) { - Log.e('字体加载未知异常 [$fontFamily]', e); - return false; - } - } - - Future downloadFont(int index) async { - if (index < 0 || index >= state.onlineFonts.length) return; - - final onlineFont = state.onlineFonts[index]; - if (onlineFont.isDownloaded) { - AppToast.showSuccess('${onlineFont.name} 已安装'); - return; - } - if (onlineFont.isDownloading) return; - - final newOnlineFonts = List.from(state.onlineFonts); - newOnlineFonts[index] = onlineFont.copyWith( - isDownloading: true, - downloadProgress: 0.0, - ); - state = state.copyWith(onlineFonts: newOnlineFonts); - - try { - final dir = await getApplicationDocumentsDirectory(); - final fontDir = Directory('${dir.path}/fonts'); - if (!await fontDir.exists()) { - await fontDir.create(recursive: true); - } - - final urlPath = _onlineFontData[index].$3; - final urlExt = urlPath.contains('.') ? urlPath.split('.').last : 'ttf'; - final fileName = '${onlineFont.fontFamily}.$urlExt'; - final savePath = '${fontDir.path}${Platform.pathSeparator}$fileName'; - - await _dio.download( - _onlineFontData[index].$3, - savePath, - onReceiveProgress: (received, total) { - if (total > 0) { - final progress = received / total; - final updated = List.from(state.onlineFonts); - updated[index] = state.onlineFonts[index].copyWith( - downloadProgress: progress, - ); - state = state.copyWith(onlineFonts: updated); - } - }, - ); - - final loaded = await _loadFontIntoEngine(onlineFont.fontFamily, savePath); - - if (loaded) { - final fileSize = await File(savePath).length(); - final newFont = FontInfo( - name: onlineFont.name, - fontFamily: onlineFont.fontFamily, - path: savePath, - isDownloaded: true, - fileSize: fileSize, - ); - - final updatedOnlineFonts = List.from(state.onlineFonts); - updatedOnlineFonts[index] = newFont.copyWith( - isDownloading: false, - downloadProgress: 1.0, - ); - - final updatedFonts = List.from(state.fonts)..add(newFont); - - state = state.copyWith( - fonts: updatedFonts, - onlineFonts: updatedOnlineFonts, - ); - - _saveInstalledFontsToKV( - updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), - ); - - AppToast.showSuccess('${onlineFont.name} 下载安装成功 ✅'); - } else { - _resetDownloadState(index, '${onlineFont.name} 加载失败'); - } - } on DioException catch (e) { - Log.e('字体下载失败: ${onlineFont.name}', e); - _resetDownloadState(index, '下载失败: ${e.message ?? '网络错误'}'); - } catch (e) { - Log.e('字体安装异常: ${onlineFont.name}', e); - _resetDownloadState(index, '安装失败: $e'); - } - } - - void _resetDownloadState(int index, String errorMsg) { - final updated = List.from(state.onlineFonts); - updated[index] = state.onlineFonts[index].copyWith( - isDownloading: false, - downloadProgress: 0.0, - ); - state = state.copyWith(onlineFonts: updated); - AppToast.showError(errorMsg); - } - - Future importFont() async { - try { - final result = await FilePicker.platform.pickFiles( - type: FileType.custom, - allowedExtensions: ['ttf', 'otf'], - allowMultiple: true, - ); - - if (result == null || result.files.isEmpty) return; - - final dir = await getApplicationDocumentsDirectory(); - final fontDir = Directory('${dir.path}/fonts'); - if (!await fontDir.exists()) { - await fontDir.create(recursive: true); - } - - int successCount = 0; - for (final platformFile in result.files) { - final filePath = platformFile.path; - if (filePath == null) continue; - - final sourceFile = File(filePath); - if (!await sourceFile.exists()) continue; - - final fileName = platformFile.name; - final name = fileName.replaceAll(RegExp(r'\.(ttf|otf)$'), ''); - final fontFamily = name.replaceAll(' ', ''); - final destPath = '${fontDir.path}${Platform.pathSeparator}$fileName'; - - if (await File(destPath).exists()) { - await File(destPath).delete(); - } - await sourceFile.copy(destPath); - - final loaded = await _loadFontIntoEngine(fontFamily, destPath); - if (loaded) { - final fileSize = await File(destPath).length(); - final newFont = FontInfo( - name: name, - fontFamily: fontFamily, - path: destPath, - isDownloaded: true, - fileSize: fileSize, - ); - - final existingIndex = state.fonts.indexWhere( - (f) => f.fontFamily == fontFamily, - ); - final updatedFonts = List.from(state.fonts); - if (existingIndex >= 0) { - updatedFonts[existingIndex] = newFont; - } else { - updatedFonts.add(newFont); - } - - state = state.copyWith(fonts: updatedFonts); - _saveInstalledFontsToKV( - updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), - ); - successCount++; - } - } - - if (successCount > 0) { - AppToast.showSuccess('成功导入 $successCount 个字体 ✅'); - } else { - AppToast.showError('字体导入失败'); - } - } catch (e) { - Log.e('字体导入失败', e); - AppToast.showError('导入失败: $e'); - } - } - - /// 从URL下载字体 - Future downloadFontFromUrl(String url, {String? name}) async { - try { - final dir = await getApplicationDocumentsDirectory(); - final fontDir = Directory('${dir.path}/fonts'); - if (!await fontDir.exists()) { - await fontDir.create(recursive: true); - } - - final uri = Uri.parse(url); - final urlFileName = uri.pathSegments.isNotEmpty - ? uri.pathSegments.last - : 'custom_font.ttf'; - final ext = urlFileName.contains('.') - ? urlFileName.split('.').last - : 'ttf'; - - String fontFamily = name?.isNotEmpty == true - ? name! - : urlFileName - .replaceAll('.$ext', '') - .replaceAll(RegExp(r'[^a-zA-Z0-9_]'), '_'); - if (fontFamily.isEmpty) - fontFamily = 'CustomFont_${DateTime.now().millisecondsSinceEpoch}'; - - final displayName = name?.isNotEmpty == true ? name! : fontFamily; - - state = state.copyWith( - isUrlDownloading: true, - urlDownloadProgress: 0.0, - urlDownloadName: displayName, - ); - - final fileName = '$fontFamily.$ext'; - final savePath = '${fontDir.path}${Platform.pathSeparator}$fileName'; - - await _dio.download( - url, - savePath, - onReceiveProgress: (received, total) { - if (total > 0) { - final progress = received / total; - state = state.copyWith(urlDownloadProgress: progress); - } - }, - ); - - final loaded = await _loadFontIntoEngine(fontFamily, savePath); - - if (loaded) { - final fileSize = await File(savePath).length(); - final newFont = FontInfo( - name: displayName, - fontFamily: fontFamily, - path: savePath, - isDownloaded: true, - fileSize: fileSize, - ); - - final updatedFonts = List.from(state.fonts)..add(newFont); - state = state.copyWith( - fonts: updatedFonts, - isUrlDownloading: false, - urlDownloadProgress: 1.0, - ); - - _saveInstalledFontsToKV( - updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), - ); - - AppToast.showSuccess('$displayName 下载安装成功 ✅'); - } else { - final file = File(savePath); - if (await file.exists()) await file.delete(); - state = state.copyWith( - isUrlDownloading: false, - urlDownloadProgress: 0.0, - ); - AppToast.showError('字体加载失败，文件可能不是有效的字体格式'); - } - } on DioException catch (e) { - Log.e('URL字体下载失败', e); - state = state.copyWith(isUrlDownloading: false, urlDownloadProgress: 0.0); - AppToast.showError('下载失败: ${e.message ?? '网络错误'}'); - } catch (e) { - Log.e('URL字体下载异常', e); - state = state.copyWith(isUrlDownloading: false, urlDownloadProgress: 0.0); - AppToast.showError('下载失败: $e'); - } - } - - Future deleteFont(String fontFamily, String path) async { - try { - final file = File(path); - if (await file.exists()) { - await file.delete(); - } - - final updatedFonts = state.fonts - .where((f) => f.fontFamily != fontFamily) - .toList(); - - final updatedOnlineFonts = state.onlineFonts.map((f) { - if (f.fontFamily == fontFamily) { - return f.copyWith( - isDownloaded: false, - isDownloading: false, - downloadProgress: 0.0, - ); - } - return f; - }).toList(); - - if (state.activeFontFamily == fontFamily) { - setActiveFont('Inter'); - } - - state = state.copyWith( - fonts: updatedFonts, - onlineFonts: updatedOnlineFonts, - ); - _saveInstalledFontsToKV( - updatedFonts.where((f) => !f.isBuiltIn && f.isDownloaded).toList(), - ); - - AppToast.showSuccess('字体已删除 🗑️'); - } catch (e) { - Log.e('字体删除失败', e); - AppToast.showError('删除失败'); - } - } - - void setActiveFont(String fontFamily) async { - state = state.copyWith(activeFontFamily: fontFamily); - AppKVStore.setString(_kvKeyActiveFont, fontFamily); - - final isBuiltIn = _builtInFonts.any((f) => f.fontFamily == fontFamily); - if (isBuiltIn) { - final fontStyleId = _builtInFonts - .firstWhere( - (f) => f.fontFamily == fontFamily, - orElse: () => const FontInfo( - name: '', - fontFamily: 'Inter', - path: '', - isBuiltIn: true, - ), - ) - .fontFamily; - final idMap = { - 'Inter': 'system', - 'NotoSerif': 'serif', - 'RobotoMono': 'mono', - 'Nunito': 'rounded', - }; - final id = idMap[fontStyleId] ?? 'system'; - ref.read(themeSettingsProvider.notifier).setFontStyle(id); - } else { - final fontInfo = state.fonts.firstWhere( - (f) => f.fontFamily == fontFamily, - orElse: () => const FontInfo(name: '', fontFamily: '', path: ''), - ); - if (fontInfo.path.isNotEmpty) { - await _loadFontIntoEngine(fontFamily, fontInfo.path); - } - _applyCustomFont(fontFamily); - } - - final fontName = state.fonts - .firstWhere( - (f) => f.fontFamily == fontFamily, - orElse: () => const FontInfo(name: '未知', fontFamily: '', path: ''), - ) - .name; - AppToast.showSuccess('已切换为 $fontName ✨'); - } - - void _applyCustomFont(String fontFamily) { - try { - ref.read(themeSettingsProvider.notifier).setFontStyle('system'); - Log.i('自定义字体已应用: $fontFamily (通过 fontFamily override)'); - } catch (e) { - Log.e('自定义字体应用失败', e); - } - } - - void _saveInstalledFontsToKV(List fonts) { - final entries = fonts - .map( - (f) => - '${f.name}|${f.fontFamily}|${f.path}${f.fileSize != null ? '|${f.fileSize}' : ''}', - ) - .toList(); - AppKVStore.setStringList(_kvKeyInstalledFonts, entries); - } -} - -final fontManagementProvider = - NotifierProvider( - FontManagementNotifier.new, - ); +import '../../settings/providers/theme_settings_provider.dart'; +import 'font_management_notifier.dart'; +import 'font_widgets.dart'; /// 字体管理页面 -class FontManagementPage extends ConsumerWidget { +class FontManagementPage extends ConsumerStatefulWidget { const FontManagementPage({super.key}); @override - Widget build(BuildContext context, WidgetRef ref) { + ConsumerState createState() => _FontManagementPageState(); +} + +class _FontManagementPageState extends ConsumerState { + final _scrollController = ScrollController(); + final _onlineSectionKey = GlobalKey(); + final _searchController = TextEditingController(); + + @override + void dispose() { + _scrollController.dispose(); + _searchController.dispose(); + super.dispose(); + } + + /// 滚动到在线字体区 + void scrollToOnlineSection() { + if (_onlineSectionKey.currentContext != null) { + Scrollable.ensureVisible( + _onlineSectionKey.currentContext!, + duration: const Duration(milliseconds: 500), + curve: Curves.easeInOut, + ); + } + } + + @override + Widget build(BuildContext context) { final ext = AppTheme.ext(context); + ref.watch(themeSettingsProvider); return CupertinoPageScaffold( backgroundColor: ext.bgPrimary, navigationBar: CupertinoNavigationBar( - middle: Text( - '🔤 字体管理', - style: AppTypography.title3.copyWith(color: ext.textPrimary), + middle: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + CupertinoIcons.textformat_abc, + size: 20, + color: ext.textPrimary, + ), + const SizedBox(width: 6), + Text( + '字体管理', + style: AppTypography.title3.copyWith(color: ext.textPrimary), + ), + ], ), backgroundColor: ext.bgElevated.withValues(alpha: 0.85), border: null, @@ -749,882 +81,49 @@ class FontManagementPage extends ConsumerWidget { ), child: SafeArea( bottom: false, - child: ListView( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.md, - vertical: AppSpacing.sm, - ), - children: [ - _QuickActions(ext: ext), - const SizedBox(height: AppSpacing.md), - _ActiveFontCard(ext: ext), - const SizedBox(height: AppSpacing.md), - _LocalFontsSection(ext: ext), - const SizedBox(height: AppSpacing.md), - _OnlineFontsSection(ext: ext), - const SizedBox(height: AppSpacing.md), - _FontTipsSection(ext: ext), - const SizedBox(height: AppSpacing.xxl), - ], - ), - ), - ); - } -} - -class _QuickActions extends ConsumerWidget { - const _QuickActions({required this.ext}); - - final AppThemeExtension ext; - - @override - Widget build(BuildContext context, WidgetRef ref) { - final fontState = ref.watch(fontManagementProvider); - return GlassContainer( - depth: GlassDepth.elevated, - padding: EdgeInsets.zero, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - children: [ - Expanded( - child: CupertinoButton( - padding: const EdgeInsets.all(AppSpacing.md), - onPressed: fontState.isUrlDownloading - ? null - : () => ref - .read(fontManagementProvider.notifier) - .importFont(), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text('📁', style: TextStyle(fontSize: 18)), - const SizedBox(width: AppSpacing.xs), - Text( - '导入字体', - style: AppTypography.subhead.copyWith( - color: ext.accent, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - ), - ), - Container( - width: 1, - height: 40, - color: ext.textHint.withValues(alpha: 0.2), - ), - Expanded( - child: CupertinoButton( - padding: const EdgeInsets.all(AppSpacing.md), - onPressed: fontState.isUrlDownloading - ? null - : () => _showUrlDownloadDialog(context, ref), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text('🔗', style: TextStyle(fontSize: 18)), - const SizedBox(width: AppSpacing.xs), - Text( - 'URL下载', - style: AppTypography.subhead.copyWith( - color: ext.accent, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - ), - ), - Container( - width: 1, - height: 40, - color: ext.textHint.withValues(alpha: 0.2), - ), - Expanded( - child: CupertinoButton( - padding: const EdgeInsets.all(AppSpacing.md), - onPressed: () => _scrollToOnlineSection(context), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text('☁️', style: TextStyle(fontSize: 18)), - const SizedBox(width: AppSpacing.xs), - Text( - '在线字体', - style: AppTypography.subhead.copyWith( - color: ext.accent, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - ), - ), - ], - ), - if (fontState.isUrlDownloading) ...[ - Padding( - padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), - child: Column( - children: [ - ClipRRect( - borderRadius: AppRadius.smBorder, - child: LinearProgressIndicator( - value: fontState.urlDownloadProgress, - backgroundColor: ext.textHint.withValues(alpha: 0.1), - valueColor: AlwaysStoppedAnimation(ext.accent), - minHeight: 4, - ), - ), - const SizedBox(height: 4), - Text( - '⬇️ 正在下载 ${fontState.urlDownloadName} ${(fontState.urlDownloadProgress * 100).toStringAsFixed(0)}%', - style: AppTypography.caption2.copyWith( - color: ext.textSecondary, - ), - ), - ], - ), - ), - const SizedBox(height: AppSpacing.sm), - ], - ], - ), - ); - } - - void _showUrlDownloadDialog(BuildContext context, WidgetRef ref) { - final urlController = TextEditingController(); - final nameController = TextEditingController(); - - showCupertinoDialog( - context: context, - builder: (ctx) => CupertinoAlertDialog( - title: const Text('🔗 从URL下载字体'), - content: Padding( - padding: const EdgeInsets.only(top: 12), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - CupertinoTextField( - controller: urlController, - placeholder: '字体文件URL (.ttf/.otf)', - clearButtonMode: OverlayVisibilityMode.editing, - keyboardType: TextInputType.url, - padding: const EdgeInsets.all(12), - ), - const SizedBox(height: 8), - CupertinoTextField( - controller: nameController, - placeholder: '字体名称 (可选)', - clearButtonMode: OverlayVisibilityMode.editing, - padding: const EdgeInsets.all(12), - ), - ], - ), - ), - actions: [ - CupertinoDialogAction( - isDestructiveAction: true, - child: const Text('取消'), - onPressed: () => Navigator.pop(ctx), - ), - CupertinoDialogAction( - isDefaultAction: true, - child: const Text('下载'), - onPressed: () { - final url = urlController.text.trim(); - if (url.isEmpty) { - AppToast.showWarning('请输入字体URL'); - return; - } - if (!url.startsWith('http')) { - AppToast.showWarning('请输入有效的URL'); - return; - } - Navigator.pop(ctx); - ref - .read(fontManagementProvider.notifier) - .downloadFontFromUrl(url, name: nameController.text.trim()); - }, - ), - ], - ), - ); - } - - void _scrollToOnlineSection(BuildContext context) { - AppToast.showInfo('👇 向下滚动查看在线字体'); - } -} - -class _ActiveFontCard extends ConsumerWidget { - const _ActiveFontCard({required this.ext}); - - final AppThemeExtension ext; - - @override - Widget build(BuildContext context, WidgetRef ref) { - final state = ref.watch(fontManagementProvider); - final activeFont = state.fonts.firstWhere( - (f) => f.fontFamily == state.activeFontFamily, - orElse: () => state.fonts.isNotEmpty - ? state.fonts.first - : const FontInfo(name: '系统默认', fontFamily: 'Inter', path: ''), - ); - - return GlassContainer( - depth: GlassDepth.elevated, - padding: const EdgeInsets.all(AppSpacing.md), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - const Text('✨', style: TextStyle(fontSize: 16)), - const SizedBox(width: AppSpacing.xs), - Text( - '当前字体', - style: AppTypography.subhead.copyWith( - color: ext.textSecondary, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - const SizedBox(height: AppSpacing.sm), - Container( - width: double.infinity, - padding: const EdgeInsets.all(AppSpacing.md), - decoration: BoxDecoration( - color: ext.accent.withValues(alpha: 0.08), - borderRadius: AppRadius.lgBorder, - border: Border.all( - color: ext.accent.withValues(alpha: 0.3), - width: 1.5, - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + child: CustomRefreshIndicator( + onRefresh: () => ref.read(fontManagementProvider.notifier).refresh(), + builder: (context, child, controller) { + return Stack( children: [ - Text( - activeFont.name, - style: AppTypography.headline.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w700, - ), - ), - const SizedBox(height: AppSpacing.xs), - Text( - '闲言 AaBbCc 你好世界 0123456789', - style: TextStyle( - fontSize: 16, - fontFamily: activeFont.fontFamily, - color: ext.textSecondary, - ), - ), - const SizedBox(height: AppSpacing.xs), - Text( - 'The quick brown fox jumps over the lazy dog.', - style: TextStyle( - fontSize: 13, - fontFamily: activeFont.fontFamily, - color: ext.textHint, - ), - ), - ], - ), - ), - ], - ), - ); - } -} - -class _LocalFontsSection extends ConsumerWidget { - const _LocalFontsSection({required this.ext}); - - final AppThemeExtension ext; - - @override - Widget build(BuildContext context, WidgetRef ref) { - final state = ref.watch(fontManagementProvider); - - return GlassContainer( - depth: GlassDepth.elevated, - padding: const EdgeInsets.all(AppSpacing.md), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - const Text('📱', style: TextStyle(fontSize: 16)), - const SizedBox(width: AppSpacing.xs), - Text( - '已安装字体', - style: AppTypography.subhead.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w600, - ), - ), - const Spacer(), - Text( - '${state.fonts.length}', - style: AppTypography.caption1.copyWith(color: ext.textHint), - ), - ], - ), - const SizedBox(height: AppSpacing.sm), - if (state.isLoading) - const Center(child: CupertinoActivityIndicator()) - else if (state.fonts.isEmpty) - Center( - child: Padding( - padding: const EdgeInsets.all(AppSpacing.lg), - child: Text( - '暂无字体，点击上方导入或下载', - style: AppTypography.caption1.copyWith(color: ext.textHint), - ), - ), - ) - else - ...state.fonts.map( - (font) => _FontItem( - font: font, - ext: ext, - isActive: font.fontFamily == state.activeFontFamily, - onActivate: () => ref - .read(fontManagementProvider.notifier) - .setActiveFont(font.fontFamily), - onDelete: font.isBuiltIn - ? null - : () => _confirmDelete(context, ref, font), - ), - ), - ], - ), - ); - } - - void _confirmDelete(BuildContext context, WidgetRef ref, FontInfo font) { - showCupertinoDialog( - context: context, - builder: (ctx) => CupertinoAlertDialog( - title: Text('🗑️ 删除 ${font.name}'), - content: const Text('确定要删除此字体吗？此操作不可撤销。'), - actions: [ - CupertinoDialogAction( - child: const Text('取消'), - onPressed: () => Navigator.pop(ctx), - ), - CupertinoDialogAction( - isDestructiveAction: true, - child: const Text('删除'), - onPressed: () { - Navigator.pop(ctx); - ref - .read(fontManagementProvider.notifier) - .deleteFont(font.fontFamily, font.path); - }, - ), - ], - ), - ); - } -} - -class _FontItem extends StatelessWidget { - const _FontItem({ - required this.font, - required this.ext, - required this.isActive, - this.onActivate, - this.onDelete, - }); - - final FontInfo font; - final AppThemeExtension ext; - final bool isActive; - final VoidCallback? onActivate; - final VoidCallback? onDelete; - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs), - child: GestureDetector( - onTap: onActivate, - child: Container( - padding: const EdgeInsets.all(AppSpacing.sm), - decoration: BoxDecoration( - color: isActive - ? ext.accent.withValues(alpha: 0.1) - : ext.bgSecondary, - borderRadius: AppRadius.mdBorder, - border: isActive ? Border.all(color: ext.accent, width: 1.5) : null, - ), - child: Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text( - font.name, - style: AppTypography.subhead.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w600, - ), - ), - if (font.isBuiltIn) ...[ - const SizedBox(width: 4), - Container( - padding: const EdgeInsets.symmetric( - horizontal: 4, - vertical: 1, - ), - decoration: BoxDecoration( - color: ext.accent.withValues(alpha: 0.15), - borderRadius: AppRadius.smBorder, - ), - child: Text( - '内置', - style: AppTypography.caption2.copyWith( - color: ext.accent, - fontSize: 9, - ), - ), - ), - ], - if (font.isDownloaded && !font.isBuiltIn) ...[ - const SizedBox(width: 4), - Container( - padding: const EdgeInsets.symmetric( - horizontal: 4, - vertical: 1, - ), - decoration: BoxDecoration( - color: CupertinoColors.systemGreen.withValues( - alpha: 0.15, - ), - borderRadius: AppRadius.smBorder, - ), - child: Text( - '已下载', - style: AppTypography.caption2.copyWith( - color: CupertinoColors.systemGreen, - fontSize: 9, - ), - ), - ), - ], - ], - ), - const SizedBox(height: 2), - Text( - font.previewText, - style: TextStyle( - fontSize: 13, - fontFamily: font.fontFamily, - color: ext.textSecondary, + child, + if (controller.value > 0) + const Positioned( + top: 0, + left: 0, + right: 0, + child: Center( + child: Padding( + padding: EdgeInsets.only(top: AppSpacing.md), + child: CupertinoActivityIndicator(), ), ), - if (font.fileSize != null) ...[ - const SizedBox(height: 1), - Text( - _formatFileSize(font.fileSize!), - style: AppTypography.caption2.copyWith( - color: ext.textHint, - ), - ), - ], - ], - ), - ), - if (isActive) - Icon( - CupertinoIcons.checkmark_circle_fill, - size: 20, - color: ext.accent, - ) - else if (onDelete != null) - CupertinoButton( - padding: EdgeInsets.zero, - onPressed: onDelete, - child: Icon( - CupertinoIcons.delete, - size: 16, - color: ext.textHint, - ), - ), - ], - ), - ), - ), - ); - } -} - -class _OnlineFontsSection extends ConsumerWidget { - const _OnlineFontsSection({required this.ext}); - - final AppThemeExtension ext; - - @override - Widget build(BuildContext context, WidgetRef ref) { - final state = ref.watch(fontManagementProvider); - - return GlassContainer( - depth: GlassDepth.elevated, - padding: const EdgeInsets.all(AppSpacing.md), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - const Text('☁️', style: TextStyle(fontSize: 16)), - const SizedBox(width: AppSpacing.xs), - Text( - '在线字体', - style: AppTypography.subhead.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w600, - ), - ), - const Spacer(), - Text( - '${state.onlineFonts.where((f) => f.isDownloaded).length}/${state.onlineFonts.length}', - style: AppTypography.caption1.copyWith(color: ext.textHint), - ), - ], - ), - const SizedBox(height: AppSpacing.xs), - Text( - '点击下载并安装到本地，安装后可在上方切换使用', - style: AppTypography.caption1.copyWith(color: ext.textSecondary), - ), - const SizedBox(height: AppSpacing.sm), - ...state.onlineFonts.asMap().entries.map( - (entry) => - _OnlineFontItem(font: entry.value, index: entry.key, ext: ext), - ), - ], - ), - ); - } -} - -class _OnlineFontItem extends ConsumerWidget { - const _OnlineFontItem({ - required this.font, - required this.index, - required this.ext, - }); - - final FontInfo font; - final int index; - final AppThemeExtension ext; - - @override - Widget build(BuildContext context, WidgetRef ref) { - final isInstalled = font.isDownloaded; - final isDownloading = font.isDownloading; - - return Padding( - padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs), - child: Container( - padding: const EdgeInsets.all(AppSpacing.sm), - decoration: BoxDecoration( - color: ext.bgSecondary, - borderRadius: AppRadius.mdBorder, - ), - child: Column( - children: [ - Row( - children: [ - Container( - width: 36, - height: 36, - decoration: BoxDecoration( - color: ext.accent.withValues(alpha: 0.1), - borderRadius: AppRadius.smBorder, - ), - child: Center( - child: Text( - _onlineFontData[index].$4, - style: const TextStyle(fontSize: 18), - ), - ), - ), - const SizedBox(width: AppSpacing.sm), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - font.name, - style: AppTypography.subhead.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w600, - ), - ), - Text( - font.fontFamily, - style: AppTypography.caption2.copyWith( - color: ext.textHint, - ), - ), - ], - ), - ), - GestureDetector( - onTap: () => _showFontDetail(context, index), - child: Padding( - padding: const EdgeInsets.all(4), - child: Icon( - CupertinoIcons.info_circle, - size: 18, - color: ext.textHint, - ), - ), - ), - if (isInstalled) - Container( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.sm, - vertical: 2, - ), - decoration: BoxDecoration( - color: CupertinoColors.systemGreen.withValues( - alpha: 0.15, - ), - borderRadius: AppRadius.smBorder, - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - CupertinoIcons.checkmark_circle, - size: 12, - color: CupertinoColors.systemGreen.darkColor, - ), - const SizedBox(width: 2), - Text( - '已安装', - style: AppTypography.caption2.copyWith( - color: CupertinoColors.systemGreen.darkColor, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - ) - else - CupertinoButton( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.sm, - ), - color: ext.accent.withValues(alpha: 0.15), - borderRadius: AppRadius.mdBorder, - onPressed: isDownloading - ? null - : () => ref - .read(fontManagementProvider.notifier) - .downloadFont(index), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - CupertinoIcons.cloud_download, - size: 14, - color: ext.accent, - ), - const SizedBox(width: 4), - Text( - '下载', - style: AppTypography.caption1.copyWith( - color: ext.accent, - fontWeight: FontWeight.w600, - ), - ), - ], - ), ), ], + ); + }, + child: ListView( + controller: _scrollController, + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, ), - if (isDownloading && !isInstalled) ...[ - const SizedBox(height: AppSpacing.xs), - ClipRRect( - borderRadius: AppRadius.smBorder, - child: LinearProgressIndicator( - value: font.downloadProgress, - backgroundColor: ext.textHint.withValues(alpha: 0.1), - valueColor: AlwaysStoppedAnimation(ext.accent), - minHeight: 4, - ), - ), - const SizedBox(height: 2), - Text( - '下载中 ${(font.downloadProgress * 100).toStringAsFixed(0)}%', - style: AppTypography.caption2.copyWith(color: ext.textHint), - ), - ], - ], - ), - ), - ); - } - - void _showFontDetail(BuildContext context, int index) { - final url = _onlineFontData[index].$3; - final type = url.split('.').last.toUpperCase(); - final sizeStr = font.fileSize != null - ? _formatFileSize(font.fileSize!) - : '未知'; - - showCupertinoDialog( - context: context, - builder: (ctx) => CupertinoAlertDialog( - title: Text('${_onlineFontData[index].$4} ${font.name}'), - content: Padding( - padding: const EdgeInsets.only(top: 12), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, children: [ - _detailRow('📦 类型', type), - const SizedBox(height: 6), - _detailRow('📏 大小', sizeStr), - const SizedBox(height: 6), - _detailRow('🏷️ 字体族', font.fontFamily), - const SizedBox(height: 6), - _detailRow('✅ 状态', font.isDownloaded ? '已安装' : '未安装'), - const SizedBox(height: 10), - Text( - '🔗 下载地址', - style: AppTypography.caption1.copyWith( - color: ext.textSecondary, - fontWeight: FontWeight.w600, - ), - ), - const SizedBox(height: 4), - Container( - width: double.infinity, - padding: const EdgeInsets.all(8), - decoration: BoxDecoration( - color: ext.bgSecondary, - borderRadius: AppRadius.smBorder, - ), - child: SelectableText( - url, - style: AppTypography.caption2.copyWith( - color: ext.textHint, - fontSize: 11, - ), - ), - ), + FontQuickActions(onScrollToOnline: scrollToOnlineSection), + const SizedBox(height: AppSpacing.sm), + FontSearchBar(controller: _searchController), + const SizedBox(height: AppSpacing.md), + const FontActiveCard(), + const SizedBox(height: AppSpacing.md), + const FontLocalSection(), + const SizedBox(height: AppSpacing.md), + FontOnlineSection(sectionKey: _onlineSectionKey), + const SizedBox(height: AppSpacing.md), + const FontTipsSection(), + const SizedBox(height: AppSpacing.xxl), ], ), ), - actions: [ - CupertinoDialogAction( - child: const Text('复制URL'), - onPressed: () { - Clipboard.setData(ClipboardData(text: url)); - Navigator.pop(ctx); - AppToast.showSuccess('URL已复制 ✅'); - }, - ), - CupertinoDialogAction( - isDefaultAction: true, - child: const Text('关闭'), - onPressed: () => Navigator.pop(ctx), - ), - ], - ), - ); - } - - Widget _detailRow(String label, String value) { - return Row( - children: [ - Text( - label, - style: AppTypography.caption1.copyWith(color: ext.textSecondary), - ), - const SizedBox(width: 8), - Expanded( - child: Text( - value, - style: AppTypography.caption1.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w600, - ), - ), - ), - ], - ); - } -} - -class _FontTipsSection extends StatelessWidget { - const _FontTipsSection({required this.ext}); - - final AppThemeExtension ext; - - @override - Widget build(BuildContext context) { - return GlassContainer( - depth: GlassDepth.elevated, - padding: const EdgeInsets.all(AppSpacing.md), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - const Text('💡', style: TextStyle(fontSize: 16)), - const SizedBox(width: AppSpacing.xs), - Text( - '字体小贴士', - style: AppTypography.subhead.copyWith( - color: ext.textPrimary, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - const SizedBox(height: AppSpacing.sm), - _tipItem('📂', '支持 .ttf 和 .otf 格式字体文件'), - _tipItem('🌐', '在线字体下载后自动安装并加载'), - _tipItem('🔄', '切换字体后全局立即生效'), - _tipItem('💾', '字体文件存储在应用文档目录，卸载后清除'), - _tipItem('⚠️', '部分在线字体链接可能需要科学上网'), - ], - ), - ); - } - - Widget _tipItem(String emoji, String text) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 2), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(emoji, style: const TextStyle(fontSize: 13)), - const SizedBox(width: AppSpacing.xs), - Expanded( - child: Text( - text, - style: AppTypography.caption1.copyWith(color: ext.textSecondary), - ), - ), - ], ), ); } diff --git a/lib/features/settings/presentation/font_models.dart b/lib/features/settings/presentation/font_models.dart new file mode 100644 index 00000000..04ad6706 --- /dev/null +++ b/lib/features/settings/presentation/font_models.dart @@ -0,0 +1,294 @@ +/// ============================================================ +/// 闲言APP — 字体管理数据模型 +/// 创建时间: 2026-04-28 +/// 更新时间: 2026-05-20 +/// 作用: 字体信息模型、管理状态、在线字体数据、工具函数 +/// 上次更新: 增加downloadUrl/hasDownloadError字段+在线字体搜索过滤 +/// ============================================================ + +import 'package:flutter/cupertino.dart'; +import 'package:pinyin/pinyin.dart'; + +/// 字体信息模型 +class FontInfo { + const FontInfo({ + required this.name, + required this.fontFamily, + required this.path, + this.isBuiltIn = false, + this.isDownloaded = false, + this.isDownloading = false, + this.downloadProgress = 0.0, + this.previewText = '闲言 AaBbCc 你好世界', + this.fileSize, + this.isFavorite = false, + this.category = '', + this.iconEmoji = '🔤', + this.downloadUrl = '', + this.hasDownloadError = false, + }); + + final String name; + final String fontFamily; + final String path; + final bool isBuiltIn; + final bool isDownloaded; + final bool isDownloading; + final double downloadProgress; + final String previewText; + final int? fileSize; + final bool isFavorite; + + /// 字体分类 (sans/serif/mono/display/handwriting/google) + final String category; + + /// 图标emoji + final String iconEmoji; + + /// 字体下载URL + final String downloadUrl; + + /// 下载是否出错 + final bool hasDownloadError; + + FontInfo copyWith({ + String? name, + String? fontFamily, + String? path, + bool? isBuiltIn, + bool? isDownloaded, + bool? isDownloading, + double? downloadProgress, + String? previewText, + int? fileSize, + bool? isFavorite, + String? category, + String? iconEmoji, + String? downloadUrl, + bool? hasDownloadError, + }) { + return FontInfo( + name: name ?? this.name, + fontFamily: fontFamily ?? this.fontFamily, + path: path ?? this.path, + isBuiltIn: isBuiltIn ?? this.isBuiltIn, + isDownloaded: isDownloaded ?? this.isDownloaded, + isDownloading: isDownloading ?? this.isDownloading, + downloadProgress: downloadProgress ?? this.downloadProgress, + previewText: previewText ?? this.previewText, + fileSize: fileSize ?? this.fileSize, + isFavorite: isFavorite ?? this.isFavorite, + category: category ?? this.category, + iconEmoji: iconEmoji ?? this.iconEmoji, + downloadUrl: downloadUrl ?? this.downloadUrl, + hasDownloadError: hasDownloadError ?? this.hasDownloadError, + ); + } + + /// 序列化为JSON + Map toJson() => { + 'name': name, + 'fontFamily': fontFamily, + 'path': path, + 'isBuiltIn': isBuiltIn, + 'isDownloaded': isDownloaded, + 'fileSize': fileSize, + 'isFavorite': isFavorite, + 'category': category, + 'iconEmoji': iconEmoji, + 'downloadUrl': downloadUrl, + }; + + /// 从JSON反序列化 + factory FontInfo.fromJson(Map json) => FontInfo( + name: json['name'] as String? ?? '', + fontFamily: json['fontFamily'] as String? ?? '', + path: json['path'] as String? ?? '', + isBuiltIn: json['isBuiltIn'] as bool? ?? false, + isDownloaded: json['isDownloaded'] as bool? ?? false, + fileSize: json['fileSize'] as int?, + isFavorite: json['isFavorite'] as bool? ?? false, + category: json['category'] as String? ?? '', + iconEmoji: json['iconEmoji'] as String? ?? '🔤', + downloadUrl: json['downloadUrl'] as String? ?? '', + ); +} + +/// 字体管理状态 +class FontManagementState { + const FontManagementState({ + this.fonts = const [], + this.onlineFonts = const [], + this.isLoading = false, + this.activeFontFamily = 'Inter', + this.urlDownloadProgress = 0.0, + this.isUrlDownloading = false, + this.urlDownloadName = '', + this.searchQuery = '', + this.downloadQueue = const {}, + }); + + final List fonts; + final List onlineFonts; + final bool isLoading; + final String activeFontFamily; + final double urlDownloadProgress; + final bool isUrlDownloading; + final String urlDownloadName; + final String searchQuery; + final Set downloadQueue; + + /// 根据搜索关键词筛选字体（支持名称、字体族、拼音首字母匹配） + List get filteredFonts { + var result = fonts; + if (searchQuery.isNotEmpty) { + final query = searchQuery.toLowerCase(); + result = result.where((f) { + final nameMatch = f.name.toLowerCase().contains(query); + final familyMatch = f.fontFamily.toLowerCase().contains(query); + bool pinyinMatch = false; + try { + pinyinMatch = PinyinHelper.getShortPinyin( + f.name, + ).toLowerCase().contains(query); + } catch (_) {} + return nameMatch || familyMatch || pinyinMatch; + }).toList(); + } + result.sort((a, b) { + if (a.isFavorite != b.isFavorite) return a.isFavorite ? -1 : 1; + return 0; + }); + return result; + } + + /// 根据搜索关键词筛选在线字体 + List get filteredOnlineFonts { + if (searchQuery.isEmpty) return onlineFonts; + final query = searchQuery.toLowerCase(); + return onlineFonts.where((f) { + final nameMatch = f.name.toLowerCase().contains(query); + final familyMatch = f.fontFamily.toLowerCase().contains(query); + bool pinyinMatch = false; + try { + pinyinMatch = PinyinHelper.getShortPinyin( + f.name, + ).toLowerCase().contains(query); + } catch (_) {} + return nameMatch || familyMatch || pinyinMatch; + }).toList(); + } + + FontManagementState copyWith({ + List? fonts, + List? onlineFonts, + bool? isLoading, + String? activeFontFamily, + double? urlDownloadProgress, + bool? isUrlDownloading, + String? urlDownloadName, + String? searchQuery, + Set? downloadQueue, + }) { + return FontManagementState( + fonts: fonts ?? this.fonts, + onlineFonts: onlineFonts ?? this.onlineFonts, + isLoading: isLoading ?? this.isLoading, + activeFontFamily: activeFontFamily ?? this.activeFontFamily, + urlDownloadProgress: urlDownloadProgress ?? this.urlDownloadProgress, + isUrlDownloading: isUrlDownloading ?? this.isUrlDownloading, + urlDownloadName: urlDownloadName ?? this.urlDownloadName, + searchQuery: searchQuery ?? this.searchQuery, + downloadQueue: downloadQueue ?? this.downloadQueue, + ); + } +} + +/// 格式化文件大小 +String formatFileSize(int bytes) { + if (bytes < 1024) return '$bytes B'; + if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} KB'; + return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB'; +} + +/// 在线字体数据 (名称, 字体族, 下载URL, emoji) +const onlineFontData = [ + ( + '霞鹜文楷', + 'LXGWWenKai', + 'https://cdn.jsdelivr.net/gh/lxgw/LxgwWenKai/fonts/LXGWWenKai-Regular.ttf', + '🖋️', + ), + ( + '阿里巴巴普惠体', + 'AlibabaPuHuiTi', + 'https://fonts.alicdn.com/font/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-55-Regular.ttf', + '💼', + ), + ( + '站酷快乐体', + 'ZCOOLKuaiLe', + 'https://cdn.jsdelivr.net/gh/googlefonts/zcool-kuaile/fonts/ttf/ZCOOLKuaiLe-Regular.ttf', + '🎉', + ), + ( + '站酷小薇', + 'ZCOOLXiaoWei', + 'https://cdn.jsdelivr.net/gh/googlefonts/zcool-xiaowei/fonts/ZCOOLXiaoWei-Regular.ttf', + '🌸', + ), + ( + '思源黑体', + 'NotoSansSC', + 'https://cdn.jsdelivr.net/gh/notofonts/noto-cjk/Sans/OTF/SimplifiedChinese/NotoSansCJKsc-Regular.otf', + '📐', + ), + ( + '思源宋体', + 'NotoSerifSC', + 'https://cdn.jsdelivr.net/gh/notofonts/noto-cjk/Serif/OTF/SimplifiedChinese/NotoSerifCJKsc-Regular.otf', + '📜', + ), +]; + +/// 内置字体配置 +class BuiltInFontConfig { + const BuiltInFontConfig({ + required this.name, + required this.fontFamily, + required this.styleId, + required this.icon, + }); + final String name; + final String fontFamily; + final String styleId; + final IconData icon; +} + +/// 内置字体配置列表 +const builtInFontConfigs = [ + BuiltInFontConfig( + name: '系统默认', + fontFamily: 'Inter', + styleId: 'system', + icon: CupertinoIcons.device_phone_portrait, + ), + BuiltInFontConfig( + name: '衬线体', + fontFamily: 'NotoSerif', + styleId: 'serif', + icon: CupertinoIcons.book_fill, + ), + BuiltInFontConfig( + name: '等宽体', + fontFamily: 'RobotoMono', + styleId: 'mono', + icon: CupertinoIcons.keyboard, + ), + BuiltInFontConfig( + name: '圆体', + fontFamily: 'Nunito', + styleId: 'rounded', + icon: CupertinoIcons.circle_fill, + ), +]; diff --git a/lib/features/settings/presentation/font_widgets.dart b/lib/features/settings/presentation/font_widgets.dart new file mode 100644 index 00000000..a0f07205 --- /dev/null +++ b/lib/features/settings/presentation/font_widgets.dart @@ -0,0 +1,1064 @@ +/// ============================================================ +/// 闲言APP — 字体管理 UI 组件 +/// 创建时间: 2026-04-28 +/// 更新时间: 2026-05-20 +/// 作用: 字体管理页面所有子组件(快捷操作/当前字体/本地字体/在线字体/小贴士) +/// 上次更新: 重试条件改用hasDownloadError+在线字体搜索过滤 +/// ============================================================ + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:heroine/heroine.dart'; + +import '../../../core/theme/app_radius.dart'; +import '../../../core/theme/app_spacing.dart'; +import '../../../core/theme/app_theme.dart'; +import '../../../core/theme/app_typography.dart'; +import '../../../shared/widgets/app_slidable.dart'; +import '../../../shared/widgets/app_toast.dart'; +import '../../../shared/widgets/glass_container.dart'; +import '../../../shared/widgets/skeleton.dart'; +import 'font/font_comparison_page.dart'; +import 'font/font_preview_sheet.dart'; +import 'font_management_notifier.dart'; +import 'font_models.dart'; + +/// 字体搜索栏 +class FontSearchBar extends ConsumerWidget { + const FontSearchBar({super.key, required this.controller}); + + final TextEditingController controller; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final ext = AppTheme.ext(context); + return CupertinoSearchTextField( + controller: controller, + onChanged: (v) => + ref.read(fontManagementProvider.notifier).setSearchQuery(v), + placeholder: '搜索字体（支持拼音）', + placeholderStyle: AppTypography.subhead.copyWith(color: ext.textHint), + style: AppTypography.subhead.copyWith(color: ext.textPrimary), + ); + } +} + +/// 快捷操作区(导入/URL下载/在线字体) +class FontQuickActions extends ConsumerWidget { + const FontQuickActions({super.key, this.onScrollToOnline}); + + final VoidCallback? onScrollToOnline; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final ext = AppTheme.ext(context); + final fontState = ref.watch(fontManagementProvider); + return GlassContainer( + depth: GlassDepth.elevated, + padding: EdgeInsets.zero, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + children: [ + Expanded( + child: CupertinoButton( + padding: const EdgeInsets.all(AppSpacing.md), + onPressed: fontState.isUrlDownloading + ? null + : () => ref + .read(fontManagementProvider.notifier) + .importFont(), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + CupertinoIcons.folder_fill, + size: 18, + color: ext.accent, + ), + const SizedBox(width: AppSpacing.xs), + Text( + '导入字体', + style: AppTypography.subhead.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ), + Container( + width: 1, + height: 40, + color: ext.textHint.withValues(alpha: 0.2), + ), + Expanded( + child: CupertinoButton( + padding: const EdgeInsets.all(AppSpacing.md), + onPressed: fontState.isUrlDownloading + ? null + : () => _showUrlDownloadDialog(context, ref), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(CupertinoIcons.link, size: 18, color: ext.accent), + const SizedBox(width: AppSpacing.xs), + Text( + 'URL下载', + style: AppTypography.subhead.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ), + Container( + width: 1, + height: 40, + color: ext.textHint.withValues(alpha: 0.2), + ), + Expanded( + child: CupertinoButton( + padding: const EdgeInsets.all(AppSpacing.md), + onPressed: onScrollToOnline, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(CupertinoIcons.cloud, size: 18, color: ext.accent), + const SizedBox(width: AppSpacing.xs), + Text( + '在线字体', + style: AppTypography.subhead.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ), + Container( + width: 1, + height: 40, + color: ext.textHint.withValues(alpha: 0.2), + ), + Expanded( + child: CupertinoButton( + padding: const EdgeInsets.all(AppSpacing.md), + onPressed: fontState.isUrlDownloading + ? null + : () => ref + .read(fontManagementProvider.notifier) + .importFontZip(), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + CupertinoIcons.archivebox_fill, + size: 18, + color: ext.accent, + ), + const SizedBox(width: AppSpacing.xs), + Text( + 'ZIP导入', + style: AppTypography.subhead.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ), + ], + ), + if (fontState.isUrlDownloading) ...[ + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md), + child: Column( + children: [ + ClipRRect( + borderRadius: AppRadius.smBorder, + child: LinearProgressIndicator( + value: fontState.urlDownloadProgress, + backgroundColor: ext.textHint.withValues(alpha: 0.1), + valueColor: AlwaysStoppedAnimation(ext.accent), + minHeight: 4, + ), + ), + const SizedBox(height: 4), + Text( + '⬇️ 正在下载 ${fontState.urlDownloadName} ${(fontState.urlDownloadProgress * 100).toStringAsFixed(0)}%', + style: AppTypography.caption2.copyWith( + color: ext.textSecondary, + ), + ), + ], + ), + ), + const SizedBox(height: AppSpacing.sm), + ], + ], + ), + ); + } + + void _showUrlDownloadDialog(BuildContext context, WidgetRef ref) { + final urlController = TextEditingController(); + final nameController = TextEditingController(); + + showCupertinoDialog( + context: context, + builder: (ctx) { + final dialogExt = AppTheme.ext(ctx); + return CupertinoAlertDialog( + title: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(CupertinoIcons.link, size: 18, color: dialogExt.accent), + const SizedBox(width: 6), + const Text('从URL下载字体'), + ], + ), + content: Padding( + padding: const EdgeInsets.only(top: 12), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + CupertinoTextField( + controller: urlController, + placeholder: '字体文件URL (.ttf/.otf)', + placeholderStyle: AppTypography.subhead.copyWith( + color: dialogExt.textHint, + ), + style: AppTypography.subhead.copyWith( + color: dialogExt.textPrimary, + ), + clearButtonMode: OverlayVisibilityMode.editing, + keyboardType: TextInputType.url, + padding: const EdgeInsets.all(12), + ), + const SizedBox(height: 8), + CupertinoTextField( + controller: nameController, + placeholder: '字体名称 (可选)', + placeholderStyle: AppTypography.subhead.copyWith( + color: dialogExt.textHint, + ), + style: AppTypography.subhead.copyWith( + color: dialogExt.textPrimary, + ), + clearButtonMode: OverlayVisibilityMode.editing, + padding: const EdgeInsets.all(12), + ), + ], + ), + ), + actions: [ + CupertinoDialogAction( + isDestructiveAction: true, + child: const Text('取消'), + onPressed: () => Navigator.pop(ctx), + ), + CupertinoDialogAction( + isDefaultAction: true, + child: const Text('下载'), + onPressed: () { + final url = urlController.text.trim(); + if (url.isEmpty) { + AppToast.showWarning('请输入字体URL'); + return; + } + if (!url.startsWith('http')) { + AppToast.showWarning('请输入有效的URL'); + return; + } + Navigator.pop(ctx); + ref + .read(fontManagementProvider.notifier) + .downloadFontFromUrl(url, name: nameController.text.trim()); + }, + ), + ], + ); + }, + ); + } +} + +/// 当前字体卡片 +class FontActiveCard extends ConsumerWidget { + const FontActiveCard({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final ext = AppTheme.ext(context); + final state = ref.watch(fontManagementProvider); + final activeFont = state.fonts.firstWhere( + (f) => f.fontFamily == state.activeFontFamily, + orElse: () => state.fonts.isNotEmpty + ? state.fonts.first + : const FontInfo(name: '系统默认', fontFamily: 'Inter', path: ''), + ); + + return GlassContainer( + depth: GlassDepth.elevated, + padding: const EdgeInsets.all(AppSpacing.md), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon(CupertinoIcons.sparkles, size: 16, color: ext.textSecondary), + const SizedBox(width: AppSpacing.xs), + Text( + '当前字体', + style: AppTypography.subhead.copyWith( + color: ext.textSecondary, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: AppSpacing.sm), + Container( + width: double.infinity, + padding: const EdgeInsets.all(AppSpacing.md), + decoration: BoxDecoration( + color: ext.accent.withValues(alpha: 0.08), + borderRadius: AppRadius.lgBorder, + border: Border.all( + color: ext.accent.withValues(alpha: 0.3), + width: 1.5, + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Heroine( + tag: 'font-preview-${state.activeFontFamily}', + child: Text( + activeFont.name, + style: AppTypography.headline.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w700, + ), + ), + ), + const SizedBox(height: AppSpacing.xs), + Text( + '闲言 AaBbCc 你好世界 0123456789', + style: TextStyle( + fontSize: 16, + fontFamily: activeFont.fontFamily, + color: ext.textSecondary, + ), + ), + const SizedBox(height: AppSpacing.xs), + Text( + 'The quick brown fox jumps over the lazy dog.', + style: TextStyle( + fontSize: 13, + fontFamily: activeFont.fontFamily, + color: ext.textHint, + ), + ), + ], + ), + ), + ], + ), + ); + } +} + +/// 已安装字体列表区 +class FontLocalSection extends ConsumerWidget { + const FontLocalSection({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final ext = AppTheme.ext(context); + final state = ref.watch(fontManagementProvider); + + return GlassContainer( + depth: GlassDepth.elevated, + padding: const EdgeInsets.all(AppSpacing.md), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + const Text('📱', style: TextStyle(fontSize: 16)), + const SizedBox(width: AppSpacing.xs), + Text( + '已安装字体', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + const Spacer(), + Text( + '${state.filteredFonts.length}', + style: AppTypography.caption1.copyWith(color: ext.textHint), + ), + ], + ), + const SizedBox(height: AppSpacing.sm), + if (state.isLoading) + SkeletonBox( + child: Column( + children: List.generate( + 4, + (_) => const Padding( + padding: EdgeInsets.symmetric(vertical: AppSpacing.xs), + child: ListItemSkeleton(), + ), + ), + ), + ) + else if (state.filteredFonts.isEmpty) + Center( + child: Padding( + padding: const EdgeInsets.all(AppSpacing.lg), + child: Text( + state.searchQuery.isNotEmpty ? '未找到匹配的字体' : '暂无字体，点击上方导入或下载', + style: AppTypography.caption1.copyWith(color: ext.textHint), + ), + ), + ) + else + ...state.filteredFonts.asMap().entries.map((entry) { + final index = entry.key; + final font = entry.value; + return AppSlidable( + slideKey: ValueKey(font.fontFamily), + groupTag: 'font_items', + leftActions: [ + SlideActionConfig( + type: SlideActionType.custom, + label: '对比', + icon: CupertinoIcons.square_split_2x1, + backgroundColor: ext.accent.withValues(alpha: 0.85), + onPressed: () => + _showCompareFromLocal(context, ref, font), + ), + ], + rightActions: [ + SlideActionConfig( + type: SlideActionType.favorite, + onPressed: () => ref + .read(fontManagementProvider.notifier) + .toggleFavorite(font.fontFamily), + ), + if (!font.isBuiltIn) + SlideActionConfig( + type: SlideActionType.delete, + onPressed: () async { + final confirmed = + await AppSlidableDeleteConfirm.show( + context, + title: '删除 ${font.name}', + ); + if (confirmed) { + ref + .read(fontManagementProvider.notifier) + .deleteFont(font.fontFamily, font.path); + } + }, + ), + ], + child: FontItemWidget( + font: font, + isActive: font.fontFamily == state.activeFontFamily, + onActivate: () => ref + .read(fontManagementProvider.notifier) + .setActiveFont(font.fontFamily), + ), + ) + .animate() + .fadeIn(duration: 300.ms, delay: (index * 50).ms) + .slideY(begin: 0.1, end: 0, curve: Curves.easeOutCubic); + }), + ], + ), + ); + } + + /// 从本地字体列表左滑对比，弹出选择第二个字体的对话框 + void _showCompareFromLocal( + BuildContext context, + WidgetRef ref, + FontInfo sourceFont, + ) { + final state = ref.read(fontManagementProvider); + showCupertinoDialog( + context: context, + builder: (ctx) { + final dialogExt = AppTheme.ext(ctx); + return CupertinoAlertDialog( + title: const Text('🔀 选择对比字体'), + content: Padding( + padding: const EdgeInsets.only(top: 12), + child: SizedBox( + width: double.minPositive, + child: Column( + mainAxisSize: MainAxisSize.min, + children: state.fonts + .where((f) => f.fontFamily != sourceFont.fontFamily) + .map( + (f) => CupertinoButton( + padding: const EdgeInsets.symmetric(vertical: 4), + child: Text( + f.name, + style: TextStyle( + fontFamily: f.fontFamily, + color: dialogExt.textPrimary, + ), + ), + onPressed: () { + Navigator.pop(ctx); + Navigator.of(context).push( + CupertinoPageRoute( + builder: (_) => FontComparisonPage( + fontA: sourceFont, + fontB: f, + ), + ), + ); + }, + ), + ) + .toList(), + ), + ), + ), + actions: [ + CupertinoDialogAction( + child: const Text('取消'), + onPressed: () => Navigator.pop(ctx), + ), + ], + ); + }, + ); + } +} + +/// 单个字体项组件 +class FontItemWidget extends StatelessWidget { + const FontItemWidget({ + super.key, + required this.font, + required this.isActive, + this.onActivate, + }); + + final FontInfo font; + final bool isActive; + final VoidCallback? onActivate; + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + return Padding( + padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs), + child: GestureDetector( + onTap: () => FontPreviewSheet.show(context, font), + onLongPress: onActivate, + child: Container( + padding: const EdgeInsets.all(AppSpacing.sm), + decoration: BoxDecoration( + color: isActive + ? ext.accent.withValues(alpha: 0.1) + : ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + border: isActive ? Border.all(color: ext.accent, width: 1.5) : null, + ), + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + font.name, + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + if (font.isFavorite) ...[ + const SizedBox(width: 4), + const Text('❤️', style: TextStyle(fontSize: 12)), + ], + if (font.isBuiltIn) ...[ + const SizedBox(width: 4), + Container( + padding: const EdgeInsets.symmetric( + horizontal: 4, + vertical: 1, + ), + decoration: BoxDecoration( + color: ext.accent.withValues(alpha: 0.15), + borderRadius: AppRadius.smBorder, + ), + child: Text( + '内置', + style: AppTypography.caption2.copyWith( + color: ext.accent, + fontSize: 9, + ), + ), + ), + ], + if (font.isDownloaded && !font.isBuiltIn) ...[ + const SizedBox(width: 4), + Container( + padding: const EdgeInsets.symmetric( + horizontal: 4, + vertical: 1, + ), + decoration: BoxDecoration( + color: ext.successColor.withValues(alpha: 0.15), + borderRadius: AppRadius.smBorder, + ), + child: Text( + '已下载', + style: AppTypography.caption2.copyWith( + color: ext.successColor, + fontSize: 9, + ), + ), + ), + ], + ], + ), + const SizedBox(height: 2), + Text( + font.previewText, + style: TextStyle( + fontSize: 13, + fontFamily: font.fontFamily, + color: ext.textSecondary, + ), + ), + if (font.fileSize != null) ...[ + const SizedBox(height: 1), + Text( + formatFileSize(font.fileSize!), + style: AppTypography.caption2.copyWith( + color: ext.textHint, + ), + ), + ], + ], + ), + ), + if (isActive) + Icon( + CupertinoIcons.checkmark_circle_fill, + size: 20, + color: ext.accent, + ), + ], + ), + ), + ), + ); + } +} + +/// 在线字体区 +class FontOnlineSection extends ConsumerWidget { + const FontOnlineSection({super.key, this.sectionKey}); + + final GlobalKey? sectionKey; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final ext = AppTheme.ext(context); + final state = ref.watch(fontManagementProvider); + + return Container( + key: sectionKey, + child: GlassContainer( + depth: GlassDepth.elevated, + padding: const EdgeInsets.all(AppSpacing.md), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + const Text('☁️', style: TextStyle(fontSize: 16)), + const SizedBox(width: AppSpacing.xs), + Text( + '在线字体', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + const Spacer(), + Text( + '${state.onlineFonts.where((f) => f.isDownloaded).length}/${state.onlineFonts.length}', + style: AppTypography.caption1.copyWith(color: ext.textHint), + ), + ], + ), + const SizedBox(height: AppSpacing.xs), + Text( + '点击下载并安装到本地，安装后可在上方切换使用', + style: AppTypography.caption1.copyWith(color: ext.textSecondary), + ), + const SizedBox(height: AppSpacing.sm), + GestureDetector( + onTap: () => _showGoogleFontsSearch(context, ref), + child: GlassContainer( + depth: GlassDepth.elevated, + padding: const EdgeInsets.all(AppSpacing.md), + child: Row( + children: [ + Icon(CupertinoIcons.globe, size: 24, color: ext.accent), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Google Fonts', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + Text( + '1500+ 在线字体', + style: AppTypography.caption1.copyWith( + color: ext.textHint, + ), + ), + ], + ), + ), + Icon( + CupertinoIcons.chevron_right, + size: 16, + color: ext.textHint, + ), + ], + ), + ), + ), + const SizedBox(height: AppSpacing.sm), + ...state.filteredOnlineFonts.asMap().entries.map( + (entry) => + FontOnlineItemWidget(font: entry.value, index: entry.key) + .animate() + .fadeIn(duration: 300.ms, delay: (entry.key * 50).ms) + .slideY(begin: 0.1, end: 0, curve: Curves.easeOutCubic), + ), + ], + ), + ), + ); + } + + /// 显示Google Fonts搜索对话框 + void _showGoogleFontsSearch(BuildContext context, WidgetRef ref) { + final controller = TextEditingController(); + showCupertinoDialog( + context: context, + builder: (ctx) => CupertinoAlertDialog( + title: const Text('Google Fonts'), + content: Column( + children: [ + const SizedBox(height: AppSpacing.sm), + CupertinoTextField( + controller: controller, + placeholder: '输入字体名称', + autofocus: true, + ), + ], + ), + actions: [ + CupertinoDialogAction( + child: const Text('取消'), + onPressed: () => Navigator.pop(ctx), + ), + CupertinoDialogAction( + isDefaultAction: true, + child: const Text('加载'), + onPressed: () { + Navigator.pop(ctx); + if (controller.text.isNotEmpty) { + ref + .read(fontManagementProvider.notifier) + .loadGoogleFont(controller.text.trim()); + } + }, + ), + ], + ), + ); + } +} + +/// 在线字体项组件 +class FontOnlineItemWidget extends ConsumerWidget { + const FontOnlineItemWidget({ + super.key, + required this.font, + required this.index, + }); + + final FontInfo font; + final int index; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final ext = AppTheme.ext(context); + final isInstalled = font.isDownloaded; + final isDownloading = font.isDownloading; + + return Padding( + padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs), + child: Container( + padding: const EdgeInsets.all(AppSpacing.sm), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.mdBorder, + ), + child: Column( + children: [ + Row( + children: [ + Container( + width: 36, + height: 36, + decoration: BoxDecoration( + color: ext.accent.withValues(alpha: 0.1), + borderRadius: AppRadius.smBorder, + ), + child: Center( + child: Text( + font.iconEmoji, + style: const TextStyle(fontSize: 18), + ), + ), + ), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + font.name, + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + Text( + font.fontFamily, + style: AppTypography.caption2.copyWith( + color: ext.textHint, + ), + ), + ], + ), + ), + GestureDetector( + onTap: () => FontPreviewSheet.show(context, font), + child: Padding( + padding: const EdgeInsets.all(4), + child: Icon( + CupertinoIcons.textformat_size, + size: 18, + color: ext.textHint, + ), + ), + ), + if (isInstalled) + Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.sm, + vertical: 2, + ), + decoration: BoxDecoration( + color: ext.successColor.withValues(alpha: 0.15), + borderRadius: AppRadius.smBorder, + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + CupertinoIcons.checkmark_circle, + size: 12, + color: ext.successColor, + ), + const SizedBox(width: 2), + Text( + '已安装', + style: AppTypography.caption2.copyWith( + color: ext.successColor, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ) + else + CupertinoButton( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.sm, + ), + color: ext.accent.withValues(alpha: 0.15), + borderRadius: AppRadius.mdBorder, + onPressed: isDownloading + ? null + : () { + if (font.hasDownloadError && !isInstalled) { + ref + .read(fontManagementProvider.notifier) + .retryDownload(index); + } else { + ref + .read(fontManagementProvider.notifier) + .downloadFont(index); + } + }, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + font.hasDownloadError && !isInstalled + ? CupertinoIcons.arrow_clockwise + : CupertinoIcons.cloud_download, + size: 14, + color: ext.accent, + ), + const SizedBox(width: 4), + Text( + font.hasDownloadError && !isInstalled ? '重试' : '下载', + style: AppTypography.caption1.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ], + ), + if (isDownloading && !isInstalled) ...[ + const SizedBox(height: AppSpacing.xs), + Row( + children: [ + SizedBox( + width: 28, + height: 28, + child: Stack( + alignment: Alignment.center, + children: [ + CircularProgressIndicator( + value: font.downloadProgress, + strokeWidth: 3, + backgroundColor: ext.textHint.withValues(alpha: 0.1), + valueColor: AlwaysStoppedAnimation(ext.accent), + ), + Text( + '${(font.downloadProgress * 100).round()}', + style: AppTypography.caption2.copyWith( + color: ext.accent, + fontSize: 8, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + const SizedBox(width: AppSpacing.xs), + Text( + '下载中...', + style: AppTypography.caption2.copyWith(color: ext.textHint), + ), + ], + ), + ], + ], + ), + ), + ); + } +} + +/// 字体小贴士区 +class FontTipsSection extends StatelessWidget { + const FontTipsSection({super.key}); + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + return GlassContainer( + depth: GlassDepth.elevated, + padding: const EdgeInsets.all(AppSpacing.md), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Icon(CupertinoIcons.lightbulb, size: 16, color: ext.textPrimary), + const SizedBox(width: AppSpacing.xs), + Text( + '字体小贴士', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: AppSpacing.sm), + _tipItem(CupertinoIcons.doc_text, '支持 .ttf 和 .otf 格式字体文件', ext), + _tipItem(CupertinoIcons.cloud_download, '在线字体下载后自动安装并加载', ext), + _tipItem(CupertinoIcons.arrow_2_circlepath, '切换字体后全局立即生效', ext), + _tipItem(CupertinoIcons.folder_fill, '字体文件存储在应用文档目录，卸载后清除', ext), + _tipItem( + CupertinoIcons.exclamationmark_triangle, + '部分在线字体链接可能需要科学上网', + ext, + ), + ], + ), + ); + } + + Widget _tipItem(IconData icon, String text, AppThemeExtension ext) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 2), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon(icon, size: 13, color: ext.textSecondary), + const SizedBox(width: AppSpacing.xs), + Expanded( + child: Text( + text, + style: AppTypography.caption1.copyWith(color: ext.textSecondary), + ), + ), + ], + ), + ); + } +} diff --git a/lib/features/settings/presentation/general/general_settings_page.dart b/lib/features/settings/presentation/general/general_settings_page.dart index 37b947d0..191189c7 100644 --- a/lib/features/settings/presentation/general/general_settings_page.dart +++ b/lib/features/settings/presentation/general/general_settings_page.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 通用设置页面 /// 创建时间: 2026-04-28 -/// 更新时间: 2026-05-19 +/// 更新时间: 2026-05-20 /// 作用: 声音/震动/通知/显示/性能/隐私/高级等设置 -/// 上次更新: 拆分为多文件结构(模型/分组/选择器/操作/主页面) +/// 上次更新: 新增每日提醒/特效背景开关逻辑 /// ============================================================ import 'package:flutter/cupertino.dart'; @@ -13,6 +13,8 @@ import 'package:package_info_plus/package_info_plus.dart'; import '../../../../core/router/app_router.dart'; import '../../../../core/services/device/haptic_service.dart'; +import '../../../../core/services/device/shake_detector.dart'; +import '../../../../core/services/notification/daily_notify_service.dart'; import '../../../../core/theme/app_theme.dart'; import '../../../../core/theme/app_spacing.dart'; import '../../../../core/theme/app_typography.dart'; @@ -462,6 +464,31 @@ class _GeneralSettingsPageState extends ConsumerState notifier.setLongPressPreviewEnabled(value); case 'app_lock': notifier.setAppLockEnabled(value); + case 'sfx': + notifier.setSfxEnabled(value); + case 'shake_to_switch': + notifier.setShakeToSwitch(value); + if (value) { + ShakeDetector.instance.start(); + } else { + ShakeDetector.instance.stop(); + } + case 'daily_notification': + notifier.setDailyNotification(value); + if (value) { + DailyNotifyService.instance.scheduleDailyNotification( + hour: ref.read(generalSettingsProvider).notifyTimeHour, + minute: ref.read(generalSettingsProvider).notifyTimeMinute, + title: '拾光为你选了一句', + body: '打开看看今天的句子吧 ✨', + ); + } else { + DailyNotifyService.instance.cancelAll(); + } + case 'shader_background': + notifier.setShaderBackground(value); + case 'nearby_discovery': + notifier.setNearbyDiscovery(value); } } @@ -477,7 +504,7 @@ class _GeneralSettingsPageState extends ConsumerState case 'screen_timeout': showScreenTimeoutPicker(); case 'language': - context.appPush('/settings/language'); + context.appPush(AppRoutes.languageSettings); case 'startup_page': showStartupPagePicker(); case 'page_transition_mode': @@ -488,6 +515,12 @@ class _GeneralSettingsPageState extends ConsumerState showCacheStrategyPicker(); case 'image_quality': showImageQualityPicker(); + case 'sfx_style': + showSfxStylePicker(); + case 'screen_always_on': + showScreenAlwaysOnPicker(); + case 'notify_time': + showNotifyTimePicker(); } } diff --git a/lib/features/settings/presentation/general/general_settings_pickers.dart b/lib/features/settings/presentation/general/general_settings_pickers.dart index cfb7e294..7dbb2c19 100644 --- a/lib/features/settings/presentation/general/general_settings_pickers.dart +++ b/lib/features/settings/presentation/general/general_settings_pickers.dart @@ -1,16 +1,18 @@ /// ============================================================ /// 闲言APP — 通用设置选择器弹窗 /// 创建时间: 2026-05-19 -/// 更新时间: 2026-05-19 +/// 更新时间: 2026-05-20 /// 作用: 提供各种设置项的 CupertinoPicker 弹窗 -/// 上次更新: 从 general_settings_page.dart 拆分出选择器逻辑 +/// 上次更新: 新增通知时间选择器 /// ============================================================ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart' show Divider; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import '../../../../core/services/audio/sfx_service.dart'; import '../../../../core/services/device/haptic_service.dart'; +import '../../../../core/services/notification/daily_notify_service.dart'; import '../../../../core/theme/app_spacing.dart'; import '../../../../core/theme/app_typography.dart'; import '../../../../core/theme/app_radius.dart'; @@ -647,4 +649,200 @@ mixin GeneralSettingsPickers on ConsumerState { ), ); } + + // ── 音效类型选择器 ── + + void showSfxStylePicker() { + final settings = ref.read(generalSettingsProvider); + final ext = AppTheme.ext(context); + + showCupertinoModalPopup( + context: context, + builder: (ctx) => Container( + height: 260, + decoration: BoxDecoration( + color: ext.bgElevated, + borderRadius: const BorderRadius.vertical(top: Radius.circular(14)), + ), + child: Column( + children: [ + Padding( + padding: const EdgeInsets.all(AppSpacing.md), + child: Text( + '🎵 音效类型', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + ), + const Divider(height: 1), + Expanded( + child: CupertinoPicker( + itemExtent: 40, + scrollController: FixedExtentScrollController( + initialItem: settings.sfxStyleIndex.clamp( + 0, + SfxStyle.values.length - 1, + ), + ), + onSelectedItemChanged: (index) { + ref.read(generalSettingsProvider.notifier).setSfxStyle(index); + HapticService.impact(); + }, + children: SfxStyle.values.map((style) { + return Center( + child: Text( + style.label, + style: AppTypography.body.copyWith( + color: ext.textPrimary, + ), + ), + ); + }).toList(), + ), + ), + ], + ), + ), + ); + } + + // ── 屏幕常亮选择器 ── + + void showScreenAlwaysOnPicker() { + final settings = ref.read(generalSettingsProvider); + final ext = AppTheme.ext(context); + const options = ['关闭', '阅读时', '始终']; + + showCupertinoModalPopup( + context: context, + builder: (ctx) => Container( + height: 260, + decoration: BoxDecoration( + color: ext.bgElevated, + borderRadius: const BorderRadius.vertical(top: Radius.circular(14)), + ), + child: Column( + children: [ + Padding( + padding: const EdgeInsets.all(AppSpacing.md), + child: Text( + '💡 屏幕常亮', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + ), + const Divider(height: 1), + Expanded( + child: CupertinoPicker( + itemExtent: 40, + scrollController: FixedExtentScrollController( + initialItem: settings.screenAlwaysOn.clamp(0, 2), + ), + onSelectedItemChanged: (index) { + ref + .read(generalSettingsProvider.notifier) + .setScreenAlwaysOn(index); + HapticService.impact(); + }, + children: options.map((label) { + return Center( + child: Text( + label, + style: AppTypography.body.copyWith( + color: ext.textPrimary, + ), + ), + ); + }).toList(), + ), + ), + ], + ), + ), + ); + } + + static const _notifyTimeOptions = [ + (6, 0, '06:00'), + (7, 0, '07:00'), + (8, 0, '08:00'), + (9, 0, '09:00'), + (10, 0, '10:00'), + (12, 0, '12:00'), + (18, 0, '18:00'), + (20, 0, '20:00'), + (22, 0, '22:00'), + ]; + + void showNotifyTimePicker() { + final settings = ref.read(generalSettingsProvider); + final ext = AppTheme.ext(context); + final currentIndex = _notifyTimeOptions.indexWhere( + (e) => + e.$1 == settings.notifyTimeHour && e.$2 == settings.notifyTimeMinute, + ); + + showCupertinoModalPopup( + context: context, + builder: (ctx) => Container( + height: 260, + decoration: BoxDecoration( + color: ext.bgElevated, + borderRadius: const BorderRadius.vertical(top: Radius.circular(14)), + ), + child: Column( + children: [ + Padding( + padding: const EdgeInsets.all(AppSpacing.md), + child: Text( + '⏰ 提醒时间', + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + fontWeight: FontWeight.w600, + ), + ), + ), + const Divider(height: 1), + Expanded( + child: CupertinoPicker( + itemExtent: 40, + scrollController: FixedExtentScrollController( + initialItem: currentIndex >= 0 ? currentIndex : 2, + ), + onSelectedItemChanged: (index) { + final selected = _notifyTimeOptions[index]; + final notifier = ref.read(generalSettingsProvider.notifier); + notifier.setNotifyTimeHour(selected.$1); + notifier.setNotifyTimeMinute(selected.$2); + if (settings.dailyNotification) { + DailyNotifyService.instance.scheduleDailyNotification( + hour: selected.$1, + minute: selected.$2, + title: '拾光为你选了一句', + body: '打开看看今天的句子吧 ✨', + ); + } + HapticService.impact(); + }, + children: _notifyTimeOptions.map((opt) { + return Center( + child: Text( + opt.$3, + style: AppTypography.body.copyWith( + color: ext.textPrimary, + ), + ), + ); + }).toList(), + ), + ), + ], + ), + ), + ); + } } diff --git a/lib/features/settings/presentation/general/general_settings_sections.dart b/lib/features/settings/presentation/general/general_settings_sections.dart index 15176c37..d3dc6cfe 100644 --- a/lib/features/settings/presentation/general/general_settings_sections.dart +++ b/lib/features/settings/presentation/general/general_settings_sections.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 通用设置分组定义 /// 创建时间: 2026-05-19 -/// 更新时间: 2026-05-19 +/// 更新时间: 2026-05-20 /// 作用: 构建通用设置页面的所有分组和设置项数据 -/// 上次更新: 从 general_settings_page.dart 拆分出分组定义逻辑 +/// 上次更新: 新增每日提醒/提醒时间/特效背景设置项 /// ============================================================ import 'package:flutter/cupertino.dart'; @@ -55,6 +55,25 @@ List buildGeneralSettingSections({ type: SettingType.selection, displayValue: settings.soundEffectType.label, ), + SettingItem( + id: 'sfx', + icon: CupertinoIcons.speaker_2_fill, + iconColor: const Color(0xFF34C759), + title: '🔊 音效反馈', + subtitle: '操作时播放音效', + type: SettingType.toggle, + value: settings.sfxEnabled, + ), + if (settings.sfxEnabled) + SettingItem( + id: 'sfx_style', + icon: CupertinoIcons.music_note, + iconColor: const Color(0xFFFF9500), + title: '🎵 音效类型', + subtitle: '选择音效风格', + type: SettingType.selection, + displayValue: settings.sfxStyle.label, + ), SettingItem( id: 'page_transition_mode', icon: CupertinoIcons.chevron_left_2, @@ -85,6 +104,15 @@ List buildGeneralSettingSections({ type: SettingType.toggle, value: settings.longPressPreviewEnabled, ), + SettingItem( + id: 'shake_to_switch', + icon: CupertinoIcons.device_phone_portrait, + iconColor: const Color(0xFF5856D6), + title: '🤝 摇一摇换句', + subtitle: '摇晃手机切换每日推荐', + type: SettingType.toggle, + value: settings.shakeToSwitch, + ), ], ), @@ -103,6 +131,26 @@ List buildGeneralSettingSections({ type: SettingType.navigation, displayValue: notificationEnabled ? t.enabled : t.disabled, ), + SettingItem( + id: 'daily_notification', + icon: CupertinoIcons.bell_circle_fill, + iconColor: const Color(0xFFFF9500), + title: '🔔 每日提醒', + subtitle: '每天定时推送一句好句', + type: SettingType.toggle, + value: settings.dailyNotification, + ), + if (settings.dailyNotification) + SettingItem( + id: 'notify_time', + icon: CupertinoIcons.clock_fill, + iconColor: const Color(0xFF5856D6), + title: '⏰ 提醒时间', + subtitle: '选择每日提醒的时间', + type: SettingType.selection, + displayValue: + '${settings.notifyTimeHour.toString().padLeft(2, '0')}:${settings.notifyTimeMinute.toString().padLeft(2, '0')}', + ), ], ), @@ -121,6 +169,15 @@ List buildGeneralSettingSections({ type: SettingType.selection, displayValue: settings.screenTimeout.label, ), + SettingItem( + id: 'screen_always_on', + icon: CupertinoIcons.sun_max_fill, + iconColor: const Color(0xFFFFCC00), + title: '💡 屏幕常亮', + subtitle: '控制屏幕是否保持常亮', + type: SettingType.selection, + displayValue: ['关闭', '阅读时', '始终'][settings.screenAlwaysOn.clamp(0, 2)], + ), SettingItem( id: 'font_scale', icon: CupertinoIcons.textformat_size, @@ -165,6 +222,15 @@ List buildGeneralSettingSections({ type: SettingType.toggle, value: settings.reduceAnimations, ), + SettingItem( + id: 'shader_background', + icon: CupertinoIcons.sparkles, + iconColor: const Color(0xFFAF52DE), + title: '✨ 特效背景', + subtitle: '句子卡片流体渐变特效', + type: SettingType.toggle, + value: settings.shaderBackground, + ), SettingItem( id: 'language', icon: CupertinoIcons.globe, @@ -258,6 +324,15 @@ List buildGeneralSettingSections({ type: SettingType.toggle, value: settings.clipboardReadEnabled, ), + SettingItem( + id: 'nearby_discovery', + icon: CupertinoIcons.antenna_radiowaves_left_right, + iconColor: const Color(0xFF34C759), + title: '📡 近场发现', + subtitle: '允许被附近用户发现', + type: SettingType.toggle, + value: settings.nearbyDiscovery, + ), SettingItem( id: 'permission', icon: CupertinoIcons.lock_shield_fill, diff --git a/lib/features/settings/presentation/theme/theme_sections_basic.dart b/lib/features/settings/presentation/theme/theme_sections_basic.dart index 1b78c559..e53c095a 100644 --- a/lib/features/settings/presentation/theme/theme_sections_basic.dart +++ b/lib/features/settings/presentation/theme/theme_sections_basic.dart @@ -16,7 +16,8 @@ import '../../../../core/theme/app_theme.dart'; import '../../../../core/theme/app_typography.dart'; import '../../../../shared/widgets/glass_container.dart'; import '../../providers/theme_settings_provider.dart'; -import '../font_management_page.dart'; +import '../font_management_notifier.dart'; +import '../font_models.dart'; import 'theme_shared_widgets.dart'; // ── 主题预设 ── diff --git a/lib/features/settings/providers/date_display_provider.dart b/lib/features/settings/providers/date_display_provider.dart new file mode 100644 index 00000000..56be38aa --- /dev/null +++ b/lib/features/settings/providers/date_display_provider.dart @@ -0,0 +1,148 @@ +// ============================================================ +// 闲言APP — 拾光栏显示配置 Provider +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 管理AppBar拾光栏的显示项配置、自定义文案、轮播开关 +// 上次更新: 初始版本 +// ============================================================ + +import 'dart:convert'; + +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:xianyan/core/storage/app_kv_store.dart'; +import 'package:xianyan/core/utils/logger.dart'; + +// ============================================================ +// 拾光栏显示项 Key 常量 +// ============================================================ + +class DateDisplayItemKey { + DateDisplayItemKey._(); + + static const String date = 'date'; + static const String weather = 'weather'; + static const String temp = 'temp'; + static const String city = 'city'; + static const String device = 'device'; + static const String battery = 'battery'; + static const String ip = 'ip'; + static const String custom = 'custom'; +} + +// ============================================================ +// 拾光栏显示配置数据模型 +// ============================================================ + +class DateDisplayConfig { + const DateDisplayConfig({ + required this.enabledItems, + required this.customText, + required this.marqueeEnabled, + }); + + final List enabledItems; + final String customText; + final bool marqueeEnabled; + + factory DateDisplayConfig.defaultConfig() => const DateDisplayConfig( + enabledItems: [DateDisplayItemKey.date], + customText: '', + marqueeEnabled: true, + ); + + factory DateDisplayConfig.fromJson(Map json) { + return DateDisplayConfig( + enabledItems: + (json['enabledItems'] as List?) + ?.map((e) => e.toString()) + .toList() ?? + [DateDisplayItemKey.date], + customText: (json['customText'] as String?) ?? '', + marqueeEnabled: (json['marqueeEnabled'] as bool?) ?? true, + ); + } + + Map toJson() => { + 'enabledItems': enabledItems, + 'customText': customText, + 'marqueeEnabled': marqueeEnabled, + }; + + DateDisplayConfig copyWith({ + List? enabledItems, + String? customText, + bool? marqueeEnabled, + }) { + return DateDisplayConfig( + enabledItems: enabledItems ?? this.enabledItems, + customText: customText ?? this.customText, + marqueeEnabled: marqueeEnabled ?? this.marqueeEnabled, + ); + } +} + +// ============================================================ +// 拾光栏显示配置 Notifier +// ============================================================ + +class DateDisplayNotifier extends Notifier { + static const String _kvKey = 'date_display_config'; + + @override + DateDisplayConfig build() { + try { + final raw = AppKVStore.getString(_kvKey); + if (raw != null && raw.isNotEmpty) { + final json = jsonDecode(raw) as Map; + return DateDisplayConfig.fromJson(json); + } + } catch (e) { + Log.w('DateDisplay: 配置读取失败，使用默认值 $e'); + } + return DateDisplayConfig.defaultConfig(); + } + + void toggleItem(String key) { + final items = List.from(state.enabledItems); + if (items.contains(key)) { + items.remove(key); + } else { + if (items.length >= 3) { + Log.w('DateDisplay: 最多启用3项，拒绝添加 $key'); + return; + } + items.add(key); + } + state = state.copyWith(enabledItems: items); + save(); + } + + void setCustomText(String text) { + final truncated = text.length > 14 ? text.substring(0, 14) : text; + state = state.copyWith(customText: truncated); + save(); + } + + void setMarqueeEnabled(bool enabled) { + state = state.copyWith(marqueeEnabled: enabled); + save(); + } + + void save() { + try { + AppKVStore.setString(_kvKey, jsonEncode(state.toJson())); + Log.d('DateDisplay: 配置已保存'); + } catch (e) { + Log.e('DateDisplay: 配置保存失败 $e'); + } + } +} + +// ============================================================ +// Provider +// ============================================================ + +final dateDisplayProvider = + NotifierProvider( + DateDisplayNotifier.new, + ); diff --git a/lib/features/settings/providers/general_settings_provider.dart b/lib/features/settings/providers/general_settings_provider.dart index cba9bf3d..c78fdfcc 100644 --- a/lib/features/settings/providers/general_settings_provider.dart +++ b/lib/features/settings/providers/general_settings_provider.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 通用设置状态管理 /// 创建时间: 2026-04-28 -/// 更新时间: 2026-05-18 +/// 更新时间: 2026-05-20 /// 作用: 管理声音/震动/通知/显示/性能/隐私/高级等通用设置 -/// 上次更新: 拆分为子状态类，GeneralSettingsState 作为组合门面保持向后兼容 +/// 上次更新: 新增 dailyNotification/notifyTimeHour/notifyTimeMinute/shaderBackground getter/setter /// ============================================================ import 'dart:io'; @@ -11,13 +11,16 @@ import 'dart:io'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:path_provider/path_provider.dart'; +import '../../../core/services/audio/sfx_service.dart'; import '../../../core/services/device/haptic_service.dart'; import '../../../core/services/device/screen_wake_service.dart'; import '../../../core/services/sound_service.dart' as svc; import '../../../core/services/device/app_lock_service.dart'; import '../../../core/services/device/battery_optimization_service.dart'; import '../../../core/services/network/network_proxy_service.dart'; +import '../../../core/services/notification/daily_notify_service.dart'; import '../../../core/services/notification/notification_scheduler.dart'; +import '../../../core/storage/app_kv_store.dart'; import '../../../core/storage/kv_storage.dart'; import '../../../core/utils/logger.dart'; import 'sub/sound_settings_provider.dart'; @@ -289,6 +292,10 @@ class GeneralSettingsState { svc.SoundEffectType get soundEffectType => sound.soundEffectType; bool get vibrationEnabled => sound.vibrationEnabled; + bool get sfxEnabled => sound.sfxEnabled; + int get sfxStyleIndex => sound.sfxStyleIndex; + SfxStyle get sfxStyle => sound.sfxStyle; + String get screenTimeoutId => display.screenTimeoutId; bool get immersiveStatusBar => display.immersiveStatusBar; bool get reduceAnimations => display.reduceAnimations; @@ -302,6 +309,8 @@ class GeneralSettingsState { FontScaleOption get fontScale => display.fontScale; ColorWeakType get colorWeakType => display.colorWeakType; + int get screenAlwaysOn => display.screenAlwaysOn; + bool get proxyEnabled => network.proxyEnabled; String get proxyHost => network.proxyHost; int get proxyPort => network.proxyPort; @@ -312,6 +321,7 @@ class GeneralSettingsState { bool get appLockEnabled => privacy.appLockEnabled; bool get clipboardReadEnabled => privacy.clipboardReadEnabled; bool get searchHistoryEnabled => privacy.searchHistoryEnabled; + bool get nearbyDiscovery => privacy.nearbyDiscovery; bool get preloadEnabled => performance.preloadEnabled; bool get dataSaverMode => performance.dataSaverMode; @@ -339,6 +349,11 @@ class GeneralSettingsState { String get contentDensityId => general.contentDensityId; String get autoClearCacheId => general.autoClearCacheId; int get cacheSize => general.cacheSize; + bool get shakeToSwitch => general.shakeToSwitch; + bool get dailyNotification => general.dailyNotification; + int get notifyTimeHour => general.notifyTimeHour; + int get notifyTimeMinute => general.notifyTimeMinute; + bool get shaderBackground => general.shaderBackground; StartupPageOption get startupPage => general.startupPage; SearchEngineOption get searchEngine => general.searchEngine; PageTransitionMode get pageTransitionMode => general.pageTransitionMode; @@ -390,6 +405,8 @@ class GeneralSettingsNotifier extends Notifier { svc.SoundService.setEffectType( svc.SoundEffectType.fromId(s.soundEffectTypeId), ); + SfxService.instance.setEnabled(s.sfxEnabled); + SfxService.instance.setStyle(s.sfxStyle); } static const _keyPrefix = 'general_'; @@ -413,6 +430,20 @@ class GeneralSettingsNotifier extends Notifier { svc.SoundService.setEffectType(svc.SoundEffectType.fromId(id)); } + void setSfxEnabled(bool v) { + state = state.copyWith(sound: state.sound.copyWith(sfxEnabled: v)); + SfxService.instance.setEnabled(v); + AppKVStore.setBool('sfx_enabled', v); + } + + void setSfxStyle(int index) { + state = state.copyWith(sound: state.sound.copyWith(sfxStyleIndex: index)); + SfxService.instance.setStyle( + SfxStyle.values[index.clamp(0, SfxStyle.values.length - 1)], + ); + AppKVStore.setInt('sfx_style', index); + } + void setPageTransitionMode(String id) { state = state.copyWith( general: state.general.copyWith(pageTransitionModeId: id), @@ -607,6 +638,11 @@ class GeneralSettingsNotifier extends Notifier { KvStorage.setBool('${_keyPrefix}search_history', v); } + void setNearbyDiscovery(bool v) { + state = state.copyWith(privacy: state.privacy.copyWith(nearbyDiscovery: v)); + KvStorage.setBool('${_keyPrefix}nearby_discovery', v); + } + void setDeveloperModeEnabled(bool v) { state = state.copyWith( developer: state.developer.copyWith(developerModeEnabled: v), @@ -658,6 +694,70 @@ class GeneralSettingsNotifier extends Notifier { state = state.copyWith(general: state.general.copyWith(cacheSize: size)); } + void setShakeToSwitch(bool v) { + state = state.copyWith(general: state.general.copyWith(shakeToSwitch: v)); + KvStorage.setBool('${_keyPrefix}shake_to_switch', v); + } + + void setDailyNotification(bool v) { + state = state.copyWith( + general: state.general.copyWith(dailyNotification: v), + ); + KvStorage.setBool('${_keyPrefix}daily_notification', v); + if (v) { + DailyNotifyService.instance.scheduleDailyNotification( + hour: state.notifyTimeHour, + minute: state.notifyTimeMinute, + title: '闲言每日一句', + body: '今天的句子已准备好，来看看吧 ✨', + ); + } else { + DailyNotifyService.instance.cancelAll(); + } + } + + void setNotifyTimeHour(int v) { + state = state.copyWith(general: state.general.copyWith(notifyTimeHour: v)); + KvStorage.setInt('${_keyPrefix}notify_time_hour', v); + if (state.dailyNotification) { + DailyNotifyService.instance.scheduleDailyNotification( + hour: v, + minute: state.notifyTimeMinute, + title: '闲言每日一句', + body: '今天的句子已准备好，来看看吧 ✨', + ); + } + } + + void setNotifyTimeMinute(int v) { + state = state.copyWith( + general: state.general.copyWith(notifyTimeMinute: v), + ); + KvStorage.setInt('${_keyPrefix}notify_time_minute', v); + if (state.dailyNotification) { + DailyNotifyService.instance.scheduleDailyNotification( + hour: state.notifyTimeHour, + minute: v, + title: '闲言每日一句', + body: '今天的句子已准备好，来看看吧 ✨', + ); + } + } + + void setShaderBackground(bool v) { + state = state.copyWith( + general: state.general.copyWith(shaderBackground: v), + ); + KvStorage.setBool('${_keyPrefix}shader_background', v); + } + + void setScreenAlwaysOn(int mode) { + state = state.copyWith( + display: state.display.copyWith(screenAlwaysOn: mode), + ); + KvStorage.setInt('${_keyPrefix}screen_always_on', mode); + } + void reload() { state = GeneralSettingsState( sound: SoundSettingsState.fromStorage(), @@ -733,6 +833,8 @@ class GeneralSettingsNotifier extends Notifier { ScreenWakeService.setMode(ScreenTimeoutMode.system); svc.SoundService.setEnabled(true); svc.SoundService.setEffectType(svc.SoundEffectType.standard); + SfxService.instance.setEnabled(true); + SfxService.instance.setStyle(SfxStyle.standard); AppLockService.setEnabled(false); BatteryOptimizationService.setEnabled(false); NetworkProxyService.reset(); diff --git a/lib/features/settings/providers/sub/display_settings_provider.dart b/lib/features/settings/providers/sub/display_settings_provider.dart index 099db5b6..64e3c563 100644 --- a/lib/features/settings/providers/sub/display_settings_provider.dart +++ b/lib/features/settings/providers/sub/display_settings_provider.dart @@ -14,6 +14,7 @@ class DisplaySettingsState { this.highContrastEnabled = false, this.colorWeakTypeId = 'none', this.boldTextEnabled = false, + this.screenAlwaysOn = 0, }); final String screenTimeoutId; @@ -24,6 +25,7 @@ class DisplaySettingsState { final bool highContrastEnabled; final String colorWeakTypeId; final bool boldTextEnabled; + final int screenAlwaysOn; ScreenTimeoutOption get screenTimeout => screenTimeoutOptions.firstWhere( (o) => o.id == screenTimeoutId, @@ -48,6 +50,7 @@ class DisplaySettingsState { bool? highContrastEnabled, String? colorWeakTypeId, bool? boldTextEnabled, + int? screenAlwaysOn, }) { return DisplaySettingsState( screenTimeoutId: screenTimeoutId ?? this.screenTimeoutId, @@ -58,6 +61,7 @@ class DisplaySettingsState { highContrastEnabled: highContrastEnabled ?? this.highContrastEnabled, colorWeakTypeId: colorWeakTypeId ?? this.colorWeakTypeId, boldTextEnabled: boldTextEnabled ?? this.boldTextEnabled, + screenAlwaysOn: screenAlwaysOn ?? this.screenAlwaysOn, ); } @@ -77,6 +81,7 @@ class DisplaySettingsState { colorWeakTypeId: KvStorage.getString('${prefix}color_weak_type') ?? 'none', boldTextEnabled: KvStorage.getBool('${prefix}bold_text') ?? false, + screenAlwaysOn: KvStorage.getInt('${prefix}screen_always_on') ?? 0, ); } @@ -90,6 +95,7 @@ class DisplaySettingsState { KvStorage.setBool('${prefix}high_contrast', highContrastEnabled); KvStorage.setString('${prefix}color_weak_type', colorWeakTypeId); KvStorage.setBool('${prefix}bold_text', boldTextEnabled); + KvStorage.setInt('${prefix}screen_always_on', screenAlwaysOn); } } @@ -143,6 +149,11 @@ class DisplaySettingsNotifier extends Notifier { state = state.copyWith(boldTextEnabled: v); KvStorage.setBool('general_bold_text', v); } + + void setScreenAlwaysOn(int mode) { + state = state.copyWith(screenAlwaysOn: mode); + KvStorage.setInt('general_screen_always_on', mode); + } } final displaySettingsProvider = diff --git a/lib/features/settings/providers/sub/general_fields_provider.dart b/lib/features/settings/providers/sub/general_fields_provider.dart index bfea9f98..d44aa098 100644 --- a/lib/features/settings/providers/sub/general_fields_provider.dart +++ b/lib/features/settings/providers/sub/general_fields_provider.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 通用杂项设置状态管理 /// 创建时间: 2026-05-18 -/// 更新时间: 2026-05-18 -/// 作用: 管理同步/更新/语言/启动页/页面转场/预测返回/长按预览/搜索引擎/内容密度/自动清理/缓存等通用杂项设置 -/// 上次更新: 初始创建，从 GeneralSettingsNotifier 拆分 +/// 更新时间: 2026-05-20 +/// 作用: 管理同步/更新/语言/启动页/页面转场/预测返回/长按预览/搜索引擎/内容密度/自动清理/缓存/摇一摇/每日通知/特效背景等通用杂项设置 +/// 上次更新: 新增 dailyNotification/notifyTimeHour/notifyTimeMinute/shaderBackground 字段 /// ============================================================ import 'dart:io'; @@ -28,6 +28,11 @@ class GeneralFieldsState { this.contentDensityId = 'standard', this.autoClearCacheId = 'never', this.cacheSize = 0, + this.shakeToSwitch = false, + this.dailyNotification = false, + this.notifyTimeHour = 8, + this.notifyTimeMinute = 0, + this.shaderBackground = false, }); final bool syncEnabled; @@ -41,6 +46,11 @@ class GeneralFieldsState { final String contentDensityId; final String autoClearCacheId; final int cacheSize; + final bool shakeToSwitch; + final bool dailyNotification; + final int notifyTimeHour; + final int notifyTimeMinute; + final bool shaderBackground; StartupPageOption get startupPage => startupPageOptions.firstWhere( (o) => o.id == startupPageId, @@ -86,6 +96,11 @@ class GeneralFieldsState { String? contentDensityId, String? autoClearCacheId, int? cacheSize, + bool? shakeToSwitch, + bool? dailyNotification, + int? notifyTimeHour, + int? notifyTimeMinute, + bool? shaderBackground, }) { return GeneralFieldsState( syncEnabled: syncEnabled ?? this.syncEnabled, @@ -101,6 +116,11 @@ class GeneralFieldsState { contentDensityId: contentDensityId ?? this.contentDensityId, autoClearCacheId: autoClearCacheId ?? this.autoClearCacheId, cacheSize: cacheSize ?? this.cacheSize, + shakeToSwitch: shakeToSwitch ?? this.shakeToSwitch, + dailyNotification: dailyNotification ?? this.dailyNotification, + notifyTimeHour: notifyTimeHour ?? this.notifyTimeHour, + notifyTimeMinute: notifyTimeMinute ?? this.notifyTimeMinute, + shaderBackground: shaderBackground ?? this.shaderBackground, ); } @@ -134,6 +154,16 @@ class GeneralFieldsState { KvStorage.getString('${_keyPrefix}content_density') ?? 'standard', autoClearCacheId: KvStorage.getString('${_keyPrefix}auto_clear_cache') ?? 'never', + shakeToSwitch: + KvStorage.getBool('${_keyPrefix}shake_to_switch') ?? false, + dailyNotification: + KvStorage.getBool('${_keyPrefix}daily_notification') ?? false, + notifyTimeHour: + KvStorage.getInt('${_keyPrefix}notify_time_hour') ?? 8, + notifyTimeMinute: + KvStorage.getInt('${_keyPrefix}notify_time_minute') ?? 0, + shaderBackground: + KvStorage.getBool('${_keyPrefix}shader_background') ?? false, ); } @@ -154,6 +184,11 @@ class GeneralFieldsState { KvStorage.setString('${_keyPrefix}search_engine', searchEngineId); KvStorage.setString('${_keyPrefix}content_density', contentDensityId); KvStorage.setString('${_keyPrefix}auto_clear_cache', autoClearCacheId); + KvStorage.setBool('${_keyPrefix}shake_to_switch', shakeToSwitch); + KvStorage.setBool('${_keyPrefix}daily_notification', dailyNotification); + KvStorage.setInt('${_keyPrefix}notify_time_hour', notifyTimeHour); + KvStorage.setInt('${_keyPrefix}notify_time_minute', notifyTimeMinute); + KvStorage.setBool('${_keyPrefix}shader_background', shaderBackground); } } @@ -229,6 +264,31 @@ class GeneralFieldsNotifier extends Notifier { state = state.copyWith(cacheSize: size); } + void setShakeToSwitch(bool v) { + state = state.copyWith(shakeToSwitch: v); + KvStorage.setBool('${_keyPrefix}shake_to_switch', v); + } + + void setDailyNotification(bool v) { + state = state.copyWith(dailyNotification: v); + KvStorage.setBool('${_keyPrefix}daily_notification', v); + } + + void setNotifyTimeHour(int v) { + state = state.copyWith(notifyTimeHour: v); + KvStorage.setInt('${_keyPrefix}notify_time_hour', v); + } + + void setNotifyTimeMinute(int v) { + state = state.copyWith(notifyTimeMinute: v); + KvStorage.setInt('${_keyPrefix}notify_time_minute', v); + } + + void setShaderBackground(bool v) { + state = state.copyWith(shaderBackground: v); + KvStorage.setBool('${_keyPrefix}shader_background', v); + } + Future calculateCacheSize() async { try { int totalSize = 0; diff --git a/lib/features/settings/providers/sub/privacy_settings_provider.dart b/lib/features/settings/providers/sub/privacy_settings_provider.dart index 2720edad..bc6d1c0a 100644 --- a/lib/features/settings/providers/sub/privacy_settings_provider.dart +++ b/lib/features/settings/providers/sub/privacy_settings_provider.dart @@ -16,21 +16,25 @@ class PrivacySettingsState { this.appLockEnabled = false, this.clipboardReadEnabled = true, this.searchHistoryEnabled = true, + this.nearbyDiscovery = false, }); final bool appLockEnabled; final bool clipboardReadEnabled; final bool searchHistoryEnabled; + final bool nearbyDiscovery; PrivacySettingsState copyWith({ bool? appLockEnabled, bool? clipboardReadEnabled, bool? searchHistoryEnabled, + bool? nearbyDiscovery, }) { return PrivacySettingsState( appLockEnabled: appLockEnabled ?? this.appLockEnabled, clipboardReadEnabled: clipboardReadEnabled ?? this.clipboardReadEnabled, searchHistoryEnabled: searchHistoryEnabled ?? this.searchHistoryEnabled, + nearbyDiscovery: nearbyDiscovery ?? this.nearbyDiscovery, ); } @@ -39,6 +43,7 @@ class PrivacySettingsState { appLockEnabled: KvStorage.getBool('general_app_lock') ?? false, clipboardReadEnabled: KvStorage.getBool('general_clipboard_read') ?? true, searchHistoryEnabled: KvStorage.getBool('general_search_history') ?? true, + nearbyDiscovery: KvStorage.getBool('general_nearby_discovery') ?? false, ); } @@ -46,6 +51,7 @@ class PrivacySettingsState { KvStorage.setBool('general_app_lock', appLockEnabled); KvStorage.setBool('general_clipboard_read', clipboardReadEnabled); KvStorage.setBool('general_search_history', searchHistoryEnabled); + KvStorage.setBool('general_nearby_discovery', nearbyDiscovery); } } @@ -68,6 +74,11 @@ class PrivacySettingsNotifier extends Notifier { state = state.copyWith(searchHistoryEnabled: v); KvStorage.setBool('general_search_history', v); } + + void setNearbyDiscovery(bool v) { + state = state.copyWith(nearbyDiscovery: v); + KvStorage.setBool('general_nearby_discovery', v); + } } final privacySettingsProvider = diff --git a/lib/features/settings/providers/sub/sound_settings_provider.dart b/lib/features/settings/providers/sub/sound_settings_provider.dart index 7fffbe1d..db105ba5 100644 --- a/lib/features/settings/providers/sub/sound_settings_provider.dart +++ b/lib/features/settings/providers/sub/sound_settings_provider.dart @@ -1,5 +1,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; +import '../../../../core/services/audio/sfx_service.dart'; +import '../../../../core/storage/app_kv_store.dart'; import '../../../../core/storage/kv_storage.dart'; import '../../../../core/services/device/haptic_service.dart'; import '../../../../core/services/sound_service.dart' as svc; @@ -9,11 +11,15 @@ class SoundSettingsState { this.soundEnabled = true, this.vibrationLevelId = 'medium', this.soundEffectTypeId = 'default', + this.sfxEnabled = true, + this.sfxStyleIndex = 0, }); final bool soundEnabled; final String vibrationLevelId; final String soundEffectTypeId; + final bool sfxEnabled; + final int sfxStyleIndex; VibrationLevel get vibrationLevel => VibrationLevel.fromId(vibrationLevelId); @@ -22,15 +28,22 @@ class SoundSettingsState { bool get vibrationEnabled => vibrationLevelId != 'off'; + SfxStyle get sfxStyle => SfxStyle.values[ + sfxStyleIndex.clamp(0, SfxStyle.values.length - 1)]; + SoundSettingsState copyWith({ bool? soundEnabled, String? vibrationLevelId, String? soundEffectTypeId, + bool? sfxEnabled, + int? sfxStyleIndex, }) { return SoundSettingsState( soundEnabled: soundEnabled ?? this.soundEnabled, vibrationLevelId: vibrationLevelId ?? this.vibrationLevelId, soundEffectTypeId: soundEffectTypeId ?? this.soundEffectTypeId, + sfxEnabled: sfxEnabled ?? this.sfxEnabled, + sfxStyleIndex: sfxStyleIndex ?? this.sfxStyleIndex, ); } @@ -54,6 +67,8 @@ class SoundSettingsState { vibrationLevelId: resolvedVibrationId, soundEffectTypeId: KvStorage.getString('${prefix}sound_effect') ?? 'default', + sfxEnabled: AppKVStore.getBool('sfx_enabled') ?? true, + sfxStyleIndex: AppKVStore.getInt('sfx_style') ?? 0, ); } @@ -62,6 +77,8 @@ class SoundSettingsState { KvStorage.setBool('${prefix}sound', soundEnabled); KvStorage.setString('${prefix}vibration_level', vibrationLevelId); KvStorage.setString('${prefix}sound_effect', soundEffectTypeId); + AppKVStore.setBool('sfx_enabled', sfxEnabled); + AppKVStore.setInt('sfx_style', sfxStyleIndex); } } @@ -94,6 +111,20 @@ class SoundSettingsNotifier extends Notifier { KvStorage.setString('general_sound_effect', id); svc.SoundService.setEffectType(type); } + + void setSfxEnabled(bool v) { + state = state.copyWith(sfxEnabled: v); + SfxService.instance.setEnabled(v); + AppKVStore.setBool('sfx_enabled', v); + } + + void setSfxStyle(int index) { + state = state.copyWith(sfxStyleIndex: index); + SfxService.instance.setStyle( + SfxStyle.values[index.clamp(0, SfxStyle.values.length - 1)], + ); + AppKVStore.setInt('sfx_style', index); + } } final soundSettingsProvider = diff --git a/lib/features/settings/providers/theme_settings_provider.dart b/lib/features/settings/providers/theme_settings_provider.dart index e2b51560..625f2b20 100644 --- a/lib/features/settings/providers/theme_settings_provider.dart +++ b/lib/features/settings/providers/theme_settings_provider.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 主题设置统一管理 /// 创建时间: 2026-04-28 -/// 更新时间: 2026-05-14 +/// 更新时间: 2026-05-20 /// 作用: 统一管理所有主题个性化设置（模式/强调色/字体/毛玻璃/动画/圆角/卡片/壁纸/定时深色/预设/Tab表情/Tab造型） -/// 上次更新: 新增Tab表情风格(exaggerated/subtle)和Tab造型偏好(cat/dog/boy/girl)设置项 +/// 上次更新: resetAll清除customFontFamily /// ============================================================ import 'dart:async'; @@ -614,6 +614,7 @@ class ThemeSettingsState { this.cardStyleId = 'standard', this.tabExpressionStyleId = 'exaggerated', this.tabCharacterStyleId = 'cat', + this.customFontFamily = '', }); final AppThemeMode themeMode; @@ -633,6 +634,7 @@ class ThemeSettingsState { final String cardStyleId; final String tabExpressionStyleId; final String tabCharacterStyleId; + final String customFontFamily; AccentColorOption get accentColor { if (accentColorId == 'custom') { @@ -780,6 +782,7 @@ class ThemeSettingsState { String? cardStyleId, String? tabExpressionStyleId, String? tabCharacterStyleId, + String? customFontFamily, }) { return ThemeSettingsState( themeMode: themeMode ?? this.themeMode, @@ -799,6 +802,7 @@ class ThemeSettingsState { cardStyleId: cardStyleId ?? this.cardStyleId, tabExpressionStyleId: tabExpressionStyleId ?? this.tabExpressionStyleId, tabCharacterStyleId: tabCharacterStyleId ?? this.tabCharacterStyleId, + customFontFamily: customFontFamily ?? this.customFontFamily, ); } } @@ -849,6 +853,8 @@ class ThemeSettingsNotifier extends Notifier { AppKVStore.getString('${_keyPrefix}tab_expression') ?? 'exaggerated'; final characterId = AppKVStore.getString('${_keyPrefix}tab_character') ?? 'cat'; + final customFontFamily = + AppKVStore.getString('${_keyPrefix}custom_font_family') ?? ''; state = ThemeSettingsState( themeMode: AppThemeMode.fromSortOrder(modeIndex), @@ -868,6 +874,7 @@ class ThemeSettingsNotifier extends Notifier { cardStyleId: cardId, tabExpressionStyleId: expressionId, tabCharacterStyleId: characterId, + customFontFamily: customFontFamily, ); Log.i('主题设置加载完成: mode=${state.themeMode.label} accent=$accentId'); } catch (e) { @@ -987,6 +994,11 @@ class ThemeSettingsNotifier extends Notifier { AppKVStore.setString('${_keyPrefix}tab_character', id); } + void setCustomFontFamily(String fontFamily) { + state = state.copyWith(customFontFamily: fontFamily); + AppKVStore.setString('${_keyPrefix}custom_font_family', fontFamily); + } + void applyPreset(ThemePreset preset) { state = state.copyWith( accentColorId: preset.accentColorId, @@ -1025,6 +1037,7 @@ class ThemeSettingsNotifier extends Notifier { AppKVStore.setString('${_keyPrefix}card_style', 'standard'); AppKVStore.setString('${_keyPrefix}tab_expression', 'exaggerated'); AppKVStore.setString('${_keyPrefix}tab_character', 'cat'); + AppKVStore.setString('${_keyPrefix}custom_font_family', ''); } void _onDispose() { diff --git a/lib/features/settings/services/font_sync_service.dart b/lib/features/settings/services/font_sync_service.dart new file mode 100644 index 00000000..9520742f --- /dev/null +++ b/lib/features/settings/services/font_sync_service.dart @@ -0,0 +1,153 @@ +/// ============================================================ +/// 闲言APP — 字体数据同步服务 +/// 创建时间: 2026-05-20 +/// 更新时间: 2026-05-20 +/// 作用: 从Supabase远程获取在线字体列表，离线时fallback到本地硬编码数据 +/// 上次更新: Supabase占位符保护+toFontInfo传入downloadUrl +/// ============================================================ + +import 'package:supabase_flutter/supabase_flutter.dart'; +import 'package:logger/logger.dart'; + +import '../../../core/constants/app_constants.dart'; +import '../presentation/font_models.dart'; + +/// 字体同步服务 +class FontSyncService { + FontSyncService._(); + + static final _log = Logger(printer: PrettyPrinter(methodCount: 0)); + + static SupabaseClient? _client; + + /// 获取Supabase客户端（懒加载） + static SupabaseClient get _supabase { + _client ??= SupabaseClient( + AppConstants.supabaseUrl, + AppConstants.supabaseAnonKey, + ); + return _client!; + } + + /// 从Supabase获取在线字体列表，失败时fallback到本地数据 + static Future> fetchOnlineFonts() async { + if (AppConstants.supabaseUrl.contains('your-project') || + AppConstants.supabaseAnonKey.contains('your-anon-key')) { + _log.d('Supabase未配置，使用本地字体数据'); + return _localFallback(); + } + try { + final response = await _supabase + .from('fonts') + .select() + .eq('is_active', true) + .order('sort_order', ascending: true); + + return response + .map((e) => OnlineFontEntry.fromJson(e)) + .toList(); + } catch (e) { + _log.w('Supabase字体列表获取失败，使用本地fallback: $e'); + return _localFallback(); + } + } + + /// 本地fallback数据 + static List _localFallback() { + return onlineFontData + .asMap() + .entries + .map( + (e) => OnlineFontEntry( + name: e.value.$1, + fontFamily: e.value.$2, + downloadUrl: e.value.$3, + iconEmoji: e.value.$4, + ), + ) + .toList(); + } +} + +/// 在线字体条目模型（对应Supabase fonts表） +class OnlineFontEntry { + const OnlineFontEntry({ + required this.name, + required this.fontFamily, + required this.downloadUrl, + this.iconEmoji = '🔤', + this.author, + this.license, + this.category = 'sans', + this.tags = const [], + this.fileSize, + this.downloadCount = 0, + this.rating = 0.0, + this.sourceUrl, + }); + + /// 字体显示名称 + final String name; + + /// 字体族名称 + final String fontFamily; + + /// 下载地址 + final String downloadUrl; + + /// 图标emoji + final String iconEmoji; + + /// 作者 + final String? author; + + /// 许可证 + final String? license; + + /// 分类 (sans/serif/mono/display/handwriting) + final String category; + + /// 标签列表 + final List tags; + + /// 文件大小(bytes) + final int? fileSize; + + /// 下载次数 + final int downloadCount; + + /// 评分 + final double rating; + + /// 来源地址 + final String? sourceUrl; + + /// 从JSON构造 + factory OnlineFontEntry.fromJson(Map json) => + OnlineFontEntry( + name: json['name'] as String? ?? '', + fontFamily: json['font_family'] as String? ?? '', + downloadUrl: json['download_url'] as String? ?? '', + iconEmoji: json['icon_emoji'] as String? ?? '🔤', + author: json['author'] as String?, + license: json['license'] as String?, + category: json['category'] as String? ?? 'sans', + tags: (json['tags'] as List?)?.map((e) => e as String).toList() ?? [], + fileSize: json['file_size'] as int?, + downloadCount: json['download_count'] as int? ?? 0, + rating: (json['rating'] as num?)?.toDouble() ?? 0.0, + sourceUrl: json['source_url'] as String?, + ); + + /// 转换为FontInfo + FontInfo toFontInfo({bool isDownloaded = false}) => FontInfo( + name: name, + fontFamily: fontFamily, + path: '', + downloadUrl: downloadUrl, + isDownloaded: isDownloaded, + fileSize: fileSize, + category: category, + iconEmoji: iconEmoji, + ); +} diff --git a/lib/features/weather/presentation/weather_page.dart b/lib/features/weather/presentation/weather_page.dart index ef7a7dea..06ccc374 100644 --- a/lib/features/weather/presentation/weather_page.dart +++ b/lib/features/weather/presentation/weather_page.dart @@ -1,15 +1,16 @@ /// ============================================================ /// 闲言APP — 天气诗词页面 /// 创建时间: 2026-05-02 -/// 更新时间: 2026-05-19 +/// 更新时间: 2026-05-20 /// 作用: 天气展示 + 天气关联诗词推荐 — 聊天样式交互 -/// 上次更新: 重构为聊天样式页面，支持动态主题+设置入口 +/// 上次更新: 支持诗词会话历史，刷新追加而非替换整个页面 /// ============================================================ import 'package:flutter/cupertino.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:xianyan/core/router/app_nav_extension.dart'; +import '../../../core/router/app_router.dart'; import '../../../core/theme/app_radius.dart'; import '../../../core/theme/app_spacing.dart'; import '../../../core/theme/app_theme.dart'; @@ -28,13 +29,27 @@ class WeatherPage extends ConsumerStatefulWidget { class _WeatherPageState extends ConsumerState { final _inputController = TextEditingController(); + final _scrollController = ScrollController(); @override void dispose() { _inputController.dispose(); + _scrollController.dispose(); super.dispose(); } + void _scrollToBottom() { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (_scrollController.hasClients) { + _scrollController.animateTo( + _scrollController.position.maxScrollExtent, + duration: const Duration(milliseconds: 300), + curve: Curves.easeOut, + ); + } + }); + } + @override Widget build(BuildContext context) { final state = ref.watch(weatherProvider); @@ -52,7 +67,7 @@ class _WeatherPageState extends ConsumerState { mainAxisSize: MainAxisSize.min, children: [ GestureDetector( - onTap: () => context.appPush('/weather/settings'), + onTap: () => context.appPush(AppRoutes.weatherSettings), child: Icon(CupertinoIcons.settings, size: 20, color: ext.iconSecondary), ), const SizedBox(width: AppSpacing.sm), @@ -106,6 +121,7 @@ class _WeatherPageState extends ConsumerState { children: [ Expanded( child: ListView.builder( + controller: _scrollController, padding: const EdgeInsets.symmetric( horizontal: AppSpacing.md, vertical: 12, @@ -135,24 +151,47 @@ class _WeatherPageState extends ConsumerState { } } + final allSessions = [...state.poetrySessions]; if (state.jinrishiciContent.isNotEmpty) { - messages.add(_ChatMessage( - type: 'poetry', - content: state.jinrishiciContent, - poetryTitle: state.jinrishiciTitle, - poetryAuthor: state.jinrishiciAuthor, - time: '08:01', + allSessions.add(WeatherPoetrySession( + jinrishiciContent: state.jinrishiciContent, + jinrishiciTitle: state.jinrishiciTitle, + jinrishiciAuthor: state.jinrishiciAuthor, + matchedPoems: state.matchedPoems, )); } - if (state.matchedPoems.isNotEmpty) { - messages.add(_ChatMessage( - type: 'poemList', - content: '', - poems: state.matchedPoems.take(5).toList(), - mood: mood, - time: '08:02', - )); + for (var i = 0; i < allSessions.length; i++) { + final session = allSessions[i]; + final index = i + 1; + + if (index > 1) { + messages.add(_ChatMessage( + type: 'system', + content: '第${index}首推荐 🔄', + time: '08:0$i', + )); + } + + if (session.jinrishiciContent.isNotEmpty) { + messages.add(_ChatMessage( + type: 'poetry', + content: session.jinrishiciContent, + poetryTitle: session.jinrishiciTitle, + poetryAuthor: session.jinrishiciAuthor, + time: '08:0$i', + )); + } + + if (session.matchedPoems.isNotEmpty) { + messages.add(_ChatMessage( + type: 'poemList', + content: '', + poems: session.matchedPoems.take(5).toList(), + mood: mood, + time: '08:0$i', + )); + } } if (weather != null) { @@ -306,6 +345,7 @@ class _WeatherPageState extends ConsumerState { void _handleQuickReply(String text) { if (text == '换首诗') { ref.read(weatherProvider.notifier).refresh(); + _scrollToBottom(); } } diff --git a/lib/features/weather/providers/weather_provider.dart b/lib/features/weather/providers/weather_provider.dart index 2c9f3a7c..726a5a98 100644 --- a/lib/features/weather/providers/weather_provider.dart +++ b/lib/features/weather/providers/weather_provider.dart @@ -1,9 +1,9 @@ -/// ============================================================ +/// ============================================================ /// 闲言APP — 天气状态管理 /// 创建时间: 2026-05-02 -/// 更新时间: 2026-05-16 +/// 更新时间: 2026-05-20 /// 作用: 天气数据 + 天气-诗词关联推荐状态 -/// 上次更新: 迁移 Riverpod 3.x — StateNotifier → Notifier +/// 上次更新: 支持诗词会话历史，刷新追加而非替换 /// ============================================================ import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -12,6 +12,20 @@ import '../../../core/utils/logger.dart'; import '../models/weather_models.dart'; import '../services/weather_service.dart'; +class WeatherPoetrySession { + const WeatherPoetrySession({ + this.jinrishiciContent = '', + this.jinrishiciTitle = '', + this.jinrishiciAuthor = '', + this.matchedPoems = const [], + }); + + final String jinrishiciContent; + final String jinrishiciTitle; + final String jinrishiciAuthor; + final List> matchedPoems; +} + class WeatherState { const WeatherState({ this.weather, @@ -20,6 +34,7 @@ class WeatherState { this.jinrishiciContent = '', this.jinrishiciTitle = '', this.jinrishiciAuthor = '', + this.poetrySessions = const [], this.isLoading = true, this.error, }); @@ -30,6 +45,7 @@ class WeatherState { final String jinrishiciContent; final String jinrishiciTitle; final String jinrishiciAuthor; + final List poetrySessions; final bool isLoading; final String? error; @@ -40,6 +56,7 @@ class WeatherState { String? jinrishiciContent, String? jinrishiciTitle, String? jinrishiciAuthor, + List? poetrySessions, bool? isLoading, String? error, }) { @@ -50,6 +67,7 @@ class WeatherState { jinrishiciContent: jinrishiciContent ?? this.jinrishiciContent, jinrishiciTitle: jinrishiciTitle ?? this.jinrishiciTitle, jinrishiciAuthor: jinrishiciAuthor ?? this.jinrishiciAuthor, + poetrySessions: poetrySessions ?? this.poetrySessions, isLoading: isLoading ?? this.isLoading, error: error, ); @@ -67,6 +85,17 @@ class WeatherNotifier extends Notifier { state = state.copyWith(isLoading: true); try { final result = await WeatherService.fetchWeatherWithPoetry(); + + final updatedSessions = List.from(state.poetrySessions); + if (state.jinrishiciContent.isNotEmpty) { + updatedSessions.add(WeatherPoetrySession( + jinrishiciContent: state.jinrishiciContent, + jinrishiciTitle: state.jinrishiciTitle, + jinrishiciAuthor: state.jinrishiciAuthor, + matchedPoems: state.matchedPoems, + )); + } + state = state.copyWith( weather: result.weather, mood: result.mood, @@ -74,9 +103,10 @@ class WeatherNotifier extends Notifier { jinrishiciContent: result.jinrishiciContent, jinrishiciTitle: result.jinrishiciTitle, jinrishiciAuthor: result.jinrishiciAuthor, + poetrySessions: updatedSessions, isLoading: false, ); - Log.i('天气加载成功: ${result.weather.city}'); + Log.i('天气加载成功: ${result.weather.city}，诗词历史: ${updatedSessions.length}首'); } catch (e) { Log.e('天气加载失败', e); state = state.copyWith(isLoading: false, error: e.toString()); diff --git a/lib/features/widget/models/widget_type.dart b/lib/features/widget/models/widget_type.dart index 79cab948..c81079d9 100644 --- a/lib/features/widget/models/widget_type.dart +++ b/lib/features/widget/models/widget_type.dart @@ -1,9 +1,9 @@ /// ============================================================ /// 闲言APP — 桌面小部件类型定义 /// 创建时间: 2026-05-19 -/// 更新时间: 2026-05-19 +/// 更新时间: 2026-05-20 /// 作用: 定义所有桌面小部件的类型、元数据和平台标识 -/// 上次更新: 新增qualifiedAndroidName属性，修复Android端ClassNotFoundException +/// 上次更新: 新增dailyWithCharacter拾光角色小组件类型 /// ============================================================ import 'package:flutter/cupertino.dart'; @@ -17,6 +17,7 @@ enum WidgetType { pomodoro, solarTerm, checkin, + dailyWithCharacter, } extension WidgetTypeX on WidgetType { @@ -31,6 +32,7 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => '番茄钟', WidgetType.solarTerm => '节气诗词', WidgetType.checkin => '每日签到', + WidgetType.dailyWithCharacter => '拾光每日一句', }; String get subtitle => switch (this) { @@ -42,6 +44,7 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => '桌面快捷专注计时', WidgetType.solarTerm => '当前节气与对应诗词', WidgetType.checkin => '连续签到天数和快捷签到', + WidgetType.dailyWithCharacter => '拾光角色+每日推荐句子', }; IconData get icon => switch (this) { @@ -53,6 +56,7 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => CupertinoIcons.timer, WidgetType.solarTerm => CupertinoIcons.arrow_3_trianglepath, WidgetType.checkin => CupertinoIcons.checkmark_seal_fill, + WidgetType.dailyWithCharacter => CupertinoIcons.sparkles, }; String get androidProviderName => switch (this) { @@ -64,6 +68,7 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => 'PomodoroProvider', WidgetType.solarTerm => 'SolarTermProvider', WidgetType.checkin => 'CheckinProvider', + WidgetType.dailyWithCharacter => 'DailyWithCharacterProvider', }; String get qualifiedAndroidName => @@ -78,6 +83,7 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => 'PomodoroWidget', WidgetType.solarTerm => 'SolarTermWidget', WidgetType.checkin => 'CheckinWidget', + WidgetType.dailyWithCharacter => 'DailyWithCharacterWidget', }; String get ohosFormName => switch (this) { @@ -89,6 +95,7 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => 'pomodoro', WidgetType.solarTerm => 'solarTerm', WidgetType.checkin => 'checkin', + WidgetType.dailyWithCharacter => 'dailyWithCharacter', }; int get priority => switch (this) { @@ -100,22 +107,26 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => 3, WidgetType.solarTerm => 3, WidgetType.checkin => 3, + WidgetType.dailyWithCharacter => 1, }; bool get isInteractive => switch (this) { WidgetType.pomodoro => true, WidgetType.checkin => true, + WidgetType.dailyWithCharacter => false, _ => false, }; bool get supportsIosInteractive => switch (this) { WidgetType.pomodoro => false, WidgetType.checkin => true, + WidgetType.dailyWithCharacter => false, _ => false, }; bool get supportsOhos => switch (this) { WidgetType.pomodoro => false, + WidgetType.dailyWithCharacter => true, _ => true, }; @@ -128,6 +139,7 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => '/widget-management', WidgetType.solarTerm => '/inspiration', WidgetType.checkin => '/signin', + WidgetType.dailyWithCharacter => '/home', }; String get dataKeyPrefix => switch (this) { @@ -139,6 +151,7 @@ extension WidgetTypeX on WidgetType { WidgetType.pomodoro => 'pomodoro', WidgetType.solarTerm => 'solar_term', WidgetType.checkin => 'checkin', + WidgetType.dailyWithCharacter => 'daily_with_character', }; String get themeKey => '${dataKeyPrefix}_theme'; diff --git a/lib/features/widget/presentation/widget_management_page.dart b/lib/features/widget/presentation/widget_management_page.dart index c5a6318d..1297819e 100644 --- a/lib/features/widget/presentation/widget_management_page.dart +++ b/lib/features/widget/presentation/widget_management_page.dart @@ -3,7 +3,7 @@ /// 创建时间: 2026-05-19 /// 更新时间: 2026-05-19 /// 作用: 管理桌面小部件的安装、数据推送、主题和平台兼容说明 -/// 上次更新: 优化分组展示+动态主题+深度链接+调试区 +/// 上次更新: 修复Android/鸿蒙端添加小部件无反应，改用requestPinWidget+手动指引 /// ============================================================ import 'package:flutter/cupertino.dart'; @@ -13,6 +13,7 @@ import '../../../core/theme/app_theme.dart'; import '../../../core/theme/app_spacing.dart'; import '../../../core/theme/app_typography.dart'; import '../../../core/theme/app_radius.dart'; +import '../../../core/utils/platform_helper.dart'; import '../../../shared/widgets/glass_container.dart'; import '../../../shared/widgets/responsive_layout.dart'; import '../../../shared/widgets/app_toast.dart'; @@ -177,13 +178,94 @@ class _WidgetManagementPageState extends ConsumerState { _ => '趣味小部件', }; - void _handleAddWidget(WidgetType type) { + void _handleAddWidget(WidgetType type) async { + final success = await ref.read(wp.widgetProvider.notifier).requestPinWidget(type); + if (!success) { + if (!mounted) return; + _showManualAddGuide(type); + return; + } ref.read(wp.widgetProvider.notifier).addWidget(type); - AppToast.showInfo('${type.title} 数据已推送'); + AppToast.showInfo('${type.title} 已添加到桌面'); } - void _handlePinWidget(WidgetType type) { - ref.read(wp.widgetProvider.notifier).requestPinWidget(type); + void _handlePinWidget(WidgetType type) async { + final success = await ref.read(wp.widgetProvider.notifier).requestPinWidget(type); + if (!success) { + if (!mounted) return; + _showManualAddGuide(type); + return; + } + ref.read(wp.widgetProvider.notifier).addWidget(type); + } + + void _showManualAddGuide(WidgetType type) { + final ext = AppTheme.ext(context); + final steps = PlatformHelper.isHarmonyOS + ? [ + '1️⃣ 长按桌面空白处', + '2️⃣ 选择「服务卡片」', + '3️⃣ 找到「闲言」', + '4️⃣ 选择「${type.title}」并添加到桌面', + ] + : PlatformHelper.isAndroid + ? [ + '1️⃣ 长按桌面空白处', + '2️⃣ 选择「小部件」', + '3️⃣ 找到「闲言」', + '4️⃣ 选择「${type.title}」拖动到桌面', + ] + : [ + '1️⃣ 向右滑动到今日视图', + '2️⃣ 滚动到底部点击「编辑」', + '3️⃣ 找到「闲言」', + '4️⃣ 选择「${type.title}」并添加', + ]; + + showCupertinoDialog( + context: context, + builder: (ctx) => CupertinoAlertDialog( + title: Padding( + padding: const EdgeInsets.only(bottom: AppSpacing.sm), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(CupertinoIcons.square_grid_2x2_fill, size: 20, color: ext.accent), + const SizedBox(width: AppSpacing.xs), + Text('添加「${type.title}」'), + ], + ), + ), + content: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + '当前设备不支持快捷添加，请按以下步骤手动添加到桌面：', + style: AppTypography.footnote.copyWith( + color: ext.textSecondary, + ), + ), + const SizedBox(height: AppSpacing.md), + ...steps.map((s) => Padding( + padding: const EdgeInsets.only(bottom: AppSpacing.xs), + child: Text( + s, + style: AppTypography.subhead.copyWith( + color: ext.textPrimary, + ), + ), + )), + ], + ), + actions: [ + CupertinoDialogAction( + isDefaultAction: true, + child: const Text('知道了'), + onPressed: () => Navigator.of(ctx).pop(), + ), + ], + ), + ); } } @@ -463,7 +545,7 @@ class _WidgetCard extends StatelessWidget { minimumSize: Size.zero, borderRadius: AppRadius.pillBorder, color: ext.accent, - onPressed: onPin, + onPressed: onAdd, child: Text( '添加', style: AppTypography.caption2.copyWith( diff --git a/lib/features/widget/providers/widget_provider.dart b/lib/features/widget/providers/widget_provider.dart index 0591336c..d7142486 100644 --- a/lib/features/widget/providers/widget_provider.dart +++ b/lib/features/widget/providers/widget_provider.dart @@ -3,7 +3,7 @@ /// 创建时间: 2026-05-19 /// 更新时间: 2026-05-19 /// 作用: 管理小部件安装状态、数据推送和交互 -/// 上次更新: requestPinWidget增加qualifiedAndroidName参数，修复Android类名拼接错误 +/// 上次更新: requestPinWidget返回bool，修复Android/鸿蒙端添加小部件无反应 /// ============================================================ import 'dart:ui'; @@ -89,7 +89,7 @@ class WidgetNotifier extends Notifier { Log.i('WidgetNotifier: 移除小部件 ${type.title}'); } - Future requestPinWidget(WidgetType type) async { + Future requestPinWidget(WidgetType type) async { try { await HomeWidget.requestPinWidget( qualifiedAndroidName: type.qualifiedAndroidName, @@ -97,8 +97,10 @@ class WidgetNotifier extends Notifier { ohosName: type.ohosFormName, ); Log.i('WidgetNotifier: 请求固定小部件 ${type.title}'); + return true; } catch (e) { Log.e('WidgetNotifier: 请求固定小部件失败', e); + return false; } } diff --git a/lib/main.dart b/lib/main.dart index 53ab82e0..5387f483 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,13 +1,13 @@ // ============================================================ // 闲言APP — 应用入口 // 创建时间: 2026-04-20 -// 更新时间: 2026-05-18 +// 更新时间: 2026-05-20 // 作用: main 函数，初始化存储 + 液态玻璃 + 异常捕获 + 启动 App -// 上次更新: v6.4 鸿蒙端使用MaterialApp(home:)+OhosAppShell替代MaterialApp.router +// 上次更新: v6.7 修复Zone mismatch(ensureInitialized移入runZonedGuarded内)+Web端path_provider守卫 // ============================================================ import 'dart:async'; -import 'dart:isolate'; +import 'dart:isolate' if (dart.library.js) 'core/utils/isolate_stub.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -44,6 +44,7 @@ void main() async { runZonedGuarded( () async { WidgetsFlutterBinding.ensureInitialized(); + if (pu.isOhos) Log.i('🟢 [OHOS] main() 开始执行'); FlutterError.onError = (FlutterErrorDetails details) { @@ -55,28 +56,32 @@ void main() async { ); }; - Isolate.current.addErrorListener( - RawReceivePort((Object? pair) { - final List errorAndStacktrace = pair as List; - Log.e( - '🔥 Isolate uncaught error', - errorAndStacktrace.first, - StackTrace.fromString(errorAndStacktrace.last.toString()), - ); - }).sendPort, - ); + if (!pu.isWeb) { + Isolate.current.addErrorListener( + RawReceivePort((Object? pair) { + final List errorAndStacktrace = pair as List; + Log.e( + '🔥 Isolate uncaught error', + errorAndStacktrace.first, + StackTrace.fromString(errorAndStacktrace.last.toString()), + ); + }).sendPort, + ); + } - SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); - SystemChrome.setSystemUIOverlayStyle( - const SystemUiOverlayStyle( - statusBarColor: Colors.transparent, - statusBarIconBrightness: Brightness.dark, - statusBarBrightness: Brightness.light, - systemNavigationBarColor: Colors.transparent, - systemNavigationBarIconBrightness: Brightness.dark, - systemNavigationBarDividerColor: Colors.transparent, - ), - ); + if (!pu.isWeb) { + SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); + SystemChrome.setSystemUIOverlayStyle( + const SystemUiOverlayStyle( + statusBarColor: Colors.transparent, + statusBarIconBrightness: Brightness.dark, + statusBarBrightness: Brightness.light, + systemNavigationBarColor: Colors.transparent, + systemNavigationBarIconBrightness: Brightness.dark, + systemNavigationBarDividerColor: Colors.transparent, + ), + ); + } if (pu.isOhos) Log.i('🟢 [OHOS] SystemChrome 配置完成'); try { @@ -118,33 +123,41 @@ void main() async { Log.e('页面注册表验证失败', e, st); } - try { - await DeepLinkService.init(); - if (pu.isOhos) Log.i('🟢 [OHOS] 深度链接服务初始化完成'); - } catch (e, st) { - Log.e('深度链接服务初始化失败', e, st); + if (!pu.isWeb) { + try { + await DeepLinkService.init(); + if (pu.isOhos) Log.i('🟢 [OHOS] 深度链接服务初始化完成'); + } catch (e, st) { + Log.e('深度链接服务初始化失败', e, st); + } } - try { - SharingReceiverService().init(); - SharingReceiverService().setNavigatorKey(rootNavigatorKey); - if (pu.isOhos) Log.i('🟢 [OHOS] 分享接收服务初始化完成'); - } catch (e, st) { - Log.e('分享接收服务初始化失败', e, st); + if (!pu.isWeb) { + try { + SharingReceiverService().init(); + SharingReceiverService().setNavigatorKey(rootNavigatorKey); + if (pu.isOhos) Log.i('🟢 [OHOS] 分享接收服务初始化完成'); + } catch (e, st) { + Log.e('分享接收服务初始化失败', e, st); + } } - try { - await LocalNotificationService.init(); - if (pu.isOhos) Log.i('🟢 [OHOS] 本地通知服务初始化完成'); - } catch (e, st) { - Log.e('本地通知服务初始化失败', e, st); + if (!pu.isWeb) { + try { + await LocalNotificationService.init(); + if (pu.isOhos) Log.i('🟢 [OHOS] 本地通知服务初始化完成'); + } catch (e, st) { + Log.e('本地通知服务初始化失败', e, st); + } } - try { - await ScreenWakeService.init(); - if (pu.isOhos) Log.i('🟢 [OHOS] 屏幕常亮服务初始化完成'); - } catch (e, st) { - Log.e('屏幕常亮服务初始化失败', e, st); + if (!pu.isWeb) { + try { + await ScreenWakeService.init(); + if (pu.isOhos) Log.i('🟢 [OHOS] 屏幕常亮服务初始化完成'); + } catch (e, st) { + Log.e('屏幕常亮服务初始化失败', e, st); + } } try { @@ -154,18 +167,22 @@ void main() async { Log.e('音效服务初始化失败', e, st); } - try { - await BatteryOptimizationService.init(); - if (pu.isOhos) Log.i('🟢 [OHOS] 电池优化服务初始化完成'); - } catch (e, st) { - Log.e('电池优化服务初始化失败', e, st); + if (!pu.isWeb) { + try { + await BatteryOptimizationService.init(); + if (pu.isOhos) Log.i('🟢 [OHOS] 电池优化服务初始化完成'); + } catch (e, st) { + Log.e('电池优化服务初始化失败', e, st); + } } - try { - await ReadlaterReminderService.startMonitoring(); - if (pu.isOhos) Log.i('🟢 [OHOS] 稍后读提醒服务初始化完成'); - } catch (e, st) { - Log.e('稍后读提醒服务初始化失败', e, st); + if (!pu.isWeb) { + try { + await ReadlaterReminderService.startMonitoring(); + if (pu.isOhos) Log.i('🟢 [OHOS] 稍后读提醒服务初始化完成'); + } catch (e, st) { + Log.e('稍后读提醒服务初始化失败', e, st); + } } try { @@ -175,18 +192,22 @@ void main() async { Log.e('聊天数据迁移检查失败', e, st); } - try { - await HomeWidgetService.instance.init(); - if (pu.isOhos) Log.i('🟢 [OHOS] 桌面小组件服务初始化完成'); - } catch (e, st) { - Log.e('桌面小组件服务初始化失败', e, st); + if (!pu.isWeb) { + try { + await HomeWidgetService.instance.init(); + if (pu.isOhos) Log.i('🟢 [OHOS] 桌面小组件服务初始化完成'); + } catch (e, st) { + Log.e('桌面小组件服务初始化失败', e, st); + } } - try { - await ClipboardMonitorService.instance.initFromStore(); - if (pu.isOhos) Log.i('🟢 [OHOS] 剪贴板监控服务初始化完成'); - } catch (e, st) { - Log.e('剪贴板监控服务初始化失败', e, st); + if (!pu.isWeb) { + try { + await ClipboardMonitorService.instance.initFromStore(); + if (pu.isOhos) Log.i('🟢 [OHOS] 剪贴板监控服务初始化完成'); + } catch (e, st) { + Log.e('剪贴板监控服务初始化失败', e, st); + } } if (pu.isOhos) { diff --git a/lib/shared/widgets/appbar_character_sprite.dart b/lib/shared/widgets/appbar_character_sprite.dart new file mode 100644 index 00000000..d5bfac58 --- /dev/null +++ b/lib/shared/widgets/appbar_character_sprite.dart @@ -0,0 +1,1424 @@ +// ============================================================ +// 闲言APP — AppBar角色动画精灵 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: AppBar左侧互动角色，支持4种造型/7种部件动画/6种手势交互 +// 上次更新: 新增speaking说话表情+嘴巴开合动画 +// ============================================================ + +import 'dart:async'; +import 'dart:math' as math; +import 'dart:ui' as ui; + +import 'package:flutter/material.dart'; +import 'package:xianyan/features/home/providers/character_mood_provider.dart'; + +enum CharacterExpression { + idle, + blink, + smile, + surprise, + wink, + pout, + love, + tickle, + lookRight, + think, + dizzy, + worried, + speaking, +} + +class AppBarCharacterSprite extends StatefulWidget { + const AppBarCharacterSprite({ + super.key, + required this.characterId, + this.animationIntensity = 1.0, + this.mood, + this.expression, + this.onTap, + this.onDoubleTap, + this.size = 48.0, + }); + + final String characterId; + final double animationIntensity; + final CharacterMood? mood; + final CharacterExpression? expression; + final VoidCallback? onTap; + final VoidCallback? onDoubleTap; + final double size; + + @override + State createState() => AppBarCharacterSpriteState(); +} + +class AppBarCharacterSpriteState extends State + with TickerProviderStateMixin { + late AnimationController _bounceController; + late AnimationController _earController; + late AnimationController _noseController; + late AnimationController _cheekController; + late AnimationController _expressionController; + late AnimationController _idleController; + + CharacterExpression _currentExpression = CharacterExpression.idle; + Timer? _expressionResetTimer; + Offset _eyeOffset = Offset.zero; + bool _isLongPressing = false; + + double _df(double v) => v <= 0 ? 1.0 : (v > 1.3 ? 1.3 : v); + + @override + void initState() { + super.initState(); + final f = _df(widget.animationIntensity); + _bounceController = AnimationController( + vsync: this, + duration: Duration(milliseconds: (500 * f).round()), + ); + _earController = AnimationController( + vsync: this, + duration: Duration(milliseconds: (400 * f).round()), + ); + _noseController = AnimationController( + vsync: this, + duration: Duration(milliseconds: (300 * f).round()), + ); + _cheekController = AnimationController( + vsync: this, + duration: Duration(milliseconds: (500 * f).round()), + ); + _expressionController = AnimationController( + vsync: this, + duration: Duration(milliseconds: (300 * f).round()), + ); + _idleController = AnimationController( + vsync: this, + duration: Duration(milliseconds: (4000 / f).round()), + ); + if (widget.animationIntensity > 0.0) _idleController.repeat(reverse: true); + } + + @override + void didUpdateWidget(AppBarCharacterSprite oldWidget) { + super.didUpdateWidget(oldWidget); + if (widget.expression != oldWidget.expression && + widget.expression != null) { + _triggerExpression(widget.expression!); + } + if (widget.animationIntensity == oldWidget.animationIntensity) return; + final f = _df(widget.animationIntensity); + _bounceController.duration = Duration(milliseconds: (500 * f).round()); + _earController.duration = Duration(milliseconds: (400 * f).round()); + _noseController.duration = Duration(milliseconds: (300 * f).round()); + _cheekController.duration = Duration(milliseconds: (500 * f).round()); + _expressionController.duration = Duration(milliseconds: (300 * f).round()); + _idleController.duration = Duration(milliseconds: (4000 / f).round()); + if (widget.animationIntensity <= 0.0) { + _idleController.stop(); + } else if (!_idleController.isAnimating) { + _idleController.repeat(reverse: true); + } + } + + @override + void dispose() { + _expressionResetTimer?.cancel(); + _bounceController.dispose(); + _earController.dispose(); + _noseController.dispose(); + _cheekController.dispose(); + _expressionController.dispose(); + _idleController.dispose(); + super.dispose(); + } + + void _triggerExpression(CharacterExpression expr) { + _expressionResetTimer?.cancel(); + _currentExpression = expr; + switch (expr) { + case CharacterExpression.idle: + _expressionController.reverse(); + _earController.reverse(); + _noseController.reverse(); + _cheekController.reverse(); + _bounceController.reverse(); + case CharacterExpression.blink: + _expressionController.forward(from: 0.0); + _scheduleReset(600); + case CharacterExpression.smile: + _expressionController.forward(from: 0.0); + _earController.forward(from: 0.0); + _noseController.forward(from: 0.0); + _bounceController.forward(from: 0.0); + _scheduleReset(1500); + case CharacterExpression.surprise: + _expressionController.forward(from: 0.0); + _earController.forward(from: 0.0); + _noseController.forward(from: 0.0); + _bounceController.forward(from: 0.0); + _scheduleReset(1200); + case CharacterExpression.wink: + _expressionController.forward(from: 0.0); + _earController.forward(from: 0.0); + _cheekController.forward(from: 0.0); + _scheduleReset(1500); + case CharacterExpression.pout: + _expressionController.forward(from: 0.0); + _noseController.forward(from: 0.0); + _cheekController.forward(from: 0.0); + _scheduleReset(1500); + case CharacterExpression.love: + _expressionController.forward(from: 0.0); + _earController.forward(from: 0.0); + _noseController.forward(from: 0.0); + _cheekController.forward(from: 0.0); + _bounceController.forward(from: 0.0); + _scheduleReset(2000); + case CharacterExpression.tickle: + _expressionController.forward(from: 0.0); + _earController.repeat(reverse: true); + _noseController.repeat(reverse: true); + _cheekController.repeat(reverse: true); + _bounceController.repeat(reverse: true); + case CharacterExpression.lookRight: + _expressionController.forward(from: 0.0); + _earController.forward(from: 0.0); + _scheduleReset(1200); + case CharacterExpression.think: + _expressionController.forward(from: 0.0); + _noseController.forward(from: 0.0); + _cheekController.forward(from: 0.0); + _scheduleReset(1500); + case CharacterExpression.dizzy: + _expressionController.forward(from: 0.0); + _earController.repeat(reverse: true); + _cheekController.forward(from: 0.0); + _bounceController.repeat(reverse: true); + _scheduleReset(2000); + case CharacterExpression.worried: + _expressionController.forward(from: 0.0); + _noseController.forward(from: 0.0); + _cheekController.forward(from: 0.0); + _scheduleReset(2000); + case CharacterExpression.speaking: + _expressionController.repeat(reverse: true); + _earController.forward(from: 0.0); + _cheekController.forward(from: 0.0); + } + } + + void _scheduleReset(int millis) { + _expressionResetTimer = Timer(Duration(milliseconds: millis), () { + if (mounted && !_isLongPressing) + _triggerExpression(CharacterExpression.idle); + }); + } + + void _handleTap() { + if (widget.animationIntensity <= 0.0) return; + const expressions = [ + CharacterExpression.blink, + CharacterExpression.smile, + CharacterExpression.surprise, + CharacterExpression.wink, + CharacterExpression.pout, + ]; + _triggerExpression(expressions[math.Random().nextInt(expressions.length)]); + widget.onTap?.call(); + } + + void _handleDoubleTap() { + if (widget.animationIntensity <= 0.0) return; + _triggerExpression(CharacterExpression.love); + widget.onDoubleTap?.call(); + } + + void _handleLongPressStart() { + if (widget.animationIntensity <= 0.0) return; + _isLongPressing = true; + _triggerExpression(CharacterExpression.tickle); + } + + void _handleLongPressEnd() { + _isLongPressing = false; + _earController.stop(); + _noseController.stop(); + _cheekController.stop(); + _bounceController.stop(); + _triggerExpression(CharacterExpression.idle); + } + + void lookAtTitle() { + if (widget.animationIntensity <= 0.0) return; + _eyeOffset = const Offset(3.0, 0.0); + _triggerExpression(CharacterExpression.lookRight); + Future.delayed(const Duration(milliseconds: 1200), () { + if (mounted) _eyeOffset = Offset.zero; + }); + } + + void triggerExpression(CharacterExpression expr) { + if (widget.animationIntensity <= 0.0) return; + _triggerExpression(expr); + } + + double _getBounceScale() => + 1.0 + (_bounceController.value * 0.15 - 0.05) * widget.animationIntensity; + double _getBounceRotation() => + (_bounceController.value * 0.16 - 0.08) * widget.animationIntensity; + + @override + Widget build(BuildContext context) { + return Listener( + onPointerMove: (event) { + if (widget.animationIntensity <= 0.0) return; + final renderBox = context.findRenderObject() as RenderBox?; + if (renderBox == null) return; + final center = renderBox.localToGlobal( + Offset(renderBox.size.width / 2, renderBox.size.height / 2), + ); + final delta = event.position - center; + const maxOffset = 3.0; + final distance = math.sqrt(delta.dx * delta.dx + delta.dy * delta.dy); + if (distance < 1.0) { + _eyeOffset = Offset.zero; + } else { + final factor = (distance / 200.0).clamp(0.0, 1.0) * maxOffset; + _eyeOffset = Offset( + (delta.dx / distance) * factor, + (delta.dy / distance) * factor, + ); + } + setState(() {}); + }, + child: GestureDetector( + onTap: _handleTap, + onDoubleTap: _handleDoubleTap, + onLongPress: _handleLongPressStart, + onLongPressEnd: (_) => _handleLongPressEnd(), + child: AnimatedBuilder( + animation: Listenable.merge([ + _bounceController, + _earController, + _noseController, + _cheekController, + _expressionController, + _idleController, + ]), + builder: (context, _) { + return SizedBox( + width: widget.size, + height: widget.size, + child: Transform.scale( + scale: _getBounceScale().clamp(0.8, 1.15), + child: Transform.rotate( + angle: _getBounceRotation().clamp(-0.08, 0.08), + child: CustomPaint( + size: Size(widget.size, widget.size), + painter: _AppBarCharacterPainter( + characterId: widget.characterId, + expression: _currentExpression, + expressionProgress: _expressionController.value, + earProgress: _earController.value, + noseProgress: _noseController.value, + cheekProgress: _cheekController.value, + bounceScale: _getBounceScale(), + bounceRotation: _getBounceRotation(), + eyeOffset: _eyeOffset, + animationIntensity: widget.animationIntensity, + idleProgress: _idleController.value, + mood: widget.mood, + ), + ), + ), + ), + ); + }, + ), + ), + ); + } +} + +// ============================================================ +// CustomPainter — 3D质感角色绘制 +// ============================================================ + +class _AppBarCharacterPainter extends CustomPainter { + _AppBarCharacterPainter({ + required this.characterId, + required this.expression, + required this.expressionProgress, + required this.earProgress, + required this.noseProgress, + required this.cheekProgress, + required this.bounceScale, + required this.bounceRotation, + required this.eyeOffset, + required this.animationIntensity, + required this.idleProgress, + this.mood, + }); + + final String characterId; + final CharacterExpression expression; + final double expressionProgress; + final double earProgress; + final double noseProgress; + final double cheekProgress; + final double bounceScale; + final double bounceRotation; + final Offset eyeOffset; + final double animationIntensity; + final double idleProgress; + final CharacterMood? mood; + + static const _headRect = Rect.fromLTWH(7, 12, 34, 30); + + @override + void paint(Canvas canvas, Size size) { + final s = size.width / 48.0; + canvas.save(); + canvas.scale(s, s); + switch (characterId) { + case 'cat': + _paintCatHead(canvas); + case 'dog': + _paintDogHead(canvas); + case 'boy': + _paintBoyHead(canvas); + case 'girl': + _paintGirlHead(canvas); + default: + _paintCatHead(canvas); + } + canvas.restore(); + } + + // ============================================================ + // 共用头部绘制 + // ============================================================ + void _paintHeadBase(Canvas canvas, List colors) { + _paintShadow(canvas, 24, 29, 17); + final headPaint = Paint() + ..shader = ui.Gradient.radial(const Offset(20, 22), 20, colors, [ + 0.0, + 0.6, + 1.0, + ]) + ..isAntiAlias = true; + canvas.drawOval(_headRect, headPaint); + _paintHighlight(canvas, 20, 20, 9, 5, -12); + _paintGroundShadow(canvas); + } + + void _paintGroundShadow(Canvas canvas) { + canvas.drawOval( + Rect.fromCenter(center: const Offset(24, 44), width: 24, height: 6), + Paint() + ..color = const Color(0xFF000000).withValues(alpha: 0.12) + ..maskFilter = const ui.MaskFilter.blur(ui.BlurStyle.normal, 3) + ..isAntiAlias = true, + ); + } + + void _paintShadow(Canvas canvas, double cx, double cy, double rx) { + canvas.drawOval( + Rect.fromCenter( + center: Offset(cx, cy + 2), + width: rx * 2, + height: rx * 1.8, + ), + Paint() + ..color = const Color(0xFF000000).withValues(alpha: 0.25) + ..maskFilter = const ui.MaskFilter.blur(ui.BlurStyle.normal, 4.5) + ..isAntiAlias = true, + ); + } + + void _paintHighlight( + Canvas canvas, + double cx, + double cy, + double rx, + double ry, + double angleDeg, + ) { + canvas.save(); + canvas.translate(cx, cy); + canvas.rotate(angleDeg * math.pi / 180); + canvas.translate(-cx, -cy); + canvas.drawOval( + Rect.fromCenter(center: Offset(cx, cy), width: rx * 2, height: ry * 2), + Paint() + ..color = const Color(0xFFFFFFFF).withValues(alpha: 0.12) + ..isAntiAlias = true, + ); + canvas.restore(); + } + + // ============================================================ + // 猫咪造型 + // ============================================================ + void _paintCatHead(Canvas canvas) { + _paintHeadBase(canvas, [ + const Color(0xFFFFE0C0), + const Color(0xFFFFD4A8), + const Color(0xFFF0B070), + ]); + _paintCatEars(canvas); + _paintEyes(canvas, 18, 26, 30, 26); + _paintWorriedEyebrows(canvas); + _paintNose( + canvas, + 24, + 29.5, + 4, + 2.6, + const Color(0xFFF5C4A0), + const Color(0xFFE8A060), + 0.3, + ); + _paintNoseHighlight(canvas, 22.7, 28.7, 1.6, 1.0, 0.25); + _paintMouth(canvas, 24, 32); + _paintCheeks(canvas, 13, 30, 35, 30); + _paintCatWhiskers(canvas); + } + + void _paintCatEars(Canvas canvas) { + final angle = (earProgress * 0.14 - 0.07) * animationIntensity; + final earPaint = Paint() + ..shader = ui.Gradient.linear(const Offset(7, 3), const Offset(18, 16), [ + const Color(0xFFFFD4A8), + const Color(0xFFE8A560), + ]) + ..isAntiAlias = true; + final innerPaint = Paint() + ..color = const Color(0xFFFFB0B0).withValues(alpha: 0.5) + ..isAntiAlias = true; + + canvas.save(); + canvas.translate(14, 16); + canvas.rotate(angle); + canvas.translate(-14, -16); + final le = Path() + ..moveTo(11, 16) + ..cubicTo(7, 3, 18, 5, 18, 13) + ..close(); + canvas.drawPath(le, earPaint); + final li = Path() + ..moveTo(12, 14) + ..cubicTo(10, 6, 17, 8, 16, 13) + ..close(); + canvas.drawPath(li, innerPaint); + canvas.restore(); + + canvas.save(); + canvas.translate(34, 16); + canvas.rotate(-angle); + canvas.translate(-34, -16); + final re = Path() + ..moveTo(37, 16) + ..cubicTo(41, 3, 30, 5, 30, 13) + ..close(); + canvas.drawPath(re, earPaint); + final ri = Path() + ..moveTo(36, 14) + ..cubicTo(38, 6, 31, 8, 32, 13) + ..close(); + canvas.drawPath(ri, innerPaint); + canvas.restore(); + } + + void _paintCatWhiskers(Canvas canvas) { + final wa = (earProgress * 0.09 - 0.045) * animationIntensity; + final wp = Paint() + ..color = const Color(0xFF8B7355).withValues(alpha: 0.35) + ..strokeWidth = 0.6 + ..isAntiAlias = true; + + canvas.save(); + canvas.translate(14, 30); + canvas.rotate(wa); + canvas.translate(-14, -30); + canvas.drawLine(const Offset(14, 28), const Offset(4, 27), wp); + canvas.drawLine(const Offset(14, 30), const Offset(3, 30), wp); + canvas.drawLine(const Offset(14, 32), const Offset(4, 33), wp); + canvas.restore(); + + canvas.save(); + canvas.translate(34, 30); + canvas.rotate(-wa); + canvas.translate(-34, -30); + canvas.drawLine(const Offset(34, 28), const Offset(44, 27), wp); + canvas.drawLine(const Offset(34, 30), const Offset(45, 30), wp); + canvas.drawLine(const Offset(34, 32), const Offset(44, 33), wp); + canvas.restore(); + } + + // ============================================================ + // 狗狗造型 + // ============================================================ + void _paintDogHead(Canvas canvas) { + _paintHeadBase(canvas, [ + const Color(0xFFE8C090), + const Color(0xFFD4A870), + const Color(0xFFC09050), + ]); + _paintDogEars(canvas); + _paintEyes(canvas, 18, 26, 30, 26); + _paintWorriedEyebrows(canvas); + _paintNose( + canvas, + 24, + 29.5, + 5, + 3.6, + const Color(0xFF5A4030), + const Color(0xFF3A2515), + 0.3, + radius: 4, + ); + _paintNoseHighlight(canvas, 22.5, 28.2, 2, 1.0, 0.2); + _paintMouth(canvas, 24, 32); + _paintDogTongue(canvas); + _paintCheeks(canvas, 13, 30, 35, 30); + } + + void _paintDogEars(Canvas canvas) { + final droop = earProgress * 4.0 * animationIntensity; + final earPaint = Paint() + ..shader = ui.Gradient.linear(const Offset(1, 16), const Offset(12, 36), [ + const Color(0xFFD4A870), + const Color(0xFFB08040), + ]) + ..isAntiAlias = true; + final innerPaint = Paint() + ..color = const Color(0xFFFFB0B0).withValues(alpha: 0.4) + ..isAntiAlias = true; + + final le = Path() + ..moveTo(9, 16) + ..cubicTo(2, 18, 1, 30 + droop, 6, 34 + droop) + ..cubicTo(9, 36 + droop, 12, 28, 13, 18) + ..close(); + canvas.drawPath(le, earPaint); + final li = Path() + ..moveTo(10, 18) + ..cubicTo(5, 20, 4, 28 + droop, 7, 32 + droop) + ..cubicTo(9, 33 + droop, 11, 27, 12, 19) + ..close(); + canvas.drawPath(li, innerPaint); + + final re = Path() + ..moveTo(39, 16) + ..cubicTo(46, 18, 47, 30 + droop, 42, 34 + droop) + ..cubicTo(39, 36 + droop, 36, 28, 35, 18) + ..close(); + canvas.drawPath(re, earPaint); + final ri = Path() + ..moveTo(38, 18) + ..cubicTo(43, 20, 44, 28 + droop, 41, 32 + droop) + ..cubicTo(39, 33 + droop, 37, 27, 36, 19) + ..close(); + canvas.drawPath(ri, innerPaint); + } + + void _paintDogTongue(Canvas canvas) { + final show = + expression == CharacterExpression.smile || + expression == CharacterExpression.love || + expression == CharacterExpression.tickle; + if (!show && expressionProgress < 0.5) return; + final ext = show ? expressionProgress : (1.0 - expressionProgress); + if (ext <= 0.0) return; + canvas.drawOval( + Rect.fromLTWH(22, 33, 4, 3.0 * ext), + Paint() + ..color = const Color(0xFFFF8888).withValues(alpha: 0.8 * ext) + ..isAntiAlias = true, + ); + } + + // ============================================================ + // 男孩造型 + // ============================================================ + void _paintBoyHead(Canvas canvas) { + _paintHeadBase(canvas, [ + const Color(0xFFFFDAB9), + const Color(0xFFFFCFA8), + const Color(0xFFF0B890), + ]); + _paintBoyEars(canvas); + _paintBoyHair(canvas); + _paintEyes(canvas, 18, 26, 30, 26); + _paintBoyEyebrows(canvas); + _paintHumanNose(canvas); + _paintMouth(canvas, 24, 32); + _paintCheeks(canvas, 13, 30, 35, 30); + } + + void _paintBoyHair(Canvas canvas) { + final basePaint = Paint() + ..shader = ui.Gradient.linear(const Offset(10, 7), const Offset(38, 18), [ + const Color(0xFF6B4F3A), + const Color(0xFF4A3728), + ]) + ..isAntiAlias = true; + canvas.drawPath( + Path() + ..moveTo(8, 22) + ..quadraticBezierTo(10, 8, 24, 7) + ..quadraticBezierTo(38, 8, 40, 22) + ..quadraticBezierTo(38, 18, 24, 16) + ..quadraticBezierTo(10, 18, 8, 22) + ..close(), + basePaint, + ); + final bangPaint = Paint() + ..shader = ui.Gradient.linear(const Offset(9, 12), const Offset(38, 18), [ + const Color(0xFF5C4033), + const Color(0xFF4A3728), + ]) + ..strokeWidth = 2.8 + ..strokeCap = ui.StrokeCap.round + ..style = ui.PaintingStyle.stroke + ..isAntiAlias = true; + canvas.drawPath( + Path() + ..moveTo(9, 18) + ..quadraticBezierTo(12, 12, 16, 17), + bangPaint, + ); + canvas.drawPath( + Path() + ..moveTo(15, 16) + ..quadraticBezierTo(20, 10, 24, 15), + bangPaint, + ); + canvas.drawPath( + Path() + ..moveTo(22, 15) + ..quadraticBezierTo(28, 10, 33, 17), + bangPaint, + ); + canvas.drawPath( + Path() + ..moveTo(30, 17) + ..quadraticBezierTo(35, 13, 38, 20), + bangPaint, + ); + canvas.drawPath( + Path() + ..moveTo(12, 12) + ..quadraticBezierTo(20, 8, 36, 14), + Paint() + ..color = const Color(0xFFFFFFFF).withValues(alpha: 0.08) + ..strokeWidth = 2.0 + ..strokeCap = ui.StrokeCap.round + ..style = ui.PaintingStyle.stroke + ..isAntiAlias = true, + ); + } + + void _paintBoyEyebrows(Canvas canvas) { + double lift = 0.0; + if (expression == CharacterExpression.surprise) { + lift = -3.0 * expressionProgress * animationIntensity; + } else if (expression == CharacterExpression.worried) { + lift = 0.0; + } + final isWorriedBrow = + expression == CharacterExpression.worried && expressionProgress > 0.1; + final bp = Paint() + ..color = const Color(0xFF5C4033).withValues(alpha: 0.6) + ..strokeWidth = 1.8 + ..strokeCap = ui.StrokeCap.round + ..isAntiAlias = true; + if (isWorriedBrow) { + canvas.drawLine(Offset(14, 22 + lift), Offset(20, 24 + lift), bp); + canvas.drawLine(Offset(27, 24 + lift), Offset(34, 22 + lift), bp); + } else { + canvas.drawLine(Offset(14, 22 + lift), Offset(21, 22.5 + lift), bp); + canvas.drawLine(Offset(27, 22.5 + lift), Offset(34, 22 + lift), bp); + } + } + + void _paintBoyEars(Canvas canvas) { + final earPaint = Paint() + ..shader = ui.Gradient.radial( + const Offset(9, 24), + 4, + [const Color(0xFFFFDAB9), const Color(0xFFF0B890)], + [0.0, 1.0], + ) + ..isAntiAlias = true; + final innerPaint = Paint() + ..color = const Color(0xFFFFB0B0).withValues(alpha: 0.3) + ..isAntiAlias = true; + canvas.drawArc( + const Rect.fromLTWH(5, 20, 8, 8), + -math.pi / 2, + math.pi, + false, + earPaint, + ); + canvas.drawArc( + const Rect.fromLTWH(6, 21, 6, 6), + -math.pi / 2, + math.pi, + false, + innerPaint, + ); + canvas.drawArc( + const Rect.fromLTWH(35, 20, 8, 8), + math.pi / 2, + math.pi, + false, + earPaint, + ); + canvas.drawArc( + const Rect.fromLTWH(36, 21, 6, 6), + math.pi / 2, + math.pi, + false, + innerPaint, + ); + } + + void _paintHumanNose(Canvas canvas) { + final sx = 1.0 + noseProgress * 0.2 * animationIntensity; + final sy = 1.0 - noseProgress * 0.2 * animationIntensity; + canvas.save(); + canvas.translate(24, 29); + canvas.scale(sx, sy); + canvas.translate(-24, -29); + canvas.drawOval( + const Rect.fromLTWH(22.5, 27.5, 3, 2.5), + Paint() + ..color = const Color(0xFFE8B898).withValues(alpha: 0.5) + ..isAntiAlias = true, + ); + canvas.restore(); + } + + // ============================================================ + // 女孩造型 + // ============================================================ + void _paintGirlHead(Canvas canvas) { + _paintHeadBase(canvas, [ + const Color(0xFFFFE4D0), + const Color(0xFFFFD4B8), + const Color(0xFFF5C0A0), + ]); + _paintGirlEars(canvas); + _paintGirlHair(canvas); + _paintEyes(canvas, 18, 26, 30, 26); + _paintWorriedEyebrows(canvas); + _paintGirlLashes(canvas); + _paintHumanNose(canvas); + _paintMouth(canvas, 24, 32); + _paintCheeks(canvas, 13, 30, 35, 30, baseRx: 4.0, maxAlpha: 0.85); + } + + void _paintGirlHair(Canvas canvas) { + final basePaint = Paint() + ..shader = ui.Gradient.linear(const Offset(6, 5), const Offset(42, 40), [ + const Color(0xFF4A3525), + const Color(0xFF2A1505), + ]) + ..isAntiAlias = true; + canvas.drawPath( + Path() + ..moveTo(6, 24) + ..quadraticBezierTo(6, 6, 24, 5) + ..quadraticBezierTo(42, 6, 42, 24) + ..quadraticBezierTo(42, 38, 38, 40) + ..quadraticBezierTo(36, 36, 34, 32) + ..lineTo(34, 22) + ..quadraticBezierTo(32, 14, 24, 12) + ..quadraticBezierTo(16, 14, 14, 22) + ..lineTo(14, 32) + ..quadraticBezierTo(12, 36, 10, 40) + ..quadraticBezierTo(6, 38, 6, 24) + ..close(), + basePaint, + ); + final bangPaint = Paint() + ..shader = ui.Gradient.linear( + const Offset(12, 11), + const Offset(36, 20), + [const Color(0xFF3A2515), const Color(0xFF2A1505)], + ) + ..isAntiAlias = true; + canvas.drawPath( + Path() + ..moveTo(12, 20) + ..quadraticBezierTo(14, 12, 24, 11) + ..quadraticBezierTo(34, 12, 36, 20) + ..lineTo(35, 19) + ..quadraticBezierTo(33, 14, 24, 13) + ..quadraticBezierTo(15, 14, 13, 19) + ..close(), + bangPaint, + ); + canvas.drawPath( + Path() + ..moveTo(14, 12) + ..quadraticBezierTo(22, 8, 34, 14), + Paint() + ..color = const Color(0xFFFFFFFF).withValues(alpha: 0.1) + ..strokeWidth = 1.5 + ..strokeCap = ui.StrokeCap.round + ..style = ui.PaintingStyle.stroke + ..isAntiAlias = true, + ); + final strandPaint = Paint() + ..color = const Color(0xFF1A0A00).withValues(alpha: 0.15) + ..strokeWidth = 0.5 + ..strokeCap = ui.StrokeCap.round + ..style = ui.PaintingStyle.stroke + ..isAntiAlias = true; + canvas.drawPath( + Path() + ..moveTo(18, 8) + ..quadraticBezierTo(17, 20, 12, 36), + strandPaint, + ); + canvas.drawPath( + Path() + ..moveTo(24, 6) + ..quadraticBezierTo(24, 18, 24, 34), + strandPaint, + ); + canvas.drawPath( + Path() + ..moveTo(30, 8) + ..quadraticBezierTo(31, 20, 36, 36), + strandPaint, + ); + } + + void _paintGirlLashes(Canvas canvas) { + final lp = Paint() + ..color = const Color(0xFF3A2515).withValues(alpha: 0.5) + ..strokeWidth = 1.0 + ..strokeCap = ui.StrokeCap.round + ..style = ui.PaintingStyle.stroke + ..isAntiAlias = true; + canvas.drawPath( + Path() + ..moveTo(16, 23) + ..quadraticBezierTo(18, 21, 20, 23), + lp, + ); + canvas.drawPath( + Path() + ..moveTo(15, 22) + ..quadraticBezierTo(18, 19, 21, 22), + lp, + ); + canvas.drawPath( + Path() + ..moveTo(28, 23) + ..quadraticBezierTo(30, 21, 32, 23), + lp, + ); + canvas.drawPath( + Path() + ..moveTo(27, 22) + ..quadraticBezierTo(30, 19, 33, 22), + lp, + ); + } + + void _paintGirlEars(Canvas canvas) { + final earPaint = Paint() + ..shader = ui.Gradient.radial( + const Offset(11, 26), + 3, + [const Color(0xFFFFE4D0), const Color(0xFFF5C0A0)], + [0.0, 1.0], + ) + ..isAntiAlias = true; + final innerPaint = Paint() + ..color = const Color(0xFFFFB0B0).withValues(alpha: 0.3) + ..isAntiAlias = true; + canvas.drawArc( + const Rect.fromLTWH(7, 22, 6, 6), + -math.pi / 2, + math.pi, + false, + earPaint, + ); + canvas.drawArc( + const Rect.fromLTWH(8, 23, 4, 4), + -math.pi / 2, + math.pi, + false, + innerPaint, + ); + canvas.drawArc( + const Rect.fromLTWH(35, 22, 6, 6), + math.pi / 2, + math.pi, + false, + earPaint, + ); + canvas.drawArc( + const Rect.fromLTWH(36, 23, 4, 4), + math.pi / 2, + math.pi, + false, + innerPaint, + ); + } + + // 共用部件 + void _paintNose( + Canvas canvas, + double cx, + double cy, + double w, + double h, + Color c1, + Color c2, + double scaleAmt, { + double radius = 3, + }) { + final sx = 1.0 + noseProgress * scaleAmt * animationIntensity; + final sy = 1.0 - noseProgress * scaleAmt * animationIntensity; + canvas.save(); + canvas.translate(cx, cy); + canvas.scale(sx, sy); + canvas.translate(-cx, -cy); + canvas.drawOval( + Rect.fromLTWH(cx - w / 2, cy - h / 2, w, h), + Paint() + ..shader = ui.Gradient.radial( + Offset(cx - 1, cy - 0.5), + radius, + [c1, c2], + [0.0, 1.0], + ) + ..isAntiAlias = true, + ); + canvas.restore(); + } + + void _paintNoseHighlight( + Canvas canvas, + double x, + double y, + double w, + double h, + double alpha, + ) { + canvas.drawOval( + Rect.fromLTWH(x, y, w, h), + Paint() + ..color = const Color(0xFFFFFFFF).withValues(alpha: alpha) + ..isAntiAlias = true, + ); + } + + void _paintEyes( + Canvas canvas, + double lCx, + double cy, + double rCx, + double cy2, + ) { + final bf = _getBlinkFactor(); + final isWink = + expression == CharacterExpression.wink && expressionProgress > 0.3; + final isLove = + expression == CharacterExpression.love && expressionProgress > 0.3; + final isLookRight = expression == CharacterExpression.lookRight; + final isDizzy = + expression == CharacterExpression.dizzy && expressionProgress > 0.3; + final isWorried = + expression == CharacterExpression.worried && expressionProgress > 0.3; + final dx = eyeOffset.dx, dy = eyeOffset.dy; + final extraDx = isLookRight ? 2.0 : 0.0; + + if (isDizzy) { + _paintDizzyEye(canvas, lCx + dx, cy + dy); + _paintDizzyEye(canvas, rCx + dx, cy2 + dy); + } else if (isLove) { + _paintHeartEye(canvas, lCx + dx, cy + dy); + _paintHeartEye(canvas, rCx + dx, cy2 + dy); + } else if (isWink) { + _paintSingleEye( + canvas, + lCx + dx + extraDx, + cy + dy, + bf, + false, + isWorried ? 0.9 : 1.0, + ); + _paintSingleEye( + canvas, + rCx + dx + extraDx, + cy2 + dy, + 0.0, + true, + isWorried ? 0.9 : 1.0, + ); + } else { + _paintSingleEye( + canvas, + lCx + dx + extraDx, + cy + dy, + bf, + false, + isWorried ? 0.9 : 1.0, + ); + _paintSingleEye( + canvas, + rCx + dx + extraDx, + cy2 + dy, + bf, + false, + isWorried ? 0.9 : 1.0, + ); + } + } + + double _getMouthCurve() { + if (expression != CharacterExpression.idle) return 0.0; + return switch (mood) { + CharacterMood.happy => 0.3, + CharacterMood.excited => 0.5, + CharacterMood.neutral => 0.0, + CharacterMood.bored => -0.1, + CharacterMood.sleepy => -0.05, + CharacterMood.worried => -0.15, + null => 0.0, + }; + } + + double _getMoodEyeOpenness() { + if (expression != CharacterExpression.idle) return 1.0; + return switch (mood) { + CharacterMood.happy => 1.0, + CharacterMood.excited => 1.2, + CharacterMood.neutral => 1.0, + CharacterMood.bored => 0.7, + CharacterMood.sleepy => 0.4, + CharacterMood.worried => 0.9, + null => 1.0, + }; + } + + double _getBlinkFactor() { + final idleBlink = idleProgress < 0.1 ? (0.1 - idleProgress) / 0.1 : 0.0; + final exprBlink = expression == CharacterExpression.blink + ? expressionProgress + : 0.0; + final thinkBlink = expression == CharacterExpression.think + ? 0.3 * expressionProgress + : 0.0; + final moodBlink = + mood == CharacterMood.sleepy && expression == CharacterExpression.idle + ? 0.4 + : 0.0; + return (idleBlink + exprBlink + thinkBlink + moodBlink).clamp(0.0, 1.0); + } + + void _paintSingleEye( + Canvas canvas, + double cx, + double cy, + double bf, + bool closed, [ + double eyeScale = 1.0, + ]) { + final moodScale = _getMoodEyeOpenness() * eyeScale; + final ry = closed ? 0.5 : (3.3 * (1.0 - bf * 0.85) * moodScale); + if (ry < 0.5) { + canvas.drawLine( + Offset(cx - 2.5, cy), + Offset(cx + 2.5, cy), + Paint() + ..color = const Color(0xFF3A2515) + ..strokeWidth = 1.2 + ..strokeCap = ui.StrokeCap.round + ..isAntiAlias = true, + ); + return; + } + canvas.drawOval( + Rect.fromCenter(center: Offset(cx, cy), width: 5.6, height: ry * 2), + Paint() + ..color = const Color(0xFFFFFFFF) + ..isAntiAlias = true, + ); + canvas.drawOval( + Rect.fromCenter(center: Offset(cx, cy), width: 3.2, height: ry * 1.2), + Paint() + ..color = const Color(0xFF3A2515) + ..isAntiAlias = true, + ); + canvas.drawOval( + Rect.fromCenter( + center: Offset(cx - 0.8, cy - ry * 0.3), + width: 2.2, + height: 2.2, + ), + Paint() + ..color = const Color(0xFFFFFFFF).withValues(alpha: 0.85) + ..isAntiAlias = true, + ); + canvas.drawOval( + Rect.fromCenter( + center: Offset(cx + 0.6, cy + ry * 0.2), + width: 1.0, + height: 1.0, + ), + Paint() + ..color = const Color(0xFFFFFFFF).withValues(alpha: 0.4) + ..isAntiAlias = true, + ); + } + + void _paintDizzyEye(Canvas canvas, double cx, double cy) { + final rotation = expressionProgress * math.pi * 2 * 3; + canvas.save(); + canvas.translate(cx, cy); + canvas.rotate(rotation); + canvas.translate(-cx, -cy); + final dp = Paint() + ..color = const Color(0xFF3A2515) + ..strokeWidth = 1.5 + ..strokeCap = ui.StrokeCap.round + ..style = ui.PaintingStyle.stroke + ..isAntiAlias = true; + canvas.drawLine(Offset(cx - 2.5, cy - 2.5), Offset(cx + 2.5, cy + 2.5), dp); + canvas.drawLine(Offset(cx + 2.5, cy - 2.5), Offset(cx - 2.5, cy + 2.5), dp); + canvas.restore(); + } + + void _paintHeartEye(Canvas canvas, double cx, double cy) { + final sc = 0.8 + expressionProgress * 0.3; + canvas.save(); + canvas.translate(cx, cy); + canvas.scale(sc, sc); + canvas.translate(-cx, -cy); + canvas.drawPath( + Path() + ..moveTo(cx, cy + 2) + ..cubicTo(cx - 3, cy - 1, cx - 3, cy - 3, cx, cy - 1.5) + ..cubicTo(cx + 3, cy - 3, cx + 3, cy - 1, cx, cy + 2) + ..close(), + Paint() + ..color = const Color(0xFFFF6B8A) + ..isAntiAlias = true, + ); + canvas.restore(); + } + + void _paintMouth(Canvas canvas, double cx, double cy) { + final mp = Paint() + ..color = const Color(0xFF8B5E3C) + ..strokeWidth = 1.0 + ..style = ui.PaintingStyle.stroke + ..strokeCap = ui.StrokeCap.round + ..isAntiAlias = true; + final fp = Paint() + ..color = const Color(0xFF8B5E3C).withValues(alpha: 0.3) + ..isAntiAlias = true; + + switch (expression) { + case CharacterExpression.idle: + final curve = _getMouthCurve(); + if (curve.abs() < 0.01) { + canvas.drawLine( + Offset(cx - 2, cy), + Offset(cx + 2, cy), + mp..strokeWidth = 0.8, + ); + } else if (curve > 0) { + canvas.drawPath( + Path() + ..moveTo(cx - 2, cy) + ..quadraticBezierTo(cx, cy + curve * 8, cx + 2, cy), + mp..strokeWidth = 0.8, + ); + } else { + canvas.drawPath( + Path() + ..moveTo(cx - 2, cy) + ..quadraticBezierTo(cx, cy + curve * 8, cx + 2, cy), + mp..strokeWidth = 0.8, + ); + } + case CharacterExpression.blink: + canvas.drawPath( + Path() + ..moveTo(cx - 2, cy) + ..quadraticBezierTo(cx, cy + 1.5, cx + 2, cy), + mp, + ); + case CharacterExpression.smile: + case CharacterExpression.love: + final p = Path() + ..moveTo(cx - 6, cy - 1) + ..quadraticBezierTo(cx, cy + 6, cx + 6, cy - 1); + canvas.drawPath(p, mp); + canvas.drawPath( + Path() + ..moveTo(cx - 6, cy - 1) + ..quadraticBezierTo(cx, cy + 6, cx + 6, cy - 1) + ..close(), + fp, + ); + case CharacterExpression.surprise: + canvas.drawOval( + Rect.fromCenter(center: Offset(cx, cy + 1), width: 4, height: 5), + mp..style = ui.PaintingStyle.stroke, + ); + case CharacterExpression.wink: + canvas.drawPath( + Path() + ..moveTo(cx - 3, cy) + ..quadraticBezierTo(cx, cy + 3, cx + 3, cy), + mp, + ); + case CharacterExpression.pout: + canvas.drawPath( + Path() + ..moveTo(cx - 3, cy + 1) + ..quadraticBezierTo(cx, cy - 1.5, cx + 3, cy + 1), + mp, + ); + case CharacterExpression.tickle: + canvas.drawPath( + Path() + ..moveTo(cx - 5, cy) + ..quadraticBezierTo(cx, cy + 5, cx + 5, cy), + mp, + ); + case CharacterExpression.lookRight: + canvas.drawPath( + Path() + ..moveTo(cx - 2, cy) + ..quadraticBezierTo(cx + 1, cy + 1.5, cx + 3, cy), + mp, + ); + case CharacterExpression.think: + canvas.drawPath( + Path() + ..moveTo(cx - 3, cy + 1) + ..quadraticBezierTo(cx, cy - 1.5, cx + 3, cy - 1), + mp, + ); + case CharacterExpression.dizzy: + final wave = expressionProgress * 2.0; + canvas.drawPath( + Path() + ..moveTo(cx - 4, cy) + ..quadraticBezierTo(cx - 2, cy - 2 + wave, cx, cy) + ..quadraticBezierTo(cx + 2, cy + 2 - wave, cx + 4, cy), + mp..strokeWidth = 1.2, + ); + case CharacterExpression.worried: + canvas.drawOval( + Rect.fromCenter(center: Offset(cx, cy + 1), width: 4, height: 3.5), + Paint() + ..color = const Color( + 0xFF8B5E3C, + ).withValues(alpha: 0.4 * expressionProgress) + ..isAntiAlias = true, + ); + canvas.drawOval( + Rect.fromCenter(center: Offset(cx, cy + 1), width: 4, height: 3.5), + mp..style = ui.PaintingStyle.stroke, + ); + case CharacterExpression.speaking: + final openAmt = 2.0 + expressionProgress * 4.0; + canvas.drawOval( + Rect.fromCenter( + center: Offset(cx, cy + 1), + width: 5, + height: openAmt, + ), + fp, + ); + canvas.drawOval( + Rect.fromCenter( + center: Offset(cx, cy + 1), + width: 5, + height: openAmt, + ), + mp, + ); + } + } + + void _paintCheeks( + Canvas canvas, + double lCx, + double cy, + double rCx, + double cy2, { + double baseRx = 3.5, + double maxAlpha = 0.7, + }) { + final rx = baseRx + cheekProgress * 2.0 * animationIntensity; + final ry = 2.2 + cheekProgress * 1.0 * animationIntensity; + final alpha = cheekProgress * maxAlpha * animationIntensity; + if (alpha < 0.01) return; + + for (final c in [Offset(lCx, cy), Offset(rCx, cy2)]) { + canvas.drawOval( + Rect.fromCenter(center: c, width: rx * 2, height: ry * 2), + Paint() + ..shader = ui.Gradient.radial( + c, + rx, + [ + const Color(0xFFFFB0B0).withValues(alpha: alpha), + const Color(0xFFFFB0B0).withValues(alpha: 0.0), + ], + [0.0, 1.0], + ) + ..isAntiAlias = true, + ); + } + } + + void _paintWorriedEyebrows(Canvas canvas) { + if (expression != CharacterExpression.worried || expressionProgress < 0.1) + return; + const s = 1.0; + final paint = Paint() + ..color = const Color( + 0xFF5C4033, + ).withValues(alpha: 0.6 * expressionProgress) + ..strokeWidth = 1.5 * s + ..strokeCap = ui.StrokeCap.round + ..style = ui.PaintingStyle.stroke + ..isAntiAlias = true; + + canvas.drawLine(const Offset(14, 22), const Offset(20, 24), paint); + canvas.drawLine(const Offset(28, 24), const Offset(34, 22), paint); + } + + @override + bool shouldRepaint(_AppBarCharacterPainter old) => + characterId != old.characterId || + expression != old.expression || + expressionProgress != old.expressionProgress || + earProgress != old.earProgress || + noseProgress != old.noseProgress || + cheekProgress != old.cheekProgress || + bounceScale != old.bounceScale || + bounceRotation != old.bounceRotation || + eyeOffset != old.eyeOffset || + animationIntensity != old.animationIntensity || + idleProgress != old.idleProgress || + mood != old.mood; +} diff --git a/lib/shared/widgets/appbar_date_display.dart b/lib/shared/widgets/appbar_date_display.dart new file mode 100644 index 00000000..01d81acc --- /dev/null +++ b/lib/shared/widgets/appbar_date_display.dart @@ -0,0 +1,266 @@ +// ============================================================ +// 闲言APP — AppBar拾光栏显示组件 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 可配置的拾光栏显示，支持多信息组合+轮播 +// 上次更新: 电池显示接入BatteryInfoService真实数据 +// ============================================================ + +import 'dart:async'; +import 'dart:convert'; + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; +import 'package:xianyan/core/storage/app_kv_store.dart'; +import 'package:xianyan/core/theme/app_theme.dart'; +import 'package:xianyan/core/theme/app_typography.dart'; +import 'package:xianyan/core/utils/logger.dart'; +import 'package:xianyan/features/settings/providers/date_display_provider.dart'; +import 'package:xianyan/core/services/weather/weather_info_provider.dart'; +import 'package:xianyan/core/services/weather/weather_info_models.dart'; +import 'package:xianyan/core/services/network/ip_location_result.dart'; +import 'package:xianyan/core/services/device/battery_info_service.dart'; + +// ============================================================ +// IP归属地缓存 Provider（同步读取 AppKVStore 缓存） +// ============================================================ + +final ipCacheProvider = Provider((ref) { + try { + const cacheKey = 'ip_location_my_ip'; + final raw = AppKVStore.getString(cacheKey); + if (raw == null || raw.isEmpty) return null; + + final map = jsonDecode(raw) as Map; + final cachedTime = map['_cache_time'] as int? ?? 0; + final now = DateTime.now().millisecondsSinceEpoch; + const cacheExpiry = Duration(hours: 24); + + if (now - cachedTime > cacheExpiry.inMilliseconds) return null; + + final data = map['data']; + if (data is Map) { + return IpLocationResult.fromJson(data); + } + } catch (e) { + Log.w('AppBarDateDisplay: IP缓存读取失败 $e'); + } + return null; +}); + +// ============================================================ +// AppBar 拾光栏主组件 +// ============================================================ + +class AppBarDateDisplay extends ConsumerWidget { + const AppBarDateDisplay({super.key, required this.onTap}); + + final VoidCallback onTap; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final config = ref.watch(dateDisplayProvider); + final ext = AppTheme.ext(context); + + return StreamBuilder( + stream: Stream.periodic( + const Duration(minutes: 1), + (_) => DateTime.now(), + ), + builder: (context, _) { + final weatherState = ref.watch(weatherInfoProvider); + final weatherBrief = weatherState.brief; + final ipResult = ref.watch(ipCacheProvider); + + final displayText = _buildDisplayText( + context, + config, + weatherBrief, + ipResult, + ); + + return GestureDetector( + onTap: onTap, + behavior: HitTestBehavior.opaque, + child: Stack( + clipBehavior: Clip.none, + children: [ + ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 240), + child: displayText.length > 10 && config.marqueeEnabled + ? _MarqueeText( + text: displayText, + style: AppTypography.footnote.copyWith( + color: ext.textSecondary, + ), + ) + : Text( + displayText, + style: AppTypography.footnote.copyWith( + color: ext.textSecondary, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ), + if (config.enabledItems.length > 1) + Positioned( + top: -2, + right: -2, + child: Container( + width: 6, + height: 6, + decoration: BoxDecoration( + color: ext.accent, + shape: BoxShape.circle, + ), + ), + ), + ], + ), + ); + }, + ); + } + + String _buildDisplayText( + BuildContext context, + DateDisplayConfig config, + WeatherBriefInfo? weatherBrief, + IpLocationResult? ipResult, + ) { + final parts = []; + + for (final key in config.enabledItems) { + switch (key) { + case DateDisplayItemKey.date: + final now = DateTime.now(); + try { + final formatted = DateFormat.MMMd( + Localizations.localeOf(context).toString(), + ).format(now); + parts.add(formatted); + } catch (_) { + final month = now.month; + final day = now.day; + parts.add('$month月${day}日'); + } + break; + case DateDisplayItemKey.weather: + final icon = weatherBrief?.icon; + if (icon != null && icon.isNotEmpty) { + parts.add(icon); + } + break; + case DateDisplayItemKey.temp: + final temp = weatherBrief?.temp; + if (temp != null && temp.isNotEmpty && temp != '--') { + parts.add(temp); + } + break; + case DateDisplayItemKey.city: + final city = weatherBrief?.city; + if (city != null && city.isNotEmpty && city != '未知') { + parts.add(city); + } + break; + case DateDisplayItemKey.device: + parts.add('iPhone'); + break; + case DateDisplayItemKey.battery: + final level = BatteryInfoService.instance.currentLevel; + final charging = BatteryInfoService.instance.isCharging; + parts.add('🔋$level%${charging ? ' ⚡' : ''}'); + break; + case DateDisplayItemKey.ip: + final displayIp = ipResult?.displayIp; + if (displayIp != null && displayIp.isNotEmpty) { + parts.add(displayIp); + } + break; + case DateDisplayItemKey.custom: + if (config.customText.isNotEmpty) { + parts.add(config.customText); + } + break; + } + } + + if (parts.isEmpty) { + final now = DateTime.now(); + return '${now.month}月${now.day}日'; + } + + return parts.join(' · '); + } +} + +// ============================================================ +// 轮播文本组件 +// ============================================================ + +class _MarqueeText extends StatefulWidget { + const _MarqueeText({required this.text, required this.style}); + + final String text; + final TextStyle style; + + @override + State<_MarqueeText> createState() => _MarqueeTextState(); +} + +class _MarqueeTextState extends State<_MarqueeText> + with SingleTickerProviderStateMixin { + late final AnimationController _controller; + + @override + void initState() { + super.initState(); + _controller = AnimationController( + vsync: this, + duration: const Duration(seconds: 6), + )..repeat(); + } + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return ClipRect( + child: AnimatedBuilder( + animation: _controller, + builder: (context, child) { + final t = _controller.value; + double offset; + + if (t < 1 / 6) { + offset = 0.0; + } else if (t < 5 / 6) { + final scrollT = (t - 1 / 6) / (4 / 6); + offset = scrollT; + } else { + offset = 1.0; + } + + return FractionalTranslation( + translation: Offset(-offset * 0.5, 0), + child: child, + ); + }, + child: Text( + widget.text, + style: widget.style, + maxLines: 1, + softWrap: false, + overflow: TextOverflow.visible, + ), + ), + ); + } +} diff --git a/lib/shared/widgets/character_tip_bubble.dart b/lib/shared/widgets/character_tip_bubble.dart new file mode 100644 index 00000000..b870d436 --- /dev/null +++ b/lib/shared/widgets/character_tip_bubble.dart @@ -0,0 +1,101 @@ +// ============================================================ +// 闲言APP — 角色拾光Tips气泡组件 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 点击角色后弹出的消息气泡，支持4类内容 +// 上次更新: 初始版本 +// ============================================================ + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import 'package:xianyan/core/theme/app_radius.dart'; +import 'package:xianyan/core/theme/app_theme.dart'; +import 'package:xianyan/core/theme/app_typography.dart'; +import 'package:xianyan/features/home/providers/character_tips_provider.dart'; + +class CharacterTipBubble extends ConsumerWidget { + const CharacterTipBubble({super.key, required this.characterId}); + + final String characterId; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final state = ref.watch(characterTipsProvider); + final ext = AppTheme.ext(context); + + if (!state.isExpanded || state.currentTip == null) { + return const SizedBox.shrink(); + } + + return AnimatedOpacity( + opacity: state.isExpanded ? 1.0 : 0.0, + duration: const Duration(milliseconds: 300), + child: AnimatedSlide( + offset: state.isExpanded ? Offset.zero : const Offset(0, 0.3), + duration: const Duration(milliseconds: 300), + curve: Curves.easeOutBack, + child: GestureDetector( + onTap: () => + ref.read(characterTipsProvider.notifier).dismissTip(), + child: Container( + constraints: const BoxConstraints(maxWidth: 200), + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + ext.accent.withValues(alpha: 0.12), + ext.accent.withValues(alpha: 0.06), + ], + ), + borderRadius: AppRadius.lgBorder, + border: Border.all( + color: ext.accent.withValues(alpha: 0.2), + width: 0.5, + ), + boxShadow: [ + BoxShadow( + color: ext.accent.withValues(alpha: 0.08), + blurRadius: 12, + offset: const Offset(0, 4), + ), + ], + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + state.currentTip!.category.emoji, + style: const TextStyle(fontSize: 12), + ), + const SizedBox(width: 4), + Text( + state.currentTip!.category.label, + style: AppTypography.caption2.copyWith( + color: ext.accent, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + const SizedBox(height: 4), + Text( + state.currentTip!.content, + style: AppTypography.footnote.copyWith( + color: ext.textPrimary, + height: 1.3, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/shared/widgets/shader_card_background.dart b/lib/shared/widgets/shader_card_background.dart new file mode 100644 index 00000000..b3ab0660 --- /dev/null +++ b/lib/shared/widgets/shader_card_background.dart @@ -0,0 +1,112 @@ +// ============================================================ +// 闲言APP — Shader卡片背景组件 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: Fragment Shader流体渐变背景 +// 上次更新: 初始版本 +// ============================================================ + +import 'dart:ui' as ui; +import 'package:flutter/scheduler.dart'; +import 'package:flutter/widgets.dart'; +import 'package:xianyan/core/utils/logger.dart'; + +class ShaderCardBackground extends StatefulWidget { + const ShaderCardBackground({super.key, this.touchOffset}); + final Offset? touchOffset; + + @override + State createState() => _ShaderCardBackgroundState(); +} + +class _ShaderCardBackgroundState extends State + with SingleTickerProviderStateMixin { + late Ticker _ticker; + double _time = 0; + ui.FragmentProgram? _program; + bool _loaded = false; + + @override + void initState() { + super.initState(); + _ticker = createTicker(_onTick); + _ticker.start(); + _loadShader(); + } + + Future _loadShader() async { + try { + _program = await ui.FragmentProgram.fromAsset('shaders/fluid.frag'); + if (mounted) setState(() => _loaded = true); + } catch (e) { + Log.e('ShaderCardBackground load error', e); + } + } + + void _onTick(Duration elapsed) { + _time = elapsed.inMicroseconds / 1000000.0; + if (mounted) setState(() {}); + } + + @override + void dispose() { + _ticker.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + if (!_loaded || _program == null) { + return Container( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + const Color(0xFF6699EE).withValues(alpha: 0.6), + const Color(0xFFB366CC).withValues(alpha: 0.6), + ], + ), + ), + ); + } + + return CustomPaint( + painter: _ShaderPainter( + program: _program!, + time: _time, + touch: widget.touchOffset ?? Offset.zero, + ), + ); + } +} + +class _ShaderPainter extends CustomPainter { + _ShaderPainter({ + required this.program, + required this.time, + required this.touch, + }); + + final ui.FragmentProgram program; + final double time; + final Offset touch; + + @override + void paint(Canvas canvas, Size size) { + final shader = program.fragmentShader(); + shader.setFloat(0, time); + shader.setFloat(1, size.width); + shader.setFloat(2, size.height); + shader.setFloat(3, touch.dx); + shader.setFloat(4, touch.dy); + + final paint = Paint()..shader = shader; + canvas.drawRect(Offset.zero & size, paint); + } + + @override + bool shouldRepaint(_ShaderPainter oldDelegate) { + return oldDelegate.time != time || oldDelegate.touch != touch; + } +} diff --git a/lib/shared/widgets/tts_player_bar.dart b/lib/shared/widgets/tts_player_bar.dart new file mode 100644 index 00000000..826853da --- /dev/null +++ b/lib/shared/widgets/tts_player_bar.dart @@ -0,0 +1,154 @@ +// ============================================================ +// 闲言APP — TTS朗读播放条组件 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 句子详情Sheet中的朗读控制条 +// 上次更新: 初始版本 +// ============================================================ + +import 'dart:async'; + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:xianyan/core/services/audio/tts_service.dart'; +import 'package:xianyan/core/theme/app_theme.dart'; +import 'package:xianyan/core/theme/app_spacing.dart'; +import 'package:xianyan/core/theme/app_typography.dart'; +import 'package:xianyan/core/theme/app_radius.dart'; + +class TtsPlayerBar extends StatefulWidget { + const TtsPlayerBar({super.key, required this.text}); + + final String text; + + @override + State createState() => _TtsPlayerBarState(); +} + +class _TtsPlayerBarState extends State { + StreamSubscription? _stateSub; + StreamSubscription<(int, int, String)>? _progressSub; + double _progress = 0.0; + bool _isPlaying = false; + + @override + void initState() { + super.initState(); + final tts = TtsService.instance; + _isPlaying = tts.isSpeaking; + _stateSub = tts.onStateChanged.listen(_onStateChanged); + _progressSub = tts.onProgress.listen(_onProgress); + } + + void _onStateChanged(TtsState state) { + if (!mounted) return; + setState(() { + _isPlaying = state == TtsState.speaking; + if (state == TtsState.idle) { + _progress = 0.0; + } + }); + } + + void _onProgress((int, int, String) data) { + if (!mounted) return; + final (start, end, _) = data; + if (end > 0) { + setState(() { + _progress = (start / end).clamp(0.0, 1.0); + }); + } + } + + void _togglePlay() { + final tts = TtsService.instance; + if (_isPlaying) { + tts.pause(); + } else { + tts.speak(widget.text); + } + } + + void _stop() { + TtsService.instance.stop(); + } + + @override + void dispose() { + _stateSub?.cancel(); + _progressSub?.cancel(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final ext = AppTheme.ext(context); + + return Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + decoration: BoxDecoration( + color: ext.bgSecondary, + borderRadius: AppRadius.lgBorder, + ), + child: Row( + children: [ + GestureDetector( + onTap: _togglePlay, + child: Container( + width: 36, + height: 36, + decoration: BoxDecoration( + color: ext.accent, + shape: BoxShape.circle, + ), + child: Icon( + _isPlaying + ? CupertinoIcons.pause_fill + : CupertinoIcons.play_fill, + color: CupertinoColors.white, + size: 18, + ), + ), + ), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ClipRRect( + borderRadius: AppRadius.fullBorder, + child: LinearProgressIndicator( + value: _progress, + backgroundColor: ext.overlaySubtle, + valueColor: AlwaysStoppedAnimation(ext.accent), + minHeight: 3, + ), + ), + const SizedBox(height: 4), + Text( + _isPlaying ? '正在朗读...' : (_progress > 0 ? '已暂停' : '点击播放'), + style: AppTypography.caption2.copyWith(color: ext.textHint), + ), + ], + ), + ), + if (_isPlaying || _progress > 0) + GestureDetector( + onTap: _stop, + child: Padding( + padding: const EdgeInsets.all(8), + child: Icon( + CupertinoIcons.stop_fill, + size: 20, + color: ext.iconSecondary, + ), + ), + ), + ], + ), + ); + } +} diff --git a/prototype_appbar.html b/prototype_appbar.html new file mode 100644 index 00000000..b5df87cf --- /dev/null +++ b/prototype_appbar.html @@ -0,0 +1,1803 @@ + + + + + +闲言 AppBar 扩展设计 - 交互原型 v2 + + + + +
+
+
📱 AppBar 交互原型 v2（点击角色/闲言/日期体验）
+
+
+ 9:41 +
+ + +
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 闲言 +
+ +
+ 5月20日 + +
+ +
+
+ +
+
+
+ +
🐱 喵~ 点击我试试！
+ +
+
人生如逆旅，我亦是行人。
+
— 苏轼《临江仙》
+
+ +
+
+ 🎨 + 创作卡片 +
+
+ 📝 + 编辑此句 +
+
+ +
+ 📖 句子广场 + 最新 ↓ +
+ +
+
+
山有木兮木有枝，心悦君兮君不知。
+
《越人歌》❤️ 2.3k
+
+
+
落霞与孤鹜齐飞，秋水共长天一色。
+
王勃《滕王阁序》❤️ 1.8k
+
+
+
但愿人长久，千里共婵娟。
+
苏轼《水调歌头》❤️ 3.1k
+
+
+ +
+
+ +
+
+
🐱
+
闲言
+
+
+
🧭
+
发现
+
+
+
👤
+
我的
+
+
+
+ +
+ +
+
+
+
+ 日期栏设置 +
✕
+
+ + +
+
🌤 天气信息
+
+
+
☀️
+
26°
+
晴 · 杭州
+
+
+
💧
+
62%
+
湿度
+
+
+
🌬
+
东南3级
+
风向风力
+
+
+
🛡
+
优
+
空气质量
+
+
+
+ + +
+
📱 设备信息
+
+
+
📲
+
iPhone 16
+
设备型号
+
+
+
🔋
+
85%
+
电池状态
+
+
+
+ + +
+
🌐 网络/IP
+
+
+
📍
+
192.168.1.***
+
IP归属地 · 浙江杭州 · WiFi
+
+
+
+ + +
+
✏️ 自定义文案 5/14
+ +
+ + +
+
📋 日期栏显示项 2/3
+
+
📅 日期 ✓
+
🌤 天气 ✓
+
🌡 温度
+
📍 城市
+
📱 设备
+
🔋 电池
+
🌐 IP
+
✏️ 自定义
+
+
+ + +
+
+
+
🔄 轮播显示
+
文字超过10字时自动滚动轮播
+
+
+
+
+
+
+ + +
+
⚡ 动画强度
+ +
+ 关闭 + 柔和 + 标准 + 强烈 +
+
+ +
+ +
+
+
+
+ +
+
+ + ① 角色 - 点击/双击/长按（耳朵鼻子脸蛋全动画） +
+
+ + ② 闲言 - 点击后角色看向标题 +
+
+ + ③ 日期 - 最多3项+轮播+14字限制 +
+
+
+
+ + +
+

🎯 方案A 动画系统设计

+

增强 CustomPainter · 3D质感 · 全部件动画 · 动画强度联动

+ +
+
+
👂
+
+
耳朵动画
+
点击摆动、惊讶竖起、开心下垂、挠痒快速抖动。独立transform-origin，受动画强度影响幅度
+
+
+
+
👃
+
+
鼻子动画
+
点击抽动、闻嗅缩放、挠痒快速颤动。使用scaleXY错位缩放模拟3D皱鼻
+
+
+
+
😊
+
+
脸蛋动画
+
开心鼓起、害羞膨胀、挠痒交替鼓腮。rx属性动画+腮红opacity联动
+
+
+
+
👁
+
+
眼睛动画
+
自动眨眼、点击闭眼、惊讶放大、看向闲言偏移、跟随手指。双高光点模拟3D球面
+
+
+
+
👄
+
+
嘴巴动画
+
微笑弧线、惊讶O型、开心大笑、挠痒交替张合。贝塞尔曲线动态控制点
+
+
+
+
🐱
+
+
胡须动画
+
点击摆动、挠痒快速颤动。独立transform-origin，左右对称旋转
+
+
+
+
👆
+
+
点击 → 全部件联动
+
单次点击触发：眨眼+耳朵摆+鼻子抽+嘴巴变，所有部件协同而非单一动画
+
+
+
+
👆👆
+
+
双击 → 特殊反应
+
爱心眼+脸蛋鼓起+耳朵竖起+嘴巴大笑，持续2s后恢复。confetti粒子特效
+
+
+
+
✊
+
+
长按 → 挠痒循环
+
耳朵快速抖动+鼻子颤动+脸蛋交替鼓+嘴巴张合+胡须摆动，循环播放直到松手
+
+
+
+
👀
+
+
眼睛跟随手指
+
Listener监听全局指针，计算偏移量映射到眼球位移，最大偏移2px。受动画强度影响灵敏度
+
+
+
+
📝
+
+
点击闲言 → 看向标题
+
眼球向右偏移+头微倾+耳朵微调，0.3s后回正。模拟"听到名字转头"的自然感
+
+
+
+
⚡
+
+
动画强度联动
+
读取themeSettingsProvider.animationIntensity，影响：弹跳幅度/耳朵摆角/鼻子缩放比/腮红透明度/眨眼频率
+
+
+
+
📅
+
+
日期栏最多3项
+
chip选择限制3个，超出时未选chip变灰禁用。自定义文案14字上限，超限红框提示
+
+
+
+
🔄
+
+
轮播显示
+
显示文本超过10字时自动横向滚动轮播，可开关。使用AnimatedMarquee组件，3s一周期
+
+
+
+
+ + + + + diff --git a/pubspec.lock b/pubspec.lock index f70421f6..b68f796e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -2403,21 +2403,26 @@ packages: source: hosted version: "0.1.0+2" sensors_plus: + dependency: "direct main" + description: + path: "packages/sensors_plus" + relative: true + source: path + version: "6.1.0-ohos.1" + sensors_plus_ohos: dependency: transitive description: - name: sensors_plus - sha256: "56e8cd4260d9ed8e00ecd8da5d9fdc8a1b2ec12345a750dfa51ff83fcf12e3fa" - url: "https://pub.flutter-io.cn" - source: hosted - version: "7.0.0" + path: "packages/sensors_plus_ohos" + relative: true + source: path + version: "1.0.1" sensors_plus_platform_interface: - dependency: transitive + dependency: "direct overridden" description: - name: sensors_plus_platform_interface - sha256: "58815d2f5e46c0c41c40fb39375d3f127306f7742efe3b891c0b1c87e2b5cd5d" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.0.1" + path: "packages/sensors_plus_platform_interface" + relative: true + source: path + version: "2.0.0" sentry: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 006b6dbf..c95a3e43 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,7 +9,7 @@ name: xianyan description: "闲言 — 文字阅读更纯粹。句子阅读 + 壁纸制作 APP" publish_to: 'none' -version: 6.5.20+26051902 +version: 6.5.21+26052001 environment: sdk: ^3.11.5 @@ -224,6 +224,8 @@ dependencies: path: packages/video_player local_auth: # v3.0.1 | 生物识别认证(本地化-鸿蒙适配) path: packages/local_auth + sensors_plus: # v6.1.0-ohos.1 | 加速度传感器(摇一摇)(本地化-鸿蒙适配) + path: packages/sensors_plus battery_plus: # v7.0.0-ohos.1 | 电池状态监听(本地化-鸿蒙适配) path: packages/battery_plus @@ -368,6 +370,10 @@ dependency_overrides: path: packages/webrtc_interface win32: path: packages/win32 + sensors_plus: + path: packages/sensors_plus + sensors_plus_platform_interface: + path: packages/sensors_plus_platform_interface # ============================================================ # Flutter 配置 @@ -390,3 +396,8 @@ flutter: - assets/model_catalog.json - assets/data/ - assets/sounds/ + - assets/sounds/sfx/ + - assets/sounds/sfx/sfx/ + - assets/sounds/sfx/sfx_soft/ + - assets/sounds/sfx/sfx_crisp/ + - assets/shaders/ diff --git a/scripts/analyze.ps1 b/scripts/analyze.ps1 new file mode 100644 index 00000000..8028666c --- /dev/null +++ b/scripts/analyze.ps1 @@ -0,0 +1,3 @@ +$env:LOCALAPPDATA = "C:\DartPluginCache" +if (!(Test-Path $env:LOCALAPPDATA)) { New-Item -ItemType Directory -Path $env:LOCALAPPDATA -Force | Out-Null } +dart analyze $args diff --git a/scripts/fix_dart_aot_path.ps1 b/scripts/fix_dart_aot_path.ps1 new file mode 100644 index 00000000..6e0bdbe7 --- /dev/null +++ b/scripts/fix_dart_aot_path.ps1 @@ -0,0 +1,41 @@ +$ErrorActionPreference = 'Stop' + +$pluginManagerPath = "$env:LOCALAPPDATA\.dartServer\.plugin_manager" +$junctionTarget = "C:\DartPluginCache" + +Write-Output "=== Dart AOT 中文路径修复工具 ===" +Write-Output "" +Write-Output "问题: 用户路径包含中文字符导致 Dart 分析器 AOT 编译失败" +Write-Output " 当前路径: $pluginManagerPath" +Write-Output " 目标路径: $junctionTarget" +Write-Output "" + +if (!(Test-Path $junctionTarget)) { + New-Item -ItemType Directory -Path $junctionTarget -Force | Out-Null + Write-Output "[1/3] 创建目标目录: $junctionTarget" +} else { + Write-Output "[1/3] 目标目录已存在: $junctionTarget" +} + +if (Test-Path $pluginManagerPath) { + $isJunction = (Get-Item $pluginManagerPath).Attributes -band [IO.FileAttributes]::ReparsePoint + if ($isJunction) { + Write-Output "[2/3] 联接已存在，跳过" + } else { + $backupPath = "$pluginManagerPath.bak" + if (Test-Path $backupPath) { Remove-Item -Recurse -Force $backupPath } + Move-Item -Path $pluginManagerPath -Destination $backupPath -Force + Write-Output "[2/3] 备份原目录到: $backupPath" + New-Item -ItemType Junction -Path $pluginManagerPath -Target $junctionTarget | Out-Null + Write-Output "[2/3] 创建联接: $pluginManagerPath -> $junctionTarget" + } +} else { + $parentDir = Split-Path $pluginManagerPath -Parent + if (!(Test-Path $parentDir)) { New-Item -ItemType Directory -Path $parentDir -Force | Out-Null } + New-Item -ItemType Junction -Path $pluginManagerPath -Target $junctionTarget | Out-Null + Write-Output "[2/3] 创建联接: $pluginManagerPath -> $junctionTarget" +} + +Write-Output "[3/3] 修复完成!" +Write-Output "" +Write-Output "请重启 VS Code / IDE 使更改生效" diff --git a/scripts/test_local_logic.js b/scripts/test_local_logic.js new file mode 100644 index 00000000..56e400e9 --- /dev/null +++ b/scripts/test_local_logic.js @@ -0,0 +1,381 @@ +// ============================================================ +// 闲言APP — 本地逻辑测试脚本 +// 创建时间: 2026-05-20 +// 更新时间: 2026-05-20 +// 作用: 测试配对码生成/设备名称/画布样式等本地逻辑 +// 上次更新: 初始创建 +// ============================================================ + +let passed = 0; +let failed = 0; +const results = []; + +function assert(condition, testName, detail) { + if (condition) { + passed++; + results.push({ name: testName, status: 'PASS', detail: '' }); + console.log(` ✅ ${testName}`); + } else { + failed++; + results.push({ name: testName, status: 'FAIL', detail: detail || '' }); + console.log(` ❌ ${testName} — ${detail || ''}`); + } +} + +// ============================================================ +// Test 1: Pairing Code Generation (4-digit numeric) +// ============================================================ +function testPairingCodeGeneration() { + console.log('\n=== Test 1: Pairing Code Generation ==='); + + for (let i = 0; i < 100; i++) { + let code = ''; + for (let j = 0; j < 4; j++) { + code += Math.floor(Math.random() * 10).toString(); + } + assert(/^\d{4}$/.test(code), `Pairing code #${i + 1} is 4-digit numeric`, `code=${code}`); + if (i >= 9) break; + } + + assert(!/^[0-9]{6}$/.test('1234'), '6-digit code does not match 4-digit pattern', ''); + assert(!/^[0-9]{4}$/.test('abcd'), 'Non-numeric code rejected by pattern', ''); + assert(!/^[0-9]{4}$/.test('12a4'), 'Mixed alphanumeric rejected by pattern', ''); + assert(/^[0-9]{4}$/.test('0000'), 'All-zero code is valid 4-digit', ''); + assert(/^[0-9]{4}$/.test('9999'), 'All-nine code is valid 4-digit', ''); +} + +// ============================================================ +// Test 2: Device Name Display Logic +// ============================================================ +function testDeviceNameDisplay() { + console.log('\n=== Test 2: Device Name Display Logic ==='); + + function displayAlias({ accountAlias, alias, deviceType, deviceModel }) { + if (accountAlias && accountAlias.isNotEmpty !== false) return accountAlias; + if (deviceType === 'web') return alias && alias.length > 0 ? alias : 'Web浏览器'; + if (alias !== '闲言设备' && alias !== '未知设备') return alias; + const parts = []; + if (deviceModel && deviceModel.length > 0 && deviceModel !== 'localhost') { + parts.push(deviceModel); + } + if (parts.isNotEmpty !== false && parts.length > 0) return parts.join(' · '); + return alias; + } + + assert( + displayAlias({ accountAlias: '我的iPhone', alias: '闲言设备', deviceType: 'mobile', deviceModel: 'localhost' }) === '我的iPhone', + 'accountAlias takes priority', + '' + ); + + assert( + displayAlias({ accountAlias: null, alias: '闲言设备', deviceType: 'mobile', deviceModel: 'localhost' }) === '闲言设备', + 'localhost deviceModel filtered, falls back to alias', + '' + ); + + assert( + displayAlias({ accountAlias: null, alias: '闲言设备', deviceType: 'mobile', deviceModel: 'Samsung Galaxy S24' }) === 'Samsung Galaxy S24', + 'Real deviceModel used instead of alias', + '' + ); + + assert( + displayAlias({ accountAlias: null, alias: 'Web浏览器', deviceType: 'web', deviceModel: '' }) === 'Web浏览器', + 'Web device type returns alias', + '' + ); + + assert( + displayAlias({ accountAlias: null, alias: '闲言设备', deviceType: 'mobile', deviceModel: '' }) === '闲言设备', + 'Empty deviceModel falls back to alias', + '' + ); +} + +// ============================================================ +// Test 3: Canvas Style Rendering Order +// ============================================================ +function testCanvasStyleRenderingOrder() { + console.log('\n=== Test 3: Canvas Style Rendering Order ==='); + + const correctOrder = ['child', 'clipRadius', 'border', 'shadow', 'stackLayers', 'outerMargin']; + const oldOrder = ['outerMargin', 'stackLayers', 'shadow', 'clipRadius', 'border', 'child']; + + assert(correctOrder.indexOf('clipRadius') < correctOrder.indexOf('border'), 'ClipRRect before border', ''); + assert(correctOrder.indexOf('clipRadius') < correctOrder.indexOf('shadow'), 'ClipRRect before shadow', ''); + assert(correctOrder.indexOf('child') < correctOrder.indexOf('clipRadius'), 'Child before ClipRRect', ''); + assert(correctOrder.indexOf('border') < correctOrder.indexOf('shadow'), 'Border before shadow', ''); + + assert(oldOrder.indexOf('clipRadius') > oldOrder.indexOf('shadow'), 'Old: ClipRRect was after shadow (bug)', ''); + assert(oldOrder.indexOf('clipRadius') < oldOrder.indexOf('border'), 'Old: ClipRRect was before border (but after shadow, which was the bug)', `clipPos=${oldOrder.indexOf('clipRadius')} borderPos=${oldOrder.indexOf('border')}`); + + console.log(' Correct order: ' + correctOrder.join(' → ')); + console.log(' Old (buggy) order: ' + oldOrder.join(' → ')); +} + +// ============================================================ +// Test 4: Canvas Style Model Defaults +// ============================================================ +function testCanvasStyleModelDefaults() { + console.log('\n=== Test 4: Canvas Style Model Defaults ==='); + + const defaults = { + borderRadius: 0, + borderWidth: 0, + borderColor: '', + borderStyle: 'solid', + shadowBlur: 0, + shadowOffsetX: 0, + shadowOffsetY: 0, + shadowColor: '', + stackCount: 0, + stackOffsetX: 0, + stackOffsetY: 0, + stackBorderColor: '', + outerMarginLeft: 0, + outerMarginRight: 0, + outerMarginTop: 0, + outerMarginBottom: 0, + }; + + assert(defaults.borderRadius === 0, 'Default borderRadius is 0', ''); + assert(defaults.borderWidth === 0, 'Default borderWidth is 0', ''); + assert(defaults.shadowBlur === 0, 'Default shadowBlur is 0', ''); + assert(defaults.stackCount === 0, 'Default stackCount is 0', ''); + assert(defaults.borderStyle === 'solid', 'Default borderStyle is solid', ''); + + function hasBorder(style) { return (style.borderWidth ?? 0) > 0; } + function hasShadow(style) { return (style.shadowBlur ?? 0) > 0; } + function hasStack(style) { return (style.stackCount ?? 0) > 0; } + function hasOuterMargin(style) { + return (style.outerMarginLeft ?? 0) > 0 || (style.outerMarginRight ?? 0) > 0 || + (style.outerMarginTop ?? 0) > 0 || (style.outerMarginBottom ?? 0) > 0; + } + + assert(!hasBorder(defaults), 'Defaults have no border', ''); + assert(!hasShadow(defaults), 'Defaults have no shadow', ''); + assert(!hasStack(defaults), 'Defaults have no stack layers', ''); + assert(!hasOuterMargin(defaults), 'Defaults have no outer margin', ''); + + const customStyle = { ...defaults, borderRadius: 20, borderWidth: 2, shadowBlur: 10, stackCount: 3 }; + assert(hasBorder(customStyle), 'Custom style has border', ''); + assert(hasShadow(customStyle), 'Custom style has shadow', ''); + assert(hasStack(customStyle), 'Custom style has stack layers', ''); +} + +// ============================================================ +// Test 5: Screen Share State Transitions +// ============================================================ +function testScreenShareStateTransitions() { + console.log('\n=== Test 5: Screen Share State Transitions ==='); + + const validStates = [ + { isSharing: false, isViewing: false, isActive: false, label: 'idle' }, + { isSharing: true, isViewing: false, isActive: true, label: 'sharing' }, + { isSharing: false, isViewing: true, isActive: true, label: 'viewing' }, + ]; + + const invalidStates = [ + { isSharing: true, isViewing: true, label: 'both sharing and viewing' }, + ]; + + for (const s of validStates) { + assert(true, `Valid state: ${s.label}`, ''); + } + + for (const s of invalidStates) { + const isInvalid = s.isSharing && s.isViewing; + assert(isInvalid, `Invalid state detected: ${s.label}`, `sharing=${s.isSharing} viewing=${s.isViewing}`); + } + + assert(validStates[0].isActive === false, 'Idle state is not active', ''); + assert(validStates[1].isActive === true, 'Sharing state is active', ''); + assert(validStates[2].isActive === true, 'Viewing state is active', ''); +} + +// ============================================================ +// Test 6: HotZone Hit Test Logic +// ============================================================ +function testHotZoneHitTest() { + console.log('\n=== Test 6: HotZone Hit Test Logic ==='); + + function hitTest(point, zones) { + for (const zone of zones) { + const r = zone.rect; + if (point.dx >= r.left && point.dx <= r.right && + point.dy >= r.top && point.dy <= r.bottom) { + return zone; + } + } + return null; + } + + const zones = [ + { id: 'top', label: '顶部栏', rect: { left: 0, top: 0, right: 400, bottom: 50 } }, + { id: 'content', label: '内容区', rect: { left: 0, top: 50, right: 400, bottom: 700 } }, + { id: 'bottom', label: '底部栏', rect: { left: 0, top: 700, right: 400, bottom: 800 } }, + ]; + + const hit1 = hitTest({ dx: 200, dy: 25 }, zones); + assert(hit1 && hit1.id === 'top', 'Hit test: top zone', `hit=${hit1?.id}`); + + const hit2 = hitTest({ dx: 200, dy: 400 }, zones); + assert(hit2 && hit2.id === 'content', 'Hit test: content zone', `hit=${hit2?.id}`); + + const hit3 = hitTest({ dx: 200, dy: 750 }, zones); + assert(hit3 && hit3.id === 'bottom', 'Hit test: bottom zone', `hit=${hit3?.id}`); + + const hit4 = hitTest({ dx: -10, dy: -10 }, zones); + assert(hit4 === null, 'Hit test: outside all zones', `hit=${hit4?.id}`); +} + +// ============================================================ +// Test 7: CapturedFrame Signaling Payload +// ============================================================ +function testCapturedFramePayload() { + console.log('\n=== Test 7: CapturedFrame Signaling Payload ==='); + + const frame = { + data: Buffer.from('fake_image_data').toString('base64'), + width: 1080, + height: 1920, + timestamp: Date.now(), + format: 'jpeg', + sizeInBytes: 1024 + }; + + const payload = { + d: frame.data, + w: frame.width, + h: frame.height, + t: frame.timestamp, + f: frame.format, + }; + + assert(typeof payload.d === 'string', 'Frame data is base64 string', ''); + assert(payload.w === 1080, 'Frame width preserved', ''); + assert(payload.h === 1920, 'Frame height preserved', ''); + assert(payload.f === 'jpeg', 'Frame format preserved', ''); + assert(payload.t > 0, 'Frame timestamp is positive', ''); + + const decoded = Buffer.from(payload.d, 'base64'); + assert(decoded.toString() === 'fake_image_data', 'Frame data round-trip correct', ''); +} + +// ============================================================ +// Test 8: Canvas Stroke Model +// ============================================================ +function testCanvasStrokeModel() { + console.log('\n=== Test 8: Canvas Stroke Model ==='); + + const stroke = { + id: 'stroke_001', + points: [{ x: 0, y: 0 }, { x: 100, y: 100 }, { x: 200, y: 50 }], + color: '#FF0000', + width: 3, + tool: 'pen', + timestamp: Date.now(), + }; + + assert(stroke.points.length === 3, 'Stroke has 3 points', ''); + assert(stroke.tool === 'pen', 'Stroke tool is pen', ''); + assert(/^#[0-9A-Fa-f]{6}$/.test(stroke.color), 'Stroke color is valid hex', ''); + + const eraserStroke = { ...stroke, tool: 'eraser', color: '#00000000' }; + assert(eraserStroke.tool === 'eraser', 'Eraser stroke tool correct', ''); + + const validTools = ['pen', 'eraser', 'line', 'rect', 'circle', 'arrow']; + assert(validTools.includes(stroke.tool), 'Pen is valid tool', ''); + assert(validTools.includes(eraserStroke.tool), 'Eraser is valid tool', ''); +} + +// ============================================================ +// Test 9: Pairing Code Validation +// ============================================================ +function testPairingCodeValidation() { + console.log('\n=== Test 9: Pairing Code Validation ==='); + + function validatePairingCode(code) { + if (!code) return { valid: false, error: 'empty' }; + const trimmed = code.trim(); + if (!/^\d{4}$/.test(trimmed)) return { valid: false, error: 'not 4-digit numeric' }; + return { valid: true, error: null }; + } + + assert(validatePairingCode('1234').valid, '1234 is valid', ''); + assert(validatePairingCode('0000').valid, '0000 is valid', ''); + assert(validatePairingCode('9999').valid, '9999 is valid', ''); + assert(!validatePairingCode('abcd').valid, 'abcd is invalid', ''); + assert(!validatePairingCode('12345').valid, '12345 is invalid', ''); + assert(!validatePairingCode('123').valid, '123 is invalid', ''); + assert(!validatePairingCode('12a4').valid, '12a4 is invalid', ''); + assert(!validatePairingCode('').valid, 'empty is invalid', ''); + assert(validatePairingCode(' 1234 ').valid === true, 'spaced code auto-trimmed and valid', `result=${JSON.stringify(validatePairingCode(' 1234 '))}`); + assert(validatePairingCode(' 1234 '.trim()).valid, 'trimmed spaced code is valid', ''); +} + +// ============================================================ +// Test 10: Timer Duration Calculation +// ============================================================ +function testTimerDuration() { + console.log('\n=== Test 10: Timer Duration Calculation ==='); + + function formatDuration(seconds) { + const h = Math.floor(seconds / 3600); + const m = Math.floor((seconds % 3600) / 60); + const s = seconds % 60; + if (h > 0) return `${h}:${m.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`; + return `${m.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`; + } + + assert(formatDuration(0) === '00:00', '0 seconds', `got=${formatDuration(0)}`); + assert(formatDuration(30) === '00:30', '30 seconds', `got=${formatDuration(30)}`); + assert(formatDuration(90) === '01:30', '90 seconds', `got=${formatDuration(90)}`); + assert(formatDuration(1800) === '30:00', '1800 seconds (30 min)', `got=${formatDuration(1800)}`); + assert(formatDuration(3600) === '1:00:00', '3600 seconds (1 hour)', `got=${formatDuration(3600)}`); + assert(formatDuration(3661) === '1:01:01', '3661 seconds', `got=${formatDuration(3661)}`); + + const maxDuration = 30 * 60; + const progress = 1800 / maxDuration; + assert(progress === 1.0, '30 min is 100% progress', `progress=${progress}`); + assert((900 / maxDuration) === 0.5, '15 min is 50% progress', ''); +} + +// ============================================================ +// Main +// ============================================================ +function main() { + console.log('\n' + '='.repeat(70)); + console.log(' 闲言APP 本地逻辑测试'); + console.log(` Time: ${new Date().toISOString()}`); + console.log('='.repeat(70)); + + testPairingCodeGeneration(); + testDeviceNameDisplay(); + testCanvasStyleRenderingOrder(); + testCanvasStyleModelDefaults(); + testScreenShareStateTransitions(); + testHotZoneHitTest(); + testCapturedFramePayload(); + testCanvasStrokeModel(); + testPairingCodeValidation(); + testTimerDuration(); + + console.log('\n' + '='.repeat(70)); + console.log(' Test Results Summary'); + console.log('='.repeat(70)); + + const failedTests = results.filter(r => r.status === 'FAIL'); + for (const r of failedTests) { + console.log(` ❌ ${r.name} — ${r.detail}`); + } + + console.log('-'.repeat(70)); + console.log(` Total: ${passed + failed} | Passed: ${passed} | Failed: ${failed}`); + console.log('='.repeat(70) + '\n'); + + process.exit(failed > 0 ? 1 : 0); +} + +main(); diff --git a/server/index.js b/server/index.js index 1d356252..3e71180f 100644 --- a/server/index.js +++ b/server/index.js @@ -761,10 +761,9 @@ class SnapdropServer { _handlePairingCodeCreate(sender, message) { const payload = message.payload || message.data || {}; - const CHARS = '23456789ABCDEFGHJKMNPQRSTUVWXYZ'; let code = ''; - for (let i = 0; i < 6; i++) { - code += CHARS.charAt(Math.floor(Math.random() * CHARS.length)); + for (let i = 0; i < 4; i++) { + code += Math.floor(Math.random() * 10).toString(); } for (const existingCode in this._pairingCodes) { if (this._pairingCodes[existingCode].creatorId === sender.id) { @@ -791,9 +790,9 @@ class SnapdropServer { _handlePairingCodeJoin(sender, message) { const payload = message.payload || message.data || {}; - const code = (payload.pairingCode || '').toUpperCase().trim(); - if (!code) { - this._send(sender, { type: 'pairing-matched', success: false, error: '配对码不能为空' }); + const code = (payload.pairingCode || '').trim(); + if (!code || !/^\d{4}$/.test(code)) { + this._send(sender, { type: 'pairing-matched', success: false, error: '请输入4位数字配对码' }); return; } const entry = this._pairingCodes[code]; diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index bab7fdd5..39c008f6 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -71,9 +71,8 @@ include(flutter/generated_plugins.cmake) set(BUILD_BUNDLE_DIR "$") # Make the "install" step default, as it's required to run. set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) -endif() +# Force install prefix to build bundle directory to avoid requiring admin privileges +set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "Install prefix" FORCE) set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}")