🐛 Fix conditions with the confirm button (#367)

Author: AlexV525

CHANGELOG.md

@@ -4,6 +4,12 @@ that can be found in the LICENSE file. -->
 
 # Changelog
 
+## 8.1.1
+
+### Fixes
+
+- Fix conditions with the confirm button. (#367)
+
 ## 8.1.0
 
 ### New features

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: wechat_assets_picker_demo
 description: The demo project for the wechat_assets_picker package.
-version: 8.1.0+25
+version: 8.1.1+26
 publish_to: none
 
 environment:

lib/src/delegates/asset_picker_builder_delegate.dart

@@ -899,9 +899,9 @@ class DefaultAssetPickerBuilderDelegate
       //   If no preview and single asset mode, do not show confirm button,
       //   because any click on an asset selects it.
       // - On iOS and macOS, show nothing.
-      actions: !isAppleOS && !isSingleAssetMode
-          ? <Widget>[confirmButton(context)]
-          : null,
+      actions: <Widget>[
+        if (!isAppleOS && isPreviewEnabled) confirmButton(context),
+      ],
       actionsPadding: const EdgeInsetsDirectional.only(end: 14),
       blurRadius: isAppleOS ? appleOSBlurRadius : 0,
     );

pubspec.yaml

@@ -1,6 +1,6 @@
 name: wechat_assets_picker
 description: An audio/video/image picker in pure Dart which is the same with WeChat, support multi picking.
-version: 8.1.0
+version: 8.1.1
 homepage: https://github.com/fluttercandies/flutter_wechat_assets_picker
 
 environment:
@@ -17,5 +17,7 @@ dependencies:
   video_player: ^2.4.0
 
 dev_dependencies:
+  flutter_localizations:
+    sdk: flutter
   flutter_test:
     sdk: flutter

test/config_test.dart

@@ -0,0 +1,37 @@
+//
+// [Author] Alex (https://github.com/AlexV525)
+// [Date] 2022/09/20 17:06
+//
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wechat_assets_picker/wechat_assets_picker.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  PhotoManager.withPlugin(TestPhotoManagerPlugin());
+  AssetPicker.setPickerDelegate(TestAssetPickerDelegate());
+
+  group('PathNameBuilder', () {
+    testWidgets('called correctly', (WidgetTester tester) async {
+      await tester.pumpWidget(
+        defaultPickerTestApp(
+          onButtonPressed: (BuildContext context) {
+            AssetPicker.pickAssets(
+              context,
+              pickerConfig: AssetPickerConfig(
+                pathNameBuilder: (AssetPathEntity p) => 'testPathNameBuilder',
+              ),
+            );
+          },
+        ),
+      );
+      await tester.tap(defaultButtonFinder);
+      await tester.pumpAndSettle();
+      await tester.tap(find.byIcon(Icons.keyboard_arrow_down));
+      await tester.pumpAndSettle();
+      expect(find.text('testPathNameBuilder'), findsOneWidget);
+    });
+  });
+}

test/delegates/builder_delegate_test.dart renamed to test/test_utils.dart

