🚀 Launch 3.2.0+125

.github/workflows/build.yml

@@ -41,6 +41,15 @@ jobs:
         with:
           name: build-output-windows
           path: build/windows/x64/runner/Release
+      - name: Compile Installer
+        uses: Minionguyjpro/Inno-Setup-Action@v1.2.2
+        with:
+          path: setup.iss
+      - name: Archive installer artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-output-windows-installer
+          path: Installer/windows-x86_64-setup.exe
   build-linux:
     runs-on: ubuntu-latest
     steps:

.gitignore

@@ -12,6 +12,9 @@
 .swiftpm/
 migrate_working_dir/
 
+# Inno Setup
+Installer/
+
 # IntelliJ related
 *.iml
 *.ipr

android/app/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     id("com.android.application")
     // START: FlutterFire Configuration
     id("com.google.gms.google-services")
+    id("com.google.firebase.crashlytics")
     // END: FlutterFire Configuration
     id("kotlin-android")
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.

android/settings.gradle.kts

@@ -21,6 +21,7 @@ plugins {
     id("com.android.application") version "8.12.0" apply false
     // START: FlutterFire Configuration
     id("com.google.gms.google-services") version("4.3.15") apply false
+    id("com.google.firebase.crashlytics") version("2.8.1") apply false
     // END: FlutterFire Configuration
     id("org.jetbrains.kotlin.android") version("2.2.0") apply false
 }

assets/i18n/en-US.json

@@ -573,6 +573,7 @@
   "keyboardShortcuts": "Keyboard Shortcuts",
   "share": "Share",
   "sharePost": "Share Post",
+  "sharePostPhoto": "Share Post as Photo",
   "quickActions": "Quick Actions",
   "post": "Post",
   "copy": "Copy",
@@ -760,6 +761,7 @@
   "pollsRecent": "Recent Polls",
   "pollCreateNew": "Create New",
   "pollCreateNewHint": "Create a new poll for your post. Pick a publisher and continue.",
+  "pollQuestions": "Questions",
   "publisher": "Publisher",
   "publisherHint": "Enter the publisher name",
   "publisherCannotBeEmpty": "Publisher cannot be empty",
@@ -792,5 +794,47 @@
   "joinedAt": "Joined at {}",
   "searchAccounts": "Search accounts...",
   "webFeeds": "Web Feeds",
-  "polls": "Polls"
+  "polls": "Polls",
+  "sharePostSlogan": "Explore more on the Solar Network",
+  "filesListAdditional": {
+    "one": "+{} file remaining",
+    "other": "+{} files remaining"
+  },
+  "pollAnswerSubmitted": "Poll answer has been submitted.",
+  "modifyAnswers": "Modify Answers",
+  "back": "Back",
+  "submit": "Submit",
+  "pollOptionDefaultLabel": "Option 1",
+  "pollUpdated": "Poll updated.",
+  "pollCreated": "Poll created.",
+  "pollCreate": "Create Poll",
+  "pollEdit": "Edit Poll",
+  "pollPreviewJsonDebug": "Debug Preview",
+  "pollTitleRequired": "Title is required",
+  "pollEndDateOptional": "End date & time (optional)",
+  "notSet": "Not set",
+  "pick": "Pick",
+  "clear": "Clear",
+  "questions": "Questions",
+  "pollAddQuestion": "Add question",
+  "pollQuestionTypeSingleChoice": "Single choice",
+  "pollQuestionTypeMultipleChoice": "Multiple choice",
+  "pollQuestionTypeFreeText": "Free text",
+  "pollQuestionTypeYesNo": "Yes / No",
+  "pollQuestionTypeRating": "Rating",
+  "pollNoQuestionsYet": "No questions yet",
+  "pollNoQuestionsHint": "Use \"Add question\" to start building your poll.",
+  "pollDebugPreview": "Debug Preview",
+  "pollUntitledQuestion": "Untitled question",
+  "moveUp": "Move up",
+  "moveDown": "Move down",
+  "required": "Required",
+  "pollQuestionTitle": "Question title",
+  "pollQuestionTitleRequired": "Question title is required",
+  "pollQuestionDescriptionOptional": "Question description (optional)",
+  "options": "Options",
+  "pollAddOption": "Add option",
+  "pollOptionLabel": "Option label",
+  "pollLongTextAnswerPreview": "Long text answer (preview)",
+  "pollShortTextAnswerPreview": "Short text answer (preview)"
 }

assets/i18n/zh-CN.json

@@ -46,7 +46,6 @@
     "delete": "删除",
     "deletePublisher": "删除发布者",
     "deletePublisherHint": "确定要删除此发布者吗？这也会删除此发布者下的所有帖子和收藏。",
-  "somethingWentWrong": "发生了一些错误……",
     "deletePost": "删除帖子",
     "deletePostHint": "确定要删除这篇帖子吗？",
     "copyLink": "复制链接",
@@ -349,7 +348,6 @@
     "postContent": "内容",
     "postSettings": "设置",
     "postPublisherUnselected": "未指定发布者",
-  "postVisibility": "可见性",
     "postVisibilityPublic": "公开",
     "postVisibilityFriends": "仅好友可见",
     "postVisibilityUnlisted": "不公开",
@@ -501,9 +499,6 @@
     "membershipTierNova": "新星",
     "membershipTierSupernova": "超新星",
     "membershipTierUnknown": "未知",
-  "membershipPriceStellar": "每月 10 金点",
-  "membershipPriceNova": "每月 20 金点",
-  "membershipPriceSupernova": "每月 30 金点",
     "membershipFeatureBasic": "基础功能",
     "membershipFeaturePrioritySupport": "优先支持",
     "membershipFeatureAdFree": "无广告",
@@ -573,37 +568,36 @@
     "share": "分享",
     "sharePost": "分享帖子",
     "quickActions": "快捷操作",
-  "post": "帖子",
+    "post": "发帖",
     "copy": "复制",
     "sendToChat": "发送到聊天",
     "failedToShareToPost": "分享到帖子失败：{}",
-  "shareToChatComingSoon": "分享到聊天的功能即将到来",
+    "shareToChatComingSoon": "分享到聊天功能即将推出",
     "failedToShareToChat": "分享到聊天失败：{}",
-  "shareToSpecificChatComingSoon": "分享到 {} 的功能即将到来",
+    "shareToSpecificChatComingSoon": "分享到 {} 功能即将推出",
     "directChat": "私信",
-  "systemShareComingSoon": "系统分享功能即将到来",
+    "systemShareComingSoon": "系统分享功能即将推出",
     "failedToShareToSystem": "分享到系统失败：{}",
     "failedToCopy": "复制失败：{}",
-  "noChatRoomsAvailable": "没有聊天室可用",
+    "noChatRoomsAvailable": "无可用聊天室",
-  "failedToLoadChats": "加载聊天室失败",
+    "failedToLoadChats": "加载聊天失败",
-  "contentToShare": "要分享的内容：",
+    "contentToShare": "分享内容：",
-  "unknownChat": "未知聊天室",
+    "unknownChat": "未知聊天",
-  "addAdditionalMessage": "添加额外消息……",
+    "addAdditionalMessage": "添加附加消息……",
     "uploadingFiles": "上传文件中……",
     "sharedSuccessfully": "分享成功！",
     "shareSuccess": "分享成功！",
-  "shareToSpecificChatSuccess": "分享到 {} 成功！",
+    "shareToSpecificChatSuccess": "成功分享至 {}！",
-  "wouldYouLikeToGoToChat": "你想要前往聊天页面吗？",
+    "wouldYouLikeToGoToChat": "是否前往该聊天？",
-  "no": "是",
+    "no": "否",
-  "yes": "否",
+    "yes": "是",
-  "navigateToChat": "前往聊天室",
+    "navigateToChat": "前往聊天",
-  "wouldYouLikeToNavigateToChat": "你想要前往聊天页面吗？",
     "abuseReport": "举报",
     "abuseReportTitle": "举报内容",
-  "abuseReportDescription": "通过举报不合适的内容和行为来帮助我们维护社区的健康稳定发展。",
+    "abuseReportDescription": "举报不当内容或行为，协助维护社区安全。",
     "abuseReportType": "举报类型",
-  "abuseReportReason": "额外细节",
+    "abuseReportReason": "补充详情",
-  "abuseReportReasonHint": "请提供更多关于此的细节……",
+    "abuseReportReasonHint": "请提供更多详情……",
     "abuseReportSubmit": "提交举报",
     "abuseReportSuccess": "举报提交成功，感谢你为社区维护作出贡献。",
     "abuseReportError": "无法提交举报，请稍后再试。",
@@ -629,8 +623,6 @@
     "chatJoin": "加入聊天",
     "realmJoin": "加入领域",
     "realmJoinSuccess": "成功加入领域。",
-  "discoverRealms": "发现领域",
-  "discoverPublishers": "发现发布者",
     "search": "搜索",
     "publisherMembers": "合作者",
     "developerHub": "开发者中心",
@@ -679,10 +671,32 @@
     "discoverWebArticles": "来自站外的文章",
     "webArticlesStand": "文章亭",
     "about": "关于",
-  "membershipCancel": "取消会员资格",
+    "somethingWentWrong": "发生了一些错误",
-  "membershipCancelConfirm": "你确定要取消会员资格吗？",
+    "editedAt": "编辑于 {}",
-  "membershipCancelHint": "你确定要取消会员资格吗？你将不会再次被扣费。你的会员资格将在当前计费周期结束前保持有效。并且你将无法重新订阅，直到当前订阅结束。",
+    "addAudio": "添加音频",
-  "membershipCancelSuccess": "你的会员资格已成功取消。",
+    "recordAudio": "录制音频",
+    "linkAttachment": "链接附件",
+    "fileIdCannotBeEmpty": "文件 ID 不能为空",
+    "fileIdLinkHint": "还没有上传到 Solar Network？点击此处打开 Solar Network Drive，自定义您的上传内容。",
+    "failedToFetchFile": "获取文件失败：{}",
+    "callLeave": "离开",
+    "callEnd": "挂断通话",
+    "postType": "帖子类型",
+    "articleAttachmentHint": "附件必须上传并插入到文章主体中才能显示出来。",
+    "postVisibility": "可见性",
+    "currentMembershipMember": "恒星计划成员 · {}",
+    "membershipPriceStellar": "需要用户等级 3+，每月价格 1200 NSP",
+    "membershipPriceNova": "需要用户等级 6+，每月价格 2400 NSP",
+    "membershipPriceSupernova": "需要用户等级 9+，每月价格 3600 NSP",
+    "sharePostPhoto": "通过图片分享帖子",
+    "wouldYouLikeToNavigateToChat": "你想要前往聊天页面吗？",
+    "abuseReports": "举报",
+    "discoverRealms": "发现领域",
+    "discoverPublishers": "发现发布者",
+    "membershipCancel": "取消会员订阅",
+    "membershipCancelConfirm": "你确定要取消会员订阅吗？",
+    "membershipCancelHint": "你确定要取消会员订阅吗？你将不会再次被扣费。你的会员资格将在当前计费周期结束前保持有效。并且你将无法重新订阅，直到当前订阅结束。",
+    "membershipCancelSuccess": "你的会员订阅已成功取消。",
     "aboutScreenTitle": "关于",
     "aboutScreenVersionInfo": "版本 {} ({})",
     "aboutScreenAppInfoSectionTitle": "应用信息",
@@ -696,7 +710,7 @@
     "aboutScreenDeveloperSectionTitle": "开发者",
     "aboutScreenContactUsTitle": "联系我们",
     "aboutScreenLicenseTitle": "许可",
-  "aboutScreenLicenseContent": "GNU Affero General Public License v3.0",
+    "aboutScreenLicenseContent": "无法翻译",
     "aboutScreenCopyright": "版权所有 © Solsynth {}",
     "aboutScreenMadeWith": "由 Solar Network 团队用 ❤︎️ 制作",
     "aboutScreenFailedToLoadPackageInfo": "无法加载包信息：{error}",
@@ -710,13 +724,13 @@
     "aboutDeviceName": "设备名称",
     "aboutDeviceIdentifier": "设备标识符",
     "donate": "捐赠",
-  "donateDescription": "支持我们继续开发 Solar Network，并保持服务器运行。",
+    "donateDescription": "支持我们继续开发 Solar Network，并维持服务器运行。",
     "fileId": "文件 ID",
     "fileIdHint": "文件 ID 是你通过 Solar Network Drive 上传文件后获得的 ID。",
     "translate": "翻译",
     "translating": "正在翻译",
     "translated": "已翻译",
-  "reactionThumbUp": "点赞",
+    "reactionThumbUp": "赞",
     "reactionThumbDown": "踩",
     "reactionJustOkay": "还行",
     "reactionCry": "哭",
@@ -726,7 +740,7 @@
     "reactionAngry": "生气",
     "reactionParty": "派对",
     "reactionPray": "祈祷",
-  "reactionHeart": "心",
+    "reactionHeart": "爱心",
     "selectMicrophone": "选择麦克风",
     "selectCamera": "选择摄像头",
     "switchedTo": "已切换到 {}",
@@ -741,19 +755,21 @@
     "rename": "重命名",
     "markAsSensitive": "标记为敏感",
     "fileName": "文件名",
-  "sensitiveCategories.language": "语言",
+    "sensitiveCategories": {
-  "sensitiveCategories.sexualContent": "色情内容",
+        "language": "语言",
-  "sensitiveCategories.violence": "暴力",
+        "sexualContent": "色情内容",
-  "sensitiveCategories.profanity": "亵渎",
+        "violence": "暴力",
-  "sensitiveCategories.hateSpeech": "仇恨言论",
+        "profanity": "亵渎",
-  "sensitiveCategories.racism": "种族主义",
+        "hateSpeech": "仇恨言论",
-  "sensitiveCategories.adultContent": "成人内容",
+        "racism": "种族主义",
-  "sensitiveCategories.drugAbuse": "药物滥用",
+        "adultContent": "成人内容",
-  "sensitiveCategories.alcoholAbuse": "酗酒",
+        "drugAbuse": "药物滥用",
-  "sensitiveCategories.gambling": "赌博",
+        "alcoholAbuse": "酗酒",
-  "sensitiveCategories.selfHarm": "自残",
+        "gambling": "赌博",
-  "sensitiveCategories.childAbuse": "虐待儿童",
+        "selfHarm": "自残",
-  "sensitiveCategories.other": "其他",
+        "childAbuse": "虐待儿童",
+        "other": "其他"
+    },
     "poll": "投票",
     "pollsRecent": "最近投票",
     "pollCreateNew": "创建新投票",
@@ -785,10 +801,15 @@
     "links": "链接",
     "addLink": "添加链接",
     "linkKey": "链接名称",
-  "linkValue": "URL",
+    "linkValue": "链接",
     "debugOptions": "调试选项",
     "joinedAt": "加入于 {}",
     "searchAccounts": "搜索帐号……",
     "webFeeds": "订阅源",
-  "polls": "投票"
+    "polls": "投票",
+    "sharePostSlogan": "加入 Solar Network 以便探索更多",
+    "filesListAdditional": {
+        "one": "+{} 个文件被折叠",
+        "other": "+{} 个文件被折叠"
+    }
 }

ios/Podfile.lock

@@ -42,22 +42,62 @@ PODS:
     - Flutter
   - Firebase/CoreOnly (12.0.0):
     - FirebaseCore (~> 12.0.0)
+  - Firebase/Crashlytics (12.0.0):
+    - Firebase/CoreOnly
+    - FirebaseCrashlytics (~> 12.0.0)
   - Firebase/Messaging (12.0.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 12.0.0)
+  - firebase_analytics (12.0.0):
+    - firebase_core
+    - FirebaseAnalytics (= 12.0.0)
+    - Flutter
   - firebase_core (4.0.0):
     - Firebase/CoreOnly (= 12.0.0)
     - Flutter
+  - firebase_crashlytics (5.0.0):
+    - Firebase/Crashlytics (= 12.0.0)
+    - firebase_core
+    - Flutter
   - firebase_messaging (16.0.0):
     - Firebase/Messaging (= 12.0.0)
     - firebase_core
     - Flutter
