💄 Sync styles

Author: AlexV525

example/lib/customs/pickers/directory_file_asset_picker.dart

@@ -506,15 +506,11 @@ class FileAssetPickerBuilder
   PreferredSizeWidget appBar(BuildContext context) {
     final AppBar appBar = AppBar(
       backgroundColor: theme.appBarTheme.backgroundColor,
-      centerTitle: isAppleOS(context),
-      title: pathEntitySelector(context),
+      title: Semantics(
+        onTapHint: semanticsTextDelegate.sActionSwitchPathLabel,
+        child: pathEntitySelector(context),
+      ),
       leading: backButton(context),
-      actions: !isAppleOS(context)
-          ? <Widget>[
-              confirmButton(context),
-              const SizedBox(width: 14.0),
-            ]
-          : null,
     );
     appBarPreferredSize ??= appBar.preferredSize;
     return appBar;
@@ -1386,24 +1382,51 @@ class FileAssetPickerViewerBuilderDelegate
         color: themeData.canvasColor.withOpacity(0.85),
         child: Row(
           children: <Widget>[
-            const BackButton(),
-            if (!isAppleOS(context))
-              StreamBuilder<int>(
-                initialData: currentIndex,
-                stream: pageStreamController.stream,
-                builder: (BuildContext _, AsyncSnapshot<int> snapshot) {
-                  return Text(
-                    '${snapshot.data! + 1}/${previewAssets.length}',
-                    style: const TextStyle(
-                      fontSize: 18.0,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  );
-                },
+            Expanded(
+              child: Align(
+                alignment: AlignmentDirectional.centerStart,
+                child: Semantics(
+                  sortKey: ordinalSortKey(0),
+                  child: IconButton(
+                    icon: const Icon(Icons.close),
+                    tooltip: MaterialLocalizations.of(
+                      context,
+                    ).backButtonTooltip,
+                    onPressed: Navigator.of(context).maybePop,
+                  ),
+                ),
+              ),
+            ),
+            Expanded(
+              child: Center(
+                child: StreamBuilder<int>(
+                  initialData: currentIndex,
+                  stream: pageStreamController.stream,
+                  builder: (BuildContext _, AsyncSnapshot<int> snapshot) {
+                    return Text(
+                      '${snapshot.requireData + 1}/${previewAssets.length}',
+                      style: const TextStyle(
+                        fontSize: 18.0,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    );
+                  },
+                ),
               ),
-            const Spacer(),
-            if (isAppleOS(context) && provider != null) selectButton(context),
-            if (!isAppleOS(context) && provider != null) confirmButton(context),
+            ),
+            if (provider != null)
+              Expanded(
+                child: Container(
+                  alignment: AlignmentDirectional.centerEnd,
+                  padding: const EdgeInsetsDirectional.only(end: 14),
+                  child: Semantics(
+                    sortKey: ordinalSortKey(0.2),
+                    child: selectButton(context),
+                  ),
+                ),
+              )
+            else
+              const Spacer(),
           ],
         ),
       ),

lib/src/delegates/asset_picker_viewer_builder_delegate.dart

@@ -725,7 +725,7 @@ class DefaultAssetPickerViewerBuilderDelegate
                 ),
               ),
             ),
-            if (!isAppleOS(context) && specialPickerType == null)
+            if (specialPickerType == null)
               Expanded(
                 child: Center(
                   child: Semantics(
@@ -734,7 +734,7 @@ class DefaultAssetPickerViewerBuilderDelegate
                       initialData: currentIndex,
                       stream: pageStreamController.stream,
                       builder: (_, AsyncSnapshot<int> snapshot) => ScaleText(
-                        '${snapshot.data! + 1}/${previewAssets.length}',
+                        '${snapshot.requireData + 1}/${previewAssets.length}',
                         style: const TextStyle(
                           fontSize: 17,
                           fontWeight: FontWeight.w500,