🚀 Launch 3.4.0+149

assets/i18n/en-US.json

@@ -180,6 +180,7 @@
     "noFortuneData": "No fortune data available for this month.",
     "creatorHub": "Creator Hub",
     "creatorHubDescription": "Manage posts, analytics, and more.",
+    "publicationSites": "Publication Sites",
     "developerPortal": "Developer Portal",
     "developerPortalDescription": "Build with Solar Network™.",
     "statusCreateHint": "What's on your mind? Add a status.",
@@ -232,6 +233,9 @@
     "pickFile": "Pick a file",
     "uploading": "Uploading",
     "uploadingProgress": "Uploading {} of {}",
+    "upload": "Upload",
+    "uploadSuccess": "Upload successful!",
+    "wouldYouLikeToViewFile": "Would you like to view the file?",
     "uploadAll": "Upload All",
     "stickerCopyPlaceholder": "Copy Placeholder",
     "realmSelection": "Select a Realm",
@@ -1109,7 +1113,6 @@
     "deleteRecycledFiles": "Delete Recycled Files",
     "recycledFilesDeleted": "Recycled files deleted successfully",
     "failedToDeleteRecycledFiles": "Failed to delete recycled files",
-    "upload": "Upload",
     "updateAvailable": "Update available",
     "noChangelogProvided": "No changelog provided.",
     "useSecondarySourceForDownload": "Use secondary source for download",
@@ -1339,5 +1342,137 @@
     "orCreateWith": "Or\ncreate with",
     "unindexedFiles": "Unindexed files",
     "folder": "Folder",
-    "clearCompleted": "Clear Completed"
-}
+    "clearCompleted": "Clear Completed",
+    "contentCantEmpty": "Content cannot be empty",
+    "features": "Features",
+    "unnamed": "Unnamed",
+    "fundEnvelopeLoadFailed": "Failed to load fund envelope",
+    "fundEnvelope": "Fund Envelope",
+    "fundEnvelopeRemaining": "Remaining: {} {}",
+    "fundEnvelopeSplit": "Split: {}",
+    "fundEnvelopeSplitEvenly": "Evenly",
+    "fundEnvelopeSplitRandomly": "Randomly",
+    "fundEnvelopeClaimSuccess": "Fund claimed successfully!",
+    "fundEnvelopeStatusCreated": "Created",
+    "fundEnvelopeStatusPartial": "Partially Claimed",
+    "fundEnvelopeStatusCompleted": "Fully Claimed",
+    "fundEnvelopeStatusExpired": "Expired",
+    "fundEnvelopeStatusUnknown": "Unknown",
+    "fundEnvelopeRecipients": "Recipients ({}/{} claimed)",
+    "fundEnvelopeExpiredDaysAgo": {
+        "one": "Expired {} day ago",
+        "other": "Expired {} days ago"
+    },
+    "fundEnvelopeExpiresSoon": "Expires soon",
+    "fundEnvelopeExpiresInHours": {
+        "one": "Expires in {} hour",
+        "other": "Expires in {} hours"
+    },
+    "fundEnvelopeExpiresInDays": {
+        "one": "Expires in {} day",
+        "other": "Expires in {} days"
+    },
+    "fundEnvelopeRemainingWithSplits": "{} {} / {} splits",
+    "fundEnvelopeUnknownUser": "Unknown User",
+    "deleteSite": "Delete Site",
+    "deleteSiteConfirm": "Are you sure you want to delete this site?",
+    "siteDeletedSuccess": "Site deleted successfully",
+    "siteSlug": "Slug",
+    "siteSlugHint": "my-site",
+    "siteSlugRequired": "Please enter a slug",
+    "siteSlugInvalid": "Slug can only contain lowercase letters, numbers, and dashes",
+    "siteName": "Site Name",
+    "siteNameHint": "My Publication Site",
+    "siteNameRequired": "Please enter a site name",
+    "siteMode": "Mode",
+    "siteModeFullyManaged": "Fully Managed",
+    "siteModeSelfManaged": "Self-Managed",
+    "editPublicationSite": "Edit Publication Site",
+    "deletePublicationSite": "Delete Publication Site",
+    "publicationSiteSavedSuccess": "Publication site saved successfully",
+    "publicationSiteDeleteConfirm": "Are you sure you want to delete this publication site? This action cannot be undone.",
+    "publicationSiteDeletedSuccess": "Publication site deleted successfully",
+    "newPublicationSite": "New Publication Site",
+    "siteDetails": "Site Details",
+    "siteInformation": "Site Information",
+    "siteDomain": "Domain",
+    "siteCreated": "Created",
+    "siteUpdated": "Updated",
+    "failedToLoadSite": "Failed to load site",
+    "sitePages": "Pages",
+    "noPagesYet": "No pages yet",
+    "createFirstPage": "Create your first page to get started",
+    "failedToLoadPages": "Failed to load pages",
+    "fileManagement": "File Management",
+    "siteFiles": "Files",
+    "siteFolder": "Folder",
+    "siteRoot": "Root",
+    "noFilesUploadedYet": "No files uploaded yet",
+    "uploadFirstFile": "Upload your first file to get started",
+    "failedToLoadFiles": "Failed to load files",
+    "noFilesFoundInFolder": "No files found in the selected folder",
+    "fileActions": "File Actions",
+    "purgeFiles": "Purge Files",
+    "purgeFilesDescription": "Remove all uploaded files from the site",
+    "deploySite": "Deploy Site",
+    "deploySiteDescription": "Upload and deploy a new version from ZIP archive",
+    "confirmPurge": "Confirm Purge",
+    "purgeFilesConfirm": "This will permanently delete all files uploaded to this site. This action cannot be undone. Are you sure you want to continue?",
+    "purgeAllFiles": "Purge All Files",
+    "allFilesPurgedSuccess": "All files purged successfully",
+    "failedToPurgeFiles": "Failed to purge files: {}",
+    "siteDeployedSuccess": "Site deployed successfully",
+    "failedToDeploySite": "Failed to deploy site: {}",
+    "createPage": "Create Page",
+    "editPage": "Edit Page",
+    "pageType": "Page Type",
+    "htmlPage": "HTML Page",
+    "redirectPage": "Redirect Page",
+    "pageTypeRequired": "Please select a page type",
+    "pagePath": "Page Path",
+    "pagePathHint": "/about, /contact, etc.",
+    "pagePathRequired": "Please enter a page path",
+    "pagePathInvalid": "Page path can only contain letters, numbers, hyphens, underscores, and slashes",
+    "pagePathMustStartWithSlash": "Page path must start with /",
+    "pagePathNoConsecutiveSlashes": "Page path cannot have consecutive slashes",
+    "pageTitle": "Page Title",
+    "pageTitleHint": "About Us, Contact, etc.",
+    "pageTitleRequired": "Please enter a page title",
+    "pageContentHtml": "Page Content (HTML)",
+    "pageContentHint": "<h1>Hello World</h1><p>This is my page content...</p>",
+    "pageContentRequired": "Please enter HTML content for the page",
+    "redirectTarget": "Redirect Target",
+    "redirectTargetHint": "/new-page, https://example.com, etc.",
+    "redirectTargetRequired": "Please enter a redirect target",
+    "redirectTargetInvalid": "Target must be a relative path (/) or absolute URL (http/https)",
+    "deletePage": "Delete Page",
+    "deletePageConfirm": "Are you sure you want to delete this page?",
+    "savePage": "Save Page",
+    "pageCreatedSuccess": "Page created successfully",
+    "pageUpdatedSuccess": "Page updated successfully",
+    "pageDeletedSuccess": "Page deleted successfully",
+    "uploadFiles": "Upload Files",
+    "uploadPath": "Upload Path",
+    "uploadPathHint": "/ (root) or /assets/images/",
+    "uploadPathRequired": "Please enter an upload path",
+    "uploadPathMustStartWithSlash": "Path must start with /",
+    "uploadPathNoSpaces": "Path cannot contain spaces",
+    "uploadPathNoConsecutiveSlashes": "Path cannot have consecutive slashes",
+    "percentCompleted": "{}% completed",
+    "filesToUpload": "{} files to upload",
+    "fileSizeKb": "Size: {} KB",
+    "uploadingEllipsis": "Uploading...",
+    "uploadFilesCount": {
+        "one": "Upload {} File",
+        "other": "Upload {} Files"
+    },
+    "allUploadsCompleted": "All uploads completed",
+    "someUploadsFailed": "Some uploads failed",
+    "uploadingInProgress": "Uploading in progress",
+    "readyToUpload": "Ready to upload",
+    "allFilesUploadedSuccess": "All files uploaded successfully",
+    "lotteryLastNumberSpecial": "The last selected number will be your special number.",
+    "lotteryMultiplierRequired": "Please enter a multiplier",
+    "lotteryMultiplierRange": "Multiplier must be between 1 and 10",
+    "dropToShare": "Drop to share"
+}

assets/i18n/zh-CN.json

@@ -585,10 +585,10 @@
     "unknownChat": "未知聊天",
     "addAdditionalMessage": "添加附加消息……",
     "uploadingFiles": "上传文件中……",
-    "sharedSuccessfully": "分享成功！",
-    "shareSuccess": "分享成功！",
-    "shareToSpecificChatSuccess": "成功分享至 {}！",
-    "wouldYouLikeToGoToChat": "是否前往该聊天？",
+    "sharedSuccessfully": "分享成功",
+    "shareSuccess": "分享成功",
+    "shareToSpecificChatSuccess": "成功分享至 {}",
+    "wouldYouLikeToGoToChat": "是否前往该聊天页面？",
     "no": "否",
     "yes": "是",
     "navigateToChat": "前往聊天",
@@ -1092,4 +1092,4 @@
     "aiThought": "寻思",
     "aiThoughtTitle": "让 SN 酱寻思寻思",
     "thoughtUnpaidHint": "寻思因为有未支付的订单而被禁用"
-}
+}

ios/Podfile.lock

@@ -140,8 +140,6 @@ PODS:
     - Flutter
   - flutter_native_splash (2.4.3):
     - Flutter
-  - flutter_platform_alert (0.0.1):
-    - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
   - flutter_timezone (0.0.1):
@@ -251,14 +249,13 @@ PODS:
   - nanopb/encode (3.30910.0)
   - native_exif (0.0.1):
     - Flutter
+  - objective_c (0.0.1):
+    - Flutter
   - OrderedSet (6.0.3)
   - package_info_plus (0.4.5):
     - Flutter
   - pasteboard (0.0.1):
     - Flutter
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
   - pointer_interceptor_ios (0.0.1):
     - Flutter
   - PromisesObjC (2.4.0)