+  - FirebaseAnalytics (12.0.0):
+    - FirebaseAnalytics/Default (= 12.0.0)
+    - FirebaseCore (~> 12.0.0)
+    - FirebaseInstallations (~> 12.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/Default (12.0.0):
+    - FirebaseCore (~> 12.0.0)
+    - FirebaseInstallations (~> 12.0.0)
+    - GoogleAppMeasurement/Default (= 12.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
   - FirebaseCore (12.0.0):
     - FirebaseCoreInternal (~> 12.0.0)
     - GoogleUtilities/Environment (~> 8.1)
     - GoogleUtilities/Logger (~> 8.1)
+  - FirebaseCoreExtension (12.0.0):
+    - FirebaseCore (~> 12.0.0)
   - FirebaseCoreInternal (12.0.0):
     - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseCrashlytics (12.0.0):
+    - FirebaseCore (~> 12.0.0)
+    - FirebaseInstallations (~> 12.0.0)
+    - FirebaseRemoteConfigInterop (~> 12.0.0)
+    - FirebaseSessions (~> 12.0.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
   - FirebaseInstallations (12.0.0):
     - FirebaseCore (~> 12.0.0)
     - GoogleUtilities/Environment (~> 8.1)
@@ -72,6 +112,16 @@ PODS:
     - GoogleUtilities/Reachability (~> 8.1)
     - GoogleUtilities/UserDefaults (~> 8.1)
     - nanopb (~> 3.30910.0)
+  - FirebaseRemoteConfigInterop (12.0.0)
+  - FirebaseSessions (12.0.0):
+    - FirebaseCore (~> 12.0.0)
+    - FirebaseCoreExtension (~> 12.0.0)
+    - FirebaseInstallations (~> 12.0.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
+    - PromisesSwift (~> 2.1)
   - Flutter (1.0.0)
   - flutter_app_update (0.0.1):
     - Flutter
@@ -101,6 +151,32 @@ PODS:
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
+  - GoogleAdsOnDeviceConversion (2.1.0):
+    - GoogleUtilities/Logger (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/Core (12.0.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/Default (12.0.0):
+    - GoogleAdsOnDeviceConversion (= 2.1.0)
+    - GoogleAppMeasurement/Core (= 12.0.0)
+    - GoogleAppMeasurement/IdentitySupport (= 12.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/IdentitySupport (12.0.0):
+    - GoogleAppMeasurement/Core (= 12.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
   - GoogleDataTransport (10.1.0):
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
@@ -114,6 +190,9 @@ PODS:
   - GoogleUtilities/Logger (8.1.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
+  - GoogleUtilities/MethodSwizzler (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
   - GoogleUtilities/Network (8.1.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
@@ -162,6 +241,8 @@ PODS:
   - pointer_interceptor_ios (0.0.1):
     - Flutter
   - PromisesObjC (2.4.0)
+  - PromisesSwift (2.4.0):
+    - PromisesObjC (= 2.4.0)
   - receive_sharing_intent (1.8.1):
     - Flutter
   - record_ios (1.0.0):
@@ -222,7 +303,9 @@ DEPENDENCIES:
   - croppy (from `.symlinks/plugins/croppy/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
+  - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
+  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
   - flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`)
@@ -265,16 +348,24 @@ SPEC REPOS:
     - DKImagePickerController
     - DKPhotoGallery
     - Firebase
+    - FirebaseAnalytics
     - FirebaseCore
+    - FirebaseCoreExtension
     - FirebaseCoreInternal
+    - FirebaseCrashlytics
     - FirebaseInstallations
     - FirebaseMessaging
+    - FirebaseRemoteConfigInterop
+    - FirebaseSessions
+    - GoogleAdsOnDeviceConversion
+    - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleUtilities
     - Kingfisher
     - nanopb
     - OrderedSet
     - PromisesObjC
+    - PromisesSwift
     - SAMKeychain
     - SDWebImage
     - sqlite3
@@ -290,8 +381,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/device_info_plus/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
+  firebase_analytics:
+    :path: ".symlinks/plugins/firebase_analytics/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
+  firebase_crashlytics:
+    :path: ".symlinks/plugins/firebase_crashlytics/ios"
   firebase_messaging:
     :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
@@ -370,12 +465,19 @@ SPEC CHECKSUMS:
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
   file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
   Firebase: 800d487043c0557d9faed71477a38d9aafb08a41
+  firebase_analytics: cd56fc56f75c1df30a6ff5290cd56e230996a76d
   firebase_core: 633e1851ffe1b9ab875f6467a4f574c79cef02e4
+  firebase_crashlytics: 2c6c1a17900a38081d938330e9f48e60ec5b255d
   firebase_messaging: d17feef781edc84ebefe62624fb384358ad96361
+  FirebaseAnalytics: 6d790cd1b159b4eb61a99948df0934ce505a34f7
   FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a
+  FirebaseCoreExtension: 639afb3de6abd611952be78a794c54a47fa0f361
   FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55
+  FirebaseCrashlytics: db75aa0cab8d00f68406fa247c32fe17ade884d7
   FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
   FirebaseMessaging: af49f8d7c0a3d2a017d9302c80946f45a7777dde
+  FirebaseRemoteConfigInterop: bfa0ea72ba3dc5af739777296424e46bd6f42613
+  FirebaseSessions: 4e784acda213108aafef536535cdfc03504acc42
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
@@ -387,6 +489,8 @@ SPEC CHECKSUMS:
   flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9
   flutter_webrtc: 6f7da106613d52ade777d5b4875a43f48c28b457
   gal: baecd024ebfd13c441269ca7404792a7152fde89
+  GoogleAdsOnDeviceConversion: 2be6297a4f048459e0ae17fad9bfd2844e10cf64
+  GoogleAppMeasurement: 8f6ab04ad6ae493b53fcf56bd26323fb2f1384f3
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
   image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
@@ -404,6 +508,7 @@ SPEC CHECKSUMS:
   path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
   pointer_interceptor_ios: ec847ef8b0915778bed2b2cef636f4d177fa8eed
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
   record_ios: fee1c924aa4879b882ebca2b4bce6011bcfc3d8b
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c

ios/Runner.xcodeproj/project.pbxproj

@@ -439,6 +439,7 @@
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				8C0351B03869BBF493808288 /* [CP] Embed Pods Frameworks */,
 				5E7D6EF29B671AC7EDBA5649 /* [CP] Copy Pods Resources */,
+				E86CDE9D6464F4F52B910856 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
 			);
 			buildRules = (
 			);
@@ -682,6 +683,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		E86CDE9D6464F4F52B910856 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:${PUB_CACHE}/bin:$HOME/.pub-cache/bin\"\n\nif [ -z \"$PODS_ROOT\" ] || [ ! -d \"$PODS_ROOT/FirebaseCrashlytics\" ]; then\n  # Cannot use \"BUILD_DIR%/Build/*\" as per Firebase documentation, it points to \"flutter-project/build/ios/*\" path which doesn't have run script\n  DERIVED_DATA_PATH=$(echo \"$BUILD_ROOT\" | sed -E 's|(.*DerivedData/[^/]+).*|\\1|')\n  PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT=\"${DERIVED_DATA_PATH}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\nelse\n  PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT=\"$PODS_ROOT/FirebaseCrashlytics/run\"\nfi\n\n# Command to upload symbols script used to upload symbols to Firebase server\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=\"$PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT\" --platform=ios --apple-project-path=\"${SRCROOT}\" --env-platform-name=\"${PLATFORM_NAME}\" --env-configuration=\"${CONFIGURATION}\" --env-project-dir=\"${PROJECT_DIR}\" --env-built-products-dir=\"${BUILT_PRODUCTS_DIR}\" --env-dwarf-dsym-folder-path=\"${DWARF_DSYM_FOLDER_PATH}\" --env-dwarf-dsym-file-name=\"${DWARF_DSYM_FILE_NAME}\" --env-infoplist-path=\"${INFOPLIST_PATH}\" --default-config=default\n";
+		};
 		E947029FCA058878F9B63890 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

lib/firebase_options.dart

@@ -61,10 +61,8 @@ class DefaultFirebaseOptions {
     messagingSenderId: '961776991058',
     projectId: 'solian-0x001',
     storageBucket: 'solian-0x001.firebasestorage.app',
-    androidClientId:
+    androidClientId: '961776991058-r4iv9qoio57ul7utbfpgfrda2etvtch8.apps.googleusercontent.com',
-        '961776991058-r4iv9qoio57ul7utbfpgfrda2etvtch8.apps.googleusercontent.com',
+    iosClientId: '961776991058-stt7et4qvn3cpscl4r61gl1hnlatqkig.apps.googleusercontent.com',
-    iosClientId:
-        '961776991058-stt7et4qvn3cpscl4r61gl1hnlatqkig.apps.googleusercontent.com',
     iosBundleId: 'dev.solsynth.solian',
   );
 
@@ -74,10 +72,8 @@ class DefaultFirebaseOptions {
     messagingSenderId: '961776991058',
     projectId: 'solian-0x001',
     storageBucket: 'solian-0x001.firebasestorage.app',
-    androidClientId:
+    androidClientId: '961776991058-r4iv9qoio57ul7utbfpgfrda2etvtch8.apps.googleusercontent.com',
-        '961776991058-r4iv9qoio57ul7utbfpgfrda2etvtch8.apps.googleusercontent.com',
+    iosClientId: '961776991058-stt7et4qvn3cpscl4r61gl1hnlatqkig.apps.googleusercontent.com',
-    iosClientId:
-        '961776991058-stt7et4qvn3cpscl4r61gl1hnlatqkig.apps.googleusercontent.com',
     iosBundleId: 'dev.solsynth.solian',
   );
 
@@ -90,4 +86,5 @@ class DefaultFirebaseOptions {
     storageBucket: 'solian-0x001.firebasestorage.app',
     measurementId: 'G-JD1YEG9D6F',
   );
+
 }

lib/main.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:croppy/croppy.dart';
 import 'package:easy_localization/easy_localization.dart' hide TextDirection;
 import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -28,7 +29,6 @@ import 'package:relative_time/relative_time.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:island/widgets/keyboard_navigation.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:flutter_langdetect/flutter_langdetect.dart' as langdetect;
 
@@ -62,6 +62,17 @@ void main() async {
       FirebaseMessaging.onBackgroundMessage(
         _firebaseMessagingBackgroundHandler,
       );
+      // Although previous if case checked this. Still check is web or not
+      // Otherwise the web platform will broke due to there is no Platform api on the web
+      // Skip crashlytics setup on debug mode to prevent unexpected report to firebase
+      if ((kIsWeb || !Platform.isWindows) && !kDebugMode) {
+        FlutterError.onError =
+            FirebaseCrashlytics.instance.recordFlutterFatalError;
+        PlatformDispatcher.instance.onError = (error, stack) {
+          FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
+          return true;
+        };
+      }
     }
 
     log("[SplashScreen] Firebase is ready!");
@@ -245,8 +256,7 @@ class IslandApp extends HookConsumerWidget {
 
     final router = ref.watch(routerProvider);
 
-    return KeyboardNavigation(
+    return MaterialApp.router(
-      child: MaterialApp.router(
       theme: theme?.light,
       darkTheme: theme?.dark,
       themeMode: ThemeMode.system,
@@ -270,7 +280,6 @@ class IslandApp extends HookConsumerWidget {
           ],
         );
       },
-      ),
     );
   }
 }

lib/models/account.dart

@@ -1,9 +1,10 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/auth.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/wallet.dart';
 
-part 'user.freezed.dart';
+part 'account.freezed.dart';
-part 'user.g.dart';
+part 'account.g.dart';
 
 @freezed
 sealed class SnAccount with _$SnAccount {
@@ -174,3 +175,36 @@ sealed class SnVerificationMark with _$SnVerificationMark {
   factory SnVerificationMark.fromJson(Map<String, dynamic> json) =>
       _$SnVerificationMarkFromJson(json);
 }
+
+@freezed
+sealed class SnAuthDevice with _$SnAuthDevice {
+  const factory SnAuthDevice({
+    required String id,
+    required String deviceId,
+    required String deviceName,
+    required String? deviceLabel,
+    required String accountId,
+    required int platform,
+    @Default(false) bool isCurrent,
+  }) = _SnAuthDevice;
+
+  factory SnAuthDevice.fromJson(Map<String, dynamic> json) =>
+      _$SnAuthDeviceFromJson(json);
+}
+
+@freezed
+sealed class SnAuthDeviceWithChallenge with _$SnAuthDeviceWithChallenge {
+  const factory SnAuthDeviceWithChallenge({
+    required String id,
+    required String deviceId,
+    required String deviceName,
+    required String? deviceLabel,
+    required String accountId,
+    required int platform,
+    required List<SnAuthChallenge> challenges,
+    @Default(false) bool isCurrent,
+  }) = _SnAuthDeviceWithChallengee;
+
+  factory SnAuthDeviceWithChallenge.fromJson(Map<String, dynamic> json) =>
+      _$SnAuthDeviceWithChallengeFromJson(json);
+}

lib/models/account.freezed.dart

@@ -3,7 +3,7 @@
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
-part of 'user.dart';
+part of 'account.dart';
 
 // **************************************************************************
 // FreezedGenerator
@@ -2452,6 +2452,572 @@ as String?,
 }
 
 
+}
+
+
+/// @nodoc
+mixin _$SnAuthDevice {
+
+ String get id; String get deviceId; String get deviceName; String? get deviceLabel; String get accountId; int get platform; bool get isCurrent;
+/// Create a copy of SnAuthDevice
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnAuthDeviceCopyWith<SnAuthDevice> get copyWith => _$SnAuthDeviceCopyWithImpl<SnAuthDevice>(this as SnAuthDevice, _$identity);
+
+  /// Serializes this SnAuthDevice to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAuthDevice&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.deviceName, deviceName) || other.deviceName == deviceName)&&(identical(other.deviceLabel, deviceLabel) || other.deviceLabel == deviceLabel)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.platform, platform) || other.platform == platform)&&(identical(other.isCurrent, isCurrent) || other.isCurrent == isCurrent));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,deviceId,deviceName,deviceLabel,accountId,platform,isCurrent);
+
+@override
+String toString() {
+  return 'SnAuthDevice(id: $id, deviceId: $deviceId, deviceName: $deviceName, deviceLabel: $deviceLabel, accountId: $accountId, platform: $platform, isCurrent: $isCurrent)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnAuthDeviceCopyWith<$Res>  {
+  factory $SnAuthDeviceCopyWith(SnAuthDevice value, $Res Function(SnAuthDevice) _then) = _$SnAuthDeviceCopyWithImpl;
+@useResult
+$Res call({
+ String id, String deviceId, String deviceName, String? deviceLabel, String accountId, int platform, bool isCurrent
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnAuthDeviceCopyWithImpl<$Res>
+    implements $SnAuthDeviceCopyWith<$Res> {
+  _$SnAuthDeviceCopyWithImpl(this._self, this._then);
+
+  final SnAuthDevice _self;
+  final $Res Function(SnAuthDevice) _then;
+
+/// Create a copy of SnAuthDevice
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? deviceId = null,Object? deviceName = null,Object? deviceLabel = freezed,Object? accountId = null,Object? platform = null,Object? isCurrent = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
+as String,deviceName: null == deviceName ? _self.deviceName : deviceName // ignore: cast_nullable_to_non_nullable
+as String,deviceLabel: freezed == deviceLabel ? _self.deviceLabel : deviceLabel // ignore: cast_nullable_to_non_nullable
+as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,platform: null == platform ? _self.platform : platform // ignore: cast_nullable_to_non_nullable
+as int,isCurrent: null == isCurrent ? _self.isCurrent : isCurrent // ignore: cast_nullable_to_non_nullable
+as bool,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnAuthDevice].
+extension SnAuthDevicePatterns on SnAuthDevice {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnAuthDevice value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnAuthDevice() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnAuthDevice value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnAuthDevice():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnAuthDevice value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnAuthDevice() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String deviceId,  String deviceName,  String? deviceLabel,  String accountId,  int platform,  bool isCurrent)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnAuthDevice() when $default != null:
+return $default(_that.id,_that.deviceId,_that.deviceName,_that.deviceLabel,_that.accountId,_that.platform,_that.isCurrent);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String deviceId,  String deviceName,  String? deviceLabel,  String accountId,  int platform,  bool isCurrent)  $default,) {final _that = this;
+switch (_that) {
+case _SnAuthDevice():
+return $default(_that.id,_that.deviceId,_that.deviceName,_that.deviceLabel,_that.accountId,_that.platform,_that.isCurrent);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String deviceId,  String deviceName,  String? deviceLabel,  String accountId,  int platform,  bool isCurrent)?  $default,) {final _that = this;
+switch (_that) {
+case _SnAuthDevice() when $default != null:
+return $default(_that.id,_that.deviceId,_that.deviceName,_that.deviceLabel,_that.accountId,_that.platform,_that.isCurrent);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnAuthDevice implements SnAuthDevice {
+  const _SnAuthDevice({required this.id, required this.deviceId, required this.deviceName, required this.deviceLabel, required this.accountId, required this.platform, this.isCurrent = false});
+  factory _SnAuthDevice.fromJson(Map<String, dynamic> json) => _$SnAuthDeviceFromJson(json);
+
+@override final  String id;
+@override final  String deviceId;
+@override final  String deviceName;
+@override final  String? deviceLabel;
+@override final  String accountId;
+@override final  int platform;
+@override@JsonKey() final  bool isCurrent;
+
+/// Create a copy of SnAuthDevice
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnAuthDeviceCopyWith<_SnAuthDevice> get copyWith => __$SnAuthDeviceCopyWithImpl<_SnAuthDevice>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnAuthDeviceToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAuthDevice&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.deviceName, deviceName) || other.deviceName == deviceName)&&(identical(other.deviceLabel, deviceLabel) || other.deviceLabel == deviceLabel)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.platform, platform) || other.platform == platform)&&(identical(other.isCurrent, isCurrent) || other.isCurrent == isCurrent));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,deviceId,deviceName,deviceLabel,accountId,platform,isCurrent);
+
+@override
+String toString() {
+  return 'SnAuthDevice(id: $id, deviceId: $deviceId, deviceName: $deviceName, deviceLabel: $deviceLabel, accountId: $accountId, platform: $platform, isCurrent: $isCurrent)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnAuthDeviceCopyWith<$Res> implements $SnAuthDeviceCopyWith<$Res> {
+  factory _$SnAuthDeviceCopyWith(_SnAuthDevice value, $Res Function(_SnAuthDevice) _then) = __$SnAuthDeviceCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String deviceId, String deviceName, String? deviceLabel, String accountId, int platform, bool isCurrent
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnAuthDeviceCopyWithImpl<$Res>
+    implements _$SnAuthDeviceCopyWith<$Res> {
+  __$SnAuthDeviceCopyWithImpl(this._self, this._then);
+
+  final _SnAuthDevice _self;
+  final $Res Function(_SnAuthDevice) _then;
+
+/// Create a copy of SnAuthDevice
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? deviceId = null,Object? deviceName = null,Object? deviceLabel = freezed,Object? accountId = null,Object? platform = null,Object? isCurrent = null,}) {
+  return _then(_SnAuthDevice(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
+as String,deviceName: null == deviceName ? _self.deviceName : deviceName // ignore: cast_nullable_to_non_nullable
+as String,deviceLabel: freezed == deviceLabel ? _self.deviceLabel : deviceLabel // ignore: cast_nullable_to_non_nullable
+as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,platform: null == platform ? _self.platform : platform // ignore: cast_nullable_to_non_nullable
+as int,isCurrent: null == isCurrent ? _self.isCurrent : isCurrent // ignore: cast_nullable_to_non_nullable
+as bool,
+  ));
+}
+
+
+}
+
+SnAuthDeviceWithChallenge _$SnAuthDeviceWithChallengeFromJson(
+  Map<String, dynamic> json
+) {
+    return _SnAuthDeviceWithChallengee.fromJson(
+      json
+    );
+}
+
+/// @nodoc
+mixin _$SnAuthDeviceWithChallenge {
+
+ String get id; String get deviceId; String get deviceName; String? get deviceLabel; String get accountId; int get platform; List<SnAuthChallenge> get challenges; bool get isCurrent;
+/// Create a copy of SnAuthDeviceWithChallenge
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnAuthDeviceWithChallengeCopyWith<SnAuthDeviceWithChallenge> get copyWith => _$SnAuthDeviceWithChallengeCopyWithImpl<SnAuthDeviceWithChallenge>(this as SnAuthDeviceWithChallenge, _$identity);
+
+  /// Serializes this SnAuthDeviceWithChallenge to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAuthDeviceWithChallenge&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.deviceName, deviceName) || other.deviceName == deviceName)&&(identical(other.deviceLabel, deviceLabel) || other.deviceLabel == deviceLabel)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.platform, platform) || other.platform == platform)&&const DeepCollectionEquality().equals(other.challenges, challenges)&&(identical(other.isCurrent, isCurrent) || other.isCurrent == isCurrent));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,deviceId,deviceName,deviceLabel,accountId,platform,const DeepCollectionEquality().hash(challenges),isCurrent);
+
+@override
+String toString() {
+  return 'SnAuthDeviceWithChallenge(id: $id, deviceId: $deviceId, deviceName: $deviceName, deviceLabel: $deviceLabel, accountId: $accountId, platform: $platform, challenges: $challenges, isCurrent: $isCurrent)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnAuthDeviceWithChallengeCopyWith<$Res>  {
+  factory $SnAuthDeviceWithChallengeCopyWith(SnAuthDeviceWithChallenge value, $Res Function(SnAuthDeviceWithChallenge) _then) = _$SnAuthDeviceWithChallengeCopyWithImpl;
+@useResult
+$Res call({
+ String id, String deviceId, String deviceName, String? deviceLabel, String accountId, int platform, List<SnAuthChallenge> challenges, bool isCurrent
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnAuthDeviceWithChallengeCopyWithImpl<$Res>
+    implements $SnAuthDeviceWithChallengeCopyWith<$Res> {
+  _$SnAuthDeviceWithChallengeCopyWithImpl(this._self, this._then);
+
+  final SnAuthDeviceWithChallenge _self;
+  final $Res Function(SnAuthDeviceWithChallenge) _then;
+
+/// Create a copy of SnAuthDeviceWithChallenge
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? deviceId = null,Object? deviceName = null,Object? deviceLabel = freezed,Object? accountId = null,Object? platform = null,Object? challenges = null,Object? isCurrent = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
+as String,deviceName: null == deviceName ? _self.deviceName : deviceName // ignore: cast_nullable_to_non_nullable
+as String,deviceLabel: freezed == deviceLabel ? _self.deviceLabel : deviceLabel // ignore: cast_nullable_to_non_nullable
+as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,platform: null == platform ? _self.platform : platform // ignore: cast_nullable_to_non_nullable
+as int,challenges: null == challenges ? _self.challenges : challenges // ignore: cast_nullable_to_non_nullable
+as List<SnAuthChallenge>,isCurrent: null == isCurrent ? _self.isCurrent : isCurrent // ignore: cast_nullable_to_non_nullable
+as bool,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnAuthDeviceWithChallenge].
+extension SnAuthDeviceWithChallengePatterns on SnAuthDeviceWithChallenge {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnAuthDeviceWithChallengee value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnAuthDeviceWithChallengee() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnAuthDeviceWithChallengee value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnAuthDeviceWithChallengee():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnAuthDeviceWithChallengee value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnAuthDeviceWithChallengee() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String deviceId,  String deviceName,  String? deviceLabel,  String accountId,  int platform,  List<SnAuthChallenge> challenges,  bool isCurrent)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnAuthDeviceWithChallengee() when $default != null:
+return $default(_that.id,_that.deviceId,_that.deviceName,_that.deviceLabel,_that.accountId,_that.platform,_that.challenges,_that.isCurrent);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String deviceId,  String deviceName,  String? deviceLabel,  String accountId,  int platform,  List<SnAuthChallenge> challenges,  bool isCurrent)  $default,) {final _that = this;
+switch (_that) {
+case _SnAuthDeviceWithChallengee():
+return $default(_that.id,_that.deviceId,_that.deviceName,_that.deviceLabel,_that.accountId,_that.platform,_that.challenges,_that.isCurrent);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String deviceId,  String deviceName,  String? deviceLabel,  String accountId,  int platform,  List<SnAuthChallenge> challenges,  bool isCurrent)?  $default,) {final _that = this;
+switch (_that) {
+case _SnAuthDeviceWithChallengee() when $default != null:
+return $default(_that.id,_that.deviceId,_that.deviceName,_that.deviceLabel,_that.accountId,_that.platform,_that.challenges,_that.isCurrent);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnAuthDeviceWithChallengee implements SnAuthDeviceWithChallenge {
+  const _SnAuthDeviceWithChallengee({required this.id, required this.deviceId, required this.deviceName, required this.deviceLabel, required this.accountId, required this.platform, required final  List<SnAuthChallenge> challenges, this.isCurrent = false}): _challenges = challenges;
+  factory _SnAuthDeviceWithChallengee.fromJson(Map<String, dynamic> json) => _$SnAuthDeviceWithChallengeeFromJson(json);
+
+@override final  String id;
+@override final  String deviceId;
+@override final  String deviceName;
+@override final  String? deviceLabel;
+@override final  String accountId;
+@override final  int platform;
+ final  List<SnAuthChallenge> _challenges;
+@override List<SnAuthChallenge> get challenges {
+  if (_challenges is EqualUnmodifiableListView) return _challenges;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_challenges);
+}
+
+@override@JsonKey() final  bool isCurrent;
+
+/// Create a copy of SnAuthDeviceWithChallenge
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnAuthDeviceWithChallengeeCopyWith<_SnAuthDeviceWithChallengee> get copyWith => __$SnAuthDeviceWithChallengeeCopyWithImpl<_SnAuthDeviceWithChallengee>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnAuthDeviceWithChallengeeToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAuthDeviceWithChallengee&&(identical(other.id, id) || other.id == id)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.deviceName, deviceName) || other.deviceName == deviceName)&&(identical(other.deviceLabel, deviceLabel) || other.deviceLabel == deviceLabel)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.platform, platform) || other.platform == platform)&&const DeepCollectionEquality().equals(other._challenges, _challenges)&&(identical(other.isCurrent, isCurrent) || other.isCurrent == isCurrent));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,deviceId,deviceName,deviceLabel,accountId,platform,const DeepCollectionEquality().hash(_challenges),isCurrent);
+
+@override
+String toString() {
+  return 'SnAuthDeviceWithChallenge(id: $id, deviceId: $deviceId, deviceName: $deviceName, deviceLabel: $deviceLabel, accountId: $accountId, platform: $platform, challenges: $challenges, isCurrent: $isCurrent)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnAuthDeviceWithChallengeeCopyWith<$Res> implements $SnAuthDeviceWithChallengeCopyWith<$Res> {
+  factory _$SnAuthDeviceWithChallengeeCopyWith(_SnAuthDeviceWithChallengee value, $Res Function(_SnAuthDeviceWithChallengee) _then) = __$SnAuthDeviceWithChallengeeCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String deviceId, String deviceName, String? deviceLabel, String accountId, int platform, List<SnAuthChallenge> challenges, bool isCurrent
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnAuthDeviceWithChallengeeCopyWithImpl<$Res>
+    implements _$SnAuthDeviceWithChallengeeCopyWith<$Res> {
+  __$SnAuthDeviceWithChallengeeCopyWithImpl(this._self, this._then);
+
+  final _SnAuthDeviceWithChallengee _self;
+  final $Res Function(_SnAuthDeviceWithChallengee) _then;
+
+/// Create a copy of SnAuthDeviceWithChallenge
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? deviceId = null,Object? deviceName = null,Object? deviceLabel = freezed,Object? accountId = null,Object? platform = null,Object? challenges = null,Object? isCurrent = null,}) {
+  return _then(_SnAuthDeviceWithChallengee(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
+as String,deviceName: null == deviceName ? _self.deviceName : deviceName // ignore: cast_nullable_to_non_nullable
+as String,deviceLabel: freezed == deviceLabel ? _self.deviceLabel : deviceLabel // ignore: cast_nullable_to_non_nullable
+as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,platform: null == platform ? _self.platform : platform // ignore: cast_nullable_to_non_nullable
+as int,challenges: null == challenges ? _self._challenges : challenges // ignore: cast_nullable_to_non_nullable
+as List<SnAuthChallenge>,isCurrent: null == isCurrent ? _self.isCurrent : isCurrent // ignore: cast_nullable_to_non_nullable
+as bool,
+  ));
+}
+
+
 }
 
 // dart format on

lib/models/account.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'user.dart';
+part of 'account.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
@@ -297,3 +297,54 @@ Map<String, dynamic> _$SnVerificationMarkToJson(_SnVerificationMark instance) =>
       'description': instance.description,
       'verified_by': instance.verifiedBy,
     };
+
+_SnAuthDevice _$SnAuthDeviceFromJson(Map<String, dynamic> json) =>
+    _SnAuthDevice(
+      id: json['id'] as String,
+      deviceId: json['device_id'] as String,
+      deviceName: json['device_name'] as String,
+      deviceLabel: json['device_label'] as String?,
+      accountId: json['account_id'] as String,
+      platform: (json['platform'] as num).toInt(),
+      isCurrent: json['is_current'] as bool? ?? false,
+    );
+
+Map<String, dynamic> _$SnAuthDeviceToJson(_SnAuthDevice instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'device_id': instance.deviceId,
+      'device_name': instance.deviceName,
+      'device_label': instance.deviceLabel,
+      'account_id': instance.accountId,
+      'platform': instance.platform,
+      'is_current': instance.isCurrent,
+    };
+
+_SnAuthDeviceWithChallengee _$SnAuthDeviceWithChallengeeFromJson(
+  Map<String, dynamic> json,
+) => _SnAuthDeviceWithChallengee(
+  id: json['id'] as String,
+  deviceId: json['device_id'] as String,
+  deviceName: json['device_name'] as String,
+  deviceLabel: json['device_label'] as String?,
+  accountId: json['account_id'] as String,
+  platform: (json['platform'] as num).toInt(),
+  challenges:
+      (json['challenges'] as List<dynamic>)
+          .map((e) => SnAuthChallenge.fromJson(e as Map<String, dynamic>))
+          .toList(),
+  isCurrent: json['is_current'] as bool? ?? false,
+);
+
+Map<String, dynamic> _$SnAuthDeviceWithChallengeeToJson(
+  _SnAuthDeviceWithChallengee instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'device_id': instance.deviceId,
+  'device_name': instance.deviceName,
+  'device_label': instance.deviceLabel,
+  'account_id': instance.accountId,
+  'platform': instance.platform,
+  'challenges': instance.challenges.map((e) => e.toJson()).toList(),
+  'is_current': instance.isCurrent,
+};

lib/models/activity.dart

@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 
 part 'activity.freezed.dart';
 part 'activity.g.dart';

lib/models/auth.dart

