android/app/src/main/AndroidManifest.xml

@@ -17,7 +17,6 @@
         android:label="Solian"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:enableOnBackInvokedCallback="true"
         android:requestLegacyExternalStorage="true">
         <activity
             android:name=".MainActivity"

assets/translations/en-US.json

@@ -294,7 +294,6 @@
   "addAttachmentFromCameraPhoto": "Take photo",
   "addAttachmentFromCameraVideo": "Take video",
   "addAttachmentFromRandomId": "Link via RID",
-  "attachmentDetailInfo": "Attachment details",
   "attachmentPastedImage": "Pasted Image",
   "attachmentInsertLink": "Insert Link",
   "attachmentSetAsPostThumbnail": "Set as post thumbnail",

assets/translations/zh-CN.json

@@ -292,7 +292,6 @@
   "addAttachmentFromCameraPhoto": "拍摄照片",
   "addAttachmentFromCameraVideo": "拍摄视频",
   "addAttachmentFromRandomId": "通过访问 ID 链接",
-  "attachmentDetailInfo": "附件详细信息",
   "attachmentPastedImage": "粘贴的图片",
   "attachmentInsertLink": "插入连接",
   "attachmentSetAsPostThumbnail": "设置为帖子缩略图",

lib/screens/explore.dart

@@ -217,24 +217,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
               hasReachedMax: _postCount != null && _posts.length >= _postCount!,
               onFetchData: _fetchPosts,
               itemBuilder: (context, idx) {
-                return Center(
+                return GestureDetector(
-                  child: Container(
-                    decoration: BoxDecoration(
-                      border: Border(
-                        left: BorderSide(
-                          color: Theme.of(context).dividerColor,
-                          width: 1 / MediaQuery.of(context).devicePixelRatio,
-                        ),
-                        right: BorderSide(
-                          color: Theme.of(context).dividerColor,
-                          width: 1 / MediaQuery.of(context).devicePixelRatio,
-                        ),
-                      ),
-                    ),
-                    constraints: const BoxConstraints(maxWidth: 640),
-                    child: Column(
-                      children: [
-                        GestureDetector(
                   child: PostItem(
                     data: _posts[idx],
                     maxWidth: 640,
@@ -252,13 +235,9 @@ class _ExploreScreenState extends State<ExploreScreen> {
                       extra: _posts[idx],
                     );
                   },
-                        ),
-                        const Divider(height: 1),
-                      ],
-                    ),
-                  ),
                 );
               },
+              separatorBuilder: (context, index) => const Divider(height: 1),
             ),
           ],
         ),

lib/screens/settings.dart

@@ -120,7 +120,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                   subtitle: Text('settingsThemeMaterial3Description').tr(),
                   contentPadding: const EdgeInsets.only(left: 24, right: 17),
                   secondary: const Icon(Symbols.new_releases),