@@ -1,52 +1,62 @@
-// Copyright 2019 The FlutterCandies author. All rights reserved.
-// Use of this source code is governed by an Apache license that can be found
-// in the LICENSE file.
+//
+// [Author] Alex (https://github.com/AlexV525)
+// [Date] 2022/09/20 16:35
+//
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
-void main() {
-  PhotoManager.withPlugin(TestPhotoManagerPlugin());
-  AssetPicker.setPickerDelegate(TestAssetPickerDelegate());
+const String _testButtonText = 'Picker test press';
 
-  final Finder defaultButtonFinder = find.byType(TextButton);
+final Finder defaultButtonFinder = find.widgetWithText(
+  TextButton,
+  _testButtonText,
+);
 
-  Widget _defaultApp({void Function(BuildContext)? onButtonPressed}) {
-    return MaterialApp(
-      home: Builder(
-        builder: (BuildContext context) => Scaffold(
-          body: Center(
-            child: TextButton(
-              onPressed: () => onButtonPressed?.call(context),
-              child: const Text('Press'),
-            ),
-          ),
+Widget defaultPickerTestApp({
+  void Function(BuildContext)? onButtonPressed,
+  Locale locale = const Locale('zh'),
+}) {
+  return MaterialApp(
+    home: _DefaultHomePage(onButtonPressed),
+    localizationsDelegates: const <LocalizationsDelegate<dynamic>>[
+      GlobalWidgetsLocalizations.delegate,
+      GlobalMaterialLocalizations.delegate,
+      GlobalCupertinoLocalizations.delegate,
+    ],
+    supportedLocales: const <Locale>[
+      Locale('zh'),
+      Locale('en'),
+      Locale('he'),
+      Locale('de'),
+      Locale('ru'),
+      Locale('ja'),
+      Locale('ar'),
+      Locale('fr'),
+    ],
+    locale: locale,
+  );
+}
+
+class _DefaultHomePage extends StatelessWidget {
+  const _DefaultHomePage(this.onButtonPressed, {Key? key}) : super(key: key);
+
+  final void Function(BuildContext)? onButtonPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: TextButton(
+          onPressed: () => onButtonPressed?.call(context),
+          child: const Text(_testButtonText),
         ),
       ),
     );
   }
-
-  testWidgets('PathNameBuilder called correctly', (WidgetTester tester) async {
-    await tester.pumpWidget(
-      _defaultApp(
-        onButtonPressed: (BuildContext context) {
-          AssetPicker.pickAssets(
-            context,
-            pickerConfig: AssetPickerConfig(
-              pathNameBuilder: (AssetPathEntity p) => 'testPathNameBuilder',
-            ),
-          );
-        },
-      ),
-    );
-    await tester.tap(defaultButtonFinder);
-    await tester.pumpAndSettle();
-    await tester.tap(find.byIcon(Icons.keyboard_arrow_down));
-    await tester.pumpAndSettle();
-    expect(find.text('testPathNameBuilder'), findsOneWidget);
-  });
 }
 
 class TestPhotoManagerPlugin extends PhotoManagerPlugin {

test/widget_test.dart

@@ -0,0 +1,94 @@
+//
+// [Author] Alex (https://github.com/AlexV525)
+// [Date] 2022/09/20 17:09
+//
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wechat_assets_picker/wechat_assets_picker.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  PhotoManager.withPlugin(TestPhotoManagerPlugin());
+  AssetPicker.setPickerDelegate(TestAssetPickerDelegate());
+
+  group('Confirm button', () {
+    group('displays when enabled preview', () {
+      testWidgets(
+        'with multiple assets picking',
+        (WidgetTester tester) async {
+          await tester.pumpWidget(
+            defaultPickerTestApp(
+              onButtonPressed: (BuildContext context) {
+                AssetPicker.pickAssets(
+                  context,
+                  pickerConfig: const AssetPickerConfig(
+                    maxAssets: 10,
+                    // ignore: avoid_redundant_argument_values
+                    specialPickerType: null, // Explicitly null.
+                  ),
+                );
+              },
+            ),
+          );
+          await tester.tap(defaultButtonFinder);
+          await tester.pumpAndSettle();
+          expect(
+            find.text(const AssetPickerTextDelegate().confirm),
+            findsOneWidget,
+          );
+        },
+      );
+      testWidgets(
+        'with single asset picking',
+        (WidgetTester tester) async {
+          await tester.pumpWidget(
+            defaultPickerTestApp(
+              onButtonPressed: (BuildContext context) {
+                AssetPicker.pickAssets(
+                  context,
+                  pickerConfig: const AssetPickerConfig(
+                    maxAssets: 1,
+                    // ignore: avoid_redundant_argument_values
+                    specialPickerType: null, // Explicitly null.
+                  ),
+                );
+              },
+            ),
+          );
+          await tester.tap(defaultButtonFinder);
+          await tester.pumpAndSettle();
+          expect(
+            find.text(const AssetPickerTextDelegate().confirm),
+            findsOneWidget,
+          );
+        },
+      );
+    });
+
+    testWidgets(
+      'not display when disabled preview',
+      (WidgetTester tester) async {
+        await tester.pumpWidget(
+          defaultPickerTestApp(
+            onButtonPressed: (BuildContext context) {
+              AssetPicker.pickAssets(
+                context,
+                pickerConfig: AssetPickerConfig(
+                  specialPickerType: SpecialPickerType.noPreview,
+                ),
+              );
+            },
+          ),
+        );
+        await tester.tap(defaultButtonFinder);
+        await tester.pumpAndSettle();
+        expect(
+          find.text(const AssetPickerTextDelegate().confirm),
+          findsNothing,
+        );
+      },
+    );
+  });
+}