@@ -19,14 +19,12 @@ sealed class SnAuthChallenge with _$SnAuthChallenge {
     required int stepRemain,
     required int stepTotal,
     required int failedAttempts,
-    required int platform,
     required int type,
     required List<String> blacklistFactors,
     required List<dynamic> audiences,
     required List<dynamic> scopes,
     required String ipAddress,
     required String userAgent,
-    required String deviceId,
     required String? nonce,
     required String? location,
     required String accountId,
@@ -76,22 +74,6 @@ sealed class SnAuthFactor with _$SnAuthFactor {
       _$SnAuthFactorFromJson(json);
 }
 
-@freezed
-sealed class SnAuthDevice with _$SnAuthDevice {
-  const factory SnAuthDevice({
-    required dynamic label,
-    required String userAgent,
-    required String deviceId,
-    required int platform,
-    required List<SnAuthSession> sessions,
-    // Not from backend, used for UI
-    @Default(false) bool isCurrent,
-  }) = _SnAuthDevice;
-
-  factory SnAuthDevice.fromJson(Map<String, dynamic> json) =>
-      _$SnAuthDeviceFromJson(json);
-}
-
 @freezed
 sealed class SnAccountConnection with _$SnAccountConnection {
   const factory SnAccountConnection({

lib/models/auth.freezed.dart

@@ -272,7 +272,7 @@ as String,
 /// @nodoc
 mixin _$SnAuthChallenge {
 
- String get id; DateTime get expiredAt; int get stepRemain; int get stepTotal; int get failedAttempts; int get platform; int get type; List<String> get blacklistFactors; List<dynamic> get audiences; List<dynamic> get scopes; String get ipAddress; String get userAgent; String get deviceId; String? get nonce; String? get location; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; DateTime get expiredAt; int get stepRemain; int get stepTotal; int get failedAttempts; int get type; List<String> get blacklistFactors; List<dynamic> get audiences; List<dynamic> get scopes; String get ipAddress; String get userAgent; String? get nonce; String? get location; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -285,16 +285,16 @@ $SnAuthChallengeCopyWith<SnAuthChallenge> get copyWith => _$SnAuthChallengeCopyW
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAuthChallenge&&(identical(other.id, id) || other.id == id)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.stepRemain, stepRemain) || other.stepRemain == stepRemain)&&(identical(other.stepTotal, stepTotal) || other.stepTotal == stepTotal)&&(identical(other.failedAttempts, failedAttempts) || other.failedAttempts == failedAttempts)&&(identical(other.platform, platform) || other.platform == platform)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other.blacklistFactors, blacklistFactors)&&const DeepCollectionEquality().equals(other.audiences, audiences)&&const DeepCollectionEquality().equals(other.scopes, scopes)&&(identical(other.ipAddress, ipAddress) || other.ipAddress == ipAddress)&&(identical(other.userAgent, userAgent) || other.userAgent == userAgent)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&(identical(other.location, location) || other.location == location)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAuthChallenge&&(identical(other.id, id) || other.id == id)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.stepRemain, stepRemain) || other.stepRemain == stepRemain)&&(identical(other.stepTotal, stepTotal) || other.stepTotal == stepTotal)&&(identical(other.failedAttempts, failedAttempts) || other.failedAttempts == failedAttempts)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other.blacklistFactors, blacklistFactors)&&const DeepCollectionEquality().equals(other.audiences, audiences)&&const DeepCollectionEquality().equals(other.scopes, scopes)&&(identical(other.ipAddress, ipAddress) || other.ipAddress == ipAddress)&&(identical(other.userAgent, userAgent) || other.userAgent == userAgent)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&(identical(other.location, location) || other.location == location)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hashAll([runtimeType,id,expiredAt,stepRemain,stepTotal,failedAttempts,platform,type,const DeepCollectionEquality().hash(blacklistFactors),const DeepCollectionEquality().hash(audiences),const DeepCollectionEquality().hash(scopes),ipAddress,userAgent,deviceId,nonce,location,accountId,createdAt,updatedAt,deletedAt]);
+int get hashCode => Object.hash(runtimeType,id,expiredAt,stepRemain,stepTotal,failedAttempts,type,const DeepCollectionEquality().hash(blacklistFactors),const DeepCollectionEquality().hash(audiences),const DeepCollectionEquality().hash(scopes),ipAddress,userAgent,nonce,location,accountId,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnAuthChallenge(id: $id, expiredAt: $expiredAt, stepRemain: $stepRemain, stepTotal: $stepTotal, failedAttempts: $failedAttempts, platform: $platform, type: $type, blacklistFactors: $blacklistFactors, audiences: $audiences, scopes: $scopes, ipAddress: $ipAddress, userAgent: $userAgent, deviceId: $deviceId, nonce: $nonce, location: $location, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnAuthChallenge(id: $id, expiredAt: $expiredAt, stepRemain: $stepRemain, stepTotal: $stepTotal, failedAttempts: $failedAttempts, type: $type, blacklistFactors: $blacklistFactors, audiences: $audiences, scopes: $scopes, ipAddress: $ipAddress, userAgent: $userAgent, nonce: $nonce, location: $location, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -305,7 +305,7 @@ abstract mixin class $SnAuthChallengeCopyWith<$Res>  {
   factory $SnAuthChallengeCopyWith(SnAuthChallenge value, $Res Function(SnAuthChallenge) _then) = _$SnAuthChallengeCopyWithImpl;
 @useResult
 $Res call({
- String id, DateTime expiredAt, int stepRemain, int stepTotal, int failedAttempts, int platform, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String deviceId, String? nonce, String? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, DateTime expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, String? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -322,21 +322,19 @@ class _$SnAuthChallengeCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? platform = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? deviceId = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
 as DateTime,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
 as int,stepTotal: null == stepTotal ? _self.stepTotal : stepTotal // ignore: cast_nullable_to_non_nullable
 as int,failedAttempts: null == failedAttempts ? _self.failedAttempts : failedAttempts // ignore: cast_nullable_to_non_nullable
-as int,platform: null == platform ? _self.platform : platform // ignore: cast_nullable_to_non_nullable
 as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,blacklistFactors: null == blacklistFactors ? _self.blacklistFactors : blacklistFactors // ignore: cast_nullable_to_non_nullable
 as List<String>,audiences: null == audiences ? _self.audiences : audiences // ignore: cast_nullable_to_non_nullable
 as List<dynamic>,scopes: null == scopes ? _self.scopes : scopes // ignore: cast_nullable_to_non_nullable
 as List<dynamic>,ipAddress: null == ipAddress ? _self.ipAddress : ipAddress // ignore: cast_nullable_to_non_nullable
 as String,userAgent: null == userAgent ? _self.userAgent : userAgent // ignore: cast_nullable_to_non_nullable
-as String,deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
 as String,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
 as String?,location: freezed == location ? _self.location : location // ignore: cast_nullable_to_non_nullable
 as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
@@ -425,10 +423,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int platform,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String deviceId,  String? nonce,  String? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  String? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge() when $default != null:
-return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.platform,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.deviceId,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return orElse();
 
 }
@@ -446,10 +444,10 @@ return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int platform,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String deviceId,  String? nonce,  String? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  String? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge():
-return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.platform,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.deviceId,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -463,10 +461,10 @@ return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int platform,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String deviceId,  String? nonce,  String? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  String? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge() when $default != null:
-return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.platform,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.deviceId,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return null;
 
 }
@@ -478,7 +476,7 @@ return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.
 @JsonSerializable()
 
 class _SnAuthChallenge implements SnAuthChallenge {
-  const _SnAuthChallenge({required this.id, required this.expiredAt, required this.stepRemain, required this.stepTotal, required this.failedAttempts, required this.platform, required this.type, required final  List<String> blacklistFactors, required final  List<dynamic> audiences, required final  List<dynamic> scopes, required this.ipAddress, required this.userAgent, required this.deviceId, required this.nonce, required this.location, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt}): _blacklistFactors = blacklistFactors,_audiences = audiences,_scopes = scopes;
+  const _SnAuthChallenge({required this.id, required this.expiredAt, required this.stepRemain, required this.stepTotal, required this.failedAttempts, required this.type, required final  List<String> blacklistFactors, required final  List<dynamic> audiences, required final  List<dynamic> scopes, required this.ipAddress, required this.userAgent, required this.nonce, required this.location, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt}): _blacklistFactors = blacklistFactors,_audiences = audiences,_scopes = scopes;
   factory _SnAuthChallenge.fromJson(Map<String, dynamic> json) => _$SnAuthChallengeFromJson(json);
 
 @override final  String id;
@@ -486,7 +484,6 @@ class _SnAuthChallenge implements SnAuthChallenge {
 @override final  int stepRemain;
 @override final  int stepTotal;
 @override final  int failedAttempts;
-@override final  int platform;
 @override final  int type;
  final  List<String> _blacklistFactors;
 @override List<String> get blacklistFactors {
@@ -511,7 +508,6 @@ class _SnAuthChallenge implements SnAuthChallenge {
 
 @override final  String ipAddress;
 @override final  String userAgent;
-@override final  String deviceId;
 @override final  String? nonce;
 @override final  String? location;
 @override final  String accountId;
@@ -532,16 +528,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAuthChallenge&&(identical(other.id, id) || other.id == id)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.stepRemain, stepRemain) || other.stepRemain == stepRemain)&&(identical(other.stepTotal, stepTotal) || other.stepTotal == stepTotal)&&(identical(other.failedAttempts, failedAttempts) || other.failedAttempts == failedAttempts)&&(identical(other.platform, platform) || other.platform == platform)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other._blacklistFactors, _blacklistFactors)&&const DeepCollectionEquality().equals(other._audiences, _audiences)&&const DeepCollectionEquality().equals(other._scopes, _scopes)&&(identical(other.ipAddress, ipAddress) || other.ipAddress == ipAddress)&&(identical(other.userAgent, userAgent) || other.userAgent == userAgent)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&(identical(other.location, location) || other.location == location)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAuthChallenge&&(identical(other.id, id) || other.id == id)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.stepRemain, stepRemain) || other.stepRemain == stepRemain)&&(identical(other.stepTotal, stepTotal) || other.stepTotal == stepTotal)&&(identical(other.failedAttempts, failedAttempts) || other.failedAttempts == failedAttempts)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other._blacklistFactors, _blacklistFactors)&&const DeepCollectionEquality().equals(other._audiences, _audiences)&&const DeepCollectionEquality().equals(other._scopes, _scopes)&&(identical(other.ipAddress, ipAddress) || other.ipAddress == ipAddress)&&(identical(other.userAgent, userAgent) || other.userAgent == userAgent)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&(identical(other.location, location) || other.location == location)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hashAll([runtimeType,id,expiredAt,stepRemain,stepTotal,failedAttempts,platform,type,const DeepCollectionEquality().hash(_blacklistFactors),const DeepCollectionEquality().hash(_audiences),const DeepCollectionEquality().hash(_scopes),ipAddress,userAgent,deviceId,nonce,location,accountId,createdAt,updatedAt,deletedAt]);
+int get hashCode => Object.hash(runtimeType,id,expiredAt,stepRemain,stepTotal,failedAttempts,type,const DeepCollectionEquality().hash(_blacklistFactors),const DeepCollectionEquality().hash(_audiences),const DeepCollectionEquality().hash(_scopes),ipAddress,userAgent,nonce,location,accountId,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnAuthChallenge(id: $id, expiredAt: $expiredAt, stepRemain: $stepRemain, stepTotal: $stepTotal, failedAttempts: $failedAttempts, platform: $platform, type: $type, blacklistFactors: $blacklistFactors, audiences: $audiences, scopes: $scopes, ipAddress: $ipAddress, userAgent: $userAgent, deviceId: $deviceId, nonce: $nonce, location: $location, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnAuthChallenge(id: $id, expiredAt: $expiredAt, stepRemain: $stepRemain, stepTotal: $stepTotal, failedAttempts: $failedAttempts, type: $type, blacklistFactors: $blacklistFactors, audiences: $audiences, scopes: $scopes, ipAddress: $ipAddress, userAgent: $userAgent, nonce: $nonce, location: $location, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -552,7 +548,7 @@ abstract mixin class _$SnAuthChallengeCopyWith<$Res> implements $SnAuthChallenge
   factory _$SnAuthChallengeCopyWith(_SnAuthChallenge value, $Res Function(_SnAuthChallenge) _then) = __$SnAuthChallengeCopyWithImpl;
 @override @useResult
 $Res call({
- String id, DateTime expiredAt, int stepRemain, int stepTotal, int failedAttempts, int platform, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String deviceId, String? nonce, String? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, DateTime expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, String? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -569,21 +565,19 @@ class __$SnAuthChallengeCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? platform = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? deviceId = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnAuthChallenge(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
 as DateTime,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
 as int,stepTotal: null == stepTotal ? _self.stepTotal : stepTotal // ignore: cast_nullable_to_non_nullable
 as int,failedAttempts: null == failedAttempts ? _self.failedAttempts : failedAttempts // ignore: cast_nullable_to_non_nullable
-as int,platform: null == platform ? _self.platform : platform // ignore: cast_nullable_to_non_nullable
 as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,blacklistFactors: null == blacklistFactors ? _self._blacklistFactors : blacklistFactors // ignore: cast_nullable_to_non_nullable
 as List<String>,audiences: null == audiences ? _self._audiences : audiences // ignore: cast_nullable_to_non_nullable
 as List<dynamic>,scopes: null == scopes ? _self._scopes : scopes // ignore: cast_nullable_to_non_nullable
 as List<dynamic>,ipAddress: null == ipAddress ? _self.ipAddress : ipAddress // ignore: cast_nullable_to_non_nullable
 as String,userAgent: null == userAgent ? _self.userAgent : userAgent // ignore: cast_nullable_to_non_nullable
-as String,deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
 as String,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
 as String?,location: freezed == location ? _self.location : location // ignore: cast_nullable_to_non_nullable
 as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
@@ -1189,286 +1183,6 @@ as Map<String, dynamic>?,
 }
 
 
-/// @nodoc
-mixin _$SnAuthDevice {
-
- dynamic get label; String get userAgent; String get deviceId; int get platform; List<SnAuthSession> get sessions;// Not from backend, used for UI
- bool get isCurrent;
-/// Create a copy of SnAuthDevice
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$SnAuthDeviceCopyWith<SnAuthDevice> get copyWith => _$SnAuthDeviceCopyWithImpl<SnAuthDevice>(this as SnAuthDevice, _$identity);
-
-  /// Serializes this SnAuthDevice to a JSON map.
-  Map<String, dynamic> toJson();
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAuthDevice&&const DeepCollectionEquality().equals(other.label, label)&&(identical(other.userAgent, userAgent) || other.userAgent == userAgent)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.platform, platform) || other.platform == platform)&&const DeepCollectionEquality().equals(other.sessions, sessions)&&(identical(other.isCurrent, isCurrent) || other.isCurrent == isCurrent));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(label),userAgent,deviceId,platform,const DeepCollectionEquality().hash(sessions),isCurrent);
-
-@override
-String toString() {
-  return 'SnAuthDevice(label: $label, userAgent: $userAgent, deviceId: $deviceId, platform: $platform, sessions: $sessions, isCurrent: $isCurrent)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $SnAuthDeviceCopyWith<$Res>  {
-  factory $SnAuthDeviceCopyWith(SnAuthDevice value, $Res Function(SnAuthDevice) _then) = _$SnAuthDeviceCopyWithImpl;
-@useResult
-$Res call({
- dynamic label, String userAgent, String deviceId, int platform, List<SnAuthSession> sessions, bool isCurrent
-});
-
-
-
-
-}
-/// @nodoc
-class _$SnAuthDeviceCopyWithImpl<$Res>
-    implements $SnAuthDeviceCopyWith<$Res> {
-  _$SnAuthDeviceCopyWithImpl(this._self, this._then);
-
-  final SnAuthDevice _self;
-  final $Res Function(SnAuthDevice) _then;
-
-/// Create a copy of SnAuthDevice
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? label = freezed,Object? userAgent = null,Object? deviceId = null,Object? platform = null,Object? sessions = null,Object? isCurrent = null,}) {
-  return _then(_self.copyWith(
-label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
-as dynamic,userAgent: null == userAgent ? _self.userAgent : userAgent // ignore: cast_nullable_to_non_nullable
-as String,deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
-as String,platform: null == platform ? _self.platform : platform // ignore: cast_nullable_to_non_nullable
-as int,sessions: null == sessions ? _self.sessions : sessions // ignore: cast_nullable_to_non_nullable
-as List<SnAuthSession>,isCurrent: null == isCurrent ? _self.isCurrent : isCurrent // ignore: cast_nullable_to_non_nullable
-as bool,
-  ));
-}
-
-}
-
-
-/// Adds pattern-matching-related methods to [SnAuthDevice].
-extension SnAuthDevicePatterns on SnAuthDevice {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnAuthDevice value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _SnAuthDevice() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnAuthDevice value)  $default,){
-final _that = this;
-switch (_that) {
-case _SnAuthDevice():
-return $default(_that);}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnAuthDevice value)?  $default,){
-final _that = this;
-switch (_that) {
-case _SnAuthDevice() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( dynamic label,  String userAgent,  String deviceId,  int platform,  List<SnAuthSession> sessions,  bool isCurrent)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _SnAuthDevice() when $default != null:
-return $default(_that.label,_that.userAgent,_that.deviceId,_that.platform,_that.sessions,_that.isCurrent);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( dynamic label,  String userAgent,  String deviceId,  int platform,  List<SnAuthSession> sessions,  bool isCurrent)  $default,) {final _that = this;
-switch (_that) {
-case _SnAuthDevice():
-return $default(_that.label,_that.userAgent,_that.deviceId,_that.platform,_that.sessions,_that.isCurrent);}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( dynamic label,  String userAgent,  String deviceId,  int platform,  List<SnAuthSession> sessions,  bool isCurrent)?  $default,) {final _that = this;
-switch (_that) {
-case _SnAuthDevice() when $default != null:
-return $default(_that.label,_that.userAgent,_that.deviceId,_that.platform,_that.sessions,_that.isCurrent);case _:
-  return null;
-
-}
-}
-
-}
-
-/// @nodoc
-@JsonSerializable()
-
-class _SnAuthDevice implements SnAuthDevice {
-  const _SnAuthDevice({required this.label, required this.userAgent, required this.deviceId, required this.platform, required final  List<SnAuthSession> sessions, this.isCurrent = false}): _sessions = sessions;
-  factory _SnAuthDevice.fromJson(Map<String, dynamic> json) => _$SnAuthDeviceFromJson(json);
-
-@override final  dynamic label;
-@override final  String userAgent;
-@override final  String deviceId;
-@override final  int platform;
- final  List<SnAuthSession> _sessions;
-@override List<SnAuthSession> get sessions {
-  if (_sessions is EqualUnmodifiableListView) return _sessions;
-  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_sessions);
-}
-
-// Not from backend, used for UI
-@override@JsonKey() final  bool isCurrent;
-
-/// Create a copy of SnAuthDevice
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$SnAuthDeviceCopyWith<_SnAuthDevice> get copyWith => __$SnAuthDeviceCopyWithImpl<_SnAuthDevice>(this, _$identity);
-
-@override
-Map<String, dynamic> toJson() {
-  return _$SnAuthDeviceToJson(this, );
-}
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAuthDevice&&const DeepCollectionEquality().equals(other.label, label)&&(identical(other.userAgent, userAgent) || other.userAgent == userAgent)&&(identical(other.deviceId, deviceId) || other.deviceId == deviceId)&&(identical(other.platform, platform) || other.platform == platform)&&const DeepCollectionEquality().equals(other._sessions, _sessions)&&(identical(other.isCurrent, isCurrent) || other.isCurrent == isCurrent));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(label),userAgent,deviceId,platform,const DeepCollectionEquality().hash(_sessions),isCurrent);
-
-@override
-String toString() {
-  return 'SnAuthDevice(label: $label, userAgent: $userAgent, deviceId: $deviceId, platform: $platform, sessions: $sessions, isCurrent: $isCurrent)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$SnAuthDeviceCopyWith<$Res> implements $SnAuthDeviceCopyWith<$Res> {
-  factory _$SnAuthDeviceCopyWith(_SnAuthDevice value, $Res Function(_SnAuthDevice) _then) = __$SnAuthDeviceCopyWithImpl;
-@override @useResult
-$Res call({
- dynamic label, String userAgent, String deviceId, int platform, List<SnAuthSession> sessions, bool isCurrent
-});
-
-
-
-
-}
-/// @nodoc
-class __$SnAuthDeviceCopyWithImpl<$Res>
-    implements _$SnAuthDeviceCopyWith<$Res> {
-  __$SnAuthDeviceCopyWithImpl(this._self, this._then);
-
-  final _SnAuthDevice _self;
-  final $Res Function(_SnAuthDevice) _then;
-
-/// Create a copy of SnAuthDevice
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? label = freezed,Object? userAgent = null,Object? deviceId = null,Object? platform = null,Object? sessions = null,Object? isCurrent = null,}) {
-  return _then(_SnAuthDevice(
-label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
-as dynamic,userAgent: null == userAgent ? _self.userAgent : userAgent // ignore: cast_nullable_to_non_nullable
-as String,deviceId: null == deviceId ? _self.deviceId : deviceId // ignore: cast_nullable_to_non_nullable
-as String,platform: null == platform ? _self.platform : platform // ignore: cast_nullable_to_non_nullable
-as int,sessions: null == sessions ? _self._sessions : sessions // ignore: cast_nullable_to_non_nullable
-as List<SnAuthSession>,isCurrent: null == isCurrent ? _self.isCurrent : isCurrent // ignore: cast_nullable_to_non_nullable
-as bool,
-  ));
-}
-
-
-}
-
-
 /// @nodoc
 mixin _$SnAccountConnection {
 

lib/models/auth.g.dart

@@ -20,7 +20,6 @@ _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
       stepRemain: (json['step_remain'] as num).toInt(),
       stepTotal: (json['step_total'] as num).toInt(),
       failedAttempts: (json['failed_attempts'] as num).toInt(),
-      platform: (json['platform'] as num).toInt(),
       type: (json['type'] as num).toInt(),
       blacklistFactors:
           (json['blacklist_factors'] as List<dynamic>)
@@ -30,7 +29,6 @@ _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
       scopes: json['scopes'] as List<dynamic>,
       ipAddress: json['ip_address'] as String,
       userAgent: json['user_agent'] as String,
-      deviceId: json['device_id'] as String,
       nonce: json['nonce'] as String?,
       location: json['location'] as String?,
       accountId: json['account_id'] as String,
@@ -49,14 +47,12 @@ Map<String, dynamic> _$SnAuthChallengeToJson(_SnAuthChallenge instance) =>
       'step_remain': instance.stepRemain,
       'step_total': instance.stepTotal,
       'failed_attempts': instance.failedAttempts,
-      'platform': instance.platform,
       'type': instance.type,
       'blacklist_factors': instance.blacklistFactors,
       'audiences': instance.audiences,
       'scopes': instance.scopes,
       'ip_address': instance.ipAddress,
       'user_agent': instance.userAgent,
-      'device_id': instance.deviceId,
       'nonce': instance.nonce,
       'location': instance.location,
       'account_id': instance.accountId,
@@ -133,29 +129,6 @@ Map<String, dynamic> _$SnAuthFactorToJson(_SnAuthFactor instance) =>
       'created_response': instance.createdResponse,
     };
 
