From 031dfd2ea6b95b22c7b80c5867114c1ae203b25d Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Tue, 15 Feb 2022 14:41:09 -0800 Subject: [PATCH 01/12] [image_picker] Added image_picker_for_windows. --- .../image_picker_for_windows/AUTHORS | 67 +++ .../image_picker_for_windows/CHANGELOG.md | 3 + .../image_picker_for_windows/LICENSE | 25 + .../image_picker_for_windows/README.md | 36 ++ .../example/README.md | 8 + .../example/lib/main.dart | 465 ++++++++++++++++++ .../example/pubspec.yaml | 34 ++ .../example/windows/.gitignore | 17 + .../example/windows/CMakeLists.txt | 95 ++++ .../example/windows/flutter/CMakeLists.txt | 103 ++++ .../windows/flutter/generated_plugins.cmake | 16 + .../example/windows/runner/CMakeLists.txt | 17 + .../example/windows/runner/Runner.rc | 121 +++++ .../example/windows/runner/flutter_window.cpp | 61 +++ .../example/windows/runner/flutter_window.h | 33 ++ .../example/windows/runner/main.cpp | 43 ++ .../example/windows/runner/resource.h | 16 + .../windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes .../windows/runner/runner.exe.manifest | 20 + .../example/windows/runner/utils.cpp | 64 +++ .../example/windows/runner/utils.h | 19 + .../example/windows/runner/win32_window.cpp | 245 +++++++++ .../example/windows/runner/win32_window.h | 98 ++++ .../lib/image_picker_for_windows.dart | 143 ++++++ .../image_picker_for_windows/pubspec.yaml | 28 ++ 25 files changed, 1777 insertions(+) create mode 100644 packages/image_picker/image_picker_for_windows/AUTHORS create mode 100644 packages/image_picker/image_picker_for_windows/CHANGELOG.md create mode 100644 packages/image_picker/image_picker_for_windows/LICENSE create mode 100644 packages/image_picker/image_picker_for_windows/README.md create mode 100644 packages/image_picker/image_picker_for_windows/example/README.md create mode 100644 packages/image_picker/image_picker_for_windows/example/lib/main.dart create mode 100644 packages/image_picker/image_picker_for_windows/example/pubspec.yaml create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/.gitignore create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/CMakeLists.txt create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/flutter/CMakeLists.txt create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/flutter/generated_plugins.cmake create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/CMakeLists.txt create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/Runner.rc create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.cpp create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.h create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/main.cpp create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/resource.h create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/resources/app_icon.ico create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/runner.exe.manifest create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/utils.cpp create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/utils.h create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.cpp create mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.h create mode 100644 packages/image_picker/image_picker_for_windows/lib/image_picker_for_windows.dart create mode 100644 packages/image_picker/image_picker_for_windows/pubspec.yaml diff --git a/packages/image_picker/image_picker_for_windows/AUTHORS b/packages/image_picker/image_picker_for_windows/AUTHORS new file mode 100644 index 000000000000..d6ad42a677e5 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/AUTHORS @@ -0,0 +1,67 @@ +# Below is a list of people and organizations that have contributed +# to the Flutter project. Names should be added to the list like so: +# +# Name/Organization + +Google Inc. +The Chromium Authors +German Saprykin +Benjamin Sauer +larsenthomasj@gmail.com +Ali Bitek +Pol Batlló +Anatoly Pulyaevskiy +Hayden Flinner +Stefano Rodriguez +Salvatore Giordano +Brian Armstrong +Paul DeMarco +Fabricio Nogueira +Simon Lightfoot +Ashton Thomas +Thomas Danner +Diego Velásquez +Hajime Nakamura +Tuyển Vũ Xuân +Miguel Ruivo +Sarthak Verma +Mike Diarmid +Invertase +Elliot Hesp +Vince Varga +Aawaz Gyawali +EUI Limited +Katarina Sheremet +Thomas Stockx +Sarbagya Dhaubanjar +Ozkan Eksi +Rishab Nayak +ko2ic +Jonathan Younger +Jose Sanchez +Debkanchan Samadder +Audrius Karosevicius +Lukasz Piliszczuk +SoundReply Solutions GmbH +Rafal Wachol +Pau Picas +Christian Weder +Alexandru Tuca +Christian Weder +Rhodes Davis Jr. +Luigi Agosti +Quentin Le Guennec +Koushik Ravikumar +Nissim Dsilva +Giancarlo Rocha +Ryo Miyake +Théo Champion +Kazuki Yamaguchi +Eitan Schwartz +Chris Rutkowski +Juan Alvarez +Aleksandr Yurkovskiy +Anton Borries +Alex Li +Rahul Raj <64.rahulraj@gmail.com> +Balvinder Singh Gambhir diff --git a/packages/image_picker/image_picker_for_windows/CHANGELOG.md b/packages/image_picker/image_picker_for_windows/CHANGELOG.md new file mode 100644 index 000000000000..ca6fae6b4580 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/CHANGELOG.md @@ -0,0 +1,3 @@ +# 0.0.1 + +* Initial Windows support. diff --git a/packages/image_picker/image_picker_for_windows/LICENSE b/packages/image_picker/image_picker_for_windows/LICENSE new file mode 100644 index 000000000000..c6823b81eb84 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/LICENSE @@ -0,0 +1,25 @@ +Copyright 2013 The Flutter Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/image_picker/image_picker_for_windows/README.md b/packages/image_picker/image_picker_for_windows/README.md new file mode 100644 index 000000000000..aea534822118 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/README.md @@ -0,0 +1,36 @@ +# image\_picker\_for\_windows + +A Windows implementation of [`image_picker`][1]. + +### pickImage() +The arguments `maxWidth`, `maxHeight` and `imageQuality` are not supported. + +### pickVideo() +The argument `maxDuration` is not supported on Windows. + +## Usage + +### Import the package + +This package is not yet [endorsed](https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin), which means you need to add +not only the `image_picker`, as well as the `image_picker_for_windows`. + +### Use the plugin + +You should be able to use `package:image_picker` _almost_ as normal. + +If you want to use the path directly, your code would need look like this: + +```dart +... +Image.file(File(pickedFile.path)); +... +``` + +Or, using bytes: + +```dart +... +Image.memory(await pickedFile.readAsBytes()) +... +``` diff --git a/packages/image_picker/image_picker_for_windows/example/README.md b/packages/image_picker/image_picker_for_windows/example/README.md new file mode 100644 index 000000000000..fe08d9a5dcf7 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/README.md @@ -0,0 +1,8 @@ +# image_picker_for_windows_example + +Demonstrates how to use the image_picker_for_windows plugin. + +## Getting Started + +For help getting started with Flutter, view our online +[documentation](https://flutter.dev/). diff --git a/packages/image_picker/image_picker_for_windows/example/lib/main.dart b/packages/image_picker/image_picker_for_windows/example/lib/main.dart new file mode 100644 index 000000000000..0f5ba76db6df --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/lib/main.dart @@ -0,0 +1,465 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// ignore_for_file: public_member_api_docs + +import 'dart:async'; +import 'dart:io'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:image_picker/image_picker.dart'; +import 'package:video_player/video_player.dart'; + +void main() { + runApp(MyApp()); +} + +class MyApp extends StatelessWidget { + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Image Picker Demo', + home: MyHomePage(title: 'Image Picker Example'), + ); + } +} + +class MyHomePage extends StatefulWidget { + MyHomePage({Key? key, this.title}) : super(key: key); + + final String? title; + + @override + _MyHomePageState createState() => _MyHomePageState(); +} + +class _MyHomePageState extends State { + List? _imageFileList; + + set _imageFile(XFile? value) { + _imageFileList = value == null ? null : [value]; + } + + dynamic _pickImageError; + bool isVideo = false; + + VideoPlayerController? _controller; + VideoPlayerController? _toBeDisposed; + String? _retrieveDataError; + + final ImagePicker _picker = ImagePicker(); + final TextEditingController maxWidthController = TextEditingController(); + final TextEditingController maxHeightController = TextEditingController(); + final TextEditingController qualityController = TextEditingController(); + + Future _playVideo(XFile? file) async { + if (file != null && mounted) { + await _disposeVideoController(); + late VideoPlayerController controller; + if (kIsWeb) { + controller = VideoPlayerController.network(file.path); + } else { + controller = VideoPlayerController.file(File(file.path)); + } + _controller = controller; + // In web, most browsers won't honor a programmatic call to .play + // if the video has a sound track (and is not muted). + // Mute the video so it auto-plays in web! + // This is not needed if the call to .play is the result of user + // interaction (clicking on a "play" button, for example). + final double volume = kIsWeb ? 0.0 : 1.0; + await controller.setVolume(volume); + await controller.initialize(); + await controller.setLooping(true); + await controller.play(); + setState(() {}); + } + } + + void _onImageButtonPressed(ImageSource source, + {BuildContext? context, bool isMultiImage = false}) async { + if (_controller != null) { + await _controller!.setVolume(0.0); + } + if (isVideo) { + final XFile? file = await _picker.pickVideo( + source: source, maxDuration: const Duration(seconds: 10)); + await _playVideo(file); + } else if (isMultiImage) { + await _displayPickImageDialog(context!, + (double? maxWidth, double? maxHeight, int? quality) async { + try { + final pickedFileList = await _picker.pickMultiImage( + maxWidth: maxWidth, + maxHeight: maxHeight, + imageQuality: quality, + ); + setState(() { + _imageFileList = pickedFileList; + }); + } catch (e) { + setState(() { + _pickImageError = e; + }); + } + }); + } else { + await _displayPickImageDialog(context!, + (double? maxWidth, double? maxHeight, int? quality) async { + try { + final pickedFile = await _picker.pickImage( + source: source, + maxWidth: maxWidth, + maxHeight: maxHeight, + imageQuality: quality, + ); + setState(() { + _imageFile = pickedFile; + }); + } catch (e) { + setState(() { + _pickImageError = e; + }); + } + }); + } + } + + @override + void deactivate() { + if (_controller != null) { + _controller!.setVolume(0.0); + _controller!.pause(); + } + super.deactivate(); + } + + @override + void dispose() { + _disposeVideoController(); + maxWidthController.dispose(); + maxHeightController.dispose(); + qualityController.dispose(); + super.dispose(); + } + + Future _disposeVideoController() async { + if (_toBeDisposed != null) { + await _toBeDisposed!.dispose(); + } + _toBeDisposed = _controller; + _controller = null; + } + + Widget _previewVideo() { + final Text? retrieveError = _getRetrieveErrorWidget(); + if (retrieveError != null) { + return retrieveError; + } + if (_controller == null) { + return const Text( + 'You have not yet picked a video', + textAlign: TextAlign.center, + ); + } + return Padding( + padding: const EdgeInsets.all(10.0), + child: AspectRatioVideo(_controller), + ); + } + + Widget _previewImages() { + final Text? retrieveError = _getRetrieveErrorWidget(); + if (retrieveError != null) { + return retrieveError; + } + if (_imageFileList != null) { + return Semantics( + child: ListView.builder( + key: UniqueKey(), + itemBuilder: (context, index) { + // Why network for web? + // See https://pub.dev/packages/image_picker#getting-ready-for-the-web-platform + return Semantics( + label: 'image_picker_example_picked_image', + child: kIsWeb + ? Image.network(_imageFileList![index].path) + : Image.file(File(_imageFileList![index].path)), + ); + }, + itemCount: _imageFileList!.length, + ), + label: 'image_picker_example_picked_images'); + } else if (_pickImageError != null) { + return Text( + 'Pick image error: $_pickImageError', + textAlign: TextAlign.center, + ); + } else { + return const Text( + 'You have not yet picked an image.', + textAlign: TextAlign.center, + ); + } + } + + Widget _handlePreview() { + if (isVideo) { + return _previewVideo(); + } else { + return _previewImages(); + } + } + + Future retrieveLostData() async { + final LostDataResponse response = await _picker.retrieveLostData(); + if (response.isEmpty) { + return; + } + if (response.file != null) { + if (response.type == RetrieveType.video) { + isVideo = true; + await _playVideo(response.file); + } else { + isVideo = false; + setState(() { + _imageFile = response.file; + _imageFileList = response.files; + }); + } + } else { + _retrieveDataError = response.exception!.code; + } + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(widget.title!), + ), + body: Center( + child: !kIsWeb && defaultTargetPlatform == TargetPlatform.android + ? FutureBuilder( + future: retrieveLostData(), + builder: (BuildContext context, AsyncSnapshot snapshot) { + switch (snapshot.connectionState) { + case ConnectionState.none: + case ConnectionState.waiting: + return const Text( + 'You have not yet picked an image.', + textAlign: TextAlign.center, + ); + case ConnectionState.done: + return _handlePreview(); + default: + if (snapshot.hasError) { + return Text( + 'Pick image/video error: ${snapshot.error}}', + textAlign: TextAlign.center, + ); + } else { + return const Text( + 'You have not yet picked an image.', + textAlign: TextAlign.center, + ); + } + } + }, + ) + : _handlePreview(), + ), + floatingActionButton: Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Semantics( + label: 'image_picker_example_from_gallery', + child: FloatingActionButton( + onPressed: () { + isVideo = false; + _onImageButtonPressed(ImageSource.gallery, context: context); + }, + heroTag: 'image0', + tooltip: 'Pick Image from gallery', + child: const Icon(Icons.photo), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 16.0), + child: FloatingActionButton( + onPressed: () { + isVideo = false; + _onImageButtonPressed( + ImageSource.gallery, + context: context, + isMultiImage: true, + ); + }, + heroTag: 'image1', + tooltip: 'Pick Multiple Image from gallery', + child: const Icon(Icons.photo_library), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 16.0), + child: FloatingActionButton( + onPressed: () { + isVideo = false; + _onImageButtonPressed(ImageSource.camera, context: context); + }, + heroTag: 'image2', + tooltip: 'Take a Photo', + child: const Icon(Icons.camera_alt), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 16.0), + child: FloatingActionButton( + backgroundColor: Colors.red, + onPressed: () { + isVideo = true; + _onImageButtonPressed(ImageSource.gallery); + }, + heroTag: 'video0', + tooltip: 'Pick Video from gallery', + child: const Icon(Icons.video_library), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 16.0), + child: FloatingActionButton( + backgroundColor: Colors.red, + onPressed: () { + isVideo = true; + _onImageButtonPressed(ImageSource.camera); + }, + heroTag: 'video1', + tooltip: 'Take a Video', + child: const Icon(Icons.videocam), + ), + ), + ], + ), + ); + } + + Text? _getRetrieveErrorWidget() { + if (_retrieveDataError != null) { + final Text result = Text(_retrieveDataError!); + _retrieveDataError = null; + return result; + } + return null; + } + + Future _displayPickImageDialog( + BuildContext context, OnPickImageCallback onPick) async { + return showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text('Add optional parameters'), + content: Column( + children: [ + TextField( + controller: maxWidthController, + keyboardType: TextInputType.numberWithOptions(decimal: true), + decoration: + InputDecoration(hintText: "Enter maxWidth if desired"), + ), + TextField( + controller: maxHeightController, + keyboardType: TextInputType.numberWithOptions(decimal: true), + decoration: + InputDecoration(hintText: "Enter maxHeight if desired"), + ), + TextField( + controller: qualityController, + keyboardType: TextInputType.number, + decoration: + InputDecoration(hintText: "Enter quality if desired"), + ), + ], + ), + actions: [ + TextButton( + child: const Text('CANCEL'), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + TextButton( + child: const Text('PICK'), + onPressed: () { + double? width = maxWidthController.text.isNotEmpty + ? double.parse(maxWidthController.text) + : null; + double? height = maxHeightController.text.isNotEmpty + ? double.parse(maxHeightController.text) + : null; + int? quality = qualityController.text.isNotEmpty + ? int.parse(qualityController.text) + : null; + onPick(width, height, quality); + Navigator.of(context).pop(); + }), + ], + ); + }); + } +} + +typedef void OnPickImageCallback( + double? maxWidth, double? maxHeight, int? quality); + +class AspectRatioVideo extends StatefulWidget { + AspectRatioVideo(this.controller); + + final VideoPlayerController? controller; + + @override + AspectRatioVideoState createState() => AspectRatioVideoState(); +} + +class AspectRatioVideoState extends State { + VideoPlayerController? get controller => widget.controller; + bool initialized = false; + + void _onVideoControllerUpdate() { + if (!mounted) { + return; + } + if (initialized != controller!.value.isInitialized) { + initialized = controller!.value.isInitialized; + setState(() {}); + } + } + + @override + void initState() { + super.initState(); + controller!.addListener(_onVideoControllerUpdate); + } + + @override + void dispose() { + controller!.removeListener(_onVideoControllerUpdate); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + if (initialized) { + return Center( + child: AspectRatio( + aspectRatio: controller!.value.aspectRatio, + child: VideoPlayer(controller!), + ), + ); + } else { + return Container(); + } + } +} diff --git a/packages/image_picker/image_picker_for_windows/example/pubspec.yaml b/packages/image_picker/image_picker_for_windows/example/pubspec.yaml new file mode 100644 index 000000000000..280243efdbf8 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/pubspec.yaml @@ -0,0 +1,34 @@ +name: example +description: Example for image_picker_windows implementation. +publish_to: 'none' +version: 1.0.0 + +environment: + sdk: ">=2.12.0 <3.0.0" + flutter: ">=2.2.0" + +dependencies: + video_player: ^2.1.4 + image_picker: + # When depending on this package from a real application you should use: + # image_picker: ^x.y.z + # See https://dart.dev/tools/pub/dependencies#version-constraints + # The example app is bundled with the plugin so we use a path dependency on + # the parent directory to use the current plugin's version. + path: ../../image_picker + image_picker_for_windows: + # When depending on this package from a real application you should use: + # image_picker_for_windows: ^x.y.z + # See https://dart.dev/tools/pub/dependencies#version-constraints + # The example app is bundled with the plugin so we use a path dependency on + # the parent directory to use the current plugin's version. + path: .. + flutter: + sdk: flutter + +dev_dependencies: + flutter_test: + sdk: flutter + +flutter: + uses-material-design: true diff --git a/packages/image_picker/image_picker_for_windows/example/windows/.gitignore b/packages/image_picker/image_picker_for_windows/example/windows/.gitignore new file mode 100644 index 000000000000..d492d0d98c8f --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/packages/image_picker/image_picker_for_windows/example/windows/CMakeLists.txt b/packages/image_picker/image_picker_for_windows/example/windows/CMakeLists.txt new file mode 100644 index 000000000000..1633297a0c7c --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/CMakeLists.txt @@ -0,0 +1,95 @@ +cmake_minimum_required(VERSION 3.14) +project(example LANGUAGES CXX) + +set(BINARY_NAME "example") + +cmake_policy(SET CMP0063 NEW) + +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Configure build options. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() + +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") + +# Flutter library and tool build rules. +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build +add_subdirectory("runner") + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/packages/image_picker/image_picker_for_windows/example/windows/flutter/CMakeLists.txt b/packages/image_picker/image_picker_for_windows/example/windows/flutter/CMakeLists.txt new file mode 100644 index 000000000000..b2e4bd8d658b --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/flutter/CMakeLists.txt @@ -0,0 +1,103 @@ +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/packages/image_picker/image_picker_for_windows/example/windows/flutter/generated_plugins.cmake b/packages/image_picker/image_picker_for_windows/example/windows/flutter/generated_plugins.cmake new file mode 100644 index 000000000000..63eda9b7b59f --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/flutter/generated_plugins.cmake @@ -0,0 +1,16 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + file_selector_windows +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/CMakeLists.txt b/packages/image_picker/image_picker_for_windows/example/windows/runner/CMakeLists.txt new file mode 100644 index 000000000000..de2d8916b72b --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) +apply_standard_settings(${BINARY_NAME}) +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/Runner.rc b/packages/image_picker/image_picker_for_windows/example/windows/runner/Runner.rc new file mode 100644 index 000000000000..5fdea291cf19 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#ifdef FLUTTER_BUILD_NUMBER +#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#else +#define VERSION_AS_NUMBER 1,0,0 +#endif + +#ifdef FLUTTER_BUILD_NAME +#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "example" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "example" "\0" + VALUE "LegalCopyright", "Copyright (C) 2022 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "example.exe" "\0" + VALUE "ProductName", "example" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.cpp b/packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.cpp new file mode 100644 index 000000000000..b43b9095ea3a --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.cpp @@ -0,0 +1,61 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.h b/packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.h new file mode 100644 index 000000000000..6da0652f05f2 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/main.cpp b/packages/image_picker/image_picker_for_windows/example/windows/runner/main.cpp new file mode 100644 index 000000000000..bcb57b0e2aac --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.CreateAndShow(L"example", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/resource.h b/packages/image_picker/image_picker_for_windows/example/windows/runner/resource.h new file mode 100644 index 000000000000..66a65d1e4a79 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/resources/app_icon.ico b/packages/image_picker/image_picker_for_windows/example/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/runner.exe.manifest b/packages/image_picker/image_picker_for_windows/example/windows/runner/runner.exe.manifest new file mode 100644 index 000000000000..c977c4a42589 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.cpp b/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.cpp new file mode 100644 index 000000000000..d19bdbbcc322 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.cpp @@ -0,0 +1,64 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr); + if (target_length == 0) { + return std::string(); + } + std::string utf8_string; + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, utf8_string.data(), + target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.h b/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.h new file mode 100644 index 000000000000..3879d5475579 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.cpp b/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.cpp new file mode 100644 index 000000000000..c10f08dc7da6 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.cpp @@ -0,0 +1,245 @@ +#include "win32_window.h" + +#include + +#include "resource.h" + +namespace { + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + FreeLibrary(user32_module); + } +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + return OnCreate(); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.h b/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.h new file mode 100644 index 000000000000..17ba431125b4 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.h @@ -0,0 +1,98 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates and shows a win32 window with |title| and position and size using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size to will treat the width height passed in to this function + // as logical pixels and scale to appropriate for the default monitor. Returns + // true if the window was created successfully. + bool CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responsponds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/packages/image_picker/image_picker_for_windows/lib/image_picker_for_windows.dart b/packages/image_picker/image_picker_for_windows/lib/image_picker_for_windows.dart new file mode 100644 index 000000000000..6278564f7282 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/lib/image_picker_for_windows.dart @@ -0,0 +1,143 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; + +import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; +import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; + +/// The Windows implementation of [ImagePickerPlatform]. +/// +/// This class implements the `package:image_picker` functionality for Windows. +class ImagePickerWindowsPlugin extends ImagePickerPlatform { + /// A constructor that allows tests to override the function that creates file inputs. + ImagePickerWindowsPlugin(); + + List _imageFormats = ['jpg', 'jpeg', 'png', 'bmp']; + List _videoFormats = ['mov', 'wmv', 'mkv', 'mp4']; + + /// Registers this class as the default instance of [ImagePickerPlatform]. + static void registerWith() { + ImagePickerPlatform.instance = ImagePickerWindowsPlugin(); + } + + /// Returns a [PickedFile] with the image that was picked. + /// + /// The `source` argument controls where the image comes from. This can + /// be either [ImageSource.camera] or [ImageSource.gallery]. + /// + /// Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are not supported on the Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + /// + /// Use `preferredCameraDevice` to specify the camera to use when the `source` is [ImageSource.camera]. + /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery]. It is also ignored if the chosen camera is not supported on the device. + /// Defaults to [CameraDevice.rear]. + /// + /// If no images were picked, the return value is null. + @override + Future pickImage({ + required ImageSource source, + double? maxWidth, + double? maxHeight, + int? imageQuality, + CameraDevice preferredCameraDevice = CameraDevice.rear, + }) async { + final typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); + final file = await FileSelectorPlatform.instance + .openFile(acceptedTypeGroups: [typeGroup]); + if (file != null) { + return PickedFile(file.path); + } + return null; + } + + /// Returns a [PickedFile] containing the video that was picked. + /// + /// The [source] argument controls where the video comes from. This can + /// be either [ImageSource.camera] or [ImageSource.gallery]. + /// + /// Note that the `maxDuration` argument is not supported on the Windows. If the argument is supplied, it'll be silently ignored by the Windows version of the plugin. + /// + /// Use `preferredCameraDevice` to specify the camera to use when the `source` is [ImageSource.camera]. + /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery]. It is also ignored if the chosen camera is not supported on the device. + /// Defaults to [CameraDevice.rear]. + /// + /// If no images were picked, the return value is null. + @override + Future pickVideo({ + required ImageSource source, + CameraDevice preferredCameraDevice = CameraDevice.rear, + Duration? maxDuration, + }) async { + final typeGroup = XTypeGroup(label: 'videos', extensions: _videoFormats); + final file = await FileSelectorPlatform.instance + .openFile(acceptedTypeGroups: [typeGroup]); + if (file != null) { + return PickedFile(file.path); + } + return null; + } + + /// Returns an [XFile] with the image that was picked. + /// + /// The `source` argument controls where the image comes from. This can + /// be either [ImageSource.camera] or [ImageSource.gallery]. + /// + /// Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are not supported on the Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + /// + /// Use `preferredCameraDevice` to specify the camera to use when the `source` is [ImageSource.camera]. + /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery]. It is also ignored if the chosen camera is not supported on the device. + /// Defaults to [CameraDevice.rear]. + /// + /// If no images were picked, the return value is null. + @override + Future getImage({ + required ImageSource source, + double? maxWidth, + double? maxHeight, + int? imageQuality, + CameraDevice preferredCameraDevice = CameraDevice.rear, + }) async { + final typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); + final file = await FileSelectorPlatform.instance + .openFile(acceptedTypeGroups: [typeGroup]); + return file; + } + + /// Returns an [XFile] containing the video that was picked. + /// + /// The [source] argument controls where the video comes from. This can + /// be either [ImageSource.camera] or [ImageSource.gallery]. + /// + /// Note that the `maxDuration` argument is not supported on the Windows. If the argument is supplied, it'll be silently ignored by the Windows version of the plugin. + /// + /// Use `preferredCameraDevice` to specify the camera to use when the `source` is [ImageSource.camera]. + /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery]. It is also ignored if the chosen camera is not supported on the device. + /// Defaults to [CameraDevice.rear]. + /// + /// If no images were picked, the return value is null. + @override + Future getVideo({ + required ImageSource source, + CameraDevice preferredCameraDevice = CameraDevice.rear, + Duration? maxDuration, + }) async { + final typeGroup = XTypeGroup(label: 'videos', extensions: _videoFormats); + final file = await FileSelectorPlatform.instance + .openFile(acceptedTypeGroups: [typeGroup]); + return file; + } + + /// Injects a file input, and returns a list of XFile that the user selected locally. + @override + Future> getMultiImage({ + double? maxWidth, + double? maxHeight, + int? imageQuality, + }) async { + final typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); + final files = await FileSelectorPlatform.instance + .openFiles(acceptedTypeGroups: [typeGroup]); + return files; + } +} diff --git a/packages/image_picker/image_picker_for_windows/pubspec.yaml b/packages/image_picker/image_picker_for_windows/pubspec.yaml new file mode 100644 index 000000000000..0fc0fd55f809 --- /dev/null +++ b/packages/image_picker/image_picker_for_windows/pubspec.yaml @@ -0,0 +1,28 @@ +name: image_picker_for_windows +description: Windows platform implementation of image_picker +repository: https://github.com/flutter/plugins/tree/main/packages/image_picker/image_picker_for_windows +issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 +version: 0.0.1 + +environment: + sdk: ">=2.12.0 <3.0.0" + flutter: ">=2.0.0" + +flutter: + plugin: + implements: image_picker + platforms: + windows: + dartPluginClass: ImagePickerWindowsPlugin + +dependencies: + flutter: + sdk: flutter + image_picker_platform_interface: ^2.4.3 + file_selector: ^0.8.3 + file_selector_windows: ^0.8.2 + pedantic: ^1.10.0 + +dev_dependencies: + flutter_test: + sdk: flutter From ad41c89f6918c1c8548e4ec074c4b95d0ba3709c Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Wed, 16 Feb 2022 18:32:43 -0800 Subject: [PATCH 02/12] More windows work. --- .../image_picker_for_windows/AUTHORS | 67 -------- .../example/windows/runner/resource.h | 16 -- .../lib/image_picker_for_windows.dart | 143 ------------------ .../image_picker/image_picker_windows/AUTHORS | 7 + .../CHANGELOG.md | 2 +- .../LICENSE | 0 .../README.md | 6 +- .../example/README.md | 4 +- .../example/lib/main.dart | 132 +++++----------- .../example/pubspec.yaml | 19 +-- .../example/windows/.gitignore | 0 .../example/windows/CMakeLists.txt | 0 .../example/windows/flutter/CMakeLists.txt | 0 .../windows/flutter/generated_plugins.cmake | 0 .../example/windows/runner/CMakeLists.txt | 0 .../example/windows/runner/Runner.rc | 0 .../example/windows/runner/flutter_window.cpp | 0 .../example/windows/runner/flutter_window.h | 0 .../example/windows/runner/main.cpp | 5 +- .../example/windows/runner/resource.h | 16 ++ .../windows/runner/resources/app_icon.ico | Bin .../windows/runner/runner.exe.manifest | 0 .../example/windows/runner/utils.cpp | 11 +- .../example/windows/runner/utils.h | 0 .../example/windows/runner/win32_window.cpp | 18 +-- .../example/windows/runner/win32_window.h | 9 +- .../lib/image_picker_windows.dart | 125 +++++++++++++++ .../pubspec.yaml | 15 +- 28 files changed, 218 insertions(+), 377 deletions(-) delete mode 100644 packages/image_picker/image_picker_for_windows/AUTHORS delete mode 100644 packages/image_picker/image_picker_for_windows/example/windows/runner/resource.h delete mode 100644 packages/image_picker/image_picker_for_windows/lib/image_picker_for_windows.dart create mode 100644 packages/image_picker/image_picker_windows/AUTHORS rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/CHANGELOG.md (77%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/LICENSE (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/README.md (83%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/README.md (54%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/lib/main.dart (70%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/pubspec.yaml (57%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/.gitignore (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/CMakeLists.txt (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/flutter/CMakeLists.txt (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/flutter/generated_plugins.cmake (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/CMakeLists.txt (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/Runner.rc (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/flutter_window.cpp (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/flutter_window.h (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/main.cpp (88%) create mode 100644 packages/image_picker/image_picker_windows/example/windows/runner/resource.h rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/resources/app_icon.ico (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/runner.exe.manifest (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/utils.cpp (84%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/utils.h (100%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/win32_window.cpp (93%) rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/example/windows/runner/win32_window.h (91%) create mode 100644 packages/image_picker/image_picker_windows/lib/image_picker_windows.dart rename packages/image_picker/{image_picker_for_windows => image_picker_windows}/pubspec.yaml (72%) diff --git a/packages/image_picker/image_picker_for_windows/AUTHORS b/packages/image_picker/image_picker_for_windows/AUTHORS deleted file mode 100644 index d6ad42a677e5..000000000000 --- a/packages/image_picker/image_picker_for_windows/AUTHORS +++ /dev/null @@ -1,67 +0,0 @@ -# Below is a list of people and organizations that have contributed -# to the Flutter project. Names should be added to the list like so: -# -# Name/Organization - -Google Inc. -The Chromium Authors -German Saprykin -Benjamin Sauer -larsenthomasj@gmail.com -Ali Bitek -Pol Batlló -Anatoly Pulyaevskiy -Hayden Flinner -Stefano Rodriguez -Salvatore Giordano -Brian Armstrong -Paul DeMarco -Fabricio Nogueira -Simon Lightfoot -Ashton Thomas -Thomas Danner -Diego Velásquez -Hajime Nakamura -Tuyển Vũ Xuân -Miguel Ruivo -Sarthak Verma -Mike Diarmid -Invertase -Elliot Hesp -Vince Varga -Aawaz Gyawali -EUI Limited -Katarina Sheremet -Thomas Stockx -Sarbagya Dhaubanjar -Ozkan Eksi -Rishab Nayak -ko2ic -Jonathan Younger -Jose Sanchez -Debkanchan Samadder -Audrius Karosevicius -Lukasz Piliszczuk -SoundReply Solutions GmbH -Rafal Wachol -Pau Picas -Christian Weder -Alexandru Tuca -Christian Weder -Rhodes Davis Jr. -Luigi Agosti -Quentin Le Guennec -Koushik Ravikumar -Nissim Dsilva -Giancarlo Rocha -Ryo Miyake -Théo Champion -Kazuki Yamaguchi -Eitan Schwartz -Chris Rutkowski -Juan Alvarez -Aleksandr Yurkovskiy -Anton Borries -Alex Li -Rahul Raj <64.rahulraj@gmail.com> -Balvinder Singh Gambhir diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/resource.h b/packages/image_picker/image_picker_for_windows/example/windows/runner/resource.h deleted file mode 100644 index 66a65d1e4a79..000000000000 --- a/packages/image_picker/image_picker_for_windows/example/windows/runner/resource.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Runner.rc -// -#define IDI_APP_ICON 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/packages/image_picker/image_picker_for_windows/lib/image_picker_for_windows.dart b/packages/image_picker/image_picker_for_windows/lib/image_picker_for_windows.dart deleted file mode 100644 index 6278564f7282..000000000000 --- a/packages/image_picker/image_picker_for_windows/lib/image_picker_for_windows.dart +++ /dev/null @@ -1,143 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:async'; - -import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; -import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; - -/// The Windows implementation of [ImagePickerPlatform]. -/// -/// This class implements the `package:image_picker` functionality for Windows. -class ImagePickerWindowsPlugin extends ImagePickerPlatform { - /// A constructor that allows tests to override the function that creates file inputs. - ImagePickerWindowsPlugin(); - - List _imageFormats = ['jpg', 'jpeg', 'png', 'bmp']; - List _videoFormats = ['mov', 'wmv', 'mkv', 'mp4']; - - /// Registers this class as the default instance of [ImagePickerPlatform]. - static void registerWith() { - ImagePickerPlatform.instance = ImagePickerWindowsPlugin(); - } - - /// Returns a [PickedFile] with the image that was picked. - /// - /// The `source` argument controls where the image comes from. This can - /// be either [ImageSource.camera] or [ImageSource.gallery]. - /// - /// Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are not supported on the Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. - /// - /// Use `preferredCameraDevice` to specify the camera to use when the `source` is [ImageSource.camera]. - /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery]. It is also ignored if the chosen camera is not supported on the device. - /// Defaults to [CameraDevice.rear]. - /// - /// If no images were picked, the return value is null. - @override - Future pickImage({ - required ImageSource source, - double? maxWidth, - double? maxHeight, - int? imageQuality, - CameraDevice preferredCameraDevice = CameraDevice.rear, - }) async { - final typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); - final file = await FileSelectorPlatform.instance - .openFile(acceptedTypeGroups: [typeGroup]); - if (file != null) { - return PickedFile(file.path); - } - return null; - } - - /// Returns a [PickedFile] containing the video that was picked. - /// - /// The [source] argument controls where the video comes from. This can - /// be either [ImageSource.camera] or [ImageSource.gallery]. - /// - /// Note that the `maxDuration` argument is not supported on the Windows. If the argument is supplied, it'll be silently ignored by the Windows version of the plugin. - /// - /// Use `preferredCameraDevice` to specify the camera to use when the `source` is [ImageSource.camera]. - /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery]. It is also ignored if the chosen camera is not supported on the device. - /// Defaults to [CameraDevice.rear]. - /// - /// If no images were picked, the return value is null. - @override - Future pickVideo({ - required ImageSource source, - CameraDevice preferredCameraDevice = CameraDevice.rear, - Duration? maxDuration, - }) async { - final typeGroup = XTypeGroup(label: 'videos', extensions: _videoFormats); - final file = await FileSelectorPlatform.instance - .openFile(acceptedTypeGroups: [typeGroup]); - if (file != null) { - return PickedFile(file.path); - } - return null; - } - - /// Returns an [XFile] with the image that was picked. - /// - /// The `source` argument controls where the image comes from. This can - /// be either [ImageSource.camera] or [ImageSource.gallery]. - /// - /// Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are not supported on the Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. - /// - /// Use `preferredCameraDevice` to specify the camera to use when the `source` is [ImageSource.camera]. - /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery]. It is also ignored if the chosen camera is not supported on the device. - /// Defaults to [CameraDevice.rear]. - /// - /// If no images were picked, the return value is null. - @override - Future getImage({ - required ImageSource source, - double? maxWidth, - double? maxHeight, - int? imageQuality, - CameraDevice preferredCameraDevice = CameraDevice.rear, - }) async { - final typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); - final file = await FileSelectorPlatform.instance - .openFile(acceptedTypeGroups: [typeGroup]); - return file; - } - - /// Returns an [XFile] containing the video that was picked. - /// - /// The [source] argument controls where the video comes from. This can - /// be either [ImageSource.camera] or [ImageSource.gallery]. - /// - /// Note that the `maxDuration` argument is not supported on the Windows. If the argument is supplied, it'll be silently ignored by the Windows version of the plugin. - /// - /// Use `preferredCameraDevice` to specify the camera to use when the `source` is [ImageSource.camera]. - /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery]. It is also ignored if the chosen camera is not supported on the device. - /// Defaults to [CameraDevice.rear]. - /// - /// If no images were picked, the return value is null. - @override - Future getVideo({ - required ImageSource source, - CameraDevice preferredCameraDevice = CameraDevice.rear, - Duration? maxDuration, - }) async { - final typeGroup = XTypeGroup(label: 'videos', extensions: _videoFormats); - final file = await FileSelectorPlatform.instance - .openFile(acceptedTypeGroups: [typeGroup]); - return file; - } - - /// Injects a file input, and returns a list of XFile that the user selected locally. - @override - Future> getMultiImage({ - double? maxWidth, - double? maxHeight, - int? imageQuality, - }) async { - final typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); - final files = await FileSelectorPlatform.instance - .openFiles(acceptedTypeGroups: [typeGroup]); - return files; - } -} diff --git a/packages/image_picker/image_picker_windows/AUTHORS b/packages/image_picker/image_picker_windows/AUTHORS new file mode 100644 index 000000000000..5db3d584e6bc --- /dev/null +++ b/packages/image_picker/image_picker_windows/AUTHORS @@ -0,0 +1,7 @@ +# Below is a list of people and organizations that have contributed +# to the Flutter project. Names should be added to the list like so: +# +# Name/Organization + +Google Inc. +Alexandre Zollinger Chohfi \ No newline at end of file diff --git a/packages/image_picker/image_picker_for_windows/CHANGELOG.md b/packages/image_picker/image_picker_windows/CHANGELOG.md similarity index 77% rename from packages/image_picker/image_picker_for_windows/CHANGELOG.md rename to packages/image_picker/image_picker_windows/CHANGELOG.md index ca6fae6b4580..c4a71a0176b5 100644 --- a/packages/image_picker/image_picker_for_windows/CHANGELOG.md +++ b/packages/image_picker/image_picker_windows/CHANGELOG.md @@ -1,3 +1,3 @@ -# 0.0.1 +# 0.1.0 * Initial Windows support. diff --git a/packages/image_picker/image_picker_for_windows/LICENSE b/packages/image_picker/image_picker_windows/LICENSE similarity index 100% rename from packages/image_picker/image_picker_for_windows/LICENSE rename to packages/image_picker/image_picker_windows/LICENSE diff --git a/packages/image_picker/image_picker_for_windows/README.md b/packages/image_picker/image_picker_windows/README.md similarity index 83% rename from packages/image_picker/image_picker_for_windows/README.md rename to packages/image_picker/image_picker_windows/README.md index aea534822118..cb2add67c63d 100644 --- a/packages/image_picker/image_picker_for_windows/README.md +++ b/packages/image_picker/image_picker_windows/README.md @@ -1,4 +1,4 @@ -# image\_picker\_for\_windows +# image\_picker\_windows A Windows implementation of [`image_picker`][1]. @@ -13,11 +13,11 @@ The argument `maxDuration` is not supported on Windows. ### Import the package This package is not yet [endorsed](https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin), which means you need to add -not only the `image_picker`, as well as the `image_picker_for_windows`. +not only the `image_picker`, as well as the `image_picker_windows`. ### Use the plugin -You should be able to use `package:image_picker` _almost_ as normal. +You should be able to use `package:image_picker` _almost_ as normal, since this package is not fully featured yet. If you want to use the path directly, your code would need look like this: diff --git a/packages/image_picker/image_picker_for_windows/example/README.md b/packages/image_picker/image_picker_windows/example/README.md similarity index 54% rename from packages/image_picker/image_picker_for_windows/example/README.md rename to packages/image_picker/image_picker_windows/example/README.md index fe08d9a5dcf7..ae730a5ec846 100644 --- a/packages/image_picker/image_picker_for_windows/example/README.md +++ b/packages/image_picker/image_picker_windows/example/README.md @@ -1,6 +1,6 @@ -# image_picker_for_windows_example +# image_picker_windows_example -Demonstrates how to use the image_picker_for_windows plugin. +Demonstrates how to use the image_picker_windows plugin. ## Getting Started diff --git a/packages/image_picker/image_picker_for_windows/example/lib/main.dart b/packages/image_picker/image_picker_windows/example/lib/main.dart similarity index 70% rename from packages/image_picker/image_picker_for_windows/example/lib/main.dart rename to packages/image_picker/image_picker_windows/example/lib/main.dart index 0f5ba76db6df..a078ebdd88e7 100644 --- a/packages/image_picker/image_picker_for_windows/example/lib/main.dart +++ b/packages/image_picker/image_picker_windows/example/lib/main.dart @@ -9,7 +9,8 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:image_picker/image_picker.dart'; +import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; +import 'package:image_picker_windows/image_picker_windows.dart'; import 'package:video_player/video_player.dart'; void main() { @@ -19,7 +20,7 @@ void main() { class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( + return const MaterialApp( title: 'Image Picker Demo', home: MyHomePage(title: 'Image Picker Example'), ); @@ -27,7 +28,7 @@ class MyApp extends StatelessWidget { } class MyHomePage extends StatefulWidget { - MyHomePage({Key? key, this.title}) : super(key: key); + const MyHomePage({Key? key, this.title}) : super(key: key); final String? title; @@ -36,10 +37,10 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { - List? _imageFileList; + List? _imageFileList; - set _imageFile(XFile? value) { - _imageFileList = value == null ? null : [value]; + set _imageFile(PickedFile? value) { + _imageFileList = value == null ? null : [value]; } dynamic _pickImageError; @@ -49,28 +50,18 @@ class _MyHomePageState extends State { VideoPlayerController? _toBeDisposed; String? _retrieveDataError; - final ImagePicker _picker = ImagePicker(); + final ImagePickerPlatform _picker = ImagePickerWindows(); final TextEditingController maxWidthController = TextEditingController(); final TextEditingController maxHeightController = TextEditingController(); final TextEditingController qualityController = TextEditingController(); - Future _playVideo(XFile? file) async { + Future _playVideo(PickedFile? file) async { if (file != null && mounted) { await _disposeVideoController(); - late VideoPlayerController controller; - if (kIsWeb) { - controller = VideoPlayerController.network(file.path); - } else { - controller = VideoPlayerController.file(File(file.path)); - } + final VideoPlayerController controller = + VideoPlayerController.file(File(file.path)); _controller = controller; - // In web, most browsers won't honor a programmatic call to .play - // if the video has a sound track (and is not muted). - // Mute the video so it auto-plays in web! - // This is not needed if the call to .play is the result of user - // interaction (clicking on a "play" button, for example). - final double volume = kIsWeb ? 0.0 : 1.0; - await controller.setVolume(volume); + await controller.setVolume(1.0); await controller.initialize(); await controller.setLooping(true); await controller.play(); @@ -78,20 +69,20 @@ class _MyHomePageState extends State { } } - void _onImageButtonPressed(ImageSource source, + Future _onImageButtonPressed(ImageSource source, {BuildContext? context, bool isMultiImage = false}) async { if (_controller != null) { await _controller!.setVolume(0.0); } if (isVideo) { - final XFile? file = await _picker.pickVideo( + final PickedFile? file = await _picker.pickVideo( source: source, maxDuration: const Duration(seconds: 10)); await _playVideo(file); } else if (isMultiImage) { await _displayPickImageDialog(context!, (double? maxWidth, double? maxHeight, int? quality) async { try { - final pickedFileList = await _picker.pickMultiImage( + final List? pickedFileList = await _picker.pickMultiImage( maxWidth: maxWidth, maxHeight: maxHeight, imageQuality: quality, @@ -109,7 +100,7 @@ class _MyHomePageState extends State { await _displayPickImageDialog(context!, (double? maxWidth, double? maxHeight, int? quality) async { try { - final pickedFile = await _picker.pickImage( + final PickedFile? pickedFile = await _picker.pickImage( source: source, maxWidth: maxWidth, maxHeight: maxHeight, @@ -179,14 +170,10 @@ class _MyHomePageState extends State { return Semantics( child: ListView.builder( key: UniqueKey(), - itemBuilder: (context, index) { - // Why network for web? - // See https://pub.dev/packages/image_picker#getting-ready-for-the-web-platform + itemBuilder: (BuildContext context, int index) { return Semantics( label: 'image_picker_example_picked_image', - child: kIsWeb - ? Image.network(_imageFileList![index].path) - : Image.file(File(_imageFileList![index].path)), + child: Image.file(File(_imageFileList![index].path)), ); }, itemCount: _imageFileList!.length, @@ -213,27 +200,6 @@ class _MyHomePageState extends State { } } - Future retrieveLostData() async { - final LostDataResponse response = await _picker.retrieveLostData(); - if (response.isEmpty) { - return; - } - if (response.file != null) { - if (response.type == RetrieveType.video) { - isVideo = true; - await _playVideo(response.file); - } else { - isVideo = false; - setState(() { - _imageFile = response.file; - _imageFileList = response.files; - }); - } - } else { - _retrieveDataError = response.exception!.code; - } - } - @override Widget build(BuildContext context) { return Scaffold( @@ -241,35 +207,7 @@ class _MyHomePageState extends State { title: Text(widget.title!), ), body: Center( - child: !kIsWeb && defaultTargetPlatform == TargetPlatform.android - ? FutureBuilder( - future: retrieveLostData(), - builder: (BuildContext context, AsyncSnapshot snapshot) { - switch (snapshot.connectionState) { - case ConnectionState.none: - case ConnectionState.waiting: - return const Text( - 'You have not yet picked an image.', - textAlign: TextAlign.center, - ); - case ConnectionState.done: - return _handlePreview(); - default: - if (snapshot.hasError) { - return Text( - 'Pick image/video error: ${snapshot.error}}', - textAlign: TextAlign.center, - ); - } else { - return const Text( - 'You have not yet picked an image.', - textAlign: TextAlign.center, - ); - } - } - }, - ) - : _handlePreview(), + child: _handlePreview(), ), floatingActionButton: Column( mainAxisAlignment: MainAxisAlignment.end, @@ -358,28 +296,30 @@ class _MyHomePageState extends State { BuildContext context, OnPickImageCallback onPick) async { return showDialog( context: context, - builder: (context) { + builder: (BuildContext context) { return AlertDialog( - title: Text('Add optional parameters'), + title: const Text('Add optional parameters'), content: Column( children: [ TextField( controller: maxWidthController, - keyboardType: TextInputType.numberWithOptions(decimal: true), - decoration: - InputDecoration(hintText: "Enter maxWidth if desired"), + keyboardType: + const TextInputType.numberWithOptions(decimal: true), + decoration: const InputDecoration( + hintText: 'Enter maxWidth if desired'), ), TextField( controller: maxHeightController, - keyboardType: TextInputType.numberWithOptions(decimal: true), - decoration: - InputDecoration(hintText: "Enter maxHeight if desired"), + keyboardType: + const TextInputType.numberWithOptions(decimal: true), + decoration: const InputDecoration( + hintText: 'Enter maxHeight if desired'), ), TextField( controller: qualityController, keyboardType: TextInputType.number, - decoration: - InputDecoration(hintText: "Enter quality if desired"), + decoration: const InputDecoration( + hintText: 'Enter quality if desired'), ), ], ), @@ -393,13 +333,13 @@ class _MyHomePageState extends State { TextButton( child: const Text('PICK'), onPressed: () { - double? width = maxWidthController.text.isNotEmpty + final double? width = maxWidthController.text.isNotEmpty ? double.parse(maxWidthController.text) : null; - double? height = maxHeightController.text.isNotEmpty + final double? height = maxHeightController.text.isNotEmpty ? double.parse(maxHeightController.text) : null; - int? quality = qualityController.text.isNotEmpty + final int? quality = qualityController.text.isNotEmpty ? int.parse(qualityController.text) : null; onPick(width, height, quality); @@ -411,11 +351,11 @@ class _MyHomePageState extends State { } } -typedef void OnPickImageCallback( +typedef OnPickImageCallback = void Function( double? maxWidth, double? maxHeight, int? quality); class AspectRatioVideo extends StatefulWidget { - AspectRatioVideo(this.controller); + const AspectRatioVideo(this.controller); final VideoPlayerController? controller; diff --git a/packages/image_picker/image_picker_for_windows/example/pubspec.yaml b/packages/image_picker/image_picker_windows/example/pubspec.yaml similarity index 57% rename from packages/image_picker/image_picker_for_windows/example/pubspec.yaml rename to packages/image_picker/image_picker_windows/example/pubspec.yaml index 280243efdbf8..68c9395c6097 100644 --- a/packages/image_picker/image_picker_for_windows/example/pubspec.yaml +++ b/packages/image_picker/image_picker_windows/example/pubspec.yaml @@ -5,26 +5,19 @@ version: 1.0.0 environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.2.0" + flutter: ">=2.5.0" dependencies: - video_player: ^2.1.4 - image_picker: - # When depending on this package from a real application you should use: - # image_picker: ^x.y.z - # See https://dart.dev/tools/pub/dependencies#version-constraints - # The example app is bundled with the plugin so we use a path dependency on - # the parent directory to use the current plugin's version. - path: ../../image_picker - image_picker_for_windows: + flutter: + sdk: flutter + image_picker_windows: # When depending on this package from a real application you should use: - # image_picker_for_windows: ^x.y.z + # image_picker_windows: ^x.y.z # See https://dart.dev/tools/pub/dependencies#version-constraints # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: .. - flutter: - sdk: flutter + video_player: ^2.1.4 dev_dependencies: flutter_test: diff --git a/packages/image_picker/image_picker_for_windows/example/windows/.gitignore b/packages/image_picker/image_picker_windows/example/windows/.gitignore similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/.gitignore rename to packages/image_picker/image_picker_windows/example/windows/.gitignore diff --git a/packages/image_picker/image_picker_for_windows/example/windows/CMakeLists.txt b/packages/image_picker/image_picker_windows/example/windows/CMakeLists.txt similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/CMakeLists.txt rename to packages/image_picker/image_picker_windows/example/windows/CMakeLists.txt diff --git a/packages/image_picker/image_picker_for_windows/example/windows/flutter/CMakeLists.txt b/packages/image_picker/image_picker_windows/example/windows/flutter/CMakeLists.txt similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/flutter/CMakeLists.txt rename to packages/image_picker/image_picker_windows/example/windows/flutter/CMakeLists.txt diff --git a/packages/image_picker/image_picker_for_windows/example/windows/flutter/generated_plugins.cmake b/packages/image_picker/image_picker_windows/example/windows/flutter/generated_plugins.cmake similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/flutter/generated_plugins.cmake rename to packages/image_picker/image_picker_windows/example/windows/flutter/generated_plugins.cmake diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/CMakeLists.txt b/packages/image_picker/image_picker_windows/example/windows/runner/CMakeLists.txt similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/CMakeLists.txt rename to packages/image_picker/image_picker_windows/example/windows/runner/CMakeLists.txt diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/Runner.rc b/packages/image_picker/image_picker_windows/example/windows/runner/Runner.rc similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/Runner.rc rename to packages/image_picker/image_picker_windows/example/windows/runner/Runner.rc diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.cpp b/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.cpp similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.cpp rename to packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.cpp diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.h b/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.h similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/flutter_window.h rename to packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.h diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/main.cpp b/packages/image_picker/image_picker_windows/example/windows/runner/main.cpp similarity index 88% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/main.cpp rename to packages/image_picker/image_picker_windows/example/windows/runner/main.cpp index bcb57b0e2aac..8862daf5b60f 100644 --- a/packages/image_picker/image_picker_for_windows/example/windows/runner/main.cpp +++ b/packages/image_picker/image_picker_windows/example/windows/runner/main.cpp @@ -6,7 +6,7 @@ #include "utils.h" int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, - _In_ wchar_t *command_line, _In_ int show_command) { + _In_ wchar_t* command_line, _In_ int show_command) { // Attach to console when present (e.g., 'flutter run') or create a // new console when running with a debugger. if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { @@ -19,8 +19,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, flutter::DartProject project(L"data"); - std::vector command_line_arguments = - GetCommandLineArguments(); + std::vector command_line_arguments = GetCommandLineArguments(); project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); diff --git a/packages/image_picker/image_picker_windows/example/windows/runner/resource.h b/packages/image_picker/image_picker_windows/example/windows/runner/resource.h new file mode 100644 index 000000000000..d5d958dc4257 --- /dev/null +++ b/packages/image_picker/image_picker_windows/example/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/resources/app_icon.ico b/packages/image_picker/image_picker_windows/example/windows/runner/resources/app_icon.ico similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/resources/app_icon.ico rename to packages/image_picker/image_picker_windows/example/windows/runner/resources/app_icon.ico diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/runner.exe.manifest b/packages/image_picker/image_picker_windows/example/windows/runner/runner.exe.manifest similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/runner.exe.manifest rename to packages/image_picker/image_picker_windows/example/windows/runner/runner.exe.manifest diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.cpp b/packages/image_picker/image_picker_windows/example/windows/runner/utils.cpp similarity index 84% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/utils.cpp rename to packages/image_picker/image_picker_windows/example/windows/runner/utils.cpp index d19bdbbcc322..afa363b236e3 100644 --- a/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.cpp +++ b/packages/image_picker/image_picker_windows/example/windows/runner/utils.cpp @@ -9,7 +9,7 @@ void CreateAndAttachConsole() { if (::AllocConsole()) { - FILE *unused; + FILE* unused; if (freopen_s(&unused, "CONOUT$", "w", stdout)) { _dup2(_fileno(stdout), 1); } @@ -45,17 +45,16 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) { if (utf16_string == nullptr) { return std::string(); } - int target_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, nullptr, 0, nullptr, nullptr); + int target_length = + ::WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, -1, + nullptr, 0, nullptr, nullptr); if (target_length == 0) { return std::string(); } std::string utf8_string; utf8_string.resize(target_length); int converted_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, utf8_string.data(), + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, -1, utf8_string.data(), target_length, nullptr, nullptr); if (converted_length == 0) { return std::string(); diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/utils.h b/packages/image_picker/image_picker_windows/example/windows/runner/utils.h similarity index 100% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/utils.h rename to packages/image_picker/image_picker_windows/example/windows/runner/utils.h diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.cpp b/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.cpp similarity index 93% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.cpp rename to packages/image_picker/image_picker_windows/example/windows/runner/win32_window.cpp index c10f08dc7da6..44091b3f3c91 100644 --- a/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.cpp +++ b/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.cpp @@ -93,17 +93,14 @@ void WindowClassRegistrar::UnregisterWindowClass() { class_registered_ = false; } -Win32Window::Win32Window() { - ++g_active_window_count; -} +Win32Window::Win32Window() { ++g_active_window_count; } Win32Window::~Win32Window() { --g_active_window_count; Destroy(); } -bool Win32Window::CreateAndShow(const std::wstring& title, - const Point& origin, +bool Win32Window::CreateAndShow(const std::wstring& title, const Point& origin, const Size& size) { Destroy(); @@ -130,8 +127,7 @@ bool Win32Window::CreateAndShow(const std::wstring& title, } // static -LRESULT CALLBACK Win32Window::WndProc(HWND const window, - UINT const message, +LRESULT CALLBACK Win32Window::WndProc(HWND const window, UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept { if (message == WM_NCCREATE) { @@ -150,9 +146,7 @@ LRESULT CALLBACK Win32Window::WndProc(HWND const window, } LRESULT -Win32Window::MessageHandler(HWND hwnd, - UINT const message, - WPARAM const wparam, +Win32Window::MessageHandler(HWND hwnd, UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept { switch (message) { case WM_DESTROY: @@ -227,9 +221,7 @@ RECT Win32Window::GetClientArea() { return frame; } -HWND Win32Window::GetHandle() { - return window_handle_; -} +HWND Win32Window::GetHandle() { return window_handle_; } void Win32Window::SetQuitOnClose(bool quit_on_close) { quit_on_close_ = quit_on_close; diff --git a/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.h b/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.h similarity index 91% rename from packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.h rename to packages/image_picker/image_picker_windows/example/windows/runner/win32_window.h index 17ba431125b4..4ae64a12b465 100644 --- a/packages/image_picker/image_picker_for_windows/example/windows/runner/win32_window.h +++ b/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.h @@ -34,8 +34,7 @@ class Win32Window { // consistent size to will treat the width height passed in to this function // as logical pixels and scale to appropriate for the default monitor. Returns // true if the window was created successfully. - bool CreateAndShow(const std::wstring& title, - const Point& origin, + bool CreateAndShow(const std::wstring& title, const Point& origin, const Size& size); // Release OS resources associated with window. @@ -58,8 +57,7 @@ class Win32Window { // Processes and route salient window messages for mouse handling, // size change and DPI. Delegates handling of these to member overloads that // inheriting classes can handle. - virtual LRESULT MessageHandler(HWND window, - UINT const message, + virtual LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept; @@ -78,8 +76,7 @@ class Win32Window { // non-client DPI scaling so that the non-client area automatically // responsponds to changes in DPI. All other messages are handled by // MessageHandler. - static LRESULT CALLBACK WndProc(HWND const window, - UINT const message, + static LRESULT CALLBACK WndProc(HWND const window, UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept; diff --git a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart new file mode 100644 index 000000000000..016dc5d6aa3b --- /dev/null +++ b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart @@ -0,0 +1,125 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; + +import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; +import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; + +/// The Windows implementation of [ImagePickerPlatform]. +/// +/// This class implements the `package:image_picker` functionality for Windows. +class ImagePickerWindows extends ImagePickerPlatform { + /// Constructs a ImagePickerWindows. + ImagePickerWindows(); + + final List _imageFormats = [ + 'jpg', + 'jpeg', + 'png', + 'bmp', + 'webp', + 'gif', + 'tif', + 'tiff', + 'apng' + ]; + final List _videoFormats = [ + 'mov', + 'wmv', + 'mkv', + 'mp4', + 'webm', + 'avi', + 'mpeg', + 'mpg' + ]; + + /// Registers this class as the default instance of [ImagePickerPlatform]. + static void registerWith() { + ImagePickerPlatform.instance = ImagePickerWindows(); + } + + // Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are not supported on the Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + @override + Future pickImage({ + required ImageSource source, + double? maxWidth, + double? maxHeight, + int? imageQuality, + CameraDevice preferredCameraDevice = CameraDevice.rear, + }) async { + final XFile? file = await getImage( + source: source, + maxWidth: maxWidth, + maxHeight: maxHeight, + imageQuality: imageQuality, + preferredCameraDevice: preferredCameraDevice); + if (file != null) { + return PickedFile(file.path); + } + return null; + } + + // Note that the `source`, `preferredCameraDevice`, and `maxDuration` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + @override + Future pickVideo({ + required ImageSource source, + CameraDevice preferredCameraDevice = CameraDevice.rear, + Duration? maxDuration, + }) async { + final XFile? file = await getVideo( + source: source, + preferredCameraDevice: preferredCameraDevice, + maxDuration: maxDuration); + if (file != null) { + return PickedFile(file.path); + } + return null; + } + + // Note that the `source`, `maxWidth`, `maxHeight`, `imageQuality`, and `preferredCameraDevice` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + @override + Future getImage({ + required ImageSource source, + double? maxWidth, + double? maxHeight, + int? imageQuality, + CameraDevice preferredCameraDevice = CameraDevice.rear, + }) async { + final XTypeGroup typeGroup = + XTypeGroup(label: 'images', extensions: _imageFormats); + final XFile? file = await FileSelectorPlatform.instance + .openFile(acceptedTypeGroups: [typeGroup]); + return file; + } + + // Note that the `source`, `preferredCameraDevice`, and `maxDuration` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + @override + Future getVideo({ + required ImageSource source, + CameraDevice preferredCameraDevice = CameraDevice.rear, + Duration? maxDuration, + }) async { + final XTypeGroup typeGroup = + XTypeGroup(label: 'videos', extensions: _videoFormats); + final XFile? file = await FileSelectorPlatform.instance + .openFile(acceptedTypeGroups: [typeGroup]); + return file; + } + + // Note that the `maxWidth`, `maxHeight`, and `imageQuality` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + @override + Future> getMultiImage({ + double? maxWidth, + double? maxHeight, + int? imageQuality, + }) async { + final XTypeGroup typeGroup = + XTypeGroup(label: 'images', extensions: _imageFormats); + final List files = await FileSelectorPlatform.instance + .openFiles(acceptedTypeGroups: [typeGroup]); + return files; + } +} diff --git a/packages/image_picker/image_picker_for_windows/pubspec.yaml b/packages/image_picker/image_picker_windows/pubspec.yaml similarity index 72% rename from packages/image_picker/image_picker_for_windows/pubspec.yaml rename to packages/image_picker/image_picker_windows/pubspec.yaml index 0fc0fd55f809..b342daad2225 100644 --- a/packages/image_picker/image_picker_for_windows/pubspec.yaml +++ b/packages/image_picker/image_picker_windows/pubspec.yaml @@ -1,27 +1,26 @@ -name: image_picker_for_windows +name: image_picker_windows description: Windows platform implementation of image_picker -repository: https://github.com/flutter/plugins/tree/main/packages/image_picker/image_picker_for_windows +repository: https://github.com/flutter/plugins/tree/main/packages/image_picker/image_picker_windows issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 0.0.1 +version: 0.1.0 environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.5.0" flutter: plugin: implements: image_picker platforms: windows: - dartPluginClass: ImagePickerWindowsPlugin + dartPluginClass: ImagePickerWindows dependencies: + file_selector_platform_interface: ^2.0.4 + file_selector_windows: ^0.8.2 flutter: sdk: flutter image_picker_platform_interface: ^2.4.3 - file_selector: ^0.8.3 - file_selector_windows: ^0.8.2 - pedantic: ^1.10.0 dev_dependencies: flutter_test: From 59b831de9431104d2fd928ad6920f5814c50c7d3 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Thu, 17 Feb 2022 11:32:07 -0800 Subject: [PATCH 03/12] Applied PR feedback. --- .../image_picker_windows/README.md | 22 +----- .../example/lib/main.dart | 3 +- .../example/windows/runner/flutter_window.cpp | 4 ++ .../example/windows/runner/flutter_window.h | 4 ++ .../example/windows/runner/main.cpp | 4 ++ .../example/windows/runner/utils.cpp | 4 ++ .../example/windows/runner/utils.h | 4 ++ .../example/windows/runner/win32_window.cpp | 4 ++ .../example/windows/runner/win32_window.h | 4 ++ .../lib/image_picker_windows.dart | 72 +++++++++++-------- 10 files changed, 74 insertions(+), 51 deletions(-) diff --git a/packages/image_picker/image_picker_windows/README.md b/packages/image_picker/image_picker_windows/README.md index cb2add67c63d..a254abf086c2 100644 --- a/packages/image_picker/image_picker_windows/README.md +++ b/packages/image_picker/image_picker_windows/README.md @@ -13,24 +13,4 @@ The argument `maxDuration` is not supported on Windows. ### Import the package This package is not yet [endorsed](https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin), which means you need to add -not only the `image_picker`, as well as the `image_picker_windows`. - -### Use the plugin - -You should be able to use `package:image_picker` _almost_ as normal, since this package is not fully featured yet. - -If you want to use the path directly, your code would need look like this: - -```dart -... -Image.file(File(pickedFile.path)); -... -``` - -Or, using bytes: - -```dart -... -Image.memory(await pickedFile.readAsBytes()) -... -``` +not only the `image_picker`, as well as the `image_picker_windows`. \ No newline at end of file diff --git a/packages/image_picker/image_picker_windows/example/lib/main.dart b/packages/image_picker/image_picker_windows/example/lib/main.dart index a078ebdd88e7..4321b67f8239 100644 --- a/packages/image_picker/image_picker_windows/example/lib/main.dart +++ b/packages/image_picker/image_picker_windows/example/lib/main.dart @@ -10,7 +10,6 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; -import 'package:image_picker_windows/image_picker_windows.dart'; import 'package:video_player/video_player.dart'; void main() { @@ -50,7 +49,7 @@ class _MyHomePageState extends State { VideoPlayerController? _toBeDisposed; String? _retrieveDataError; - final ImagePickerPlatform _picker = ImagePickerWindows(); + final ImagePickerPlatform _picker = ImagePickerPlatform.instance; final TextEditingController maxWidthController = TextEditingController(); final TextEditingController maxHeightController = TextEditingController(); final TextEditingController qualityController = TextEditingController(); diff --git a/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.cpp b/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.cpp index b43b9095ea3a..8254bd9ff3c1 100644 --- a/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.cpp +++ b/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.cpp @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "flutter_window.h" #include diff --git a/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.h b/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.h index 6da0652f05f2..f1fc669093d0 100644 --- a/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.h +++ b/packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.h @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #ifndef RUNNER_FLUTTER_WINDOW_H_ #define RUNNER_FLUTTER_WINDOW_H_ diff --git a/packages/image_picker/image_picker_windows/example/windows/runner/main.cpp b/packages/image_picker/image_picker_windows/example/windows/runner/main.cpp index 8862daf5b60f..df379fa0be93 100644 --- a/packages/image_picker/image_picker_windows/example/windows/runner/main.cpp +++ b/packages/image_picker/image_picker_windows/example/windows/runner/main.cpp @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include #include #include diff --git a/packages/image_picker/image_picker_windows/example/windows/runner/utils.cpp b/packages/image_picker/image_picker_windows/example/windows/runner/utils.cpp index afa363b236e3..fb7e945a63b7 100644 --- a/packages/image_picker/image_picker_windows/example/windows/runner/utils.cpp +++ b/packages/image_picker/image_picker_windows/example/windows/runner/utils.cpp @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "utils.h" #include diff --git a/packages/image_picker/image_picker_windows/example/windows/runner/utils.h b/packages/image_picker/image_picker_windows/example/windows/runner/utils.h index 3879d5475579..bd81e1e02338 100644 --- a/packages/image_picker/image_picker_windows/example/windows/runner/utils.h +++ b/packages/image_picker/image_picker_windows/example/windows/runner/utils.h @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #ifndef RUNNER_UTILS_H_ #define RUNNER_UTILS_H_ diff --git a/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.cpp b/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.cpp index 44091b3f3c91..85aa3614e8ad 100644 --- a/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.cpp +++ b/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.cpp @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #include "win32_window.h" #include diff --git a/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.h b/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.h index 4ae64a12b465..d2a730052223 100644 --- a/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.h +++ b/packages/image_picker/image_picker_windows/example/windows/runner/win32_window.h @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #ifndef RUNNER_WIN32_WINDOW_H_ #define RUNNER_WIN32_WINDOW_H_ diff --git a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart index 016dc5d6aa3b..8d0033c747f1 100644 --- a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart +++ b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart @@ -5,43 +5,48 @@ import 'dart:async'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; +import 'package:file_selector_windows/file_selector_windows.dart'; import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; +const List _imageFormats = [ + 'jpg', + 'jpeg', + 'png', + 'bmp', + 'webp', + 'gif', + 'tif', + 'tiff', + 'apng' +]; +const List _videoFormats = [ + 'mov', + 'wmv', + 'mkv', + 'mp4', + 'webm', + 'avi', + 'mpeg', + 'mpg' +]; + /// The Windows implementation of [ImagePickerPlatform]. /// -/// This class implements the `package:image_picker` functionality for Windows. +/// This class implements the `package:image_picker` functionality for +/// Windows. class ImagePickerWindows extends ImagePickerPlatform { /// Constructs a ImagePickerWindows. ImagePickerWindows(); - final List _imageFormats = [ - 'jpg', - 'jpeg', - 'png', - 'bmp', - 'webp', - 'gif', - 'tif', - 'tiff', - 'apng' - ]; - final List _videoFormats = [ - 'mov', - 'wmv', - 'mkv', - 'mp4', - 'webm', - 'avi', - 'mpeg', - 'mpg' - ]; - /// Registers this class as the default instance of [ImagePickerPlatform]. static void registerWith() { ImagePickerPlatform.instance = ImagePickerWindows(); + FileSelectorWindows.registerWith(); } - // Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are not supported on the Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + // Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are + // not supported on the Windows. If any of these arguments is supplied, + // it'll be silently ignored by the Windows version of the plugin. @override Future pickImage({ required ImageSource source, @@ -62,7 +67,10 @@ class ImagePickerWindows extends ImagePickerPlatform { return null; } - // Note that the `source`, `preferredCameraDevice`, and `maxDuration` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + // Note that the `source`, `preferredCameraDevice`, and `maxDuration` + // arguments are not supported on Windows. If any of these arguments is + // supplied, it'll be silently ignored by the Windows version of the + // plugin. @override Future pickVideo({ required ImageSource source, @@ -79,7 +87,10 @@ class ImagePickerWindows extends ImagePickerPlatform { return null; } - // Note that the `source`, `maxWidth`, `maxHeight`, `imageQuality`, and `preferredCameraDevice` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + // Note that the `source`, `maxWidth`, `maxHeight`, `imageQuality`, and + // `preferredCameraDevice` arguments are not supported on Windows. If + // any of these arguments is supplied, it'll be silently ignored by the + // Windows version of the plugin. @override Future getImage({ required ImageSource source, @@ -95,7 +106,10 @@ class ImagePickerWindows extends ImagePickerPlatform { return file; } - // Note that the `source`, `preferredCameraDevice`, and `maxDuration` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + // Note that the `source`, `preferredCameraDevice`, and `maxDuration` + // arguments are not supported on Windows. If any of these arguments + // is supplied, it'll be silently ignored by the Windows version of + // the plugin. @override Future getVideo({ required ImageSource source, @@ -109,7 +123,9 @@ class ImagePickerWindows extends ImagePickerPlatform { return file; } - // Note that the `maxWidth`, `maxHeight`, and `imageQuality` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin. + // Note that the `maxWidth`, `maxHeight`, and `imageQuality` arguments are + // not supported on Windows. If any of these arguments is supplied, it'll + // be silently ignored by the Windows version of the plugin. @override Future> getMultiImage({ double? maxWidth, From fb7ac4d7b0d1be19018c81f7786ee236e4cdaf4c Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Thu, 17 Feb 2022 11:53:58 -0800 Subject: [PATCH 04/12] Added image_picker_windows tests. --- .../test/image_picker_windows_test.dart | 188 ++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart diff --git a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart new file mode 100644 index 000000000000..64933a255b6b --- /dev/null +++ b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart @@ -0,0 +1,188 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; +import 'package:file_selector_windows/file_selector_windows.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; +import 'package:image_picker_windows/image_picker_windows.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group('$ImagePickerWindows()', () { + final ImagePickerWindows plugin = ImagePickerWindows(); + final FileSelectorWindows fileSelectorWindows = FileSelectorWindows(); + + final List log = []; + + setUp(() { + fileSelectorWindows.channel + .setMockMethodCallHandler((MethodCall methodCall) async { + log.add(methodCall); + return null; + }); + + log.clear(); + }); + + test('registered instance', () { + ImagePickerWindows.registerWith(); + expect(ImagePickerPlatform.instance, isA()); + expect(FileSelectorPlatform.instance, isA()); + }); + + group('images', () { + test('pickImage passes the accepted type groups correctly', () async { + final XTypeGroup group = XTypeGroup( + label: 'images', + extensions: [ + 'jpg', + 'jpeg', + 'png', + 'bmp', + 'webp', + 'gif', + 'tif', + 'tiff', + 'apng' + ]); + + await plugin.pickImage(source: ImageSource.gallery); + + expect( + log, + [ + isMethodCall('openFile', arguments: { + 'acceptedTypeGroups': >[group.toJSON()], + 'initialDirectory': null, + 'confirmButtonText': null, + 'multiple': false, + }), + ], + ); + }); + + test('getImage passes the accepted type groups correctly', () async { + final XTypeGroup group = XTypeGroup( + label: 'images', + extensions: [ + 'jpg', + 'jpeg', + 'png', + 'bmp', + 'webp', + 'gif', + 'tif', + 'tiff', + 'apng' + ]); + + await plugin.getImage(source: ImageSource.gallery); + + expect( + log, + [ + isMethodCall('openFile', arguments: { + 'acceptedTypeGroups': >[group.toJSON()], + 'initialDirectory': null, + 'confirmButtonText': null, + 'multiple': false, + }), + ], + ); + }); + + test('getMultiImage passes the accepted type groups correctly', () async { + final XTypeGroup group = XTypeGroup( + label: 'images', + extensions: [ + 'jpg', + 'jpeg', + 'png', + 'bmp', + 'webp', + 'gif', + 'tif', + 'tiff', + 'apng' + ]); + + await plugin.getMultiImage(); + + expect( + log, + [ + isMethodCall('openFile', arguments: { + 'acceptedTypeGroups': >[group.toJSON()], + 'initialDirectory': null, + 'confirmButtonText': null, + 'multiple': true, + }), + ], + ); + }); + }); + group('videos', () { + test('pickVideo passes the accepted type groups correctly', () async { + final XTypeGroup group = XTypeGroup( + label: 'videos', + extensions: [ + 'mov', + 'wmv', + 'mkv', + 'mp4', + 'webm', + 'avi', + 'mpeg', + 'mpg' + ]); + + await plugin.pickVideo(source: ImageSource.gallery); + + expect( + log, + [ + isMethodCall('openFile', arguments: { + 'acceptedTypeGroups': >[group.toJSON()], + 'initialDirectory': null, + 'confirmButtonText': null, + 'multiple': false, + }), + ], + ); + }); + + test('getVideo passes the accepted type groups correctly', () async { + final XTypeGroup group = XTypeGroup( + label: 'videos', + extensions: [ + 'mov', + 'wmv', + 'mkv', + 'mp4', + 'webm', + 'avi', + 'mpeg', + 'mpg' + ]); + + await plugin.getVideo(source: ImageSource.gallery); + + expect( + log, + [ + isMethodCall('openFile', arguments: { + 'acceptedTypeGroups': >[group.toJSON()], + 'initialDirectory': null, + 'confirmButtonText': null, + 'multiple': false, + }), + ], + ); + }); + }); + }); +} From aeb1d04c5bf21365cf7eaf5f7c982ca4cb968611 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Thu, 17 Feb 2022 12:25:26 -0800 Subject: [PATCH 05/12] Excl image_picker_windows win32 integration tests. --- script/configs/exclude_integration_win32.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/script/configs/exclude_integration_win32.yaml b/script/configs/exclude_integration_win32.yaml index 4626fbd79ce7..09306691e5ed 100644 --- a/script/configs/exclude_integration_win32.yaml +++ b/script/configs/exclude_integration_win32.yaml @@ -1,3 +1,4 @@ # Can't use Flutter integration tests due to native modal UI. - file_selector - file_selector_windows +- image_picker_windows \ No newline at end of file From 08fa0038b99c3518c149850e87b7a9fecb611b03 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Thu, 24 Feb 2022 14:35:07 -0800 Subject: [PATCH 06/12] [image_picker_windows] Added its own FileSelectorWindows instance --- .../image_picker_windows/lib/image_picker_windows.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart index 8d0033c747f1..eb7f635d6609 100644 --- a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart +++ b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart @@ -38,10 +38,11 @@ class ImagePickerWindows extends ImagePickerPlatform { /// Constructs a ImagePickerWindows. ImagePickerWindows(); + static FileSelectorWindows get _fileSelectorInstance => FileSelectorWindows(); + /// Registers this class as the default instance of [ImagePickerPlatform]. static void registerWith() { ImagePickerPlatform.instance = ImagePickerWindows(); - FileSelectorWindows.registerWith(); } // Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are @@ -101,7 +102,7 @@ class ImagePickerWindows extends ImagePickerPlatform { }) async { final XTypeGroup typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); - final XFile? file = await FileSelectorPlatform.instance + final XFile? file = await _fileSelectorInstance .openFile(acceptedTypeGroups: [typeGroup]); return file; } @@ -118,7 +119,7 @@ class ImagePickerWindows extends ImagePickerPlatform { }) async { final XTypeGroup typeGroup = XTypeGroup(label: 'videos', extensions: _videoFormats); - final XFile? file = await FileSelectorPlatform.instance + final XFile? file = await _fileSelectorInstance .openFile(acceptedTypeGroups: [typeGroup]); return file; } @@ -134,7 +135,7 @@ class ImagePickerWindows extends ImagePickerPlatform { }) async { final XTypeGroup typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); - final List files = await FileSelectorPlatform.instance + final List files = await _fileSelectorInstance .openFiles(acceptedTypeGroups: [typeGroup]); return files; } From 69a1b81fd56f480e83e9965b59b5123bae55443a Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Fri, 25 Feb 2022 12:44:14 -0800 Subject: [PATCH 07/12] Fix test. --- .../image_picker_windows/test/image_picker_windows_test.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart index 64933a255b6b..5bdc4567d83b 100644 --- a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart +++ b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart @@ -31,7 +31,6 @@ void main() { test('registered instance', () { ImagePickerWindows.registerWith(); expect(ImagePickerPlatform.instance, isA()); - expect(FileSelectorPlatform.instance, isA()); }); group('images', () { From 132b8086137f62f6cffd8f89b50efacca6c34117 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Mon, 28 Feb 2022 16:22:22 -0800 Subject: [PATCH 08/12] Documentation fixes. --- .../image_picker_windows/README.md | 4 +-- .../lib/image_picker_windows.dart | 34 +++++++++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/packages/image_picker/image_picker_windows/README.md b/packages/image_picker/image_picker_windows/README.md index a254abf086c2..0b256411b2fc 100644 --- a/packages/image_picker/image_picker_windows/README.md +++ b/packages/image_picker/image_picker_windows/README.md @@ -3,10 +3,10 @@ A Windows implementation of [`image_picker`][1]. ### pickImage() -The arguments `maxWidth`, `maxHeight` and `imageQuality` are not supported. +The arguments `source`, `maxWidth`, `maxHeight`, `imageQuality`, and `preferredCameraDevice` are not supported on Windows. ### pickVideo() -The argument `maxDuration` is not supported on Windows. +The arguments `source`, `preferredCameraDevice`, and `maxDuration` are not supported on Windows. ## Usage diff --git a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart index eb7f635d6609..a33c7debcf65 100644 --- a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart +++ b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart @@ -38,16 +38,19 @@ class ImagePickerWindows extends ImagePickerPlatform { /// Constructs a ImagePickerWindows. ImagePickerWindows(); - static FileSelectorWindows get _fileSelectorInstance => FileSelectorWindows(); + static final FileSelectorWindows _fileSelectorInstance = + FileSelectorWindows(); /// Registers this class as the default instance of [ImagePickerPlatform]. static void registerWith() { ImagePickerPlatform.instance = ImagePickerWindows(); } - // Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are - // not supported on the Windows. If any of these arguments is supplied, - // it'll be silently ignored by the Windows version of the plugin. + // Note that the `maxWidth`, `maxHeight`, `imageQuality` + // and `preferredCameraDevice` arguments are not supported on Windows. + // If any of these arguments is supplied, it'll be silently ignored + // by the Windows version of the plugin. `source` is not implemented + // for `ImageSource.camera` and will throw an exception. @override Future pickImage({ required ImageSource source, @@ -68,10 +71,11 @@ class ImagePickerWindows extends ImagePickerPlatform { return null; } - // Note that the `source`, `preferredCameraDevice`, and `maxDuration` + // Note that the `preferredCameraDevice` and `maxDuration` // arguments are not supported on Windows. If any of these arguments is // supplied, it'll be silently ignored by the Windows version of the - // plugin. + // plugin. `source` is not implemented for `ImageSource.camera` and + // will throw an exception. @override Future pickVideo({ required ImageSource source, @@ -88,10 +92,11 @@ class ImagePickerWindows extends ImagePickerPlatform { return null; } - // Note that the `source`, `maxWidth`, `maxHeight`, `imageQuality`, and + // Note that the `maxWidth`, `maxHeight`, `imageQuality`, and // `preferredCameraDevice` arguments are not supported on Windows. If // any of these arguments is supplied, it'll be silently ignored by the - // Windows version of the plugin. + // Windows version of the plugin. `source` is not implemented for + // `ImageSource.camera` and will throw an exception. @override Future getImage({ required ImageSource source, @@ -100,6 +105,10 @@ class ImagePickerWindows extends ImagePickerPlatform { int? imageQuality, CameraDevice preferredCameraDevice = CameraDevice.rear, }) async { + if (source != ImageSource.gallery) { + throw UnimplementedError( + 'source is only implemented for `ImageSource.gallery` on Windows'); + } final XTypeGroup typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); final XFile? file = await _fileSelectorInstance @@ -107,16 +116,21 @@ class ImagePickerWindows extends ImagePickerPlatform { return file; } - // Note that the `source`, `preferredCameraDevice`, and `maxDuration` + // Note that the `preferredCameraDevice` and `maxDuration` // arguments are not supported on Windows. If any of these arguments // is supplied, it'll be silently ignored by the Windows version of - // the plugin. + // the plugin. `source` is not implemented for `ImageSource.camera` + // and will throw an exception. @override Future getVideo({ required ImageSource source, CameraDevice preferredCameraDevice = CameraDevice.rear, Duration? maxDuration, }) async { + if (source != ImageSource.gallery) { + throw UnimplementedError( + 'source is only implemented for `ImageSource.gallery` on Windows'); + } final XTypeGroup typeGroup = XTypeGroup(label: 'videos', extensions: _videoFormats); final XFile? file = await _fileSelectorInstance From 922b42be6d426a55793d4330769b10f0e74272ca Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Mon, 7 Mar 2022 14:15:48 -0800 Subject: [PATCH 09/12] Improved UnimplementedError message on Windows. --- .../image_picker_windows/lib/image_picker_windows.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart index a33c7debcf65..45b66fb54f8d 100644 --- a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart +++ b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart @@ -107,7 +107,7 @@ class ImagePickerWindows extends ImagePickerPlatform { }) async { if (source != ImageSource.gallery) { throw UnimplementedError( - 'source is only implemented for `ImageSource.gallery` on Windows'); + 'ImageSource.gallery is currently the only supported source on Windows'); } final XTypeGroup typeGroup = XTypeGroup(label: 'images', extensions: _imageFormats); @@ -129,7 +129,7 @@ class ImagePickerWindows extends ImagePickerPlatform { }) async { if (source != ImageSource.gallery) { throw UnimplementedError( - 'source is only implemented for `ImageSource.gallery` on Windows'); + 'ImageSource.gallery is currently the only supported source on Windows'); } final XTypeGroup typeGroup = XTypeGroup(label: 'videos', extensions: _videoFormats); From 8ab457b0aeb3a7c73d6a9b0e6dcaab2ff6c8caab Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Mon, 7 Mar 2022 15:58:51 -0800 Subject: [PATCH 10/12] Changed tests based on PR feedback. --- .../lib/image_picker_windows.dart | 67 ++++--- .../image_picker_windows/pubspec.yaml | 2 + .../test/image_picker_windows_test.dart | 175 +++++------------- .../test/image_picker_windows_test.mocks.dart | 78 ++++++++ 4 files changed, 163 insertions(+), 159 deletions(-) create mode 100644 packages/image_picker/image_picker_windows/test/image_picker_windows_test.mocks.dart diff --git a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart index 45b66fb54f8d..6f3416f03bb6 100644 --- a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart +++ b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart @@ -6,30 +6,9 @@ import 'dart:async'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; import 'package:file_selector_windows/file_selector_windows.dart'; +import 'package:flutter/foundation.dart'; import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; -const List _imageFormats = [ - 'jpg', - 'jpeg', - 'png', - 'bmp', - 'webp', - 'gif', - 'tif', - 'tiff', - 'apng' -]; -const List _videoFormats = [ - 'mov', - 'wmv', - 'mkv', - 'mp4', - 'webm', - 'avi', - 'mpeg', - 'mpg' -]; - /// The Windows implementation of [ImagePickerPlatform]. /// /// This class implements the `package:image_picker` functionality for @@ -38,8 +17,36 @@ class ImagePickerWindows extends ImagePickerPlatform { /// Constructs a ImagePickerWindows. ImagePickerWindows(); - static final FileSelectorWindows _fileSelectorInstance = - FileSelectorWindows(); + /// List of image extensions used when picking images + @visibleForTesting + static const List imageFormats = [ + 'jpg', + 'jpeg', + 'png', + 'bmp', + 'webp', + 'gif', + 'tif', + 'tiff', + 'apng' + ]; + + /// List of video extensions used when picking videos + @visibleForTesting + static const List videoFormats = [ + 'mov', + 'wmv', + 'mkv', + 'mp4', + 'webm', + 'avi', + 'mpeg', + 'mpg' + ]; + + /// The FileSelectorPlatform used by the ImagePickerWindows. + @visibleForTesting + static late FileSelectorPlatform fileSelectorInstance = FileSelectorWindows(); /// Registers this class as the default instance of [ImagePickerPlatform]. static void registerWith() { @@ -110,8 +117,8 @@ class ImagePickerWindows extends ImagePickerPlatform { 'ImageSource.gallery is currently the only supported source on Windows'); } final XTypeGroup typeGroup = - XTypeGroup(label: 'images', extensions: _imageFormats); - final XFile? file = await _fileSelectorInstance + XTypeGroup(label: 'images', extensions: imageFormats); + final XFile? file = await fileSelectorInstance .openFile(acceptedTypeGroups: [typeGroup]); return file; } @@ -132,8 +139,8 @@ class ImagePickerWindows extends ImagePickerPlatform { 'ImageSource.gallery is currently the only supported source on Windows'); } final XTypeGroup typeGroup = - XTypeGroup(label: 'videos', extensions: _videoFormats); - final XFile? file = await _fileSelectorInstance + XTypeGroup(label: 'videos', extensions: videoFormats); + final XFile? file = await fileSelectorInstance .openFile(acceptedTypeGroups: [typeGroup]); return file; } @@ -148,8 +155,8 @@ class ImagePickerWindows extends ImagePickerPlatform { int? imageQuality, }) async { final XTypeGroup typeGroup = - XTypeGroup(label: 'images', extensions: _imageFormats); - final List files = await _fileSelectorInstance + XTypeGroup(label: 'images', extensions: imageFormats); + final List files = await fileSelectorInstance .openFiles(acceptedTypeGroups: [typeGroup]); return files; } diff --git a/packages/image_picker/image_picker_windows/pubspec.yaml b/packages/image_picker/image_picker_windows/pubspec.yaml index b342daad2225..eec41f7bfa0d 100644 --- a/packages/image_picker/image_picker_windows/pubspec.yaml +++ b/packages/image_picker/image_picker_windows/pubspec.yaml @@ -23,5 +23,7 @@ dependencies: image_picker_platform_interface: ^2.4.3 dev_dependencies: + build_runner: ^2.1.5 flutter_test: sdk: flutter + mockito: ^5.0.16 diff --git a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart index 5bdc4567d83b..c26ab67daffb 100644 --- a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart +++ b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart @@ -3,29 +3,34 @@ // found in the LICENSE file. import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; -import 'package:file_selector_windows/file_selector_windows.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:image_picker_platform_interface/image_picker_platform_interface.dart'; import 'package:image_picker_windows/image_picker_windows.dart'; +import 'package:mockito/annotations.dart'; +import 'package:mockito/mockito.dart'; +import 'image_picker_windows_test.mocks.dart'; + +@GenerateMocks([FileSelectorPlatform]) void main() { TestWidgetsFlutterBinding.ensureInitialized(); group('$ImagePickerWindows()', () { final ImagePickerWindows plugin = ImagePickerWindows(); - final FileSelectorWindows fileSelectorWindows = FileSelectorWindows(); - - final List log = []; + late MockFileSelectorPlatform mockFileSelectorPlatform; setUp(() { - fileSelectorWindows.channel - .setMockMethodCallHandler((MethodCall methodCall) async { - log.add(methodCall); - return null; - }); + mockFileSelectorPlatform = MockFileSelectorPlatform(); + + when(mockFileSelectorPlatform.openFile( + acceptedTypeGroups: anyNamed('acceptedTypeGroups'))) + .thenAnswer((_) async => null); + + when(mockFileSelectorPlatform.openFiles( + acceptedTypeGroups: anyNamed('acceptedTypeGroups'))) + .thenAnswer((_) async => List.empty()); - log.clear(); + ImagePickerWindows.fileSelectorInstance = mockFileSelectorPlatform; }); test('registered instance', () { @@ -35,152 +40,64 @@ void main() { group('images', () { test('pickImage passes the accepted type groups correctly', () async { - final XTypeGroup group = XTypeGroup( - label: 'images', - extensions: [ - 'jpg', - 'jpeg', - 'png', - 'bmp', - 'webp', - 'gif', - 'tif', - 'tiff', - 'apng' - ]); - await plugin.pickImage(source: ImageSource.gallery); expect( - log, - [ - isMethodCall('openFile', arguments: { - 'acceptedTypeGroups': >[group.toJSON()], - 'initialDirectory': null, - 'confirmButtonText': null, - 'multiple': false, - }), - ], - ); + verify(mockFileSelectorPlatform.openFile( + acceptedTypeGroups: captureAnyNamed('acceptedTypeGroups'))) + .captured + .single[0] + .extensions, + ImagePickerWindows.imageFormats); }); test('getImage passes the accepted type groups correctly', () async { - final XTypeGroup group = XTypeGroup( - label: 'images', - extensions: [ - 'jpg', - 'jpeg', - 'png', - 'bmp', - 'webp', - 'gif', - 'tif', - 'tiff', - 'apng' - ]); - await plugin.getImage(source: ImageSource.gallery); expect( - log, - [ - isMethodCall('openFile', arguments: { - 'acceptedTypeGroups': >[group.toJSON()], - 'initialDirectory': null, - 'confirmButtonText': null, - 'multiple': false, - }), - ], - ); + verify(mockFileSelectorPlatform.openFile( + acceptedTypeGroups: captureAnyNamed('acceptedTypeGroups'))) + .captured + .single[0] + .extensions, + ImagePickerWindows.imageFormats); }); test('getMultiImage passes the accepted type groups correctly', () async { - final XTypeGroup group = XTypeGroup( - label: 'images', - extensions: [ - 'jpg', - 'jpeg', - 'png', - 'bmp', - 'webp', - 'gif', - 'tif', - 'tiff', - 'apng' - ]); - await plugin.getMultiImage(); expect( - log, - [ - isMethodCall('openFile', arguments: { - 'acceptedTypeGroups': >[group.toJSON()], - 'initialDirectory': null, - 'confirmButtonText': null, - 'multiple': true, - }), - ], - ); + verify(mockFileSelectorPlatform.openFiles( + acceptedTypeGroups: captureAnyNamed('acceptedTypeGroups'))) + .captured + .single[0] + .extensions, + ImagePickerWindows.imageFormats); }); }); group('videos', () { test('pickVideo passes the accepted type groups correctly', () async { - final XTypeGroup group = XTypeGroup( - label: 'videos', - extensions: [ - 'mov', - 'wmv', - 'mkv', - 'mp4', - 'webm', - 'avi', - 'mpeg', - 'mpg' - ]); - await plugin.pickVideo(source: ImageSource.gallery); expect( - log, - [ - isMethodCall('openFile', arguments: { - 'acceptedTypeGroups': >[group.toJSON()], - 'initialDirectory': null, - 'confirmButtonText': null, - 'multiple': false, - }), - ], - ); + verify(mockFileSelectorPlatform.openFile( + acceptedTypeGroups: captureAnyNamed('acceptedTypeGroups'))) + .captured + .single[0] + .extensions, + ImagePickerWindows.videoFormats); }); test('getVideo passes the accepted type groups correctly', () async { - final XTypeGroup group = XTypeGroup( - label: 'videos', - extensions: [ - 'mov', - 'wmv', - 'mkv', - 'mp4', - 'webm', - 'avi', - 'mpeg', - 'mpg' - ]); - await plugin.getVideo(source: ImageSource.gallery); expect( - log, - [ - isMethodCall('openFile', arguments: { - 'acceptedTypeGroups': >[group.toJSON()], - 'initialDirectory': null, - 'confirmButtonText': null, - 'multiple': false, - }), - ], - ); + verify(mockFileSelectorPlatform.openFile( + acceptedTypeGroups: captureAnyNamed('acceptedTypeGroups'))) + .captured + .single[0] + .extensions, + ImagePickerWindows.videoFormats); }); }); }); diff --git a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.mocks.dart b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.mocks.dart new file mode 100644 index 000000000000..be2dd2ac5768 --- /dev/null +++ b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.mocks.dart @@ -0,0 +1,78 @@ +// Mocks generated by Mockito 5.1.0 from annotations +// in image_picker_windows/example/windows/flutter/ephemeral/.plugin_symlinks/image_picker_windows/test/image_picker_windows_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i3; + +import 'package:file_selector_platform_interface/file_selector_platform_interface.dart' + as _i2; +import 'package:mockito/mockito.dart' as _i1; + +// ignore_for_file: type=lint +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters +// ignore_for_file: comment_references +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member +// ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis +// ignore_for_file: camel_case_types + +/// A class which mocks [FileSelectorPlatform]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockFileSelectorPlatform extends _i1.Mock + implements _i2.FileSelectorPlatform { + MockFileSelectorPlatform() { + _i1.throwOnMissingStub(this); + } + + @override + _i3.Future<_i2.XFile?> openFile( + {List<_i2.XTypeGroup>? acceptedTypeGroups, + String? initialDirectory, + String? confirmButtonText}) => + (super.noSuchMethod( + Invocation.method(#openFile, [], { + #acceptedTypeGroups: acceptedTypeGroups, + #initialDirectory: initialDirectory, + #confirmButtonText: confirmButtonText + }), + returnValue: Future<_i2.XFile?>.value()) as _i3.Future<_i2.XFile?>); + @override + _i3.Future> openFiles( + {List<_i2.XTypeGroup>? acceptedTypeGroups, + String? initialDirectory, + String? confirmButtonText}) => + (super.noSuchMethod( + Invocation.method(#openFiles, [], { + #acceptedTypeGroups: acceptedTypeGroups, + #initialDirectory: initialDirectory, + #confirmButtonText: confirmButtonText + }), + returnValue: Future>.value(<_i2.XFile>[])) + as _i3.Future>); + @override + _i3.Future getSavePath( + {List<_i2.XTypeGroup>? acceptedTypeGroups, + String? initialDirectory, + String? suggestedName, + String? confirmButtonText}) => + (super.noSuchMethod( + Invocation.method(#getSavePath, [], { + #acceptedTypeGroups: acceptedTypeGroups, + #initialDirectory: initialDirectory, + #suggestedName: suggestedName, + #confirmButtonText: confirmButtonText + }), + returnValue: Future.value()) as _i3.Future); + @override + _i3.Future getDirectoryPath( + {String? initialDirectory, String? confirmButtonText}) => + (super.noSuchMethod( + Invocation.method(#getDirectoryPath, [], { + #initialDirectory: initialDirectory, + #confirmButtonText: confirmButtonText + }), + returnValue: Future.value()) as _i3.Future); +} From d4b7821afd5094d03c09cf32ce8fe1d04aeb13a2 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Fri, 11 Mar 2022 10:27:34 -0800 Subject: [PATCH 11/12] Added tests for unimplemented camera source. --- .../test/image_picker_windows_test.dart | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart index c26ab67daffb..b7d8f567a263 100644 --- a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart +++ b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart @@ -51,6 +51,12 @@ void main() { ImagePickerWindows.imageFormats); }); + test('pickImage throws UnimplementedError when source is camera', + () async { + expect(() async => await plugin.pickImage(source: ImageSource.camera), + throwsA(isA())); + }); + test('getImage passes the accepted type groups correctly', () async { await plugin.getImage(source: ImageSource.gallery); @@ -63,6 +69,12 @@ void main() { ImagePickerWindows.imageFormats); }); + test('getImage throws UnimplementedError when source is camera', + () async { + expect(() async => await plugin.getImage(source: ImageSource.camera), + throwsA(isA())); + }); + test('getMultiImage passes the accepted type groups correctly', () async { await plugin.getMultiImage(); @@ -88,6 +100,12 @@ void main() { ImagePickerWindows.videoFormats); }); + test('pickVideo throws UnimplementedError when source is camera', + () async { + expect(() async => await plugin.pickVideo(source: ImageSource.camera), + throwsA(isA())); + }); + test('getVideo passes the accepted type groups correctly', () async { await plugin.getVideo(source: ImageSource.gallery); @@ -99,6 +117,12 @@ void main() { .extensions, ImagePickerWindows.videoFormats); }); + + test('getVideo throws UnimplementedError when source is camera', + () async { + expect(() async => await plugin.getVideo(source: ImageSource.camera), + throwsA(isA())); + }); }); }); } From c3f46ee73179e28a17924292728f82f3b75cd650 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Mon, 18 Apr 2022 15:46:06 -0700 Subject: [PATCH 12/12] Applied PR feedback. --- .../example/lib/main.dart | 96 ++++++++++--------- .../lib/image_picker_windows.dart | 60 ++++++------ .../test/image_picker_windows_test.dart | 2 +- 3 files changed, 86 insertions(+), 72 deletions(-) diff --git a/packages/image_picker/image_picker_windows/example/lib/main.dart b/packages/image_picker/image_picker_windows/example/lib/main.dart index 4321b67f8239..af97115676c0 100644 --- a/packages/image_picker/image_picker_windows/example/lib/main.dart +++ b/packages/image_picker/image_picker_windows/example/lib/main.dart @@ -38,12 +38,13 @@ class MyHomePage extends StatefulWidget { class _MyHomePageState extends State { List? _imageFileList; + // This must be called from within a setState() callback set _imageFile(PickedFile? value) { _imageFileList = value == null ? null : [value]; } dynamic _pickImageError; - bool isVideo = false; + bool _isVideo = false; VideoPlayerController? _controller; VideoPlayerController? _toBeDisposed; @@ -68,52 +69,61 @@ class _MyHomePageState extends State { } } + Future _handleMultiImagePicked(BuildContext? context) async { + await _displayPickImageDialog(context!, + (double? maxWidth, double? maxHeight, int? quality) async { + try { + final List? pickedFileList = await _picker.pickMultiImage( + maxWidth: maxWidth, + maxHeight: maxHeight, + imageQuality: quality, + ); + setState(() { + _imageFileList = pickedFileList; + }); + } catch (e) { + setState(() { + _pickImageError = e; + }); + } + }); + } + + Future _handleSingleImagePicked( + BuildContext? context, ImageSource source) async { + await _displayPickImageDialog(context!, + (double? maxWidth, double? maxHeight, int? quality) async { + try { + final PickedFile? pickedFile = await _picker.pickImage( + source: source, + maxWidth: maxWidth, + maxHeight: maxHeight, + imageQuality: quality, + ); + setState(() { + _imageFile = pickedFile; + }); + } catch (e) { + setState(() { + _pickImageError = e; + }); + } + }); + } + Future _onImageButtonPressed(ImageSource source, {BuildContext? context, bool isMultiImage = false}) async { if (_controller != null) { await _controller!.setVolume(0.0); } - if (isVideo) { + if (_isVideo) { final PickedFile? file = await _picker.pickVideo( source: source, maxDuration: const Duration(seconds: 10)); await _playVideo(file); } else if (isMultiImage) { - await _displayPickImageDialog(context!, - (double? maxWidth, double? maxHeight, int? quality) async { - try { - final List? pickedFileList = await _picker.pickMultiImage( - maxWidth: maxWidth, - maxHeight: maxHeight, - imageQuality: quality, - ); - setState(() { - _imageFileList = pickedFileList; - }); - } catch (e) { - setState(() { - _pickImageError = e; - }); - } - }); + await _handleMultiImagePicked(context); } else { - await _displayPickImageDialog(context!, - (double? maxWidth, double? maxHeight, int? quality) async { - try { - final PickedFile? pickedFile = await _picker.pickImage( - source: source, - maxWidth: maxWidth, - maxHeight: maxHeight, - imageQuality: quality, - ); - setState(() { - _imageFile = pickedFile; - }); - } catch (e) { - setState(() { - _pickImageError = e; - }); - } - }); + await _handleSingleImagePicked(context, source); } } @@ -192,7 +202,7 @@ class _MyHomePageState extends State { } Widget _handlePreview() { - if (isVideo) { + if (_isVideo) { return _previewVideo(); } else { return _previewImages(); @@ -215,7 +225,7 @@ class _MyHomePageState extends State { label: 'image_picker_example_from_gallery', child: FloatingActionButton( onPressed: () { - isVideo = false; + _isVideo = false; _onImageButtonPressed(ImageSource.gallery, context: context); }, heroTag: 'image0', @@ -227,7 +237,7 @@ class _MyHomePageState extends State { padding: const EdgeInsets.only(top: 16.0), child: FloatingActionButton( onPressed: () { - isVideo = false; + _isVideo = false; _onImageButtonPressed( ImageSource.gallery, context: context, @@ -243,7 +253,7 @@ class _MyHomePageState extends State { padding: const EdgeInsets.only(top: 16.0), child: FloatingActionButton( onPressed: () { - isVideo = false; + _isVideo = false; _onImageButtonPressed(ImageSource.camera, context: context); }, heroTag: 'image2', @@ -256,7 +266,7 @@ class _MyHomePageState extends State { child: FloatingActionButton( backgroundColor: Colors.red, onPressed: () { - isVideo = true; + _isVideo = true; _onImageButtonPressed(ImageSource.gallery); }, heroTag: 'video0', @@ -269,7 +279,7 @@ class _MyHomePageState extends State { child: FloatingActionButton( backgroundColor: Colors.red, onPressed: () { - isVideo = true; + _isVideo = true; _onImageButtonPressed(ImageSource.camera); }, heroTag: 'video1', diff --git a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart index 6f3416f03bb6..9bd26c471b4e 100644 --- a/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart +++ b/packages/image_picker/image_picker_windows/lib/image_picker_windows.dart @@ -44,20 +44,20 @@ class ImagePickerWindows extends ImagePickerPlatform { 'mpg' ]; - /// The FileSelectorPlatform used by the ImagePickerWindows. + /// The file selector used to prompt the user to select images or videos. @visibleForTesting - static late FileSelectorPlatform fileSelectorInstance = FileSelectorWindows(); + static late FileSelectorPlatform fileSelector = FileSelectorWindows(); /// Registers this class as the default instance of [ImagePickerPlatform]. static void registerWith() { ImagePickerPlatform.instance = ImagePickerWindows(); } - // Note that the `maxWidth`, `maxHeight`, `imageQuality` - // and `preferredCameraDevice` arguments are not supported on Windows. - // If any of these arguments is supplied, it'll be silently ignored - // by the Windows version of the plugin. `source` is not implemented - // for `ImageSource.camera` and will throw an exception. + // `maxWidth`, `maxHeight`, `imageQuality` and `preferredCameraDevice` + // arguments are not supported on Windows. If any of these arguments + // is supplied, it'll be silently ignored by the Windows version of + // the plugin. `source` is not implemented for `ImageSource.camera` + // and will throw an exception. @override Future pickImage({ required ImageSource source, @@ -78,11 +78,11 @@ class ImagePickerWindows extends ImagePickerPlatform { return null; } - // Note that the `preferredCameraDevice` and `maxDuration` - // arguments are not supported on Windows. If any of these arguments is - // supplied, it'll be silently ignored by the Windows version of the - // plugin. `source` is not implemented for `ImageSource.camera` and - // will throw an exception. + // `preferredCameraDevice` and `maxDuration` arguments are not + // supported on Windows. If any of these arguments is supplied, + // it'll be silently ignored by the Windows version of the plugin. + // `source` is not implemented for `ImageSource.camera` and will + // throw an exception. @override Future pickVideo({ required ImageSource source, @@ -99,11 +99,11 @@ class ImagePickerWindows extends ImagePickerPlatform { return null; } - // Note that the `maxWidth`, `maxHeight`, `imageQuality`, and - // `preferredCameraDevice` arguments are not supported on Windows. If - // any of these arguments is supplied, it'll be silently ignored by the - // Windows version of the plugin. `source` is not implemented for - // `ImageSource.camera` and will throw an exception. + // `maxWidth`, `maxHeight`, `imageQuality`, and `preferredCameraDevice` + // arguments are not supported on Windows. If any of these arguments + // is supplied, it'll be silently ignored by the Windows version + // of the plugin. `source` is not implemented for `ImageSource.camera` + // and will throw an exception. @override Future getImage({ required ImageSource source, @@ -113,21 +113,23 @@ class ImagePickerWindows extends ImagePickerPlatform { CameraDevice preferredCameraDevice = CameraDevice.rear, }) async { if (source != ImageSource.gallery) { + // TODO(azchohfi): Support ImageSource.camera. + // See https://github.com/flutter/flutter/issues/102115 throw UnimplementedError( 'ImageSource.gallery is currently the only supported source on Windows'); } final XTypeGroup typeGroup = XTypeGroup(label: 'images', extensions: imageFormats); - final XFile? file = await fileSelectorInstance + final XFile? file = await fileSelector .openFile(acceptedTypeGroups: [typeGroup]); return file; } - // Note that the `preferredCameraDevice` and `maxDuration` - // arguments are not supported on Windows. If any of these arguments - // is supplied, it'll be silently ignored by the Windows version of - // the plugin. `source` is not implemented for `ImageSource.camera` - // and will throw an exception. + // `preferredCameraDevice` and `maxDuration` arguments are not + // supported on Windows. If any of these arguments is supplied, + // it'll be silently ignored by the Windows version of the plugin. + // `source` is not implemented for `ImageSource.camera` and will + // throw an exception. @override Future getVideo({ required ImageSource source, @@ -135,19 +137,21 @@ class ImagePickerWindows extends ImagePickerPlatform { Duration? maxDuration, }) async { if (source != ImageSource.gallery) { + // TODO(azchohfi): Support ImageSource.camera. + // See https://github.com/flutter/flutter/issues/102115 throw UnimplementedError( 'ImageSource.gallery is currently the only supported source on Windows'); } final XTypeGroup typeGroup = XTypeGroup(label: 'videos', extensions: videoFormats); - final XFile? file = await fileSelectorInstance + final XFile? file = await fileSelector .openFile(acceptedTypeGroups: [typeGroup]); return file; } - // Note that the `maxWidth`, `maxHeight`, and `imageQuality` arguments are - // not supported on Windows. If any of these arguments is supplied, it'll - // be silently ignored by the Windows version of the plugin. + // `maxWidth`, `maxHeight`, and `imageQuality` arguments are not + // supported on Windows. If any of these arguments is supplied, + // it'll be silently ignored by the Windows version of the plugin. @override Future> getMultiImage({ double? maxWidth, @@ -156,7 +160,7 @@ class ImagePickerWindows extends ImagePickerPlatform { }) async { final XTypeGroup typeGroup = XTypeGroup(label: 'images', extensions: imageFormats); - final List files = await fileSelectorInstance + final List files = await fileSelector .openFiles(acceptedTypeGroups: [typeGroup]); return files; } diff --git a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart index b7d8f567a263..c3df2d80679f 100644 --- a/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart +++ b/packages/image_picker/image_picker_windows/test/image_picker_windows_test.dart @@ -30,7 +30,7 @@ void main() { acceptedTypeGroups: anyNamed('acceptedTypeGroups'))) .thenAnswer((_) async => List.empty()); - ImagePickerWindows.fileSelectorInstance = mockFileSelectorPlatform; + ImagePickerWindows.fileSelector = mockFileSelectorPlatform; }); test('registered instance', () {