🗑️ Remove pfp decoration test code

android/app/src/main/AndroidManifest.xml

@@ -12,6 +12,8 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />

ios/Podfile.lock

@@ -257,6 +257,8 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - permission_handler_apple (9.3.0):
+    - Flutter
   - pointer_interceptor_ios (0.0.1):
     - Flutter
   - PromisesObjC (2.4.0)
@@ -351,6 +353,7 @@ DEPENDENCIES:
   - 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`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - 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`)
@@ -458,6 +461,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/pasteboard/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  permission_handler_apple:
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
   pointer_interceptor_ios:
     :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
   protocol_handler_ios:
@@ -539,6 +544,7 @@ SPEC CHECKSUMS:
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   pointer_interceptor_ios: da06a662d5bfd329602b45b2ab41bc0fb5fdb0f0
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851

lib/screens/account.dart

@@ -331,8 +331,7 @@ class AccountScreen extends HookConsumerWidget {
                   if (availableWidth > totalMin) {
                     return Row(
                       spacing: 8,
-                      children:
+                      children: children
-                          children
                           .map((child) => Expanded(child: child))
                           .toList(),
                     ).padding(horizontal: 12).height(48);
@@ -341,8 +340,7 @@ class AccountScreen extends HookConsumerWidget {
                       scrollDirection: Axis.horizontal,
                       child: Row(
                         spacing: 8,
-                        children:
+                        children: children
-                            children
                             .map(
                               (child) =>
                                   SizedBox(width: minWidth, child: child),
@@ -495,8 +493,7 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return AppScaffold(
       appBar: AppBar(title: const Text('account').tr()),
-      body:
+      body: ConstrainedBox(
-          ConstrainedBox(
         constraints: const BoxConstraints(maxWidth: 360),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,

lib/screens/creators/sites/site_list.dart

@@ -167,22 +167,10 @@ class _CreatorSiteItem extends HookConsumerWidget {
                       ],
                     ),
                     onTap: () async {
-                      final confirmed = await showDialog<bool>(
+                      final confirmed = await showConfirmAlert(
-                        context: context,
+                        'publicationSiteDeleteConfirm'.tr(),
-                        builder: (context) => AlertDialog(
+                        'deleteSite'.tr(),
-                          title: Text('deleteSite'.tr()),
+                        isDanger: true,
-                          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 {

lib/screens/developers/app_detail.dart

@@ -39,8 +39,7 @@ class AppDetailScreen extends HookConsumerWidget {
         actions: [
           IconButton(
             icon: const Icon(Symbols.edit),
-            onPressed:
+            onPressed: appData.value == null
-                appData.value == null
                 ? null
                 : () {
                     context.pushNamed(
@@ -85,21 +84,31 @@ class AppDetailScreen extends HookConsumerWidget {
             controller: tabController,
             physics: const NeverScrollableScrollPhysics(),
             children: [
-              _AppOverview(app: app),
+              Align(
-              AppSecretsScreen(
+                alignment: Alignment.topCenter,
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 640),
+                  child: _AppOverview(app: app),
+                ),
+              ),
+              Align(
+                alignment: Alignment.topCenter,
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 640),
+                  child: AppSecretsScreen(
                     publisherName: publisherName,
                     projectId: projectId,
                     appId: appId,
                   ),
+                ),
+              ),
             ],
           );
         },
         loading: () => const Center(child: CircularProgressIndicator()),
-        error:
+        error: (err, stack) => ResponseErrorWidget(
-            (err, stack) => ResponseErrorWidget(
           error: err,
-              onRetry:
+          onRetry: () => ref.invalidate(
-                  () => ref.invalidate(
             customAppProvider(publisherName, projectId, appId),
           ),
         ),
@@ -115,6 +124,7 @@ class _AppOverview extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SingleChildScrollView(
+      padding: EdgeInsets.zero,
       child: Column(
         children: [
           AspectRatio(
@@ -125,8 +135,7 @@ class _AppOverview extends StatelessWidget {
               children: [
                 Container(
                   color: Theme.of(context).colorScheme.surfaceContainer,
-                  child:
+                  child: app.background != null
-                      app.background != null
                       ? CloudFileWidget(
                           item: app.background!,
                           fit: BoxFit.cover,

lib/screens/developers/app_secrets.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/custom_app_secret.dart';
 import 'package:island/pods/network.dart';
@@ -53,8 +54,7 @@ class AppSecretsScreen extends HookConsumerWidget {
       showModalBottomSheet(
         context: context,
         isScrollControlled: true,
-        builder:
+        builder: (context) => SheetScaffold(
-            (context) => SheetScaffold(
           titleText: 'newSecretGenerated'.tr(),
           child: Padding(
             padding: const EdgeInsets.all(20.0),
@@ -114,23 +114,39 @@ class AppSecretsScreen extends HookConsumerWidget {
                         controller: descriptionController,
                         decoration: InputDecoration(
                           labelText: 'description'.tr(),
+                          border: OutlineInputBorder(
+                            borderRadius: const BorderRadius.all(
+                              Radius.circular(12),
+                            ),
+                          ),
                         ),
                         autofocus: true,
                       ),
-                      const SizedBox(height: 20),
+                      const Gap(16),
                       TextFormField(
                         controller: expiresInController,
                         decoration: InputDecoration(
                           labelText: 'expiresIn'.tr(),
+                          border: OutlineInputBorder(
+                            borderRadius: const BorderRadius.all(
+                              Radius.circular(12),
+                            ),
+                          ),
                         ),
                         keyboardType: TextInputType.number,
                       ),
-                      const SizedBox(height: 20),
+                      const Gap(16),
-                      SwitchListTile(
+                      Card(
+                        margin: EdgeInsets.zero,
+                        child: SwitchListTile(
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
                           title: Text('isOidc'.tr()),
                           value: isOidc.value,
                           onChanged: (value) => isOidc.value = value,
                         ),
+                      ),
                       const SizedBox(height: 20),
                       FilledButton.icon(
                         onPressed: () async {
@@ -175,13 +191,8 @@ class AppSecretsScreen extends HookConsumerWidget {
     return secrets.when(
       data: (data) {
         return RefreshIndicator(
-          onRefresh:
+          onRefresh: () => ref.refresh(
-              () => ref.refresh(
+            customAppSecretsProvider(publisherName, projectId, appId).future,
-                customAppSecretsProvider(
-                  publisherName,
-                  projectId,
-                  appId,
-                ).future,
           ),
           child: Column(
             children: [
@@ -240,11 +251,9 @@ class AppSecretsScreen extends HookConsumerWidget {
         );
       },
       loading: () => const Center(child: CircularProgressIndicator()),
-      error:
+      error: (err, stack) => ResponseErrorWidget(
-          (err, stack) => ResponseErrorWidget(
         error: err,
-            onRetry:
+        onRetry: () => ref.invalidate(
-                () => ref.invalidate(
           customAppSecretsProvider(publisherName, projectId, appId),
         ),
       ),

lib/screens/developers/apps.dart

@@ -76,8 +76,7 @@ class CustomAppsScreen extends HookConsumerWidget {
                     showModalBottomSheet(
                       context: context,
                       isScrollControlled: true,
-                      builder:
+                      builder: (context) => SheetScaffold(
-                          (context) => SheetScaffold(
                         titleText: 'createCustomApp'.tr(),
                         child: NewCustomAppScreen(
                           publisherName: publisherName,
@@ -95,10 +94,8 @@ class CustomAppsScreen extends HookConsumerWidget {
           );
         }
         return ExtendedRefreshIndicator(
-          onRefresh:
+          onRefresh: () =>
-              () => ref.refresh(
+              ref.refresh(customAppsProvider(publisherName, projectId).future),
-                customAppsProvider(publisherName, projectId).future,
-              ),
           child: Column(
             children: [
               const Gap(8),
@@ -110,8 +107,7 @@ class CustomAppsScreen extends HookConsumerWidget {
                       showModalBottomSheet(
                         context: context,
                         isScrollControlled: true,
-                        builder:
+                        builder: (context) => SheetScaffold(
-                            (context) => SheetScaffold(
                           titleText: 'createCustomApp'.tr(),
                           child: NewCustomAppScreen(
                             publisherName: publisherName,
@@ -145,32 +141,21 @@ class CustomAppsScreen extends HookConsumerWidget {
                           );
                         },
                         child: Column(
-                          children: [
-                            SizedBox(
-                              height: 150,
-                              child: Stack(
-                                fit: StackFit.expand,
                           children: [
                             if (app.background != null)
-                                    CloudFileWidget(
+                              AspectRatio(
+                                aspectRatio: 16 / 7,
+                                child: CloudFileWidget(
                                   item: app.background!,
                                   fit: BoxFit.cover,
                                 ).clipRRect(topLeft: 8, topRight: 8),
-                                  if (app.picture != null)
-                                    Positioned(
-                                      left: 16,
-                                      bottom: 16,
-                                      child: ProfilePictureWidget(
-                                        fileId: app.picture!.id,
-                                        radius: 40,
-                                        fallbackIcon: Symbols.apps,
-                                      ),
-                                    ),
-                                ],
-                              ),
                               ),
                             ListTile(
                               title: Text(app.name),
+                              leading: ProfilePictureWidget(
+                                fileId: app.picture?.id,
+                                fallbackIcon: Symbols.apps,
+                              ),
                               subtitle: Text(
                                 app.slug,
                                 style: GoogleFonts.robotoMono(fontSize: 12),
@@ -180,8 +165,7 @@ class CustomAppsScreen extends HookConsumerWidget {
                                 right: 12,
                               ),
                               trailing: PopupMenuButton(
-                                itemBuilder:
+                                itemBuilder: (context) => [
-                                    (context) => [
                                   PopupMenuItem(
                                     value: 'edit',
                                     child: Row(
@@ -203,9 +187,7 @@ class CustomAppsScreen extends HookConsumerWidget {
                                         const SizedBox(width: 12),
                                         Text(
                                           'delete',
-                                              style: TextStyle(
+                                          style: TextStyle(color: Colors.red),
-                                                color: Colors.red,
-                                              ),
                                         ).tr(),
                                       ],
                                     ),
@@ -216,8 +198,7 @@ class CustomAppsScreen extends HookConsumerWidget {
                                     showModalBottomSheet(
                                       context: context,
                                       isScrollControlled: true,
-                                      builder:
+                                      builder: (context) => SheetScaffold(
-                                          (context) => SheetScaffold(
                                         titleText: 'editCustomApp'.tr(),
                                         child: EditAppScreen(
                                           publisherName: publisherName,
@@ -264,13 +245,10 @@ class CustomAppsScreen extends HookConsumerWidget {
         );
       },
       loading: () => const Center(child: CircularProgressIndicator()),
-      error:
+      error: (err, stack) => ResponseErrorWidget(
-          (err, stack) => ResponseErrorWidget(
         error: err,
-            onRetry:
+        onRetry: () =>
-                () => ref.invalidate(
+            ref.invalidate(customAppsProvider(publisherName, projectId)),
-                  customAppsProvider(publisherName, projectId),
-                ),
       ),
     );
   }

lib/screens/developers/bot_detail.dart

@@ -36,8 +36,7 @@ class BotDetailScreen extends HookConsumerWidget {
         actions: [
           IconButton(
             icon: const Icon(Symbols.edit),
-            onPressed:
+            onPressed: botData.value == null
-                botData.value == null
                 ? null
                 : () {
                     context.pushNamed(
@@ -84,23 +83,32 @@ class BotDetailScreen extends HookConsumerWidget {
             controller: tabController,
             physics: const NeverScrollableScrollPhysics(),
             children: [
-              _BotOverview(bot: bot),
+              Align(
-              BotKeysScreen(
+                alignment: Alignment.topCenter,
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 640),
+                  child: _BotOverview(bot: bot),
+                ),
+              ),
+              Align(
+                alignment: Alignment.topCenter,
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 640),
+                  child: BotKeysScreen(
                     publisherName: publisherName,
                     projectId: projectId,
                     botId: botId,
                   ),
+                ),
+              ),
             ],
           );
         },
         loading: () => const Center(child: CircularProgressIndicator()),
-        error:
+        error: (err, stack) => ResponseErrorWidget(
-            (err, stack) => ResponseErrorWidget(
           error: err,
-              onRetry:
+          onRetry: () =>
-                  () => ref.invalidate(
+              ref.invalidate(botProvider(publisherName, projectId, botId)),
-                    botProvider(publisherName, projectId, botId),
-                  ),
         ),
       ),
     );
@@ -124,8 +132,7 @@ class _BotOverview extends StatelessWidget {
               children: [
                 Container(
                   color: Theme.of(context).colorScheme.surfaceContainer,
-                  child:
+                  child: bot.account.profile.background != null
-                      bot.account.profile.background != null
                       ? CloudFileWidget(
                           item: bot.account.profile.background!,
                           fit: BoxFit.cover,

lib/screens/developers/bot_keys.dart

@@ -53,8 +53,7 @@ class BotKeysScreen extends HookConsumerWidget {
       showModalBottomSheet(
         context: context,
         isScrollControlled: true,
-        builder:
+        builder: (context) => SheetScaffold(
-            (context) => SheetScaffold(
           titleText: 'newKeyGenerated'.tr(),
           child: Padding(
             padding: const EdgeInsets.all(20.0),
@@ -94,8 +93,8 @@ class BotKeysScreen extends HookConsumerWidget {
       showModalBottomSheet(
         context: context,
         isScrollControlled: true,
-        builder:
+        builder: (context) => SheetScaffold(
-            (context) => SheetScaffold(
+          heightFactor: 0.7,
           titleText: 'newBotKey'.tr(),
           child: Padding(
             padding: const EdgeInsets.all(20.0),
@@ -105,7 +104,12 @@ class BotKeysScreen extends HookConsumerWidget {
               children: [
                 TextFormField(
                   controller: keyNameController,
-                      decoration: InputDecoration(labelText: 'keyName'.tr()),
+                  decoration: InputDecoration(
+                    labelText: 'keyName'.tr(),
+                    border: const OutlineInputBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(12)),
+                    ),
+                  ),
                   autofocus: true,
                 ),
                 const SizedBox(height: 20),
@@ -189,22 +193,15 @@ class BotKeysScreen extends HookConsumerWidget {
             ListTile(
               leading: const Icon(Symbols.add),
               title: Text('newBotKey'.tr()),
-              trailing: const Icon(Symbols.chevron_right),
               onTap: createKey,
             ),
             const Divider(height: 1),
             Expanded(
-              child:
+              child: data.isEmpty
-                  data.isEmpty
                   ? Center(child: Text('noBotKeys'.tr()))
                   : RefreshIndicator(
-                        onRefresh:
+                      onRefresh: () => ref.refresh(
-                            () => ref.refresh(
+                        botKeysProvider(publisherName, projectId, botId).future,
-                              botKeysProvider(
-                                publisherName,
-                                projectId,
-                                botId,
-                              ).future,
                       ),
                       child: ListView.builder(
                         padding: EdgeInsets.zero,
@@ -219,8 +216,7 @@ class BotKeysScreen extends HookConsumerWidget {
                               right: 12,
                             ),
                             trailing: PopupMenuButton(
-                                itemBuilder:
+                              itemBuilder: (context) => [
-                                    (context) => [
                                 PopupMenuItem(
                                   value: 'rotate',
                                   child: Row(
@@ -242,9 +238,7 @@ class BotKeysScreen extends HookConsumerWidget {
                                       const Gap(12),
                                       Text(
                                         'revoke'.tr(),
-                                              style: TextStyle(
+                                        style: TextStyle(color: Colors.red),
-                                                color: Colors.red,
-                                              ),
                                       ),
                                     ],
                                   ),
@@ -267,13 +261,10 @@ class BotKeysScreen extends HookConsumerWidget {
         );
       },
       loading: () => const Center(child: CircularProgressIndicator()),
-      error:
+      error: (err, stack) => ResponseErrorWidget(
-          (err, stack) => ResponseErrorWidget(
         error: err,
-            onRetry:
+        onRetry: () =>
-                () => ref.invalidate(
+            ref.invalidate(botKeysProvider(publisherName, projectId, botId)),
-                  botKeysProvider(publisherName, projectId, botId),
-                ),
       ),
     );
   }

lib/screens/developers/bots.dart

@@ -54,8 +54,7 @@ class BotsScreen extends HookConsumerWidget {
                     showModalBottomSheet(
                       context: context,
                       isScrollControlled: true,
-                      builder:
+                      builder: (context) => SheetScaffold(
-                          (context) => SheetScaffold(
                         titleText: 'createBot'.tr(),
                         child: NewBotScreen(
                           publisherName: publisherName,
@@ -73,8 +72,8 @@ class BotsScreen extends HookConsumerWidget {
           );
         }
         return ExtendedRefreshIndicator(
-          onRefresh:
+          onRefresh: () =>
-              () => ref.refresh(botsProvider(publisherName, projectId).future),
+              ref.refresh(botsProvider(publisherName, projectId).future),
           child: Column(
             children: [
               const Gap(8),
@@ -86,8 +85,7 @@ class BotsScreen extends HookConsumerWidget {
                       showModalBottomSheet(
                         context: context,
                         isScrollControlled: true,
-                        builder:
+                        builder: (context) => SheetScaffold(
-                            (context) => SheetScaffold(
                           titleText: 'createBot'.tr(),
                           child: NewBotScreen(
                             publisherName: publisherName,
@@ -108,23 +106,30 @@ class BotsScreen extends HookConsumerWidget {
                   itemBuilder: (context, index) {
                     final bot = data[index];
                     return Card(
-                      child: ListTile(
+                      child: Column(
-                        shape: const RoundedRectangleBorder(
+                        children: [
-                          borderRadius: BorderRadius.all(Radius.circular(8.0)),
+                          if (bot.account.profile.background != null)
+                            AspectRatio(
+                              aspectRatio: 16 / 7,
+                              child: CloudFileWidget(
+                                item: bot.account.profile.background!,
+                                fit: BoxFit.cover,
+                              ).clipRRect(topLeft: 8, topRight: 8),
                             ),
-                        leading: CircleAvatar(
+                          ListTile(
-                          child:
+                            shape: const RoundedRectangleBorder(
-                              bot.account.profile.picture != null
+                              borderRadius: BorderRadius.all(
-                                  ? ProfilePictureWidget(
+                                Radius.circular(8.0),
-                                    file: bot.account.profile.picture!,
+                              ),
-                                  )
+                            ),
-                                  : const Icon(Symbols.smart_toy),
+                            leading: ProfilePictureWidget(
+                              fallbackIcon: Symbols.smart_toy,
+                              file: bot.account.profile.picture,
                             ),
                             title: Text(bot.account.nick),
                             subtitle: Text(bot.account.name),
                             trailing: PopupMenuButton(
-                          itemBuilder:
+                              itemBuilder: (context) => [
-                              (context) => [
                                 PopupMenuItem(
                                   value: 'edit',
                                   child: Row(
@@ -157,8 +162,7 @@ class BotsScreen extends HookConsumerWidget {
                                   showModalBottomSheet(
                                     context: context,
                                     isScrollControlled: true,
-                                builder:
+                                    builder: (context) => SheetScaffold(
-                                    (context) => SheetScaffold(
                                       titleText: 'editBot'.tr(),
                                       child: EditBotScreen(
                                         publisherName: publisherName,
@@ -175,7 +179,9 @@ class BotsScreen extends HookConsumerWidget {
                                     isDanger: true,
                                   ).then((confirm) {
                                     if (confirm) {
-                                  final client = ref.read(apiClientProvider);
+                                      final client = ref.read(
+                                        apiClientProvider,
+                                      );
                                       client.delete(
                                         '/develop/developers/$publisherName/projects/$projectId/bots/${bot.id}',
                                       );
@@ -198,6 +204,8 @@ class BotsScreen extends HookConsumerWidget {
                               );
                             },
                           ),
+                        ],
+                      ),
                     );
                   },
                 ),
@@ -207,11 +215,9 @@ class BotsScreen extends HookConsumerWidget {
         );
       },
       loading: () => const Center(child: CircularProgressIndicator()),
-      error:
+      error: (err, stack) => ResponseErrorWidget(
-          (err, stack) => ResponseErrorWidget(
         error: err,
-            onRetry:
+        onRetry: () => ref.invalidate(botsProvider(publisherName, projectId)),
-                () => ref.invalidate(botsProvider(publisherName, projectId)),
       ),
     );
   }

lib/screens/developers/project_detail_view.dart

@@ -24,6 +24,16 @@ class ProjectDetailView extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final tabController = useTabController(initialLength: 2);
+    final currentDest = useState(0);
+
+    useEffect(() {
+      tabController.addListener(() {
+        if (tabController.indexIsChanging) {
+          currentDest.value = tabController.index;
+        }
+      });
+      return null;
+    });
 
     final isWide = isWideScreen(context);
 
@@ -38,14 +48,13 @@ class ProjectDetailView extends HookConsumerWidget {
               child: NavigationRail(
                 extended: isWiderScreen(context),
                 scrollable: true,
-                labelType:
+                labelType: isWiderScreen(context)
-                    isWiderScreen(context)
                     ? null
                     : NavigationRailLabelType.selected,
                 backgroundColor: Colors.transparent,
-                selectedIndex: tabController.index,
+                selectedIndex: currentDest.value,
-                onDestinationSelected:
+                onDestinationSelected: (index) =>
-                    (index) => tabController.animateTo(index),
+                    tabController.animateTo(index),
                 destinations: [
                   NavigationRailDestination(
                     icon: Icon(Icons.apps),

lib/widgets/content/cloud_files.dart

@@ -9,8 +9,11 @@ import 'package:island/models/file.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/services/time.dart';
 import 'package:island/utils/format.dart';
+import 'package:island/widgets/content/profile_decoration.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'dart:math' as math;
+import 'dart:ui' as ui;
 import 'package:island/widgets/data_saving_gate.dart';
 
 import 'file_viewer_contents.dart';
@@ -258,15 +261,13 @@ class CloudFileWidget extends HookConsumerWidget {
     var content = switch (item.mimeType?.split('/').firstOrNull) {
       'image' => AspectRatio(
         aspectRatio: ratio,
-        child:
+        child: (useInternalGate && dataSaving && !unlocked.value)
-            (useInternalGate && dataSaving && !unlocked.value)
             ? dataPlaceHolder(Symbols.image)
             : cloudImage(),
       ),
       'video' => AspectRatio(
         aspectRatio: ratio,
-        child:
+        child: (useInternalGate && dataSaving && !unlocked.value)
-            (useInternalGate && dataSaving && !unlocked.value)
             ? dataPlaceHolder(Symbols.play_arrow)
             : cloudVideo(),
       ),
@@ -383,8 +384,7 @@ class CloudVideoWidget extends HookConsumerWidget {
     final serverUrl = ref.watch(serverUrlProvider);
     final uri = '$serverUrl/drive/files/${item.id}';
 
-    var ratio =
+    var ratio = item.fileMeta?['ratio'] is num
-        item.fileMeta?['ratio'] is num
         ? item.fileMeta!['ratio'].toDouble()
         : 1.0;
     if (ratio == 0) ratio = 1.0;
@@ -533,8 +533,7 @@ class CloudImageWidget extends ConsumerWidget {
 
     return AspectRatio(
       aspectRatio: aspectRatio,
-      child:
+      child: file != null
-          file != null
           ? CloudFileWidget(item: file!, fit: fit)
           : UniversalImage(uri: uri, blurHash: blurHash, fit: fit),
     );
@@ -545,8 +544,7 @@ class CloudImageWidget extends ConsumerWidget {
     required String serverUrl,
     bool original = false,
   }) {
-    final uri =
+    final uri = original
-        original
         ? '$serverUrl/drive/files/$fileId?original=true'
         : '$serverUrl/drive/files/$fileId';
     return CachedNetworkImageProvider(uri);
@@ -560,6 +558,7 @@ class ProfilePictureWidget extends ConsumerWidget {
   final double? borderRadius;
   final IconData? fallbackIcon;
   final Color? fallbackColor;
+  final ProfileDecoration? decoration;
   const ProfilePictureWidget({
     super.key,
     this.fileId,
@@ -568,6 +567,7 @@ class ProfilePictureWidget extends ConsumerWidget {
     this.borderRadius,
     this.fallbackIcon,
     this.fallbackColor,
+    this.decoration,
   });
 
   @override
@@ -575,36 +575,49 @@ class ProfilePictureWidget extends ConsumerWidget {
     final serverUrl = ref.watch(serverUrlProvider);
     final String? id = file?.id ?? fileId;
 
-    final fallback =
+    final fallback = Icon(
-        Icon(
       fallbackIcon ?? Symbols.account_circle,
       size: radius,
-          color:
+      color: fallbackColor ?? Theme.of(context).colorScheme.onPrimaryContainer,
-              fallbackColor ?? Theme.of(context).colorScheme.onPrimaryContainer,
     ).center();
 
-    return ClipRRect(
+    final image = id == null
-      borderRadius:
-          borderRadius == null
-              ? BorderRadius.all(Radius.circular(radius))
-              : BorderRadius.all(Radius.circular(borderRadius!)),
-      child: Container(
-        width: radius * 2,
-        height: radius * 2,
-        color: Theme.of(context).colorScheme.primaryContainer,
-        child:
-            id == null
         ? fallback
         : DataSavingGate(
             bypass: true,
             placeholder: fallback,
-                  content:
+            content: () => UniversalImage(
-                      () => UniversalImage(
               uri: '$serverUrl/drive/files/$id',
               fit: BoxFit.cover,
             ),
+          );
+
+    Widget content = Container(
+      width: radius * 2,
+      height: radius * 2,
+      color: Theme.of(context).colorScheme.primaryContainer,
+      child: decoration != null
+          ? Stack(
+              fit: StackFit.expand,
+              children: [
+                image,
+                CustomPaint(
+                  painter: _ProfileDecorationPainter(
+                    text: decoration!.text,
+                    color: decoration!.color,
+                    textColor: decoration!.textColor ?? Colors.white,
                   ),
                 ),
+              ],
+            )
+          : image,
+    );
+
+    return ClipRRect(
+      borderRadius: borderRadius == null
+          ? BorderRadius.all(Radius.circular(radius))
+          : BorderRadius.all(Radius.circular(borderRadius!)),
+      child: content,
     );
   }
 }
@@ -716,11 +729,9 @@ class SplitAvatarWidget extends ConsumerWidget {
                           ),
                         ),
                         Expanded(
-                          child:
+                          child: filesId.length > 4
-                              filesId.length > 4
                               ? Container(
-                                    color:
+                                  color: Theme.of(
-                                        Theme.of(
                                     context,
                                   ).colorScheme.primaryContainer,
                                   child: Center(
@@ -728,8 +739,7 @@ class SplitAvatarWidget extends ConsumerWidget {
                                       '+${filesId.length - 3}',
                                       style: TextStyle(
                                         fontSize: radius * 0.4,
-                                          color:
+                                        color: Theme.of(
-                                              Theme.of(
                                           context,
                                         ).colorScheme.onPrimaryContainer,
                                       ),
@@ -765,13 +775,11 @@ class SplitAvatarWidget extends ConsumerWidget {
         width: radius,
         height: radius,
         color: Theme.of(context).colorScheme.primaryContainer,
-        child:
+        child: Icon(
-            Icon(
           fallbackIcon,
           size: radius * 0.6,
           color:
-                  fallbackColor ??
+              fallbackColor ?? Theme.of(context).colorScheme.onPrimaryContainer,
-                  Theme.of(context).colorScheme.onPrimaryContainer,
         ).center(),
       );
     }
@@ -786,3 +794,106 @@ class SplitAvatarWidget extends ConsumerWidget {
     );
   }
 }
+
+class _ProfileDecorationPainter extends CustomPainter {
+  final String text;
+  final Color color;
+  final Color textColor;
+
+  _ProfileDecorationPainter({
+    required this.text,
+    required this.color,
+    required this.textColor,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    if (text.isEmpty) return;
+
+    final radius = size.width / 2;
+    final center = Offset(size.width / 2, size.height / 2);
+
+    final strokeWidth = radius * 0.4; // Increased thickness
+    final centerAngle = 3 * math.pi / 4;
+    final sweepAngle = math.pi / 1;
+    final startAngle = centerAngle - (sweepAngle / 2);
+
+    final arcRadius = radius - (strokeWidth / 2);
+    final rect = Rect.fromCircle(center: center, radius: arcRadius);
+
+    final paint = Paint()
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = strokeWidth
+      ..shader = SweepGradient(
+        startAngle: startAngle,
+        endAngle: startAngle + sweepAngle,
+        colors: [color.withOpacity(0), color, color, color.withOpacity(0)],
+        stops: const [0.0, 0.25, 0.75, 1.0],
+      ).createShader(rect);
+
+    canvas.drawArc(rect, startAngle, sweepAngle, false, paint);
+
+    _drawTextOnArc(canvas, center, arcRadius, text, centerAngle);
+  }
+
+  void _drawTextOnArc(
+    Canvas canvas,
+    Offset center,
+    double radius,
+    String text,
+    double centerAngle,
+  ) {
+    final textStyle = TextStyle(
+      color: textColor,
+      fontSize: radius * 0.28,
+      fontWeight: FontWeight.bold,
+    );
+
+    double totalAngle = 0;
+    List<double> charAngles = [];
+
+    // Calculate total angle occupied by text
+    for (int i = 0; i < text.length; i++) {
+      final char = text[i];
+      final span = TextSpan(text: char, style: textStyle);
+      final tp = TextPainter(text: span, textDirection: ui.TextDirection.ltr);
+      tp.layout();
+      final charWidth = tp.width;
+      final angle = charWidth / radius;
+      charAngles.add(angle);
+      totalAngle += angle;
+    }
+
+    // Start from "Left" of the center (High angle)
+    // We want to traverse from centerAngle + total/2 to centerAngle - total/2
+    double currentAngle = centerAngle + (totalAngle / 2);
+
+    for (int i = 0; i < text.length; i++) {
+      final char = text[i];
+      final span = TextSpan(text: char, style: textStyle);
+      final tp = TextPainter(text: span, textDirection: ui.TextDirection.ltr);
+      tp.layout();
+
+      final charAngle = charAngles[i];
+      final midCharAngle = currentAngle - charAngle / 2;
+
+      final x = center.dx + radius * math.cos(midCharAngle);
+      final y = center.dy + radius * math.sin(midCharAngle);
+
+      canvas.save();
+      canvas.translate(x, y);
+      canvas.rotate(midCharAngle - math.pi / 2);
+
+      tp.paint(canvas, Offset(-tp.width / 2, -tp.height / 2));
+
+      canvas.restore();
+
+      currentAngle -= charAngle;
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) {
+    return true;
+  }
+}

lib/widgets/content/profile_decoration.dart

@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'profile_decoration.freezed.dart';
+
+@freezed
+sealed class ProfileDecoration with _$ProfileDecoration {
+  const factory ProfileDecoration({
+    required String text,
+    required Color color,
+    Color? textColor,
+  }) = _ProfileDecoration;
+}

lib/widgets/content/profile_decoration.freezed.dart

@@ -0,0 +1,277 @@
+// 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 'profile_decoration.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+/// @nodoc
+mixin _$ProfileDecoration {
+
+ String get text; Color get color; Color? get textColor;
+/// Create a copy of ProfileDecoration
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$ProfileDecorationCopyWith<ProfileDecoration> get copyWith => _$ProfileDecorationCopyWithImpl<ProfileDecoration>(this as ProfileDecoration, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is ProfileDecoration&&(identical(other.text, text) || other.text == text)&&(identical(other.color, color) || other.color == color)&&(identical(other.textColor, textColor) || other.textColor == textColor));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,text,color,textColor);
+
+@override
+String toString() {
+  return 'ProfileDecoration(text: $text, color: $color, textColor: $textColor)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $ProfileDecorationCopyWith<$Res>  {
+  factory $ProfileDecorationCopyWith(ProfileDecoration value, $Res Function(ProfileDecoration) _then) = _$ProfileDecorationCopyWithImpl;
+@useResult
+$Res call({
+ String text, Color color, Color? textColor
+});
+
+
+
+
+}
+/// @nodoc
+class _$ProfileDecorationCopyWithImpl<$Res>
+    implements $ProfileDecorationCopyWith<$Res> {
+  _$ProfileDecorationCopyWithImpl(this._self, this._then);
+
+  final ProfileDecoration _self;
+  final $Res Function(ProfileDecoration) _then;
+
+/// Create a copy of ProfileDecoration
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? text = null,Object? color = null,Object? textColor = freezed,}) {
+  return _then(_self.copyWith(
+text: null == text ? _self.text : text // ignore: cast_nullable_to_non_nullable
+as String,color: null == color ? _self.color : color // ignore: cast_nullable_to_non_nullable
+as Color,textColor: freezed == textColor ? _self.textColor : textColor // ignore: cast_nullable_to_non_nullable
+as Color?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [ProfileDecoration].
+extension ProfileDecorationPatterns on ProfileDecoration {
+/// 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( _ProfileDecoration value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _ProfileDecoration() 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( _ProfileDecoration value)  $default,){
+final _that = this;
+switch (_that) {
+case _ProfileDecoration():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// 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( _ProfileDecoration value)?  $default,){
+final _that = this;
+switch (_that) {
+case _ProfileDecoration() 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 text,  Color color,  Color? textColor)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _ProfileDecoration() when $default != null:
+return $default(_that.text,_that.color,_that.textColor);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 text,  Color color,  Color? textColor)  $default,) {final _that = this;
+switch (_that) {
+case _ProfileDecoration():
+return $default(_that.text,_that.color,_that.textColor);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// 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 text,  Color color,  Color? textColor)?  $default,) {final _that = this;
+switch (_that) {
+case _ProfileDecoration() when $default != null:
+return $default(_that.text,_that.color,_that.textColor);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class _ProfileDecoration implements ProfileDecoration {
+  const _ProfileDecoration({required this.text, required this.color, this.textColor});
+  
+
+@override final  String text;
+@override final  Color color;
+@override final  Color? textColor;
+
+/// Create a copy of ProfileDecoration
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$ProfileDecorationCopyWith<_ProfileDecoration> get copyWith => __$ProfileDecorationCopyWithImpl<_ProfileDecoration>(this, _$identity);
+
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _ProfileDecoration&&(identical(other.text, text) || other.text == text)&&(identical(other.color, color) || other.color == color)&&(identical(other.textColor, textColor) || other.textColor == textColor));
+}
+
+
+@override
+int get hashCode => Object.hash(runtimeType,text,color,textColor);
+
+@override
+String toString() {
+  return 'ProfileDecoration(text: $text, color: $color, textColor: $textColor)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$ProfileDecorationCopyWith<$Res> implements $ProfileDecorationCopyWith<$Res> {
+  factory _$ProfileDecorationCopyWith(_ProfileDecoration value, $Res Function(_ProfileDecoration) _then) = __$ProfileDecorationCopyWithImpl;
+@override @useResult
+$Res call({
+ String text, Color color, Color? textColor
+});
+
+
+
+
+}
+/// @nodoc
+class __$ProfileDecorationCopyWithImpl<$Res>
+    implements _$ProfileDecorationCopyWith<$Res> {
+  __$ProfileDecorationCopyWithImpl(this._self, this._then);
+
+  final _ProfileDecoration _self;
+  final $Res Function(_ProfileDecoration) _then;
+
+/// Create a copy of ProfileDecoration
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? text = null,Object? color = null,Object? textColor = freezed,}) {
+  return _then(_ProfileDecoration(
+text: null == text ? _self.text : text // ignore: cast_nullable_to_non_nullable
+as String,color: null == color ? _self.color : color // ignore: cast_nullable_to_non_nullable
+as Color,textColor: freezed == textColor ? _self.textColor : textColor // ignore: cast_nullable_to_non_nullable
+as Color?,
+  ));
+}
+
+
+}
+
+// dart format on

lib/widgets/post/compose_sheet.dart

@@ -1,4 +1,7 @@
+import 'dart:io';
+
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
@@ -8,6 +11,7 @@ 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/services/responsive.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/post/compose_card.dart';
 import 'package:island/widgets/post/compose_shared.dart';
@@ -171,7 +175,14 @@ class PostComposeSheet extends HookConsumerWidget {
       ),
     ];
 
+    // Tablet will show a virtual keyboard, so we adjust the height factor accordingly
+    final isTablet =
+        isWideScreen(context) &&
+        !kIsWeb &&
+        (Platform.isAndroid || Platform.isAndroid);
+
     return SheetScaffold(
+      heightFactor: isTablet ? 0.95 : 0.8,
       titleText: 'postCompose'.tr(),
       actions: actions,
       child: PostComposeCard(

lib/widgets/sites/file_management_section.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:file_picker/file_picker.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
@@ -10,6 +11,7 @@ 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:permission_handler/permission_handler.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:path/path.dart' as p;
 
@@ -53,6 +55,9 @@ class FileManagementSection extends HookConsumerWidget {
                     PopupMenuButton<String>(
                       icon: const Icon(Symbols.upload),
                       onSelected: (String choice) async {
+                        if (!kIsWeb) {
+                          await Permission.storage.request();
+                        }
                         List<File> files = [];
                         List<Map<String, dynamic>>? results;
                         if (choice == 'files') {
@@ -65,17 +70,17 @@ class FileManagementSection extends HookConsumerWidget {
                               selectedFiles.files.isEmpty) {
                             return; // User canceled
                           }
-                          files =
+                          files = selectedFiles.files
-                              selectedFiles.files
                               .map((f) => File(f.path!))
                               .toList();
                         } else if (choice == 'folder') {
-                          final dirPath =
+                          final dirPath = await FilePicker.platform
-                              await FilePicker.platform.getDirectoryPath();
+                              .getDirectoryPath();
                           if (dirPath == null) return;
                           results = await _getFilesRecursive(dirPath);
-                          files =
+                          files = results
-                              results.map((m) => m['file'] as File).toList();
+                              .map((m) => m['file'] as File)
+                              .toList();
                           if (files.isEmpty) {
                             showSnackBar('noFilesFoundInFolder'.tr());
                             return;
@@ -88,15 +93,11 @@ class FileManagementSection extends HookConsumerWidget {
                         showModalBottomSheet(
                           context: context,
                           isScrollControlled: true,
-                          builder:
+                          builder: (context) => FileUploadDialog(
-                              (context) => FileUploadDialog(
                             selectedFiles: files,
                             site: site,
-                                relativePaths:
+                            relativePaths: results
-                                    results
+                                ?.map((m) => m['relativePath'] as String)
-                                        ?.map(
-                                          (m) => m['relativePath'] as String,
-                                        )
                                 .toList(),
                             onUploadComplete: () {
                               // Refresh file list
@@ -110,8 +111,7 @@ class FileManagementSection extends HookConsumerWidget {
                           ),
                         );
                       },
-                      itemBuilder:
+                      itemBuilder: (BuildContext context) => [
-                          (BuildContext context) => [
                         PopupMenuItem<String>(
                           value: 'files',
                           child: Row(
@@ -156,8 +156,7 @@ class FileManagementSection extends HookConsumerWidget {
                         IconButton(
                           icon: Icon(Symbols.arrow_back),
                           onPressed: () {
-                            final pathParts =
+                            final pathParts = currentPath.value!
-                                currentPath.value!
                                 .split('/')
                                 .where((part) => part.isNotEmpty)
                                 .toList();
@@ -165,8 +164,7 @@ class FileManagementSection extends HookConsumerWidget {
                               currentPath.value = null;
                             } else {
                               pathParts.removeLast();
-                              currentPath.value =
+                              currentPath.value = pathParts.isEmpty
-                                  pathParts.isEmpty
                                   ? null
                                   : pathParts.join('/');
                             }
@@ -185,8 +183,7 @@ class FileManagementSection extends HookConsumerWidget {
                                 child: Text('siteRoot'.tr()),
                               ),
                               ...() {
-                                final parts =
+                                final parts = currentPath.value!
-                                    currentPath.value!
                                     .split('/')
                                     .where((part) => part.isNotEmpty)
                                     .toList();
@@ -200,8 +197,8 @@ class FileManagementSection extends HookConsumerWidget {
                                   widgets.addAll([
                                     const Text(' / '),
                                     InkWell(
-                                      onTap:
+                                      onTap: () =>
-                                          () => currentPath.value = pathToSet,
+                                          currentPath.value = pathToSet,
                                       child: Text(part),
                                     ),
                                   ]);
@@ -253,23 +250,21 @@ class FileManagementSection extends HookConsumerWidget {
                         return FileItem(
                           file: file,
                           site: site,
-                          onNavigateDirectory:
+                          onNavigateDirectory: (path) =>
-                              (path) => currentPath.value = path,
+                              currentPath.value = path,
                         );
                       },
                     );
                   },
-                  loading:
+                  loading: () =>
-                      () => const Center(child: CircularProgressIndicator()),
+                      const Center(child: CircularProgressIndicator()),
-                  error:
+                  error: (error, stack) => Center(
-                      (error, stack) => Center(
                     child: Column(
                       children: [
                         Text('failedToLoadFiles'.tr()),
                         const Gap(8),
                         ElevatedButton(
-                              onPressed:
+                          onPressed: () => ref.invalidate(
-                                  () => ref.invalidate(
                             siteFilesProvider(
                               siteId: site.id,
                               path: currentPath.value,

lib/widgets/sites/site_action_menu.dart

@@ -19,8 +19,7 @@ class SiteActionMenu extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return PopupMenuButton<String>(
-      itemBuilder:
+      itemBuilder: (context) => [
-          (context) => [
         PopupMenuItem(
           value: 'edit',
           child: Row(
@@ -52,31 +51,18 @@ class SiteActionMenu extends HookConsumerWidget {
             showModalBottomSheet(
               context: context,
               isScrollControlled: true,
-              builder:
+              builder: (context) =>
-                  (context) => SiteForm(pubName: pubName, siteSlug: site.slug),
+                  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>(
+            final confirmed = await showConfirmAlert(
-              context: context,
+              'publicationSiteDeleteConfirm'.tr(),
-              builder:
+              'deleteSite'.tr(),
-                  (context) => AlertDialog(
+              isDanger: true,
-                    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) {

pubspec.lock

@@ -1917,6 +1917,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0+3"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      sha256: bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.0.1"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.1"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.4.7"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3+5"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   petitparser:
     dependency: transitive
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 3.5.0+150
+version: 3.5.0+151
 
 environment:
   sdk: ^3.8.0
@@ -171,6 +171,7 @@ dependencies:
   http_parser: ^4.1.2
   flutter_code_editor: ^0.3.5
   skeletonizer: ^2.1.1
+  permission_handler: ^12.0.1
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -24,6 +24,7 @@
 #include <media_kit_libs_windows_video/media_kit_libs_windows_video_plugin_c_api.h>
 #include <media_kit_video/media_kit_video_plugin_c_api.h>
 #include <pasteboard/pasteboard_plugin.h>
+#include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <protocol_handler_windows/protocol_handler_windows_plugin_c_api.h>
 #include <record_windows/record_windows_plugin_c_api.h>
 #include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
@@ -73,6 +74,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("MediaKitVideoPluginCApi"));
   PasteboardPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PasteboardPlugin"));
+  PermissionHandlerWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   ProtocolHandlerWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ProtocolHandlerWindowsPluginCApi"));
   RecordWindowsPluginCApiRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -21,6 +21,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   media_kit_libs_windows_video
   media_kit_video
   pasteboard
+  permission_handler_windows
   protocol_handler_windows
   record_windows
   screen_retriever_windows