-_SnAuthDevice _$SnAuthDeviceFromJson(Map<String, dynamic> json) =>
-    _SnAuthDevice(
-      label: json['label'],
-      userAgent: json['user_agent'] as String,
-      deviceId: json['device_id'] as String,
-      platform: (json['platform'] as num).toInt(),
-      sessions:
-          (json['sessions'] as List<dynamic>)
-              .map((e) => SnAuthSession.fromJson(e as Map<String, dynamic>))
-              .toList(),
-      isCurrent: json['is_current'] as bool? ?? false,
-    );
-
-Map<String, dynamic> _$SnAuthDeviceToJson(_SnAuthDevice instance) =>
-    <String, dynamic>{
-      'label': instance.label,
-      'user_agent': instance.userAgent,
-      'device_id': instance.deviceId,
-      'platform': instance.platform,
-      'sessions': instance.sessions.map((e) => e.toJson()).toList(),
-      'is_current': instance.isCurrent,
-    };
-
 _SnAccountConnection _$SnAccountConnectionFromJson(Map<String, dynamic> json) =>
     _SnAccountConnection(
       id: json['id'] as String,

lib/models/chat.dart

@@ -1,7 +1,7 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/realm.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 
 part 'chat.freezed.dart';
 part 'chat.g.dart';

lib/models/custom_app.dart

@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/models/file.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 
 part 'custom_app.freezed.dart';
 part 'custom_app.g.dart';

lib/models/poll.dart

@@ -8,7 +8,7 @@ part 'poll.g.dart';
 sealed class SnPollWithStats with _$SnPollWithStats {
   const factory SnPollWithStats({
     required Map<String, dynamic>? userAnswer,
-    required Map<String, dynamic> stats,
+    @Default({}) Map<String, dynamic> stats,
     required String id,
     required List<SnPollQuestion> questions,
     String? title,

lib/models/poll.freezed.dart

@@ -213,7 +213,7 @@ return $default(_that.userAnswer,_that.stats,_that.id,_that.questions,_that.titl
 @JsonSerializable()
 
 class _SnPollWithStats implements SnPollWithStats {
-  const _SnPollWithStats({required final  Map<String, dynamic>? userAnswer, required final  Map<String, dynamic> stats, required this.id, required final  List<SnPollQuestion> questions, this.title, this.description, this.endedAt, required this.publisherId, required this.createdAt, required this.updatedAt, this.deletedAt}): _userAnswer = userAnswer,_stats = stats,_questions = questions;
+  const _SnPollWithStats({required final  Map<String, dynamic>? userAnswer, final  Map<String, dynamic> stats = const {}, required this.id, required final  List<SnPollQuestion> questions, this.title, this.description, this.endedAt, required this.publisherId, required this.createdAt, required this.updatedAt, this.deletedAt}): _userAnswer = userAnswer,_stats = stats,_questions = questions;
   factory _SnPollWithStats.fromJson(Map<String, dynamic> json) => _$SnPollWithStatsFromJson(json);
 
  final  Map<String, dynamic>? _userAnswer;
@@ -226,7 +226,7 @@ class _SnPollWithStats implements SnPollWithStats {
 }
 
  final  Map<String, dynamic> _stats;
-@override Map<String, dynamic> get stats {
+@override@JsonKey() Map<String, dynamic> get stats {
   if (_stats is EqualUnmodifiableMapView) return _stats;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableMapView(_stats);

lib/models/poll.g.dart

@@ -9,7 +9,7 @@ part of 'poll.dart';
 _SnPollWithStats _$SnPollWithStatsFromJson(Map<String, dynamic> json) =>
     _SnPollWithStats(
       userAnswer: json['user_answer'] as Map<String, dynamic>?,
-      stats: json['stats'] as Map<String, dynamic>,
+      stats: json['stats'] as Map<String, dynamic>? ?? const {},
       id: json['id'] as String,
       questions:
           (json['questions'] as List<dynamic>)

lib/models/publisher.dart

@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/models/file.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 
 part 'publisher.freezed.dart';
 part 'publisher.g.dart';

lib/models/realm.dart

@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/models/file.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 
 part 'realm.freezed.dart';
 part 'realm.g.dart';

lib/models/relationship.dart

@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 
 part 'relationship.freezed.dart';
 part 'relationship.g.dart';

lib/models/wallet.dart

@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 
 part 'wallet.freezed.dart';
 part 'wallet.g.dart';

lib/pods/userinfo.dart

@@ -1,8 +1,9 @@
 import 'dart:developer';
 
+import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 
@@ -17,6 +18,7 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
       final response = await client.get('/id/accounts/me');
       final user = SnAccount.fromJson(response.data);
       state = AsyncValue.data(user);
+      FirebaseAnalytics.instance.setUserId(id: user.id);
     } catch (error, stackTrace) {
       log(
         "[UserInfo] Failed to fetch user info...",
@@ -33,6 +35,7 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
     final prefs = _ref.read(sharedPreferencesProvider);
     await prefs.remove(kTokenPairStoreKey);
     _ref.invalidate(tokenProvider);
+    FirebaseAnalytics.instance.setUserId(id: null);
   }
 }
 

lib/route.dart

@@ -1,3 +1,5 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
+
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -59,6 +61,9 @@ final routerProvider = Provider<GoRouter>((ref) {
   return GoRouter(
     navigatorKey: rootNavigatorKey,
     initialLocation: '/',
+    observers: [
+      FirebaseAnalyticsObserver(analytics: FirebaseAnalytics.instance),
+    ],
     routes: [
       ShellRoute(
         navigatorKey: _shellNavigatorKey,

lib/screens/account.dart

@@ -3,12 +3,14 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/account/account_name.dart';
 import 'package:island/widgets/account/status.dart';
 import 'package:island/widgets/account/leveling_progress.dart';
+import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/debug_sheet.dart';
@@ -303,7 +305,12 @@ class AccountScreen extends HookConsumerWidget {
               trailing: const Icon(Symbols.chevron_right),
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('logout').tr(),
-              onTap: () {
+              onTap: () async {
+                final apiClient = ref.watch(apiClientProvider);
+                showLoadingModal(context);
+                await apiClient.delete('/id/accounts/me/sessions/current');
+                if (!context.mounted) return;
+                hideLoadingModal(context);
                 final userNotifier = ref.read(userInfoProvider.notifier);
                 userNotifier.logOut();
               },

lib/screens/account/me/settings.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/auth.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/screens/account/me/settings_auth_factors.dart';
@@ -15,7 +15,7 @@ import 'package:island/screens/account/me/settings_contacts.dart';
 import 'package:island/screens/auth/captcha.dart';
 import 'package:island/screens/auth/login.dart';
 import 'package:island/services/responsive.dart';
-import 'package:island/widgets/account/account_session_sheet.dart';
+import 'package:island/widgets/account/account_devices.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/response.dart';

lib/screens/account/me/settings_connections.dart

@@ -166,7 +166,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
               webAuthenticationOptions: WebAuthenticationOptions(
                 clientId: 'dev.solsynth.solarpass',
                 redirectUri: Uri.parse(
-                  'https://nt.solian.app/auth/callback/apple',
+                  'https://id.solian.app/auth/callback/apple',
                 ),
               ),
             );

lib/screens/account/me/settings_contacts.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/sheet.dart';

lib/screens/account/me/update.dart

@@ -7,7 +7,7 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/models/file.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';

lib/screens/account/profile.dart

@@ -2,12 +2,13 @@ import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/chat.dart';
 import 'package:island/models/relationship.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/event_calendar.dart';
 import 'package:island/pods/network.dart';
@@ -262,6 +263,10 @@ class AccountProfileScreen extends HookConsumerWidget {
     }
 
     final user = ref.watch(userInfoProvider);
+    final isCurrentUser = useMemoized(
+      () => user.value?.id == account.value?.id,
+      [user, account],
+    );
 
     Widget accountBasicInfo(SnAccount data) => Padding(
       padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
@@ -589,7 +594,7 @@ class AccountProfileScreen extends HookConsumerWidget {
                           child: CustomScrollView(
                             slivers: [
                               SliverGap(24),
-                              if (user.value != null)
+                              if (user.value != null && !isCurrentUser)
                                 SliverToBoxAdapter(child: accountAction(data)),
                               SliverToBoxAdapter(
                                 child: Card(
@@ -686,7 +691,7 @@ class AccountProfileScreen extends HookConsumerWidget {
                             data,
                           ).padding(horizontal: 4),
                         ),
-                        if (user.value != null)
+                        if (user.value != null && !isCurrentUser)
                           SliverToBoxAdapter(
                             child: accountAction(data).padding(horizontal: 4),
                           ),

lib/screens/auth/login.dart

@@ -42,6 +42,22 @@ final Map<int, (String, String, IconData)> kFactorTypes = {
   4: ('authFactorPin', 'authFactorPinDescription', Symbols.nest_secure_alarm),
 };
 
+Future<String?> getDeviceName() async {
+  if (kIsWeb) return null;
+  String? name;
+  if (Platform.isIOS) {
+    final deviceInfo = await DeviceInfoPlugin().iosInfo;
+    name = deviceInfo.name;
+  } else if (Platform.isAndroid) {
+    final deviceInfo = await DeviceInfoPlugin().androidInfo;
+    name = deviceInfo.name;
+  } else if (Platform.isWindows) {
+    final deviceInfo = await DeviceInfoPlugin().windowsInfo;
+    name = deviceInfo.computerName;
+  }
+  return name;
+}
+
 class LoginScreen extends HookConsumerWidget {
   const LoginScreen({super.key});
 
@@ -198,28 +214,6 @@ class _LoginCheckScreen extends HookConsumerWidget {
         wsNotifier.connect();
         if (context.mounted) Navigator.pop(context, true);
       });
-
-      // Update the sessions' device name is available
-      if (!kIsWeb) {
-        String? name;
-        if (Platform.isIOS) {
-          final deviceInfo = await DeviceInfoPlugin().iosInfo;
-          name = deviceInfo.name;
-        } else if (Platform.isAndroid) {
-          final deviceInfo = await DeviceInfoPlugin().androidInfo;
-          name = deviceInfo.name;
-        } else if (Platform.isWindows) {
-          final deviceInfo = await DeviceInfoPlugin().windowsInfo;
-          name = deviceInfo.computerName;
-        }
-        if (name != null) {
-          final client = ref.watch(apiClientProvider);
-          await client.patch(
-            '/id/accounts/me/sessions/current/label',
-            data: jsonEncode(name),
-          );
-        }
-      }
     }
 
     useEffect(() {
@@ -578,6 +572,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
           data: {
             'account': uname,
             'device_id': await getUdid(),
+            'device_name': await getDeviceName(),
             'platform':
                 kIsWeb
                     ? 1
@@ -628,6 +623,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
             'identity_token': credential.identityToken!,
             'authorization_code': credential.authorizationCode,
             'device_id': await getUdid(),
+            'device_name': await getDeviceName(),
           },
         );
 

lib/screens/creators/poll/poll_list.dart

@@ -14,17 +14,19 @@ part 'poll_list.g.dart';
 
 @riverpod
 class PollListNotifier extends _$PollListNotifier
-    with CursorPagingNotifierMixin<SnPoll> {
+    with CursorPagingNotifierMixin<SnPollWithStats> {
   static const int _pageSize = 20;
 
   @override
-  Future<CursorPagingData<SnPoll>> build(String? pubName) {
+  Future<CursorPagingData<SnPollWithStats>> build(String? pubName) {
     // immediately load first page
     return fetch(cursor: null);
   }
 
   @override
-  Future<CursorPagingData<SnPoll>> fetch({required String? cursor}) async {
+  Future<CursorPagingData<SnPollWithStats>> fetch({
+    required String? cursor,
+  }) async {
     final client = ref.read(apiClientProvider);
     final offset = cursor == null ? 0 : int.parse(cursor);
 
@@ -42,7 +44,7 @@ class PollListNotifier extends _$PollListNotifier
     );
     final total = int.parse(response.headers.value('X-Total') ?? '0');
     final List<dynamic> data = response.data;
-    final items = data.map((json) => SnPoll.fromJson(json)).toList();
+    final items = data.map((json) => SnPollWithStats.fromJson(json)).toList();
 
     final hasMore = offset + items.length < total;
     final nextCursor = hasMore ? (offset + items.length).toString() : null;
@@ -55,6 +57,13 @@ class PollListNotifier extends _$PollListNotifier
   }
 }
 
+@riverpod
+Future<SnPollWithStats> pollWithStats(Ref ref, String id) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final resp = await apiClient.get('/sphere/polls/$id');
+  return SnPollWithStats.fromJson(resp.data);
+}
+
 class CreatorPollListScreen extends HookConsumerWidget {
   const CreatorPollListScreen({super.key, required this.pubName});
 
@@ -64,7 +73,7 @@ class CreatorPollListScreen extends HookConsumerWidget {
     final result = await GoRouter.of(
       context,
     ).pushNamed('creatorPollNew', pathParameters: {'name': pubName});
-    if (result is SnPoll && context.mounted) {
+    if (result is SnPollWithStats && context.mounted) {
       Navigator.of(context).maybePop(result);
     }
   }
@@ -92,8 +101,11 @@ class CreatorPollListScreen extends HookConsumerWidget {
                       if (index == widgetCount - 1) {
                         return endItemView;
                       }
-                      final poll = data.items[index];
+                      final pollWithStats = data.items[index];
-                      return _CreatorPollItem(poll: poll, pubName: pubName);
+                      return _CreatorPollItem(
+                        pollWithStats: pollWithStats,
+                        pubName: pubName,
+                      );
                     },
                   ),
             ),
@@ -106,14 +118,14 @@ class CreatorPollListScreen extends HookConsumerWidget {
 
 class _CreatorPollItem extends StatelessWidget {
   final String pubName;
-  const _CreatorPollItem({required this.poll, required this.pubName});
+  const _CreatorPollItem({required this.pollWithStats, required this.pubName});
 
-  final SnPoll poll;
+  final SnPollWithStats pollWithStats;
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final ended = poll.endedAt;
+    final ended = pollWithStats.endedAt;
     final endedText =
         ended == null
             ? 'No end'
@@ -123,15 +135,16 @@ class _CreatorPollItem extends StatelessWidget {
       margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
       clipBehavior: Clip.antiAlias,
       child: ListTile(
-        title: Text(poll.title ?? 'Untitled poll'),
+        title: Text(pollWithStats.title ?? 'Untitled poll'),
         subtitle: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            if (poll.description != null && poll.description!.isNotEmpty)
+            if (pollWithStats.description != null &&
+                pollWithStats.description!.isNotEmpty)
               Padding(
                 padding: const EdgeInsets.only(top: 4),
                 child: Text(
-                  poll.description!,
+                  pollWithStats.description!,
                   maxLines: 2,
                   overflow: TextOverflow.ellipsis,
                 ),
@@ -139,7 +152,7 @@ class _CreatorPollItem extends StatelessWidget {
             Padding(
               padding: const EdgeInsets.only(top: 4),
               child: Text(
-                'Questions: ${poll.questions.length} · Ends: $endedText',
+                'Questions: ${pollWithStats.questions.length} · Ends: $endedText',
                 style: theme.textTheme.bodySmall,
               ),
             ),
@@ -159,7 +172,7 @@ class _CreatorPollItem extends StatelessWidget {
                   onTap: () {
                     GoRouter.of(context).pushNamed(
                       'creatorPollEdit',
-                      pathParameters: {'name': pubName, 'id': poll.id},
+                      pathParameters: {'name': pubName, 'id': pollWithStats.id},
                     );
                   },
                 ),
@@ -170,8 +183,7 @@ class _CreatorPollItem extends StatelessWidget {
             context: context,
             useRootNavigator: true,
             isScrollControlled: true,
-            builder:
+            builder: (context) => PollFeedbackSheet(pollId: pollWithStats.id),
-                (context) => PollFeedbackSheet(pollId: poll.id, poll: poll),
           );
         },
       ),

lib/screens/creators/poll/poll_list.g.dart

@@ -6,7 +6,7 @@ part of 'poll_list.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$pollListNotifierHash() => r'd3da24ff6bbb8f35b06d57fc41625dc0312508e4';
+String _$pollWithStatsHash() => r'6bb910046ce1e09368f9922dbec52fdc2cc86740';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -29,11 +29,133 @@ class _SystemHash {
   }
 }
 
+/// See also [pollWithStats].
+@ProviderFor(pollWithStats)
+const pollWithStatsProvider = PollWithStatsFamily();
+
+/// See also [pollWithStats].
+class PollWithStatsFamily extends Family<AsyncValue<SnPollWithStats>> {
+  /// See also [pollWithStats].
+  const PollWithStatsFamily();
+
+  /// See also [pollWithStats].
+  PollWithStatsProvider call(String id) {
+    return PollWithStatsProvider(id);
+  }
+
+  @override
+  PollWithStatsProvider getProviderOverride(
+    covariant PollWithStatsProvider provider,
+  ) {
+    return call(provider.id);
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'pollWithStatsProvider';
+}
+
+/// See also [pollWithStats].
+class PollWithStatsProvider extends AutoDisposeFutureProvider<SnPollWithStats> {
+  /// See also [pollWithStats].
+  PollWithStatsProvider(String id)
+    : this._internal(
+        (ref) => pollWithStats(ref as PollWithStatsRef, id),
+        from: pollWithStatsProvider,
+        name: r'pollWithStatsProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$pollWithStatsHash,
+        dependencies: PollWithStatsFamily._dependencies,
+        allTransitiveDependencies:
+            PollWithStatsFamily._allTransitiveDependencies,
+        id: id,
+      );
+
+  PollWithStatsProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.id,
+  }) : super.internal();
+
+  final String id;
+
+  @override
+  Override overrideWith(
+    FutureOr<SnPollWithStats> Function(PollWithStatsRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: PollWithStatsProvider._internal(
+        (ref) => create(ref as PollWithStatsRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        id: id,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<SnPollWithStats> createElement() {
+    return _PollWithStatsProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is PollWithStatsProvider && other.id == id;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, id.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin PollWithStatsRef on AutoDisposeFutureProviderRef<SnPollWithStats> {
+  /// The parameter `id` of this provider.
+  String get id;
+}
+
+class _PollWithStatsProviderElement
+    extends AutoDisposeFutureProviderElement<SnPollWithStats>
+    with PollWithStatsRef {
+  _PollWithStatsProviderElement(super.provider);
+
+  @override
+  String get id => (origin as PollWithStatsProvider).id;
+}
+
+String _$pollListNotifierHash() => r'd5b822e737788be8982f5cb3b501d460441930c1';
+
 abstract class _$PollListNotifier
-    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnPoll>> {
+    extends
+        BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnPollWithStats>> {
   late final String? pubName;
 
-  FutureOr<CursorPagingData<SnPoll>> build(String? pubName);
+  FutureOr<CursorPagingData<SnPollWithStats>> build(String? pubName);
 }
 
 /// See also [PollListNotifier].
@@ -42,7 +164,7 @@ const pollListNotifierProvider = PollListNotifierFamily();
 
 /// See also [PollListNotifier].
 class PollListNotifierFamily
-    extends Family<AsyncValue<CursorPagingData<SnPoll>>> {
+    extends Family<AsyncValue<CursorPagingData<SnPollWithStats>>> {
   /// See also [PollListNotifier].
   const PollListNotifierFamily();
 
@@ -78,7 +200,7 @@ class PollListNotifierProvider
     extends
         AutoDisposeAsyncNotifierProviderImpl<
           PollListNotifier,
-          CursorPagingData<SnPoll>
+          CursorPagingData<SnPollWithStats>
         > {
   /// See also [PollListNotifier].
   PollListNotifierProvider(String? pubName)
@@ -109,7 +231,7 @@ class PollListNotifierProvider
   final String? pubName;
 
   @override
-  FutureOr<CursorPagingData<SnPoll>> runNotifierBuild(
+  FutureOr<CursorPagingData<SnPollWithStats>> runNotifierBuild(
     covariant PollListNotifier notifier,
   ) {
     return notifier.build(pubName);
@@ -134,7 +256,7 @@ class PollListNotifierProvider
   @override
   AutoDisposeAsyncNotifierProviderElement<
     PollListNotifier,
-    CursorPagingData<SnPoll>
+    CursorPagingData<SnPollWithStats>
   >
   createElement() {
     return _PollListNotifierProviderElement(this);
@@ -157,7 +279,7 @@ class PollListNotifierProvider
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 mixin PollListNotifierRef
-    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnPoll>> {
+    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnPollWithStats>> {
   /// The parameter `pubName` of this provider.
   String? get pubName;
 }
@@ -166,7 +288,7 @@ class _PollListNotifierProviderElement
     extends
         AutoDisposeAsyncNotifierProviderElement<
           PollListNotifier,
-          CursorPagingData<SnPoll>
+          CursorPagingData<SnPollWithStats>
         >
     with PollListNotifierRef {
   _PollListNotifierProviderElement(super.provider);

lib/screens/notification.dart

@@ -5,7 +5,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/route.dart';

lib/screens/poll/poll_editor.dart

@@ -11,6 +11,7 @@ import 'package:island/widgets/alert.dart';
 import 'package:island/models/poll.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:uuid/uuid.dart';
+import 'package:easy_localization/easy_localization.dart';
 
 class PollEditorState {
   String? id; // for editing
@@ -110,7 +111,7 @@ class PollEditor extends Notifier<PollEditorState> {
               ? [
                 SnPollOption(
                   id: const Uuid().v4(),
-                  label: 'Option 1',
+                  label: 'pollOptionDefaultLabel'.tr(),
                   order: 0,
                 ),
               ]
@@ -191,7 +192,7 @@ class PollEditor extends Notifier<PollEditorState> {
                 : [
                   SnPollOption(
                     id: const Uuid().v4(),
-                    label: 'Option 1',
+                    label: 'pollOptionDefaultLabel'.tr(),
                     order: 0,
                   ),
                 ])
@@ -389,7 +390,7 @@ class PollEditorScreen extends ConsumerWidget {
                 data: body,
               ));
 
-      showSnackBar(isUpdate ? 'Poll updated.' : 'Poll created.');
+      showSnackBar(isUpdate ? 'pollUpdated'.tr() : 'pollCreated'.tr());
 
       if (!context.mounted) return;
       Navigator.of(context).maybePop(res.data);
@@ -416,11 +417,11 @@ class PollEditorScreen extends ConsumerWidget {
 
     return AppScaffold(
       appBar: AppBar(
-        title: Text(model.id == null ? 'Create Poll' : 'Edit Poll'),
+        title: Text(model.id == null ? 'pollCreate'.tr() : 'pollEdit'.tr()),
         actions: [
           if (kDebugMode)
             IconButton(
-              tooltip: 'Preview JSON (debug)',
+              tooltip: 'pollPreviewJsonDebug'.tr(),
               onPressed: () {
                 _showDebugPreview(context, model);
               },
@@ -439,8 +440,8 @@ class PollEditorScreen extends ConsumerWidget {
                 children: [
                   TextFormField(
                     initialValue: model.title ?? '',
-                    decoration: const InputDecoration(
+                    decoration: InputDecoration(
-                      labelText: 'Title',
+                      labelText: 'title'.tr(),
                       border: OutlineInputBorder(
                         borderRadius: BorderRadius.all(Radius.circular(16)),
                       ),
@@ -452,7 +453,7 @@ class PollEditorScreen extends ConsumerWidget {
                         (_) => FocusManager.instance.primaryFocus?.unfocus(),
                     validator: (v) {
                       if (v == null || v.trim().isEmpty) {
-                        return 'Title is required';
+                        return 'pollTitleRequired'.tr();
                       }
                       return null;
                     },
@@ -460,8 +461,8 @@ class PollEditorScreen extends ConsumerWidget {
                   const Gap(12),
                   TextFormField(
                     initialValue: model.description ?? '',
-                    decoration: const InputDecoration(
+                    decoration: InputDecoration(
-                      labelText: 'Description',
+                      labelText: 'description'.tr(),
                       alignLabelWithHint: true,
                       border: OutlineInputBorder(
                         borderRadius: BorderRadius.all(Radius.circular(16)),
@@ -482,7 +483,7 @@ class PollEditorScreen extends ConsumerWidget {
                   Row(
                     children: [
                       Text(
-                        'Questions',
+                        'questions'.tr(),
                         style: Theme.of(context).textTheme.titleLarge,
                       ),
                       const Spacer(),
@@ -495,7 +496,7 @@ class PollEditorScreen extends ConsumerWidget {
                                   : controller.open();
                             },
                             icon: const Icon(Icons.add),
-                            label: const Text('Add question'),
+                            label: Text('pollAddQuestion'.tr()),
                           );
                         },
                         menuChildren:
@@ -514,9 +515,9 @@ class PollEditorScreen extends ConsumerWidget {
                   const Gap(8),
                   if (model.questions.isEmpty)
                     _EmptyState(
-                      title: 'No questions yet',
+                      title: 'pollNoQuestionsYet'.tr(),
                       subtitle:
-                          'Use "Add question" to start building your poll.',
+                          'pollNoQuestionsHint'.tr(),
                     )
                   else
                     ReorderableListView.builder(
@@ -585,7 +586,7 @@ class PollEditorScreen extends ConsumerWidget {
                   Navigator.of(context).maybePop();
                 },
                 icon: const Icon(Icons.close),
-                label: const Text('Cancel'),
+                label: Text('cancel'.tr()),
               ),
               const Spacer(),
               FilledButton.icon(
@@ -593,7 +594,7 @@ class PollEditorScreen extends ConsumerWidget {
                   _submitPoll(context, ref);
                 },
                 icon: const Icon(Icons.cloud_upload_outlined),
-                label: Text(model.id == null ? 'Create' : 'Update'),
+                label: Text(model.id == null ? 'create'.tr() : 'update'.tr()),
               ),
             ],
           ),
@@ -637,14 +638,14 @@ class PollEditorScreen extends ConsumerWidget {
       context: context,
       builder:
           (_) => AlertDialog(
-            title: const Text('Debug Preview'),
+            title: Text('pollDebugPreview'.tr()),
             content: SingleChildScrollView(
               child: SelectableText(buf.toString()),
             ),
             actions: [
               TextButton(
                 onPressed: () => Navigator.of(context).pop(),
-                child: const Text('Close'),
+                child: Text('close'.tr()),
               ),
             ],
           ),
@@ -673,15 +674,15 @@ IconData _iconForType(SnPollQuestionType t) {
 String _labelForType(SnPollQuestionType t) {
   switch (t) {
     case SnPollQuestionType.singleChoice:
-      return 'Single choice';
+      return 'pollQuestionTypeSingleChoice'.tr();
     case SnPollQuestionType.multipleChoice:
-      return 'Multiple choice';
+      return 'pollQuestionTypeMultipleChoice'.tr();
     case SnPollQuestionType.freeText:
-      return 'Free text';
+      return 'pollQuestionTypeFreeText'.tr();
     case SnPollQuestionType.yesNo:
-      return 'Yes / No';
+      return 'pollQuestionTypeYesNo'.tr();
     case SnPollQuestionType.rating:
-      return 'Rating';
+      return 'pollQuestionTypeRating'.tr();
   }
 }
 
@@ -698,8 +699,8 @@ class _EndDatePicker extends StatelessWidget {
       children: [
         Expanded(
           child: InputDecorator(
-            decoration: const InputDecoration(
+            decoration: InputDecoration(
-              labelText: 'End date & time (optional)',
+              labelText: 'pollEndDateOptional'.tr(),
               border: OutlineInputBorder(
                 borderRadius: BorderRadius.all(Radius.circular(16)),
               ),
@@ -711,7 +712,7 @@ class _EndDatePicker extends StatelessWidget {
                 Icon(Icons.event, color: Theme.of(context).colorScheme.primary),
                 Text(
                   value == null
-                      ? 'Not set'
+                      ? 'notSet'.tr()
                       : MaterialLocalizations.of(
                         context,
                       ).formatFullDate(value!),
@@ -759,12 +760,12 @@ class _EndDatePicker extends StatelessWidget {
                     );
                     onChanged(dt);
                   },
-                  child: const Text('Pick'),
+                  child: Text('pick'.tr()),
                 ),
                 if (value != null)
                   TextButton(
                     onPressed: () => onChanged(null),
-                    child: const Text('Clear'),
+                    child: Text('clear'.tr()),
                   ),
               ],
             ),
@@ -799,7 +800,7 @@ class _QuestionHeader extends StatelessWidget {
         child: const Icon(Icons.drag_handle),
       ),
       title: Text(
-        question.title.isEmpty ? 'Untitled question' : question.title,
+        question.title.isEmpty ? 'pollUntitledQuestion'.tr() : question.title,
         maxLines: 1,
         overflow: TextOverflow.ellipsis,
       ),
@@ -808,17 +809,17 @@ class _QuestionHeader extends StatelessWidget {
         spacing: 4,
         children: [
           IconButton(
-            tooltip: 'Move up',
+            tooltip: 'moveUp'.tr(),
             onPressed: onMoveUp,
             icon: const Icon(Icons.arrow_upward),
           ),
           IconButton(
-            tooltip: 'Move down',
+            tooltip: 'moveDown'.tr(),
             onPressed: onMoveDown,
             icon: const Icon(Icons.arrow_downward),
           ),
           IconButton(
-            tooltip: 'Delete',
+            tooltip: 'delete'.tr(),
             onPressed: onDelete,
             icon: const Icon(Icons.delete_outline),
             color: Theme.of(context).colorScheme.error,
@@ -853,7 +854,7 @@ class _QuestionEditor extends ConsumerWidget {
               onChanged: (t) => notifier.setQuestionType(index, t),
             ),
             FilterChip(
-              label: const Text('Required'),
+              label: Text('required'.tr()),
               selected: question.isRequired,
               onSelected: (v) => notifier.setQuestionRequired(index, v),
               avatar: Icon(
@@ -867,8 +868,8 @@ class _QuestionEditor extends ConsumerWidget {
         const Gap(12),
         TextFormField(
           initialValue: question.title,
-          decoration: const InputDecoration(
+          decoration: InputDecoration(
-            labelText: 'Question title',
+            labelText: 'pollQuestionTitle'.tr(),
             border: OutlineInputBorder(
               borderRadius: BorderRadius.all(Radius.circular(16)),
             ),
@@ -879,7 +880,7 @@ class _QuestionEditor extends ConsumerWidget {
           onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
           validator: (v) {
             if (v == null || v.trim().isEmpty) {
-              return 'Question title is required';
+              return 'pollQuestionTitleRequired'.tr();
             }
             return null;
           },
@@ -887,8 +888,8 @@ class _QuestionEditor extends ConsumerWidget {
         const Gap(12),
         TextFormField(
           initialValue: question.description ?? '',
-          decoration: const InputDecoration(
+          decoration: InputDecoration(
-            labelText: 'Question description (optional)',
+            labelText: 'pollQuestionDescriptionOptional'.tr(),
             border: OutlineInputBorder(
               borderRadius: BorderRadius.all(Radius.circular(16)),
             ),
@@ -902,7 +903,7 @@ class _QuestionEditor extends ConsumerWidget {
         ),
         if (question.options != null) ...[
           const Gap(16),
-          Text('Options', style: Theme.of(context).textTheme.titleMedium),
+          Text('options'.tr(), style: Theme.of(context).textTheme.titleMedium),
           const Gap(8),
           _OptionsEditor(index: index, options: question.options!),
           const Gap(4),
@@ -911,7 +912,7 @@ class _QuestionEditor extends ConsumerWidget {
             child: OutlinedButton.icon(
               onPressed: () => notifier.addOption(index),
               icon: const Icon(Icons.add),
-              label: const Text('Add option'),
+              label: Text('pollAddOption'.tr()),
             ),
           ),
         ],
@@ -937,8 +938,8 @@ class _QuestionTypePicker extends StatelessWidget {
   Widget build(BuildContext context) {
     return DropdownButtonFormField<SnPollQuestionType>(
       value: value,
-      decoration: const InputDecoration(
+      decoration: InputDecoration(
-        labelText: 'Type',
+        labelText: 'Type'.tr(),
         border: OutlineInputBorder(
           borderRadius: BorderRadius.all(Radius.circular(16)),
         ),
@@ -987,8 +988,8 @@ class _OptionsEditor extends ConsumerWidget {
                   child: TextFormField(
                     key: ValueKey(options[i].id),
                     initialValue: options[i].label,
-                    decoration: const InputDecoration(
+                    decoration: InputDecoration(
-                      labelText: 'Option label',
+                      labelText: 'pollOptionLabel'.tr(),
                       border: OutlineInputBorder(
                         borderRadius: BorderRadius.all(Radius.circular(16)),
                       ),
@@ -1003,7 +1004,7 @@ class _OptionsEditor extends ConsumerWidget {
                 SizedBox(
                   width: 40,
                   child: IconButton(
-                    tooltip: 'Move up',
+                    tooltip: 'moveUp'.tr(),
                     onPressed:
                         i > 0 ? () => notifier.moveOptionUp(index, i) : null,
                     icon: const Icon(Icons.arrow_upward),
@@ -1012,7 +1013,7 @@ class _OptionsEditor extends ConsumerWidget {
                 SizedBox(
                   width: 40,
                   child: IconButton(
-                    tooltip: 'Move down',
+                    tooltip: 'moveDown'.tr(),
                     onPressed:
                         i < options.length - 1
                             ? () => notifier.moveOptionDown(index, i)
@@ -1023,7 +1024,7 @@ class _OptionsEditor extends ConsumerWidget {
                 SizedBox(
                   width: 40,
                   child: IconButton(
-                    tooltip: 'Delete',
+                    tooltip: 'delete'.tr(),
                     onPressed: () => notifier.removeOption(index, i),
                     icon: const Icon(Icons.close),
                   ),
@@ -1048,7 +1049,7 @@ class _TextAnswerPreview extends StatelessWidget {
       maxLines: long ? 4 : 1,
       decoration: InputDecoration(
         labelText:
-            long ? 'Long text answer (preview)' : 'Short text answer (preview)',
+            long ? 'pollLongTextAnswerPreview'.tr() : 'pollShortTextAnswerPreview'.tr(),
         border: const OutlineInputBorder(
           borderRadius: BorderRadius.all(Radius.circular(16)),
         ),
@@ -1082,9 +1083,9 @@ class _EmptyState extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(title, style: Theme.of(context).textTheme.titleMedium),
+                Text('pollNoQuestionsYet'.tr(), style: Theme.of(context).textTheme.titleMedium),
                 const Gap(4),
-                Text(subtitle, style: Theme.of(context).textTheme.bodyMedium),
+                Text('pollNoQuestionsHint'.tr(), style: Theme.of(context).textTheme.bodyMedium),
               ],
             ),
           ),

lib/screens/posts/pub_profile.dart

@@ -7,7 +7,7 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/post.dart';
 import 'package:island/models/publisher.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/services/color.dart';

lib/services/notify.dart

@@ -10,7 +10,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:island/main.dart';
 import 'package:island/route.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/widgets/app_notification.dart';
 import 'package:top_snackbar_flutter/top_snack_bar.dart';

lib/widgets/account/account_devices.dart

@@ -3,33 +3,34 @@ import 'dart:convert';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/auth.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/services/udid.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/response.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-part 'account_session_sheet.g.dart';
+part 'account_devices.g.dart';
 
 @riverpod
-Future<List<SnAuthDevice>> authDevices(Ref ref) async {
+Future<List<SnAuthDeviceWithChallenge>> authDevices(Ref ref) async {
   final resp = await ref
       .watch(apiClientProvider)
       .get('/id/accounts/me/devices');
-  final sessionId = resp.headers.value('x-auth-session');
+  final currentId = await getUdid();
   final data =
-      resp.data.map<SnAuthDevice>((e) {
+      resp.data.map<SnAuthDeviceWithChallenge>((e) {
-        final ele = SnAuthDevice.fromJson(e);
+        final ele = SnAuthDeviceWithChallenge.fromJson(e);
-        return ele.copyWith(isCurrent: ele.sessions.first.id == sessionId);
+        return ele.copyWith(isCurrent: ele.deviceId == currentId);
       }).toList();
   return data;
 }
 
 class _DeviceListTile extends StatelessWidget {
-  final SnAuthDevice device;
+  final SnAuthDeviceWithChallenge device;
   final Function(String) updateDeviceLabel;
   final Function(String) logoutDevice;
 
@@ -57,17 +58,16 @@ class _DeviceListTile extends StatelessWidget {
       subtitle: Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          Text('authSessionsCount'.plural(device.sessions.length)),
           Text(
             'lastActiveAt'.tr(
               args: [
                 DateFormat().format(
-                  device.sessions.first.lastGrantedAt.toLocal(),
+                  device.challenges.first.createdAt.toLocal(),
                 ),
               ],
             ),
           ),
-          Text(device.sessions.first.challenge.ipAddress),
+          Text(device.challenges.first.ipAddress),
           if (device.isCurrent)
             Row(
               children: [
@@ -84,7 +84,7 @@ class _DeviceListTile extends StatelessWidget {
             ).padding(top: 4),
         ],
       ),
-      title: Text(device.label ?? device.sessions.first.challenge.userAgent),
+      title: Text(device.deviceLabel ?? device.deviceName),
       trailing:
           isWideScreen(context)
               ? Row(
@@ -93,14 +93,13 @@ class _DeviceListTile extends StatelessWidget {
                   IconButton(
                     icon: Icon(Icons.edit),
                     tooltip: 'authDeviceEditLabel'.tr(),
-                    onPressed:
+                    onPressed: () => updateDeviceLabel(device.deviceId),
-                        () => updateDeviceLabel(device.sessions.first.id),
                   ),
                   if (!device.isCurrent)
                     IconButton(
                       icon: Icon(Icons.logout),
                       tooltip: 'authDeviceLogout'.tr(),
-                      onPressed: () => logoutDevice(device.sessions.first.id),
+                      onPressed: () => logoutDevice(device.deviceId),
                     ),
                 ],
               )
@@ -124,7 +123,7 @@ class AccountSessionSheet extends HookConsumerWidget {
       if (!confirm || !context.mounted) return;
       try {
         final apiClient = ref.watch(apiClientProvider);
-        await apiClient.delete('/id/accounts/me/sessions/$sessionId');
+        await apiClient.delete('/id/accounts/me/devices/$sessionId');
         ref.invalidate(authDevicesProvider);
       } catch (err) {
         showErrorAlert(err);
@@ -163,7 +162,7 @@ class AccountSessionSheet extends HookConsumerWidget {
       try {
         final apiClient = ref.watch(apiClientProvider);
         await apiClient.patch(
-          '/accounts/me/sessions/$sessionId/label',
+          '/accounts/me/devices/$sessionId/label',
           data: jsonEncode(label),
         );
         ref.invalidate(authDevicesProvider);
@@ -194,7 +193,7 @@ class AccountSessionSheet extends HookConsumerWidget {
                     );
                   } else {
                     return Dismissible(
-                      key: Key('device-${device.sessions.first.id}'),
+                      key: Key('device-${device.id}'),
                       direction:
                           device.isCurrent
                               ? DismissDirection.startToEnd
@@ -213,7 +212,7 @@ class AccountSessionSheet extends HookConsumerWidget {
                       ),
                       confirmDismiss: (direction) async {
                         if (direction == DismissDirection.startToEnd) {
-                          updateDeviceLabel(device.sessions.first.id);
+                          updateDeviceLabel(device.deviceId);
                           return false;
                         } else {
                           final confirm = await showConfirmAlert(
@@ -221,7 +220,7 @@ class AccountSessionSheet extends HookConsumerWidget {
                             'authDeviceLogout'.tr(),
                           );
                           if (confirm && context.mounted) {
-                            logoutDevice(device.sessions.first.id);
+                            logoutDevice(device.deviceId);
                           }
                           return false; // Don't dismiss
                         }

lib/widgets/account/account_devices.g.dart

@@ -1,17 +1,17 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'account_session_sheet.dart';
+part of 'account_devices.dart';
 
 // **************************************************************************
 // RiverpodGenerator
 // **************************************************************************
 
-String _$authDevicesHash() => r'8bc41a1ffc37df8e757c977b4ddae11db8faaeb5';
+String _$authDevicesHash() => r'feb19238f759921e51c888f8b443a3d7761e68da';
 
 /// See also [authDevices].
 @ProviderFor(authDevices)
 final authDevicesProvider =
-    AutoDisposeFutureProvider<List<SnAuthDevice>>.internal(
+    AutoDisposeFutureProvider<List<SnAuthDeviceWithChallenge>>.internal(
       authDevices,
       name: r'authDevicesProvider',
       debugGetCreateSourceHash:
@@ -24,6 +24,7 @@ final authDevicesProvider =
 
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
-typedef AuthDevicesRef = AutoDisposeFutureProviderRef<List<SnAuthDevice>>;
+typedef AuthDevicesRef =
+    AutoDisposeFutureProviderRef<List<SnAuthDeviceWithChallenge>>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/widgets/account/account_name.dart

@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/models/wallet.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';

lib/widgets/account/account_picker.dart

@@ -4,7 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';

lib/widgets/account/badge.dart

@@ -1,6 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/models/badge.dart';
 
 class BadgeList extends StatelessWidget {

lib/widgets/account/status.dart

@@ -2,7 +2,7 @@ import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/screens/account/profile.dart';
 import 'package:island/services/time.dart';

lib/widgets/account/status_creation.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/widgets/account/status.dart';

lib/widgets/alert.dart

@@ -69,7 +69,7 @@ void showLoadingModal(BuildContext context) {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    CircularProgressIndicator(year2023: true),
+                    CircularProgressIndicator(year2023: false),
                     const Gap(24),
                     Text('loading'.tr()),
                   ],

lib/widgets/app_notification.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/models/user.dart';
+import 'package:island/models/account.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:styled_widget/styled_widget.dart';

lib/widgets/content/cloud_file_collection.dart

@@ -31,6 +31,7 @@ class CloudFileList extends HookConsumerWidget {
   final bool disableZoomIn;
   final bool disableConstraint;
   final EdgeInsets? padding;
+  final bool isColumn;
   const CloudFileList({
     super.key,
     required this.files,
@@ -40,6 +41,7 @@ class CloudFileList extends HookConsumerWidget {
     this.disableZoomIn = false,
     this.disableConstraint = false,
     this.padding,
+    this.isColumn = false,
   });
 
   double calculateAspectRatio() {
@@ -63,6 +65,74 @@ class CloudFileList extends HookConsumerWidget {
     );
 
     if (files.isEmpty) return const SizedBox.shrink();
+
+    if (isColumn) {
+      final children = <Widget>[];
+      const maxFiles = 2;
+      final filesToShow = files.take(maxFiles).toList();
+
+      for (var i = 0; i < filesToShow.length; i++) {
+        final file = filesToShow[i];
+        final isImage = file.mimeType?.startsWith('image') ?? false;
+        final isAudio = file.mimeType?.startsWith('audio') ?? false;
+        final widgetItem = ClipRRect(
+          borderRadius: const BorderRadius.all(Radius.circular(8)),
+          child: _CloudFileListEntry(
+            file: file,
+            heroTag: heroTags[i],
+            isImage: isImage,
+            disableZoomIn: disableZoomIn,
+            onTap: () {
+              if (!isImage) {
+                return;
+              }
+              if (!disableZoomIn) {
+                context.pushTransparentRoute(
+                  CloudFileZoomIn(item: file, heroTag: heroTags[i]),
+                  rootNavigator: true,
+                );
+              }
+            },
+          ),
+        );
+
+        Widget item;
+        if (isAudio) {
+          item = SizedBox(height: 120, child: widgetItem);
+        } else {
+          item = AspectRatio(
+            aspectRatio: file.fileMeta?['ratio'] as double? ?? 1.0,
+            child: widgetItem,
+          );
+        }
+        children.add(item);
+        if (i < filesToShow.length - 1) {
+          children.add(const Gap(8));
+        }
+      }
+
+      if (files.length > maxFiles) {
+        children.add(const Gap(8));
+        children.add(
+          Text(
+            'filesListAdditional'.plural(files.length - filesToShow.length),
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+              color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
+            ),
+          ),
+        );
+      }
+
+      return Padding(
+        padding: padding ?? EdgeInsets.zero,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: children,
+        ),
+      );
+    }
     if (files.length == 1) {
       final isImage = files.first.mimeType?.startsWith('image') ?? false;
       final isAudio = files.first.mimeType?.startsWith('audio') ?? false;

lib/widgets/keyboard_navigation.dart

@@ -1,86 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-enum VimMode { normal, insert }
-
-class KeyboardNavigation extends StatefulWidget {
-  const KeyboardNavigation({super.key, required this.child});
-
-  final Widget child;
-
-  @override
-  State<KeyboardNavigation> createState() => _KeyboardNavigationState();
-}
-
-class _KeyboardNavigationState extends State<KeyboardNavigation> {
-  VimMode _mode = VimMode.normal;
-  final FocusScopeNode _focusScopeNode = FocusScopeNode();
-
-  @override
-  void dispose() {
-    _focusScopeNode.dispose();
-    super.dispose();
-  }
-
-  KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
-    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
-      return KeyEventResult.ignored;
-    }
-
-    if (_mode == VimMode.normal) {
-      if (event.logicalKey == LogicalKeyboardKey.keyJ) {
-        node.focusInDirection(TraversalDirection.down);
-        return KeyEventResult.handled;
-      } else if (event.logicalKey == LogicalKeyboardKey.keyK) {
-        node.focusInDirection(TraversalDirection.up);
-        return KeyEventResult.handled;
-      } else if (event.logicalKey == LogicalKeyboardKey.keyH) {
-        final focusNode = FocusManager.instance.primaryFocus;
-        if (focusNode != null) {
-          final scrollable = Scrollable.of(focusNode.context!);
-          if (scrollable.position.axis == Axis.horizontal) {
-            scrollable.position.moveTo(scrollable.position.pixels - 50);
-            return KeyEventResult.handled;
-          }
-        }
-        node.focusInDirection(TraversalDirection.left);
-        return KeyEventResult.handled;
-      } else if (event.logicalKey == LogicalKeyboardKey.keyL) {
-        final focusNode = FocusManager.instance.primaryFocus;
-        if (focusNode != null) {
-          final scrollable = Scrollable.of(focusNode.context!);
-          if (scrollable.position.axis == Axis.horizontal) {
-            scrollable.position.moveTo(scrollable.position.pixels + 50);
-            return KeyEventResult.handled;
-          }
-        }
-        node.focusInDirection(TraversalDirection.right);
-        return KeyEventResult.handled;
-      } else if (event.logicalKey == LogicalKeyboardKey.keyI) {
-        setState(() {
-          _mode = VimMode.insert;
-        });
-        return KeyEventResult.handled;
-      }
-    } else if (_mode == VimMode.insert) {
-      if (event.logicalKey == LogicalKeyboardKey.escape) {
-        setState(() {
-          _mode = VimMode.normal;
-        });
-        // Unfocus the current widget to prevent typing
-        node.unfocus();
-        return KeyEventResult.handled;
-      }
-    }
-    return KeyEventResult.ignored;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Focus(
-      focusNode: _focusScopeNode,
-      onKeyEvent: _handleKeyEvent,
-      child: widget.child,
-    );
-  }
-}

lib/widgets/poll/poll_feedback.dart

@@ -1,9 +1,14 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/poll.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/screens/creators/poll/poll_list.dart';
 import 'package:island/services/time.dart';
 import 'package:island/widgets/content/sheet.dart';
+import 'package:island/widgets/poll/poll_stats_widget.dart';
+import 'package:island/widgets/response.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:styled_widget/styled_widget.dart';
@@ -52,78 +57,93 @@ class PollFeedbackNotifier extends _$PollFeedbackNotifier
 class PollFeedbackSheet extends HookConsumerWidget {
   final String pollId;
   final String? title;
-  final SnPoll poll;
+  const PollFeedbackSheet({super.key, required this.pollId, this.title});
-  final Map<String, dynamic>? stats; // stats object similar to PollSubmit
-  const PollFeedbackSheet({
-    super.key,
-    required this.pollId,
-    required this.poll,
-    this.title,
-    this.stats,
-  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final poll = ref.watch(pollWithStatsProvider(pollId));
+
     return SheetScaffold(
       titleText: title ?? 'Poll feedback',
-      child: Column(
+      child: poll.when(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
+        data:
-        children: [
+            (data) => CustomScrollView(
-          _PollHeader(poll: poll, stats: stats),
+              slivers: [
-          const Divider(height: 1),
+                SliverToBoxAdapter(child: _PollHeader(poll: data)),
-          Expanded(
+                SliverToBoxAdapter(child: const Divider(height: 1)),
-            child: PagingHelperView(
+                SliverGap(4),
+                PagingHelperSliverView(
                   provider: pollFeedbackNotifierProvider(pollId),
-              futureRefreshable: pollFeedbackNotifierProvider(pollId).future,
+                  futureRefreshable:
+                      pollFeedbackNotifierProvider(pollId).future,
                   notifierRefreshable:
                       pollFeedbackNotifierProvider(pollId).notifier,
                   contentBuilder:
-                  (data, widgetCount, endItemView) => ListView.separated(
+                      (val, widgetCount, endItemView) => SliverList.separated(
-                    padding: const EdgeInsets.symmetric(vertical: 4),
                         itemCount: widgetCount,
                         itemBuilder: (context, index) {
                           if (index == widgetCount - 1) {
                             // Provided by PagingHelperView to indicate end/loading
                             return endItemView;
                           }
-                      final answer = data.items[index];
+                          final answer = val.items[index];
-                      return _PollAnswerTile(answer: answer, poll: poll);
+                          return _PollAnswerTile(answer: answer, poll: data);
                         },
                         separatorBuilder:
                             (context, index) =>
                                 const Divider(height: 1).padding(vertical: 4),
                       ),
                 ),
-          ),
+                SliverGap(4 + MediaQuery.of(context).padding.bottom),
               ],
             ),
+        error:
+            (err, _) => ResponseErrorWidget(
+              error: err,
+              onRetry: () => ref.invalidate(pollWithStatsProvider(pollId)),
+            ),
+        loading: () => ResponseLoadingWidget(),
+      ),
     );
   }
 }
 
 class _PollHeader extends StatelessWidget {
-  const _PollHeader({required this.poll, this.stats});
+  const _PollHeader({required this.poll});
-  final SnPoll poll;
+  final SnPollWithStats poll;
-  final Map<String, dynamic>? stats;
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
     return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      spacing: 12,
+      children: [
+        if (poll.title != null || (poll.description?.isNotEmpty ?? false))
+          Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               if (poll.title != null)
                 Text(poll.title!, style: theme.textTheme.titleLarge),
-        if (poll.description != null)
+              if (poll.description?.isNotEmpty ?? false)
-          Padding(
+                Text(
-            padding: const EdgeInsets.only(top: 2),
-            child: Text(
                   poll.description!,
                   style: theme.textTheme.bodyMedium?.copyWith(
                     color: theme.textTheme.bodyMedium?.color?.withOpacity(0.7),
                   ),
                 ),
+            ],
+          ),
+        Text('pollQuestions').tr().fontSize(17).bold(),
+        for (final q in poll.questions)
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              if (q.title.isNotEmpty) Text(q.title).bold(),
+              if (q.description?.isNotEmpty ?? false) Text(q.description!),
+              PollStatsWidget(question: q, stats: poll.stats),
+            ],
           ),
       ],
     ).padding(horizontal: 20, vertical: 16);
@@ -132,7 +152,7 @@ class _PollHeader extends StatelessWidget {
 
 class _PollAnswerTile extends StatelessWidget {
   final SnPollAnswer answer;
-  final SnPoll poll;
+  final SnPollWithStats poll;
   const _PollAnswerTile({required this.answer, required this.poll});
 
   String _formatPerQuestionAnswer(

lib/widgets/poll/poll_stats_widget.dart

@@ -0,0 +1,233 @@
+import 'package:flutter/material.dart';
+import 'package:island/models/poll.dart';
+
+class PollStatsWidget extends StatelessWidget {
+  const PollStatsWidget({
+    super.key,
+    required this.question,
+    required this.stats,
+  });
+
+  final SnPollQuestion question;
+  final Map<String, dynamic>? stats;
+
+  @override
+  Widget build(BuildContext context) {
+    if (stats == null) return const SizedBox.shrink();
+    final raw = stats![question.id];
+    if (raw == null) return const SizedBox.shrink();
+
+    Widget? body;
+
+    switch (question.type) {
+      case SnPollQuestionType.rating:
+        // rating: avg score (double or int)
+        final avg = (raw['rating'] as num?)?.toDouble();
+        if (avg == null) break;
+        final theme = Theme.of(context);
+        body = Row(
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: [
+            Icon(Icons.star, color: Colors.amber.shade600, size: 18),
+            const SizedBox(width: 6),
+            Text(
+              avg.toStringAsFixed(1),
+              style: theme.textTheme.labelMedium?.copyWith(
+                color: theme.colorScheme.onSurfaceVariant,
+              ),
+            ),
+          ],
+        );
+        break;
+
+      case SnPollQuestionType.yesNo:
+        // yes/no: map {true: count, false: count}
+        if (raw is Map) {
+          final int yes =
+              (raw[true] is int)
+                  ? raw[true] as int
+                  : int.tryParse('${raw[true]}') ?? 0;
+          final int no =
+              (raw[false] is int)
+                  ? raw[false] as int
+                  : int.tryParse('${raw[false]}') ?? 0;
+          final total = (yes + no).clamp(0, 1 << 31);
+          final yesPct = total == 0 ? 0.0 : yes / total;
+          final noPct = total == 0 ? 0.0 : no / total;
+          final theme = Theme.of(context);
+          body = Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              _BarStatRow(
+                label: 'Yes',
+                count: yes,
+                fraction: yesPct,
+                color: Colors.green.shade600,
+              ),
+              const SizedBox(height: 6),
+              _BarStatRow(
+                label: 'No',
+                count: no,
+                fraction: noPct,
+                color: Colors.red.shade600,
+              ),
+              const SizedBox(height: 4),
+              Text(
+                'Total: $total',
+                style: theme.textTheme.labelSmall?.copyWith(
+                  color: theme.colorScheme.onSurfaceVariant,
+                ),
+              ),
+            ],
+          );
+        }
+        break;
+
+      case SnPollQuestionType.singleChoice:
+      case SnPollQuestionType.multipleChoice:
+        // map optionId -> count
+        if (raw is Map) {
+          final options = [...?question.options]
+            ..sort((a, b) => a.order.compareTo(b.order));
+          final List<_OptionCount> items = [];
+          int total = 0;
+          for (final opt in options) {
+            final dynamic v = raw[opt.id];
+            final int count = v is int ? v : int.tryParse('$v') ?? 0;
+            total += count;
+            items.add(_OptionCount(id: opt.id, label: opt.label, count: count));
+          }
+          if (items.isNotEmpty) {
+            items.sort(
+              (a, b) => b.count.compareTo(a.count),
+            ); // show highest first
+          }
+          body = Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              for (final it in items)
+                Padding(
+                  padding: const EdgeInsets.only(bottom: 6),
+                  child: _BarStatRow(
+                    label: it.label,
+                    count: it.count,
+                    fraction: total == 0 ? 0 : it.count / total,
+                  ),
+                ),
+              if (items.isNotEmpty)
+                Text(
+                  'Total: $total',
+                  style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                ),
+            ],
+          );
+        }
+        break;
+
+      case SnPollQuestionType.freeText:
+        // No stats
+        break;
+    }
+
+    if (body == null) return Text('No stats available');
+
+    return Padding(
+      padding: const EdgeInsets.only(top: 8),
+      child: DecoratedBox(
+        decoration: BoxDecoration(
+          color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.35),
+          borderRadius: BorderRadius.circular(8),
+        ),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                'Stats',
+                style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                ),
+              ),
+              const SizedBox(height: 8),
+              body,
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _OptionCount {
+  final String id;
+  final String label;
+  final int count;
+  const _OptionCount({
+    required this.id,
+    required this.label,
+    required this.count,
+  });
+}
+
+class _BarStatRow extends StatelessWidget {
+  const _BarStatRow({
+    required this.label,
+    required this.count,
+    required this.fraction,
+    this.color,
+  });
+
+  final String label;
+  final int count;
+  final double fraction;
+  final Color? color;
+
+  @override
+  Widget build(BuildContext context) {
+    final barColor = color ?? Theme.of(context).colorScheme.primary;
+    final bgColor = Theme.of(
+      context,
+    ).colorScheme.surfaceVariant.withOpacity(0.6);
+    final fg =
+        (fraction.isNaN || fraction.isInfinite)
+            ? 0.0
+            : fraction.clamp(0.0, 1.0);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text('$label · $count', style: Theme.of(context).textTheme.labelMedium),
+        const SizedBox(height: 4),
+        LayoutBuilder(
+          builder: (context, constraints) {
+            final width = constraints.maxWidth;
+            final filled = width * fg;
+            return Stack(
+              children: [
+                Container(
+                  height: 8,
+                  width: width,
+                  decoration: BoxDecoration(
+                    color: bgColor,
+                    borderRadius: BorderRadius.circular(999),
+                  ),
+                ),
+                Container(
+                  height: 8,
+                  width: filled,
+                  decoration: BoxDecoration(
+                    color: barColor,
+                    borderRadius: BorderRadius.circular(999),
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+      ],
+    );
+  }
+}

lib/widgets/poll/poll_submit.dart

@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:island/models/poll.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/poll/poll_stats_widget.dart';
 
 class PollSubmit extends ConsumerStatefulWidget {
   const PollSubmit({
@@ -14,6 +16,7 @@ class PollSubmit extends ConsumerStatefulWidget {
     this.initialAnswers,
     this.onCancel,
     this.showProgress = true,
+    this.isReadonly = false,
   });
 
   final SnPollWithStats poll;
@@ -31,6 +34,8 @@ class PollSubmit extends ConsumerStatefulWidget {
   /// Whether to show a progress indicator (e.g., "2 / N").
   final bool showProgress;
 
+  final bool isReadonly;
+
   @override
   ConsumerState<PollSubmit> createState() => _PollSubmitState();
 }
@@ -39,6 +44,7 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
   late final List<SnPollQuestion> _questions;
   int _index = 0;
   bool _submitting = false;
+  bool _isModifying = false; // New state to track if user is modifying answers
 
   /// Collected answers, keyed by questionId
   late Map<String, dynamic> _answers;
@@ -59,7 +65,14 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
     _questions = [...widget.poll.questions]
       ..sort((a, b) => a.order.compareTo(b.order));
     _answers = Map<String, dynamic>.from(widget.initialAnswers ?? {});
+    if (!widget.isReadonly) {
       _loadCurrentIntoLocalState();
+      // If initial answers are provided, set _isModifying to false initially
+      // so the "Modify" button is shown.
+      if (widget.initialAnswers != null && widget.initialAnswers!.isNotEmpty) {
+        _isModifying = false;
+      }
+    }
   }
 
   @override
@@ -74,7 +87,11 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
           [...widget.poll.questions]
             ..sort((a, b) => a.order.compareTo(b.order)),
         );
+      if (!widget.isReadonly) {
         _loadCurrentIntoLocalState();
+        // If poll ID changes, reset modification state
+        _isModifying = false;
+      }
     }
   }
 
@@ -196,7 +213,7 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
       // Only call onSubmit after server accepts
       widget.onSubmit(Map<String, dynamic>.unmodifiable(_answers));
 
-      showSnackBar('Poll answer has been submitted.');
+      showSnackBar('pollAnswerSubmitted'.tr());
       HapticFeedback.heavyImpact();
     } catch (e) {
       showErrorAlert(e);
@@ -268,7 +285,8 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
               ],
             ),
           ),
-        if (widget.showProgress)
+        if (widget.showProgress &&
+            _isModifying) // Only show progress when modifying
           Text(
             '${_index + 1} / ${_questions.length}',
             style: Theme.of(context).textTheme.labelMedium,
@@ -310,154 +328,13 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
   }
 
   Widget _buildStats(BuildContext context, SnPollQuestion q) {
-    if (widget.stats == null) return const SizedBox.shrink();
+    return PollStatsWidget(question: q, stats: widget.stats);
-    final raw = widget.stats![q.id];
-    if (raw == null) return const SizedBox.shrink();
-
-    Widget? body;
-
-    switch (q.type) {
-      case SnPollQuestionType.rating:
-        // rating: avg score (double or int)
-        final avg = (raw['rating'] as num?)?.toDouble();
-        if (avg == null) break;
-        final theme = Theme.of(context);
-        body = Row(
-          mainAxisAlignment: MainAxisAlignment.start,
-          children: [
-            Icon(Icons.star, color: Colors.amber.shade600, size: 18),
-            const SizedBox(width: 6),
-            Text(
-              avg.toStringAsFixed(1),
-              style: theme.textTheme.labelMedium?.copyWith(
-                color: theme.colorScheme.onSurfaceVariant,
-              ),
-            ),
-          ],
-        );
-        break;
-
-      case SnPollQuestionType.yesNo:
-        // yes/no: map {true: count, false: count}
-        if (raw is Map) {
-          final int yes =
-              (raw[true] is int)
-                  ? raw[true] as int
-                  : int.tryParse('${raw[true]}') ?? 0;
-          final int no =
-              (raw[false] is int)
-                  ? raw[false] as int
-                  : int.tryParse('${raw[false]}') ?? 0;
-          final total = (yes + no).clamp(0, 1 << 31);
-          final yesPct = total == 0 ? 0.0 : yes / total;
-          final noPct = total == 0 ? 0.0 : no / total;
-          final theme = Theme.of(context);
-          body = Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _BarStatRow(
-                label: 'Yes',
-                count: yes,
-                fraction: yesPct,
-                color: Colors.green.shade600,
-              ),
-              const SizedBox(height: 6),
-              _BarStatRow(
-                label: 'No',
-                count: no,
-                fraction: noPct,
-                color: Colors.red.shade600,
-              ),
-              const SizedBox(height: 4),
-              Text(
-                'Total: $total',
-                style: theme.textTheme.labelSmall?.copyWith(
-                  color: theme.colorScheme.onSurfaceVariant,
-                ),
-              ),
-            ],
-          );
-        }
-        break;
-
-      case SnPollQuestionType.singleChoice:
-      case SnPollQuestionType.multipleChoice:
-        // map optionId -> count
-        if (raw is Map) {
-          final options = [...?q.options]
-            ..sort((a, b) => a.order.compareTo(b.order));
-          final List<_OptionCount> items = [];
-          int total = 0;
-          for (final opt in options) {
-            final dynamic v = raw[opt.id];
-            final int count = v is int ? v : int.tryParse('$v') ?? 0;
-            total += count;
-            items.add(_OptionCount(id: opt.id, label: opt.label, count: count));
-          }
-          if (items.isNotEmpty) {
-            items.sort(
-              (a, b) => b.count.compareTo(a.count),
-            ); // show highest first
-          }
-          body = Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              for (final it in items)
-                Padding(
-                  padding: const EdgeInsets.only(bottom: 6),
-                  child: _BarStatRow(
-                    label: it.label,
-                    count: it.count,
-                    fraction: total == 0 ? 0 : it.count / total,
-                  ),
-                ),
-              if (items.isNotEmpty)
-                Text(
-                  'Total: $total',
-                  style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-                ),
-            ],
-          );
-        }
-        break;
-
-      case SnPollQuestionType.freeText:
-        // No stats
-        break;
-    }
-
-    if (body == null) return const SizedBox.shrink();
-
-    return Padding(
-      padding: const EdgeInsets.only(top: 8),
-      child: DecoratedBox(
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.35),
-          borderRadius: BorderRadius.circular(8),
-        ),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                'Stats',
-                style: Theme.of(context).textTheme.labelLarge?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-              ),
-              const SizedBox(height: 8),
-              body,
-            ],
-          ),
-        ),
-      ),
-    );
   }
 
   Widget _buildBody(BuildContext context) {
+    if (widget.initialAnswers != null && !widget.isReadonly && !_isModifying) {
+      return const SizedBox.shrink(); // Collapse input fields if already submitted and not modifying
+    }
     final q = _current;
     switch (q.type) {
       case SnPollQuestionType.singleChoice:
@@ -517,9 +394,9 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
       children: [
         Expanded(
           child: SegmentedButton<bool>(
-            segments: const [
+            segments: [
-              ButtonSegment(value: true, label: Text('Yes')),
+              ButtonSegment(value: true, label: Text('yes'.tr())),
-              ButtonSegment(value: false, label: Text('No')),
+              ButtonSegment(value: false, label: Text('no'.tr())),
             ],
             selected: _yesNoSelected == null ? {} : {_yesNoSelected!},
             onSelectionChanged: (sel) {
@@ -568,12 +445,39 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
     final isLast = _index == _questions.length - 1;
     final canProceed = _isCurrentAnswered() && !_submitting;
 
+    if (widget.initialAnswers != null && !_isModifying && !widget.isReadonly) {
+      // If poll is submitted and not in modification mode, show "Modify" button
+      return FilledButton.icon(
+        icon: const Icon(Icons.edit),
+        label: Text('modifyAnswers'.tr()),
+        onPressed: () {
+          setState(() {
+            _isModifying = true;
+            _index = 0; // Reset to first question for modification
+            _loadCurrentIntoLocalState();
+          });
+        },
+      );
+    }
+
     return Row(
       children: [
         OutlinedButton.icon(
           icon: const Icon(Icons.arrow_back),
-          label: Text(_index == 0 ? 'Cancel' : 'Back'),
+          label: Text(_index == 0 ? 'cancel'.tr() : 'back'.tr()),
-          onPressed: _submitting ? null : _back,
+          onPressed:
+              _submitting
+                  ? null
+                  : () {
+                    if (_index == 0 && _isModifying) {
+                      // If at first question and in modification mode, go back to submitted view
+                      setState(() {
+                        _isModifying = false;
+                      });
+                    } else {
+                      _back();
+                    }
+                  },
         ),
         const Spacer(),
         FilledButton.icon(
@@ -585,19 +489,188 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
                     child: CircularProgressIndicator(strokeWidth: 2),
                   )
                   : Icon(isLast ? Icons.check : Icons.arrow_forward),
-          label: Text(isLast ? 'Submit' : 'Next'),
+          label: Text(isLast ? 'submit'.tr() : 'next'.tr()),
           onPressed: canProceed ? _next : null,
         ),
       ],
     );
   }
 
+  Widget _buildSubmittedView(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (widget.poll.title != null || widget.poll.description != null)
+          Padding(
+            padding: const EdgeInsets.only(bottom: 12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (widget.poll.title?.isNotEmpty ?? false)
+                  Text(
+                    widget.poll.title!,
+                    style: Theme.of(context).textTheme.titleLarge,
+                  ),
+                if (widget.poll.description?.isNotEmpty ?? false)
+                  Padding(
+                    padding: const EdgeInsets.only(top: 4),
+                    child: Text(
+                      widget.poll.description!,
+                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                        color: Theme.of(
+                          context,
+                        ).textTheme.bodyMedium?.color?.withOpacity(0.7),
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        for (final q in _questions)
+          Padding(
+            padding: const EdgeInsets.only(bottom: 16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Expanded(
+                      child: Text(
+                        q.title,
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                    ),
+                    if (q.isRequired)
+                      Padding(
+                        padding: const EdgeInsets.only(left: 8),
+                        child: Text(
+                          '*',
+                          style: Theme.of(
+                            context,
+                          ).textTheme.titleMedium?.copyWith(
+                            color: Theme.of(context).colorScheme.error,
+                          ),
+                        ),
+                      ),
+                  ],
+                ),
+                if (q.description != null)
+                  Padding(
+                    padding: const EdgeInsets.only(top: 4),
+                    child: Text(
+                      q.description!,
+                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                        color: Theme.of(
+                          context,
+                        ).textTheme.bodySmall?.color?.withOpacity(0.7),
+                      ),
+                    ),
+                  ),
+                _buildStats(context, q),
+              ],
+            ),
+          ),
+      ],
+    );
+  }
+
+  Widget _buildReadonlyView(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (widget.poll.title != null || widget.poll.description != null)
+          Padding(
+            padding: const EdgeInsets.only(bottom: 12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (widget.poll.title != null)
+                  Text(
+                    widget.poll.title!,
+                    style: Theme.of(context).textTheme.titleLarge,
+                  ),
+                if (widget.poll.description != null)
+                  Padding(
+                    padding: const EdgeInsets.only(top: 4),
+                    child: Text(
+                      widget.poll.description!,
+                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                        color: Theme.of(
+                          context,
+                        ).textTheme.bodyMedium?.color?.withOpacity(0.7),
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        for (final q in _questions)
+          Padding(
+            padding: const EdgeInsets.only(bottom: 16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Expanded(
+                      child: Text(
+                        q.title,
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                    ),
+                    if (q.isRequired)
+                      Padding(
+                        padding: const EdgeInsets.only(left: 8),
+                        child: Text(
+                          '*',
+                          style: Theme.of(
+                            context,
+                          ).textTheme.titleMedium?.copyWith(
+                            color: Theme.of(context).colorScheme.error,
+                          ),
+                        ),
+                      ),
+                  ],
+                ),
+                if (q.description != null)
+                  Padding(
+                    padding: const EdgeInsets.only(top: 4),
+                    child: Text(
+                      q.description!,
+                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                        color: Theme.of(
+                          context,
+                        ).textTheme.bodySmall?.color?.withOpacity(0.7),
+                      ),
+                    ),
+                  ),
+                _buildStats(context, q),
+              ],
+            ),
+          ),
+      ],
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     if (_questions.isEmpty) {
       return const SizedBox.shrink();
     }
 
+    // If poll is already submitted and not in readonly mode, and not in modification mode, show submitted view
+    if (widget.initialAnswers != null && !widget.isReadonly && !_isModifying) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [_buildSubmittedView(context), _buildNavBar(context)],
+      );
+    }
+
+    // If poll is in readonly mode, show readonly view
+    if (widget.isReadonly) {
+      return _buildReadonlyView(context);
+    }
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
@@ -617,77 +690,6 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
   }
 }
 
-class _OptionCount {
-  final String id;
-  final String label;
-  final int count;
-  const _OptionCount({
-    required this.id,
-    required this.label,
-    required this.count,
-  });
-}
-
-class _BarStatRow extends StatelessWidget {
-  const _BarStatRow({
-    required this.label,
-    required this.count,
-    required this.fraction,
-    this.color,
-  });
-
-  final String label;
-  final int count;
-  final double fraction;
-  final Color? color;
-
-  @override
-  Widget build(BuildContext context) {
-    final barColor = color ?? Theme.of(context).colorScheme.primary;
-    final bgColor = Theme.of(
-      context,
-    ).colorScheme.surfaceVariant.withOpacity(0.6);
-    final fg =
-        (fraction.isNaN || fraction.isInfinite)
-            ? 0.0
-            : fraction.clamp(0.0, 1.0);
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text('$label · $count', style: Theme.of(context).textTheme.labelMedium),
-        const SizedBox(height: 4),
-        LayoutBuilder(
-          builder: (context, constraints) {
-            final width = constraints.maxWidth;
-            final filled = width * fg;
-            return Stack(
-              children: [
-                Container(
-                  height: 8,
-                  width: width,
-                  decoration: BoxDecoration(
-                    color: bgColor,
-                    borderRadius: BorderRadius.circular(999),
-                  ),
-                ),
-                Container(
-                  height: 8,
-                  width: filled,
-                  decoration: BoxDecoration(
-                    color: barColor,
-                    borderRadius: BorderRadius.circular(999),
-                  ),
-                ),
-              ],
-            );
-          },
-        ),
-      ],
-    );
-  }
-}
-
 /// Simple fade/slide transition between questions.
 class _AnimatedStep extends StatelessWidget {
   const _AnimatedStep({super.key, required this.child});

lib/widgets/post/compose_poll.dart

@@ -186,10 +186,9 @@ class ComposePollSheet extends HookConsumerWidget {
     );
   }
 
-  Widget? _buildPollSubtitle(SnPoll poll) {
+  Widget? _buildPollSubtitle(SnPollWithStats poll) {
     try {
-      final SnPoll dyn = poll;
+      final List<SnPollQuestion> options = poll.questions;
-      final List<SnPollQuestion> options = dyn.questions;
       if (options.isEmpty) return null;
       final preview = options.take(3).map((e) => e.title).join(' · ');
       if (preview.trim().isEmpty) return null;

lib/widgets/post/post_item_creator.dart

@@ -7,11 +7,9 @@ import 'package:island/models/post.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/services/time.dart';
 import 'package:island/widgets/alert.dart';
-import 'package:island/widgets/content/cloud_file_collection.dart';
-import 'package:island/widgets/content/markdown.dart';
 import 'package:island/widgets/post/post_item.dart';
+import 'package:island/widgets/post/post_shared.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:styled_widget/styled_widget.dart';
 import 'package:super_context_menu/super_context_menu.dart';
 
 class PostItemCreator extends HookConsumerWidget {
@@ -81,7 +79,6 @@ class PostItemCreator extends HookConsumerWidget {
               title: 'copyLink'.tr(),
               image: MenuImage.icon(Symbols.link),
               callback: () {
-                // Copy post link to clipboard
                 context.pushNamed(
                   'postDetail',
                   pathParameters: {'id': item.id},
@@ -105,8 +102,9 @@ class PostItemCreator extends HookConsumerWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                _buildPostHeader(context),
+                PostHeader(item: item),
-                _buildPostContent(context),
+                PostBody(item: item),
+                ReferencedPostWidget(item: item),
                 const Gap(16),
                 _buildAnalyticsSection(context),
               ],
@@ -117,128 +115,12 @@ class PostItemCreator extends HookConsumerWidget {
     );
   }
 
-  Widget _buildPostHeader(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        // Post ID and timestamp row
-        Row(
-          children: [
-            Container(
-              padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-              decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.primaryContainer,
-                borderRadius: BorderRadius.circular(4),
-              ),
-              child: Text(
-                'ID: ${item.id.substring(0, 6)}',
-                style: TextStyle(
-                  fontSize: 12,
-                  fontWeight: FontWeight.bold,
-                  color: Theme.of(context).colorScheme.onPrimaryContainer,
-                ),
-              ),
-            ),
-            const Spacer(),
-            Icon(
-              _getVisibilityIcon(item.visibility),
-              size: 16,
-              color: Theme.of(context).colorScheme.secondary,
-            ),
-            const SizedBox(width: 4),
-            Text(
-              _getVisibilityText(item.visibility).tr(),
-              style: TextStyle(
-                fontSize: 12,
-                color: Theme.of(context).colorScheme.secondary,
-              ),
-            ),
-            const Gap(8),
-            Text(
-              item.publishedAt?.formatSystem() ?? '',
-              style: TextStyle(
-                fontSize: 12,
-                color: Theme.of(context).colorScheme.secondary,
-              ),
-            ),
-          ],
-        ),
-        const Gap(8),
-
-        // Title and description
-        if (item.title?.isNotEmpty ?? false)
-          Text(
-            item.title!,
-            style: Theme.of(
-              context,
-            ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
-          ),
-        if (item.description?.isNotEmpty ?? false)
-          Text(
-            item.description!,
-            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-            ),
-          ).padding(top: 4),
-      ],
-    );
-  }
-
-  Widget _buildPostContent(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        // Content preview
-        if (item.content?.isNotEmpty ?? false)
-          Container(
-            margin: const EdgeInsets.only(top: 12),
-            child: MarkdownTextContent(content: item.content!),
-          ),
-
-        // Attachments
-        if (item.attachments.isNotEmpty)
-          CloudFileList(
-            files: item.attachments,
-            maxWidth: MediaQuery.of(context).size.width * 0.85,
-            padding: EdgeInsets.only(top: 8),
-          ),
-
-        // Reference post indicator
-        if (item.repliedPost != null || item.forwardedPost != null)
-          Container(
-            margin: const EdgeInsets.only(top: 8),
-            child: Row(
-              children: [
-                Icon(
-                  item.repliedPost != null ? Symbols.reply : Symbols.forward,
-                  size: 16,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-                const Gap(4),
-                Text(
-                  item.repliedPost != null
-                      ? 'repliedTo'.tr()
-                      : 'forwarded'.tr(),
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: Theme.of(context).colorScheme.secondary,
-                  ),
-                ),
-              ],
-            ),
-          ),
-      ],
-    );
-  }
-
   Widget _buildAnalyticsSection(BuildContext context) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text('Analytics', style: Theme.of(context).textTheme.titleSmall),
         const Gap(8),
-
-        // Engagement metrics in a card
         Card(
           elevation: 1,
           margin: EdgeInsets.zero,
@@ -279,15 +161,9 @@ class PostItemCreator extends HookConsumerWidget {
           ),
         ),
         const Gap(16),
-
-        // Reactions summary
         if (item.reactionsCount.isNotEmpty) _buildReactionsSection(context),
-
-        // Metadata section
         if (item.meta != null && item.meta!.isNotEmpty)
           _buildMetadataSection(context),
-
-        // Creation and modification timestamps
         const Gap(16),
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -425,31 +301,3 @@ class PostItemCreator extends HookConsumerWidget {
     );
   }
 }
-
-// Helper method to get the appropriate icon for each visibility status
-IconData _getVisibilityIcon(int visibility) {
-  switch (visibility) {
-    case 1: // Friends
-      return Symbols.group;
-    case 2: // Unlisted
-      return Symbols.link_off;
-    case 3: // Private
-      return Symbols.lock;
-    default: // Public (0) or unknown
-      return Symbols.public;
-  }
-}
-
-// Helper method to get the translation key for each visibility status
-String _getVisibilityText(int visibility) {
-  switch (visibility) {
-    case 1: // Friends
-      return 'postVisibilityFriends';
-    case 2: // Unlisted
-      return 'postVisibilityUnlisted';
-    case 3: // Private
-      return 'postVisibilityPrivate';
-    default: // Public (0) or unknown
-      return 'postVisibilityPublic';
-  }
-}

lib/widgets/post/post_item_screenshot.dart

@@ -0,0 +1,135 @@
+import 'package:collection/collection.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/post.dart';
+import 'package:island/widgets/post/post_shared.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class PostItemScreenshot extends ConsumerWidget {
+  final SnPost item;
+  final EdgeInsets? padding;
+  final bool isFullPost;
+  final bool isShowReference;
+  const PostItemScreenshot({
+    super.key,
+    required this.item,
+    this.padding,
+    this.isFullPost = false,
+    this.isShowReference = true,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final renderingPadding =
+        padding ?? const EdgeInsets.symmetric(horizontal: 8, vertical: 8);
+
+    final mostReaction =
+        item.reactionsCount.isEmpty
+            ? null
+            : item.reactionsCount.entries
+                .sortedBy((e) => e.value)
+                .map((e) => e.key)
+                .last;
+
+    final isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
+
+    return Material(
+      elevation: 0,
+      color: Theme.of(context).colorScheme.surface,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Gap(renderingPadding.vertical),
+          PostHeader(
+            item: item,
+            isFullPost: isFullPost,
+            isInteractive: false,
+            renderingPadding: renderingPadding,
+            isRelativeTime: false,
+            trailing:
+                mostReaction != null
+                    ? Row(
+                      children: [
+                        Text(
+                          kReactionTemplates[mostReaction]?.icon ?? '',
+                          style: const TextStyle(fontSize: 20),
+                        ),
+                        const Gap(4),
+                        Text(
+                          'x${item.reactionsCount[mostReaction]}',
+                          style: const TextStyle(fontSize: 11),
+                        ),
+                      ],
+                    )
+                    : null,
+          ),
+          PostBody(
+            item: item,
+            renderingPadding: renderingPadding,
+            isFullPost: isFullPost,
+            isTextSelectable: false,
+            isInteractive: false,
+          ),
+          if (isShowReference)
+            ReferencedPostWidget(
+              item: item,
+              isInteractive: false,
+              renderingPadding: renderingPadding,
+            ),
+          Container(
+            color: Theme.of(context).colorScheme.surfaceContainerLow,
+            margin: const EdgeInsets.only(top: 8),
+            padding: EdgeInsets.symmetric(
+              horizontal: renderingPadding.horizontal,
+              vertical: 4,
+            ),
+            child: Row(
+              children: [
+                SizedBox(
+                  width: 44,
+                  height: 44,
+                  child: Image.asset(
+                    'assets/icons/icon${isDark ? '-dark' : ''}.png',
+                    width: 40,
+                    height: 40,
+                  ),
+                ).padding(vertical: 8, right: 12),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const Text(
+                        'Solar Network',
+                        style: TextStyle(
+                          fontSize: 14,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      const Text(
+                        'sharePostSlogan',
+                        style: TextStyle(fontSize: 12),
+                      ).tr().opacity(0.9),
+                    ],
+                  ),
+                ),
+                QrImageView(
+                  data: 'https://solian.app/posts/${item.id}',
+                  version: QrVersions.auto,
+                  size: 60,
+                  errorCorrectionLevel: QrErrorCorrectLevel.M,
+                  backgroundColor: Colors.transparent,
+                  foregroundColor: Theme.of(context).colorScheme.onSurface,
+                  padding: const EdgeInsets.all(8),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/post/post_shared.dart

@@ -0,0 +1,841 @@
+import 'dart:math' as math;
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/embed.dart';
+import 'package:island/models/poll.dart';
+import 'package:island/models/post.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/services/responsive.dart';
+import 'package:island/services/time.dart';
+import 'package:island/utils/mapping.dart';
+import 'package:island/widgets/account/account_name.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/cloud_file_collection.dart';
+import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/embed/link.dart';
+import 'package:island/widgets/content/markdown.dart';
+import 'package:island/widgets/poll/poll_submit.dart';
+import 'package:island/widgets/post/post_replies_sheet.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+part 'post_shared.g.dart';
+
+@riverpod
+Future<SnPost?> postFeaturedReply(Ref ref, String id) async {
+  final client = ref.watch(apiClientProvider);
+  try {
+    final resp = await client.get('/sphere/posts/$id/replies/featured');
+    return SnPost.fromJson(resp.data);
+  } catch (_) {
+    return null;
+  }
+}
+
+class PostVisibilityHelpers {
+  static IconData getVisibilityIcon(int visibility) {
+    switch (visibility) {
+      case 1:
+        return Symbols.group;
+      case 2:
+        return Symbols.link_off;
+      case 3:
+        return Symbols.lock;
+      default:
+        return Symbols.public;
+    }
+  }
+
+  static String getVisibilityText(int visibility) {
+    switch (visibility) {
+      case 1:
+        return 'postVisibilityFriends';
+      case 2:
+        return 'postVisibilityUnlisted';
+      case 3:
+        return 'postVisibilityPrivate';
+      default:
+        return 'postVisibilityPublic';
+    }
+  }
+}
+
+class PostReplyPreview extends HookConsumerWidget {
+  final SnPost parent;
+  final bool isOpenable;
+  final bool isCompact;
+  final bool isAutoload;
+  final VoidCallback? onOpen;
+  const PostReplyPreview({
+    super.key,
+    required this.parent,
+    this.isOpenable = false,
+    this.isCompact = false,
+    this.isAutoload = true,
+    this.onOpen,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final posts = useState<List<SnPost>>([]);
+    final loading = useState(false);
+
+    Future<void> fetchMoreReplies({int pageSize = 3}) async {
+      final client = ref.read(apiClientProvider);
+      loading.value = true;
+
+      try {
+        final response = await client.get(
+          '/sphere/posts/${parent.id}/replies',
+          queryParameters: {'offset': posts.value.length, 'take': pageSize},
+        );
+        try {
+          posts.value = [
+            ...posts.value,
+            ...response.data.map((e) => SnPost.fromJson(e)),
+          ];
+        } catch (_) {
+          // ignore disposed
+        }
+      } catch (err) {
+        showErrorAlert(err);
+      } finally {
+        try {
+          loading.value = false;
+        } catch (_) {
+          // ignore disposed
+        }
+      }
+    }
+
+    useEffect(() {
+      if (isAutoload) fetchMoreReplies();
+      return null;
+    }, [parent]);
+
+    final featuredReply =
+        isOpenable ? null : ref.watch(PostFeaturedReplyProvider(parent.id));
+
+    final itemWidget =
+        isOpenable
+            ? Column(
+              children: [
+                for (final post in posts.value)
+                  Column(
+                    children: [
+                      InkWell(
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          spacing: 8,
+                          children: [
+                            ProfilePictureWidget(
+                              file: post.publisher.picture,
+                              radius: 12,
+                            ).padding(top: 4),
+                            if (post.content?.isNotEmpty ?? false)
+                              Expanded(
+                                child: MarkdownTextContent(
+                                  content: post.content!,
+                                ).padding(top: 2),
+                              )
+                            else
+                              Expanded(
+                                child: Text(
+                                  'postHasAttachments',
+                                ).plural(post.attachments.length),
+                              ),
+                          ],
+                        ),
+                        onTap: () {
+                          onOpen?.call();
+                          context.pushNamed(
+                            'postDetail',
+                            pathParameters: {'id': post.id},
+                          );
+                        },
+                      ),
+                      if (post.repliesCount > 0)
+                        PostReplyPreview(
+                          parent: post,
+                          isOpenable: true,
+                          isCompact: true,
+                          isAutoload: false,
+                          onOpen: onOpen,
+                        ).padding(left: 24),
+                    ],
+                  ),
+                if (loading.value)
+                  Row(
+                    spacing: 8,
+                    children: [
+                      SizedBox(
+                        width: 16,
+                        height: 16,
+                        child: CircularProgressIndicator(),
+                      ),
+                      Text('loading').tr(),
+                    ],
+                  )
+                else if (posts.value.length < parent.repliesCount)
+                  InkWell(
+                    child: Row(
+                      spacing: 8,
+                      children: [
+                        const Icon(Symbols.keyboard_arrow_down, size: 20),
+                        Text('repliesLoadMore').tr(),
+                      ],
+                    ),
+                    onTap: () {
+                      fetchMoreReplies();
+                    },
+                  ),
+              ],
+            )
+            : (featuredReply!).map(
+              data:
+                  (data) => Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    spacing: 8,
+                    children: [
+                      ProfilePictureWidget(
+                        file: data.value?.publisher.picture,
+                        radius: 12,
+                      ).padding(top: 4),
+                      if (data.value?.content?.isNotEmpty ?? false)
+                        Expanded(
+                          child: MarkdownTextContent(
+                            content: data.value!.content!,
+                          ),
+                        )
+                      else
+                        Expanded(
+                          child: Text(
+                            'postHasAttachments',
+                          ).plural(data.value?.attachments.length ?? 0),
+                        ),
+                    ],
+                  ),
+              error:
+                  (e) => Row(
+                    spacing: 8,
+                    children: [
+                      const Icon(Symbols.close, size: 18),
+                      Text(e.error.toString()),
+                    ],
+                  ),
+              loading:
+                  (_) => Row(
+                    spacing: 8,
+                    children: [
+                      SizedBox(
+                        width: 16,
+                        height: 16,
+                        child: CircularProgressIndicator(),
+                      ),
+                      Text('loading').tr(),
+                    ],
+                  ),
+            );
+
+    final contentWidget =
+        isCompact
+            ? itemWidget
+            : Container(
+              padding: EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surfaceContainerLow,
+                border: Border.all(
+                  color: Theme.of(context).dividerColor.withOpacity(0.5),
+                ),
+                borderRadius: BorderRadius.all(Radius.circular(8)),
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                spacing: 4,
+                children: [
+                  Text('repliesCount')
+                      .plural(parent.repliesCount)
+                      .fontSize(15)
+                      .bold()
+                      .padding(horizontal: 5),
+                  itemWidget,
+                ],
+              ),
+            );
+
+    return InkWell(
+      borderRadius: const BorderRadius.all(Radius.circular(8)),
+      onTap: () {
+        showModalBottomSheet(
+          context: context,
+          isScrollControlled: true,
+          useRootNavigator: true,
+          builder: (context) => PostRepliesSheet(post: parent),
+        );
+      },
+      child: contentWidget,
+    );
+  }
+}
+
+class PostTruncateHint extends StatelessWidget {
+  final bool isCompact;
+  final EdgeInsets? margin;
+  final bool withArrow;
+
+  const PostTruncateHint({
+    super.key,
+    this.isCompact = false,
+    this.margin,
+    this.withArrow = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: margin ?? EdgeInsets.only(top: isCompact ? 4 : 8),
+      padding: EdgeInsets.symmetric(
+        horizontal: isCompact ? 8 : 12,
+        vertical: isCompact ? 4 : 8,
+      ),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.3),
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(
+          color: Theme.of(context).colorScheme.outline.withOpacity(0.2),
+        ),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(
+            Symbols.more_horiz,
+            size: isCompact ? 14 : 16,
+            color: Theme.of(context).colorScheme.secondary,
+          ),
+          SizedBox(width: isCompact ? 4 : 6),
+          Flexible(
+            child: Text(
+              'postTruncated'.tr(),
+              style: TextStyle(
+                fontSize: isCompact ? 10 : 12,
+                color: Theme.of(context).colorScheme.secondary,
+                fontStyle: FontStyle.italic,
+              ),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+          if (withArrow) ...[
+            SizedBox(width: isCompact ? 3 : 4),
+            Icon(
+              Symbols.arrow_forward,
+              size: isCompact ? 12 : 14,
+              color: Theme.of(context).colorScheme.secondary,
+            ),
+          ],
+        ],
+      ),
+    );
+  }
+}
+
+class ReferencedPostWidget extends StatelessWidget {
+  final SnPost item;
+  final bool isInteractive;
+  final EdgeInsets renderingPadding;
+
+  const ReferencedPostWidget({
+    super.key,
+    required this.item,
+    this.isInteractive = true,
+    this.renderingPadding = EdgeInsets.zero,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final referencePost = item.repliedPost ?? item.forwardedPost;
+    if (referencePost == null) return const SizedBox.shrink();
+
+    final isReply = item.repliedPost != null;
+
+    final content = Container(
+      padding: EdgeInsets.symmetric(
+        horizontal: renderingPadding.horizontal,
+        vertical: 8,
+      ),
+      margin: EdgeInsets.only(
+        top: 8,
+        left: renderingPadding.vertical,
+        right: renderingPadding.vertical,
+      ),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.5),
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(
+          color: Theme.of(context).dividerColor.withOpacity(0.5),
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(
+                isReply ? Symbols.reply : Symbols.forward,
+                size: 16,
+                color: Theme.of(context).colorScheme.secondary,
+              ),
+              const SizedBox(width: 6),
+              Text(
+                isReply ? 'repliedTo'.tr() : 'forwarded'.tr(),
+                style: TextStyle(
+                  color: Theme.of(context).colorScheme.secondary,
+                  fontWeight: FontWeight.w500,
+                  fontSize: 12,
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 8),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              ProfilePictureWidget(
+                fileId: referencePost.publisher.picture?.id,
+                radius: 16,
+              ),
+              const SizedBox(width: 8),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      referencePost.publisher.nick,
+                      style: const TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 14,
+                      ),
+                    ),
+                    if (referencePost.visibility != 0)
+                      Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Icon(
+                            PostVisibilityHelpers.getVisibilityIcon(
+                              referencePost.visibility,
+                            ),
+                            size: 12,
+                            color: Theme.of(context).colorScheme.secondary,
+                          ),
+                          const SizedBox(width: 4),
+                          Text(
+                            PostVisibilityHelpers.getVisibilityText(
+                              referencePost.visibility,
+                            ).tr(),
+                            style: TextStyle(
+                              fontSize: 10,
+                              color: Theme.of(context).colorScheme.secondary,
+                            ),
+                          ),
+                        ],
+                      ).padding(top: 2, bottom: 2),
+                    if (referencePost.title?.isNotEmpty ?? false)
+                      Text(
+                        referencePost.title!,
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 13,
+                          color: Theme.of(context).colorScheme.onSurface,
+                        ),
+                      ).padding(top: 2, bottom: 2),
+                    if (referencePost.description?.isNotEmpty ?? false)
+                      Text(
+                        referencePost.description!,
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                        ),
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                      ).padding(bottom: 2),
+                    if (referencePost.content?.isNotEmpty ?? false)
+                      MarkdownTextContent(
+                        content: referencePost.content!,
+                        textStyle: const TextStyle(fontSize: 14),
+                        isSelectable: false,
+                        linesMargin:
+                            referencePost.type == 0
+                                ? const EdgeInsets.only(bottom: 4)
+                                : null,
+                        attachments: item.attachments,
+                      ).padding(bottom: 4),
+                    if (referencePost.isTruncated)
+                      const PostTruncateHint(
+                        isCompact: true,
+                        margin: EdgeInsets.only(top: 4, bottom: 8),
+                      ),
+                    if (referencePost.attachments.isNotEmpty &&
+                        referencePost.type != 1)
+                      Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Icon(
+                            Symbols.attach_file,
+                            size: 12,
+                            color: Theme.of(context).colorScheme.secondary,
+                          ),
+                          const SizedBox(width: 4),
+                          Text(
+                            'postHasAttachments'.plural(
+                              referencePost.attachments.length,
+                            ),
+                            style: TextStyle(
+                              color: Theme.of(context).colorScheme.secondary,
+                              fontSize: 12,
+                            ),
+                          ),
+                        ],
+                      ).padding(vertical: 2),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+
+    if (!isInteractive) {
+      return content;
+    }
+
+    return content.gestures(
+      onTap:
+          () => context.pushNamed(
+            'postDetail',
+            pathParameters: {'id': referencePost.id},
+          ),
+    );
+  }
+}
+
+class PostHeader extends StatelessWidget {
+  final SnPost item;
+  final bool isFullPost;
+  final Widget? trailing;
+  final bool isInteractive;
+  final EdgeInsets renderingPadding;
+  final bool isRelativeTime;
+
+  const PostHeader({
+    super.key,
+    required this.item,
+    this.isFullPost = false,
+    this.trailing,
+    this.isInteractive = true,
+    this.renderingPadding = EdgeInsets.zero,
+    this.isRelativeTime = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      spacing: 12,
+      children: [
+        GestureDetector(
+          onTap:
+              isInteractive
+                  ? () {
+                    context.pushNamed(
+                      'publisherProfile',
+                      pathParameters: {'name': item.publisher.name},
+                    );
+                  }
+                  : null,
+          child: ProfilePictureWidget(file: item.publisher.picture, radius: 16),
+        ),
+        Expanded(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                spacing: 4,
+                children: [
+                  Text(item.publisher.nick).bold(),
+                  if (item.publisher.verification != null)
+                    VerificationMark(mark: item.publisher.verification!),
+                  Text('@${item.publisher.name}').fontSize(11),
+                ],
+              ),
+              Row(
+                spacing: 6,
+                crossAxisAlignment: CrossAxisAlignment.end,
+                children: [
+                  Text(
+                    !isFullPost && isRelativeTime
+                        ? (item.publishedAt ?? item.createdAt)!.formatRelative(
+                          context,
+                        )
+                        : (item.publishedAt ?? item.createdAt)!.formatSystem(),
+                  ).fontSize(10),
+                  if (item.editedAt != null)
+                    Text(
+                      'editedAt'.tr(
+                        args: [
+                          !isFullPost && isRelativeTime
+                              ? item.editedAt!.formatRelative(context)
+                              : item.editedAt!.formatSystem(),
+                        ],
+                      ),
+                    ).fontSize(10),
+                  if (item.visibility != 0)
+                    Text(
+                      PostVisibilityHelpers.getVisibilityText(
+                        item.visibility,
+                      ).tr(),
+                    ).fontSize(10),
+                ],
+              ),
+            ],
+          ),
+        ),
+        if (trailing != null) trailing!,
+      ],
+    ).padding(horizontal: renderingPadding.horizontal, bottom: 4);
+  }
+}
+
+class PostBody extends ConsumerWidget {
+  final SnPost item;
+  final bool isFullPost;
+  final bool isTextSelectable;
+  final Widget? translationSection;
+  final bool isInteractive;
+  final EdgeInsets renderingPadding;
+
+  const PostBody({
+    super.key,
+    required this.item,
+    this.isFullPost = false,
+    this.isTextSelectable = true,
+    this.translationSection,
+    this.isInteractive = true,
+    this.renderingPadding = EdgeInsets.zero,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (!isFullPost && item.type == 1)
+          Container(
+            decoration: BoxDecoration(
+              color: Theme.of(context).colorScheme.surfaceContainerHigh,
+              border: Border.all(
+                color: Theme.of(context).dividerColor.withOpacity(0.5),
+              ),
+              borderRadius: const BorderRadius.all(Radius.circular(8)),
+            ),
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+            margin: EdgeInsets.only(
+              top: 4,
+              left: renderingPadding.horizontal,
+              right: renderingPadding.vertical,
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Align(
+                  alignment: Alignment.centerLeft,
+                  child: Badge(
+                    label: const Text('postArticle').tr(),
+                    backgroundColor: Theme.of(context).colorScheme.primary,
+                    textColor: Theme.of(context).colorScheme.onPrimary,
+                  ),
+                ),
+                const Gap(4),
+                if (item.title != null)
+                  Text(
+                    item.title!,
+                    style: Theme.of(context).textTheme.titleMedium!.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                if (item.description != null)
+                  Text(
+                    item.description!,
+                    style: Theme.of(context).textTheme.bodyMedium,
+                  )
+                else
+                  MarkdownTextContent(content: '${item.content!}...'),
+              ],
+            ),
+          )
+        else if ((item.content?.isNotEmpty ?? false) ||
+            (item.title?.isNotEmpty ?? false) ||
+            (item.description?.isNotEmpty ?? false))
+          Padding(
+            padding: EdgeInsets.only(
+              left: renderingPadding.horizontal,
+              right: renderingPadding.horizontal,
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                if ((item.title?.isNotEmpty ?? false) ||
+                    (item.description?.isNotEmpty ?? false))
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      if (item.title?.isNotEmpty ?? false)
+                        Text(
+                          item.title!,
+                          style: Theme.of(context).textTheme.titleMedium!
+                              .copyWith(fontWeight: FontWeight.bold),
+                        ),
+                      if (item.description?.isNotEmpty ?? false)
+                        Text(
+                          item.description!,
+                          style: Theme.of(context).textTheme.bodyMedium,
+                        ),
+                    ],
+                  ).padding(bottom: 4),
+                MarkdownTextContent(
+                  content:
+                      item.isTruncated ? '${item.content!}...' : item.content!,
+                  isSelectable: isTextSelectable,
+                ),
+                if (translationSection != null) translationSection!,
+              ],
+            ),
+          ),
+        if (item.isTruncated && item.type != 1)
+          PostTruncateHint(
+            isCompact: true,
+            withArrow: isInteractive,
+            margin: EdgeInsets.only(
+              top: 4,
+              bottom: 4,
+              left: renderingPadding.horizontal,
+              right: renderingPadding.horizontal,
+            ),
+          ),
+        if (item.attachments.isNotEmpty && item.type != 1)
+          CloudFileList(
+            files: item.attachments,
+            isColumn: !isInteractive,
+            padding: EdgeInsets.symmetric(
+              horizontal: renderingPadding.horizontal,
+              vertical: 4,
+            ),
+          ),
+        if (item.tags.isNotEmpty || item.categories.isNotEmpty)
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            spacing: 2,
+            children: [
+              if (item.tags.isNotEmpty)
+                Wrap(
+                  runAlignment: WrapAlignment.center,
+                  spacing: 8,
+                  children: [
+                    const Icon(Symbols.label, size: 16).padding(top: 2),
+                    for (final tag
+                        in isFullPost ? item.tags : item.tags.take(3))
+                      InkWell(
+                        onTap:
+                            isInteractive
+                                ? () {
+                                  GoRouter.of(context).pushNamed(
+                                    'postTagDetail',
+                                    pathParameters: {'slug': tag.slug},
+                                  );
+                                }
+                                : null,
+                        child: Text('#${tag.name ?? tag.slug}'),
+                      ),
+                    if (!isFullPost && item.tags.length > 3)
+                      Text('+${item.tags.length - 3}').opacity(0.6),
+                  ],
+                ),
+              if (item.categories.isNotEmpty)
+                Wrap(
+                  runAlignment: WrapAlignment.center,
+                  spacing: 8,
+                  children: [
+                    const Icon(Symbols.category, size: 16).padding(top: 2),
+                    for (final category
+                        in isFullPost
+                            ? item.categories
+                            : item.categories.take(2))
+                      InkWell(
+                        onTap:
+                            isInteractive
+                                ? () {
+                                  GoRouter.of(context).pushNamed(
+                                    'postCategoryDetail',
+                                    pathParameters: {'slug': category.slug},
+                                  );
+                                }
+                                : null,
+                        child: Text(category.categoryDisplayTitle),
+                      ),
+                    if (!isFullPost && item.categories.length > 2)
+                      Text('+${item.categories.length - 2}').opacity(0.6),
+                  ],
+                ),
+            ],
+          ).padding(horizontal: renderingPadding.horizontal + 4, top: 4),
+        if (item.meta?['embeds'] != null)
+          ...((item.meta!['embeds'] as List<dynamic>)
+              .map((embedData) => convertMapKeysToSnakeCase(embedData))
+              .map(
+                (embedData) => switch (embedData['type']) {
+                  'link' => EmbedLinkWidget(
+                    link: SnScrappedLink.fromJson(embedData),
+                    maxWidth: math.min(
+                      MediaQuery.of(context).size.width,
+                      kWideScreenWidth,
+                    ),
+                    margin: EdgeInsets.only(
+                      top: 4,
+                      bottom: 4,
+                      left: renderingPadding.horizontal,
+                      right: renderingPadding.horizontal,
+                    ),
+                  ),
+                  'poll' => Card(
+                    margin: EdgeInsets.symmetric(
+                      horizontal: renderingPadding.horizontal,
+                      vertical: 8,
+                    ),
+                    child:
+                        embedData['poll'] == null
+                            ? const Text('Poll was not loaded...')
+                            : PollSubmit(
+                              initialAnswers:
+                                  embedData['poll']?['user_answer']?['answer'],
+                              stats: embedData['poll']?['stats'],
+                              poll: SnPollWithStats.fromJson(embedData['poll']),
+                              onSubmit: (_) {},
+                              isReadonly: !isInteractive,
+                            ).padding(horizontal: 16, vertical: 12),
+                  ),
+                  _ => Text('Unable show embed: ${embedData['type']}'),
+                },
+              )),
+      ],
+    );
+  }
+}

lib/widgets/post/post_shared.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'post_item.dart';
+part of 'post_shared.dart';
 
 // **************************************************************************
 // RiverpodGenerator

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -10,7 +10,9 @@ import connectivity_plus
 import device_info_plus
 import file_picker
 import file_selector_macos
+import firebase_analytics
 import firebase_core
+import firebase_crashlytics
 import firebase_messaging
 import flutter_inappwebview_macos
 import flutter_platform_alert
@@ -44,7 +46,9 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  FirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FirebaseAnalyticsPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
+  FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
   FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
   InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
   FlutterPlatformAlertPlugin.register(with: registry.registrar(forPlugin: "FlutterPlatformAlertPlugin"))

macos/Podfile.lock

@@ -13,23 +13,64 @@ PODS:
     - FlutterMacOS
   - Firebase/CoreOnly (12.0.0):
     - FirebaseCore (~> 12.0.0)
+  - Firebase/Crashlytics (12.0.0):
+    - Firebase/CoreOnly
+    - FirebaseCrashlytics (~> 12.0.0)
   - Firebase/Messaging (12.0.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 12.0.0)
+  - firebase_analytics (12.0.0):
+    - firebase_core
+    - FirebaseAnalytics (= 12.0.0)
+    - FlutterMacOS
   - firebase_core (4.0.0):
     - Firebase/CoreOnly (~> 12.0.0)
     - FlutterMacOS
+  - firebase_crashlytics (5.0.0):
+    - Firebase/CoreOnly (~> 12.0.0)
+    - Firebase/Crashlytics (~> 12.0.0)
+    - firebase_core
+    - FlutterMacOS
   - firebase_messaging (16.0.0):
     - Firebase/CoreOnly (~> 12.0.0)
     - Firebase/Messaging (~> 12.0.0)
     - firebase_core
     - FlutterMacOS
+  - FirebaseAnalytics (12.0.0):
+    - FirebaseAnalytics/Default (= 12.0.0)
+    - FirebaseCore (~> 12.0.0)
+    - FirebaseInstallations (~> 12.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/Default (12.0.0):
+    - FirebaseCore (~> 12.0.0)
+    - FirebaseInstallations (~> 12.0.0)
+    - GoogleAppMeasurement/Default (= 12.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
   - FirebaseCore (12.0.0):
     - FirebaseCoreInternal (~> 12.0.0)
     - GoogleUtilities/Environment (~> 8.1)
     - GoogleUtilities/Logger (~> 8.1)
+  - FirebaseCoreExtension (12.0.0):
+    - FirebaseCore (~> 12.0.0)
   - FirebaseCoreInternal (12.0.0):
     - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseCrashlytics (12.0.0):
+    - FirebaseCore (~> 12.0.0)
+    - FirebaseInstallations (~> 12.0.0)
+    - FirebaseRemoteConfigInterop (~> 12.0.0)
+    - FirebaseSessions (~> 12.0.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
   - FirebaseInstallations (12.0.0):
     - FirebaseCore (~> 12.0.0)
     - GoogleUtilities/Environment (~> 8.1)
@@ -44,6 +85,16 @@ PODS:
     - GoogleUtilities/Reachability (~> 8.1)
     - GoogleUtilities/UserDefaults (~> 8.1)
     - nanopb (~> 3.30910.0)
+  - FirebaseRemoteConfigInterop (12.0.0)
+  - FirebaseSessions (12.0.0):
+    - FirebaseCore (~> 12.0.0)
+    - FirebaseCoreExtension (~> 12.0.0)
+    - FirebaseInstallations (~> 12.0.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
+    - PromisesSwift (~> 2.1)
   - flutter_inappwebview_macos (0.0.1):
     - FlutterMacOS
     - OrderedSet (~> 6.0.3)
@@ -63,6 +114,28 @@ PODS:
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
+  - GoogleAppMeasurement/Core (12.0.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/Default (12.0.0):
+    - GoogleAdsOnDeviceConversion (= 2.1.0)
+    - GoogleAppMeasurement/Core (= 12.0.0)
+    - GoogleAppMeasurement/IdentitySupport (= 12.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/IdentitySupport (12.0.0):
+    - GoogleAppMeasurement/Core (= 12.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
   - GoogleDataTransport (10.1.0):
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
@@ -76,6 +149,9 @@ PODS:
   - GoogleUtilities/Logger (8.1.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
+  - GoogleUtilities/MethodSwizzler (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
   - GoogleUtilities/Network (8.1.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
@@ -117,6 +193,8 @@ PODS:
     - Flutter
     - FlutterMacOS
   - PromisesObjC (2.4.0)
+  - PromisesSwift (2.4.0):
+    - PromisesObjC (= 2.4.0)
   - record_macos (1.0.0):
     - FlutterMacOS
   - SAMKeychain (1.5.3)
@@ -172,7 +250,9 @@ DEPENDENCIES:
   - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
   - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
+  - firebase_analytics (from `Flutter/ephemeral/.symlinks/plugins/firebase_analytics/macos`)
   - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`)
+  - firebase_crashlytics (from `Flutter/ephemeral/.symlinks/plugins/firebase_crashlytics/macos`)
   - firebase_messaging (from `Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos`)
   - flutter_inappwebview_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos`)
   - flutter_platform_alert (from `Flutter/ephemeral/.symlinks/plugins/flutter_platform_alert/macos`)
@@ -204,15 +284,22 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - Firebase
+    - FirebaseAnalytics
     - FirebaseCore
+    - FirebaseCoreExtension
     - FirebaseCoreInternal
+    - FirebaseCrashlytics
     - FirebaseInstallations
     - FirebaseMessaging
+    - FirebaseRemoteConfigInterop
+    - FirebaseSessions
+    - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleUtilities
     - nanopb
     - OrderedSet
     - PromisesObjC
+    - PromisesSwift
     - SAMKeychain
     - sqlite3
     - WebRTC-SDK
@@ -230,8 +317,12 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
   file_selector_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
+  firebase_analytics:
+    :path: Flutter/ephemeral/.symlinks/plugins/firebase_analytics/macos
   firebase_core:
     :path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos
+  firebase_crashlytics:
+    :path: Flutter/ephemeral/.symlinks/plugins/firebase_crashlytics/macos
   firebase_messaging:
     :path: Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos
   flutter_inappwebview_macos:
@@ -295,12 +386,19 @@ SPEC CHECKSUMS:
   file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
   file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
   Firebase: 800d487043c0557d9faed71477a38d9aafb08a41
+  firebase_analytics: 53f0dc87ad10f56a6df8746da60d8a5fe41f886f
   firebase_core: eeea10f64026b68cd0bc3dee079ab4717e22909e
+  firebase_crashlytics: 7be1dacc38809971354def57193b280636a3d51a
   firebase_messaging: 5eefcd5bde556bfacdd9968e11c52f39032dfbe5
+  FirebaseAnalytics: 6d790cd1b159b4eb61a99948df0934ce505a34f7
   FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a
+  FirebaseCoreExtension: 639afb3de6abd611952be78a794c54a47fa0f361
   FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55
+  FirebaseCrashlytics: db75aa0cab8d00f68406fa247c32fe17ade884d7
   FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
   FirebaseMessaging: af49f8d7c0a3d2a017d9302c80946f45a7777dde
+  FirebaseRemoteConfigInterop: bfa0ea72ba3dc5af739777296424e46bd6f42613
+  FirebaseSessions: 4e784acda213108aafef536535cdfc03504acc42
   flutter_inappwebview_macos: c2d68649f9f8f1831bfcd98d73fd6256366d9d1d
   flutter_platform_alert: 8fa7a7c21f95b26d08b4a3891936ca27e375f284
   flutter_secure_storage_macos: 7f45e30f838cf2659862a4e4e3ee1c347c2b3b54
@@ -309,6 +407,7 @@ SPEC CHECKSUMS:
   flutter_webrtc: 0d70bd8782c19bde286dc52f766eebbea26de201
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   gal: baecd024ebfd13c441269ca7404792a7152fde89
+  GoogleAppMeasurement: 8f6ab04ad6ae493b53fcf56bd26323fb2f1384f3
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
   irondash_engine_context: 893c7d96d20ce361d7e996f39d360c4c2f9869ba
@@ -322,6 +421,7 @@ SPEC CHECKSUMS:
   pasteboard: 278d8100149f940fb795d6b3a74f0720c890ecb7
   path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   record_macos: 295d70bd5fb47145df78df7b80e6697cd18403c0
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
   share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc

macos/Runner.xcodeproj/project.pbxproj

@@ -234,6 +234,7 @@
 				3399D490228B24CF009A79C7 /* ShellScript */,
 				F1E275A871246799FC3019F6 /* [CP] Embed Pods Frameworks */,
 				8D06F41203F1FD2FDE04DC7F /* [CP] Copy Pods Resources */,
+				6B512DBE9D8E74A09686E70F /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
 			);
 			buildRules = (
 			);
@@ -376,6 +377,24 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		6B512DBE9D8E74A09686E70F /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:${PUB_CACHE}/bin:$HOME/.pub-cache/bin\"\n\nif [ -z \"$PODS_ROOT\" ] || [ ! -d \"$PODS_ROOT/FirebaseCrashlytics\" ]; then\n  # Cannot use \"BUILD_DIR%/Build/*\" as per Firebase documentation, it points to \"flutter-project/build/ios/*\" path which doesn't have run script\n  DERIVED_DATA_PATH=$(echo \"$BUILD_ROOT\" | sed -E 's|(.*DerivedData/[^/]+).*|\\1|')\n  PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT=\"${DERIVED_DATA_PATH}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\nelse\n  PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT=\"$PODS_ROOT/FirebaseCrashlytics/run\"\nfi\n\n# Command to upload symbols script used to upload symbols to Firebase server\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=\"$PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT\" --platform=macos --apple-project-path=\"${SRCROOT}\" --env-platform-name=\"${PLATFORM_NAME}\" --env-configuration=\"${CONFIGURATION}\" --env-project-dir=\"${PROJECT_DIR}\" --env-built-products-dir=\"${BUILT_PRODUCTS_DIR}\" --env-dwarf-dsym-folder-path=\"${DWARF_DSYM_FOLDER_PATH}\" --env-dwarf-dsym-file-name=\"${DWARF_DSYM_FILE_NAME}\" --env-infoplist-path=\"${INFOPLIST_PATH}\" --default-config=default\n";
+		};
 		8D06F41203F1FD2FDE04DC7F /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

pubspec.lock

@@ -301,10 +301,10 @@ packages:
     dependency: transitive
     description:
       name: connectivity_plus
-      sha256: "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99"
+      sha256: b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "6.1.5"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -313,6 +313,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
+  console:
+    dependency: transitive
+    description:
+      name: console
+      sha256: e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   convert:
     dependency: transitive
     description:
@@ -405,10 +413,10 @@ packages:
     dependency: transitive
     description:
       name: dart_webrtc
-      sha256: a2ae542cdadc21359022adedc26138fa3487cc3b3547c24ff4f556681869e28c
+      sha256: "3bfa069a8b14a53ba506f6dd529e9b88c878ba0cc238f311051a39bf1e53d075"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.3+hotfix.4"
+    version: "1.5.3+hotfix.5"
   dbus:
     dependency: transitive
     description:
@@ -557,10 +565,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "8f9f429998f9232d65bc4757af74475ce44fc80f10704ff5dfa8b1d14fc429b9"
+      sha256: ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2
       url: "https://pub.dev"
     source: hosted
-    version: "10.2.3"
+    version: "10.3.1"
   file_selector_linux:
     dependency: transitive
     description:
@@ -593,6 +601,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.9.3+4"
+  firebase_analytics:
+    dependency: "direct main"
+    description:
+      name: firebase_analytics
+      sha256: "07146e89e11302c6b07e3465c2c556ebcdd0053a3c5b1aa9bfd3203b778e5b4c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.0.0"
+  firebase_analytics_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_analytics_platform_interface
+      sha256: "27e81a0efc821bec6cba64abc1083b91c8ddbad28eeb4c6f6b7c78a59d06f259"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.0"
+  firebase_analytics_web:
+    dependency: transitive
+    description:
+      name: firebase_analytics_web
+      sha256: "7d87f47462042a7d9125e3123db2783bc72917d85e2719d4cb6aeaec209605e1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.0"
   firebase_core:
     dependency: "direct main"
     description:
@@ -617,6 +649,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  firebase_crashlytics:
+    dependency: "direct main"
+    description:
+      name: firebase_crashlytics
+      sha256: "95b6871850b1a7e3b09c284c59a0c71fafcad3eee8ac1b6f06aaf8979290cbb8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.0"
+  firebase_crashlytics_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_crashlytics_platform_interface
+      sha256: ba5b7a916f1ebedc6db35b33abdc618f202fc25e0792088dfba698e19fec9c09
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.8.11"
   firebase_messaging:
     dependency: "direct main"
     description:
@@ -706,10 +754,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_hooks
-      sha256: b772e710d16d7a20c0740c4f855095026b31c7eb5ba3ab67d2bd52021cd9461d
+      sha256: c3df76c62bb3a9f9bee75c57cdab40abab6123b734c1cd7e9b26a5dbd436eceb
       url: "https://pub.dev"
     source: hosted
-    version: "0.21.2"
+    version: "0.21.3"
   flutter_inappwebview:
     dependency: "direct main"
     description:
@@ -1069,6 +1117,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  get_it:
+    dependency: transitive
+    description:
+      name: get_it
+      sha256: a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.2.0"
   glob:
     dependency: transitive
     description:
@@ -1430,7 +1486,7 @@ packages:
     source: hosted
     version: "0.12.17"
   material_color_utilities:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: material_color_utilities
       sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
@@ -1541,6 +1597,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  msix:
+    dependency: "direct dev"
+    description:
+      name: msix
+      sha256: f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.16.12"
   native_exif:
     dependency: "direct main"
     description:
@@ -1585,18 +1649,18 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191"
+      sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968"
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "8.3.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c"
+      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   palette_generator:
     dependency: "direct main"
     description:
@@ -1769,10 +1833,10 @@ packages:
     dependency: transitive
     description:
       name: protobuf
-      sha256: "6153efcc92a06910918f3db8231fd2cf828ac81e50ebd87adc8f8a8cb3caff0e"
+      sha256: de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.1"
+    version: "4.2.0"
   provider:
     dependency: transitive
     description:
@@ -1981,6 +2045,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  screenshot:
+    dependency: "direct main"
+    description:
+      name: screenshot
+      sha256: "63817697a7835e6ce82add4228e15d233b74d42975c143ad8cfe07009fab866b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   scroll_to_index:
     dependency: transitive
     description:
@@ -2001,18 +2073,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0
+      sha256: d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.0"
+    version: "11.1.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef"
+      sha256: "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
+    version: "6.1.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -2134,10 +2206,10 @@ packages:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1"
+      sha256: a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.6"
+    version: "1.3.7"
   source_span:
     dependency: transitive
     description:
@@ -2646,4 +2718,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.29.0"
+  flutter: ">=3.32.0"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 3.1.0+123
+version: 3.2.0+125
 
 environment:
   sdk: ^3.7.2
@@ -36,7 +36,7 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
-  flutter_hooks: ^0.21.2
+  flutter_hooks: ^0.21.3
   hooks_riverpod: ^2.6.1
   bitsdojo_window: ^0.1.6
   go_router: ^16.1.0
@@ -67,13 +67,13 @@ dependencies:
   easy_localization: ^3.0.8
   flutter_inappwebview: ^6.1.5
   animations: ^2.0.11
-  package_info_plus: ^8.3.0
+  package_info_plus: ^8.3.1
   device_info_plus: ^11.5.0
   tus_client_dart:
     git: https://github.com/LittleSheep2Code/tus_client.git
   cross_file: ^0.3.4+2
   image_picker: ^1.1.2
-  file_picker: ^10.2.3
+  file_picker: ^10.3.1
   riverpod_annotation: ^2.6.1
   image_picker_platform_interface: ^2.10.1
   image_picker_android: ^0.8.12+25
@@ -121,7 +121,7 @@ dependencies:
   local_auth: ^2.3.0
   flutter_secure_storage: ^9.2.4
   flutter_math_fork: ^0.7.4
-  share_plus: ^11.0.0
+  share_plus: ^11.1.0
   receive_sharing_intent: ^1.8.1
   top_snackbar_flutter: ^3.3.0
   textfield_tags:
@@ -134,6 +134,10 @@ dependencies:
   flutter_langdetect: ^0.0.2
   waveform_flutter: ^1.2.0
   flutter_app_update: ^3.2.2
+  firebase_crashlytics: ^5.0.0
+  firebase_analytics: ^12.0.0
+  material_color_utilities: ^0.11.1
+  screenshot: ^3.0.0
 
 dev_dependencies:
   flutter_test:
@@ -153,6 +157,7 @@ dev_dependencies:
   riverpod_lint: ^2.6.5
   drift_dev: ^2.28.0
   flutter_launcher_icons: ^0.14.4
+  msix: ^3.16.12
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -222,3 +227,11 @@ flutter_native_splash:
   image_dark: "assets/icons/icon-dark.png"
   color: "#ffffff"
   color_dark: "#121212"
+
+msix_config:
+  display_name: Solian
+  publisher_display_name: Solsynth LLC
+  identity_name: dev.solian.app
+  msix_version: 3.2.0.0
+  logo_path: .\assets\icons\icon.png
+  capabilities: internetClientServer, location, microphone, webcam

setup.iss

@@ -0,0 +1,52 @@
+; ==================================================
+#define AppVersion "3.2.0"
+#define BuildNumber "124"
+; ==================================================
+
+#define FullVersion AppVersion + "." + BuildNumber
+
+[Setup]
+AppName=Solian
+AppVersion={#AppVersion}
+AppPublisher=Solsynth
+AppPublisherURL=https://solsynth.dev
+AppSupportURL=https://kb.solsynth.dev/zh/solar-network
+AppUpdatesURL=https://github.com/Solsynth/Solian/releases
+AppCopyright=Copyright © 2025 Solsynth
+VersionInfoVersion={#FullVersion}
+UninstallDisplayName=Solian
+UninstallDisplayIcon={app}\Solian.exe
+
+DefaultDirName={commonpf}\Solian
+UsePreviousAppDir=no
+
+OutputDir=.\Installer
+OutputBaseFilename=windows-x86_64-setup
+SetupIconFile=.\assets\icons\icon.ico  
+
+Compression=lzma2/ultra64
+SolidCompression=yes
+LZMAUseSeparateProcess=yes
+LZMANumBlockThreads=4
+
+ArchitecturesAllowed=x64compatible
+PrivilegesRequired=admin
+
+[Files]
+Source: ".\build\windows\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+[Icons]
+Name: "{group}\Solian"; Filename: "{app}\Solian.exe";IconFilename: "{app}\Solian.exe"
+Name: "{group}\{cm:UninstallProgram,Solian}"; Filename: "{uninstallexe}"
+Name: "{autodesktop}\Solian"; Filename: "{app}\Solian.exe"; Tasks: desktopicon
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Run]
+Filename: "{app}\Solian.exe"; Description: "Launch Solian"; Flags: nowait postinstall skipifsilent
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{userappdata}\dev.solsynth\Solian"
+Type: files; Name: "{group}\Solian.lnk" ;
+Type: files; Name: "{autodesktop}\Solian.lnk" ;