@@ -336,7 +333,6 @@ DEPENDENCIES:
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
-  - flutter_platform_alert (from `.symlinks/plugins/flutter_platform_alert/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`)
   - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`)
@@ -351,9 +347,9 @@ DEPENDENCIES:
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - native_exif (from `.symlinks/plugins/native_exif/ios`)
+  - objective_c (from `.symlinks/plugins/objective_c/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - pasteboard (from `.symlinks/plugins/pasteboard/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
   - protocol_handler_ios (from `.symlinks/plugins/protocol_handler_ios/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
@@ -431,8 +427,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
-  flutter_platform_alert:
-    :path: ".symlinks/plugins/flutter_platform_alert/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   flutter_timezone:
@@ -457,12 +451,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/media_kit_video/ios"
   native_exif:
     :path: ".symlinks/plugins/native_exif/ios"
+  objective_c:
+    :path: ".symlinks/plugins/objective_c/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   pasteboard:
     :path: ".symlinks/plugins/pasteboard/ios"
-  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   pointer_interceptor_ios:
     :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
   protocol_handler_ios:
@@ -519,7 +513,6 @@ SPEC CHECKSUMS:
   flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
   flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
-  flutter_platform_alert: bf3b5fcd4ac14bd637e20527e9c471633071afd3
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
   flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
   flutter_udid: 92a5d31fe0526b7b6002a2318df702e12e7eb300
@@ -541,10 +534,10 @@ SPEC CHECKSUMS:
   media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   native_exif: 0eb73d3d5b3ca892719228df8d2d1b13d1ae396c
+  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c
-  path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   pointer_interceptor_ios: da06a662d5bfd329602b45b2ab41bc0fb5fdb0f0
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851

ios/SolianNotificationService/NotificationService.swift

@@ -140,21 +140,29 @@ class NotificationService: UNNotificationServiceExtension {
 
         guard !attachmentUrls.isEmpty else {
             print("Invalid URLs for attachments: \(attachmentUrls)")
+            self.contentHandler?(content)
             return
         }
 
         let targetSize = 512
         let scaleProcessor = ResizingImageProcessor(referenceSize: CGSize(width: targetSize, height: targetSize), mode: .aspectFit)
+        
+        let dispatchGroup = DispatchGroup()
+        var attachments: [UNNotificationAttachment] = []
+        let lock = NSLock() // To synchronize access to the attachments array
 
         for attachmentUrl in attachmentUrls {
             guard let remoteUrl = URL(string: attachmentUrl) else {
                 print("Invalid URL for attachment: \(attachmentUrl)")
-                continue // Skip this URL and move to the next one
+                continue
             }
+            
+            dispatchGroup.enter()
 
             KingfisherManager.shared.retrieveImage(with: remoteUrl, options: scaleDown ? [
                 .processor(scaleProcessor)
             ] : nil) { [weak self] result in
+                defer { dispatchGroup.leave() }
                 guard let self = self else { return }
 
                 switch result {
@@ -166,49 +174,34 @@ class NotificationService: UNNotificationServiceExtension {
                     do {
                         // Write the image data to a temporary file for UNNotificationAttachment
                         try retrievalResult.image.pngData()?.write(to: cachedFileUrl)
-                        self.attachLocalMedia(to: content, fileType: type?.identifier, from: cachedFileUrl, withIdentifier: attachmentUrl)
+                        
+                        if let attachment = try? UNNotificationAttachment(identifier: attachmentUrl, url: cachedFileUrl, options: [
+                            UNNotificationAttachmentOptionsTypeHintKey: type?.identifier as Any,
+                            UNNotificationAttachmentOptionsThumbnailHiddenKey: 0,
+                        ]) {
+                            lock.lock()
+                            attachments.append(attachment)
+                            lock.unlock()
+                        }
                     } catch {
                         print("Failed to write media to temporary file: \(error.localizedDescription)")
-                        self.contentHandler?(content)
                     }
 
                 case .failure(let error):
                     print("Failed to retrieve image: \(error.localizedDescription)")
-                    self.contentHandler?(content)
-                }
-            }
-        }
-    }
-    
-    private func attachLocalMedia(to content: UNMutableNotificationContent, fileType type: String?, from localUrl: URL, withIdentifier identifier: String) {
-        do {
-            let attachment = try UNNotificationAttachment(identifier: identifier, url: localUrl, options: [
-                UNNotificationAttachmentOptionsTypeHintKey: type as Any,
-                UNNotificationAttachmentOptionsThumbnailHiddenKey: 0,
-            ])
-            content.attachments = [attachment]
-        } catch let error as NSError {
-            // Log detailed error information
-            print("Failed to create attachment from file at \(localUrl.path)")
-            print("Error: \(error.localizedDescription)")
-            
-            // Check specific error codes if needed
-            if error.domain == NSCocoaErrorDomain {
-                switch error.code {
-                case NSFileReadNoSuchFileError:
-                    print("File does not exist at \(localUrl.path)")
-                case NSFileReadNoPermissionError:
-                    print("No permission to read file at \(localUrl.path)")
-                default:
-                    print("Unhandled file error: \(error.code)")
                 }
             }
         }
         
-        // Call content handler regardless of success or failure
-        self.contentHandler?(content)
+        dispatchGroup.notify(queue: .main) { [weak self] in
+            guard let self = self else { return }
+            content.attachments = attachments
+            self.contentHandler?(content)
+        }
     }
     
+
+    
     private func createMessageIntent(with sender: INPerson, meta: [AnyHashable: Any], body: String) -> INSendMessageIntent {
         INSendMessageIntent(
             recipients: nil,

lib/database/drift_db.dart

@@ -360,21 +360,41 @@ class AppDatabase extends _$AppDatabase {
   }
 
   Future<void> saveChatRooms(List<SnChatRoom> rooms) async {
-    await batch((batch) {
-      for (final room in rooms) {
-        batch.insert(
-          chatRooms,
-          companionFromRoom(room),
-          mode: InsertMode.insertOrReplace,
-        );
-        for (final member in room.members ?? []) {
+    await transaction(() async {
+      // 1. Identify rooms to remove
+      final remoteRoomIds = rooms.map((r) => r.id).toSet();
+      final currentRooms = await select(chatRooms).get();
+      final currentRoomIds = currentRooms.map((r) => r.id).toSet();
+      final idsToRemove = currentRoomIds.difference(remoteRoomIds);
+
+      if (idsToRemove.isNotEmpty) {
+        final idsList = idsToRemove.toList();
+        // Remove messages
+        await (delete(chatMessages)..where((t) => t.roomId.isIn(idsList))).go();
+        // Remove members
+        await (delete(chatMembers)
+          ..where((t) => t.chatRoomId.isIn(idsList))).go();
+        // Remove rooms
+        await (delete(chatRooms)..where((t) => t.id.isIn(idsList))).go();
+      }
+
+      // 2. Upsert remote rooms
+      await batch((batch) {
+        for (final room in rooms) {
           batch.insert(
-            chatMembers,
-            companionFromMember(member),
+            chatRooms,
+            companionFromRoom(room),
             mode: InsertMode.insertOrReplace,
           );
+          for (final member in room.members ?? []) {
+            batch.insert(
+              chatMembers,
+              companionFromMember(member),
+              mode: InsertMode.insertOrReplace,
+            );
+          }
         }
-      }
+      });
     });
   }
 
@@ -429,4 +449,13 @@ class AppDatabase extends _$AppDatabase {
       chatMembers,
     ).insert(companionFromMember(member), mode: InsertMode.insertOrReplace);
   }
+
+  Future<int> saveMessageWithSender(LocalChatMessage message) async {
+    // First save the sender if it exists
+    if (message.sender != null) {
+      await saveMember(message.sender!);
+    }
+    // Then save the message
+    return await saveMessage(messageToCompanion(message));
+  }
 }

lib/models/publication_site.dart

@@ -0,0 +1,41 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'publication_site.freezed.dart';
+part 'publication_site.g.dart';
+
+@freezed
+sealed class SnPublicationSite with _$SnPublicationSite {
+  const factory SnPublicationSite({
+    required String id,
+    required String slug,
+    required String name,
+    String? description,
+    int? mode,
+    required String publisherId,
+    required String accountId,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required List<SnPublicationPage> pages,
+  }) = _SnPublicationSite;
+
+  factory SnPublicationSite.fromJson(Map<String, dynamic> json) =>
+      _$SnPublicationSiteFromJson(json);
+}
+
+@freezed
+sealed class SnPublicationPage with _$SnPublicationPage {
+  const factory SnPublicationPage({
+    required String id,
+    String? preset,
+    String? path,
+    Map<String, dynamic>? config,
+    required String siteId,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+  }) = _SnPublicationPage;
+
+  factory SnPublicationPage.fromJson(Map<String, dynamic> json) =>
+      _$SnPublicationPageFromJson(json);
+}
+
+enum PublicationPagePreset { landing, profile, posts, custom }

lib/models/publication_site.freezed.dart

@@ -0,0 +1,587 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// 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 'publication_site.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnPublicationSite {
+
+ String get id; String get slug; String get name; String? get description; int? get mode; String get publisherId; String get accountId; DateTime get createdAt; DateTime get updatedAt; List<SnPublicationPage> get pages;
+/// Create a copy of SnPublicationSite
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnPublicationSiteCopyWith<SnPublicationSite> get copyWith => _$SnPublicationSiteCopyWithImpl<SnPublicationSite>(this as SnPublicationSite, _$identity);
+
+  /// Serializes this SnPublicationSite to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPublicationSite&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.mode, mode) || other.mode == mode)&&(identical(other.publisherId, publisherId) || other.publisherId == publisherId)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&const DeepCollectionEquality().equals(other.pages, pages));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,description,mode,publisherId,accountId,createdAt,updatedAt,const DeepCollectionEquality().hash(pages));
+
+@override
+String toString() {
+  return 'SnPublicationSite(id: $id, slug: $slug, name: $name, description: $description, mode: $mode, publisherId: $publisherId, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, pages: $pages)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnPublicationSiteCopyWith<$Res>  {
+  factory $SnPublicationSiteCopyWith(SnPublicationSite value, $Res Function(SnPublicationSite) _then) = _$SnPublicationSiteCopyWithImpl;
+@useResult
+$Res call({
+ String id, String slug, String name, String? description, int? mode, String publisherId, String accountId, DateTime createdAt, DateTime updatedAt, List<SnPublicationPage> pages
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnPublicationSiteCopyWithImpl<$Res>
+    implements $SnPublicationSiteCopyWith<$Res> {
+  _$SnPublicationSiteCopyWithImpl(this._self, this._then);
+
+  final SnPublicationSite _self;
+  final $Res Function(SnPublicationSite) _then;
+
+/// Create a copy of SnPublicationSite
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = null,Object? description = freezed,Object? mode = freezed,Object? publisherId = null,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? pages = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,mode: freezed == mode ? _self.mode : mode // ignore: cast_nullable_to_non_nullable
+as int?,publisherId: null == publisherId ? _self.publisherId : publisherId // ignore: cast_nullable_to_non_nullable
+as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,pages: null == pages ? _self.pages : pages // ignore: cast_nullable_to_non_nullable
+as List<SnPublicationPage>,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnPublicationSite].
+extension SnPublicationSitePatterns on SnPublicationSite {
+/// 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( _SnPublicationSite value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnPublicationSite() 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( _SnPublicationSite value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnPublicationSite():
+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( _SnPublicationSite value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnPublicationSite() 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 slug,  String name,  String? description,  int? mode,  String publisherId,  String accountId,  DateTime createdAt,  DateTime updatedAt,  List<SnPublicationPage> pages)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnPublicationSite() when $default != null:
+return $default(_that.id,_that.slug,_that.name,_that.description,_that.mode,_that.publisherId,_that.accountId,_that.createdAt,_that.updatedAt,_that.pages);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 slug,  String name,  String? description,  int? mode,  String publisherId,  String accountId,  DateTime createdAt,  DateTime updatedAt,  List<SnPublicationPage> pages)  $default,) {final _that = this;
+switch (_that) {
+case _SnPublicationSite():
+return $default(_that.id,_that.slug,_that.name,_that.description,_that.mode,_that.publisherId,_that.accountId,_that.createdAt,_that.updatedAt,_that.pages);}
+}
+/// 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 slug,  String name,  String? description,  int? mode,  String publisherId,  String accountId,  DateTime createdAt,  DateTime updatedAt,  List<SnPublicationPage> pages)?  $default,) {final _that = this;
+switch (_that) {
+case _SnPublicationSite() when $default != null:
+return $default(_that.id,_that.slug,_that.name,_that.description,_that.mode,_that.publisherId,_that.accountId,_that.createdAt,_that.updatedAt,_that.pages);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnPublicationSite implements SnPublicationSite {
+  const _SnPublicationSite({required this.id, required this.slug, required this.name, this.description, this.mode, required this.publisherId, required this.accountId, required this.createdAt, required this.updatedAt, required final  List<SnPublicationPage> pages}): _pages = pages;
+  factory _SnPublicationSite.fromJson(Map<String, dynamic> json) => _$SnPublicationSiteFromJson(json);
+
+@override final  String id;
+@override final  String slug;
+@override final  String name;
+@override final  String? description;
+@override final  int? mode;
+@override final  String publisherId;
+@override final  String accountId;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+ final  List<SnPublicationPage> _pages;
+@override List<SnPublicationPage> get pages {
+  if (_pages is EqualUnmodifiableListView) return _pages;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_pages);
+}
+
+
+/// Create a copy of SnPublicationSite
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnPublicationSiteCopyWith<_SnPublicationSite> get copyWith => __$SnPublicationSiteCopyWithImpl<_SnPublicationSite>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnPublicationSiteToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPublicationSite&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.mode, mode) || other.mode == mode)&&(identical(other.publisherId, publisherId) || other.publisherId == publisherId)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&const DeepCollectionEquality().equals(other._pages, _pages));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,description,mode,publisherId,accountId,createdAt,updatedAt,const DeepCollectionEquality().hash(_pages));
+
+@override
+String toString() {
+  return 'SnPublicationSite(id: $id, slug: $slug, name: $name, description: $description, mode: $mode, publisherId: $publisherId, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, pages: $pages)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnPublicationSiteCopyWith<$Res> implements $SnPublicationSiteCopyWith<$Res> {
+  factory _$SnPublicationSiteCopyWith(_SnPublicationSite value, $Res Function(_SnPublicationSite) _then) = __$SnPublicationSiteCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String slug, String name, String? description, int? mode, String publisherId, String accountId, DateTime createdAt, DateTime updatedAt, List<SnPublicationPage> pages
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnPublicationSiteCopyWithImpl<$Res>
+    implements _$SnPublicationSiteCopyWith<$Res> {
+  __$SnPublicationSiteCopyWithImpl(this._self, this._then);
+
+  final _SnPublicationSite _self;
+  final $Res Function(_SnPublicationSite) _then;
+
+/// Create a copy of SnPublicationSite
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = null,Object? description = freezed,Object? mode = freezed,Object? publisherId = null,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? pages = null,}) {
+  return _then(_SnPublicationSite(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,mode: freezed == mode ? _self.mode : mode // ignore: cast_nullable_to_non_nullable
+as int?,publisherId: null == publisherId ? _self.publisherId : publisherId // ignore: cast_nullable_to_non_nullable
+as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,pages: null == pages ? _self._pages : pages // ignore: cast_nullable_to_non_nullable
+as List<SnPublicationPage>,
+  ));
+}
+
+
+}
+
+
+/// @nodoc
+mixin _$SnPublicationPage {
+
+ String get id; String? get preset; String? get path; Map<String, dynamic>? get config; String get siteId; DateTime get createdAt; DateTime get updatedAt;
+/// Create a copy of SnPublicationPage
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnPublicationPageCopyWith<SnPublicationPage> get copyWith => _$SnPublicationPageCopyWithImpl<SnPublicationPage>(this as SnPublicationPage, _$identity);
+
+  /// Serializes this SnPublicationPage to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPublicationPage&&(identical(other.id, id) || other.id == id)&&(identical(other.preset, preset) || other.preset == preset)&&(identical(other.path, path) || other.path == path)&&const DeepCollectionEquality().equals(other.config, config)&&(identical(other.siteId, siteId) || other.siteId == siteId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,preset,path,const DeepCollectionEquality().hash(config),siteId,createdAt,updatedAt);
+
+@override
+String toString() {
+  return 'SnPublicationPage(id: $id, preset: $preset, path: $path, config: $config, siteId: $siteId, createdAt: $createdAt, updatedAt: $updatedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnPublicationPageCopyWith<$Res>  {
+  factory $SnPublicationPageCopyWith(SnPublicationPage value, $Res Function(SnPublicationPage) _then) = _$SnPublicationPageCopyWithImpl;
+@useResult
+$Res call({
+ String id, String? preset, String? path, Map<String, dynamic>? config, String siteId, DateTime createdAt, DateTime updatedAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnPublicationPageCopyWithImpl<$Res>
+    implements $SnPublicationPageCopyWith<$Res> {
+  _$SnPublicationPageCopyWithImpl(this._self, this._then);
+
+  final SnPublicationPage _self;
+  final $Res Function(SnPublicationPage) _then;
+
+/// Create a copy of SnPublicationPage
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? preset = freezed,Object? path = freezed,Object? config = freezed,Object? siteId = null,Object? createdAt = null,Object? updatedAt = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,preset: freezed == preset ? _self.preset : preset // ignore: cast_nullable_to_non_nullable
+as String?,path: freezed == path ? _self.path : path // ignore: cast_nullable_to_non_nullable
+as String?,config: freezed == config ? _self.config : config // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,siteId: null == siteId ? _self.siteId : siteId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnPublicationPage].
+extension SnPublicationPagePatterns on SnPublicationPage {
+/// 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( _SnPublicationPage value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnPublicationPage() 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( _SnPublicationPage value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnPublicationPage():
+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( _SnPublicationPage value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnPublicationPage() 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? preset,  String? path,  Map<String, dynamic>? config,  String siteId,  DateTime createdAt,  DateTime updatedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnPublicationPage() when $default != null:
+return $default(_that.id,_that.preset,_that.path,_that.config,_that.siteId,_that.createdAt,_that.updatedAt);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? preset,  String? path,  Map<String, dynamic>? config,  String siteId,  DateTime createdAt,  DateTime updatedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnPublicationPage():
+return $default(_that.id,_that.preset,_that.path,_that.config,_that.siteId,_that.createdAt,_that.updatedAt);}
+}
+/// 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? preset,  String? path,  Map<String, dynamic>? config,  String siteId,  DateTime createdAt,  DateTime updatedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnPublicationPage() when $default != null:
+return $default(_that.id,_that.preset,_that.path,_that.config,_that.siteId,_that.createdAt,_that.updatedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnPublicationPage implements SnPublicationPage {
+  const _SnPublicationPage({required this.id, this.preset, this.path, final  Map<String, dynamic>? config, required this.siteId, required this.createdAt, required this.updatedAt}): _config = config;
+  factory _SnPublicationPage.fromJson(Map<String, dynamic> json) => _$SnPublicationPageFromJson(json);
+
+@override final  String id;
+@override final  String? preset;
+@override final  String? path;
+ final  Map<String, dynamic>? _config;
+@override Map<String, dynamic>? get config {
+  final value = _config;
+  if (value == null) return null;
+  if (_config is EqualUnmodifiableMapView) return _config;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+@override final  String siteId;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+
+/// Create a copy of SnPublicationPage
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnPublicationPageCopyWith<_SnPublicationPage> get copyWith => __$SnPublicationPageCopyWithImpl<_SnPublicationPage>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnPublicationPageToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPublicationPage&&(identical(other.id, id) || other.id == id)&&(identical(other.preset, preset) || other.preset == preset)&&(identical(other.path, path) || other.path == path)&&const DeepCollectionEquality().equals(other._config, _config)&&(identical(other.siteId, siteId) || other.siteId == siteId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,preset,path,const DeepCollectionEquality().hash(_config),siteId,createdAt,updatedAt);
+
+@override
+String toString() {
+  return 'SnPublicationPage(id: $id, preset: $preset, path: $path, config: $config, siteId: $siteId, createdAt: $createdAt, updatedAt: $updatedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnPublicationPageCopyWith<$Res> implements $SnPublicationPageCopyWith<$Res> {
+  factory _$SnPublicationPageCopyWith(_SnPublicationPage value, $Res Function(_SnPublicationPage) _then) = __$SnPublicationPageCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String? preset, String? path, Map<String, dynamic>? config, String siteId, DateTime createdAt, DateTime updatedAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnPublicationPageCopyWithImpl<$Res>
+    implements _$SnPublicationPageCopyWith<$Res> {
+  __$SnPublicationPageCopyWithImpl(this._self, this._then);
+
+  final _SnPublicationPage _self;
+  final $Res Function(_SnPublicationPage) _then;
+
+/// Create a copy of SnPublicationPage
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? preset = freezed,Object? path = freezed,Object? config = freezed,Object? siteId = null,Object? createdAt = null,Object? updatedAt = null,}) {
+  return _then(_SnPublicationPage(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,preset: freezed == preset ? _self.preset : preset // ignore: cast_nullable_to_non_nullable
+as String?,path: freezed == path ? _self.path : path // ignore: cast_nullable_to_non_nullable
+as String?,config: freezed == config ? _self._config : config // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,siteId: null == siteId ? _self.siteId : siteId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/publication_site.g.dart

@@ -0,0 +1,60 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'publication_site.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnPublicationSite _$SnPublicationSiteFromJson(Map<String, dynamic> json) =>
+    _SnPublicationSite(
+      id: json['id'] as String,
+      slug: json['slug'] as String,
+      name: json['name'] as String,
+      description: json['description'] as String?,
+      mode: (json['mode'] as num?)?.toInt(),
+      publisherId: json['publisher_id'] as String,
+      accountId: json['account_id'] as String,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      pages:
+          (json['pages'] as List<dynamic>)
+              .map((e) => SnPublicationPage.fromJson(e as Map<String, dynamic>))
+              .toList(),
+    );
+
+Map<String, dynamic> _$SnPublicationSiteToJson(_SnPublicationSite instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'slug': instance.slug,
+      'name': instance.name,
+      'description': instance.description,
+      'mode': instance.mode,
+      'publisher_id': instance.publisherId,
+      'account_id': instance.accountId,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'pages': instance.pages.map((e) => e.toJson()).toList(),
+    };
+
+_SnPublicationPage _$SnPublicationPageFromJson(Map<String, dynamic> json) =>
+    _SnPublicationPage(
+      id: json['id'] as String,
+      preset: json['preset'] as String?,
+      path: json['path'] as String?,
+      config: json['config'] as Map<String, dynamic>?,
+      siteId: json['site_id'] as String,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+    );
+
+Map<String, dynamic> _$SnPublicationPageToJson(_SnPublicationPage instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'preset': instance.preset,
+      'path': instance.path,
+      'config': instance.config,
+      'site_id': instance.siteId,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+    };

lib/models/site_file.dart

@@ -0,0 +1,25 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'site_file.freezed.dart';
+part 'site_file.g.dart';
+
+@freezed
+sealed class SnSiteFileEntry with _$SnSiteFileEntry {
+  const factory SnSiteFileEntry({
+    required bool isDirectory,
+    required String relativePath,
+    required int size, // Size in bytes (0 for directories)
+    required DateTime modified, // ISO 8601 timestamp
+  }) = _SnSiteFileEntry;
+
+  factory SnSiteFileEntry.fromJson(Map<String, dynamic> json) =>
+      _$SnSiteFileEntryFromJson(json);
+}
+
+@freezed
+sealed class SnFileContent with _$SnFileContent {
+  const factory SnFileContent({required String content}) = _SnFileContent;
+
+  factory SnFileContent.fromJson(Map<String, dynamic> json) =>
+      _$SnFileContentFromJson(json);
+}

lib/models/site_file.freezed.dart

@@ -0,0 +1,539 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// 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 'site_file.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnSiteFileEntry {
+
+ bool get isDirectory; String get relativePath; int get size;// Size in bytes (0 for directories)
+ DateTime get modified;
+/// Create a copy of SnSiteFileEntry
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnSiteFileEntryCopyWith<SnSiteFileEntry> get copyWith => _$SnSiteFileEntryCopyWithImpl<SnSiteFileEntry>(this as SnSiteFileEntry, _$identity);
+
+  /// Serializes this SnSiteFileEntry to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnSiteFileEntry&&(identical(other.isDirectory, isDirectory) || other.isDirectory == isDirectory)&&(identical(other.relativePath, relativePath) || other.relativePath == relativePath)&&(identical(other.size, size) || other.size == size)&&(identical(other.modified, modified) || other.modified == modified));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,isDirectory,relativePath,size,modified);
+
+@override
+String toString() {
+  return 'SnSiteFileEntry(isDirectory: $isDirectory, relativePath: $relativePath, size: $size, modified: $modified)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnSiteFileEntryCopyWith<$Res>  {
+  factory $SnSiteFileEntryCopyWith(SnSiteFileEntry value, $Res Function(SnSiteFileEntry) _then) = _$SnSiteFileEntryCopyWithImpl;
+@useResult
+$Res call({
+ bool isDirectory, String relativePath, int size, DateTime modified
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnSiteFileEntryCopyWithImpl<$Res>
+    implements $SnSiteFileEntryCopyWith<$Res> {
+  _$SnSiteFileEntryCopyWithImpl(this._self, this._then);
+
+  final SnSiteFileEntry _self;
+  final $Res Function(SnSiteFileEntry) _then;
+
+/// Create a copy of SnSiteFileEntry
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? isDirectory = null,Object? relativePath = null,Object? size = null,Object? modified = null,}) {
+  return _then(_self.copyWith(
+isDirectory: null == isDirectory ? _self.isDirectory : isDirectory // ignore: cast_nullable_to_non_nullable
+as bool,relativePath: null == relativePath ? _self.relativePath : relativePath // ignore: cast_nullable_to_non_nullable
+as String,size: null == size ? _self.size : size // ignore: cast_nullable_to_non_nullable
+as int,modified: null == modified ? _self.modified : modified // ignore: cast_nullable_to_non_nullable
+as DateTime,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnSiteFileEntry].
+extension SnSiteFileEntryPatterns on SnSiteFileEntry {
+/// 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( _SnSiteFileEntry value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnSiteFileEntry() 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( _SnSiteFileEntry value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnSiteFileEntry():
+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( _SnSiteFileEntry value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnSiteFileEntry() 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( bool isDirectory,  String relativePath,  int size,  DateTime modified)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnSiteFileEntry() when $default != null:
+return $default(_that.isDirectory,_that.relativePath,_that.size,_that.modified);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( bool isDirectory,  String relativePath,  int size,  DateTime modified)  $default,) {final _that = this;
+switch (_that) {
+case _SnSiteFileEntry():
+return $default(_that.isDirectory,_that.relativePath,_that.size,_that.modified);}
+}
+/// 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( bool isDirectory,  String relativePath,  int size,  DateTime modified)?  $default,) {final _that = this;
+switch (_that) {
+case _SnSiteFileEntry() when $default != null:
+return $default(_that.isDirectory,_that.relativePath,_that.size,_that.modified);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnSiteFileEntry implements SnSiteFileEntry {
+  const _SnSiteFileEntry({required this.isDirectory, required this.relativePath, required this.size, required this.modified});
+  factory _SnSiteFileEntry.fromJson(Map<String, dynamic> json) => _$SnSiteFileEntryFromJson(json);
+
+@override final  bool isDirectory;
+@override final  String relativePath;
+@override final  int size;
+// Size in bytes (0 for directories)
+@override final  DateTime modified;
+
+/// Create a copy of SnSiteFileEntry
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnSiteFileEntryCopyWith<_SnSiteFileEntry> get copyWith => __$SnSiteFileEntryCopyWithImpl<_SnSiteFileEntry>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnSiteFileEntryToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnSiteFileEntry&&(identical(other.isDirectory, isDirectory) || other.isDirectory == isDirectory)&&(identical(other.relativePath, relativePath) || other.relativePath == relativePath)&&(identical(other.size, size) || other.size == size)&&(identical(other.modified, modified) || other.modified == modified));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,isDirectory,relativePath,size,modified);
+
+@override
+String toString() {
+  return 'SnSiteFileEntry(isDirectory: $isDirectory, relativePath: $relativePath, size: $size, modified: $modified)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnSiteFileEntryCopyWith<$Res> implements $SnSiteFileEntryCopyWith<$Res> {
+  factory _$SnSiteFileEntryCopyWith(_SnSiteFileEntry value, $Res Function(_SnSiteFileEntry) _then) = __$SnSiteFileEntryCopyWithImpl;
+@override @useResult
+$Res call({
+ bool isDirectory, String relativePath, int size, DateTime modified
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnSiteFileEntryCopyWithImpl<$Res>
+    implements _$SnSiteFileEntryCopyWith<$Res> {
+  __$SnSiteFileEntryCopyWithImpl(this._self, this._then);
+
+  final _SnSiteFileEntry _self;
+  final $Res Function(_SnSiteFileEntry) _then;
+
+/// Create a copy of SnSiteFileEntry
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? isDirectory = null,Object? relativePath = null,Object? size = null,Object? modified = null,}) {
+  return _then(_SnSiteFileEntry(
+isDirectory: null == isDirectory ? _self.isDirectory : isDirectory // ignore: cast_nullable_to_non_nullable
+as bool,relativePath: null == relativePath ? _self.relativePath : relativePath // ignore: cast_nullable_to_non_nullable
+as String,size: null == size ? _self.size : size // ignore: cast_nullable_to_non_nullable
+as int,modified: null == modified ? _self.modified : modified // ignore: cast_nullable_to_non_nullable
+as DateTime,
+  ));
+}
+
+
+}
+
+
+/// @nodoc
+mixin _$SnFileContent {
+
+ String get content;
+/// Create a copy of SnFileContent
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnFileContentCopyWith<SnFileContent> get copyWith => _$SnFileContentCopyWithImpl<SnFileContent>(this as SnFileContent, _$identity);
+
+  /// Serializes this SnFileContent to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnFileContent&&(identical(other.content, content) || other.content == content));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,content);
+
+@override
+String toString() {
+  return 'SnFileContent(content: $content)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnFileContentCopyWith<$Res>  {
+  factory $SnFileContentCopyWith(SnFileContent value, $Res Function(SnFileContent) _then) = _$SnFileContentCopyWithImpl;
+@useResult
+$Res call({
+ String content
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnFileContentCopyWithImpl<$Res>
+    implements $SnFileContentCopyWith<$Res> {
+  _$SnFileContentCopyWithImpl(this._self, this._then);
+
+  final SnFileContent _self;
+  final $Res Function(SnFileContent) _then;
+
+/// Create a copy of SnFileContent
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? content = null,}) {
+  return _then(_self.copyWith(
+content: null == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnFileContent].
+extension SnFileContentPatterns on SnFileContent {
+/// 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( _SnFileContent value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnFileContent() 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( _SnFileContent value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnFileContent():
+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( _SnFileContent value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnFileContent() 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 content)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnFileContent() when $default != null:
+return $default(_that.content);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 content)  $default,) {final _that = this;
+switch (_that) {
+case _SnFileContent():
+return $default(_that.content);}
+}
+/// 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 content)?  $default,) {final _that = this;
+switch (_that) {
+case _SnFileContent() when $default != null:
+return $default(_that.content);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnFileContent implements SnFileContent {
+  const _SnFileContent({required this.content});
+  factory _SnFileContent.fromJson(Map<String, dynamic> json) => _$SnFileContentFromJson(json);
+
+@override final  String content;
+
+/// Create a copy of SnFileContent
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnFileContentCopyWith<_SnFileContent> get copyWith => __$SnFileContentCopyWithImpl<_SnFileContent>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnFileContentToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnFileContent&&(identical(other.content, content) || other.content == content));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,content);
+
+@override
+String toString() {
+  return 'SnFileContent(content: $content)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnFileContentCopyWith<$Res> implements $SnFileContentCopyWith<$Res> {
+  factory _$SnFileContentCopyWith(_SnFileContent value, $Res Function(_SnFileContent) _then) = __$SnFileContentCopyWithImpl;
+@override @useResult
+$Res call({
+ String content
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnFileContentCopyWithImpl<$Res>
+    implements _$SnFileContentCopyWith<$Res> {
+  __$SnFileContentCopyWithImpl(this._self, this._then);
+
+  final _SnFileContent _self;
+  final $Res Function(_SnFileContent) _then;
+
+/// Create a copy of SnFileContent
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? content = null,}) {
+  return _then(_SnFileContent(
+content: null == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
+as String,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/site_file.g.dart

@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'site_file.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnSiteFileEntry _$SnSiteFileEntryFromJson(Map<String, dynamic> json) =>
+    _SnSiteFileEntry(
+      isDirectory: json['is_directory'] as bool,
+      relativePath: json['relative_path'] as String,
+      size: (json['size'] as num).toInt(),
+      modified: DateTime.parse(json['modified'] as String),
+    );
+
+Map<String, dynamic> _$SnSiteFileEntryToJson(_SnSiteFileEntry instance) =>
+    <String, dynamic>{
+      'is_directory': instance.isDirectory,
+      'relative_path': instance.relativePath,
+      'size': instance.size,
+      'modified': instance.modified.toIso8601String(),
+    };
+
+_SnFileContent _$SnFileContentFromJson(Map<String, dynamic> json) =>
+    _SnFileContent(content: json['content'] as String);
+
+Map<String, dynamic> _$SnFileContentToJson(_SnFileContent instance) =>
+    <String, dynamic>{'content': instance.content};

lib/pods/chat/call.dart

@@ -212,8 +212,14 @@ class CallNotifier extends _$CallNotifier {
   String? _roomId;
   String? get roomId => _roomId;
 
-  Future<void> joinRoom(String roomId) async {
-    if (_roomId == roomId && _room != null) {
+  SnChatRoom? _chatRoom;
+  SnChatRoom? get chatRoom => _chatRoom;
+
+  Future<void> joinRoom(SnChatRoom room) async {
+    var roomId = room.id;
+    if (_roomId == roomId &&
+        _room != null &&
+        _room?.connectionState == lk.ConnectionState.connected) {
       talker.info('[Call] Call skipped. Already has data');
       return;
     } else if (_room != null) {
@@ -223,6 +229,7 @@ class CallNotifier extends _$CallNotifier {
       }
     }
     _roomId = roomId;
+    _chatRoom = room;
     if (_room != null) {
       await _room!.disconnect();
       await _room!.dispose();
@@ -355,6 +362,7 @@ class CallNotifier extends _$CallNotifier {
               sourceId: source.id,
               maxFrameRate: 30.0,
               captureScreenAudio: true,
+              useiOSBroadcastExtension: true,
             ),
           );
           await _localParticipant!.publishVideoTrack(track);

lib/pods/chat/call.g.dart

@@ -6,7 +6,7 @@ part of 'call.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$callNotifierHash() => r'a8ca3f625c0db3ad9992033ae70864ce15efc281';
+String _$callNotifierHash() => r'ef4e3e9c9d411cf9dce1ceb456a3b866b2c87db3';
 
 /// See also [CallNotifier].
 @ProviderFor(CallNotifier)

lib/pods/chat/chat_summary.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+import 'dart:math' as math;
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:island/models/chat.dart';
 import 'package:island/pods/network.dart';
@@ -6,6 +8,58 @@ import 'package:island/pods/chat/chat_subscribe.dart';
 
 part 'chat_summary.g.dart';
 
+@riverpod
+class ChatUnreadCountNotifier extends _$ChatUnreadCountNotifier {
+  StreamSubscription<WebSocketPacket>? _subscription;
+
+  @override
+  Future<int> build() async {
+    // Subscribe to websocket events when this provider is built
+    _subscribeToWebSocket();
+
+    // Dispose the subscription when this provider is disposed
+    ref.onDispose(() {
+      _subscription?.cancel();
+    });
+
+    try {
+      final client = ref.read(apiClientProvider);
+      final response = await client.get('/sphere/chat/unread');
+      return (response.data as num).toInt();
+    } catch (_) {
+      return 0;
+    }
+  }
+
+  void _subscribeToWebSocket() {
+    final webSocketService = ref.read(websocketProvider);
+    _subscription = webSocketService.dataStream.listen((packet) {
+      if (packet.type == 'messages.new' && packet.data != null) {
+        final message = SnChatMessage.fromJson(packet.data!);
+        final currentSubscribed = ref.read(currentSubscribedChatIdProvider);
+        // Only increment if the message is not from the currently subscribed chat
+        if (message.chatRoomId != currentSubscribed) {
+          _incrementCounter();
+        }
+      }
+    });
+  }
+
+  Future<void> _incrementCounter() async {
+    final current = await future;
+    state = AsyncData(current + 1);
+  }
+
+  Future<void> decrement(int count) async {
+    final current = await future;
+    state = AsyncData(math.max(current - count, 0));
+  }
+
+  void clear() async {
+    state = AsyncData(0);
+  }
+}
+
 @riverpod
 class ChatSummary extends _$ChatSummary {
   @override
@@ -41,6 +95,14 @@ class ChatSummary extends _$ChatSummary {
     state.whenData((summaries) {
       final summary = summaries[chatId];
       if (summary != null) {
+        // Decrement global unread count
+        final unreadToDecrement = summary.unreadCount;
+        if (unreadToDecrement > 0) {
+          ref
+              .read(chatUnreadCountNotifierProvider.notifier)
+              .decrement(unreadToDecrement);
+        }
+
         state = AsyncData({
           ...summaries,
           chatId: SnChatSummary(

lib/pods/chat/chat_summary.g.dart

@@ -6,6 +6,24 @@ part of 'chat_summary.dart';
 // RiverpodGenerator
 // **************************************************************************
 
+String _$chatUnreadCountNotifierHash() =>
+    r'b8d93589dc37f772d4c3a07d9afd81c37026e57d';
+
+/// See also [ChatUnreadCountNotifier].
+@ProviderFor(ChatUnreadCountNotifier)
+final chatUnreadCountNotifierProvider =
+    AutoDisposeAsyncNotifierProvider<ChatUnreadCountNotifier, int>.internal(
+      ChatUnreadCountNotifier.new,
+      name: r'chatUnreadCountNotifierProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$chatUnreadCountNotifierHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+typedef _$ChatUnreadCountNotifier = AutoDisposeAsyncNotifier<int>;
 String _$chatSummaryHash() => r'33815a3bd81d20902b7063e8194fe336930df9b4';
 
 /// See also [ChatSummary].

lib/pods/chat/messages_notifier.dart

@@ -45,6 +45,7 @@ class MessagesNotifier extends _$MessagesNotifier {
   bool _isSyncing = false;
   bool _isJumping = false;
   bool _isUpdatingState = false;
+  bool _allRemoteMessagesFetched = false;
   DateTime? _lastPauseTime;
 
   late final Future<SnAccount?> Function(String) _fetchAccount;
@@ -278,6 +279,7 @@ class MessagesNotifier extends _$MessagesNotifier {
     }
 
     if (offset >= _totalCount!) {
+      _allRemoteMessagesFetched = true;
       return [];
     }
 
@@ -299,10 +301,7 @@ class MessagesNotifier extends _$MessagesNotifier {
         }).toList();
 
     for (final message in messages) {
-      await _database.saveMessage(_database.messageToCompanion(message));
-      if (message.sender != null) {
-        await _database.saveMember(message.sender!); // Save/update member data
-      }
+      await _database.saveMessageWithSender(message);
       if (message.nonce != null) {
         _pendingMessages.removeWhere(
           (_, pendingMsg) => pendingMsg.nonce == message.nonce,
@@ -310,6 +309,11 @@ class MessagesNotifier extends _$MessagesNotifier {
       }
     }
 
+    // Check if we've fetched all remote messages
+    if (offset + messages.length >= _totalCount!) {
+      _allRemoteMessagesFetched = true;
+    }
+
     return messages;
   }
 
@@ -319,6 +323,7 @@ class MessagesNotifier extends _$MessagesNotifier {
       return;
     }
     _isSyncing = true;
+    _allRemoteMessagesFetched = false;
 
     talker.log('Starting message sync');
     Future.microtask(() => ref.read(isSyncingProvider.notifier).state = true);
@@ -346,19 +351,48 @@ class MessagesNotifier extends _$MessagesNotifier {
         return;
       }
 
-      final resp = await _apiClient.post(
-        '/sphere/chat/${_room.id}/sync',
-        data: {
-          'last_sync_timestamp':
-              lastMessage.toRemoteMessage().updatedAt.millisecondsSinceEpoch,
-        },
-      );
+      // Sync with pagination support using timestamp-based cursor
+      int? totalMessages;
+      int syncedCount = 0;
+      int lastSyncTimestamp =
+          lastMessage.toRemoteMessage().updatedAt.millisecondsSinceEpoch;
 
-      final response = MessageSyncResponse.fromJson(resp.data);
-      talker.log('Sync response: ${response.messages.length} changes');
-      for (final message in response.messages) {
-        await receiveMessage(message);
-      }
+      do {
+        final resp = await _apiClient.post(
+          '/sphere/chat/${_room.id}/sync',
+          data: {'last_sync_timestamp': lastSyncTimestamp},
+        );
+
+        // Read total count from header on first request
+        if (totalMessages == null) {
+          totalMessages = int.parse(
+            resp.headers['x-total']?.firstOrNull ?? '0',
+          );
+          talker.log('Total messages to sync: $totalMessages');
+        }
+
+        final response = MessageSyncResponse.fromJson(resp.data);
+        final messagesCount = response.messages.length;
+        talker.log(
+          'Sync page: synced=$syncedCount/$totalMessages, count=$messagesCount',
+        );
+
+        for (final message in response.messages) {
+          await receiveMessage(message);
+        }
+
+        syncedCount += messagesCount;
+
+        // Update cursor to the last message's createdAt for next page
+        if (response.messages.isNotEmpty) {
+          lastSyncTimestamp =
+              response.messages.last.createdAt.millisecondsSinceEpoch;
+        }
+
+        // Continue if there are more messages to fetch
+      } while (syncedCount < totalMessages);
+
+      talker.log('Sync complete: synced $syncedCount messages');
     } catch (err, stackTrace) {
       talker.log(
         'Error syncing messages',
@@ -397,14 +431,35 @@ class MessagesNotifier extends _$MessagesNotifier {
         withAttachments: _withAttachments,
       );
 
-      if (localMessages.isNotEmpty) {
+      // If we have local messages AND we've fetched all remote messages, return local
+      if (localMessages.isNotEmpty && _allRemoteMessagesFetched) {
         return localMessages;
       }
 
+      // If we haven't fetched all remote messages, check remote even if we have local
+      // OR if we have no local messages at all
       if (_searchQuery == null || _searchQuery!.isEmpty) {
-        return await _fetchAndCacheMessages(offset: offset, take: take);
+        final remoteMessages = await _fetchAndCacheMessages(
+          offset: offset,
+          take: take,
+        );
+
+        // If we got remote messages, re-fetch from cache to get merged result
+        if (remoteMessages.isNotEmpty) {
+          return await _getCachedMessages(
+            offset: offset,
+            take: take,
+            searchQuery: _searchQuery,
+            withLinks: _withLinks,
+            withAttachments: _withAttachments,
+          );
+        }
+
+        // No remote messages, return local (if any)
+        return localMessages;
       } else {
-        return []; // If searching, and no local messages, don't fetch from network
+        // For search queries, return local only
+        return localMessages;
       }
     } catch (e) {
       final localMessages = await _getCachedMessages(
@@ -424,6 +479,7 @@ class MessagesNotifier extends _$MessagesNotifier {
 
   Future<void> loadInitial() async {
     talker.log('Loading initial messages');
+    _allRemoteMessagesFetched = false;
     if (_searchQuery == null || _searchQuery!.isEmpty) {
       syncMessages();
     }
@@ -445,6 +501,7 @@ class MessagesNotifier extends _$MessagesNotifier {
     if (!_hasMore || state is AsyncLoading) return;
     talker.log('Loading more messages');
 
+    Future.microtask(() => ref.read(isSyncingProvider.notifier).state = true);
     try {
       final currentMessages = state.value ?? [];
       final offset = currentMessages.length;
@@ -466,6 +523,10 @@ class MessagesNotifier extends _$MessagesNotifier {
         stackTrace: stackTrace,
       );
       showErrorAlert(err);
+    } finally {
+      Future.microtask(
+        () => ref.read(isSyncingProvider.notifier).state = false,
+      );
     }
   }
 
@@ -501,8 +562,7 @@ class MessagesNotifier extends _$MessagesNotifier {
 
     _pendingMessages[localMessage.id] = localMessage;
     _fileUploadProgress[localMessage.id] = {};
-    await _database.saveMessage(_database.messageToCompanion(localMessage));
-    await _database.saveMember(mockMessage.sender);
+    await _database.saveMessageWithSender(localMessage);
 
     final currentMessages = state.value ?? [];
     state = AsyncValue.data([localMessage, ...currentMessages]);
@@ -553,7 +613,7 @@ class MessagesNotifier extends _$MessagesNotifier {
 
       _pendingMessages.remove(localMessage.id);
       await _database.deleteMessage(localMessage.id);
-      await _database.saveMessage(_database.messageToCompanion(updatedMessage));
+      await _database.saveMessageWithSender(updatedMessage);
 
       final currentMessages = state.value ?? [];
       if (editingTo != null) {
@@ -635,7 +695,7 @@ class MessagesNotifier extends _$MessagesNotifier {
 
       _pendingMessages.remove(pendingMessageId);
       await _database.deleteMessage(pendingMessageId);
-      await _database.saveMessage(_database.messageToCompanion(updatedMessage));
+      await _database.saveMessageWithSender(updatedMessage);
 
       final newMessages =
           (state.value ?? []).map((m) {
@@ -692,7 +752,7 @@ class MessagesNotifier extends _$MessagesNotifier {
       );
     }
 
-    await _database.saveMessage(_database.messageToCompanion(localMessage));
+    await _database.saveMessageWithSender(localMessage);
 
     final currentMessages = state.value ?? [];
     final existingIndex = currentMessages.indexWhere(
@@ -789,7 +849,7 @@ class MessagesNotifier extends _$MessagesNotifier {
       messageToUpdate.status,
     );
 
-    await _database.saveMessage(_database.messageToCompanion(deletedMessage));
+    await _database.saveMessageWithSender(deletedMessage);
 
     if (messageIndex != -1) {
       final newList = [...currentMessages];
@@ -913,6 +973,7 @@ class MessagesNotifier extends _$MessagesNotifier {
     _searchQuery = null;
     _withLinks = null;
     _withAttachments = null;
+    _allRemoteMessagesFetched = false;
     loadInitial();
   }
 
@@ -938,7 +999,7 @@ class MessagesNotifier extends _$MessagesNotifier {
         MessageStatus.sent,
       );
 
-      await _database.saveMessage(_database.messageToCompanion(message));
+      await _database.saveMessageWithSender(message);
       return message;
     } catch (e) {
       if (e is DioException) return null;

lib/pods/chat/messages_notifier.g.dart

@@ -6,7 +6,7 @@ part of 'messages_notifier.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$messagesNotifierHash() => r'fc9c99024a0801efa4894f250aea8bdc6127a0b6';
+String _$messagesNotifierHash() => r'27ce32c54e317a04e1d554ed4a70a24e4503fdd1';
 
 /// Copied from Dart SDK
 class _SystemHash {

lib/pods/file_references.g.dart

@@ -6,7 +6,7 @@ part of 'file_references.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$fileReferencesHash() => r'464562fbdc9452d8a5ffbd2d9d9343cdb43f1876';
+String _$fileReferencesHash() => r'd66c678c221f61978bdb242b98e6dbe31d0c204b';
 
 /// Copied from Dart SDK
 class _SystemHash {

lib/pods/site_files.dart

@@ -0,0 +1,159 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:dio/dio.dart';
+import 'package:http_parser/http_parser.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:island/models/site_file.dart';
+import 'package:island/pods/network.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'site_files.g.dart';
+
+@riverpod
+Future<List<SnSiteFileEntry>> siteFiles(
+  Ref ref, {
+  required String siteId,
+  String? path,
+}) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final queryParams = path != null ? {'path': path} : null;
+  final resp = await apiClient.get(
+    '/zone/sites/$siteId/files',
+    queryParameters: queryParams,
+  );
+  final data = resp.data as List<dynamic>;
+  return data.map((json) => SnSiteFileEntry.fromJson(json)).toList();
+}
+
+@riverpod
+Future<SnFileContent> siteFileContent(
+  Ref ref, {
+  required String siteId,
+  required String relativePath,
+}) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final resp = await apiClient.get(
+    '/zone/sites/$siteId/files/content/$relativePath',
+  );
+  final content =
+      resp.data is String
+          ? resp.data
+          : SnFileContent.fromJson(resp.data).content;
+  return SnFileContent(content: content);
+}
+
+@riverpod
+Future<String> siteFileContentRaw(
+  Ref ref, {
+  required String siteId,
+  required String relativePath,
+}) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final resp = await apiClient.get(
+    '/zone/sites/$siteId/files/content/$relativePath',
+  );
+  return resp.data is String ? resp.data : resp.data['content'] as String;
+}
+
+class SiteFilesNotifier
+    extends
+        AutoDisposeFamilyAsyncNotifier<
+          List<SnSiteFileEntry>,
+          ({String siteId, String? path})
+        > {
+  @override
+  Future<List<SnSiteFileEntry>> build(
+    ({String siteId, String? path}) arg,
+  ) async {
+    return fetchFiles();
+  }
+
+  Future<List<SnSiteFileEntry>> fetchFiles() async {
+    try {
+      final apiClient = ref.read(apiClientProvider);
+      final queryParams = arg.path != null ? {'path': arg.path} : null;
+      final resp = await apiClient.get(
+        '/zone/sites/${arg.siteId}/files',
+        queryParameters: queryParams,
+      );
+      final data = resp.data as List<dynamic>;
+      return data.map((json) => SnSiteFileEntry.fromJson(json)).toList();
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  Future<void> uploadFile(File file, String filePath) async {
+    state = const AsyncValue.loading();
+    try {
+      final apiClient = ref.read(apiClientProvider);
+
+      // Create multipart form data
+      final formData = FormData.fromMap({
+        'filePath': filePath,
+        'file': await MultipartFile.fromFile(
+          file.path,
+          filename: file.path.split('/').last,
+          contentType: MediaType('application', 'octet-stream'),
+        ),
+      });
+
+      await apiClient.post(
+        '/zone/sites/${arg.siteId}/files/upload',
+        data: formData,
+      );
+
+      // Refresh the files list
+      ref.invalidate(siteFilesProvider(siteId: arg.siteId, path: arg.path));
+    } catch (error, stackTrace) {
+      state = AsyncValue.error(error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> updateFileContent(String relativePath, String newContent) async {
+    state = const AsyncValue.loading();
+    try {
+      final apiClient = ref.read(apiClientProvider);
+      await apiClient.put(
+        '/zone/sites/${arg.siteId}/files/edit/$relativePath',
+        data: {'new_content': newContent},
+      );
+
+      // Refresh the files list
+      ref.invalidate(siteFilesProvider(siteId: arg.siteId, path: arg.path));
+    } catch (error, stackTrace) {
+      state = AsyncValue.error(error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteFile(String relativePath) async {
+    state = const AsyncValue.loading();
+    try {
+      final apiClient = ref.read(apiClientProvider);
+      await apiClient.delete(
+        '/zone/sites/${arg.siteId}/files/delete/$relativePath',
+      );
+
+      // Refresh the files list
+      ref.invalidate(siteFilesProvider(siteId: arg.siteId, path: arg.path));
+    } catch (error, stackTrace) {
+      state = AsyncValue.error(error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> createDirectory(String directoryPath) async {
+    // For directories, we upload a dummy file first then delete it or create through upload
+    // Actually, according to API docs, directories are created when uploading files to them
+    // So we'll just invalidate to refresh the list
+    ref.invalidate(siteFilesProvider(siteId: arg.siteId, path: arg.path));
+  }
+}
+
+final siteFilesNotifierProvider = AsyncNotifierProvider.autoDispose.family<
+  SiteFilesNotifier,
+  List<SnSiteFileEntry>,
+  ({String siteId, String? path})
+>(SiteFilesNotifier.new);

lib/pods/site_files.g.dart

@@ -0,0 +1,451 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'site_files.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$siteFilesHash() => r'd4029e6c160edcd454eb39ef1c19427b7f95a8d8';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [siteFiles].
+@ProviderFor(siteFiles)
+const siteFilesProvider = SiteFilesFamily();
+
+/// See also [siteFiles].
+class SiteFilesFamily extends Family<AsyncValue<List<SnSiteFileEntry>>> {
+  /// See also [siteFiles].
+  const SiteFilesFamily();
+
+  /// See also [siteFiles].
+  SiteFilesProvider call({required String siteId, String? path}) {
+    return SiteFilesProvider(siteId: siteId, path: path);
+  }
+
+  @override
+  SiteFilesProvider getProviderOverride(covariant SiteFilesProvider provider) {
+    return call(siteId: provider.siteId, path: provider.path);
+  }
+
+  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'siteFilesProvider';
+}
+
+/// See also [siteFiles].
+class SiteFilesProvider
+    extends AutoDisposeFutureProvider<List<SnSiteFileEntry>> {
+  /// See also [siteFiles].
+  SiteFilesProvider({required String siteId, String? path})
+    : this._internal(
+        (ref) => siteFiles(ref as SiteFilesRef, siteId: siteId, path: path),
+        from: siteFilesProvider,
+        name: r'siteFilesProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$siteFilesHash,
+        dependencies: SiteFilesFamily._dependencies,
+        allTransitiveDependencies: SiteFilesFamily._allTransitiveDependencies,
+        siteId: siteId,
+        path: path,
+      );
+
+  SiteFilesProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.siteId,
+    required this.path,
+  }) : super.internal();
+
+  final String siteId;
+  final String? path;
+
+  @override
+  Override overrideWith(
+    FutureOr<List<SnSiteFileEntry>> Function(SiteFilesRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SiteFilesProvider._internal(
+        (ref) => create(ref as SiteFilesRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        siteId: siteId,
+        path: path,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<List<SnSiteFileEntry>> createElement() {
+    return _SiteFilesProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SiteFilesProvider &&
+        other.siteId == siteId &&
+        other.path == path;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, siteId.hashCode);
+    hash = _SystemHash.combine(hash, path.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SiteFilesRef on AutoDisposeFutureProviderRef<List<SnSiteFileEntry>> {
+  /// The parameter `siteId` of this provider.
+  String get siteId;
+
+  /// The parameter `path` of this provider.
+  String? get path;
+}
+
+class _SiteFilesProviderElement
+    extends AutoDisposeFutureProviderElement<List<SnSiteFileEntry>>
+    with SiteFilesRef {
+  _SiteFilesProviderElement(super.provider);
+
+  @override
+  String get siteId => (origin as SiteFilesProvider).siteId;
+  @override
+  String? get path => (origin as SiteFilesProvider).path;
+}
+
+String _$siteFileContentHash() => r'b594ad4f8c54555e742ece94ee001092cb2f83d1';
+
+/// See also [siteFileContent].
+@ProviderFor(siteFileContent)
+const siteFileContentProvider = SiteFileContentFamily();
+
+/// See also [siteFileContent].
+class SiteFileContentFamily extends Family<AsyncValue<SnFileContent>> {
+  /// See also [siteFileContent].
+  const SiteFileContentFamily();
+
+  /// See also [siteFileContent].
+  SiteFileContentProvider call({
+    required String siteId,
+    required String relativePath,
+  }) {
+    return SiteFileContentProvider(siteId: siteId, relativePath: relativePath);
+  }
+
+  @override
+  SiteFileContentProvider getProviderOverride(
+    covariant SiteFileContentProvider provider,
+  ) {
+    return call(siteId: provider.siteId, relativePath: provider.relativePath);
+  }
+
+  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'siteFileContentProvider';
+}
+
+/// See also [siteFileContent].
+class SiteFileContentProvider extends AutoDisposeFutureProvider<SnFileContent> {
+  /// See also [siteFileContent].
+  SiteFileContentProvider({
+    required String siteId,
+    required String relativePath,
+  }) : this._internal(
+         (ref) => siteFileContent(
+           ref as SiteFileContentRef,
+           siteId: siteId,
+           relativePath: relativePath,
+         ),
+         from: siteFileContentProvider,
+         name: r'siteFileContentProvider',
+         debugGetCreateSourceHash:
+             const bool.fromEnvironment('dart.vm.product')
+                 ? null
+                 : _$siteFileContentHash,
+         dependencies: SiteFileContentFamily._dependencies,
+         allTransitiveDependencies:
+             SiteFileContentFamily._allTransitiveDependencies,
+         siteId: siteId,
+         relativePath: relativePath,
+       );
+
+  SiteFileContentProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.siteId,
+    required this.relativePath,
+  }) : super.internal();
+
+  final String siteId;
+  final String relativePath;
+
+  @override
+  Override overrideWith(
+    FutureOr<SnFileContent> Function(SiteFileContentRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SiteFileContentProvider._internal(
+        (ref) => create(ref as SiteFileContentRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        siteId: siteId,
+        relativePath: relativePath,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<SnFileContent> createElement() {
+    return _SiteFileContentProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SiteFileContentProvider &&
+        other.siteId == siteId &&
+        other.relativePath == relativePath;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, siteId.hashCode);
+    hash = _SystemHash.combine(hash, relativePath.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SiteFileContentRef on AutoDisposeFutureProviderRef<SnFileContent> {
+  /// The parameter `siteId` of this provider.
+  String get siteId;
+
+  /// The parameter `relativePath` of this provider.
+  String get relativePath;
+}
+
+class _SiteFileContentProviderElement
+    extends AutoDisposeFutureProviderElement<SnFileContent>
+    with SiteFileContentRef {
+  _SiteFileContentProviderElement(super.provider);
+
+  @override
+  String get siteId => (origin as SiteFileContentProvider).siteId;
+  @override
+  String get relativePath => (origin as SiteFileContentProvider).relativePath;
+}
+
+String _$siteFileContentRawHash() =>
+    r'd0331c30698a9f4b90fe9b79273ff5914fa46616';
+
+/// See also [siteFileContentRaw].
+@ProviderFor(siteFileContentRaw)
+const siteFileContentRawProvider = SiteFileContentRawFamily();
+
+/// See also [siteFileContentRaw].
+class SiteFileContentRawFamily extends Family<AsyncValue<String>> {
+  /// See also [siteFileContentRaw].
+  const SiteFileContentRawFamily();
+
+  /// See also [siteFileContentRaw].
+  SiteFileContentRawProvider call({
+    required String siteId,
+    required String relativePath,
+  }) {
+    return SiteFileContentRawProvider(
+      siteId: siteId,
+      relativePath: relativePath,
+    );
+  }
+
+  @override
+  SiteFileContentRawProvider getProviderOverride(
+    covariant SiteFileContentRawProvider provider,
+  ) {
+    return call(siteId: provider.siteId, relativePath: provider.relativePath);
+  }
+
+  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'siteFileContentRawProvider';
+}
+
+/// See also [siteFileContentRaw].
+class SiteFileContentRawProvider extends AutoDisposeFutureProvider<String> {
+  /// See also [siteFileContentRaw].
+  SiteFileContentRawProvider({
+    required String siteId,
+    required String relativePath,
+  }) : this._internal(
+         (ref) => siteFileContentRaw(
+           ref as SiteFileContentRawRef,
+           siteId: siteId,
+           relativePath: relativePath,
+         ),
+         from: siteFileContentRawProvider,
+         name: r'siteFileContentRawProvider',
+         debugGetCreateSourceHash:
+             const bool.fromEnvironment('dart.vm.product')
+                 ? null
+                 : _$siteFileContentRawHash,
+         dependencies: SiteFileContentRawFamily._dependencies,
+         allTransitiveDependencies:
+             SiteFileContentRawFamily._allTransitiveDependencies,
+         siteId: siteId,
+         relativePath: relativePath,
+       );
+
+  SiteFileContentRawProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.siteId,
+    required this.relativePath,
+  }) : super.internal();
+
+  final String siteId;
+  final String relativePath;
+
+  @override
+  Override overrideWith(
+    FutureOr<String> Function(SiteFileContentRawRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SiteFileContentRawProvider._internal(
+        (ref) => create(ref as SiteFileContentRawRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        siteId: siteId,
+        relativePath: relativePath,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<String> createElement() {
+    return _SiteFileContentRawProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SiteFileContentRawProvider &&
+        other.siteId == siteId &&
+        other.relativePath == relativePath;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, siteId.hashCode);
+    hash = _SystemHash.combine(hash, relativePath.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SiteFileContentRawRef on AutoDisposeFutureProviderRef<String> {
+  /// The parameter `siteId` of this provider.
+  String get siteId;
+
+  /// The parameter `relativePath` of this provider.
+  String get relativePath;
+}
+
+class _SiteFileContentRawProviderElement
+    extends AutoDisposeFutureProviderElement<String>
+    with SiteFileContentRawRef {
+  _SiteFileContentRawProviderElement(super.provider);
+
+  @override
+  String get siteId => (origin as SiteFileContentRawProvider).siteId;
+  @override
+  String get relativePath =>
+      (origin as SiteFileContentRawProvider).relativePath;
+}
+
+// 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/pods/site_pages.dart

@@ -0,0 +1,116 @@
+import 'dart:async';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:island/models/publication_site.dart';
+import 'package:island/pods/network.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'site_pages.g.dart';
+
+@riverpod
+Future<List<SnPublicationPage>> sitePages(
+  Ref ref,
+  String pubName,
+  String siteSlug,
+) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final resp = await apiClient.get('/zone/sites/$pubName/$siteSlug/pages');
+  final data = resp.data as List<dynamic>;
+  return data.map((json) => SnPublicationPage.fromJson(json)).toList();
+}
+
+@riverpod
+Future<SnPublicationPage> sitePage(Ref ref, String pageId) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final resp = await apiClient.get('/zone/sites/pages/$pageId');
+  return SnPublicationPage.fromJson(resp.data);
+}
+
+class SitePagesNotifier
+    extends
+        AutoDisposeFamilyAsyncNotifier<
+          List<SnPublicationPage>,
+          ({String pubName, String siteSlug})
+        > {
+  @override
+  Future<List<SnPublicationPage>> build(
+    ({String pubName, String siteSlug}) arg,
+  ) async {
+    return fetchPages();
+  }
+
+  Future<List<SnPublicationPage>> fetchPages() async {
+    try {
+      final apiClient = ref.read(apiClientProvider);
+      final resp = await apiClient.get(
+        '/zone/sites/${arg.pubName}/${arg.siteSlug}/pages',
+      );
+      final data = resp.data as List<dynamic>;
+      return data.map((json) => SnPublicationPage.fromJson(json)).toList();
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  Future<SnPublicationPage?> createPage(Map<String, dynamic> pageData) async {
+    state = const AsyncValue.loading();
+    try {
+      final apiClient = ref.read(apiClientProvider);
+      final resp = await apiClient.post(
+        '/zone/sites/${arg.pubName}/${arg.siteSlug}/pages',
+        data: pageData,
+      );
+      final newPage = SnPublicationPage.fromJson(resp.data);
+
+      // Refresh the pages list
+      ref.invalidate(sitePagesProvider(arg.pubName, arg.siteSlug));
+
+      return newPage;
+    } catch (error, stackTrace) {
+      state = AsyncValue.error(error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<SnPublicationPage?> updatePage(
+    String pageId,
+    Map<String, dynamic> pageData,
+  ) async {
+    state = const AsyncValue.loading();
+    try {
+      final apiClient = ref.read(apiClientProvider);
+      final resp = await apiClient.patch(
+        '/zone/sites/pages/$pageId',
+        data: pageData,
+      );
+      final updatedPage = SnPublicationPage.fromJson(resp.data);
+
+      // Refresh the pages list
+      ref.invalidate(sitePagesProvider(arg.pubName, arg.siteSlug));
+
+      return updatedPage;
+    } catch (error, stackTrace) {
+      state = AsyncValue.error(error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> deletePage(String pageId) async {
+    state = const AsyncValue.loading();
+    try {
+      final apiClient = ref.read(apiClientProvider);
+      await apiClient.delete('/zone/sites/pages/$pageId');
+
+      // Refresh the pages list
+      ref.invalidate(sitePagesProvider(arg.pubName, arg.siteSlug));
+    } catch (error, stackTrace) {
+      state = AsyncValue.error(error, stackTrace);
+      rethrow;
+    }
+  }
+}
+
+final sitePagesNotifierProvider = AsyncNotifierProvider.autoDispose.family<
+  SitePagesNotifier,
+  List<SnPublicationPage>,
+  ({String pubName, String siteSlug})
+>(SitePagesNotifier.new);

lib/pods/site_pages.g.dart

@@ -0,0 +1,280 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'site_pages.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$sitePagesHash() => r'5e084e9694ad665e9b238c6a747c6c6e99c5eb03';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [sitePages].
+@ProviderFor(sitePages)
+const sitePagesProvider = SitePagesFamily();
+
+/// See also [sitePages].
+class SitePagesFamily extends Family<AsyncValue<List<SnPublicationPage>>> {
+  /// See also [sitePages].
+  const SitePagesFamily();
+
+  /// See also [sitePages].
+  SitePagesProvider call(String pubName, String siteSlug) {
+    return SitePagesProvider(pubName, siteSlug);
+  }
+
+  @override
+  SitePagesProvider getProviderOverride(covariant SitePagesProvider provider) {
+    return call(provider.pubName, provider.siteSlug);
+  }
+
+  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'sitePagesProvider';
+}
+
+/// See also [sitePages].
+class SitePagesProvider
+    extends AutoDisposeFutureProvider<List<SnPublicationPage>> {
+  /// See also [sitePages].
+  SitePagesProvider(String pubName, String siteSlug)
+    : this._internal(
+        (ref) => sitePages(ref as SitePagesRef, pubName, siteSlug),
+        from: sitePagesProvider,
+        name: r'sitePagesProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$sitePagesHash,
+        dependencies: SitePagesFamily._dependencies,
+        allTransitiveDependencies: SitePagesFamily._allTransitiveDependencies,
+        pubName: pubName,
+        siteSlug: siteSlug,
+      );
+
+  SitePagesProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.pubName,
+    required this.siteSlug,
+  }) : super.internal();
+
+  final String pubName;
+  final String siteSlug;
+
+  @override
+  Override overrideWith(
+    FutureOr<List<SnPublicationPage>> Function(SitePagesRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SitePagesProvider._internal(
+        (ref) => create(ref as SitePagesRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        pubName: pubName,
+        siteSlug: siteSlug,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<List<SnPublicationPage>> createElement() {
+    return _SitePagesProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SitePagesProvider &&
+        other.pubName == pubName &&
+        other.siteSlug == siteSlug;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, pubName.hashCode);
+    hash = _SystemHash.combine(hash, siteSlug.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SitePagesRef on AutoDisposeFutureProviderRef<List<SnPublicationPage>> {
+  /// The parameter `pubName` of this provider.
+  String get pubName;
+
+  /// The parameter `siteSlug` of this provider.
+  String get siteSlug;
+}
+
+class _SitePagesProviderElement
+    extends AutoDisposeFutureProviderElement<List<SnPublicationPage>>
+    with SitePagesRef {
+  _SitePagesProviderElement(super.provider);
+
+  @override
+  String get pubName => (origin as SitePagesProvider).pubName;
+  @override
+  String get siteSlug => (origin as SitePagesProvider).siteSlug;
+}
+
+String _$sitePageHash() => r'542f70c5b103fe34d7cf7eb0821d52f017022efc';
+
+/// See also [sitePage].
+@ProviderFor(sitePage)
+const sitePageProvider = SitePageFamily();
+
+/// See also [sitePage].
+class SitePageFamily extends Family<AsyncValue<SnPublicationPage>> {
+  /// See also [sitePage].
+  const SitePageFamily();
+
+  /// See also [sitePage].
+  SitePageProvider call(String pageId) {
+    return SitePageProvider(pageId);
+  }
+
+  @override
+  SitePageProvider getProviderOverride(covariant SitePageProvider provider) {
+    return call(provider.pageId);
+  }
+
+  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'sitePageProvider';
+}
+
+/// See also [sitePage].
+class SitePageProvider extends AutoDisposeFutureProvider<SnPublicationPage> {
+  /// See also [sitePage].
+  SitePageProvider(String pageId)
+    : this._internal(
+        (ref) => sitePage(ref as SitePageRef, pageId),
+        from: sitePageProvider,
+        name: r'sitePageProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$sitePageHash,
+        dependencies: SitePageFamily._dependencies,
+        allTransitiveDependencies: SitePageFamily._allTransitiveDependencies,
+        pageId: pageId,
+      );
+
+  SitePageProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.pageId,
+  }) : super.internal();
+
+  final String pageId;
+
+  @override
+  Override overrideWith(
+    FutureOr<SnPublicationPage> Function(SitePageRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: SitePageProvider._internal(
+        (ref) => create(ref as SitePageRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        pageId: pageId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<SnPublicationPage> createElement() {
+    return _SitePageProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SitePageProvider && other.pageId == pageId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, pageId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SitePageRef on AutoDisposeFutureProviderRef<SnPublicationPage> {
+  /// The parameter `pageId` of this provider.
+  String get pageId;
+}
+
+class _SitePageProviderElement
+    extends AutoDisposeFutureProviderElement<SnPublicationPage>
+    with SitePageRef {
+  _SitePageProviderElement(super.provider);
+
+  @override
+  String get pageId => (origin as SitePageProvider).pageId;
+}
+
+// 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/pods/sites.dart

@@ -0,0 +1,88 @@
+import 'dart:async';
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:island/models/publication_site.dart';
+import 'package:island/pods/network.dart';
+
+class SiteNotifier
+    extends
+        AutoDisposeFamilyAsyncNotifier<
+          SnPublicationSite,
+          ({String pubName, String? siteId})
+        > {
+  @override
+  FutureOr<SnPublicationSite> build(
+    ({String pubName, String? siteId}) arg,
+  ) async {
+    if (arg.siteId == null || arg.siteId!.isEmpty) {
+      return SnPublicationSite(
+        id: '',
+        slug: '',
+        name: '',
+        publisherId: arg.pubName,
+        accountId: '',
+        createdAt: DateTime.now(),
+        updatedAt: DateTime.now(),
+        pages: [],
+      );
+    }
+
+    try {
+      final client = ref.read(apiClientProvider);
+      final response = await client.get('/sphere/sites/${arg.siteId}');
+      return SnPublicationSite.fromJson(response.data);
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  Future<void> saveSite(SnPublicationSite site) async {
+    state = const AsyncValue.loading();
+    try {
+      final client = ref.read(apiClientProvider);
+      final url = '/sphere/sites';
+
+      final response =
+          site.id.isEmpty
+              ? await client.post(url, data: site.toJson())
+              : await client.patch('$url/${site.id}', data: site.toJson());
+
+      state = AsyncValue.data(SnPublicationSite.fromJson(response.data));
+    } catch (error, stackTrace) {
+      state = AsyncValue.error(error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteSite() async {
+    final siteId = arg.siteId;
+    if (siteId == null || siteId.isEmpty) return;
+
+    state = const AsyncValue.loading();
+    try {
+      final client = ref.read(apiClientProvider);
+      await client.delete('/sphere/sites/$siteId');
+      state = AsyncValue.data(
+        SnPublicationSite(
+          id: '',
+          slug: '',
+          name: '',
+          publisherId: arg.pubName,
+          accountId: '',
+          createdAt: DateTime.now(),
+          updatedAt: DateTime.now(),
+          pages: [],
+        ),
+      );
+    } catch (error, stackTrace) {
+      state = AsyncValue.error(error, stackTrace);
+      rethrow;
+    }
+  }
+}
+
+final siteNotifierProvider = AsyncNotifierProvider.autoDispose.family<
+  SiteNotifier,
+  SnPublicationSite,
+  ({String pubName, String? siteId})
+>(SiteNotifier.new);

lib/pods/userinfo.dart

@@ -5,7 +5,8 @@ import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_platform_alert/flutter_platform_alert.dart';
+import 'package:flutter/material.dart';
+import 'package:island/widgets/alert.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/account.dart';
@@ -36,41 +37,65 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
     } catch (error, stackTrace) {
       if (!kIsWeb) {
         if (error is DioException) {
-          FlutterPlatformAlert.showCustomAlert(
-            windowTitle: 'failedToLoadUserInfo'.tr(),
-            text: [
-              (error.response?.statusCode == 401
-                      ? 'failedToLoadUserInfoUnauthorized'
-                      : 'failedToLoadUserInfoNetwork')
-                  .tr()
-                  .trim(),
-              '',
-              '${error.response?.statusCode ?? 'Network Error'}',
-              if (error.response?.headers != null) error.response?.headers,
-              if (error.response?.data != null)
-                jsonEncode(error.response?.data),
-            ].join('\n'),
-            iconStyle: IconStyle.error,
-            neutralButtonTitle: 'retry'.tr(),
-            negativeButtonTitle: 'okay'.tr(),
+          showOverlayDialog<bool>(
+            builder:
+                (context, close) => AlertDialog(
+                  title: Text('failedToLoadUserInfo'.tr()),
+                  content: Text(
+                    [
+                      (error.response?.statusCode == 401
+                              ? 'failedToLoadUserInfoUnauthorized'
+                              : 'failedToLoadUserInfoNetwork')
+                          .tr()
+                          .trim(),
+                      '',
+                      '${error.response?.statusCode ?? 'Network Error'}',
+                      if (error.response?.headers != null)
+                        error.response?.headers,
+                      if (error.response?.data != null)
+                        jsonEncode(error.response?.data),
+                    ].join('\n'),
+                  ),
+                  actions: [
+                    TextButton(
+                      onPressed: () => close(false),
+                      child: Text('okay'.tr()),
+                    ),
+                    TextButton(
+                      onPressed: () => close(true),
+                      child: Text('retry'.tr()),
+                    ),
+                  ],
+                ),
           ).then((value) {
-            if (value == CustomButton.neutralButton) {
+            if (value == true) {
               fetchUser();
             }
           });
         }
-        FlutterPlatformAlert.showCustomAlert(
-          windowTitle: 'failedToLoadUserInfo'.tr(),
-          text:
-              [
-                'failedToLoadUserInfoNetwork'.tr(),
-                error.toString(),
-              ].join('\n\n').trim(),
-          iconStyle: IconStyle.error,
-          neutralButtonTitle: 'retry'.tr(),
-          negativeButtonTitle: 'okay'.tr(),
+        showOverlayDialog<bool>(
+          builder:
+              (context, close) => AlertDialog(
+                title: Text('failedToLoadUserInfo'.tr()),
+                content: Text(
+                  [
+                    'failedToLoadUserInfoNetwork'.tr(),
+                    error.toString(),
+                  ].join('\n\n').trim(),
+                ),
+                actions: [
+                  TextButton(
+                    onPressed: () => close(false),
+                    child: Text('okay'.tr()),
+                  ),
+                  TextButton(
+                    onPressed: () => close(true),
+                    child: Text('retry'.tr()),
+                  ),
+                ],
+              ),
         ).then((value) {
-          if (value == CustomButton.neutralButton) {
+          if (value == true) {
             fetchUser();
           }
         });

lib/route.dart

@@ -32,7 +32,6 @@ import 'package:island/screens/account/me/account_settings.dart';
 import 'package:island/screens/chat/chat.dart';
 import 'package:island/screens/chat/room.dart';
 import 'package:island/screens/chat/room_detail.dart';
-import 'package:island/screens/chat/call.dart';
 import 'package:island/screens/chat/search_messages.dart';
 import 'package:island/screens/thought/think.dart';
 import 'package:island/screens/creators/hub.dart';
@@ -43,6 +42,8 @@ import 'package:island/screens/stickers/pack_detail.dart';
 import 'package:island/screens/discovery/feeds/feed_marketplace.dart';
 import 'package:island/screens/discovery/feeds/feed_detail.dart';
 import 'package:island/screens/creators/poll/poll_list.dart';
+import 'package:island/screens/creators/sites/site_detail.dart';
+import 'package:island/screens/creators/sites/site_list.dart';
 import 'package:island/screens/creators/webfeed/webfeed_list.dart';
 import 'package:island/screens/posts/compose.dart';
 import 'package:island/screens/posts/compose_article.dart';
@@ -117,14 +118,6 @@ final routerProvider = Provider<GoRouter>((ref) {
               return ArticleEditScreen(id: id);
             },
           ),
-          GoRoute(
-            name: 'chatCall',
-            path: '/chat/:id/call',
-            builder: (context, state) {
-              final id = state.pathParameters['id']!;
-              return CallScreen(roomId: id);
-            },
-          ),
           GoRoute(
             name: 'logs',
             path: '/logs',
@@ -484,6 +477,29 @@ final routerProvider = Provider<GoRouter>((ref) {
                       return CreatorPollListScreen(pubName: name);
                     },
                   ),
+                  // Site list route
+                  GoRoute(
+                    name: 'creatorSites',
+                    path: ':name/sites',
+                    builder: (context, state) {
+                      final name = state.pathParameters['name']!;
+                      return CreatorSiteListScreen(pubName: name);
+                    },
+                    routes: [
+                      GoRoute(
+                        name: 'creatorSiteDetail',
+                        path: ':siteSlug',
+                        builder: (context, state) {
+                          final name = state.pathParameters['name']!;
+                          final siteSlug = state.pathParameters['siteSlug']!;
+                          return PublicationSiteDetailScreen(
+                            siteSlug: siteSlug,
+                            pubName: name,
+                          );
+                        },
+                      ),
+                    ],
+                  ),
 
                   GoRoute(
                     name: 'creatorStickers',

lib/screens/about.dart

@@ -384,9 +384,7 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
               icon: const Icon(Symbols.content_copy, size: 16),
               onPressed: () {
                 Clipboard.setData(ClipboardData(text: value));
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(content: Text('copiedToClipboard'.tr())),
-                );
+                showSnackBar('copiedToClipboard'.tr());
               },
               padding: EdgeInsets.zero,
               constraints: const BoxConstraints(),

lib/screens/account/me/account_settings.dart

@@ -62,6 +62,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
       final confirm = await showConfirmAlert(
         'accountDeletionHint'.tr(),
         'accountDeletion'.tr(),
+        isDanger: true,
       );
       if (!confirm || !context.mounted) return;
       try {

lib/screens/account/me/settings_auth_factors.dart

@@ -26,6 +26,7 @@ class AuthFactorSheet extends HookConsumerWidget {
       final confirm = await showConfirmAlert(
         'authFactorDeleteHint'.tr(),
         'authFactorDelete'.tr(),
+        isDanger: true,
       );
       if (!confirm || !context.mounted) return;
       try {

lib/screens/account/me/settings_connections.dart

@@ -82,6 +82,7 @@ class AccountConnectionSheet extends HookConsumerWidget {
       final confirm = await showConfirmAlert(
         'accountConnectionDeleteHint'.tr(),
         'accountConnectionDelete'.tr(),
+        isDanger: true,
       );
       if (!confirm || !context.mounted) return;
       try {
@@ -332,6 +333,7 @@ class AccountConnectionsSheet extends HookConsumerWidget {
                               final confirm = await showConfirmAlert(
                                 'accountConnectionDeleteHint'.tr(),
                                 'accountConnectionDelete'.tr(),
+                                isDanger: true,
                               );
                               if (confirm && context.mounted) {
                                 try {

lib/screens/account/me/settings_contacts.dart

@@ -20,6 +20,7 @@ class ContactMethodSheet extends HookConsumerWidget {
       final confirm = await showConfirmAlert(
         'contactMethodDeleteHint'.tr(),
         'contactMethodDelete'.tr(),
+        isDanger: true,
       );
       if (!confirm || !context.mounted) return;
       try {

lib/screens/auth/captcha.native.dart

@@ -6,11 +6,12 @@ import 'package:island/widgets/content/sheet.dart';
 
 class CaptchaScreen extends ConsumerWidget {
   static Future<String?> show(BuildContext context) {
-    return showModalBottomSheet<String>(
-      context: context,
-      isScrollControlled: true,
-      isDismissible: false,
-      builder: (context) => const CaptchaScreen(),
+    return Navigator.push<String>(
+      context,
+      MaterialPageRoute(
+        builder: (context) => const CaptchaScreen(),
+        fullscreenDialog: true,
+      ),
     );
   }
 

lib/screens/auth/captcha.web.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: invalid_runtime_check_with_js_interop_types
-
 import 'dart:ui_web' as ui;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/config.dart';
@@ -10,11 +8,12 @@ import 'package:flutter/material.dart';
 
 class CaptchaScreen extends ConsumerStatefulWidget {
   static Future<String?> show(BuildContext context) {
-    return showModalBottomSheet<String>(
-      context: context,
-      isDismissible: false,
-      isScrollControlled: true,
-      builder: (context) => const CaptchaScreen(),
+    return Navigator.push<String>(
+      context,
+      MaterialPageRoute(
+        builder: (context) => const CaptchaScreen(),
+        fullscreenDialog: true,
+      ),
     );
   }
 
@@ -29,7 +28,9 @@ class _CaptchaScreenState extends ConsumerState<CaptchaScreen> {
 
   void _setupWebListener(String serverUrl) async {
     web.window.onMessage.listen((event) {
+      // ignore: invalid_runtime_check_with_js_interop_types
       if (event.data != null && event.data is String) {
+        // ignore: invalid_runtime_check_with_js_interop_types
         final message = event.data as String;
         if (message.startsWith("captcha_tk=")) {
           String token = message.replaceFirst("captcha_tk=", "");

lib/screens/chat/call.dart

@@ -3,30 +3,31 @@ import 'package:flutter/material.dart' hide ConnectionState;
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/chat.dart';
 import 'package:island/pods/chat/call.dart';
 import 'package:island/talker.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/chat/call_button.dart';
+import 'package:island/widgets/chat/call_content.dart';
 import 'package:island/widgets/chat/call_overlay.dart';
 import 'package:island/widgets/chat/call_participant_tile.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:livekit_client/livekit_client.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:styled_widget/styled_widget.dart';
 
 class CallScreen extends HookConsumerWidget {
-  final String roomId;
-  const CallScreen({super.key, required this.roomId});
+  final SnChatRoom room;
+  const CallScreen({super.key, required this.room});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final ongoingCall = ref.watch(ongoingCallProvider(roomId));
+    final ongoingCall = ref.watch(ongoingCallProvider(room.id));
     final callState = ref.watch(callNotifierProvider);
     final callNotifier = ref.watch(callNotifierProvider.notifier);
 
     useEffect(() {
       talker.info('[Call] Joining the call...');
-      callNotifier.joinRoom(roomId).catchError((_) {
+      callNotifier.joinRoom(room).catchError((_) {
         showConfirmAlert(
           'Seems there already has a call connected, do you want override it?',
           'Call already connected',
@@ -35,7 +36,7 @@ class CallScreen extends HookConsumerWidget {
           talker.info('[Call] Joining the call... with overrides');
           callNotifier.disconnect();
           callNotifier.dispose();
-          callNotifier.joinRoom(roomId);
+          callNotifier.joinRoom(room);
         });
       });
       return null;
@@ -110,7 +111,7 @@ class CallScreen extends HookConsumerWidget {
                         onPressed: () {
                           callNotifier.disconnect();
                           callNotifier.dispose();
-                          callNotifier.joinRoom(roomId);
+                          callNotifier.joinRoom(room);
                         },
                         child: Text('retry').tr(),
                       ),
@@ -120,72 +121,7 @@ class CallScreen extends HookConsumerWidget {
               )
               : Column(
                 children: [
-                  Expanded(
-                    child: Builder(
-                      builder: (context) {
-                        if (!callState.isConnected) {
-                          return const Center(
-                            child: CircularProgressIndicator(),
-                          );
-                        }
-                        if (callNotifier.participants.isEmpty) {
-                          return const Center(
-                            child: Text('No participants in call'),
-                          );
-                        }
-
-                        final participants = callNotifier.participants;
-                        if (allAudioOnly) {
-                          // Audio-only: show avatars in a compact row
-                          return Center(
-                            child: SingleChildScrollView(
-                              scrollDirection: Axis.horizontal,
-                              child: Wrap(
-                                crossAxisAlignment: WrapCrossAlignment.center,
-                                alignment: WrapAlignment.center,
-                                spacing: 8,
-                                runSpacing: 8,
-                                children: [
-                                  for (final live in participants)
-                                    SpeakingRippleAvatar(
-                                      live: live,
-                                      size: 72,
-                                    ).padding(horizontal: 4),
-                                ],
-                              ),
-                            ),
-                          );
-                        }
-
-                        // Stage view: show main speaker(s) large, others in row
-                        final mainSpeakers =
-                            participants
-                                .where(
-                                  (p) => p
-                                      .remoteParticipant
-                                      .trackPublications
-                                      .values
-                                      .any(
-                                        (pub) =>
-                                            pub.track != null &&
-                                            pub.kind == TrackType.VIDEO,
-                                      ),
-                                )
-                                .toList();
-                        if (mainSpeakers.isEmpty && participants.isNotEmpty) {
-                          mainSpeakers.add(participants.first);
-                        }
-                        return Column(
-                          children: [
-                            for (final speaker in mainSpeakers)
-                              Expanded(
-                                child: CallParticipantTile(live: speaker),
-                              ),
-                          ],
-                        );
-                      },
-                    ),
-                  ),
+                  Expanded(child: CallContent()),
                   CallControlsBar(),
                   Gap(MediaQuery.of(context).padding.bottom + 16),
                 ],

lib/screens/chat/chat.dart

@@ -11,7 +11,6 @@ import 'package:island/models/chat.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/account.dart';
 import 'package:island/pods/database.dart';
-import 'package:island/pods/chat/call.dart';
 import 'package:island/pods/chat/chat_summary.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
@@ -28,6 +27,7 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:relative_time/relative_time.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:super_sliver_list/super_sliver_list.dart';
 
 part 'chat.g.dart';
 
@@ -289,7 +289,6 @@ class ChatListBodyWidget extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final chats = ref.watch(chatroomsJoinedProvider);
-    final callState = ref.watch(callNotifierProvider);
 
     Widget bodyWidget = Column(
       children: [
@@ -314,10 +313,8 @@ class ChatListBodyWidget extends HookConsumerWidget {
                       () => Future.sync(() {
                         ref.invalidate(chatroomsJoinedProvider);
                       }),
-                  child: ListView.builder(
-                    padding: EdgeInsets.only(
-                      bottom: callState.isConnected ? 96 : 0,
-                    ),
+                  child: SuperListView.builder(
+                    padding: EdgeInsets.only(bottom: 96),
                     itemCount:
                         items
                             .where(

lib/screens/chat/chat.g.dart

@@ -6,7 +6,7 @@ part of 'chat.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$chatroomsJoinedHash() => r'3bb6389af07e81007680484d04bf5fe6f6c10571';
+String _$chatroomsJoinedHash() => r'9523efecd1869e7dd26adfc8ec87be48db19ee1c';
 
 /// See also [chatroomsJoined].
 @ProviderFor(chatroomsJoined)

lib/screens/chat/room.dart

@@ -39,6 +39,7 @@ import "package:island/widgets/chat/chat_input.dart";
 import "package:island/widgets/chat/chat_link_attachments.dart";
 import "package:island/widgets/chat/public_room_preview.dart";
 import "package:island/screens/thought/think_sheet.dart";
+import "package:island/screens/chat/widgets/message_item_wrapper.dart";
 
 class ChatRoomScreen extends HookConsumerWidget {
   final String id;
@@ -178,6 +179,38 @@ class ChatRoomScreen extends HookConsumerWidget {
     final isSelectionMode = useState<bool>(false);
     final selectedMessages = useState<Set<String>>({});
 
+    final roomOpenTime = useMemoized(() => DateTime.now());
+
+    final onMessageAction = useCallback(
+      (String action, LocalChatMessage message) {
+        switch (action) {
+          case MessageItemAction.delete:
+            messagesNotifier.deleteMessage(message.id);
+          case MessageItemAction.edit:
+            messageEditingTo.value = message.toRemoteMessage();
+            messageController.text = messageEditingTo.value?.content ?? '';
+            attachments.value =
+                messageEditingTo.value!.attachments
+                    .map((e) => UniversalFile.fromAttachment(e))
+                    .toList();
+          case MessageItemAction.forward:
+            messageForwardingTo.value = message.toRemoteMessage();
+          case MessageItemAction.reply:
+            messageReplyingTo.value = message.toRemoteMessage();
+          case MessageItemAction.resend:
+            messagesNotifier.retryMessage(message.id);
+        }
+      },
+      [
+        messagesNotifier,
+        messageEditingTo,
+        messageController,
+        attachments,
+        messageForwardingTo,
+        messageReplyingTo,
+      ],
+    );
+
     var isLoading = false;
     var isScrollingToMessage = false; // Flag to prevent scroll conflicts
 
@@ -627,7 +660,6 @@ class ChatRoomScreen extends HookConsumerWidget {
       duration: const Duration(milliseconds: 200),
       curve: Curves.easeOut,
       padding: EdgeInsets.only(
-        top: 16,
         bottom: MediaQuery.of(context).padding.bottom + 8 + inputHeight.value,
       ),
       child: SuperListView.builder(
@@ -659,138 +691,30 @@ class ChatRoomScreen extends HookConsumerWidget {
 
           final key = Key('$messageKeyPrefix${message.nonce ?? message.id}');
 
-          final messageWidget = chatIdentity.when(
-            skipError: true,
-            data:
-                (identity) => GestureDetector(
-                  onLongPress: () {
-                    if (!isSelectionMode.value) {
-                      toggleSelectionMode();
-                      toggleMessageSelection(message.id);
-                    }
-                  },
-                  onTap: () {
-                    if (isSelectionMode.value) {
-                      toggleMessageSelection(message.id);
-                    }
-                  },
-                  child: Container(
-                    color:
-                        selectedMessages.value.contains(message.id)
-                            ? Theme.of(
-                              context,
-                            ).colorScheme.primaryContainer.withOpacity(0.3)
-                            : null,
-                    child: Stack(
-                      children: [
-                        MessageItem(
-                          key: settings.disableAnimation ? key : null,
-                          message: message,
-                          isCurrentUser: identity?.id == message.senderId,
-                          onAction:
-                              isSelectionMode.value
-                                  ? null
-                                  : (action) {
-                                    switch (action) {
-                                      case MessageItemAction.delete:
-                                        messagesNotifier.deleteMessage(
-                                          message.id,
-                                        );
-                                      case MessageItemAction.edit:
-                                        messageEditingTo.value =
-                                            message.toRemoteMessage();
-                                        messageController.text =
-                                            messageEditingTo.value?.content ??
-                                            '';
-                                        attachments.value =
-                                            messageEditingTo.value!.attachments
-                                                .map(
-                                                  (e) =>
-                                                      UniversalFile.fromAttachment(
-                                                        e,
-                                                      ),
-                                                )
-                                                .toList();
-                                      case MessageItemAction.forward:
-                                        messageForwardingTo.value =
-                                            message.toRemoteMessage();
-                                      case MessageItemAction.reply:
-                                        messageReplyingTo.value =
-                                            message.toRemoteMessage();
-                                      case MessageItemAction.resend:
-                                        messagesNotifier.retryMessage(
-                                          message.id,
-                                        );
-                                    }
-                                  },
-                          onJump:
-                              (messageId) => scrollToMessage(
-                                messageId: messageId,
-                                messageList: messageList,
-                                messagesNotifier: messagesNotifier,
-                                listController: listController,
-                                scrollController: scrollController,
-                                ref: ref,
-                              ),
-                          progress: attachmentProgress.value[message.id],
-                          showAvatar: isLastInGroup,
-                          isSelectionMode: isSelectionMode.value,
-                          isSelected: selectedMessages.value.contains(
-                            message.id,
-                          ),
-                          onToggleSelection: toggleMessageSelection,
-                          onEnterSelectionMode: () {
-                            if (!isSelectionMode.value) toggleSelectionMode();
-                          },
-                        ),
-                        if (selectedMessages.value.contains(message.id))
-                          Positioned(
-                            top: 8,
-                            right: 8,
-                            child: Container(
-                              width: 16,
-                              height: 16,
-                              decoration: BoxDecoration(
-                                color: Theme.of(context).colorScheme.primary,
-                                shape: BoxShape.circle,
-                              ),
-                              child: Icon(
-                                Icons.check,
-                                size: 12,
-                                color: Theme.of(context).colorScheme.onPrimary,
-                              ),
-                            ),
-                          ),
-                      ],
-                    ),
-                  ),
+          return MessageItemWrapper(
+            key: key,
+            message: message,
+            index: index,
+            isLastInGroup: isLastInGroup,
+            isSelectionMode: isSelectionMode.value,
+            selectedMessages: selectedMessages.value,
+            chatIdentity: chatIdentity,
+            toggleSelectionMode: toggleSelectionMode,
+            toggleMessageSelection: toggleMessageSelection,
+            onMessageAction: onMessageAction,
+            onJump:
+                (messageId) => scrollToMessage(
+                  messageId: messageId,
+                  messageList: messageList,
+                  messagesNotifier: messagesNotifier,
+                  listController: listController,
+                  scrollController: scrollController,
+                  ref: ref,
                 ),
-            loading:
-                () => MessageItem(
-                  message: message,
-                  isCurrentUser: false,
-                  onAction: null,
-                  progress: null,
-                  showAvatar: false,
-                  onJump: (_) {},
-                ),
-            error: (_, _) => const SizedBox.shrink(),
+            attachmentProgress: attachmentProgress.value,
+            disableAnimation: settings.disableAnimation,
+            roomOpenTime: roomOpenTime,
           );
-
-          return settings.disableAnimation
-              ? messageWidget
-              : TweenAnimationBuilder<double>(
-                key: key,
-                tween: Tween<double>(begin: 0.0, end: 1.0),
-                duration: Duration(milliseconds: 400 + (index % 5) * 50),
-                curve: Curves.easeOutCubic,
-                builder:
-                    (context, animationValue, child) => Transform.translate(
-                      offset: Offset(0, 20 * (1 - animationValue)),
-                      child: Opacity(opacity: animationValue, child: child),
-                    ),
-                child: messageWidget,
-              );
         },
       ),
     );
@@ -814,7 +738,11 @@ class ChatRoomScreen extends HookConsumerWidget {
               ),
         ),
         actions: [
-          AudioCallButton(roomId: id),
+          chatRoom.when(
+            data: (data) => AudioCallButton(room: data!),
+            error: (err, _) => const SizedBox.shrink(),
+            loading: () => const SizedBox.shrink(),
+          ),
           IconButton(
             icon: const Icon(Icons.more_vert),
             onPressed: () async {
@@ -915,7 +843,14 @@ class ChatRoomScreen extends HookConsumerWidget {
             left: 0,
             right: 0,
             top: 0,
-            child: CallOverlayBar().padding(horizontal: 8, top: 12),
+            child: chatRoom.when(
+              data:
+                  (data) => CallOverlayBar(
+                    room: data!,
+                  ).padding(horizontal: 8, top: 12),
+              error: (_, _) => const SizedBox.shrink(),
+              loading: () => const SizedBox.shrink(),
+            ),
           ),
           if (isSyncing)
             Positioned(

lib/screens/chat/room_detail.dart

@@ -487,6 +487,7 @@ class _ChatRoomActionMenu extends HookConsumerWidget {
                   showConfirmAlert(
                     'deleteChatRoomHint'.tr(),
                     'deleteChatRoom'.tr(),
+                    isDanger: true,
                   ).then((confirm) async {
                     if (confirm) {
                       final client = ref.watch(apiClientProvider);

lib/screens/chat/widgets/message_item_wrapper.dart

@@ -0,0 +1,169 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import 'package:island/database/message.dart';
+import 'package:island/models/chat.dart';
+import 'package:island/widgets/chat/message_item.dart';
+
+// Provider to track animated messages to prevent replay
+final animatedMessagesProvider = StateProvider<Set<String>>((ref) => {});
+
+class MessageItemWrapper extends HookConsumerWidget {
+  final LocalChatMessage message;
+  final int index;
+  final bool isLastInGroup;
+  final bool isSelectionMode;
+  final Set<String> selectedMessages;
+  final AsyncValue<SnChatMember?> chatIdentity;
+  final VoidCallback toggleSelectionMode;
+  final Function(String) toggleMessageSelection;
+  final Function(String, LocalChatMessage) onMessageAction;
+  final Function(String) onJump;
+  final Map<String, Map<int, double?>> attachmentProgress;
+  final bool disableAnimation;
+  final DateTime roomOpenTime;
+
+  const MessageItemWrapper({
+    super.key,
+    required this.message,
+    required this.index,
+    required this.isLastInGroup,
+    required this.isSelectionMode,
+    required this.selectedMessages,
+    required this.chatIdentity,
+    required this.toggleSelectionMode,
+    required this.toggleMessageSelection,
+    required this.onMessageAction,
+    required this.onJump,
+    required this.attachmentProgress,
+    required this.disableAnimation,
+    required this.roomOpenTime,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    // Animation logic
+    final animatedMessages = ref.watch(animatedMessagesProvider);
+    final isNewMessage = message.createdAt.isAfter(roomOpenTime);
+    final hasAnimated = animatedMessages.contains(message.id);
+
+    // Only animate if:
+    // 1. Animation is enabled
+    // 2. Message is new (created after room open)
+    // 3. Has not animated yet
+    final shouldAnimate = !disableAnimation && isNewMessage && !hasAnimated;
+
+    final child = chatIdentity.when(
+      skipError: true,
+      data: (identity) => _buildContent(context, identity),
+      loading: () => _buildLoading(),
+      error: (_, _) => const SizedBox.shrink(),
+    );
+
+    if (!shouldAnimate) {
+      return child;
+    }
+
+    return TweenAnimationBuilder<double>(
+      key: ValueKey('anim-${message.id}'), // Ensure unique key for animation
+      tween: Tween<double>(begin: 0.0, end: 1.0),
+      duration: Duration(milliseconds: 400 + (index % 5) * 50),
+      curve: Curves.easeOutCubic,
+      builder: (context, value, child) {
+        return Transform.translate(
+          offset: Offset(0, 20 * (1 - value)),
+          child: Opacity(opacity: value, child: child),
+        );
+      },
+      onEnd: () {
+        // Mark as animated
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          ref
+              .read(animatedMessagesProvider.notifier)
+              .update((state) => {...state, message.id});
+        });
+      },
+      child: child,
+    );
+  }
+
+  Widget _buildContent(BuildContext context, SnChatMember? identity) {
+    final isSelected = selectedMessages.contains(message.id);
+    final isCurrentUser = identity?.id == message.senderId;
+
+    return GestureDetector(
+      onLongPress: () {
+        if (!isSelectionMode) {
+          toggleSelectionMode();
+          toggleMessageSelection(message.id);
+        }
+      },
+      onTap: () {
+        if (isSelectionMode) {
+          toggleMessageSelection(message.id);
+        }
+      },
+      child: Container(
+        color:
+            isSelected
+                ? Theme.of(
+                  context,
+                ).colorScheme.primaryContainer.withOpacity(0.3)
+                : null,
+        child: Stack(
+          children: [
+            MessageItem(
+              // If animation is disabled, we might want to pass a key to maintain state?
+              // But here we are inside the wrapper.
+              key: ValueKey('item-${message.id}'),
+              message: message,
+              isCurrentUser: isCurrentUser,
+              onAction:
+                  isSelectionMode
+                      ? null
+                      : (action) => onMessageAction(action, message),
+              onJump: onJump,
+              progress: attachmentProgress[message.id],
+              showAvatar: isLastInGroup,
+              isSelectionMode: isSelectionMode,
+              isSelected: isSelected,
+              onToggleSelection: toggleMessageSelection,
+              onEnterSelectionMode: () {
+                if (!isSelectionMode) toggleSelectionMode();
+              },
+            ),
+            if (isSelected)
+              Positioned(
+                top: 8,
+                right: 8,
+                child: Container(
+                  width: 16,
+                  height: 16,
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.primary,
+                    shape: BoxShape.circle,
+                  ),
+                  child: Icon(
+                    Icons.check,
+                    size: 12,
+                    color: Theme.of(context).colorScheme.onPrimary,
+                  ),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLoading() {
+    return MessageItem(
+      message: message,
+      isCurrentUser: false,
+      onAction: null,
+      progress: null,
+      showAvatar: false,
+      onJump: (_) {},
+    );
+  }
+}

lib/screens/creators/hub.dart

@@ -304,16 +304,18 @@ class CreatorHubScreen extends HookConsumerWidget {
     }
 
     void deletePublisher() {
-      showConfirmAlert('deletePublisherHint'.tr(), 'deletePublisher'.tr()).then(
-        (confirm) {
-          if (confirm) {
-            final client = ref.watch(apiClientProvider);
-            client.delete('/sphere/publishers/${currentPublisher.value!.name}');
-            ref.invalidate(publishersManagedProvider);
-            currentPublisher.value = null;
-          }
-        },
-      );
+      showConfirmAlert(
+        'deletePublisherHint'.tr(),
+        'deletePublisher'.tr(),
+        isDanger: true,
+      ).then((confirm) {
+        if (confirm) {
+          final client = ref.watch(apiClientProvider);
+          client.delete('/sphere/publishers/${currentPublisher.value!.name}');
+          ref.invalidate(publishersManagedProvider);
+          currentPublisher.value = null;
+        }
+      });
     }
 
     final List<DropdownMenuItem<SnPublisher>> publishersMenu = publishers.when(
@@ -403,6 +405,21 @@ class CreatorHubScreen extends HookConsumerWidget {
             );
           },
         ),
+        ListTile(
+          shape: RoundedRectangleBorder(
+            borderRadius: const BorderRadius.all(Radius.circular(8)),
+          ),
+          minTileHeight: 48,
+          title: Text('publicationSites').tr(),
+          trailing: const Icon(Symbols.chevron_right),
+          leading: const Icon(Symbols.web),
+          onTap: () {
+            context.pushNamed(
+              'creatorSites',
+              pathParameters: {'name': currentPublisher.value!.name},
+            );
+          },
+        ),
         ListTile(
           shape: RoundedRectangleBorder(
             borderRadius: const BorderRadius.all(Radius.circular(8)),
@@ -585,7 +602,7 @@ class CreatorHubScreen extends HookConsumerWidget {
                                     ).padding(horizontal: 12),
                                   buildNavigationWidget(true),
                                 ],
-                              )
+                              ).padding(vertical: 24)
                               : Column(
                                 spacing: 12,
                                 children: [
@@ -831,7 +848,7 @@ class _PublisherMemberListSheet extends HookConsumerWidget {
       try {
         final apiClient = ref.watch(apiClientProvider);
         await apiClient.post(
-          '/sphere/publishers/$publisherUname/invites',
+          '/sphere/publishers/invites/$publisherUname',
           data: {'related_user_id': result.id, 'role': 0},
         );
         // Refresh both providers
@@ -1119,7 +1136,7 @@ class _PublisherInviteSheet extends HookConsumerWidget {
       try {
         final client = ref.read(apiClientProvider);
         await client.post(
-          '/publishers/invites/${invite.publisher!.name}/accept',
+          '/sphere/publishers/invites/${invite.publisher!.name}/accept',
         );
         ref.invalidate(publisherInvitesProvider);
         ref.invalidate(publishersManagedProvider);
@@ -1132,7 +1149,7 @@ class _PublisherInviteSheet extends HookConsumerWidget {
       try {
         final client = ref.read(apiClientProvider);
         await client.post(
-          '/publishers/invites/${invite.publisher!.name}/decline',
+          '/sphere/publishers/invites/${invite.publisher!.name}/decline',
         );
         ref.invalidate(publisherInvitesProvider);
       } catch (err) {

lib/screens/creators/poll/poll_list.dart

@@ -5,6 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/poll.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/screens/poll/poll_editor.dart';
+import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/poll/poll_feedback.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -234,19 +235,9 @@ class _CreatorPollItem extends HookConsumerWidget {
                           '/sphere/polls/${pollWithStats.id}',
                         );
                         ref.invalidate(pollListNotifierProvider(pubName));
-                        if (context.mounted) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text('Poll deleted successfully'),
-                            ),
-                          );
-                        }
+                        showSnackBar('Poll deleted successfully');
                       } catch (e) {
-                        if (context.mounted) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(content: Text('Failed to delete poll')),
-                          );
-                        }
+                        showErrorAlert(e);
                       }
                     }
                   },

lib/screens/creators/sites/site_detail.dart

@@ -0,0 +1,161 @@
+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/publication_site.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/pods/site_pages.dart';
+import 'package:island/widgets/sites/page_form.dart';
+import 'package:island/widgets/sites/site_action_menu.dart';
+import 'package:island/widgets/sites/site_detail_content.dart';
+import 'package:island/widgets/sites/site_info_card.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:island/widgets/sites/pages_section.dart';
+import 'package:island/widgets/sites/file_management_section.dart';
+import 'package:island/widgets/sites/file_management_action_section.dart';
+import 'package:island/services/responsive.dart';
+import 'package:island/widgets/extended_refresh_indicator.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+part 'site_detail.g.dart';
+
+@riverpod
+Future<SnPublicationSite> publicationSiteDetail(
+  Ref ref,
+  String pubName,
+  String siteSlug,
+) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final resp = await apiClient.get('/zone/sites/$pubName/$siteSlug');
+  return SnPublicationSite.fromJson(resp.data);
+}
+
+class PublicationSiteDetailScreen extends HookConsumerWidget {
+  final String siteSlug;
+  final String pubName;
+
+  const PublicationSiteDetailScreen({
+    super.key,
+    required this.siteSlug,
+    required this.pubName,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final siteAsync = ref.watch(
+      publicationSiteDetailProvider(pubName, siteSlug),
+    );
+
+    return AppScaffold(
+      isNoBackground: false,
+      appBar: AppBar(
+        title: siteAsync.maybeWhen(
+          data: (site) => Text(site.name),
+          orElse: () => Text('siteDetails'.tr()),
+        ),
+        actions: [
+          siteAsync.maybeWhen(
+            data: (site) => SiteActionMenu(site: site, pubName: pubName),
+            orElse: () => const SizedBox.shrink(),
+          ),
+          const Gap(8),
+        ],
+      ),
+      body: siteAsync.when(
+        data: (site) {
+          if (isWideScreen(context)) {
+            return ExtendedRefreshIndicator(
+              onRefresh:
+                  () async => ref.invalidate(
+                    publicationSiteDetailProvider(pubName, site.slug),
+                  ),
+              child: Row(
+                spacing: 8,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Expanded(
+                    flex: 3,
+                    child: SingleChildScrollView(
+                      padding: const EdgeInsets.symmetric(vertical: 16),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          PagesSection(site: site, pubName: pubName),
+                          if (site.mode == 1) // Self-Managed only
+                            FileManagementSection(site: site, pubName: pubName),
+                        ],
+                      ),
+                    ),
+                  ),
+                  Expanded(
+                    flex: 2,
+                    child: SingleChildScrollView(
+                      padding: const EdgeInsets.symmetric(vertical: 16),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          SiteInfoCard(site: site),
+                          const Gap(8),
+                          if (site.mode == 1) // Self-Managed only
+                            FileManagementActionSection(
+                              site: site,
+                              pubName: pubName,
+                            ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ],
+              ).padding(horizontal: 12),
+            );
+          } else {
+            return SiteDetailContent(site: site, pubName: pubName);
+          }
+        },
+        error:
+            (error, stack) => Center(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text(
+                    'failedToLoadSite'.tr(),
+                    style: Theme.of(context).textTheme.headlineSmall,
+                  ),
+                  const Gap(16),
+                  Text(error.toString()),
+                  const Gap(24),
+                  ElevatedButton(
+                    onPressed:
+                        () => ref.invalidate(
+                          publicationSiteDetailProvider(pubName, siteSlug),
+                        ),
+                    child: Text('retry'.tr()),
+                  ),
+                ],
+              ),
+            ),
+        loading: () => const Center(child: CircularProgressIndicator()),
+      ),
+      floatingActionButton: siteAsync.maybeWhen(
+        data:
+            (site) => FloatingActionButton(
+              onPressed: () {
+                // Create new page
+                showModalBottomSheet(
+                  context: context,
+                  isScrollControlled: true,
+                  builder: (context) => PageForm(site: site, pubName: pubName),
+                ).then((_) {
+                  // Refresh pages after creation
+                  ref.invalidate(sitePagesProvider(pubName, site.slug));
+                });
+              },
+              child: const Icon(Symbols.add),
+            ),
+        orElse: () => null,
+      ),
+    );
+  }
+}

lib/screens/creators/sites/site_detail.g.dart

@@ -0,0 +1,173 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'site_detail.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$publicationSiteDetailHash() =>
+    r'e5d259ea39c4ba47e92d37e644fc3d84984927a9';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+/// See also [publicationSiteDetail].
+@ProviderFor(publicationSiteDetail)
+const publicationSiteDetailProvider = PublicationSiteDetailFamily();
+
+/// See also [publicationSiteDetail].
+class PublicationSiteDetailFamily
+    extends Family<AsyncValue<SnPublicationSite>> {
+  /// See also [publicationSiteDetail].
+  const PublicationSiteDetailFamily();
+
+  /// See also [publicationSiteDetail].
+  PublicationSiteDetailProvider call(String pubName, String siteSlug) {
+    return PublicationSiteDetailProvider(pubName, siteSlug);
+  }
+
+  @override
+  PublicationSiteDetailProvider getProviderOverride(
+    covariant PublicationSiteDetailProvider provider,
+  ) {
+    return call(provider.pubName, provider.siteSlug);
+  }
+
+  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'publicationSiteDetailProvider';
+}
+
+/// See also [publicationSiteDetail].
+class PublicationSiteDetailProvider
+    extends AutoDisposeFutureProvider<SnPublicationSite> {
+  /// See also [publicationSiteDetail].
+  PublicationSiteDetailProvider(String pubName, String siteSlug)
+    : this._internal(
+        (ref) => publicationSiteDetail(
+          ref as PublicationSiteDetailRef,
+          pubName,
+          siteSlug,
+        ),
+        from: publicationSiteDetailProvider,
+        name: r'publicationSiteDetailProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$publicationSiteDetailHash,
+        dependencies: PublicationSiteDetailFamily._dependencies,
+        allTransitiveDependencies:
+            PublicationSiteDetailFamily._allTransitiveDependencies,
+        pubName: pubName,
+        siteSlug: siteSlug,
+      );
+
+  PublicationSiteDetailProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.pubName,
+    required this.siteSlug,
+  }) : super.internal();
+
+  final String pubName;
+  final String siteSlug;
+
+  @override
+  Override overrideWith(
+    FutureOr<SnPublicationSite> Function(PublicationSiteDetailRef provider)
+    create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: PublicationSiteDetailProvider._internal(
+        (ref) => create(ref as PublicationSiteDetailRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        pubName: pubName,
+        siteSlug: siteSlug,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<SnPublicationSite> createElement() {
+    return _PublicationSiteDetailProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is PublicationSiteDetailProvider &&
+        other.pubName == pubName &&
+        other.siteSlug == siteSlug;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, pubName.hashCode);
+    hash = _SystemHash.combine(hash, siteSlug.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin PublicationSiteDetailRef
+    on AutoDisposeFutureProviderRef<SnPublicationSite> {
+  /// The parameter `pubName` of this provider.
+  String get pubName;
+
+  /// The parameter `siteSlug` of this provider.
+  String get siteSlug;
+}
+
+class _PublicationSiteDetailProviderElement
+    extends AutoDisposeFutureProviderElement<SnPublicationSite>
+    with PublicationSiteDetailRef {
+  _PublicationSiteDetailProviderElement(super.provider);
+
+  @override
+  String get pubName => (origin as PublicationSiteDetailProvider).pubName;
+  @override
+  String get siteSlug => (origin as PublicationSiteDetailProvider).siteSlug;
+}
+
+// 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/screens/creators/sites/site_edit.dart

@@ -0,0 +1,385 @@
+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/pods/network.dart';
+import 'package:island/screens/creators/sites/site_detail.dart';
+import 'package:island/screens/creators/sites/site_list.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:island/widgets/response.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class SiteForm extends HookConsumerWidget {
+  final String pubName;
+  final String? siteSlug;
+
+  const SiteForm({super.key, required this.pubName, this.siteSlug});
+
+  Widget _buildForm(
+    GlobalKey<FormState> formKey,
+    TextEditingController slugController,
+    TextEditingController nameController,
+    TextEditingController descriptionController,
+    ValueNotifier<int> modeController,
+    Function() saveSite,
+    Function() deleteSite,
+    String siteSlug,
+  ) {
+    final formFields = Column(
+      children: [
+        TextFormField(
+          controller: slugController,
+          decoration: InputDecoration(
+            labelText: 'siteSlug'.tr(),
+            hintText: 'siteSlugHint'.tr(),
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.all(Radius.circular(12)),
+            ),
+          ),
+          validator: (value) {
+            if (value == null || value.isEmpty) {
+              return 'siteSlugRequired'.tr();
+            }
+            final slugRegex = RegExp(r'^[a-z0-9]+(?:-[a-z0-9]+)*$');
+            if (!slugRegex.hasMatch(value)) {
+              return 'siteSlugInvalid'.tr();
+            }
+            return null;
+          },
+          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+        ),
+        const SizedBox(height: 16),
+        TextFormField(
+          controller: nameController,
+          decoration: InputDecoration(
+            labelText: 'siteName'.tr(),
+            hintText: 'siteNameHint'.tr(),
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.all(Radius.circular(12)),
+            ),
+          ),
+          validator: (value) {
+            if (value == null || value.isEmpty) {
+              return 'siteNameRequired'.tr();
+            }
+            return null;
+          },
+          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+        ),
+        const SizedBox(height: 16),
+        TextFormField(
+          controller: descriptionController,
+          decoration: InputDecoration(
+            labelText: 'description'.tr(),
+            alignLabelWithHint: true,
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.all(Radius.circular(12)),
+            ),
+          ),
+          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+          maxLines: 3,
+        ),
+        const SizedBox(height: 16),
+        DropdownButtonFormField<int>(
+          value: modeController.value,
+          decoration: InputDecoration(
+            labelText: 'siteMode'.tr(),
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.all(Radius.circular(12)),
+            ),
+          ),
+          items: [
+            DropdownMenuItem(
+              value: 0,
+              child: Text('siteModeFullyManaged'.tr()),
+            ),
+            DropdownMenuItem(value: 1, child: Text('siteModeSelfManaged'.tr())),
+          ],
+          onChanged: (value) {
+            if (value != null) {
+              modeController.value = value;
+            }
+          },
+        ),
+      ],
+    ).padding(all: 20);
+
+    return SheetScaffold(
+      titleText: 'editPublicationSite'.tr(),
+      child: Builder(
+        builder:
+            (context) => SingleChildScrollView(
+              child: Column(
+                children: [
+                  Form(key: formKey, child: formFields),
+                  Row(
+                    children: [
+                      TextButton.icon(
+                        onPressed: deleteSite,
+                        icon: const Icon(Symbols.delete_forever),
+                        label: Text('deletePublicationSite'.tr()),
+                        style: TextButton.styleFrom(
+                          foregroundColor: Colors.red,
+                        ),
+                      ).alignment(Alignment.centerRight),
+                      const Spacer(),
+                      TextButton.icon(
+                        onPressed: saveSite,
+                        icon: const Icon(Symbols.save),
+                        label: Text('saveChanges').tr(),
+                      ),
+                    ],
+                  ).padding(horizontal: 20, vertical: 12),
+                ],
+              ),
+            ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final formKey = useMemoized(() => GlobalKey<FormState>());
+    final slugController = useTextEditingController();
+    final nameController = useTextEditingController();
+    final descriptionController = useTextEditingController();
+    final modeController = useState<int>(0); // Default to fully managed (0)
+    final isLoading = useState(false);
+
+    final saveSite = useCallback(() async {
+      if (!formKey.currentState!.validate()) return;
+
+      isLoading.value = true;
+
+      try {
+        final client = ref.read(apiClientProvider);
+        final url = '/zone/sites/$pubName';
+        final payload = <String, dynamic>{
+          'slug': slugController.text,
+          'name': nameController.text,
+          'mode': modeController.value,
+          if (descriptionController.text.isNotEmpty)
+            'description': descriptionController.text,
+        };
+
+        if (siteSlug != null) {
+          await client.patch('$url/$siteSlug', data: payload);
+        } else {
+          await client.post(url, data: payload);
+        }
+
+        // Refresh the site list
+        ref.invalidate(siteListNotifierProvider(pubName));
+
+        if (context.mounted) {
+          showSnackBar('publicationSiteSavedSuccess'.tr());
+          Navigator.pop(context);
+        }
+      } catch (e) {
+        showErrorAlert(e);
+      } finally {
+        isLoading.value = false;
+      }
+    }, [pubName, siteSlug, context]);
+
+    final deleteSite = useCallback(() async {
+      if (siteSlug == null) return; // Shouldn't happen for editing
+
+      final confirmed = await showConfirmAlert(
+        'publicationSiteDeleteConfirm'.tr(),
+        'deletePublicationSite'.tr(),
+        isDanger: true,
+      );
+      if (confirmed != true) return;
+
+      isLoading.value = true;
+
+      try {
+        final client = ref.read(apiClientProvider);
+        await client.delete('/zone/sites/$pubName/$siteSlug');
+
+        ref.invalidate(siteListNotifierProvider(pubName));
+
+        if (context.mounted) {
+          showSnackBar('publicationSiteDeletedSuccess'.tr());
+          Navigator.pop(context);
+        }
+      } catch (e) {
+        showErrorAlert(e);
+      } finally {
+        isLoading.value = false;
+      }
+    }, [pubName, siteSlug, context]);
+
+    // Use Riverpod provider for loading and error states for editing
+    if (siteSlug != null) {
+      final editingSiteSlug =
+          siteSlug!; // Assert non-null since we checked above
+      final siteAsync = ref.watch(
+        publicationSiteDetailProvider(pubName, editingSiteSlug),
+      );
+
+      // Initialize form fields when site data is loaded
+      useEffect(() {
+        if (siteAsync.value != null && nameController.text.isEmpty) {
+          final site = siteAsync.value!;
+          slugController.text = site.slug;
+          nameController.text = site.name;
+          descriptionController.text = site.description ?? '';
+          modeController.value = site.mode ?? 0;
+        }
+        return null;
+      }, [siteAsync]);
+
+      // Handle loading and error states for editing using AsyncValue
+      return siteAsync.when(
+        data:
+            (_) => _buildForm(
+              formKey,
+              slugController,
+              nameController,
+              descriptionController,
+              modeController,
+              saveSite,
+              deleteSite,
+              editingSiteSlug,
+            ),
+        loading:
+            () => SheetScaffold(
+              titleText: 'editPublicationSite'.tr(),
+              child: Center(child: CircularProgressIndicator()),
+            ),
+        error:
+            (error, _) => SheetScaffold(
+              titleText: 'editPublicationSite'.tr(),
+              child: ResponseErrorWidget(
+                error: error.toString(),
+                onRetry: () {
+                  ref.invalidate(
+                    publicationSiteDetailProvider(pubName, editingSiteSlug),
+                  );
+                },
+              ),
+            ),
+      );
+    }
+
+    // For new sites, directly show the form
+
+    final formFields = Column(
+      children: [
+        TextFormField(
+          controller: slugController,
+          decoration: const InputDecoration(
+            labelText: 'Slug',
+            hintText: 'my-site',
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.all(Radius.circular(12)),
+            ),
+          ),
+          validator: (value) {
+            if (value == null || value.isEmpty) {
+              return 'Please enter a slug';
+            }
+            final slugRegex = RegExp(r'^[a-z0-9]+(?:-[a-z0-9]+)*$');
+            if (!slugRegex.hasMatch(value)) {
+              return 'Slug can only contain lowercase letters, numbers, and dashes';
+            }
+            return null;
+          },
+          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+        ),
+        const SizedBox(height: 16),
+        TextFormField(
+          controller: nameController,
+          decoration: const InputDecoration(
+            labelText: 'Site Name',
+            hintText: 'My Publication Site',
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.all(Radius.circular(12)),
+            ),
+          ),
+          validator: (value) {
+            if (value == null || value.isEmpty) {
+              return 'Please enter a site name';
+            }
+            return null;
+          },
+          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+        ),
+        const SizedBox(height: 16),
+        TextFormField(
+          controller: descriptionController,
+          decoration: const InputDecoration(
+            labelText: 'Description',
+            alignLabelWithHint: true,
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.all(Radius.circular(12)),
+            ),
+          ),
+          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+          maxLines: 3,
+        ),
+        const SizedBox(height: 16),
+        DropdownButtonFormField<int>(
+          value: modeController.value,
+          decoration: const InputDecoration(
+            labelText: 'Mode',
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.all(Radius.circular(12)),
+            ),
+          ),
+          items: [
+            DropdownMenuItem(
+              value: 0,
+              child: Text('siteModeFullyManaged'.tr()),
+            ),
+            DropdownMenuItem(value: 1, child: Text('siteModeSelfManaged'.tr())),
+          ],
+          onChanged: (value) {
+            if (value != null) {
+              modeController.value = value;
+            }
+          },
+        ),
+      ],
+    ).padding(all: 20);
+
+    final saveButton = TextButton.icon(
+      onPressed: isLoading.value ? null : saveSite,
+      icon: const Icon(Symbols.save),
+      label: Text('saveChanges').tr(),
+    ).padding(horizontal: 20, vertical: 12);
+
+    return SheetScaffold(
+      titleText:
+          siteSlug == null
+              ? 'newPublicationSite'.tr()
+              : 'editPublicationSite'.tr(),
+      child: SingleChildScrollView(
+        child: Column(
+          children: [
+            Form(key: formKey, child: formFields),
+            Row(
+              children: [
+                if (siteSlug != null) ...[
+                  TextButton.icon(
+                    onPressed: isLoading.value ? null : deleteSite,
+                    icon: const Icon(Symbols.delete_forever),
+                    label: Text('deletePublicationSite'.tr()),
+                    style: TextButton.styleFrom(foregroundColor: Colors.red),
+                  ).alignment(Alignment.centerRight),
+                  const SizedBox(height: 16),
+                ],
+                const Spacer(),
+                saveButton,
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/creators/sites/site_list.dart

@@ -0,0 +1,243 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/publication_site.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/screens/creators/sites/site_edit.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
+import 'package:island/widgets/extended_refresh_indicator.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+part 'site_list.g.dart';
+
+@riverpod
+class SiteListNotifier extends _$SiteListNotifier
+    with CursorPagingNotifierMixin<SnPublicationSite> {
+  static const int _pageSize = 20;
+
+  @override
+  Future<CursorPagingData<SnPublicationSite>> build(String? pubName) {
+    // immediately load first page
+    return fetch(cursor: null);
+  }
+
+  @override
+  Future<CursorPagingData<SnPublicationSite>> fetch({
+    required String? cursor,
+  }) async {
+    final client = ref.read(apiClientProvider);
+    final offset = cursor == null ? 0 : int.parse(cursor);
+
+    // read the current family argument passed to provider
+    final queryParams = {'offset': offset, 'take': _pageSize};
+
+    final response = await client.get(
+      '/zone/sites/$pubName',
+      queryParameters: queryParams,
+    );
+    final total = int.parse(response.headers.value('X-Total') ?? '0');
+    final List<dynamic> data = response.data;
+    final items = data.map((json) => SnPublicationSite.fromJson(json)).toList();
+
+    final hasMore = offset + items.length < total;
+    final nextCursor = hasMore ? (offset + items.length).toString() : null;
+
+    return CursorPagingData(
+      items: items,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
+class CreatorSiteListScreen extends HookConsumerWidget {
+  const CreatorSiteListScreen({super.key, required this.pubName});
+
+  final String pubName;
+
+  Future<void> _createSite(BuildContext context) async {
+    await showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => SiteForm(pubName: pubName),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return AppScaffold(
+      isNoBackground: false,
+      appBar: AppBar(title: Text('publicationSites'.tr())),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () => _createSite(context),
+        child: Icon(Icons.add),
+      ),
+      body: ExtendedRefreshIndicator(
+        onRefresh: () => ref.refresh(siteListNotifierProvider(pubName).future),
+        child: CustomScrollView(
+          slivers: [
+            const SliverGap(8),
+            PagingHelperSliverView(
+              provider: siteListNotifierProvider(pubName),
+              futureRefreshable: siteListNotifierProvider(pubName).future,
+              notifierRefreshable: siteListNotifierProvider(pubName).notifier,
+              contentBuilder:
+                  (data, widgetCount, endItemView) => SliverList.builder(
+                    itemCount: widgetCount,
+                    itemBuilder: (context, index) {
+                      if (index == widgetCount - 1) {
+                        return endItemView;
+                      }
+                      final site = data.items[index];
+                      return ConstrainedBox(
+                        constraints: BoxConstraints(maxWidth: 640),
+                        child: _CreatorSiteItem(site: site, pubName: pubName),
+                      ).center();
+                    },
+                  ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _CreatorSiteItem extends HookConsumerWidget {
+  final String pubName;
+  const _CreatorSiteItem({required this.site, required this.pubName});
+
+  final SnPublicationSite site;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      clipBehavior: Clip.antiAlias,
+      child: InkWell(
+        onTap: () {
+          // Navigate to site detail screen
+          context.pushNamed(
+            'creatorSiteDetail',
+            pathParameters: {'name': pubName, 'siteSlug': site.slug},
+          );
+        },
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Expanded(
+                child: Column(
+                  spacing: 2,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Icon(
+                          Symbols.globe,
+                          size: 18,
+                          color: Theme.of(context).colorScheme.primary,
+                        ),
+                        const Gap(6),
+                        Text(site.name).bold(),
+                      ],
+                    ),
+                    if (site.description != null &&
+                        site.description!.isNotEmpty)
+                      Text(
+                        site.description!,
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    const Divider(height: 8),
+                    Text(
+                      '${site.slug}.solian.page',
+                      style: GoogleFonts.robotoMono(fontSize: 11),
+                    ).opacity(0.8),
+                  ],
+                ),
+              ),
+              PopupMenuButton<String>(
+                itemBuilder:
+                    (context) => [
+                      PopupMenuItem(
+                        child: Row(
+                          children: [
+                            const Icon(Symbols.edit),
+                            const Gap(16),
+                            Text('edit').tr(),
+                          ],
+                        ),
+                        onTap: () {
+                          showModalBottomSheet(
+                            context: context,
+                            isScrollControlled: true,
+                            builder:
+                                (context) => SiteForm(
+                                  pubName: pubName,
+                                  siteSlug: site.slug,
+                                ),
+                          );
+                        },
+                      ),
+                      PopupMenuItem(
+                        child: Row(
+                          children: [
+                            const Icon(Symbols.delete, color: Colors.red),
+                            const Gap(16),
+                            Text('delete').tr().textColor(Colors.red),
+                          ],
+                        ),
+                        onTap: () async {
+                          final confirmed = await showDialog<bool>(
+                            context: context,
+                            builder:
+                                (context) => AlertDialog(
+                                  title: Text('deleteSite'.tr()),
+                                  content: Text('deleteSiteConfirm'.tr()),
+                                  actions: [
+                                    TextButton(
+                                      onPressed:
+                                          () =>
+                                              Navigator.of(context).pop(false),
+                                      child: Text('cancel'.tr()),
+                                    ),
+                                    TextButton(
+                                      onPressed:
+                                          () => Navigator.of(context).pop(true),
+                                      child: Text('delete'.tr()),
+                                    ),
+                                  ],
+                                ),
+                          );
+                          if (confirmed == true) {
+                            try {
+                              final client = ref.read(apiClientProvider);
+                              await client.delete(
+                                '/zone/sites/$pubName/${site.slug}',
+                              );
+                              ref.invalidate(siteListNotifierProvider(pubName));
+                              showSnackBar('siteDeletedSuccess'.tr());
+                            } catch (e) {
+                              showErrorAlert(e);
+                            }
+                          }
+                        },
+                      ),
+                    ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/screens/creators/sites/site_list.g.dart

@@ -0,0 +1,183 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'site_list.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$siteListNotifierHash() => r'1670cadcc0c7ccbd98bc33bbf5b4af21e9cb166c';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$SiteListNotifier
+    extends
+        BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnPublicationSite>> {
+  late final String? pubName;
+
+  FutureOr<CursorPagingData<SnPublicationSite>> build(String? pubName);
+}
+
+/// See also [SiteListNotifier].
+@ProviderFor(SiteListNotifier)
+const siteListNotifierProvider = SiteListNotifierFamily();
+
+/// See also [SiteListNotifier].
+class SiteListNotifierFamily
+    extends Family<AsyncValue<CursorPagingData<SnPublicationSite>>> {
+  /// See also [SiteListNotifier].
+  const SiteListNotifierFamily();
+
+  /// See also [SiteListNotifier].
+  SiteListNotifierProvider call(String? pubName) {
+    return SiteListNotifierProvider(pubName);
+  }
+
+  @override
+  SiteListNotifierProvider getProviderOverride(
+    covariant SiteListNotifierProvider provider,
+  ) {
+    return call(provider.pubName);
+  }
+
+  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'siteListNotifierProvider';
+}
+
+/// See also [SiteListNotifier].
+class SiteListNotifierProvider
+    extends
+        AutoDisposeAsyncNotifierProviderImpl<
+          SiteListNotifier,
+          CursorPagingData<SnPublicationSite>
+        > {
+  /// See also [SiteListNotifier].
+  SiteListNotifierProvider(String? pubName)
+    : this._internal(
+        () => SiteListNotifier()..pubName = pubName,
+        from: siteListNotifierProvider,
+        name: r'siteListNotifierProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$siteListNotifierHash,
+        dependencies: SiteListNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            SiteListNotifierFamily._allTransitiveDependencies,
+        pubName: pubName,
+      );
+
+  SiteListNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.pubName,
+  }) : super.internal();
+
+  final String? pubName;
+
+  @override
+  FutureOr<CursorPagingData<SnPublicationSite>> runNotifierBuild(
+    covariant SiteListNotifier notifier,
+  ) {
+    return notifier.build(pubName);
+  }
+
+  @override
+  Override overrideWith(SiteListNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: SiteListNotifierProvider._internal(
+        () => create()..pubName = pubName,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        pubName: pubName,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeAsyncNotifierProviderElement<
+    SiteListNotifier,
+    CursorPagingData<SnPublicationSite>
+  >
+  createElement() {
+    return _SiteListNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SiteListNotifierProvider && other.pubName == pubName;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, pubName.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SiteListNotifierRef
+    on
+        AutoDisposeAsyncNotifierProviderRef<
+          CursorPagingData<SnPublicationSite>
+        > {
+  /// The parameter `pubName` of this provider.
+  String? get pubName;
+}
+
+class _SiteListNotifierProviderElement
+    extends
+        AutoDisposeAsyncNotifierProviderElement<
+          SiteListNotifier,
+          CursorPagingData<SnPublicationSite>
+        >
+    with SiteListNotifierRef {
+  _SiteListNotifierProviderElement(super.provider);
+
+  @override
+  String? get pubName => (origin as SiteListNotifierProvider).pubName;
+}
+
+// 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/screens/creators/stickers/pack_detail.dart

@@ -288,6 +288,7 @@ class StickerPackActionMenu extends HookConsumerWidget {
                 showConfirmAlert(
                   'deleteStickerPackHint'.tr(),
                   'deleteStickerPack'.tr(),
+                  isDanger: true,
                 ).then((confirm) {
                   if (confirm) {
                     final client = ref.watch(apiClientProvider);

lib/screens/creators/webfeed/webfeed_edit.dart

@@ -70,6 +70,7 @@ class WebfeedForm extends HookConsumerWidget {
       final confirmed = await showConfirmAlert(
         'Are you sure you want to delete this web feed? This action cannot be undone.',
         'Delete Web Feed',
+        isDanger: true,
       );
       if (confirmed != true) return;
 

lib/screens/developers/app_secrets.dart

@@ -211,6 +211,7 @@ class AppSecretsScreen extends HookConsumerWidget {
                               showConfirmAlert(
                                 'deleteSecretHint'.tr(),
                                 'deleteSecret'.tr(),
+                                isDanger: true,
                               ).then((confirm) {
                                 if (confirm) {
                                   final client = ref.read(apiClientProvider);

lib/screens/developers/apps.dart

@@ -231,6 +231,7 @@ class CustomAppsScreen extends HookConsumerWidget {
                                     showConfirmAlert(
                                       'deleteCustomAppHint'.tr(),
                                       'deleteCustomApp'.tr(),
+                                      isDanger: true,
                                     ).then((confirm) {
                                       if (confirm) {
                                         final client = ref.read(

lib/screens/developers/bot_keys.dart

@@ -159,9 +159,11 @@ class BotKeysScreen extends HookConsumerWidget {
     }
 
     void revokeKey(String keyId) {
-      showConfirmAlert('revokeBotKeyHint'.tr(), 'revokeBotKey'.tr()).then((
-        confirm,
-      ) {
+      showConfirmAlert(
+        'revokeBotKeyHint'.tr(),
+        'revokeBotKey'.tr(),
+        isDanger: true,
+      ).then((confirm) {
         if (confirm) {
           final client = ref.read(apiClientProvider);
           client

lib/screens/developers/bots.dart

@@ -172,6 +172,7 @@ class BotsScreen extends HookConsumerWidget {
                               showConfirmAlert(
                                 'deleteBotHint'.tr(),
                                 'deleteBot'.tr(),
+                                isDanger: true,
                               ).then((confirm) {
                                 if (confirm) {
                                   final client = ref.read(apiClientProvider);

lib/screens/developers/hub.dart

@@ -631,6 +631,7 @@ class _ProjectListTile extends HookConsumerWidget {
             showConfirmAlert(
               'deleteProjectHint'.tr(),
               'deleteProject'.tr(),
+              isDanger: true,
             ).then((confirm) {
               if (confirm) {
                 final client = ref.read(apiClientProvider);

lib/screens/explore.dart

@@ -1,3 +1,4 @@
+import 'package:desktop_drop/desktop_drop.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -30,7 +31,9 @@ import 'package:island/widgets/publisher/publisher_card.dart';
 import 'package:island/widgets/web_article_card.dart';
 import 'package:island/widgets/extended_refresh_indicator.dart';
 import 'package:island/services/event_bus.dart';
+import 'package:island/widgets/share/share_sheet.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:super_sliver_list/super_sliver_list.dart';
 
 part 'explore.g.dart';
 
@@ -239,23 +242,74 @@ class ExploreScreen extends HookConsumerWidget {
 
     final appBar = isWide ? null : _buildAppBar(tabController, context);
 
-    return AppScaffold(
-      isNoBackground: false,
-      appBar: appBar,
-      body:
-          isWide
-              ? _buildWideBody(
-                context,
-                ref,
-                filterBar,
-                user,
-                notificationCount,
-                query,
-                events,
-                selectedDay,
-                currentFilter.value,
-              )
-              : _buildNarrowBody(context, ref, currentFilter.value),
+    final dragging = useState(false);
+
+    return DropTarget(
+      onDragDone: (detail) {
+        dragging.value = false;
+        if (detail.files.isNotEmpty) {
+          showModalBottomSheet(
+            context: context,
+            isScrollControlled: true,
+            useRootNavigator: true,
+            builder: (context) => ShareSheet.files(files: detail.files),
+          );
+        }
+      },
+      onDragEntered: (_) => dragging.value = true,
+      onDragExited: (_) => dragging.value = false,
+      child: Stack(
+        children: [
+          AppScaffold(
+            isNoBackground: false,
+            appBar: appBar,
+            body:
+                isWide
+                    ? _buildWideBody(
+                      context,
+                      ref,
+                      filterBar,
+                      user,
+                      notificationCount,
+                      query,
+                      events,
+                      selectedDay,
+                      currentFilter.value,
+                    )
+                    : _buildNarrowBody(context, ref, currentFilter.value),
+          ),
+          if (dragging.value)
+            Positioned.fill(
+              child: Container(
+                color: Theme.of(
+                  context,
+                ).colorScheme.primaryContainer.withOpacity(0.9),
+                child: Center(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Icon(
+                        Symbols.upload_file,
+                        size: 64,
+                        color: Theme.of(context).colorScheme.primary,
+                      ),
+                      const Gap(16),
+                      Text(
+                        'dropToShare'.tr(),
+                        style: Theme.of(
+                          context,
+                        ).textTheme.headlineMedium?.copyWith(
+                          color: Theme.of(context).colorScheme.primary,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+        ],
+      ),
     );
   }
 
@@ -545,6 +599,7 @@ class ExploreScreen extends HookConsumerWidget {
               SliverToBoxAdapter(
                 child: FriendsOverviewWidget(
                   padding: const EdgeInsets.only(bottom: 8),
+                  hideWhenEmpty: true,
                 ),
               ),
               if (notificationCount.value != null &&
@@ -581,7 +636,7 @@ class _DiscoveryActivityItem extends StatelessWidget {
     final height = type == 'post' ? 280.0 : 180.0;
 
     final contentWidget = switch (type) {
-      'post' => ListView.separated(
+      'post' => SuperListView.separated(
         scrollDirection: Axis.horizontal,
         itemCount: items.length,
         separatorBuilder: (context, index) => const Gap(12),

lib/screens/files/file_list.dart

@@ -36,7 +36,7 @@ class FileListScreen extends HookConsumerWidget {
       isNoBackground: false,
       appBar: AppBar(
         title: Text('files').tr(),
-        leading: const PageBackButton(),
+        leading: const PageBackButton(backTo: '/account'),
         actions: [
           IconButton(
             icon: const Icon(Symbols.bar_chart),

lib/screens/lottery.dart

@@ -534,7 +534,7 @@ class _LotteryPurchaseSheetState extends State<LotteryPurchaseSheet> {
                   ),
                   const Gap(4),
                   Text(
-                    'The last selected number will be your special number.',
+                    'lotteryLastNumberSpecial'.tr(),
                     style: Theme.of(context).textTheme.bodySmall?.copyWith(
                       color: Theme.of(context).colorScheme.secondary,
                       fontWeight: FontWeight.w500,
@@ -738,11 +738,11 @@ class _LotteryPurchaseSheetState extends State<LotteryPurchaseSheet> {
       },
       validator: (value) {
         if (value == null || value.isEmpty) {
-          return 'Please enter a multiplier';
+          return 'lotteryMultiplierRequired'.tr();
         }
         final parsed = int.tryParse(value);
         if (parsed == null || parsed < 1 || parsed > 10) {
-          return 'Multiplier must be between 1 and 10';
+          return 'lotteryMultiplierRange'.tr();
         }
         return null;
       },

lib/screens/notification.dart

@@ -10,6 +10,7 @@ import 'package:island/pods/network.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/route.dart';
 import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/markdown.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
@@ -68,6 +69,16 @@ class NotificationUnreadCountNotifier
   void clear() async {
     state = AsyncData(0);
   }
+
+  Future<void> refresh() async {
+    try {
+      final client = ref.read(apiClientProvider);
+      final response = await client.get('/ring/notifications/count');
+      state = AsyncData((response.data as num).toInt());
+    } catch (_) {
+      // Keep the current state if refresh fails
+    }
+  }
 }
 
 @riverpod
@@ -115,8 +126,36 @@ class NotificationListNotifier extends _$NotificationListNotifier
 class NotificationSheet extends HookConsumerWidget {
   const NotificationSheet({super.key});
 
+  IconData _getNotificationIcon(String topic) {
+    switch (topic) {
+      case 'post.replies':
+        return Symbols.reply;
+      case 'wallet.transactions':
+        return Symbols.account_balance_wallet;
+      case 'relationships.friends.request':
+        return Symbols.person_add;
+      case 'invites.chat':
+        return Symbols.chat;
+      case 'invites.realm':
+        return Symbols.domain;
+      case 'auth.login':
+        return Symbols.login;
+      case 'posts.new':
+        return Symbols.post_add;
+      case 'wallet.orders.paid':
+        return Symbols.shopping_bag;
+      case 'posts.reactions.new':
+        return Symbols.add_reaction;
+      default:
+        return Symbols.notifications;
+    }
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    // Refresh unread count when sheet opens to sync across devices
+    ref.read(notificationUnreadCountNotifierProvider.notifier).refresh();
+
     Future<void> markAllRead() async {
       showLoadingModal(context);
       final apiClient = ref.watch(apiClientProvider);
@@ -149,12 +188,30 @@ class NotificationSheet extends HookConsumerWidget {
                 }
 
                 final notification = data.items[index];
+                final pfp = notification.meta['pfp'] as String?;
+                final images = notification.meta['images'] as List?;
+                final imageIds = images?.cast<String>() ?? [];
+
                 return ListTile(
                   isThreeLine: true,
                   contentPadding: EdgeInsets.symmetric(
                     horizontal: 16,
                     vertical: 8,
                   ),
+                  leading:
+                      pfp != null
+                          ? ProfilePictureWidget(fileId: pfp, radius: 20)
+                          : CircleAvatar(
+                            backgroundColor:
+                                Theme.of(context).colorScheme.primaryContainer,
+                            child: Icon(
+                              _getNotificationIcon(notification.topic),
+                              color:
+                                  Theme.of(
+                                    context,
+                                  ).colorScheme.onPrimaryContainer,
+                            ),
+                          ),
                   title: Text(notification.title),
                   subtitle: Column(
                     crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -187,6 +244,29 @@ class NotificationSheet extends HookConsumerWidget {
                           ).colorScheme.onSurface.withOpacity(0.8),
                         ),
                       ),
+                      if (imageIds.isNotEmpty)
+                        Padding(
+                          padding: const EdgeInsets.only(top: 8),
+                          child: Wrap(
+                            spacing: 8,
+                            runSpacing: 8,
+                            children:
+                                imageIds.map((imageId) {
+                                  return SizedBox(
+                                    width: 80,
+                                    height: 80,
+                                    child: ClipRRect(
+                                      borderRadius: BorderRadius.circular(8),
+                                      child: CloudImageWidget(
+                                        fileId: imageId,
+                                        aspectRatio: 1,
+                                        fit: BoxFit.cover,
+                                      ),
+                                    ),
+                                  );
+                                }).toList(),
+                          ),
+                        ),
                     ],
                   ),
                   trailing:

lib/screens/posts/compose_article.dart

@@ -256,21 +256,25 @@ class ArticleComposeScreen extends HookConsumerWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              ComposeFormFields(
-                state: state,
-                showPublisherAvatar: false,
-                onPublisherTap: () {
-                  showModalBottomSheet(
-                    isScrollControlled: true,
-                    context: context,
-                    builder: (context) => const PublisherModal(),
-                  ).then((value) {
-                    if (value != null) {
-                      state.currentPublisher.value = value;
-                    }
-                  });
-                },
-              ).padding(top: 16),
+              Expanded(
+                child: SingleChildScrollView(
+                  child: ComposeFormFields(
+                    state: state,
+                    showPublisherAvatar: false,
+                    onPublisherTap: () {
+                      showModalBottomSheet(
+                        isScrollControlled: true,
+                        context: context,
+                        builder: (context) => const PublisherModal(),
+                      ).then((value) {
+                        if (value != null) {
+                          state.currentPublisher.value = value;
+                        }
+                      });
+                    },
+                  ).padding(top: 16),
+                ),
+              ),
 
               // Attachments preview
               ValueListenableBuilder<List<UniversalFile>>(

lib/screens/posts/post_detail.dart

@@ -145,9 +145,11 @@ class PostActionButtons extends HookConsumerWidget {
           message: 'delete'.tr(),
           child: FilledButton.tonal(
             onPressed: () {
-              showConfirmAlert('deletePostHint'.tr(), 'deletePost'.tr()).then((
-                confirm,
-              ) {
+              showConfirmAlert(
+                'deletePostHint'.tr(),
+                'deletePost'.tr(),
+                isDanger: true,
+              ).then((confirm) {
                 if (confirm) {
                   final client = ref.watch(apiClientProvider);
                   client

lib/screens/realm/realm_detail.dart

@@ -427,6 +427,7 @@ class _RealmActionMenu extends HookConsumerWidget {
                               showConfirmAlert(
                                 'deleteRealmHint'.tr(),
                                 'deleteRealm'.tr(),
+                                isDanger: true,
                               ).then((confirm) {
                                 if (confirm) {
                                   final client = ref.watch(apiClientProvider);

lib/screens/tabs.dart

@@ -14,6 +14,7 @@ import 'package:island/widgets/navigation/fab_menu.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:island/pods/config.dart';
+import 'package:island/pods/chat/chat_summary.dart';
 
 final currentRouteProvider = StateProvider<String?>((ref) => null);
 
@@ -50,6 +51,8 @@ class TabsScreen extends HookConsumerWidget {
       notificationUnreadCountNotifierProvider,
     );
 
+    final chatUnreadCount = ref.watch(chatUnreadCountNotifierProvider);
+
     final wideScreen = isWideScreen(context);
 
     final destinations = [
@@ -59,7 +62,11 @@ class TabsScreen extends HookConsumerWidget {
       ),
       NavigationDestination(
         label: 'chat'.tr(),
-        icon: const Icon(Symbols.forum_rounded),
+        icon: Badge.count(
+          count: chatUnreadCount.value ?? 0,
+          isLabelVisible: (chatUnreadCount.value ?? 0) > 0,
+          child: const Icon(Symbols.forum_rounded),
+        ),
       ),
       NavigationDestination(
         label: 'realms'.tr(),

lib/services/update_service.dart

@@ -82,12 +82,32 @@ class _ParsedVersion implements Comparable<_ParsedVersion> {
     return _ParsedVersion(major, minor, patch, build);
   }
 
+  /// Normalize Android build numbers by removing architecture-based offsets
+  /// Android adds 1000 for x86, 2000 for ARMv7, 4000 for ARMv8
+  int get normalizedBuild {
+    // Check if build number has an architecture offset
+    // We detect this by checking if the build % 1000 is the base build
+    if (build >= 4000) {
+      // Likely ARMv8 (arm64-v8a) with +4000 offset
+      return build % 4000;
+    } else if (build >= 2000) {
+      // Likely ARMv7 (armeabi-v7a) with +2000 offset
+      return build % 2000;
+    } else if (build >= 1000) {
+      // Likely x86/x86_64 with +1000 offset
+      return build % 1000;
+    }
+    // No offset, return as-is
+    return build;
+  }
+
   @override
   int compareTo(_ParsedVersion other) {
     if (major != other.major) return major.compareTo(other.major);
     if (minor != other.minor) return minor.compareTo(other.minor);
     if (patch != other.patch) return patch.compareTo(other.patch);
-    return build.compareTo(other.build);
+    // Use normalized build numbers for comparison to handle Android arch offsets
+    return normalizedBuild.compareTo(other.normalizedBuild);
   }
 
   @override
@@ -244,13 +264,14 @@ class UpdateService {
     showDialog(
       context: context,
       barrierDismissible: false,
-      builder: (context) => _WindowsUpdateDialog(
-        updateUrl: url,
-        onComplete: () {
-          // Close the update sheet
-          Navigator.of(context).pop();
-        },
-      ),
+      builder:
+          (context) => _WindowsUpdateDialog(
+            updateUrl: url,
+            onComplete: () {
+              // Close the update sheet
+              Navigator.of(context).pop();
+            },
+          ),
     );
   }
 
@@ -321,7 +342,9 @@ class _WindowsUpdateDialog extends StatefulWidget {
 
 class _WindowsUpdateDialogState extends State<_WindowsUpdateDialog> {
   final ValueNotifier<double?> progressNotifier = ValueNotifier<double?>(null);
-  final ValueNotifier<String> messageNotifier = ValueNotifier<String>('Downloading installer...');
+  final ValueNotifier<String> messageNotifier = ValueNotifier<String>(
+    'Downloading installer...',
+  );
 
   @override
   void initState() {
@@ -392,16 +415,17 @@ class _WindowsUpdateDialogState extends State<_WindowsUpdateDialog> {
     Navigator.of(context).pop();
     showDialog(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Update Failed'),
-        content: Text(message),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.of(context).pop(),
-            child: const Text('OK'),
+      builder:
+          (context) => AlertDialog(
+            title: const Text('Update Failed'),
+            content: Text(message),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.of(context).pop(),
+                child: const Text('OK'),
+              ),
+            ],
           ),
-        ],
-      ),
     );
   }
 
@@ -458,7 +482,9 @@ class _WindowsUpdateDialogState extends State<_WindowsUpdateDialog> {
       );
 
       if (response.statusCode == 200) {
-        talker.info('[Update] Windows installer downloaded successfully to: $filePath');
+        talker.info(
+          '[Update] Windows installer downloaded successfully to: $filePath',
+        );
         return filePath;
       } else {
         talker.error(
@@ -500,7 +526,9 @@ class _WindowsUpdateDialogState extends State<_WindowsUpdateDialog> {
         }
       }
 
-      talker.info('[Update] Windows installer extracted successfully to: $extractDir');
+      talker.info(
+        '[Update] Windows installer extracted successfully to: $extractDir',
+      );
       return extractDir;
     } catch (e) {
       talker.error('[Update] Error extracting Windows installer: $e');
@@ -514,10 +542,11 @@ class _WindowsUpdateDialogState extends State<_WindowsUpdateDialog> {
       talker.info('[Update] Running Windows installer from: $extractDir');
 
       final dir = Directory(extractDir);
-      final exeFiles = dir
-          .listSync()
-          .where((f) => f is File && f.path.endsWith('.exe'))
-          .toList();
+      final exeFiles =
+          dir
+              .listSync()
+              .where((f) => f is File && f.path.endsWith('.exe'))
+              .toList();
 
       if (exeFiles.isEmpty) {
         talker.info('[Update] No .exe file found in extracted directory');

lib/widgets/account/account_devices.dart

@@ -150,6 +150,7 @@ class AccountSessionSheet extends HookConsumerWidget {
       final confirm = await showConfirmAlert(
         'authDeviceLogoutHint'.tr(),
         'authDeviceLogout'.tr(),
+        isDanger: true,
       );
       if (!confirm || !context.mounted) return;
       try {
@@ -276,6 +277,7 @@ class AccountSessionSheet extends HookConsumerWidget {
                                 final confirm = await showConfirmAlert(
                                   'authDeviceLogoutHint'.tr(),
                                   'authDeviceLogout'.tr(),
+                                  isDanger: true,
                                 );
                                 if (confirm && context.mounted) {
                                   try {

lib/widgets/account/account_name.dart

@@ -25,12 +25,24 @@ const Map<String, Color> kUsernamePlainColors = {
   'white': Colors.white,
 };
 
-const kVerificationMarkColors = [
+const List<IconData> kVerificationMarkIcons = [
+  Symbols.build_circle,
+  Symbols.verified,
+  Symbols.verified,
+  Symbols.account_balance,
+  Symbols.palette,
+  Symbols.code,
+  Symbols.masks,
+];
+
+const List<Color> kVerificationMarkColors = [
   Colors.teal,
-  Colors.blue,
-  Colors.amber,
-  Colors.blueGrey,
   Colors.lightBlue,
+  Colors.indigo,
+  Colors.red,
+  Colors.orange,
+  Colors.blue,
+  Colors.blueAccent,
 ];
 
 class AccountName extends StatelessWidget {
@@ -291,13 +303,14 @@ class VerificationMark extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final icon = Icon(
-      mark.type == 4
-          ? Symbols.play_circle
-          : mark.type == 0
-          ? Symbols.build_circle
+      (kVerificationMarkIcons.length > mark.type && mark.type >= 0)
+          ? kVerificationMarkIcons[mark.type]
           : Symbols.verified,
       size: 16,
-      color: kVerificationMarkColors[mark.type],
+      color:
+          (kVerificationMarkColors.length > mark.type && mark.type >= 0)
+              ? kVerificationMarkColors[mark.type]
+              : Colors.blue,
       fill: 1,
     );
 
@@ -394,13 +407,14 @@ class VerificationStatusCard extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
         Icon(
-          mark.type == 4
-              ? Symbols.play_circle
-              : mark.type == 0
-              ? Symbols.build_circle
+          (kVerificationMarkIcons.length > mark.type && mark.type >= 0)
+              ? kVerificationMarkIcons[mark.type]
               : Symbols.verified,
           size: 32,
-          color: kVerificationMarkColors[mark.type],
+          color:
+              (kVerificationMarkColors.length > mark.type && mark.type >= 0)
+                  ? kVerificationMarkColors[mark.type]
+                  : Colors.blue,
           fill: 1,
         ).alignment(Alignment.centerLeft),
         const Gap(8),

lib/widgets/activity_heatmap.dart

@@ -1,11 +1,24 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:fl_heatmap/fl_heatmap.dart';
 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/heatmap.dart';
-import '../services/responsive.dart';
+import 'package:island/services/responsive.dart';
+
+/// Custom data class for selected heatmap item
+class SelectedHeatmapItem {
+  final double value;
+  final String unit;
+  final String dateString;
+  final String dayLabel;
+
+  SelectedHeatmapItem({
+    required this.value,
+    required this.unit,
+    required this.dateString,
+    required this.dayLabel,
+  });
+}
 
 /// A reusable heatmap widget for displaying activity data in GitHub-style layout.
 /// Shows exactly 365 days (wide screen) or 90 days (non-wide screen) of data ending at the current date.
@@ -21,7 +34,7 @@ class ActivityHeatmapWidget extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final selectedItem = useState<HeatmapItem?>(null);
+    final selectedItem = useState<SelectedHeatmapItem?>(null);
 
     final now = DateTime.now();
 
@@ -101,48 +114,18 @@ class ActivityHeatmapWidget extends HookConsumerWidget {
       }
     }
 
-    final heatmapData = HeatmapData(
-      rows: [
-        'Mon',
-        'Tue',
-        'Wed',
-        'Thu',
-        'Fri',
-        'Sat',
-        'Sun',
-      ], // Days of week vertically
-      columns:
-          weeks
-              .map(
-                (w) =>
-                    '${w.year}-${w.month.toString().padLeft(2, '0')}-${w.day.toString().padLeft(2, '0')}',
-              )
-              .toList(), // Weeks horizontally
-      items: [
-        for (int day = 0; day < 7; day++) // For each day of week (Mon-Sun)
-          for (final week in weeks) // For each week
-            HeatmapItem(
-              value: dataMap[week.add(Duration(days: day))] ?? 0.0,
-              unit: heatmap.unit,
-              xAxisLabel:
-                  '${week.year}-${week.month.toString().padLeft(2, '0')}-${week.day.toString().padLeft(2, '0')}',
-              yAxisLabel:
-                  day == 0
-                      ? 'Mon'
-                      : day == 1
-                      ? 'Tue'
-                      : day == 2
-                      ? 'Wed'
-                      : day == 3
-                      ? 'Thu'
-                      : day == 4
-                      ? 'Fri'
-                      : day == 5
-                      ? 'Sat'
-                      : 'Sun',
-            ),
-      ],
-    );
+    // Find maximum value for color scaling
+    final maxValue =
+        dataMap.values.isNotEmpty
+            ? dataMap.values.reduce((a, b) => a > b ? a : b)
+            : 1.0;
+
+    // Helper function to get color based on activity level
+    Color getActivityColor(double value) {
+      if (value == 0) return Colors.grey.withOpacity(0.1);
+      final intensity = value / maxValue;
+      return Colors.green.withOpacity(0.2 + (intensity * 0.8));
+    }
 
     return Card(
       margin: EdgeInsets.zero,
@@ -151,39 +134,103 @@ class ActivityHeatmapWidget extends HookConsumerWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(
-              'activityHeatmap',
-              style: Theme.of(context).textTheme.titleMedium,
-            ).tr(),
-            const Gap(8),
-            // Month labels row
+            // Month labels row - aligned with month start positions
             Row(
               children: [
                 const SizedBox(width: 30), // Space for day labels
-                ...monthLabels.asMap().entries.map((entry) {
-                  final month = entry.value;
+                ...List.generate(weeks.length, (weekIndex) {
+                  // Check if this week is the start of a month
+                  final monthIndex = monthPositions.indexOf(weekIndex);
+                  final monthText =
+                      monthIndex != -1 ? monthLabels[monthIndex] : null;
 
-                  return Expanded(
-                    child: Container(
-                      alignment: Alignment.center,
-                      child: Text(
-                        month,
-                        style: Theme.of(context).textTheme.bodySmall,
-                        textAlign: TextAlign.center,
-                      ),
-                    ),
-                  );
+                  return monthText != null
+                      ? Expanded(
+                        child: Text(
+                          monthText,
+                          style: Theme.of(context).textTheme.bodySmall,
+                          textAlign: TextAlign.center,
+                        ),
+                      )
+                      : SizedBox.shrink();
                 }),
               ],
             ),
             const Gap(4),
-            Heatmap(
-              heatmapData: heatmapData,
-              rowsVisible: 7,
-              showXAxisLabels: false,
-              onItemSelectedListener: (item) {
-                selectedItem.value = item;
-              },
+            // Custom heatmap grid
+            Column(
+              children: List.generate(7, (dayIndex) {
+                final dayLabels = [
+                  'Mon',
+                  'Tue',
+                  'Wed',
+                  'Thu',
+                  'Fri',
+                  'Sat',
+                  'Sun',
+                ];
+                final dayLabel = dayLabels[dayIndex];
+
+                return Row(
+                  children: [
+                    // Day label
+                    SizedBox(
+                      width: 30,
+                      child: Text(
+                        dayLabel,
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                        ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                    // Activity squares for each week - evenly distributed
+                    Expanded(
+                      child: Row(
+                        children: List.generate(weeks.length, (weekIndex) {
+                          final week = weeks[weekIndex];
+                          final date = week.add(Duration(days: dayIndex));
+                          final value = dataMap[date] ?? 0.0;
+                          final dateString =
+                              '${date.year}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
+
+                          return Expanded(
+                            child: GestureDetector(
+                              onTap: () {
+                                selectedItem.value = SelectedHeatmapItem(
+                                  value: value,
+                                  unit: heatmap.unit,
+                                  dateString: dateString,
+                                  dayLabel: dayLabel,
+                                );
+                              },
+                              child: Container(
+                                height: 12,
+                                margin: const EdgeInsets.all(1),
+                                decoration: BoxDecoration(
+                                  color: getActivityColor(value),
+                                  borderRadius: BorderRadius.circular(2),
+                                  border:
+                                      selectedItem.value != null &&
+                                              selectedItem.value!.dateString ==
+                                                  dateString &&
+                                              selectedItem.value!.dayLabel ==
+                                                  dayLabel
+                                          ? Border.all(
+                                            color: Colors.blue,
+                                            width: 1,
+                                          )
+                                          : null,
+                                ),
+                              ),
+                            ),
+                          );
+                        }),
+                      ),
+                    ),
+                  ],
+                );
+              }),
             ),
             const Gap(8),
             // Legend
@@ -203,9 +250,7 @@ class ActivityHeatmapWidget extends HookConsumerWidget {
                           style: Theme.of(context).textTheme.bodySmall,
                         ),
                         TextSpan(
-                          text: _formatDate(
-                            selectedItem.value!.xAxisLabel ?? '',
-                          ),
+                          text: _formatDate(selectedItem.value!.dateString),
                           style: Theme.of(context).textTheme.bodySmall,
                         ),
                       ],

lib/widgets/alert.dart

@@ -1,13 +1,15 @@
+import 'dart:async';
+
+import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:island/main.dart';
+import 'package:island/talker.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:top_snackbar_flutter/top_snack_bar.dart';
 
-export 'content/alert.native.dart'
-    if (dart.library.html) 'content/alert.web.dart';
-
 void showSnackBar(String message, {SnackBarAction? action}) {
   final context = globalOverlay.currentState!.context;
   final screenWidth = MediaQuery.of(context).size.width;
@@ -29,43 +31,60 @@ void showSnackBar(String message, {SnackBarAction? action}) {
         ),
       ),
     ),
+    curve: Curves.easeInOut,
     snackBarPosition: SnackBarPosition.bottom,
   );
 }
 
-void clearSnackBar(BuildContext context) {
-  ScaffoldMessenger.of(context).clearSnackBars();
-}
-
 OverlayEntry? _loadingOverlay;
 GlobalKey<_FadeOverlayState> _loadingOverlayKey = GlobalKey();
 
 class _FadeOverlay extends StatefulWidget {
-  const _FadeOverlay({super.key, required this.child});
-  final Widget child;
+  const _FadeOverlay({
+    super.key,
+    this.child,
+    this.builder,
+    this.duration = const Duration(milliseconds: 200),
+    this.curve = Curves.linear,
+  }) : assert(child != null || builder != null);
+
+  final Widget? child;
+  final Widget Function(BuildContext, Animation<double>)? builder;
+  final Duration duration;
+  final Curve curve;
 
   @override
   State<_FadeOverlay> createState() => _FadeOverlayState();
 }
 
-class _FadeOverlayState extends State<_FadeOverlay> {
-  bool _visible = false;
+class _FadeOverlayState extends State<_FadeOverlay>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      setState(() => _visible = true);
-    });
+    _controller = AnimationController(vsync: this, duration: widget.duration);
+    _controller.forward();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  Future<void> animateOut() async {
+    await _controller.reverse();
   }
 
   @override
   Widget build(BuildContext context) {
-    return AnimatedOpacity(
-      opacity: _visible ? 1.0 : 0.0,
-      duration: const Duration(milliseconds: 200),
-      child: widget.child,
-    );
+    final animation = CurvedAnimation(parent: _controller, curve: widget.curve);
+    if (widget.builder != null) {
+      return widget.builder!(context, animation);
+    }
+    return FadeTransition(opacity: animation, child: widget.child);
   }
 }
 
@@ -109,10 +128,250 @@ void hideLoadingModal(BuildContext context) async {
   final state = entry.mounted ? _loadingOverlayKey.currentState : null;
 
   if (state != null) {
-    // ignore: invalid_use_of_protected_member
-    state.setState(() => state._visible = false);
-    await Future.delayed(const Duration(milliseconds: 200));
+    await state.animateOut();
   }
 
   entry.remove();
 }
+
+String _parseRemoteError(DioException err) {
+  String? message;
+  if (err.response?.data is String) {
+    message = err.response?.data;
+  } else if (err.response?.data?['message'] != null) {
+    message = <String?>[
+      err.response?.data?['message']?.toString(),
+      err.response?.data?['detail']?.toString(),
+    ].where((e) => e != null).cast<String>().map((e) => e.trim()).join('\n');
+  } else if (err.response?.data?['errors'] != null) {
+    final errors = err.response?.data['errors'] as Map<String, dynamic>;
+    message = errors.values
+        .map(
+          (ele) =>
+              (ele as List<dynamic>).map((ele) => ele.toString()).join('\n'),
+        )
+        .join('\n');
+  }
+  if (message == null || message.isEmpty) message = err.response?.statusMessage;
+  message ??= err.message;
+  return message ?? err.toString();
+}
+
+// Track active overlay dialogs for dismissal
+final List<void Function()> _activeOverlayDialogs = [];
+
+Future<T?> showOverlayDialog<T>({
+  required Widget Function(BuildContext context, void Function(T? result) close)
+  builder,
+  bool barrierDismissible = true,
+}) {
+  final completer = Completer<T?>();
+  final key = GlobalKey<_FadeOverlayState>();
+  late OverlayEntry entry;
+
+  void close(T? result) async {
+    if (completer.isCompleted) return;
+
+    final state = key.currentState;
+    if (state != null) {
+      await state.animateOut();
+    }
+
+    entry.remove();
+    _activeOverlayDialogs.remove(close);
+    completer.complete(result);
+  }
+
+  entry = OverlayEntry(
+    builder:
+        (context) => _FadeOverlay(
+          key: key,
+          duration: const Duration(milliseconds: 150),
+          curve: Curves.easeOut,
+          builder: (context, animation) {
+            return Stack(
+              children: [
+                Positioned.fill(
+                  child: FadeTransition(
+                    opacity: animation,
+                    child: GestureDetector(
+                      onTap: barrierDismissible ? () => close(null) : null,
+                      behavior: HitTestBehavior.opaque,
+                      child: const ColoredBox(color: Colors.black54),
+                    ),
+                  ),
+                ),
+                Center(
+                  child: SlideTransition(
+                    position: Tween<Offset>(
+                      begin: const Offset(0, 0.05),
+                      end: Offset.zero,
+                    ).animate(animation),
+                    child: FadeTransition(
+                      opacity: animation,
+                      child: builder(context, close),
+                    ),
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+  );
+
+  _activeOverlayDialogs.add(() => close(null));
+  globalOverlay.currentState!.insert(entry);
+  return completer.future;
+}
+
+// Close the topmost overlay dialog if any exists
+bool closeTopmostOverlayDialog() {
+  if (_activeOverlayDialogs.isNotEmpty) {
+    final closeFunc = _activeOverlayDialogs.last;
+    closeFunc();
+    return true;
+  }
+  return false;
+}
+
+const kDialogMaxWidth = 480.0;
+
+void showErrorAlert(dynamic err, {IconData? icon}) {
+  if (err is Error) {
+    talker.error('Something went wrong...', err, err.stackTrace);
+  }
+  final text = switch (err) {
+    String _ => err,
+    DioException _ => _parseRemoteError(err),
+    Exception _ => err.toString(),
+    _ => err.toString(),
+  };
+
+  showOverlayDialog<void>(
+    builder:
+        (context, close) => ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: kDialogMaxWidth),
+          child: AlertDialog(
+            title: null,
+            titlePadding: EdgeInsets.zero,
+            contentPadding: const EdgeInsets.fromLTRB(24, 24, 24, 0),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Icon(
+                  icon ?? Icons.error_outline_rounded,
+                  size: 48,
+                  color: Theme.of(context).colorScheme.error,
+                ),
+                const Gap(16),
+                Text(
+                  'somethingWentWrong'.tr(),
+                  style: Theme.of(context).textTheme.titleLarge,
+                ),
+                const Gap(8),
+                Text(text),
+              ],
+            ),
+            actions: [
+              TextButton(
+                onPressed: () => close(null),
+                child: Text(MaterialLocalizations.of(context).okButtonLabel),
+              ),
+            ],
+          ),
+        ),
+  );
+}
+
+void showInfoAlert(String message, String title, {IconData? icon}) {
+  showOverlayDialog<void>(
+    builder:
+        (context, close) => ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: kDialogMaxWidth),
+          child: AlertDialog(
+            title: null,
+            titlePadding: EdgeInsets.zero,
+            contentPadding: const EdgeInsets.fromLTRB(24, 24, 24, 0),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Icon(
+                  icon ?? Symbols.info_rounded,
+                  fill: 1,
+                  size: 48,
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+                const Gap(16),
+                Text(title, style: Theme.of(context).textTheme.titleLarge),
+                const Gap(8),
+                Text(message),
+                const Gap(8),
+              ],
+            ),
+            actions: [
+              TextButton(
+                onPressed: () => close(null),
+                child: Text(MaterialLocalizations.of(context).okButtonLabel),
+              ),
+            ],
+          ),
+        ),
+  );
+}
+
+Future<bool> showConfirmAlert(
+  String message,
+  String title, {
+  IconData? icon,
+  bool isDanger = false,
+}) async {
+  final result = await showOverlayDialog<bool>(
+    builder:
+        (context, close) => ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: kDialogMaxWidth),
+          child: AlertDialog(
+            title: null,
+            titlePadding: EdgeInsets.zero,
+            contentPadding: const EdgeInsets.fromLTRB(24, 24, 24, 0),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Icon(
+                  icon ?? Symbols.help_rounded,
+                  size: 48,
+                  fill: 1,
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+                const Gap(16),
+                Text(title, style: Theme.of(context).textTheme.titleLarge),
+                const Gap(8),
+                Text(message),
+                const Gap(8),
+              ],
+            ),
+            actions: [
+              TextButton(
+                onPressed: () => close(false),
+                child: Text(
+                  MaterialLocalizations.of(context).cancelButtonLabel,
+                ),
+              ),
+              TextButton(
+                onPressed: () => close(true),
+                style:
+                    isDanger
+                        ? TextButton.styleFrom(
+                          foregroundColor: Theme.of(context).colorScheme.error,
+                        )
+                        : null,
+                child: Text(MaterialLocalizations.of(context).okButtonLabel),
+              ),
+            ],
+          ),
+        ),
+  );
+  return result ?? false;
+}

lib/widgets/app_scaffold.dart

@@ -13,6 +13,7 @@ import 'package:island/route.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/upload_overlay.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:path_provider/path_provider.dart';
@@ -364,6 +365,12 @@ class PopAction extends Action<PopIntent> {
 
   @override
   void invoke(PopIntent intent) {
+    // First, try to close any overlay dialogs
+    if (closeTopmostOverlayDialog()) {
+      return;
+    }
+
+    // If no overlay to close, pop the route
     if (ref.watch(routerProvider).canPop()) {
       ref.read(routerProvider).pop();
     }

lib/widgets/app_wrapper.dart

@@ -130,6 +130,17 @@ class _AppWrapperState extends ConsumerState<AppWrapper>
       return;
     }
 
+    // Special handling for share intent deep links
+    // Share intents are handled by SharingIntentService showing a modal,
+    // not by routing to a page
+    if (path == '/share') {
+      if (!kIsWeb &&
+          (Platform.isWindows || Platform.isLinux || Platform.isMacOS)) {
+        windowManager.show();
+      }
+      return;
+    }
+
     final router = ref.read(routerProvider);
     if (uri.queryParameters.isNotEmpty) {
       path =

lib/widgets/chat/call_button.dart

@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
+
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/chat.dart';
@@ -28,12 +28,12 @@ Future<SnRealtimeCall?> ongoingCall(Ref ref, String roomId) async {
 }
 
 class AudioCallButton extends HookConsumerWidget {
-  final String roomId;
-  const AudioCallButton({super.key, required this.roomId});
+  final SnChatRoom room;
+  const AudioCallButton({super.key, required this.room});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final ongoingCall = ref.watch(ongoingCallProvider(roomId));
+    final ongoingCall = ref.watch(ongoingCallProvider(room.id));
     final callState = ref.watch(callNotifierProvider);
     final callNotifier = ref.read(callNotifierProvider.notifier);
     final isLoading = useState(false);
@@ -42,10 +42,9 @@ class AudioCallButton extends HookConsumerWidget {
     Future<void> handleJoin() async {
       isLoading.value = true;
       try {
-        await apiClient.post('/sphere/chat/realtime/$roomId');
-        if (context.mounted) {
-          context.pushNamed('chatCall', pathParameters: {'id': roomId});
-        }
+        await apiClient.post('/sphere/chat/realtime/${room.id}');
+        // Just join the room, the overlay will handle the UI
+        await callNotifier.joinRoom(room);
       } catch (e) {
         showErrorAlert(e);
       } finally {
@@ -56,7 +55,7 @@ class AudioCallButton extends HookConsumerWidget {
     Future<void> handleEnd() async {
       isLoading.value = true;
       try {
-        await apiClient.delete('/sphere/chat/realtime/$roomId');
+        await apiClient.delete('/sphere/chat/realtime/${room.id}');
         callNotifier.dispose(); // Clean up call resources
       } catch (e) {
         showErrorAlert(e);
@@ -94,9 +93,14 @@ class AudioCallButton extends HookConsumerWidget {
       return IconButton(
         icon: const Icon(Icons.call),
         tooltip: 'Join Ongoing Call',
-        onPressed: () {
-          if (context.mounted) {
-            context.pushNamed('chatCall', pathParameters: {'id': roomId});
+        onPressed: () async {
+          isLoading.value = true;
+          try {
+            await callNotifier.joinRoom(room);
+          } catch (e) {
+            showErrorAlert(e);
+          } finally {
+            isLoading.value = false;
           }
         },
       );
@@ -105,7 +109,7 @@ class AudioCallButton extends HookConsumerWidget {
     // Show join/start call button
     return IconButton(
       icon: const Icon(Icons.call),
-      tooltip: 'Start/Join Call',
+      tooltip: 'Start Call',
       onPressed: handleJoin,
     );
   }

lib/widgets/chat/call_content.dart

@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/pods/chat/call.dart';
+import 'package:island/widgets/chat/call_participant_tile.dart';
+import 'package:livekit_client/livekit_client.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class CallContent extends HookConsumerWidget {
+  const CallContent({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final callState = ref.watch(callNotifierProvider);
+    final callNotifier = ref.watch(callNotifierProvider.notifier);
+
+    if (!callState.isConnected) {
+      return const Center(child: CircularProgressIndicator());
+    }
+    if (callNotifier.participants.isEmpty) {
+      return const Center(child: Text('No participants in call'));
+    }
+
+    final participants = callNotifier.participants;
+    final allAudioOnly = participants.every(
+      (p) =>
+          !(p.hasVideo &&
+              p.remoteParticipant.trackPublications.values.any(
+                (pub) =>
+                    pub.track != null &&
+                    pub.kind == TrackType.VIDEO &&
+                    !pub.muted &&
+                    !pub.isDisposed,
+              )),
+    );
+
+    if (allAudioOnly) {
+      // Audio-only: show avatars in a compact row
+      return Center(
+        child: SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          child: Wrap(
+            crossAxisAlignment: WrapCrossAlignment.center,
+            alignment: WrapAlignment.center,
+            spacing: 8,
+            runSpacing: 8,
+            children: [
+              for (final live in participants)
+                SpeakingRippleAvatar(
+                  live: live,
+                  size: 72,
+                ).padding(horizontal: 4),
+            ],
+          ),
+        ),
+      );
+    }
+
+    // Show all participants in a responsive grid
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        // Calculate width for responsive 2-column layout
+        final itemWidth = (constraints.maxWidth / 2) - 16;
+
+        return Wrap(
+          alignment: WrapAlignment.center,
+          runAlignment: WrapAlignment.center,
+          spacing: 8,
+          runSpacing: 8,
+          children: [
+            for (final participant in participants)
+              SizedBox(
+                width: itemWidth,
+                child: CallParticipantTile(live: participant),
+              ),
+          ],
+        );
+      },
+    );
+  }
+}

lib/widgets/chat/call_overlay.dart

@@ -1,11 +1,18 @@
+import 'package:animations/animations.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/account.dart';
+import 'package:island/models/chat.dart';
 import 'package:island/pods/chat/call.dart';
+import 'package:island/pods/userinfo.dart';
+import 'package:island/screens/chat/call.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/chat/call_button.dart';
+import 'package:island/widgets/chat/call_content.dart';
 import 'package:island/widgets/chat/call_participant_tile.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -13,7 +20,8 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:livekit_client/livekit_client.dart';
 
 class CallControlsBar extends HookConsumerWidget {
-  const CallControlsBar({super.key});
+  final bool isCompact;
+  const CallControlsBar({super.key, this.isCompact = false});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -21,11 +29,14 @@ class CallControlsBar extends HookConsumerWidget {
     final callNotifier = ref.read(callNotifierProvider.notifier);
 
     return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+      padding: EdgeInsets.symmetric(
+        horizontal: isCompact ? 12 : 20,
+        vertical: isCompact ? 8 : 16,
+      ),
       child: Wrap(
         alignment: WrapAlignment.center,
-        runSpacing: 16,
-        spacing: 16,
+        runSpacing: isCompact ? 12 : 16,
+        spacing: isCompact ? 12 : 16,
         children: [
           _buildCircularButtonWithDropdown(
             context: context,
@@ -73,12 +84,15 @@ class CallControlsBar extends HookConsumerWidget {
                       (innerContext) => Column(
                         mainAxisSize: MainAxisSize.min,
                         children: [
+                          const Gap(24),
                           ListTile(
                             leading: const Icon(Symbols.logout, fill: 1),
                             title: Text('callLeave').tr(),
                             onTap: () {
                               callNotifier.disconnect();
-                              Navigator.of(context).pop();
+                              if (Navigator.of(context).canPop()) {
+                                Navigator.of(context).pop();
+                              }
                               Navigator.of(innerContext).pop();
                             },
                           ),
@@ -96,7 +110,9 @@ class CallControlsBar extends HookConsumerWidget {
                                 );
                                 callNotifier.dispose();
                                 if (context.mounted) {
-                                  Navigator.of(context).pop();
+                                  if (Navigator.of(context).canPop()) {
+                                    Navigator.of(context).pop();
+                                  }
                                   Navigator.of(innerContext).pop();
                                 }
                               } catch (err) {
@@ -124,12 +140,14 @@ class CallControlsBar extends HookConsumerWidget {
     required Color backgroundColor,
     Color? iconColor,
   }) {
+    final size = isCompact ? 40.0 : 56.0;
+    final iconSize = isCompact ? 20.0 : 24.0;
     return Container(
-      width: 56,
-      height: 56,
+      width: size,
+      height: size,
       decoration: BoxDecoration(color: backgroundColor, shape: BoxShape.circle),
       child: IconButton(
-        icon: Icon(icon, color: iconColor ?? Colors.white, size: 24),
+        icon: Icon(icon, color: iconColor ?? Colors.white, size: iconSize),
         onPressed: onPressed,
       ),
     );
@@ -145,41 +163,51 @@ class CallControlsBar extends HookConsumerWidget {
     Color? iconColor,
     String? deviceType, // 'videoinput' or 'audioinput'
   }) {
+    final size = isCompact ? 40.0 : 56.0;
+    final iconSize = isCompact ? 20.0 : 24.0;
     return Stack(
+      clipBehavior: Clip.none,
       children: [
         Container(
-          width: 56,
-          height: 56,
+          width: size,
+          height: size,
           decoration: BoxDecoration(
             color: backgroundColor,
             shape: BoxShape.circle,
           ),
           child: IconButton(
-            icon: Icon(icon, color: iconColor ?? Colors.white, size: 24),
+            icon: Icon(icon, color: iconColor ?? Colors.white, size: iconSize),
             onPressed: onPressed,
           ),
         ),
         if (hasDropdown && deviceType != null)
           Positioned(
-            bottom: 4,
-            right: 4,
-            child: GestureDetector(
-              onTap: () => _showDeviceSelectionDialog(context, ref, deviceType),
-              child: Container(
-                width: 16,
-                height: 16,
-                decoration: BoxDecoration(
-                  color: backgroundColor.withOpacity(0.8),
-                  shape: BoxShape.circle,
-                  border: Border.all(
-                    color: Colors.white.withOpacity(0.3),
-                    width: 0.5,
+            bottom: 0,
+            right: isCompact ? 0 : -4,
+            child: Material(
+              color:
+                  Colors
+                      .transparent, // Make Material transparent to show underlying color
+              child: InkWell(
+                onTap:
+                    () => _showDeviceSelectionDialog(context, ref, deviceType),
+                borderRadius: BorderRadius.circular((isCompact ? 16 : 24) / 2),
+                child: Container(
+                  width: isCompact ? 16 : 24,
+                  height: isCompact ? 16 : 24,
+                  decoration: BoxDecoration(
+                    color: backgroundColor.withOpacity(0.8),
+                    shape: BoxShape.circle,
+                    border: Border.all(
+                      color: Colors.white.withOpacity(0.3),
+                      width: 0.5,
+                    ),
+                  ),
+                  child: Icon(
+                    Icons.arrow_drop_down,
+                    color: Colors.white,
+                    size: isCompact ? 12 : 20,
                   ),
-                ),
-                child: Icon(
-                  Icons.arrow_drop_down,
-                  color: Colors.white,
-                  size: 12,
                 ),
               ),
             ),
@@ -279,34 +307,150 @@ class CallControlsBar extends HookConsumerWidget {
 }
 
 class CallOverlayBar extends HookConsumerWidget {
-  const CallOverlayBar({super.key});
+  final SnChatRoom room;
+  const CallOverlayBar({super.key, required this.room});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final callState = ref.watch(callNotifierProvider);
     final callNotifier = ref.read(callNotifierProvider.notifier);
-    // Only show if connected and not on the call screen
-    if (!callState.isConnected) return const SizedBox.shrink();
+    final ongoingCall = ref.watch(ongoingCallProvider(room.id));
 
+    // State for overlay mode: compact or preview
+    // Default to true (preview mode) so user sees video immediately after joining
+    final isExpanded = useState(true);
+
+    Widget child;
+    if (callState.isConnected) {
+      child = _buildActiveCallOverlay(
+        context,
+        ref,
+        callState,
+        callNotifier,
+        isExpanded,
+      );
+    } else if (ongoingCall.value != null) {
+      child = _buildJoinPrompt(context, ref);
+    } else {
+      child = const SizedBox.shrink(key: ValueKey('empty'));
+    }
+
+    return AnimatedSize(
+      duration: const Duration(milliseconds: 150),
+      curve: Curves.easeInOut,
+      alignment: Alignment.topCenter,
+      child: AnimatedSwitcher(
+        duration: const Duration(milliseconds: 150),
+        layoutBuilder: (currentChild, previousChildren) {
+          return Stack(
+            alignment: Alignment.topCenter,
+            children: <Widget>[
+              ...previousChildren,
+              if (currentChild != null) currentChild,
+            ],
+          );
+        },
+        child: child,
+      ),
+    );
+  }
+
+  Widget _buildJoinPrompt(BuildContext context, WidgetRef ref) {
+    final isLoading = useState(false);
+
+    return Card(
+      key: const ValueKey('join_prompt'),
+      margin: EdgeInsets.zero,
+      color: Theme.of(context).colorScheme.surfaceContainerHighest,
+      child: Row(
+        children: [
+          Container(
+            padding: const EdgeInsets.all(8),
+            decoration: BoxDecoration(
+              color: Theme.of(context).colorScheme.primary,
+              shape: BoxShape.circle,
+            ),
+            child: Icon(
+              Icons.videocam,
+              color: Theme.of(context).colorScheme.onPrimary,
+              size: 20,
+            ),
+          ),
+          const Gap(12),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text('Call in progress').bold(),
+              Text('Tap to join', style: Theme.of(context).textTheme.bodySmall),
+            ],
+          ),
+          const Spacer(),
+          if (isLoading.value)
+            const SizedBox(
+              width: 24,
+              height: 24,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ).padding(right: 8)
+          else
+            FilledButton.icon(
+              onPressed: () async {
+                isLoading.value = true;
+                try {
+                  // Just join the room, don't navigate
+                  await ref.read(callNotifierProvider.notifier).joinRoom(room);
+                } catch (e) {
+                  showErrorAlert(e);
+                } finally {
+                  isLoading.value = false;
+                }
+              },
+              icon: const Icon(Icons.call, size: 18),
+              label: const Text('Join'),
+              style: FilledButton.styleFrom(
+                visualDensity: VisualDensity.compact,
+              ),
+            ),
+        ],
+      ).padding(all: 12),
+    );
+  }
+
+  String _getChatRoomName(SnChatRoom? room, SnAccount currentUser) {
+    if (room == null) return 'unnamed'.tr();
+    return room.name ??
+        (room.members ?? [])
+            .where((element) => element.id != currentUser.id)
+            .map((element) => element.account.nick)
+            .first;
+  }
+
+  Widget _buildActiveCallOverlay(
+    BuildContext context,
+    WidgetRef ref,
+    CallState callState,
+    CallNotifier callNotifier,
+    ValueNotifier<bool> isExpanded,
+  ) {
     final lastSpeaker =
         callNotifier.participants
                 .where(
                   (element) => element.remoteParticipant.lastSpokeAt != null,
                 )
                 .isEmpty
-            ? callNotifier.participants.first
+            ? callNotifier.participants.firstOrNull
             : callNotifier.participants
                 .where(
                   (element) => element.remoteParticipant.lastSpokeAt != null,
                 )
                 .fold(
-                  callNotifier.participants.first,
+                  callNotifier.participants.firstOrNull,
                   (value, element) =>
                       element.remoteParticipant.lastSpokeAt != null &&
-                              (value.remoteParticipant.lastSpokeAt == null ||
+                              (value?.remoteParticipant.lastSpokeAt == null ||
                                   element.remoteParticipant.lastSpokeAt!
                                           .compareTo(
-                                            value
+                                            value!
                                                 .remoteParticipant
                                                 .lastSpokeAt!,
                                           ) >
@@ -315,11 +459,76 @@ class CallOverlayBar extends HookConsumerWidget {
                           : value,
                 );
 
-    final actionButtonStyle = ButtonStyle(
-      minimumSize: const MaterialStatePropertyAll(Size(24, 24)),
-    );
+    if (lastSpeaker == null) {
+      return const SizedBox.shrink(key: ValueKey('active_waiting'));
+    }
 
+    final userInfo = ref.watch(userInfoProvider).value!;
+
+    // Preview Mode (Expanded)
+    if (isExpanded.value) {
+      return Card(
+        key: const ValueKey('active_expanded'),
+        margin: EdgeInsets.zero,
+        clipBehavior: Clip.antiAlias,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            // Header
+            Row(
+              children: [
+                const Gap(4),
+                Text(_getChatRoomName(callNotifier.chatRoom, userInfo)),
+                const Gap(4),
+                Text(formatDuration(callState.duration)).bold(),
+                const Spacer(),
+                OpenContainer(
+                  closedElevation: 0,
+                  closedColor: Colors.transparent,
+                  openColor: Theme.of(context).scaffoldBackgroundColor,
+                  middleColor: Theme.of(context).scaffoldBackgroundColor,
+                  openBuilder: (context, action) => CallScreen(room: room),
+                  closedBuilder:
+                      (context, openContainer) => IconButton(
+                        visualDensity: const VisualDensity(
+                          horizontal: -4,
+                          vertical: -4,
+                        ),
+                        icon: const Icon(Icons.fullscreen),
+                        onPressed: openContainer,
+                        tooltip: 'Full Screen',
+                      ),
+                ),
+                IconButton(
+                  visualDensity: const VisualDensity(
+                    horizontal: -4,
+                    vertical: -4,
+                  ),
+                  icon: const Icon(Icons.expand_less),
+                  onPressed: () => isExpanded.value = false,
+                  tooltip: 'Collapse',
+                ),
+              ],
+            ).padding(horizontal: 12, vertical: 8),
+            // Video Preview
+            Container(
+              height: 200,
+              width: double.infinity,
+              color: Theme.of(context).colorScheme.surfaceContainerHighest,
+              child: const CallContent(),
+            ),
+            const CallControlsBar(
+              isCompact: true,
+            ).padding(vertical: 8, horizontal: 16),
+          ],
+        ),
+      );
+    }
+
+    // Compact Mode
     return GestureDetector(
+      key: const ValueKey('active_collapsed'),
+      onTap: () => isExpanded.value = true,
       child: Card(
         margin: EdgeInsets.zero,
         child: Row(
@@ -328,30 +537,32 @@ class CallOverlayBar extends HookConsumerWidget {
             Expanded(
               child: Row(
                 children: [
-                  Builder(
-                    builder: (context) {
-                      if (callNotifier.localParticipant == null) {
-                        return CircularProgressIndicator().center();
-                      }
-                      return SizedBox(
-                        width: 40,
-                        height: 40,
-                        child:
-                            SpeakingRippleAvatar(
-                              live: lastSpeaker,
-                              size: 36,
-                            ).center(),
-                      );
-                    },
+                  SizedBox(
+                    width: 40,
+                    height: 40,
+                    child:
+                        SpeakingRippleAvatar(
+                          live: lastSpeaker,
+                          size: 36,
+                        ).center(),
                   ),
                   const Gap(8),
                   Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text('@${lastSpeaker.participant.identity}').bold(),
-                      Text(
-                        formatDuration(callState.duration),
-                        style: Theme.of(context).textTheme.bodySmall,
+                      Row(
+                        spacing: 4,
+                        children: [
+                          Text(
+                            _getChatRoomName(callNotifier.chatRoom, userInfo),
+                            style: Theme.of(context).textTheme.bodySmall,
+                          ),
+                          Text(
+                            formatDuration(callState.duration),
+                            style: Theme.of(context).textTheme.bodySmall,
+                          ),
+                        ],
                       ),
                     ],
                   ),
@@ -361,41 +572,20 @@ class CallOverlayBar extends HookConsumerWidget {
             IconButton(
               icon: Icon(
                 callState.isMicrophoneEnabled ? Icons.mic : Icons.mic_off,
+                size: 20,
               ),
               onPressed: () {
                 callNotifier.toggleMicrophone();
               },
-              style: actionButtonStyle,
             ),
             IconButton(
-              icon: Icon(
-                callState.isCameraEnabled ? Icons.videocam : Icons.videocam_off,
-              ),
-              onPressed: () {
-                callNotifier.toggleCamera();
-              },
-              style: actionButtonStyle,
-            ),
-            IconButton(
-              icon: Icon(
-                callState.isScreenSharing
-                    ? Icons.stop_screen_share
-                    : Icons.screen_share,
-              ),
-              onPressed: () {
-                callNotifier.toggleScreenShare(context);
-              },
-              style: actionButtonStyle,
+              icon: const Icon(Icons.expand_more),
+              onPressed: () => isExpanded.value = true,
+              tooltip: 'Expand',
             ),
           ],
-        ).padding(all: 16),
+        ).padding(all: 12),
       ),
-      onTap: () {
-        context.pushNamed(
-          'chatCall',
-          pathParameters: {'id': callNotifier.roomId!},
-        );
-      },
     );
   }
 }

lib/widgets/chat/call_participant_tile.dart

@@ -8,6 +8,59 @@ import 'package:livekit_client/livekit_client.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 
+class SpeakingRipple extends StatelessWidget {
+  final double size;
+  final double audioLevel;
+  final bool isSpeaking;
+  final Widget child;
+
+  const SpeakingRipple({
+    super.key,
+    required this.size,
+    required this.audioLevel,
+    required this.isSpeaking,
+    required this.child,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final avatarRadius = size / 2;
+    final clampedLevel = audioLevel.clamp(0.0, 1.0);
+    final rippleRadius = avatarRadius + clampedLevel * (size * 0.333);
+
+    return SizedBox(
+      width: size + 8,
+      height: size + 8,
+      child: TweenAnimationBuilder<double>(
+        tween: Tween<double>(
+          begin: avatarRadius,
+          end: isSpeaking ? rippleRadius : avatarRadius,
+        ),
+        duration: const Duration(milliseconds: 250),
+        curve: Curves.easeOut,
+        builder: (context, animatedRadius, child) {
+          return Stack(
+            alignment: Alignment.center,
+            children: [
+              if (isSpeaking)
+                Container(
+                  width: animatedRadius * 2,
+                  height: animatedRadius * 2,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: Colors.green.withOpacity(0.75 + 0.25 * clampedLevel),
+                  ),
+                ),
+              child!,
+            ],
+          );
+        },
+        child: SizedBox(width: size, height: size, child: child),
+      ),
+    );
+  }
+}
+
 class SpeakingRippleAvatar extends HookConsumerWidget {
   final CallParticipantLive live;
   final double size;
@@ -18,79 +71,58 @@ class SpeakingRippleAvatar extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final account = ref.watch(accountProvider(live.participant.identity));
 
-    final avatarRadius = size / 2;
-    final clampedLevel = live.remoteParticipant.audioLevel.clamp(0.0, 1.0);
-    final rippleRadius = avatarRadius + clampedLevel * (size * 0.333);
-    return SizedBox(
-      width: size + 8,
-      height: size + 8,
-      child: TweenAnimationBuilder<double>(
-        tween: Tween<double>(
-          begin: avatarRadius,
-          end: live.remoteParticipant.isSpeaking ? rippleRadius : avatarRadius,
-        ),
-        duration: const Duration(milliseconds: 250),
-        curve: Curves.easeOut,
-        builder: (context, animatedRadius, child) {
-          return Stack(
+    return SpeakingRipple(
+      size: size,
+      audioLevel: live.remoteParticipant.audioLevel,
+      isSpeaking: live.remoteParticipant.isSpeaking,
+      child: Stack(
+        children: [
+          Container(
+            width: size,
+            height: size,
             alignment: Alignment.center,
-            children: [
-              if (live.remoteParticipant.isSpeaking)
-                Container(
-                  width: animatedRadius * 2,
-                  height: animatedRadius * 2,
-                  decoration: BoxDecoration(
-                    shape: BoxShape.circle,
-                    color: Colors.green.withOpacity(0.75 + 0.25 * clampedLevel),
+            decoration: const BoxDecoration(shape: BoxShape.circle),
+            child: account.when(
+              data:
+                  (value) => CallParticipantGestureDetector(
+                    participant: live,
+                    child: ProfilePictureWidget(
+                      file: value.profile.picture,
+                      radius: size / 2,
+                    ),
                   ),
+              error:
+                  (_, _) => CircleAvatar(
+                    radius: size / 2,
+                    child: const Icon(Symbols.person_remove),
+                  ),
+              loading:
+                  () => CircleAvatar(
+                    radius: size / 2,
+                    child: CircularProgressIndicator(),
+                  ),
+            ),
+          ),
+          if (live.remoteParticipant.isMuted)
+            Positioned(
+              bottom: 0,
+              right: 0,
+              child: Container(
+                width: 24,
+                height: 24,
+                decoration: BoxDecoration(
+                  color: Colors.red,
+                  borderRadius: BorderRadius.circular(12),
+                  border: Border.all(color: Colors.white, width: 2),
                 ),
-              Container(
-                width: size,
-                height: size,
-                alignment: Alignment.center,
-                decoration: BoxDecoration(shape: BoxShape.circle),
-                child: account.when(
-                  data:
-                      (value) => CallParticipantGestureDetector(
-                        participant: live,
-                        child: ProfilePictureWidget(
-                          file: value.profile.picture,
-                          radius: size / 2,
-                        ),
-                      ),
-                  error:
-                      (_, _) => CircleAvatar(
-                        radius: size / 2,
-                        child: const Icon(Symbols.person_remove),
-                      ),
-                  loading:
-                      () => CircleAvatar(
-                        radius: size / 2,
-                        child: CircularProgressIndicator(),
-                      ),
+                child: const Icon(
+                  Symbols.mic_off,
+                  size: 14,
+                  color: Colors.white,
                 ),
               ),
-              if (live.remoteParticipant.isMuted)
-                Positioned(
-                  bottom: 4,
-                  right: 4,
-                  child: Container(
-                    width: 20,
-                    height: 20,
-                    decoration: BoxDecoration(
-                      color: Colors.red,
-                      borderRadius: BorderRadius.all(Radius.circular(10)),
-                    ),
-                    child: const Icon(
-                      Symbols.mic_off,
-                      size: 14,
-                      fill: 1,
-                    ).padding(left: 1.5, top: 1.5),
-                  ),
-                ),
-            ],
-          );
-        },
+            ),
+        ],
       ),
     );
   }
@@ -103,6 +135,8 @@ class CallParticipantTile extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final userInfo = ref.watch(accountProvider(live.participant.name));
+
     final hasVideo =
         live.hasVideo &&
         live.remoteParticipant.trackPublications.values
@@ -110,42 +144,92 @@ class CallParticipantTile extends HookConsumerWidget {
             .isNotEmpty;
 
     if (hasVideo) {
-      return Stack(
-        fit: StackFit.loose,
-        children: [
-          AspectRatio(
-            aspectRatio: 16 / 9,
-            child: VideoTrackRenderer(
-              live.remoteParticipant.trackPublications.values
-                      .where((track) => track.kind == TrackType.VIDEO)
-                      .first
-                      .track
-                  as VideoTrack,
-              renderMode: VideoRenderMode.platformView,
-            ),
-          ),
-          Positioned(
-            left: 8,
-            right: 8,
-            bottom: 8,
-            child: Text(
-              '@${live.participant.name}',
-              textAlign: TextAlign.center,
-              style: const TextStyle(
-                fontSize: 14,
-                color: Colors.white,
-                shadows: [
-                  BoxShadow(
-                    color: Colors.black54,
-                    offset: Offset(1, 1),
-                    spreadRadius: 8,
-                    blurRadius: 8,
-                  ),
-                ],
+      return Padding(
+        padding: const EdgeInsets.all(8),
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            // Use the smaller dimension to determine the "size" for the ripple calculation
+            // effectively making the ripple relative to the tile size.
+            // However, for a rectangular video, we might want a different approach.
+            // The user asked for "speaking ripple to the video as well".
+            // If we use the extracted SpeakingRipple, it expects a size and assumes a circle.
+            // We need to adapt it or create a rectangular version.
+            // Given the "image" likely shows a rectangular video with rounded corners,
+            // let's create a specific wrapper for the video tile that adds a border/glow when speaking.
+
+            final isSpeaking = live.remoteParticipant.isSpeaking;
+            final audioLevel = live.remoteParticipant.audioLevel;
+
+            return AnimatedContainer(
+              duration: const Duration(milliseconds: 200),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                borderRadius: BorderRadius.circular(16),
+                border: Border.all(
+                  color:
+                      isSpeaking
+                          ? Colors.green.withOpacity(
+                            0.5 + 0.5 * audioLevel.clamp(0.0, 1.0),
+                          )
+                          : Theme.of(context).colorScheme.outlineVariant,
+                  width: isSpeaking ? 4 : 1,
+                ),
               ),
-            ),
-          ),
-        ],
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(12),
+                child: AspectRatio(
+                  aspectRatio: 16 / 9,
+                  child: Stack(
+                    fit: StackFit.expand,
+                    children: [
+                      VideoTrackRenderer(
+                        live.remoteParticipant.trackPublications.values
+                                .where((track) => track.kind == TrackType.VIDEO)
+                                .first
+                                .track
+                            as VideoTrack,
+                        renderMode: VideoRenderMode.platformView,
+                      ),
+                      Positioned(
+                        left: 8,
+                        bottom: 8,
+                        child: Container(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 8,
+                            vertical: 4,
+                          ),
+                          decoration: BoxDecoration(
+                            color: Colors.black.withOpacity(0.6),
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              if (live.remoteParticipant.isMuted)
+                                const Icon(
+                                  Symbols.mic_off,
+                                  size: 14,
+                                  color: Colors.redAccent,
+                                ).padding(right: 4),
+                              Text(
+                                userInfo.value?.nick ?? live.participant.name,
+                                style: const TextStyle(
+                                  fontSize: 12,
+                                  color: Colors.white,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            );
+          },
+        ),
       );
     } else {
       return SpeakingRippleAvatar(size: 84, live: live);

lib/widgets/chat/chat_input.dart

@@ -45,6 +45,8 @@ void _insertPlaceholder(TextEditingController controller, String placeholder) {
 
 const kInputDrawerExpandedHeight = 180.0;
 
+const kExpandedSectionTabHeight = 32.0;
+
 class _ExpandedSection extends StatelessWidget {
   final TextEditingController messageController;
   final SnPoll? selectedPoll;
@@ -75,9 +77,23 @@ class _ExpandedSection extends StatelessWidget {
           length: 2,
           child: Column(
             children: [
-              TabBar(
-                splashBorderRadius: const BorderRadius.all(Radius.circular(40)),
-                tabs: [Tab(text: 'Features'), Tab(text: 'Stickers')],
+              PreferredSize(
+                preferredSize: const Size.fromHeight(kExpandedSectionTabHeight),
+                child: TabBar(
+                  splashBorderRadius: const BorderRadius.all(
+                    Radius.circular(40),
+                  ),
+                  tabs: [
+                    Tab(
+                      text: 'features'.tr(),
+                      height: kExpandedSectionTabHeight,
+                    ),
+                    Tab(
+                      text: 'stickers'.tr(),
+                      height: kExpandedSectionTabHeight,
+                    ),
+                  ],
+                ),
               ),
               SizedBox(
                 height: kInputDrawerExpandedHeight,
@@ -248,6 +264,7 @@ class ChatInput extends HookConsumerWidget {
 
     void send() {
       inputFocusNode.requestFocus();
+      if (isExpanded.value) isExpanded.value = false;
       onSend.call();
     }
 

lib/widgets/chat/message_item.dart

@@ -596,6 +596,7 @@ class MessageHoverActionMenu extends StatelessWidget {
     final confirmed = await showConfirmAlert(
       'deleteMessageConfirmation'.tr(),
       'deleteMessage'.tr(),
+      isDanger: true,
     );
 
     if (confirmed) {

lib/widgets/chat/message_sender_info.dart

@@ -77,27 +77,12 @@ class MessageSenderInfo extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Row(
-                  children: [
-                    AccountName(
-                      account: sender.account,
-                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                        color: textColor,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ),
-                    const SizedBox(width: 4),
-                    Badge(
-                      label:
-                          Text(
-                            sender.role >= 100
-                                ? 'permissionOwner'
-                                : sender.role >= 50
-                                ? 'permissionModerator'
-                                : 'permissionMember',
-                          ).tr(),
-                    ),
-                  ],
+                AccountName(
+                  account: sender.account,
+                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                    color: textColor,
+                    fontWeight: FontWeight.w500,
+                  ),
                 ),
                 Text(
                   timestamp,

lib/widgets/content/alert.native.dart

@@ -1,64 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter_platform_alert/flutter_platform_alert.dart';
-import 'package:island/talker.dart';
-
-String _parseRemoteError(DioException err) {
-  String? message;
-  if (err.response?.data is String) {
-    message = err.response?.data;
-  } else if (err.response?.data?['message'] != null) {
-    message = <String?>[
-      err.response?.data?['message']?.toString(),
-      err.response?.data?['detail']?.toString(),
-    ].where((e) => e != null).cast<String>().map((e) => e.trim()).join('\n');
-  } else if (err.response?.data?['errors'] != null) {
-    final errors = err.response?.data['errors'] as Map<String, dynamic>;
-    message = errors.values
-        .map(
-          (ele) =>
-              (ele as List<dynamic>).map((ele) => ele.toString()).join('\n'),
-        )
-        .join('\n');
-  }
-  if (message == null || message.isEmpty) message = err.response?.statusMessage;
-  message ??= err.message;
-  return message ?? err.toString();
-}
-
-void showErrorAlert(dynamic err) async {
-  if (err is Error) {
-    talker.error('Something went wrong...', err, err.stackTrace);
-  }
-  final text = switch (err) {
-    String _ => err,
-    DioException _ => _parseRemoteError(err),
-    Exception _ => err.toString(),
-    _ => err.toString(),
-  };
-  FlutterPlatformAlert.showAlert(
-    windowTitle: 'somethingWentWrong'.tr(),
-    text: text,
-    alertStyle: AlertButtonStyle.ok,
-    iconStyle: IconStyle.error,
-  );
-}
-
-void showInfoAlert(String message, String title) async {
-  FlutterPlatformAlert.showAlert(
-    windowTitle: title,
-    text: message,
-    alertStyle: AlertButtonStyle.ok,
-    iconStyle: IconStyle.information,
-  );
-}
-
-Future<bool> showConfirmAlert(String message, String title) async {
-  final result = await FlutterPlatformAlert.showAlert(
-    windowTitle: title,
-    text: message,
-    alertStyle: AlertButtonStyle.okCancel,
-    iconStyle: IconStyle.question,
-  );
-  return result == AlertButton.okButton;
-}

lib/widgets/content/alert.web.dart

@@ -1,53 +0,0 @@
-// ignore_for_file: avoid_web_libraries_in_flutter
-
-import 'dart:js' as js;
-
-import 'package:dio/dio.dart';
-import 'package:easy_localization/easy_localization.dart';
-
-String _parseRemoteError(DioException err) {
-  String? message;
-  if (err.response?.data is String) {
-    message = err.response?.data;
-  } else if (err.response?.data?['message'] != null) {
-    message = <String?>[
-      err.response?.data?['message']?.toString(),
-      err.response?.data?['detail']?.toString(),
-    ].where((e) => e != null).cast<String>().map((e) => e.trim()).join('\n');
-  } else if (err.response?.data?['errors'] != null) {
-    final errors = err.response?.data['errors'] as Map<String, dynamic>;
-    message = errors.values
-        .map(
-          (ele) =>
-              (ele as List<dynamic>).map((ele) => ele.toString()).join('\n'),
-        )
-        .join('\n');
-  }
-  if (message == null || message.isEmpty) message = err.response?.statusMessage;
-  message ??= err.message;
-  return message ?? err.toString();
-}
-
-void showErrorAlert(dynamic err) async {
-  final text = switch (err) {
-    String _ => err,
-    DioException _ => _parseRemoteError(err),
-    Exception _ => err.toString(),
-    _ => err.toString(),
-  };
-  js.context.callMethod('swal', ['somethingWentWrong'.tr(), text, 'error']);
-}
-
-void showInfoAlert(String message, String title) async {
-  js.context.callMethod('swal', [title, message, 'info']);
-}
-
-Future<bool> showConfirmAlert(String message, String title) async {
-  final result = await js.context.callMethod('swal', [
-    title,
-    message,
-    'question',
-    {'buttons': true},
-  ]);
-  return result == true;
-}

lib/widgets/content/cloud_file_collection.dart

@@ -215,6 +215,7 @@ class CloudFileList extends HookConsumerWidget {
     }
     if (files.length == 1) {
       final isImage = files.first.mimeType?.startsWith('image') ?? false;
+      final isAudio = files.first.mimeType?.startsWith('audio') ?? false;
       final ratio = files.first.fileMeta?['ratio'] as num?;
       final widgetItem = ClipRRect(
         borderRadius: const BorderRadius.all(Radius.circular(8)),
@@ -246,6 +247,8 @@ class CloudFileList extends HookConsumerWidget {
         child:
             (ratio == null && isImage)
                 ? IntrinsicWidth(child: IntrinsicHeight(child: widgetItem))
+                : (ratio == null && isAudio)
+                ? IntrinsicHeight(child: widgetItem)
                 : AspectRatio(
                   aspectRatio: ratio?.toDouble() ?? 1,
                   child: widgetItem,

lib/widgets/content/embed/link.dart

@@ -55,14 +55,18 @@ class _EmbedLinkWidgetState extends State<EmbedLinkWidget> {
       stream.removeListener(listener);
 
       final aspectRatio = info.image.width / info.image.height;
-      setState(() {
-        _isSquare = aspectRatio >= 0.9 && aspectRatio <= 1.1;
-      });
+      if (mounted) {
+        setState(() {
+          _isSquare = aspectRatio >= 0.9 && aspectRatio <= 1.1;
+        });
+      }
     } catch (e) {
       // If error, assume not square
-      setState(() {
-        _isSquare = false;
-      });
+      if (mounted) {
+        setState(() {
+          _isSquare = false;
+        });
+      }
     }
   }
 

lib/widgets/content/markdown.dart

@@ -166,7 +166,6 @@ class MarkdownTextContent extends HookConsumerWidget {
                     label: 'copyToClipboard'.tr(),
                     onPressed: () {
                       Clipboard.setData(ClipboardData(text: href));
-                      clearSnackBar(context);
                     },
                   ),
                 );

lib/widgets/content/network_status_sheet.dart

@@ -15,6 +15,7 @@ class NetworkStatusSheet extends HookConsumerWidget {
     final wsState = ref.watch(websocketStateProvider);
 
     return SheetScaffold(
+      heightFactor: 0.4,
       titleText:
           wsState == WebSocketState.connected()
               ? 'Connection Status'

lib/widgets/content/sheet.dart

@@ -51,7 +51,10 @@ class SheetScaffold extends StatelessWidget {
                 const Spacer(),
                 ...actions,
                 IconButton(
-                  icon: const Icon(Symbols.close),
+                  icon: Icon(
+                    Symbols.close,
+                    color: Theme.of(context).colorScheme.onSurface,
+                  ),
                   onPressed:
                       () =>
                           onClose != null

lib/widgets/file_list_view.dart

@@ -512,6 +512,7 @@ class FileListView extends HookConsumerWidget {
                                   final confirmed = await showConfirmAlert(
                                     'Are you sure you want to delete the selected files?',
                                     'Delete Selected Files',
+                                    isDanger: true,
                                   );
                                   if (!confirmed) return;
                                   if (context.mounted) {
@@ -742,22 +743,25 @@ class FileListView extends HookConsumerWidget {
               ),
             ),
             const Gap(16),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                ElevatedButton.icon(
-                  onPressed: onPickAndUpload,
-                  icon: const Icon(Symbols.upload_file),
-                  label: const Text('Upload Files'),
-                ),
-                const Gap(12),
-                OutlinedButton.icon(
-                  onPressed:
-                      () => onShowCreateDirectory(ref.context, currentPath),
-                  icon: const Icon(Symbols.create_new_folder),
-                  label: const Text('Create Directory'),
-                ),
-              ],
+            SingleChildScrollView(
+              scrollDirection: Axis.horizontal,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  ElevatedButton.icon(
+                    onPressed: onPickAndUpload,
+                    icon: const Icon(Symbols.upload_file),
+                    label: const Text('Upload Files'),
+                  ),
+                  const Gap(12),
+                  OutlinedButton.icon(
+                    onPressed:
+                        () => onShowCreateDirectory(ref.context, currentPath),
+                    icon: const Icon(Symbols.create_new_folder),
+                    label: const Text('Create Directory'),
+                  ),
+                ],
+              ),
             ),
           ],
         ),
@@ -785,6 +789,7 @@ class FileListView extends HookConsumerWidget {
             final confirmed = await showConfirmAlert(
               'confirmDeleteFile'.tr(),
               'deleteFile'.tr(),
+              isDanger: true,
             );
             if (!confirmed) return;
 
@@ -1153,6 +1158,7 @@ class FileListView extends HookConsumerWidget {
           final confirmed = await showConfirmAlert(
             'confirmDeleteFile'.tr(),
             'deleteFile'.tr(),
+            isDanger: true,
           );
           if (!confirmed) return;
 
@@ -1221,6 +1227,7 @@ class FileListView extends HookConsumerWidget {
           final confirmed = await showConfirmAlert(
             'confirmDeleteFile'.tr(),
             'deleteFile'.tr(),
+            isDanger: true,
           );
           if (!confirmed) return;
 
@@ -1263,6 +1270,7 @@ class FileListView extends HookConsumerWidget {
             final confirmed = await showConfirmAlert(
               'confirmDeleteFile'.tr(),
               'deleteFile'.tr(),
+              isDanger: true,
             );
             if (!confirmed) return;
 

lib/widgets/post/compose_embed_sheet.dart

@@ -6,6 +6,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/post.dart';
+import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/post/compose_shared.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -56,9 +57,7 @@ class ComposeEmbedSheet extends HookConsumerWidget {
     void saveEmbedView() {
       final uri = uriController.text.trim();
       if (uri.isEmpty) {
-        ScaffoldMessenger.of(
-          context,
-        ).showSnackBar(SnackBar(content: Text('embedUriRequired'.tr())));
+        showSnackBar('embedUriRequired'.tr());
         return;
       }
 

lib/widgets/post/compose_shared.dart

@@ -751,12 +751,7 @@ class ComposeLogic {
 
       return post;
     } catch (err) {
-      // Show error message if context is mounted
-      if (context.mounted) {
-        ScaffoldMessenger.of(
-          context,
-        ).showSnackBar(SnackBar(content: Text('Error: $err')));
-      }
+      showErrorAlert(err);
       rethrow;
     } finally {
       state.submitting.value = false;

lib/widgets/post/compose_sheet.dart

@@ -5,6 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/post.dart';
 import 'package:island/screens/posts/compose.dart';
+import 'package:island/screens/posts/post_detail.dart';
 import 'package:island/services/compose_storage_db.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/post/compose_card.dart';
@@ -50,19 +51,33 @@ class PostComposeSheet extends HookConsumerWidget {
     final restoredInitialState = useState<PostComposeInitialState?>(null);
     final prompted = useState(false);
 
-    final repliedPost = initialState?.replyingTo ?? originalPost?.repliedPost;
+    // Fetch full post data if we're editing a post
+    final fullPostData =
+        originalPost != null
+            ? ref.watch(postProvider(originalPost!.id))
+            : const AsyncValue.data(null);
+
+    // Use the full post data if available, otherwise fall back to originalPost
+    final effectiveOriginalPost = fullPostData.when(
+      data: (fullPost) => fullPost ?? originalPost,
+      loading: () => originalPost,
+      error: (_, _) => originalPost,
+    );
+
+    final repliedPost =
+        initialState?.replyingTo ?? effectiveOriginalPost?.repliedPost;
     final forwardedPost =
-        initialState?.forwardingTo ?? originalPost?.forwardedPost;
+        initialState?.forwardingTo ?? effectiveOriginalPost?.forwardedPost;
 
     // Create compose state
     final ComposeState state = useMemoized(
       () => ComposeLogic.createState(
-        originalPost: originalPost,
+        originalPost: effectiveOriginalPost,
         forwardedPost: forwardedPost,
         repliedPost: repliedPost,
         postType: 0,
       ),
-      [originalPost, forwardedPost, repliedPost],
+      [effectiveOriginalPost, forwardedPost, repliedPost],
     );
 
     // Add a listener to the entire state to trigger rebuilds
@@ -112,7 +127,7 @@ class PostComposeSheet extends HookConsumerWidget {
         ref,
         state,
         context,
-        originalPost: originalPost,
+        originalPost: effectiveOriginalPost,
         repliedPost: repliedPost,
         forwardedPost: forwardedPost,
         onSuccess: () {
@@ -139,8 +154,13 @@ class PostComposeSheet extends HookConsumerWidget {
                   height: 24,
                   child: const CircularProgressIndicator(strokeWidth: 2),
                 )
-                : Icon(originalPost != null ? Symbols.edit : Symbols.upload),
-        tooltip: originalPost != null ? 'postUpdate'.tr() : 'postPublish'.tr(),
+                : Icon(
+                  effectiveOriginalPost != null ? Symbols.edit : Symbols.upload,
+                ),
+        tooltip:
+            effectiveOriginalPost != null
+                ? 'postUpdate'.tr()
+                : 'postPublish'.tr(),
       ),
     ];
 
@@ -148,7 +168,7 @@ class PostComposeSheet extends HookConsumerWidget {
       titleText: 'postCompose'.tr(),
       actions: actions,
       child: PostComposeCard(
-        originalPost: originalPost,
+        originalPost: effectiveOriginalPost,
         initialState: restoredInitialState.value ?? initialState,
         onCancel: () => Navigator.of(context).pop(),
         onSubmit: () {

lib/widgets/post/draft_manager.dart

@@ -122,6 +122,7 @@ class DraftManagerSheet extends HookConsumerWidget {
                         final confirmed = await showConfirmAlert(
                           'clearAllDraftsConfirm'.tr(),
                           'clearAllDrafts'.tr(),
+                          isDanger: true,
                         );
 
                         if (confirmed == true) {

lib/widgets/post/post_item.dart

@@ -197,6 +197,7 @@ class PostActionableItem extends HookConsumerWidget {
                   showConfirmAlert(
                     'deletePostHint'.tr(),
                     'deletePost'.tr(),
+                    isDanger: true,
                   ).then((confirm) {
                     if (confirm) {
                       final client = ref.watch(apiClientProvider);

lib/widgets/post/post_item_creator.dart

@@ -69,22 +69,24 @@ class PostItemCreator extends HookConsumerWidget {
               title: 'delete'.tr(),
               image: MenuImage.icon(Symbols.delete),
               callback: () {
-                showConfirmAlert('deletePostHint'.tr(), 'deletePost'.tr()).then(
-                  (confirm) {
-                    if (confirm) {
-                      final client = ref.watch(apiClientProvider);
-                      client
-                          .delete('/sphere/posts/${item.id}')
-                          .catchError((err) {
-                            showErrorAlert(err);
-                            return err;
-                          })
-                          .then((_) {
-                            onRefresh?.call();
-                          });
-                    }
-                  },
-                );
+                showConfirmAlert(
+                  'deletePostHint'.tr(),
+                  'deletePost'.tr(),
+                  isDanger: true,
+                ).then((confirm) {
+                  if (confirm) {
+                    final client = ref.watch(apiClientProvider);
+                    client
+                        .delete('/sphere/posts/${item.id}')
+                        .catchError((err) {
+                          showErrorAlert(err);
+                          return err;
+                        })
+                        .then((_) {
+                          onRefresh?.call();
+                        });
+                  }
+                });
               },
             ),
             MenuSeparator(),

lib/widgets/post/post_reaction_sheet.dart

@@ -631,12 +631,33 @@ class CustomReactionForm extends HookConsumerWidget {
               ),
               suffixIcon: InkWell(
                 onTapDown: (details) async {
+                  final screenSize = MediaQuery.sizeOf(context);
+                  const popoverWidth = 500.0;
+                  const popoverHeight = 500.0;
+                  const padding = 20.0;
+
+                  // Calculate safe horizontal position (centered, but within bounds)
+                  final maxHorizontalOffset = math.max(
+                    padding,
+                    screenSize.width - popoverWidth - padding,
+                  );
+                  final horizontalOffset = ((screenSize.width - popoverWidth) /
+                          2)
+                      .clamp(padding, maxHorizontalOffset);
+
+                  // Calculate safe vertical position (bottom-aligned, but within bounds)
+                  final maxVerticalOffset = math.max(
+                    padding,
+                    screenSize.height - popoverHeight - padding,
+                  );
+                  final verticalOffset = (screenSize.height -
+                          popoverHeight -
+                          padding)
+                      .clamp(padding, maxVerticalOffset);
+
                   await showStickerPickerPopover(
                     context,
-                    Offset(
-                      (MediaQuery.sizeOf(context).width - 500) / 2,
-                      MediaQuery.sizeOf(context).height - 500,
-                    ),
+                    Offset(horizontalOffset, verticalOffset),
                     alignment: Alignment.topLeft,
                     onPick: (placeholder) {
                       // Remove the surrounding : from the placeholder

lib/widgets/post/post_shared.dart

@@ -196,7 +196,7 @@ class PostReplyPreview extends HookConsumerWidget {
             : (featuredReply!).map(
               data:
                   (data) => Row(
-                    crossAxisAlignment: CrossAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     spacing: 8,
                     children: [
                       ProfilePictureWidget(

lib/widgets/share/share_sheet.dart

@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/pods/userinfo.dart';
 import 'package:island/services/file_uploader.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/sheet.dart';
@@ -177,8 +178,11 @@ class _ShareSheetState extends ConsumerState<ShareSheet> {
 
       // Show compose sheet
       if (mounted) {
-        PostComposeSheet.show(context, initialState: initialState);
-        Navigator.of(context).pop(); // Close the share sheet
+        await PostComposeSheet.show(context, initialState: initialState);
+        // Close the share sheet after the compose sheet is dismissed
+        if (mounted) {
+          Navigator.of(context).pop();
+        }
       }
     } catch (e) {
       showErrorAlert(e);
@@ -281,23 +285,10 @@ class _ShareSheetState extends ConsumerState<ShareSheet> {
         );
 
         // Show navigation prompt
-        final shouldNavigate = await showDialog<bool>(
-          context: context,
-          builder:
-              (context) => AlertDialog(
-                title: Text('shareSuccess'.tr()),
-                content: Text('wouldYouLikeToGoToChat'.tr()),
-                actions: [
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(false),
-                    child: Text('no'.tr()),
-                  ),
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(true),
-                    child: Text('yes'.tr()),
-                  ),
-                ],
-              ),
+        final shouldNavigate = await showConfirmAlert(
+          'wouldYouLikeToGoToChat'.tr(),
+          'shareSuccess'.tr(),
+          icon: Symbols.check_circle,
         );
 
         // Close the share sheet
@@ -363,6 +354,92 @@ class _ShareSheetState extends ConsumerState<ShareSheet> {
     }
   }
 
+  Future<void> _uploadFiles() async {
+    if (widget.content.files == null || widget.content.files!.isEmpty) return;
+
+    setState(() => _isLoading = true);
+    try {
+      final universalFiles =
+          widget.content.files!.map((file) {
+            UniversalFileType fileType;
+            if (file.mimeType?.startsWith('image/') == true) {
+              fileType = UniversalFileType.image;
+            } else if (file.mimeType?.startsWith('video/') == true) {
+              fileType = UniversalFileType.video;
+            } else if (file.mimeType?.startsWith('audio/') == true) {
+              fileType = UniversalFileType.audio;
+            } else {
+              fileType = UniversalFileType.file;
+            }
+            return UniversalFile(data: file, type: fileType);
+          }).toList();
+
+      // Initialize progress tracking
+      final messageId = DateTime.now().millisecondsSinceEpoch.toString();
+      _fileUploadProgress[messageId] = List.filled(universalFiles.length, 0.0);
+
+      List<SnCloudFile> uploadedFiles = [];
+
+      // Upload each file
+      for (var idx = 0; idx < universalFiles.length; idx++) {
+        final file = universalFiles[idx];
+        final cloudFile =
+            await FileUploader.createCloudFile(
+              ref: ref,
+              fileData: file,
+              onProgress: (progress, _) {
+                if (mounted) {
+                  setState(() {
+                    _fileUploadProgress[messageId]?[idx] = progress ?? 0.0;
+                  });
+                }
+              },
+            ).future;
+
+        if (cloudFile == null) {
+          throw Exception('Failed to upload file: ${file.data.name}');
+        }
+        uploadedFiles.add(cloudFile);
+      }
+
+      if (mounted) {
+        // Show success message
+        showSnackBar('uploadSuccess'.tr());
+
+        // If single file, ask to view details
+        if (uploadedFiles.length == 1) {
+          final shouldView = await showConfirmAlert(
+            'wouldYouLikeToViewFile'.tr(),
+            'uploadSuccess'.tr(),
+            icon: Symbols.check_circle,
+          );
+
+          if (mounted) {
+            Navigator.of(context).pop(); // Close share sheet
+            if (shouldView == true) {
+              context.pushNamed(
+                'fileDetail',
+                pathParameters: {'id': uploadedFiles.first.id},
+                extra: uploadedFiles.first,
+              );
+            }
+          }
+        } else {
+          // Just close for multiple files
+          Navigator.of(context).pop();
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        showErrorAlert(e);
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _isLoading = false);
+      }
+    }
+  }
+
   Future<void> _copyToClipboard() async {
     try {
       String textToCopy = '';
@@ -452,6 +529,15 @@ class _ShareSheetState extends ConsumerState<ShareSheet> {
                                 onTap: _isLoading ? null : _shareToPost,
                               ),
                               const SizedBox(width: 12),
+                              if (widget.content.type ==
+                                  ShareContentType.file) ...[
+                                _CompactShareOption(
+                                  icon: Symbols.cloud_upload,
+                                  title: 'upload'.tr(),
+                                  onTap: _isLoading ? null : _uploadFiles,
+                                ),
+                                const SizedBox(width: 12),
+                              ],
                               _CompactShareOption(
                                 icon: Symbols.content_copy,
                                 title: 'copy'.tr(),
@@ -650,19 +736,26 @@ class _ChatRoomsList extends ConsumerWidget {
   }
 }
 
-class _ChatRoomOption extends StatelessWidget {
+class _ChatRoomOption extends HookConsumerWidget {
   final SnChatRoom room;
   final VoidCallback? onTap;
 
   const _ChatRoomOption({required this.room, this.onTap});
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final userInfo = ref.watch(userInfoProvider);
+
+    final validMembers =
+        (room.members ?? [])
+            .where((m) => m.accountId != userInfo.value?.id)
+            .toList();
+
     final isDirect = room.type == 1; // Assuming type 1 is direct chat
     final displayName =
         room.name ??
-        (isDirect && room.members != null
-            ? room.members!.map((m) => m.account.nick).join(', ')
+        (isDirect
+            ? validMembers.map((m) => m.account.nick).join(', ')
             : 'unknownChat'.tr());
 
     return GestureDetector(
@@ -694,18 +787,22 @@ class _ChatRoomOption extends StatelessWidget {
                 borderRadius: BorderRadius.circular(16),
               ),
               child:
-                  room.picture != null
-                      ? ClipRRect(
-                        borderRadius: BorderRadius.circular(16),
-                        child: CloudFileWidget(
-                          item: room.picture!,
-                          fit: BoxFit.cover,
-                        ),
+                  (isDirect && room.picture?.id == null)
+                      ? SplitAvatarWidget(
+                        filesId:
+                            validMembers
+                                .map((e) => e.account.profile.picture?.id)
+                                .toList(),
+                        radius: 16,
                       )
-                      : Icon(
-                        isDirect ? Symbols.person : Symbols.group,
-                        size: 20,
-                        color: Theme.of(context).colorScheme.primary,
+                      : room.picture?.id == null
+                      ? CircleAvatar(
+                        radius: 16,
+                        child: Text(room.name![0].toUpperCase()),
+                      )
+                      : ProfilePictureWidget(
+                        fileId: room.picture?.id,
+                        radius: 16,
                       ),
             ),
             const SizedBox(height: 4),

lib/widgets/sites/file_item.dart

@@ -0,0 +1,289 @@
+import 'dart:io';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_code_editor/flutter_code_editor.dart';
+import 'package:flutter_highlight/themes/monokai-sublime.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/site_file.dart';
+import 'package:island/models/publication_site.dart';
+import 'package:island/pods/site_files.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class FileItem extends HookConsumerWidget {
+  final SnSiteFileEntry file;
+  final SnPublicationSite site;
+  final void Function(String path)? onNavigateDirectory;
+
+  const FileItem({
+    super.key,
+    required this.file,
+    required this.site,
+    this.onNavigateDirectory,
+  });
+
+  Future<void> _downloadFile(BuildContext context, WidgetRef ref) async {
+    try {
+      final apiClient = ref.read(apiClientProvider);
+
+      // Get downloads directory
+      Directory? directory;
+      if (Platform.isAndroid) {
+        directory = await getExternalStorageDirectory();
+        if (directory != null) {
+          directory = Directory('${directory.path}/Download');
+        }
+      } else {
+        directory = await getDownloadsDirectory();
+      }
+
+      if (directory == null) {
+        throw Exception('Unable to access downloads directory');
+      }
+
+      // Create directory if it doesn't exist
+      await directory.create(recursive: true);
+
+      // Generate file path
+      final fileName = file.relativePath.split('/').last;
+      final filePath = '${directory.path}/$fileName';
+
+      // Use Dio's download method to directly stream from server to file
+      await apiClient.download(
+        '/zone/sites/${site.id}/files/content/${file.relativePath}',
+        filePath,
+      );
+
+      showSnackBar('Downloaded to $filePath');
+    } catch (e) {
+      showErrorAlert(e);
+    }
+  }
+
+  Future<void> _showEditSheet(BuildContext context, WidgetRef ref) async {
+    try {
+      final fileContent = await ref.read(
+        siteFileContentProvider(
+          siteId: site.id,
+          relativePath: file.relativePath,
+        ).future,
+      );
+
+      if (context.mounted) {
+        await showModalBottomSheet(
+          context: context,
+          isScrollControlled: true,
+          useSafeArea: false,
+          constraints: BoxConstraints(
+            maxHeight: MediaQuery.of(context).size.height,
+          ),
+          barrierColor: Theme.of(context).colorScheme.surfaceContainerLow,
+          backgroundColor: Theme.of(context).colorScheme.surfaceContainerLow,
+          builder: (BuildContext context) {
+            return FileEditorSheet(
+              file: file,
+              site: site,
+              initialContent: fileContent.content,
+            );
+          },
+        );
+      }
+    } catch (e) {
+      showErrorAlert(e);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = Theme.of(context);
+
+    return Card(
+      color: Theme.of(context).colorScheme.surfaceContainerHigh,
+      elevation: 0,
+      child: ListTile(
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(8)),
+        ),
+        leading: Icon(
+          file.isDirectory ? Symbols.folder : Symbols.description,
+          color: theme.colorScheme.primary,
+        ),
+        title: Text(file.relativePath),
+        subtitle: Text(
+          file.isDirectory
+              ? 'Directory'
+              : '${(file.size / 1024).toStringAsFixed(1)} KB',
+        ),
+        trailing: PopupMenuButton<String>(
+          itemBuilder:
+              (context) => [
+                PopupMenuItem(
+                  value: 'download',
+                  child: Row(
+                    children: [
+                      const Icon(Symbols.download),
+                      const Gap(16),
+                      Text('Download'),
+                    ],
+                  ),
+                ),
+                if (!file.isDirectory) ...[
+                  PopupMenuItem(
+                    value: 'edit',
+                    child: Row(
+                      children: [
+                        const Icon(Symbols.edit),
+                        const Gap(16),
+                        Text('Edit Content'),
+                      ],
+                    ),
+                  ),
+                ],
+                PopupMenuItem(
+                  value: 'delete',
+                  child: Row(
+                    children: [
+                      const Icon(Symbols.delete, color: Colors.red),
+                      const Gap(16),
+                      Text('Delete').textColor(Colors.red),
+                    ],
+                  ),
+                ),
+              ],
+          onSelected: (value) async {
+            switch (value) {
+              case 'download':
+                await _downloadFile(context, ref);
+                break;
+              case 'edit':
+                await _showEditSheet(context, ref);
+                break;
+              case 'delete':
+                final confirmed = await showDialog<bool>(
+                  context: context,
+                  builder:
+                      (context) => AlertDialog(
+                        title: const Text('Delete File'),
+                        content: Text(
+                          'Are you sure you want to delete "${file.relativePath}"?',
+                        ),
+                        actions: [
+                          TextButton(
+                            onPressed: () => Navigator.of(context).pop(false),
+                            child: const Text('Cancel'),
+                          ),
+                          TextButton(
+                            onPressed: () => Navigator.of(context).pop(true),
+                            child: const Text('Delete'),
+                          ),
+                        ],
+                      ),
+                );
+
+                if (confirmed == true) {
+                  try {
+                    await ref
+                        .read(
+                          siteFilesNotifierProvider((
+                            siteId: site.id,
+                            path: null,
+                          )).notifier,
+                        )
+                        .deleteFile(file.relativePath);
+                    showSnackBar('File deleted successfully');
+                  } catch (e) {
+                    showErrorAlert(e);
+                  }
+                }
+                break;
+            }
+          },
+        ),
+        onTap: () {
+          if (file.isDirectory) {
+            onNavigateDirectory?.call(file.relativePath);
+          } else {
+            _showEditSheet(context, ref);
+          }
+        },
+      ),
+    );
+  }
+}
+
+class FileEditorSheet extends HookConsumerWidget {
+  final SnSiteFileEntry file;
+  final SnPublicationSite site;
+  final String initialContent;
+
+  const FileEditorSheet({
+    super.key,
+    required this.file,
+    required this.site,
+    required this.initialContent,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final codeController = useMemoized(
+      () => CodeController(
+        text: initialContent,
+        language: null, // Let the editor auto-detect or use plain text
+      ),
+    );
+    final isSaving = useState(false);
+
+    final saveFile = useCallback(() async {
+      if (codeController.text.trim().isEmpty) {
+        showSnackBar('contentCantEmpty'.tr());
+        return;
+      }
+
+      isSaving.value = true;
+      try {
+        await ref
+            .read(
+              siteFilesNotifierProvider((siteId: site.id, path: null)).notifier,
+            )
+            .updateFileContent(file.relativePath, codeController.text);
+
+        if (context.mounted) {
+          showSnackBar('File saved successfully');
+          Navigator.of(context).pop();
+        }
+      } catch (e) {
+        showErrorAlert(e);
+      } finally {
+        isSaving.value = false;
+      }
+    }, [codeController, ref, site.id, file.relativePath, context, isSaving]);
+
+    return SheetScaffold(
+      heightFactor: 1,
+      titleText: 'Edit ${file.relativePath}',
+      actions: [
+        FilledButton(
+          onPressed: isSaving.value ? null : saveFile,
+          child: Text(isSaving.value ? 'Saving...' : 'Save'),
+        ),
+      ],
+      child: SingleChildScrollView(
+        padding: EdgeInsets.zero,
+        child: CodeTheme(
+          data: CodeThemeData(styles: monokaiSublimeTheme),
+          child: CodeField(
+            controller: codeController,
+            minLines: 20,
+            maxLines: null,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/sites/file_management_action_section.dart

@@ -0,0 +1,139 @@
+import 'dart:io';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:dio/dio.dart';
+import 'package:http_parser/http_parser.dart';
+import 'package:island/models/publication_site.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/pods/site_files.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class FileManagementActionSection extends HookConsumerWidget {
+  final SnPublicationSite site;
+  final String pubName;
+
+  const FileManagementActionSection({
+    super.key,
+    required this.site,
+    required this.pubName,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = Theme.of(context);
+
+    return Card(
+      child: Column(
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                'fileActions'.tr(),
+                style: theme.textTheme.titleMedium?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+              ).padding(horizontal: 16, top: 16),
+              Column(
+                children: [
+                  ListTile(
+                    leading: Icon(
+                      Symbols.delete_forever,
+                      color: theme.colorScheme.error,
+                    ),
+                    title: Text('purgeFiles'.tr()),
+                    subtitle: Text('purgeFilesDescription'.tr()),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+                    onTap: () => _purgeFiles(context, ref),
+                  ),
+                  const Gap(8),
+                  ListTile(
+                    leading: Icon(
+                      Symbols.upload,
+                      color: theme.colorScheme.primary,
+                    ),
+                    title: Text('deploySite'.tr()),
+                    subtitle: Text('deploySiteDescription'.tr()),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+                    onTap: () => _deploySite(context, ref),
+                  ),
+                ],
+              ).padding(vertical: 8),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _purgeFiles(BuildContext context, WidgetRef ref) async {
+    final confirmed = await showConfirmAlert(
+      'purgeFilesConfirm'.tr(),
+      'confirmPurge'.tr(),
+      isDanger: true,
+    );
+
+    if (confirmed != true) return;
+
+    try {
+      final apiClient = ref.read(apiClientProvider);
+      await apiClient.delete('/zone/sites/${site.id}/files/purge');
+      if (context.mounted) {
+        showSnackBar('allFilesPurgedSuccess'.tr());
+        // Refresh the file management section
+        ref.invalidate(siteFilesProvider(siteId: site.id));
+      }
+    } catch (e) {
+      if (context.mounted) {
+        showSnackBar('failedToPurgeFiles'.tr(args: [e.toString()]));
+      }
+    }
+  }
+
+  Future<void> _deploySite(BuildContext context, WidgetRef ref) async {
+    final result = await FilePicker.platform.pickFiles(
+      type: FileType.custom,
+      allowedExtensions: ['zip'],
+      allowMultiple: false,
+    );
+
+    if (result == null || result.files.isEmpty) {
+      return; // User canceled
+    }
+
+    final file = File(result.files.first.path!);
+
+    try {
+      final apiClient = ref.read(apiClientProvider);
+
+      // Create multipart form data
+      final formData = FormData.fromMap({
+        'file': await MultipartFile.fromFile(
+          file.path,
+          filename: result.files.first.name,
+          contentType: MediaType('application', 'zip'),
+        ),
+      });
+
+      await apiClient.post(
+        '/zone/sites/${site.id}/files/deploy',
+        data: formData,
+      );
+
+      if (context.mounted) {
+        showSnackBar('siteDeployedSuccess'.tr());
+        // Refresh the file management section
+        ref.invalidate(siteFilesProvider(siteId: site.id));
+      }
+    } catch (e) {
+      if (context.mounted) {
+        showSnackBar('failedToDeploySite'.tr(args: [e.toString()]));
+      }
+    }
+  }
+}

lib/widgets/sites/file_management_section.dart

@@ -0,0 +1,312 @@
+import 'dart:io';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:file_picker/file_picker.dart';
+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/publication_site.dart';
+import 'package:island/pods/site_files.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/sites/file_upload_dialog.dart';
+import 'package:island/widgets/sites/file_item.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+class FileManagementSection extends HookConsumerWidget {
+  final SnPublicationSite site;
+  final String pubName;
+
+  const FileManagementSection({
+    super.key,
+    required this.site,
+    required this.pubName,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final currentPath = useState<String?>(null);
+    final filesAsync = ref.watch(
+      siteFilesProvider(siteId: site.id, path: currentPath.value),
+    );
+    final theme = Theme.of(context);
+
+    return Card(
+      child: Column(
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Icon(Symbols.folder, size: 20),
+                    const Gap(8),
+                    Text(
+                      'fileManagement'.tr(),
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const Spacer(),
+                    PopupMenuButton<String>(
+                      icon: const Icon(Symbols.upload),
+                      onSelected: (String choice) async {
+                        List<File> files = [];
+                        List<Map<String, dynamic>>? results;
+                        if (choice == 'files') {
+                          final selectedFiles = await FilePicker.platform
+                              .pickFiles(
+                                allowMultiple: true,
+                                type: FileType.any,
+                              );
+                          if (selectedFiles == null ||
+                              selectedFiles.files.isEmpty) {
+                            return; // User canceled
+                          }
+                          files =
+                              selectedFiles.files
+                                  .map((f) => File(f.path!))
+                                  .toList();
+                        } else if (choice == 'folder') {
+                          final dirPath =
+                              await FilePicker.platform.getDirectoryPath();
+                          if (dirPath == null) return;
+                          results = await _getFilesRecursive(dirPath);
+                          files =
+                              results.map((m) => m['file'] as File).toList();
+                          if (files.isEmpty) {
+                            showSnackBar('noFilesFoundInFolder'.tr());
+                            return;
+                          }
+                        }
+
+                        if (!context.mounted) return;
+
+                        // Show upload dialog for path specification
+                        showModalBottomSheet(
+                          context: context,
+                          isScrollControlled: true,
+                          builder:
+                              (context) => FileUploadDialog(
+                                selectedFiles: files,
+                                site: site,
+                                relativePaths:
+                                    results
+                                        ?.map(
+                                          (m) => m['relativePath'] as String,
+                                        )
+                                        .toList(),
+                                onUploadComplete: () {
+                                  // Refresh file list
+                                  ref.invalidate(
+                                    siteFilesProvider(
+                                      siteId: site.id,
+                                      path: currentPath.value,
+                                    ),
+                                  );
+                                },
+                              ),
+                        );
+                      },
+                      itemBuilder:
+                          (BuildContext context) => [
+                            PopupMenuItem<String>(
+                              value: 'files',
+                              child: Row(
+                                children: [
+                                  Icon(Symbols.file_copy),
+                                  Gap(12),
+                                  Text('siteFiles'.tr()),
+                                ],
+                              ),
+                            ),
+                            PopupMenuItem<String>(
+                              value: 'folder',
+                              child: Row(
+                                children: [
+                                  Icon(Symbols.folder),
+                                  Gap(12),
+                                  Text('siteFolder'.tr()),
+                                ],
+                              ),
+                            ),
+                          ],
+                      style: ButtonStyle(
+                        visualDensity: const VisualDensity(
+                          horizontal: -4,
+                          vertical: -4,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                const Gap(8),
+                if (currentPath.value != null && currentPath.value!.isNotEmpty)
+                  Container(
+                    margin: const EdgeInsets.only(top: 4),
+                    decoration: BoxDecoration(
+                      color: theme.colorScheme.surfaceContainerHigh,
+                      borderRadius: BorderRadius.circular(16),
+                    ),
+                    padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                    child: Row(
+                      children: [
+                        IconButton(
+                          icon: Icon(Symbols.arrow_back),
+                          onPressed: () {
+                            final pathParts =
+                                currentPath.value!
+                                    .split('/')
+                                    .where((part) => part.isNotEmpty)
+                                    .toList();
+                            if (pathParts.isEmpty) {
+                              currentPath.value = null;
+                            } else {
+                              pathParts.removeLast();
+                              currentPath.value =
+                                  pathParts.isEmpty
+                                      ? null
+                                      : pathParts.join('/');
+                            }
+                          },
+                          visualDensity: const VisualDensity(
+                            horizontal: -4,
+                            vertical: -4,
+                          ),
+                        ),
+                        Expanded(
+                          child: Wrap(
+                            crossAxisAlignment: WrapCrossAlignment.center,
+                            children: [
+                              InkWell(
+                                onTap: () => currentPath.value = null,
+                                child: Text('siteRoot'.tr()),
+                              ),
+                              ...() {
+                                final parts =
+                                    currentPath.value!
+                                        .split('/')
+                                        .where((part) => part.isNotEmpty)
+                                        .toList();
+                                final widgets = <Widget>[];
+                                String currentBuilder = '';
+                                for (final part in parts) {
+                                  currentBuilder +=
+                                      (currentBuilder.isEmpty ? '' : '/') +
+                                      part;
+                                  final pathToSet = currentBuilder;
+                                  widgets.addAll([
+                                    const Text(' / '),
+                                    InkWell(
+                                      onTap:
+                                          () => currentPath.value = pathToSet,
+                                      child: Text(part),
+                                    ),
+                                  ]);
+                                }
+                                return widgets;
+                              }(),
+                            ],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                const Gap(8),
+                filesAsync.when(
+                  data: (files) {
+                    if (files.isEmpty) {
+                      return Center(
+                        child: Padding(
+                          padding: const EdgeInsets.all(32),
+                          child: Column(
+                            children: [
+                              Icon(
+                                Symbols.folder,
+                                size: 48,
+                                color: theme.colorScheme.outline,
+                              ),
+                              const Gap(16),
+                              Text(
+                                'noFilesUploadedYet'.tr(),
+                                style: theme.textTheme.bodyLarge,
+                              ),
+                              const Gap(8),
+                              Text(
+                                'uploadFirstFile'.tr(),
+                                style: theme.textTheme.bodySmall,
+                              ),
+                            ],
+                          ),
+                        ),
+                      );
+                    }
+
+                    return ListView.builder(
+                      shrinkWrap: true,
+                      padding: EdgeInsets.zero,
+                      itemCount: files.length,
+                      itemBuilder: (context, index) {
+                        final file = files[index];
+                        return FileItem(
+                          file: file,
+                          site: site,
+                          onNavigateDirectory:
+                              (path) => currentPath.value = path,
+                        );
+                      },
+                    );
+                  },
+                  loading:
+                      () => const Center(child: CircularProgressIndicator()),
+                  error:
+                      (error, stack) => Center(
+                        child: Column(
+                          children: [
+                            Text('failedToLoadFiles'.tr()),
+                            const Gap(8),
+                            ElevatedButton(
+                              onPressed:
+                                  () => ref.invalidate(
+                                    siteFilesProvider(
+                                      siteId: site.id,
+                                      path: currentPath.value,
+                                    ),
+                                  ),
+                              child: Text('retry'.tr()),
+                            ),
+                          ],
+                        ),
+                      ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<List<Map<String, dynamic>>> _getFilesRecursive(String dirPath) async {
+    final List<Map<String, dynamic>> results = [];
+    try {
+      await for (final entity in Directory(dirPath).list(recursive: true)) {
+        if (entity is File) {
+          String relativePath = entity.path.substring(dirPath.length);
+          if (relativePath.startsWith('/')) {
+            relativePath = relativePath.substring(1);
+          }
+          if (relativePath.isEmpty) continue;
+          results.add({
+            'file': File(entity.path),
+            'relativePath': relativePath,
+          });
+        }
+      }
+    } catch (e) {
+      // Handle error if needed
+    }
+    return results;
+  }
+}

lib/widgets/sites/file_upload_dialog.dart

@@ -0,0 +1,288 @@
+import 'dart:io';
+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/publication_site.dart';
+import 'package:island/pods/site_files.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+class FileUploadDialog extends HookConsumerWidget {
+  final List<File> selectedFiles;
+  final SnPublicationSite site;
+  final VoidCallback onUploadComplete;
+  final List<String>? relativePaths;
+
+  const FileUploadDialog({
+    super.key,
+    required this.selectedFiles,
+    required this.site,
+    required this.onUploadComplete,
+    this.relativePaths,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final formKey = useMemoized(() => GlobalKey<FormState>());
+    final pathController = useTextEditingController(text: '/');
+    final isUploading = useState(false);
+    final progressStates = useState<List<Map<String, dynamic>>>(
+      selectedFiles
+          .map(
+            (file) => {
+              'fileName':
+                  relativePaths?[selectedFiles.indexOf(file)] ??
+                  file.path.split('/').last,
+              'progress': 0.0,
+              'status':
+                  'pending', // 'pending', 'uploading', 'completed', 'error'
+              'error': null,
+            },
+          )
+          .toList(),
+    );
+
+    // Calculate overall progress
+    final overallProgress =
+        progressStates.value.isNotEmpty
+            ? progressStates.value
+                    .map((e) => e['progress'] as double)
+                    .reduce((a, b) => a + b) /
+                progressStates.value.length
+            : 0.0;
+
+    final overallStatus =
+        progressStates.value.isEmpty
+            ? 'pending'
+            : progressStates.value.every((e) => e['status'] == 'completed')
+            ? 'completed'
+            : progressStates.value.any((e) => e['status'] == 'error')
+            ? 'error'
+            : progressStates.value.any((e) => e['status'] == 'uploading')
+            ? 'uploading'
+            : 'pending';
+
+    final uploadFile = useCallback((
+      String basePath,
+      File file,
+      int index,
+    ) async {
+      try {
+        progressStates.value[index]['status'] = 'uploading';
+        progressStates.value = [...progressStates.value];
+
+        final siteFilesNotifier = ref.read(
+          siteFilesNotifierProvider((siteId: site.id, path: null)).notifier,
+        );
+
+        final fileName = relativePaths?[index] ?? file.path.split('/').last;
+        final uploadPath =
+            basePath.endsWith('/')
+                ? '$basePath$fileName'
+                : '$basePath/$fileName';
+
+        await siteFilesNotifier.uploadFile(file, uploadPath);
+
+        progressStates.value[index]['status'] = 'completed';
+        progressStates.value[index]['progress'] = 1.0;
+        progressStates.value = [...progressStates.value];
+      } catch (e) {
+        progressStates.value[index]['status'] = 'error';
+        progressStates.value[index]['error'] = e.toString();
+        progressStates.value = [...progressStates.value];
+      }
+    }, [ref, site.id, progressStates]);
+
+    final uploadAllFiles = useCallback(
+      () async {
+        if (!formKey.currentState!.validate()) return;
+
+        isUploading.value = true;
+
+        // Reset all progress states
+        for (int i = 0; i < progressStates.value.length; i++) {
+          progressStates.value[i]['status'] = 'pending';
+          progressStates.value[i]['progress'] = 0.0;
+          progressStates.value[i]['error'] = null;
+        }
+        progressStates.value = [...progressStates.value];
+
+        // Upload files sequentially (could be made parallel if needed)
+        for (int i = 0; i < selectedFiles.length; i++) {
+          final file = selectedFiles[i];
+          await uploadFile(pathController.text, file, i);
+        }
+
+        isUploading.value = false;
+
+        // Close dialog if all uploads completed successfully
+        if (progressStates.value.every(
+          (state) => state['status'] == 'completed',
+        )) {
+          if (context.mounted) {
+            showSnackBar('All files uploaded successfully');
+            onUploadComplete();
+            Navigator.of(context).pop();
+          }
+        }
+      },
+      [
+        uploadFile,
+        isUploading,
+        progressStates,
+        selectedFiles,
+        onUploadComplete,
+        context,
+        formKey,
+        pathController,
+      ],
+    );
+
+    return SheetScaffold(
+      titleText: 'Upload Files',
+      child: SingleChildScrollView(
+        padding: const EdgeInsets.all(20),
+        child: Form(
+          key: formKey,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // Upload path field
+              TextFormField(
+                controller: pathController,
+                decoration: const InputDecoration(
+                  labelText: 'Upload Path',
+                  hintText: '/ (root) or /assets/images/',
+                  border: OutlineInputBorder(
+                    borderRadius: BorderRadius.all(Radius.circular(12)),
+                  ),
+                ),
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return 'Please enter an upload path';
+                  }
+                  if (!value.startsWith('/') && value != '/') {
+                    return 'Path must start with /';
+                  }
+                  if (value.contains(' ')) {
+                    return 'Path cannot contain spaces';
+                  }
+                  if (value.contains('//')) {
+                    return 'Path cannot have consecutive slashes';
+                  }
+                  return null;
+                },
+                onTapOutside:
+                    (_) => FocusManager.instance.primaryFocus?.unfocus(),
+              ),
+              const Gap(16),
+              Card(
+                child: Column(
+                  children: [
+                    // Overall progress
+                    Padding(
+                      padding: const EdgeInsets.all(16),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            '${(overallProgress * 100).toStringAsFixed(0)}% completed',
+                            style: Theme.of(context).textTheme.titleSmall,
+                          ),
+                          const Gap(8),
+                          LinearProgressIndicator(value: overallProgress),
+                          const Gap(8),
+                          Text(
+                            _getOverallStatusText(overallStatus),
+                            style: Theme.of(context).textTheme.bodySmall,
+                          ),
+                        ],
+                      ),
+                    ),
+                    // Divider
+                    const Divider(height: 0),
+                    // File list in expansion
+                    ExpansionTile(
+                      title: Text('${selectedFiles.length} files to upload'),
+                      initiallyExpanded: selectedFiles.length <= 10,
+                      children:
+                          selectedFiles.map((file) {
+                            final index = selectedFiles.indexOf(file);
+                            final progressState = progressStates.value[index];
+                            final displayName =
+                                progressState['fileName'] as String;
+                            return ListTile(
+                              leading: _getStatusIcon(
+                                progressState['status'] as String,
+                              ),
+                              title: Text(displayName),
+                              subtitle: Text(
+                                'Size: ${(file.lengthSync() / 1024).toStringAsFixed(1)} KB',
+                              ),
+                              dense: true,
+                            );
+                          }).toList(),
+                    ),
+                  ],
+                ),
+              ),
+              const Gap(24),
+              Row(
+                children: [
+                  Expanded(
+                    child: OutlinedButton(
+                      onPressed:
+                          isUploading.value
+                              ? null
+                              : () => Navigator.of(context).pop(),
+                      child: const Text('Cancel'),
+                    ),
+                  ),
+                  const Gap(12),
+                  Expanded(
+                    child: FilledButton(
+                      onPressed: isUploading.value ? null : uploadAllFiles,
+                      child: Text(
+                        isUploading.value
+                            ? 'Uploading...'
+                            : 'Upload ${selectedFiles.length} File${selectedFiles.length == 1 ? '' : 's'}',
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Icon _getStatusIcon(String status) {
+    switch (status) {
+      case 'completed':
+        return const Icon(Symbols.check_circle, color: Colors.green);
+      case 'uploading':
+        return const Icon(Symbols.sync);
+      case 'error':
+        return const Icon(Symbols.error, color: Colors.red);
+      default:
+        return const Icon(Symbols.pending);
+    }
+  }
+
+  String _getOverallStatusText(String status) {
+    switch (status) {
+      case 'completed':
+        return 'All uploads completed';
+      case 'error':
+        return 'Some uploads failed';
+      case 'uploading':
+        return 'Uploading in progress';
+      default:
+        return 'Ready to upload';
+    }
+  }
+}

lib/widgets/sites/info_row.dart

@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+class InfoRow extends StatelessWidget {
+  final String label;
+  final String value;
+  final IconData icon;
+  final bool monospace;
+  final VoidCallback? onTap;
+
+  const InfoRow({
+    super.key,
+    required this.label,
+    required this.value,
+    required this.icon,
+    this.monospace = false,
+    this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    Widget valueWidget = Text(
+      value,
+      style:
+          monospace
+              ? GoogleFonts.robotoMono(fontSize: 14)
+              : Theme.of(context).textTheme.bodyMedium,
+      textAlign: TextAlign.end,
+    );
+
+    if (onTap != null) valueWidget = InkWell(onTap: onTap, child: valueWidget);
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Icon(icon, size: 20, color: Theme.of(context).colorScheme.primary),
+        const Gap(12),
+        Expanded(
+          flex: 2,
+          child: Text(
+            label,
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+          ),
+        ),
+        const Gap(12),
+        Expanded(flex: 3, child: valueWidget),
+      ],
+    );
+  }
+}

lib/widgets/sites/page_form.dart

@@ -0,0 +1,397 @@
+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/publication_site.dart';
+import 'package:island/pods/site_pages.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class PageForm extends HookConsumerWidget {
+  final SnPublicationSite site;
+  final String pubName;
+  final SnPublicationPage? page; // null for create, non-null for edit
+
+  const PageForm({
+    super.key,
+    required this.site,
+    required this.pubName,
+    this.page,
+  });
+
+  int _getPageType(SnPublicationPage? page) {
+    if (page == null) return 0; // Default to HTML
+    // Check config structure to determine type
+    return page.config?.containsKey('target') == true ? 1 : 0;
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final formKey = useMemoized(() => GlobalKey<FormState>());
+    final pathController = useTextEditingController(text: page?.path ?? '/');
+
+    // Determine initial type and create appropriate controllers
+    final initialType = _getPageType(page);
+    final pageType = useState(initialType);
+
+    final htmlController = useTextEditingController(
+      text:
+          pageType.value == 0
+              ? (page?.config?['html'] ?? page?.config?['content'] ?? '')
+              : '',
+    );
+    final titleController = useTextEditingController(
+      text: pageType.value == 0 ? (page?.config?['title'] ?? '') : '',
+    );
+    final targetController = useTextEditingController(
+      text: pageType.value == 1 ? (page?.config?['target'] ?? '') : '',
+    );
+
+    final isLoading = useState(false);
+
+    // Update controllers when page type changes
+    useEffect(() {
+      pageType.addListener(() {
+        if (pageType.value == 0) {
+          // HTML mode
+          htmlController.text =
+              page?.config?['html'] ?? page?.config?['content'] ?? '';
+          titleController.text = page?.config?['title'] ?? '';
+          targetController.clear();
+        } else {
+          // Redirect mode
+          htmlController.clear();
+          titleController.clear();
+          targetController.text = page?.config?['target'] ?? '';
+        }
+      });
+      return null;
+    }, [pageType]);
+
+    // Initialize form fields when page data is loaded
+    useEffect(() {
+      if (page?.path != null && pathController.text == '/') {
+        pathController.text = page!.path!;
+        if (pageType.value == 0) {
+          htmlController.text =
+              page!.config?['html'] ?? page!.config?['content'] ?? '';
+          titleController.text = page!.config?['title'] ?? '';
+        } else {
+          targetController.text = page!.config?['target'] ?? '';
+        }
+      }
+      return null;
+    }, [page]);
+
+    final savePage = useCallback(() async {
+      if (!formKey.currentState!.validate()) return;
+
+      isLoading.value = true;
+
+      try {
+        final pagesNotifier = ref.read(
+          sitePagesNotifierProvider((
+            pubName: pubName,
+            siteSlug: site.slug,
+          )).notifier,
+        );
+
+        late final Map<String, dynamic> pageData;
+
+        if (pageType.value == 0) {
+          // HTML page
+          pageData = {
+            'type': 0,
+            'path': pathController.text,
+            'config': {
+              'title': titleController.text,
+              'html': htmlController.text,
+            },
+          };
+        } else {
+          // Redirect page
+          pageData = {
+            'type': 1,
+            'path': pathController.text,
+            'config': {'target': targetController.text},
+          };
+        }
+
+        if (page == null) {
+          // Create new page
+          await pagesNotifier.createPage(pageData);
+        } else {
+          // Update existing page
+          await pagesNotifier.updatePage(page!.id, pageData);
+        }
+
+        if (context.mounted) {
+          showSnackBar(
+            page == null
+                ? 'Page created successfully'
+                : 'Page updated successfully',
+          );
+          Navigator.pop(context);
+        }
+      } catch (e) {
+        showErrorAlert(e);
+      } finally {
+        isLoading.value = false;
+      }
+    }, [pageType, pubName, site.slug, page]);
+
+    final deletePage = useCallback(() async {
+      if (page == null) return; // Shouldn't happen for editing
+
+      final confirmed = await showDialog<bool>(
+        context: context,
+        builder:
+            (context) => AlertDialog(
+              title: const Text('Delete Page'),
+              content: const Text('Are you sure you want to delete this page?'),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(false),
+                  child: const Text('Cancel'),
+                ),
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(true),
+                  child: const Text('Delete'),
+                ),
+              ],
+            ),
+      );
+      if (confirmed != true) return;
+
+      isLoading.value = true;
+
+      try {
+        final pagesNotifier = ref.read(
+          sitePagesNotifierProvider((
+            pubName: pubName,
+            siteSlug: site.slug,
+          )).notifier,
+        );
+
+        await pagesNotifier.deletePage(page!.id);
+
+        if (context.mounted) {
+          showSnackBar('Page deleted successfully');
+          Navigator.pop(context);
+        }
+      } catch (e) {
+        showErrorAlert(e);
+      } finally {
+        isLoading.value = false;
+      }
+    }, [pubName, site.slug, page, context]);
+
+    return SheetScaffold(
+      titleText: page == null ? 'Create Page' : 'Edit Page',
+      child: SingleChildScrollView(
+        child: Column(
+          children: [
+            Form(
+              key: formKey,
+              child: Column(
+                children: [
+                  // Page type selector
+                  DropdownButtonFormField<int>(
+                    value: pageType.value,
+                    decoration: const InputDecoration(
+                      labelText: 'Page Type',
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.all(Radius.circular(12)),
+                      ),
+                    ),
+                    items: const [
+                      DropdownMenuItem(
+                        value: 0,
+                        child: Row(
+                          children: [
+                            Icon(Symbols.code, size: 20),
+                            Gap(8),
+                            Text('HTML Page'),
+                          ],
+                        ),
+                      ),
+                      DropdownMenuItem(
+                        value: 1,
+                        child: Row(
+                          children: [
+                            Icon(Symbols.link, size: 20),
+                            Gap(8),
+                            Text('Redirect Page'),
+                          ],
+                        ),
+                      ),
+                    ],
+                    onChanged: (value) {
+                      if (value != null) {
+                        pageType.value = value;
+                      }
+                    },
+                    validator: (value) {
+                      if (value == null) {
+                        return 'Please select a page type';
+                      }
+                      return null;
+                    },
+                  ).padding(all: 20),
+                  // Conditional form fields based on page type
+                  if (pageType.value == 0) ...[
+                    // HTML Page fields
+                    TextFormField(
+                      controller: pathController,
+                      decoration: const InputDecoration(
+                        labelText: 'Page Path',
+                        hintText: '/about, /contact, etc.',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(12)),
+                        ),
+                      ),
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Please enter a page path';
+                        }
+                        if (!RegExp(r'^[a-zA-Z0-9\-/_]+$').hasMatch(value)) {
+                          return 'Page path can only contain letters, numbers, hyphens, underscores, and slashes';
+                        }
+                        if (!value.startsWith('/')) {
+                          return 'Page path must start with /';
+                        }
+                        if (value.contains('//')) {
+                          return 'Page path cannot have consecutive slashes';
+                        }
+                        return null;
+                      },
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ).padding(horizontal: 20),
+                    const SizedBox(height: 16),
+                    TextFormField(
+                      controller: titleController,
+                      decoration: const InputDecoration(
+                        labelText: 'Page Title',
+                        hintText: 'About Us, Contact, etc.',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(12)),
+                        ),
+                      ),
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Please enter a page title';
+                        }
+                        return null;
+                      },
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ).padding(horizontal: 20),
+                    const SizedBox(height: 16),
+                    TextFormField(
+                      controller: htmlController,
+                      decoration: const InputDecoration(
+                        labelText: 'Page Content (HTML)',
+                        hintText:
+                            '<h1>Hello World</h1><p>This is my page content...</p>',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(12)),
+                        ),
+                        alignLabelWithHint: true,
+                      ),
+                      maxLines: 10,
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Please enter HTML content for the page';
+                        }
+                        return null;
+                      },
+                    ).padding(horizontal: 20),
+                  ] else ...[
+                    // Redirect Page fields
+                    TextFormField(
+                      controller: pathController,
+                      decoration: const InputDecoration(
+                        labelText: 'Page Path',
+                        hintText: '/old-page, /redirect, etc.',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(12)),
+                        ),
+                      ),
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Please enter a page path';
+                        }
+                        if (!RegExp(r'^[a-zA-Z0-9\-/_]+$').hasMatch(value)) {
+                          return 'Page path can only contain letters, numbers, hyphens, underscores, and slashes';
+                        }
+                        if (!value.startsWith('/')) {
+                          return 'Page path must start with /';
+                        }
+                        if (value.contains('//')) {
+                          return 'Page path cannot have consecutive slashes';
+                        }
+                        return null;
+                      },
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ).padding(horizontal: 20),
+                    const SizedBox(height: 16),
+                    TextFormField(
+                      controller: targetController,
+                      decoration: const InputDecoration(
+                        labelText: 'Redirect Target',
+                        hintText: '/new-page, https://example.com, etc.',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.all(Radius.circular(12)),
+                        ),
+                      ),
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Please enter a redirect target';
+                        }
+                        if (!value.startsWith('/') &&
+                            !value.startsWith('http://') &&
+                            !value.startsWith('https://')) {
+                          return 'Target must be a relative path (/) or absolute URL (http/https)';
+                        }
+                        return null;
+                      },
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ).padding(horizontal: 20),
+                    Row(
+                      children: [
+                        if (page != null) ...[
+                          TextButton.icon(
+                            onPressed: deletePage,
+                            icon: const Icon(Symbols.delete_forever),
+                            label: const Text('Delete Page'),
+                            style: TextButton.styleFrom(
+                              foregroundColor: Colors.red,
+                            ),
+                          ).alignment(Alignment.centerRight),
+                          const Spacer(),
+                        ] else
+                          const Spacer(),
+                        TextButton.icon(
+                          onPressed: savePage,
+                          icon: const Icon(Symbols.save),
+                          label: const Text('Save Page'),
+                        ),
+                      ],
+                    ).padding(horizontal: 20, vertical: 16),
+                  ],
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/sites/page_item.dart

@@ -0,0 +1,125 @@
+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/publication_site.dart';
+import 'package:island/pods/site_pages.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/sites/page_form.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class PageItem extends HookConsumerWidget {
+  final SnPublicationPage page;
+  final SnPublicationSite site;
+  final String pubName;
+
+  const PageItem({
+    super.key,
+    required this.page,
+    required this.site,
+    required this.pubName,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = Theme.of(context);
+
+    return Card(
+      color: Theme.of(context).colorScheme.surfaceContainerHigh,
+      elevation: 0,
+      child: ListTile(
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(8)),
+        ),
+        leading: Icon(Symbols.article, color: theme.colorScheme.primary),
+        title: Text(page.path ?? '/'),
+        subtitle: Text(page.config?['title'] ?? 'Untitled'),
+        trailing: PopupMenuButton<String>(
+          itemBuilder:
+              (context) => [
+                PopupMenuItem(
+                  value: 'edit',
+                  child: Row(
+                    children: [
+                      const Icon(Symbols.edit),
+                      const Gap(16),
+                      Text('edit'.tr()),
+                    ],
+                  ),
+                ),
+                PopupMenuItem(
+                  value: 'delete',
+                  child: Row(
+                    children: [
+                      const Icon(Symbols.delete, color: Colors.red),
+                      const Gap(16),
+                      Text('delete'.tr()).textColor(Colors.red),
+                    ],
+                  ),
+                ),
+              ],
+          onSelected: (value) async {
+            switch (value) {
+              case 'edit':
+                // Open page edit dialog
+                showModalBottomSheet(
+                  context: context,
+                  isScrollControlled: true,
+                  builder:
+                      (context) =>
+                          PageForm(site: site, pubName: pubName, page: page),
+                ).then((_) {
+                  // Refresh pages after editing
+                  ref.invalidate(sitePagesProvider(pubName, site.slug));
+                });
+                break;
+              case 'delete':
+                final confirmed = await showDialog<bool>(
+                  context: context,
+                  builder:
+                      (context) => AlertDialog(
+                        title: const Text('Delete Page'),
+                        content: const Text(
+                          'Are you sure you want to delete this page?',
+                        ),
+                        actions: [
+                          TextButton(
+                            onPressed: () => Navigator.of(context).pop(false),
+                            child: const Text('Cancel'),
+                          ),
+                          TextButton(
+                            onPressed: () => Navigator.of(context).pop(true),
+                            child: const Text('Delete'),
+                          ),
+                        ],
+                      ),
+                );
+
+                if (confirmed == true) {
+                  try {
+                    await ref
+                        .read(
+                          sitePagesNotifierProvider((
+                            pubName: pubName,
+                            siteSlug: site.slug,
+                          )).notifier,
+                        )
+                        .deletePage(page.id);
+                    showSnackBar('Page deleted successfully');
+                  } catch (e) {
+                    showErrorAlert(e);
+                  }
+                }
+                break;
+            }
+          },
+        ),
+        onTap: () {
+          launchUrlString('https://${site.slug}.solian.page${page.path ?? ''}');
+        },
+      ),
+    );
+  }
+}

lib/widgets/sites/pages_section.dart

@@ -0,0 +1,123 @@
+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/publication_site.dart';
+import 'package:island/pods/site_pages.dart';
+import 'package:island/widgets/sites/page_form.dart';
+import 'package:island/widgets/sites/page_item.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+class PagesSection extends HookConsumerWidget {
+  final SnPublicationSite site;
+  final String pubName;
+
+  const PagesSection({super.key, required this.site, required this.pubName});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final pagesAsync = ref.watch(sitePagesProvider(pubName, site.slug));
+    final theme = Theme.of(context);
+
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                const Icon(Symbols.article, size: 20),
+                const Gap(8),
+                Text(
+                  'sitePages'.tr(),
+                  style: theme.textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                const Spacer(),
+                IconButton(
+                  onPressed: () {
+                    // Open page creation dialog
+                    showModalBottomSheet(
+                      context: context,
+                      isScrollControlled: true,
+                      builder:
+                          (context) => PageForm(site: site, pubName: pubName),
+                    ).then((_) {
+                      // Refresh pages after creation
+                      ref.invalidate(sitePagesProvider(pubName, site.slug));
+                    });
+                  },
+                  icon: const Icon(Symbols.add),
+                  visualDensity: const VisualDensity(
+                    horizontal: -4,
+                    vertical: -4,
+                  ),
+                ),
+              ],
+            ),
+            const Gap(16),
+            pagesAsync.when(
+              data: (pages) {
+                if (pages.isEmpty) {
+                  return Center(
+                    child: Padding(
+                      padding: const EdgeInsets.all(32),
+                      child: Column(
+                        children: [
+                          Icon(
+                            Symbols.article,
+                            size: 48,
+                            color: theme.colorScheme.outline,
+                          ),
+                          const Gap(16),
+                          Text(
+                            'noPagesYet'.tr(),
+                            style: theme.textTheme.bodyLarge,
+                          ),
+                          const Gap(8),
+                          Text(
+                            'createFirstPage'.tr(),
+                            style: theme.textTheme.bodySmall,
+                          ),
+                        ],
+                      ),
+                    ),
+                  );
+                }
+
+                return ListView.builder(
+                  shrinkWrap: true,
+                  padding: EdgeInsets.zero,
+                  itemCount: pages.length,
+                  itemBuilder: (context, index) {
+                    final page = pages[index];
+                    return PageItem(page: page, site: site, pubName: pubName);
+                  },
+                );
+              },
+              loading: () => const Center(child: CircularProgressIndicator()),
+              error:
+                  (error, stack) => Center(
+                    child: Column(
+                      children: [
+                        Text('failedToLoadPages'.tr()),
+                        const Gap(8),
+                        ElevatedButton(
+                          onPressed:
+                              () => ref.invalidate(
+                                sitePagesProvider(pubName, site.slug),
+                              ),
+                          child: Text('retry'.tr()),
+                        ),
+                      ],
+                    ),
+                  ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/sites/site_action_menu.dart

@@ -0,0 +1,99 @@
+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/publication_site.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/screens/creators/sites/site_detail.dart';
+import 'package:island/screens/creators/sites/site_edit.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class SiteActionMenu extends HookConsumerWidget {
+  final SnPublicationSite site;
+  final String pubName;
+
+  const SiteActionMenu({super.key, required this.site, required this.pubName});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return PopupMenuButton<String>(
+      itemBuilder:
+          (context) => [
+            PopupMenuItem(
+              value: 'edit',
+              child: Row(
+                children: [
+                  Icon(
+                    Symbols.edit,
+                    color: Theme.of(context).colorScheme.onSurface,
+                  ),
+                  const Gap(16),
+                  Text('edit'.tr()),
+                ],
+              ),
+            ),
+            const PopupMenuDivider(),
+            PopupMenuItem(
+              value: 'delete',
+              child: Row(
+                children: [
+                  const Icon(Symbols.delete, color: Colors.red),
+                  const Gap(16),
+                  Text('delete'.tr()).textColor(Colors.red),
+                ],
+              ),
+            ),
+          ],
+      onSelected: (value) async {
+        switch (value) {
+          case 'edit':
+            showModalBottomSheet(
+              context: context,
+              isScrollControlled: true,
+              builder:
+                  (context) => SiteForm(pubName: pubName, siteSlug: site.slug),
+            ).then((_) {
+              // Refresh site data after potential edit
+              ref.invalidate(publicationSiteDetailProvider(pubName, site.slug));
+            });
+            break;
+          case 'delete':
+            final confirmed = await showDialog<bool>(
+              context: context,
+              builder:
+                  (context) => AlertDialog(
+                    title: Text('deleteSite'.tr()),
+                    content: Text('publicationSiteDeleteConfirm'.tr()),
+                    actions: [
+                      TextButton(
+                        onPressed: () => Navigator.of(context).pop(false),
+                        child: Text('cancel'.tr()),
+                      ),
+                      TextButton(
+                        onPressed: () => Navigator.of(context).pop(true),
+                        child: Text('delete'.tr()),
+                      ),
+                    ],
+                  ),
+            );
+
+            if (confirmed == true) {
+              try {
+                final client = ref.read(apiClientProvider);
+                await client.delete('/zone/sites/$pubName/${site.slug}');
+                if (context.mounted) {
+                  showSnackBar('siteDeletedSuccess'.tr());
+                  Navigator.of(context).pop();
+                }
+              } catch (e) {
+                showErrorAlert(e);
+              }
+            }
+            break;
+        }
+      },
+    );
+  }
+}