-                  value: _prefs.getBool(kMaterialYouToggleStoreKey) ?? true,
+                  value: _prefs.getBool(kMaterialYouToggleStoreKey) ?? false,
                   onChanged: (value) {
                     setState(() {
                       _prefs.setBool(

lib/theme.dart

@@ -36,7 +36,7 @@ Future<ThemeData> createAppTheme(
   final hasAppBarBlurry = prefs.getBool(kAppbarTransparentStoreKey) ?? false;
 
   return ThemeData(
-    useMaterial3: useMaterial3 ?? (prefs.getBool(kMaterialYouToggleStoreKey) ?? true),
+    useMaterial3: useMaterial3 ?? (prefs.getBool(kMaterialYouToggleStoreKey) ?? false),
     colorScheme: colorScheme,
     brightness: brightness,
     iconTheme: IconThemeData(
@@ -52,15 +52,5 @@ Future<ThemeData> createAppTheme(
       foregroundColor: hasAppBarBlurry ? colorScheme.onSurface : colorScheme.onPrimary,
     ),
     scaffoldBackgroundColor: Colors.transparent,
-    pageTransitionsTheme: PageTransitionsTheme(
-      builders: {
-        TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
-        TargetPlatform.iOS: ZoomPageTransitionsBuilder(),
-        TargetPlatform.macOS: ZoomPageTransitionsBuilder(),
-        TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
-        TargetPlatform.linux: ZoomPageTransitionsBuilder(),
-        TargetPlatform.windows: ZoomPageTransitionsBuilder(),
-      },
-    ),
   );
 }

lib/widgets/account/account_popover.dart

@@ -10,6 +10,7 @@ import 'package:surface/providers/experience.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/screens/account/profile_page.dart';
 import 'package:surface/types/account.dart';
+import 'package:surface/types/post.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/universal_image.dart';
 

lib/widgets/attachment/attachment_zoom.dart

@@ -129,8 +129,6 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
 
   Color get _unFocusColor => Theme.of(context).colorScheme.onSurface.withOpacity(0.75);
 
-  bool _showDetail = false;
-
   @override
   Widget build(BuildContext context) {
     final sn = context.read<SnNetworkProvider>();
@@ -146,11 +144,9 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
       onDismissed: () {
         Navigator.of(context).pop();
       },
-      direction: DismissiblePageDismissDirection.none,
+      direction: DismissiblePageDismissDirection.down,
       backgroundColor: Colors.transparent,
       isFullScreen: true,
-      child: GestureDetector(
-        behavior: HitTestBehavior.translucent,
       child: Scaffold(
         body: Stack(
           children: [
@@ -268,8 +264,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                               borderRadius: const BorderRadius.all(Radius.circular(16)),
                               onTap: _isDownloading
                                   ? null
-                                    : () =>
+                                  : () => _saveToAlbum(widget.data.length > 1 ? _pageController.page?.round() ?? 0 : 0),
-                                        _saveToAlbum(widget.data.length > 1 ? _pageController.page?.round() ?? 0 : 0),
                               child: Container(
                                 padding: const EdgeInsets.all(6),
                                 child: !_isDownloading
@@ -327,8 +322,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                                 'f/${item.metadata['exif']?['Aperture']}',
                                 style: metaTextStyle,
                               ).padding(right: 2),
-                              if (item.metadata['exif']?['Megapixels'] != null &&
+                            if (item.metadata['exif']?['Megapixels'] != null && item.metadata['exif']?['Model'] != null)
-                                  item.metadata['exif']?['Model'] != null)
                               Text(
                                 '${item.metadata['exif']?['Megapixels']}MP',
                                 style: metaTextStyle,
@@ -363,132 +357,6 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
           ],
         ),
       ),
-        onVerticalDragUpdate: (details) {
-          if (_showDetail) return;
-          if (details.delta.dy < 0) {
-            _showDetail = true;
-            showModalBottomSheet(
-              context: context,
-              builder: (context) => _AttachmentZoomDetailPopup(
-                data: widget.data.elementAt(widget.data.length > 1 ? _pageController.page?.round() ?? 0 : 0),
-              ),
-            ).then((_) {
-              _showDetail = false;
-            });
-          }
-        },
-        onTap: () {
-          Navigator.of(context).pop();
-        },
-      ),
-    );
-  }
-}
-
-class _AttachmentZoomDetailPopup extends StatelessWidget {
-  final SnAttachment data;
-
-  const _AttachmentZoomDetailPopup({required this.data});
-
-  @override
-  Widget build(BuildContext context) {
-    final ud = context.read<UserDirectoryProvider>();
-    final account = ud.getAccountFromCache(data.accountId);
-
-    const tableGap = TableRow(
-      children: [
-        TableCell(child: SizedBox(height: 16)),
-        TableCell(child: SizedBox(height: 16)),
-      ],
-    );
-
-    return SizedBox(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              const Icon(Symbols.info, size: 24),
-              const Gap(16),
-              Text('attachmentDetailInfo').tr().textStyle(Theme.of(context).textTheme.titleLarge!),
-            ],
-          ).padding(horizontal: 20, top: 16, bottom: 12),
-          Expanded(
-            child: Table(
-              columnWidths: {
-                0: IntrinsicColumnWidth(),
-                1: FlexColumnWidth(),
-              },
-              children: [
-                TableRow(
-                  children: [
-                    TableCell(
-                      child: Text('attachmentUploadBy').tr().padding(right: 16),
-                    ),
-                    TableCell(
-                      child: Row(
-                        children: [
-                          if (data.accountId > 0)
-                            AccountImage(
-                              content: account?.avatar,
-                              radius: 8,
-                            ),
-                          const Gap(8),
-                          Text(data.accountId > 0 ? account?.nick ?? 'unknown'.tr() : 'unknown'.tr()),
-                          const Gap(8),
-                          Text('#${data.accountId}', style: GoogleFonts.robotoMono()).opacity(0.75),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-                tableGap,
-                TableRow(
-                  children: [
-                    TableCell(child: Text('Mimetype').padding(right: 16)),
-                    TableCell(child: Text(data.mimetype)),
-                  ],
-                ),
-                TableRow(
-                  children: [
-                    TableCell(child: Text('Size').padding(right: 16)),
-                    TableCell(
-                        child: Row(
-                      children: [
-                        Text(data.size.formatBytes()),
-                        const Gap(12),
-                        Text('${data.size} Bytes', style: GoogleFonts.robotoMono()).opacity(0.75),
-                      ],
-                    )),
-                  ],
-                ),
-                TableRow(
-                  children: [
-                    TableCell(child: Text('Name').padding(right: 16)),
-                    TableCell(child: Text(data.name)),
-                  ],
-                ),
-                if (data.hash.isNotEmpty)
-                  TableRow(
-                    children: [
-                      TableCell(child: Text('Hash').padding(right: 16)),
-                      TableCell(child: Text(data.hash, style: GoogleFonts.robotoMono(fontSize: 11)).opacity(0.9)),
-                    ],
-                  ),
-                tableGap,
-                ...(data.metadata['exif']?.keys.map((k) => TableRow(
-                      children: [
-                        TableCell(child: Text(k).padding(right: 16)),
-                        TableCell(child: Text(data.metadata['exif'][k].toString())),
-                      ],
-                    )) ??
-                    []),
-              ],
-            ).padding(horizontal: 20, vertical: 8),
-          ),
-        ],
-      ),
     );
   }
 }

lib/widgets/navigation/app_rail_navigation.dart

@@ -18,7 +18,9 @@ class _AppRailNavigationState extends State<AppRailNavigation> {
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      context.read<NavigationProvider>().autoDetectIndex(GoRouter.maybeOf(context));
+      context
+          .read<NavigationProvider>()
+          .autoDetectIndex(GoRouter.maybeOf(context));
     });
   }
 
@@ -29,11 +31,11 @@ class _AppRailNavigationState extends State<AppRailNavigation> {
     return ListenableBuilder(
       listenable: nav,
       builder: (context, _) {
-        final destinations = nav.destinations.where((ele) => ele.isPinned).toList();
+        final destinations =
+            nav.destinations.where((ele) => ele.isPinned).toList();
 
         return NavigationRail(
-          selectedIndex:
+          selectedIndex: nav.currentIndex,
-              nav.currentIndex != null && nav.currentIndex! < nav.pinnedDestinationCount ? nav.currentIndex : null,
           destinations: [
             ...destinations.where((ele) => ele.isPinned).map((ele) {
               return NavigationRailDestination(