From 9c02a0fa09e4e6258fc6ff1aab97c9cb3a6aebfe Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Fri, 4 Feb 2022 08:33:53 +1000 Subject: [PATCH] Migrate `desktop_photo_search` to top level (#1002) --- desktop_photo_search/README.md | 8 + .../fluent_ui}/.gitignore | 13 +- .../fluent_ui}/.metadata | 4 +- desktop_photo_search/fluent_ui/README.md | 66 ++ .../fluent_ui}/analysis_options.yaml | 0 desktop_photo_search/fluent_ui/lib/main.dart | 99 +++ .../lib/src/model/photo_search_model.dart | 0 .../fluent_ui}/lib/src/model/search.dart | 0 .../fluent_ui}/lib/src/model/search.g.dart | 4 +- .../fluent_ui}/lib/src/serializers.dart | 0 .../fluent_ui}/lib/src/serializers.g.dart | 2 +- .../lib/src/unsplash/api_error.dart | 0 .../lib/src/unsplash/api_error.g.dart | 4 +- .../unsplash/current_user_collections.dart | 0 .../unsplash/current_user_collections.g.dart | 8 +- .../fluent_ui}/lib/src/unsplash/exif.dart | 0 .../fluent_ui}/lib/src/unsplash/exif.g.dart | 14 +- .../fluent_ui}/lib/src/unsplash/links.dart | 0 .../fluent_ui}/lib/src/unsplash/links.g.dart | 10 +- .../fluent_ui}/lib/src/unsplash/location.dart | 0 .../lib/src/unsplash/location.g.dart | 6 +- .../fluent_ui}/lib/src/unsplash/photo.dart | 0 .../fluent_ui}/lib/src/unsplash/photo.g.dart | 24 +- .../fluent_ui}/lib/src/unsplash/position.dart | 0 .../lib/src/unsplash/position.g.dart | 2 +- .../src/unsplash/search_photos_response.dart | 0 .../unsplash/search_photos_response.g.dart | 8 +- .../fluent_ui}/lib/src/unsplash/tags.dart | 0 .../fluent_ui}/lib/src/unsplash/tags.g.dart | 2 +- .../fluent_ui}/lib/src/unsplash/unsplash.dart | 0 .../fluent_ui}/lib/src/unsplash/urls.dart | 0 .../fluent_ui}/lib/src/unsplash/urls.g.dart | 12 +- .../fluent_ui}/lib/src/unsplash/user.dart | 0 .../fluent_ui}/lib/src/unsplash/user.g.dart | 16 +- .../lib/src/widgets/photo_details.dart | 116 +++ .../lib/src/widgets/photo_search_dialog.dart | 67 ++ .../lib/src/widgets/policy_dialog.dart | 74 ++ .../fluent_ui}/lib/src/widgets/split.dart | 0 .../lib/src/widgets/unsplash_notice.dart | 106 +++ .../src/widgets/unsplash_search_content.dart | 99 +++ .../fluent_ui}/lib/unsplash_access_key.dart | 0 .../fluent_ui}/linux/.gitignore | 0 .../fluent_ui}/linux/CMakeLists.txt | 0 .../fluent_ui}/linux/flutter/CMakeLists.txt | 0 .../flutter/generated_plugin_registrant.cc | 0 .../flutter/generated_plugin_registrant.h | 0 .../linux/flutter/generated_plugins.cmake | 0 .../fluent_ui}/linux/main.cc | 0 .../fluent_ui}/linux/my_application.cc | 0 .../fluent_ui}/linux/my_application.h | 0 .../fluent_ui}/macos/.gitignore | 0 .../macos/Flutter/Flutter-Debug.xcconfig | 0 .../macos/Flutter/Flutter-Release.xcconfig | 0 .../Flutter/GeneratedPluginRegistrant.swift | 0 .../fluent_ui}/macos/Podfile | 0 .../fluent_ui}/macos/Podfile.lock | 0 .../macos/Runner.xcodeproj/project.pbxproj | 632 +++++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 8 +- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../fluent_ui}/macos/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/app_icon_1024.png | Bin .../AppIcon.appiconset/app_icon_128.png | Bin .../AppIcon.appiconset/app_icon_16.png | Bin .../AppIcon.appiconset/app_icon_256.png | Bin .../AppIcon.appiconset/app_icon_32.png | Bin .../AppIcon.appiconset/app_icon_512.png | Bin .../AppIcon.appiconset/app_icon_64.png | Bin .../macos/Runner/Base.lproj/MainMenu.xib | 343 +++++++++ .../macos/Runner/Configs/AppInfo.xcconfig | 0 .../macos/Runner/Configs/Debug.xcconfig | 0 .../macos/Runner/Configs/Release.xcconfig | 0 .../macos/Runner/Configs/Warnings.xcconfig | 0 .../macos/Runner/DebugProfile.entitlements | 0 .../fluent_ui}/macos/Runner/Info.plist | 0 .../macos/Runner/MainFlutterWindow.swift | 0 .../macos/Runner/Release.entitlements | 0 desktop_photo_search/fluent_ui/pubspec.lock | 721 ++++++++++++++++++ desktop_photo_search/fluent_ui/pubspec.yaml | 55 ++ .../fluent_ui}/test/unsplash_test.dart | 0 .../fluent_ui}/test/widget_test.dart | 0 .../fluent_ui}/tool/grind.dart | 0 .../fluent_ui}/windows/.gitignore | 0 .../fluent_ui}/windows/CMakeLists.txt | 2 +- .../fluent_ui}/windows/flutter/CMakeLists.txt | 2 +- .../flutter/generated_plugin_registrant.cc | 6 +- .../flutter/generated_plugin_registrant.h | 0 .../windows/flutter/generated_plugins.cmake | 0 .../fluent_ui}/windows/runner/CMakeLists.txt | 2 +- .../fluent_ui}/windows/runner/Runner.rc | 2 +- .../windows/runner/flutter_window.cpp | 0 .../windows/runner/flutter_window.h | 0 .../fluent_ui}/windows/runner/main.cpp | 2 +- .../fluent_ui}/windows/runner/resource.h | 0 .../windows/runner/resources/app_icon.ico | Bin .../windows/runner/runner.exe.manifest | 0 .../fluent_ui}/windows/runner/utils.cpp | 0 .../fluent_ui}/windows/runner/utils.h | 0 .../windows/runner/win32_window.cpp | 0 .../fluent_ui}/windows/runner/win32_window.h | 0 desktop_photo_search/material/.gitignore | 46 ++ desktop_photo_search/material/.metadata | 10 + desktop_photo_search/material/README.md | 64 ++ .../material/analysis_options.yaml | 1 + desktop_photo_search/material/lib/main.dart | 113 +++ .../lib/src/model/photo_search_model.dart | 51 ++ .../material/lib/src/model/search.dart | 36 + .../material/lib/src/model/search.g.dart | 166 ++++ .../material/lib/src/serializers.dart | 27 + .../material/lib/src/serializers.g.dart | 44 ++ .../material/lib/src/unsplash/api_error.dart | 33 + .../lib/src/unsplash/api_error.g.dart | 146 ++++ .../unsplash/current_user_collections.dart | 46 ++ .../unsplash/current_user_collections.g.dart | 210 +++++ .../material/lib/src/unsplash/exif.dart | 47 ++ .../material/lib/src/unsplash/exif.g.dart | 251 ++++++ .../material/lib/src/unsplash/links.dart | 41 + .../material/lib/src/unsplash/links.g.dart | 200 +++++ .../material/lib/src/unsplash/location.dart | 39 + .../material/lib/src/unsplash/location.g.dart | 187 +++++ .../material/lib/src/unsplash/photo.dart | 88 +++ .../material/lib/src/unsplash/photo.g.dart | 553 ++++++++++++++ .../material/lib/src/unsplash/position.dart | 35 + .../material/lib/src/unsplash/position.g.dart | 152 ++++ .../src/unsplash/search_photos_response.dart | 45 ++ .../unsplash/search_photos_response.g.dart | 201 +++++ .../material/lib/src/unsplash/tags.dart | 32 + .../material/lib/src/unsplash/tags.g.dart | 131 ++++ .../material/lib/src/unsplash/unsplash.dart | 118 +++ .../material/lib/src/unsplash/urls.dart | 44 ++ .../material/lib/src/unsplash/urls.g.dart | 217 ++++++ .../material/lib/src/unsplash/user.dart | 63 ++ .../material/lib/src/unsplash/user.g.dart | 377 +++++++++ .../lib/src/widgets/photo_details.dart | 0 .../lib/src/widgets/photo_search_dialog.dart | 4 +- .../lib/src/widgets/policy_dialog.dart | 74 ++ .../material/lib/src/widgets/split.dart | 190 +++++ .../lib/src/widgets/unsplash_notice.dart | 107 +++ .../src/widgets/unsplash_search_content.dart | 105 +++ .../material/lib/unsplash_access_key.dart | 9 + .../material/linux/.gitignore | 1 + .../material/linux/CMakeLists.txt | 116 +++ .../material/linux/flutter/CMakeLists.txt | 87 +++ .../flutter/generated_plugin_registrant.cc | 23 + .../flutter/generated_plugin_registrant.h | 15 + .../linux/flutter/generated_plugins.cmake | 18 + desktop_photo_search/material/linux/main.cc | 6 + .../material/linux/my_application.cc | 104 +++ .../material/linux/my_application.h | 18 + .../material/macos/.gitignore | 7 + .../macos/Flutter/Flutter-Debug.xcconfig | 2 + .../macos/Flutter/Flutter-Release.xcconfig | 2 + .../Flutter/GeneratedPluginRegistrant.swift | 16 + desktop_photo_search/material/macos/Podfile | 40 + .../material/macos/Podfile.lock | 34 + .../macos/Runner.xcodeproj/project.pbxproj | 66 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 87 +++ .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../material/macos/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 68 ++ .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 46993 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 3276 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 1429 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 5933 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1243 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 14800 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 1874 bytes .../macos/Runner/Base.lproj/MainMenu.xib | 15 +- .../macos/Runner/Configs/AppInfo.xcconfig | 14 + .../macos/Runner/Configs/Debug.xcconfig | 2 + .../macos/Runner/Configs/Release.xcconfig | 2 + .../macos/Runner/Configs/Warnings.xcconfig | 13 + .../macos/Runner/DebugProfile.entitlements | 16 + .../material/macos/Runner/Info.plist | 32 + .../macos/Runner/MainFlutterWindow.swift | 19 + .../macos/Runner/Release.entitlements | 12 + .../material}/pubspec.lock | 66 +- .../material}/pubspec.yaml | 45 +- .../material/test/unsplash_test.dart | 536 +++++++++++++ .../material/test/widget_test.dart | 134 ++++ desktop_photo_search/material/tool/grind.dart | 72 ++ .../material/windows/.gitignore | 17 + .../material/windows/CMakeLists.txt | 95 +++ .../material/windows/flutter/CMakeLists.txt | 103 +++ .../flutter/generated_plugin_registrant.cc | 20 + .../flutter/generated_plugin_registrant.h | 15 + .../windows/flutter/generated_plugins.cmake | 18 + .../material/windows/runner/CMakeLists.txt | 17 + .../material/windows/runner/Runner.rc | 121 +++ .../windows/runner/flutter_window.cpp | 61 ++ .../material/windows/runner/flutter_window.h | 33 + .../material/windows/runner/main.cpp | 43 ++ .../material/windows/runner/resource.h | 16 + .../windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes .../windows/runner/runner.exe.manifest | 20 + .../material/windows/runner/utils.cpp | 64 ++ .../material/windows/runner/utils.h | 19 + .../material/windows/runner/win32_window.cpp | 245 ++++++ .../material/windows/runner/win32_window.h | 98 +++ experimental/desktop_photo_search/README.md | 73 +- .../desktop_photo_search/lib/main.dart | 188 ----- .../lib/src/widgets/about_dialog.dart | 102 --- tool/flutter_ci_script_beta.sh | 3 +- tool/flutter_ci_script_stable.sh | 3 +- 208 files changed, 9408 insertions(+), 535 deletions(-) create mode 100644 desktop_photo_search/README.md rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/.gitignore (70%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/.metadata (76%) create mode 100644 desktop_photo_search/fluent_ui/README.md rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/analysis_options.yaml (100%) create mode 100644 desktop_photo_search/fluent_ui/lib/main.dart rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/model/photo_search_model.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/model/search.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/model/search.g.dart (93%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/serializers.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/serializers.g.dart (86%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/api_error.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/api_error.g.dart (92%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/current_user_collections.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/current_user_collections.g.dart (92%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/exif.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/exif.g.dart (90%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/links.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/links.g.dart (90%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/location.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/location.g.dart (92%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/photo.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/photo.g.dart (94%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/position.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/position.g.dart (94%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/search_photos_response.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/search_photos_response.g.dart (93%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/tags.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/tags.g.dart (92%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/unsplash.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/urls.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/urls.g.dart (90%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/user.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/unsplash/user.g.dart (93%) create mode 100644 desktop_photo_search/fluent_ui/lib/src/widgets/photo_details.dart create mode 100644 desktop_photo_search/fluent_ui/lib/src/widgets/photo_search_dialog.dart create mode 100644 desktop_photo_search/fluent_ui/lib/src/widgets/policy_dialog.dart rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/src/widgets/split.dart (100%) create mode 100644 desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_notice.dart create mode 100644 desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_search_content.dart rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/lib/unsplash_access_key.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/.gitignore (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/CMakeLists.txt (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/flutter/CMakeLists.txt (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/flutter/generated_plugin_registrant.cc (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/flutter/generated_plugin_registrant.h (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/flutter/generated_plugins.cmake (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/main.cc (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/my_application.cc (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/linux/my_application.h (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/.gitignore (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Flutter/Flutter-Debug.xcconfig (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Flutter/Flutter-Release.xcconfig (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Flutter/GeneratedPluginRegistrant.swift (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Podfile (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Podfile.lock (100%) create mode 100644 desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (95%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner.xcworkspace/contents.xcworkspacedata (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/AppDelegate.swift (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png (100%) create mode 100644 desktop_photo_search/fluent_ui/macos/Runner/Base.lproj/MainMenu.xib rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Configs/AppInfo.xcconfig (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Configs/Debug.xcconfig (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Configs/Release.xcconfig (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Configs/Warnings.xcconfig (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/DebugProfile.entitlements (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Info.plist (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/MainFlutterWindow.swift (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/macos/Runner/Release.entitlements (100%) create mode 100644 desktop_photo_search/fluent_ui/pubspec.lock create mode 100644 desktop_photo_search/fluent_ui/pubspec.yaml rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/test/unsplash_test.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/test/widget_test.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/tool/grind.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/.gitignore (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/CMakeLists.txt (98%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/flutter/CMakeLists.txt (98%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/flutter/generated_plugin_registrant.cc (73%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/flutter/generated_plugin_registrant.h (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/flutter/generated_plugins.cmake (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/CMakeLists.txt (93%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/Runner.rc (97%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/flutter_window.cpp (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/flutter_window.h (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/main.cpp (94%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/resource.h (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/resources/app_icon.ico (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/runner.exe.manifest (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/utils.cpp (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/utils.h (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/win32_window.cpp (100%) rename {experimental/desktop_photo_search => desktop_photo_search/fluent_ui}/windows/runner/win32_window.h (100%) create mode 100644 desktop_photo_search/material/.gitignore create mode 100644 desktop_photo_search/material/.metadata create mode 100644 desktop_photo_search/material/README.md create mode 100644 desktop_photo_search/material/analysis_options.yaml create mode 100644 desktop_photo_search/material/lib/main.dart create mode 100644 desktop_photo_search/material/lib/src/model/photo_search_model.dart create mode 100644 desktop_photo_search/material/lib/src/model/search.dart create mode 100644 desktop_photo_search/material/lib/src/model/search.g.dart create mode 100644 desktop_photo_search/material/lib/src/serializers.dart create mode 100644 desktop_photo_search/material/lib/src/serializers.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/api_error.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/api_error.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/current_user_collections.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/current_user_collections.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/exif.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/exif.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/links.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/links.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/location.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/location.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/photo.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/photo.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/position.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/position.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/search_photos_response.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/search_photos_response.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/tags.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/tags.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/unsplash.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/urls.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/urls.g.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/user.dart create mode 100644 desktop_photo_search/material/lib/src/unsplash/user.g.dart rename {experimental/desktop_photo_search => desktop_photo_search/material}/lib/src/widgets/photo_details.dart (100%) rename {experimental/desktop_photo_search => desktop_photo_search/material}/lib/src/widgets/photo_search_dialog.dart (94%) create mode 100644 desktop_photo_search/material/lib/src/widgets/policy_dialog.dart create mode 100644 desktop_photo_search/material/lib/src/widgets/split.dart create mode 100644 desktop_photo_search/material/lib/src/widgets/unsplash_notice.dart create mode 100644 desktop_photo_search/material/lib/src/widgets/unsplash_search_content.dart create mode 100644 desktop_photo_search/material/lib/unsplash_access_key.dart create mode 100644 desktop_photo_search/material/linux/.gitignore create mode 100644 desktop_photo_search/material/linux/CMakeLists.txt create mode 100644 desktop_photo_search/material/linux/flutter/CMakeLists.txt create mode 100644 desktop_photo_search/material/linux/flutter/generated_plugin_registrant.cc create mode 100644 desktop_photo_search/material/linux/flutter/generated_plugin_registrant.h create mode 100644 desktop_photo_search/material/linux/flutter/generated_plugins.cmake create mode 100644 desktop_photo_search/material/linux/main.cc create mode 100644 desktop_photo_search/material/linux/my_application.cc create mode 100644 desktop_photo_search/material/linux/my_application.h create mode 100644 desktop_photo_search/material/macos/.gitignore create mode 100644 desktop_photo_search/material/macos/Flutter/Flutter-Debug.xcconfig create mode 100644 desktop_photo_search/material/macos/Flutter/Flutter-Release.xcconfig create mode 100644 desktop_photo_search/material/macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 desktop_photo_search/material/macos/Podfile create mode 100644 desktop_photo_search/material/macos/Podfile.lock rename {experimental/desktop_photo_search => desktop_photo_search/material}/macos/Runner.xcodeproj/project.pbxproj (95%) create mode 100644 desktop_photo_search/material/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 desktop_photo_search/material/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 desktop_photo_search/material/macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 desktop_photo_search/material/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 desktop_photo_search/material/macos/Runner/AppDelegate.swift create mode 100644 desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename {experimental/desktop_photo_search => desktop_photo_search/material}/macos/Runner/Base.lproj/MainMenu.xib (97%) create mode 100644 desktop_photo_search/material/macos/Runner/Configs/AppInfo.xcconfig create mode 100644 desktop_photo_search/material/macos/Runner/Configs/Debug.xcconfig create mode 100644 desktop_photo_search/material/macos/Runner/Configs/Release.xcconfig create mode 100644 desktop_photo_search/material/macos/Runner/Configs/Warnings.xcconfig create mode 100644 desktop_photo_search/material/macos/Runner/DebugProfile.entitlements create mode 100644 desktop_photo_search/material/macos/Runner/Info.plist create mode 100644 desktop_photo_search/material/macos/Runner/MainFlutterWindow.swift create mode 100644 desktop_photo_search/material/macos/Runner/Release.entitlements rename {experimental/desktop_photo_search => desktop_photo_search/material}/pubspec.lock (95%) rename {experimental/desktop_photo_search => desktop_photo_search/material}/pubspec.yaml (65%) create mode 100644 desktop_photo_search/material/test/unsplash_test.dart create mode 100644 desktop_photo_search/material/test/widget_test.dart create mode 100644 desktop_photo_search/material/tool/grind.dart create mode 100644 desktop_photo_search/material/windows/.gitignore create mode 100644 desktop_photo_search/material/windows/CMakeLists.txt create mode 100644 desktop_photo_search/material/windows/flutter/CMakeLists.txt create mode 100644 desktop_photo_search/material/windows/flutter/generated_plugin_registrant.cc create mode 100644 desktop_photo_search/material/windows/flutter/generated_plugin_registrant.h create mode 100644 desktop_photo_search/material/windows/flutter/generated_plugins.cmake create mode 100644 desktop_photo_search/material/windows/runner/CMakeLists.txt create mode 100644 desktop_photo_search/material/windows/runner/Runner.rc create mode 100644 desktop_photo_search/material/windows/runner/flutter_window.cpp create mode 100644 desktop_photo_search/material/windows/runner/flutter_window.h create mode 100644 desktop_photo_search/material/windows/runner/main.cpp create mode 100644 desktop_photo_search/material/windows/runner/resource.h create mode 100644 desktop_photo_search/material/windows/runner/resources/app_icon.ico create mode 100644 desktop_photo_search/material/windows/runner/runner.exe.manifest create mode 100644 desktop_photo_search/material/windows/runner/utils.cpp create mode 100644 desktop_photo_search/material/windows/runner/utils.h create mode 100644 desktop_photo_search/material/windows/runner/win32_window.cpp create mode 100644 desktop_photo_search/material/windows/runner/win32_window.h delete mode 100644 experimental/desktop_photo_search/lib/main.dart delete mode 100644 experimental/desktop_photo_search/lib/src/widgets/about_dialog.dart diff --git a/desktop_photo_search/README.md b/desktop_photo_search/README.md new file mode 100644 index 000000000..772c0dda2 --- /dev/null +++ b/desktop_photo_search/README.md @@ -0,0 +1,8 @@ +# Photo Search app + +This is the Photo Search app, built out with two different widget sets: + + - [Material](material) shows the Photo Search app built with Material widgets + - [Fluent UI](fluent_ui) shows the Photo Search app built with [Fluent UI][] widgets + +[Fluent UI]: https://pub.dev/packages/fluent_ui \ No newline at end of file diff --git a/experimental/desktop_photo_search/.gitignore b/desktop_photo_search/fluent_ui/.gitignore similarity index 70% rename from experimental/desktop_photo_search/.gitignore rename to desktop_photo_search/fluent_ui/.gitignore index ae1f1838e..0fa6b675c 100644 --- a/experimental/desktop_photo_search/.gitignore +++ b/desktop_photo_search/fluent_ui/.gitignore @@ -22,6 +22,7 @@ # Flutter/Dart/Pub related **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ .flutter-plugins .flutter-plugins-dependencies @@ -33,5 +34,13 @@ # Web related lib/generated_plugin_registrant.dart -# Exceptions to above rules. -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/experimental/desktop_photo_search/.metadata b/desktop_photo_search/fluent_ui/.metadata similarity index 76% rename from experimental/desktop_photo_search/.metadata rename to desktop_photo_search/fluent_ui/.metadata index 8e43fa5f6..356d05d6d 100644 --- a/experimental/desktop_photo_search/.metadata +++ b/desktop_photo_search/fluent_ui/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 7caef218b55acac803aa67e7393e97f75ec70c5c - channel: master + revision: fdd0af78bbda27e1084ec859b27765d927cbe27e + channel: beta project_type: app diff --git a/desktop_photo_search/fluent_ui/README.md b/desktop_photo_search/fluent_ui/README.md new file mode 100644 index 000000000..cc0a13240 --- /dev/null +++ b/desktop_photo_search/fluent_ui/README.md @@ -0,0 +1,66 @@ +# Photo Search app + +This desktop application enables you to search +[Unsplash](https://unsplash.com/) for photographs that interest you. +To use it, you need to add an **Access Key** from +[Unsplash API](https://unsplash.com/developers) to +`lib/unsplash_access_key.dart`. + +This sample works on Windows, macOS and Linux. + +## A quick tour of the code + +This Flutter project builds a desktop application. It utilises the following +desktop specific plugins: + + - [fluent_ui] for the Fluent UI widget set + - [file_chooser] to enable the application user to select where to save a photo + from the Unsplash API. + - [menubar] for exposing Image Search functionality through the menu bar. + - [url_launcher] to open external links. + +The Unsplash API client entry point is in the [Unsplash] class, and is built +atop [http], [built_value] and [built_collection] for JSON Rest API access. + +## Deploying to the Microsoft Store + +This sample uses Yehuda Kremer's [MSIX pub package] to bundle up the Windows +release build for distribution to the [Microsoft Store]. Microsoft maintains +a [plethora of documentation][ms_store_publishing_doc] on deploying to the +Microsoft Store. + +See the `msix_config` stanza in this sample's `pubspec.yaml` for an +example configuration. Make sure the `display_name`, `publisher_display_name`, +`publisher` and `identity_name` attributes match the settings in your +Microsoft Partner Center application submission. + +## macOS Network and File entitlements + +To access the network, macOS requires applications enable the +[com.apple.security.network.client entitlement][macOS-client]. For this +sample, this entitlement is required to access the Unsplash API. + +Likewise, to save a Photo to the local file system using the `file_chooser` plugin requires the +[com.apple.security.files.user-selected.read-write entitlement][macOS-read-write]. + +Please see [macOS Signing and Security][macOS-security] for more detail. + + +[Unsplash]: lib/src/unsplash/unsplash.dart + +[built_collection]: https://pub.dev/packages/built_collection +[built_value]: https://pub.dev/packages/built_value +[file_chooser]: https://github.com/google/flutter-desktop-embedding/tree/master/plugins/file_chooser +[fluent_ui]: https://pub.dev/packages/fluent_ui +[flutter_channels]: https://github.com/flutter/flutter/wiki/Flutter-build-release-channels +[http]: https://pub.dev/packages/http +[macOS-client]: https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_network_client +[macOS-read-write]: https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_files_user-selected_read-write +[macOS-security]: https://github.com/google/flutter-desktop-embedding/blob/master/macOS-Security.md +[menubar]: https://github.com/google/flutter-desktop-embedding/tree/master/plugins/menubar +[setup documentation]: https://flutter.dev/desktop#set-up +[url_launcher]: https://pub.dev/packages/url_launcher + +[MSIX pub package]: https://pub.dev/packages/msix +[Microsoft Store]: https://www.microsoft.com/en-au/p/flutter-desktop-photo-search/9nh719dxcpj4 +[ms_store_publishing_doc]: https://docs.microsoft.com/en-us/windows/uwp/publish/ diff --git a/experimental/desktop_photo_search/analysis_options.yaml b/desktop_photo_search/fluent_ui/analysis_options.yaml similarity index 100% rename from experimental/desktop_photo_search/analysis_options.yaml rename to desktop_photo_search/fluent_ui/analysis_options.yaml diff --git a/desktop_photo_search/fluent_ui/lib/main.dart b/desktop_photo_search/fluent_ui/lib/main.dart new file mode 100644 index 000000000..5d5b70c49 --- /dev/null +++ b/desktop_photo_search/fluent_ui/lib/main.dart @@ -0,0 +1,99 @@ +// Copyright 2019 The Flutter team. 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:io'; + +import 'package:fluent_ui/fluent_ui.dart'; +import 'package:logging/logging.dart'; +import 'package:menubar/menubar.dart' as menubar; +import 'package:provider/provider.dart'; + +import 'src/model/photo_search_model.dart'; +import 'src/unsplash/unsplash.dart'; +import 'src/widgets/photo_search_dialog.dart'; +import 'src/widgets/policy_dialog.dart'; +import 'src/widgets/unsplash_notice.dart'; +import 'src/widgets/unsplash_search_content.dart'; +import 'unsplash_access_key.dart'; + +void main() { + Logger.root.level = Level.ALL; + Logger.root.onRecord.listen((rec) { + // ignore: avoid_print + print('${rec.loggerName} ${rec.level.name}: ${rec.time}: ${rec.message}'); + }); + + if (unsplashAccessKey.isEmpty) { + Logger('main').severe('Unsplash Access Key is required. ' + 'Please add to `lib/unsplash_access_key.dart`.'); + exit(1); + } + + runApp( + ChangeNotifierProvider( + create: (context) => PhotoSearchModel( + Unsplash(accessKey: unsplashAccessKey), + ), + child: const UnsplashSearchApp(), + ), + ); +} + +class UnsplashSearchApp extends StatelessWidget { + const UnsplashSearchApp({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return const FluentApp( + title: 'Photo Search', + home: UnsplashHomePage(title: 'Photo Search'), + ); + } +} + +class UnsplashHomePage extends StatelessWidget { + const UnsplashHomePage({required this.title, Key? key}) : super(key: key); + final String title; + + @override + Widget build(BuildContext context) { + final photoSearchModel = Provider.of(context); + menubar.setApplicationMenu([ + menubar.Submenu(label: 'Search', children: [ + menubar.MenuItem( + label: 'Search...', + onClicked: () { + showDialog( + context: context, + builder: (context) => + PhotoSearchDialog(callback: photoSearchModel.addSearch), + ); + }, + ), + ]), + menubar.Submenu(label: 'About', children: [ + menubar.MenuItem( + label: 'About...', + onClicked: () { + showDialog( + context: context, + builder: (context) => const PolicyDialog(), + ); + }, + ), + ]) + ]); + + return UnsplashNotice( + child: Container( + color: Colors.white, + child: photoSearchModel.entries.isNotEmpty + ? const UnsplashSearchContent() + : const Center( + child: Text('Search for Photos using the Search menu'), + ), + ), + ); + } +} diff --git a/experimental/desktop_photo_search/lib/src/model/photo_search_model.dart b/desktop_photo_search/fluent_ui/lib/src/model/photo_search_model.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/model/photo_search_model.dart rename to desktop_photo_search/fluent_ui/lib/src/model/photo_search_model.dart diff --git a/experimental/desktop_photo_search/lib/src/model/search.dart b/desktop_photo_search/fluent_ui/lib/src/model/search.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/model/search.dart rename to desktop_photo_search/fluent_ui/lib/src/model/search.dart diff --git a/experimental/desktop_photo_search/lib/src/model/search.g.dart b/desktop_photo_search/fluent_ui/lib/src/model/search.g.dart similarity index 93% rename from experimental/desktop_photo_search/lib/src/model/search.g.dart rename to desktop_photo_search/fluent_ui/lib/src/model/search.g.dart index ae59f2871..37172fcf0 100644 --- a/experimental/desktop_photo_search/lib/src/model/search.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/model/search.g.dart @@ -53,7 +53,7 @@ class _$SearchSerializer implements StructuredSerializer { result.results.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltList, const [const FullType(Photo)]))! - as BuiltList); + as BuiltList); break; } } @@ -163,4 +163,4 @@ class SearchBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/serializers.dart b/desktop_photo_search/fluent_ui/lib/src/serializers.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/serializers.dart rename to desktop_photo_search/fluent_ui/lib/src/serializers.dart diff --git a/experimental/desktop_photo_search/lib/src/serializers.g.dart b/desktop_photo_search/fluent_ui/lib/src/serializers.g.dart similarity index 86% rename from experimental/desktop_photo_search/lib/src/serializers.g.dart rename to desktop_photo_search/fluent_ui/lib/src/serializers.g.dart index d4f6be598..ad330123c 100644 --- a/experimental/desktop_photo_search/lib/src/serializers.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/serializers.g.dart @@ -41,4 +41,4 @@ Serializers _$serializers = (new Serializers().toBuilder() () => new ListBuilder())) .build(); -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/api_error.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/api_error.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/api_error.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/api_error.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/api_error.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/api_error.g.dart similarity index 92% rename from experimental/desktop_photo_search/lib/src/unsplash/api_error.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/api_error.g.dart index 4cfa82513..1c900a54d 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/api_error.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/api_error.g.dart @@ -49,7 +49,7 @@ class _$ApiErrorSerializer implements StructuredSerializer { result.errors.replace(serializers.deserialize(value, specifiedType: const FullType( BuiltList, const [const FullType(String)]))! - as BuiltList); + as BuiltList); break; } } @@ -143,4 +143,4 @@ class ApiErrorBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/current_user_collections.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/current_user_collections.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/current_user_collections.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/current_user_collections.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/current_user_collections.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/current_user_collections.g.dart similarity index 92% rename from experimental/desktop_photo_search/lib/src/unsplash/current_user_collections.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/current_user_collections.g.dart index 1c59cad46..73e703b83 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/current_user_collections.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/current_user_collections.g.dart @@ -74,15 +74,15 @@ class _$CurrentUserCollectionsSerializer break; case 'title': result.title = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'published_at': result.publishedAt = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'updated_at': result.updatedAt = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; } } @@ -207,4 +207,4 @@ class CurrentUserCollectionsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/exif.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/exif.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/exif.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/exif.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/exif.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/exif.g.dart similarity index 90% rename from experimental/desktop_photo_search/lib/src/unsplash/exif.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/exif.g.dart index 207e37d2e..e2b81a351 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/exif.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/exif.g.dart @@ -80,27 +80,27 @@ class _$ExifSerializer implements StructuredSerializer { switch (key) { case 'make': result.make = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'model': result.model = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'exposure_time': result.exposureTime = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'aperture': result.aperture = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'focal_length': result.focalLength = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'iso': result.iso = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; } } @@ -248,4 +248,4 @@ class ExifBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/links.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/links.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/links.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/links.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/links.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/links.g.dart similarity index 90% rename from experimental/desktop_photo_search/lib/src/unsplash/links.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/links.g.dart index 52c1fd4e8..503f2d39a 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/links.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/links.g.dart @@ -67,19 +67,19 @@ class _$LinksSerializer implements StructuredSerializer { switch (key) { case 'self': result.self = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'html': result.html = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'download': result.download = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'download_location': result.downloadLocation = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; } } @@ -197,4 +197,4 @@ class LinksBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/location.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/location.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/location.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/location.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/location.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/location.g.dart similarity index 92% rename from experimental/desktop_photo_search/lib/src/unsplash/location.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/location.g.dart index 9e6ed7d06..54b96ae73 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/location.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/location.g.dart @@ -60,11 +60,11 @@ class _$LocationSerializer implements StructuredSerializer { switch (key) { case 'city': result.city = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'country': result.country = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'position': result.position.replace(serializers.deserialize(value, @@ -184,4 +184,4 @@ class LocationBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/photo.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/photo.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/photo.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/photo.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/photo.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/photo.g.dart similarity index 94% rename from experimental/desktop_photo_search/lib/src/unsplash/photo.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/photo.g.dart index b879eb2a9..69bcb8b28 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/photo.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/photo.g.dart @@ -156,39 +156,39 @@ class _$PhotoSerializer implements StructuredSerializer { break; case 'created_at': result.createdAt = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'updated_at': result.updatedAt = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'width': result.width = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'height': result.height = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'color': result.color = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'downloads': result.downloads = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'likes': result.likes = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'liked_by_user': result.likedByUser = serializers.deserialize(value, - specifiedType: const FullType(bool)) as bool; + specifiedType: const FullType(bool)) as bool?; break; case 'description': result.description = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'exif': result.exif.replace(serializers.deserialize(value, @@ -202,13 +202,13 @@ class _$PhotoSerializer implements StructuredSerializer { result.tags.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltList, const [const FullType(Tags)]))! - as BuiltList); + as BuiltList); break; case 'current_user_collections': result.currentUserCollections.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltList, const [ const FullType(CurrentUserCollections) - ]))! as BuiltList); + ]))! as BuiltList); break; case 'urls': result.urls.replace(serializers.deserialize(value, @@ -550,4 +550,4 @@ class PhotoBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/position.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/position.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/position.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/position.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/position.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/position.g.dart similarity index 94% rename from experimental/desktop_photo_search/lib/src/unsplash/position.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/position.g.dart index be7d15523..6fb2a843e 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/position.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/position.g.dart @@ -149,4 +149,4 @@ class PositionBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/search_photos_response.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/search_photos_response.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/search_photos_response.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/search_photos_response.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/search_photos_response.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/search_photos_response.g.dart similarity index 93% rename from experimental/desktop_photo_search/lib/src/unsplash/search_photos_response.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/search_photos_response.g.dart index b1ab455bf..f967573a4 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/search_photos_response.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/search_photos_response.g.dart @@ -63,17 +63,17 @@ class _$SearchPhotosResponseSerializer switch (key) { case 'total': result.total = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'total_pages': result.totalPages = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'results': result.results.replace(serializers.deserialize(value, specifiedType: const FullType(BuiltList, const [const FullType(Photo)]))! - as BuiltList); + as BuiltList); break; } } @@ -198,4 +198,4 @@ class SearchPhotosResponseBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/tags.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/tags.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/tags.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/tags.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/tags.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/tags.g.dart similarity index 92% rename from experimental/desktop_photo_search/lib/src/unsplash/tags.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/tags.g.dart index 7d4d949d3..11a0de32f 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/tags.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/tags.g.dart @@ -128,4 +128,4 @@ class TagsBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/unsplash.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/unsplash.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/unsplash.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/unsplash.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/urls.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/urls.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/urls.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/urls.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/urls.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/urls.g.dart similarity index 90% rename from experimental/desktop_photo_search/lib/src/unsplash/urls.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/urls.g.dart index 14b4d5213..5983509e9 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/urls.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/urls.g.dart @@ -74,23 +74,23 @@ class _$UrlsSerializer implements StructuredSerializer { switch (key) { case 'raw': result.raw = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'full': result.full = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'regular': result.regular = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'small': result.small = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'thumb': result.thumb = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; } } @@ -214,4 +214,4 @@ class UrlsBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/unsplash/user.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/user.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/unsplash/user.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/user.dart diff --git a/experimental/desktop_photo_search/lib/src/unsplash/user.g.dart b/desktop_photo_search/fluent_ui/lib/src/unsplash/user.g.dart similarity index 93% rename from experimental/desktop_photo_search/lib/src/unsplash/user.g.dart rename to desktop_photo_search/fluent_ui/lib/src/unsplash/user.g.dart index 2aa30d209..dfb9987d3 100644 --- a/experimental/desktop_photo_search/lib/src/unsplash/user.g.dart +++ b/desktop_photo_search/fluent_ui/lib/src/unsplash/user.g.dart @@ -104,7 +104,7 @@ class _$UserSerializer implements StructuredSerializer { break; case 'updated_at': result.updatedAt = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'username': result.username = serializers.deserialize(value, @@ -116,27 +116,27 @@ class _$UserSerializer implements StructuredSerializer { break; case 'portfolio_url': result.portfolioUrl = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'bio': result.bio = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'location': result.location = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; + specifiedType: const FullType(String)) as String?; break; case 'total_likes': result.totalLikes = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'total_photos': result.totalPhotos = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'total_collections': result.totalCollections = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(int)) as int?; break; case 'links': result.links.replace(serializers.deserialize(value, @@ -374,4 +374,4 @@ class UserBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/fluent_ui/lib/src/widgets/photo_details.dart b/desktop_photo_search/fluent_ui/lib/src/widgets/photo_details.dart new file mode 100644 index 000000000..736b209bc --- /dev/null +++ b/desktop_photo_search/fluent_ui/lib/src/widgets/photo_details.dart @@ -0,0 +1,116 @@ +// Copyright 2019 The Flutter team. 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:fluent_ui/fluent_ui.dart' hide FluentIcons; +import 'package:fluentui_system_icons/fluentui_system_icons.dart'; +import 'package:flutter/material.dart' show Card, BorderSide; +import 'package:transparent_image/transparent_image.dart'; +import 'package:url_launcher/link.dart'; + +import '../../unsplash_access_key.dart'; +import '../unsplash/photo.dart'; + +final _unsplashHomepage = Uri.parse( + 'https://unsplash.com/?utm_source=$unsplashAppName&utm_medium=referral'); + +typedef PhotoDetailsPhotoSaveCallback = void Function(Photo); + +class PhotoDetails extends StatefulWidget { + const PhotoDetails({ + required this.photo, + required this.onPhotoSave, + Key? key, + }) : super(key: key); + final Photo photo; + final PhotoDetailsPhotoSaveCallback onPhotoSave; + + @override + _PhotoDetailsState createState() => _PhotoDetailsState(); +} + +class _PhotoDetailsState extends State { + Widget _buildPhotoAttribution(BuildContext context) { + return Row( + children: [ + const Text('Photo by'), + Link( + uri: Uri.parse( + 'https://unsplash.com/@${widget.photo.user!.username}?utm_source=$unsplashAppName&utm_medium=referral'), + builder: (context, followLink) => TextButton( + onPressed: followLink, + child: Text(widget.photo.user!.name), + ), + ), + const Text('on'), + Link( + uri: _unsplashHomepage, + builder: (context, followLink) => TextButton( + onPressed: followLink, + child: const Text('Unsplash'), + ), + ), + ], + ); + } + + @override + Widget build(BuildContext context) { + return Scrollbar( + child: SingleChildScrollView( + child: Center( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 16), + Card( + shape: ContinuousRectangleBorder( + side: const BorderSide(color: Colors.black), + borderRadius: BorderRadius.circular(4), + ), + child: AnimatedSize( + duration: const Duration(milliseconds: 750), + child: Padding( + padding: const EdgeInsets.fromLTRB(16, 16, 16, 40), + child: ConstrainedBox( + constraints: const BoxConstraints( + minWidth: 400, + minHeight: 400, + ), + child: FadeInImage.memoryNetwork( + placeholder: kTransparentImage, + imageSemanticLabel: widget.photo.description, + image: widget.photo.urls!.small!, + ), + ), + ), + ), + ), + const SizedBox(height: 8), + Padding( + padding: const EdgeInsets.only(left: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + _buildPhotoAttribution(context), + const SizedBox(width: 8), + IconButton( + icon: const Icon( + FluentIcons.arrow_download_20_regular, + size: 20, + ), + onPressed: () => widget.onPhotoSave(widget.photo), + ), + ], + ), + ), + const SizedBox(height: 48), + ], + ), + ), + ), + ); + } +} diff --git a/desktop_photo_search/fluent_ui/lib/src/widgets/photo_search_dialog.dart b/desktop_photo_search/fluent_ui/lib/src/widgets/photo_search_dialog.dart new file mode 100644 index 000000000..6c900324f --- /dev/null +++ b/desktop_photo_search/fluent_ui/lib/src/widgets/photo_search_dialog.dart @@ -0,0 +1,67 @@ +// Copyright 2019 The Flutter team. 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:fluent_ui/fluent_ui.dart'; + +typedef PhotoSearchDialogCallback = void Function(String searchQuery); + +class PhotoSearchDialog extends StatefulWidget { + const PhotoSearchDialog({required this.callback, Key? key}) : super(key: key); + final PhotoSearchDialogCallback callback; + @override + State createState() => _PhotoSearchDialogState(); +} + +class _PhotoSearchDialogState extends State { + final _controller = TextEditingController(); + bool _searchEnabled = false; + + @override + void initState() { + super.initState(); + _controller.addListener(() { + setState(() { + _searchEnabled = _controller.text.isNotEmpty; + }); + }); + } + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) => ContentDialog( + title: const Text('Photo Search'), + content: TextBox( + autofocus: true, + controller: _controller, + onSubmitted: (content) { + if (content.isNotEmpty) { + widget.callback(content); + Navigator.of(context).pop(); + } + }, + ), + actions: [ + FilledButton( + onPressed: _searchEnabled + ? () { + widget.callback(_controller.text); + Navigator.of(context).pop(); + } + : null, + child: const Text('Search'), + ), + Button( + onPressed: () { + Navigator.of(context).pop(); + }, + child: const Text('Cancel'), + ), + ], + ); +} diff --git a/desktop_photo_search/fluent_ui/lib/src/widgets/policy_dialog.dart b/desktop_photo_search/fluent_ui/lib/src/widgets/policy_dialog.dart new file mode 100644 index 000000000..47cabd34a --- /dev/null +++ b/desktop_photo_search/fluent_ui/lib/src/widgets/policy_dialog.dart @@ -0,0 +1,74 @@ +// Copyright 2019 The Flutter team. 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:fluent_ui/fluent_ui.dart'; +import 'package:flutter/gestures.dart'; +import 'package:url_launcher/url_launcher.dart' as url_launcher; + +class PolicyDialog extends StatelessWidget { + const PolicyDialog({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return ContentDialog( + title: const Text('Terms & Conditions'), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + RichText( + textAlign: TextAlign.left, + text: TextSpan( + text: '• ', + style: const TextStyle(color: Colors.black, fontSize: 18), + children: [ + TextSpan( + text: 'https://policies.google.com/terms', + style: TextStyle( + fontWeight: FontWeight.bold, color: Colors.blue.normal), + recognizer: TapGestureRecognizer() + ..onTap = () async { + const url = 'https://policies.google.com/terms'; + if (await url_launcher.canLaunch(url)) { + await url_launcher.launch(url); + } + }, + ) + ], + ), + ), + RichText( + textAlign: TextAlign.left, + text: TextSpan( + text: '• ', + style: const TextStyle(color: Colors.black, fontSize: 18), + children: [ + TextSpan( + text: 'https://unsplash.com/terms', + style: TextStyle( + fontWeight: FontWeight.bold, color: Colors.blue.normal), + recognizer: TapGestureRecognizer() + ..onTap = () async { + const url = 'https://unsplash.com/terms'; + if (await url_launcher.canLaunch(url)) { + await url_launcher.launch(url); + } + }, + ) + ], + ), + ), + ], + ), + actions: [ + FilledButton( + onPressed: () { + Navigator.of(context).pop(); + }, + child: const Text('Accept'), + ), + ], + ); + } +} diff --git a/experimental/desktop_photo_search/lib/src/widgets/split.dart b/desktop_photo_search/fluent_ui/lib/src/widgets/split.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/widgets/split.dart rename to desktop_photo_search/fluent_ui/lib/src/widgets/split.dart diff --git a/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_notice.dart b/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_notice.dart new file mode 100644 index 000000000..57484f6e1 --- /dev/null +++ b/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_notice.dart @@ -0,0 +1,106 @@ +// Copyright 2022 The Flutter team. 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:fluent_ui/fluent_ui.dart'; +import 'package:flutter/gestures.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../../unsplash_access_key.dart'; + +final _unsplashHomepage = + 'https://unsplash.com/?utm_source=${Uri.encodeFull(unsplashAppName)}&utm_medium=referral'; +final _unsplashPrivacyPolicy = + 'https://unsplash.com/privacy?utm_source=${Uri.encodeFull(unsplashAppName)}&utm_medium=referral'; + +class UnsplashNotice extends StatefulWidget { + const UnsplashNotice({Key? key, required this.child}) : super(key: key); + final Widget child; + + @override + State createState() => _UnsplashNoticeState(); +} + +class _UnsplashNoticeState extends State { + bool noticeAccepted = false; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance!.addPostFrameCallback((timeStamp) { + showDialog( + context: context, + builder: (context) { + return _UnsplashDialog(accepted: () { + setState(() { + noticeAccepted = true; + }); + }); + }); + }); + } + + @override + Widget build(BuildContext context) { + return widget.child; + } +} + +class _UnsplashDialog extends StatelessWidget { + const _UnsplashDialog({Key? key, required this.accepted}) : super(key: key); + final Function accepted; + + @override + Widget build(BuildContext context) { + return ContentDialog( + title: const Text('Unsplash Notice'), + content: RichText( + text: TextSpan( + text: 'This is a sample desktop application provided by Google' + ' that enables you to search ', + style: const TextStyle(color: Colors.grey), + children: [ + TextSpan( + text: 'Unsplash', + recognizer: TapGestureRecognizer() + ..onTap = () async { + if (!await launch(_unsplashHomepage)) { + throw 'Could not launch $_unsplashHomepage'; + } + }, + style: TextStyle(color: Colors.blue), + ), + const TextSpan( + text: ' for photographs that interest you. When you search' + ' for and interact with photos, Unsplash will collect' + ' information about you and your use of the Unsplash' + ' services. Learn more about ', + style: TextStyle(color: Colors.grey), + ), + TextSpan( + text: 'how Unsplash collects and uses data', + recognizer: TapGestureRecognizer() + ..onTap = () async { + if (!await launch(_unsplashPrivacyPolicy)) { + throw 'Could not launch $_unsplashPrivacyPolicy'; + } + }, + style: TextStyle(color: Colors.blue), + ), + const TextSpan( + text: '.', + style: TextStyle(color: Colors.grey), + ), + ]), + ), + actions: [ + Button( + child: const Text('Got it'), + onPressed: () { + accepted(); + Navigator.pop(context); + }) + ], + ); + } +} diff --git a/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_search_content.dart b/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_search_content.dart new file mode 100644 index 000000000..39663e712 --- /dev/null +++ b/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_search_content.dart @@ -0,0 +1,99 @@ +// Copyright 2022 The Flutter team. 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/file_selector.dart'; +import 'package:fluent_ui/fluent_ui.dart'; +import 'package:provider/provider.dart'; + +import '../model/photo_search_model.dart'; +import '../unsplash/photo.dart'; +import '../widgets/photo_details.dart'; +import '../widgets/split.dart'; + +class UnsplashSearchContent extends StatefulWidget { + const UnsplashSearchContent({Key? key}) : super(key: key); + + @override + State createState() => _UnsplashSearchContentState(); +} + +class _UnsplashSearchContentState extends State { + final _treeViewScrollController = ScrollController(); + + @override + Widget build(BuildContext context) { + final photoSearchModel = Provider.of(context); + + return Split( + axis: Axis.horizontal, + initialFirstFraction: 0.4, + firstChild: Scrollbar( + controller: _treeViewScrollController, + child: SingleChildScrollView( + controller: _treeViewScrollController, + child: TreeView( + items: photoSearchModel.entries.map(_buildSearchEntry).toList(), + ), + ), + ), + secondChild: Center( + child: photoSearchModel.selectedPhoto != null + ? PhotoDetails( + photo: photoSearchModel.selectedPhoto!, + onPhotoSave: (photo) async { + final path = await getSavePath( + suggestedName: '${photo.id}.jpg', + acceptedTypeGroups: [ + XTypeGroup( + label: 'JPG', + extensions: ['jpg'], + mimeTypes: ['image/jpeg'], + ), + ], + ); + if (path != null) { + final fileData = + await photoSearchModel.download(photo: photo); + final photoFile = + XFile.fromData(fileData, mimeType: 'image/jpeg'); + await photoFile.saveTo(path); + } + }, + ) + : Container(), + ), + ); + } + + TreeViewItem _buildSearchEntry(SearchEntry searchEntry) { + void selectPhoto(Photo photo) { + searchEntry.model.selectedPhoto = photo; + } + + String labelForPhoto(Photo photo) => 'Photo by ${photo.user!.name}'; + + return TreeViewItem( + content: Text(searchEntry.query), + children: searchEntry.photos + .map( + (photo) => TreeViewItem( + content: Semantics( + button: true, + onTap: () => selectPhoto(photo), + label: labelForPhoto(photo), + excludeSemantics: true, + child: GestureDetector( + onTap: () => selectPhoto(photo), + child: Text( + labelForPhoto(photo), + style: const TextStyle(color: Colors.black), + ), + ), + ), + ), + ) + .toList(), + ); + } +} diff --git a/experimental/desktop_photo_search/lib/unsplash_access_key.dart b/desktop_photo_search/fluent_ui/lib/unsplash_access_key.dart similarity index 100% rename from experimental/desktop_photo_search/lib/unsplash_access_key.dart rename to desktop_photo_search/fluent_ui/lib/unsplash_access_key.dart diff --git a/experimental/desktop_photo_search/linux/.gitignore b/desktop_photo_search/fluent_ui/linux/.gitignore similarity index 100% rename from experimental/desktop_photo_search/linux/.gitignore rename to desktop_photo_search/fluent_ui/linux/.gitignore diff --git a/experimental/desktop_photo_search/linux/CMakeLists.txt b/desktop_photo_search/fluent_ui/linux/CMakeLists.txt similarity index 100% rename from experimental/desktop_photo_search/linux/CMakeLists.txt rename to desktop_photo_search/fluent_ui/linux/CMakeLists.txt diff --git a/experimental/desktop_photo_search/linux/flutter/CMakeLists.txt b/desktop_photo_search/fluent_ui/linux/flutter/CMakeLists.txt similarity index 100% rename from experimental/desktop_photo_search/linux/flutter/CMakeLists.txt rename to desktop_photo_search/fluent_ui/linux/flutter/CMakeLists.txt diff --git a/experimental/desktop_photo_search/linux/flutter/generated_plugin_registrant.cc b/desktop_photo_search/fluent_ui/linux/flutter/generated_plugin_registrant.cc similarity index 100% rename from experimental/desktop_photo_search/linux/flutter/generated_plugin_registrant.cc rename to desktop_photo_search/fluent_ui/linux/flutter/generated_plugin_registrant.cc diff --git a/experimental/desktop_photo_search/linux/flutter/generated_plugin_registrant.h b/desktop_photo_search/fluent_ui/linux/flutter/generated_plugin_registrant.h similarity index 100% rename from experimental/desktop_photo_search/linux/flutter/generated_plugin_registrant.h rename to desktop_photo_search/fluent_ui/linux/flutter/generated_plugin_registrant.h diff --git a/experimental/desktop_photo_search/linux/flutter/generated_plugins.cmake b/desktop_photo_search/fluent_ui/linux/flutter/generated_plugins.cmake similarity index 100% rename from experimental/desktop_photo_search/linux/flutter/generated_plugins.cmake rename to desktop_photo_search/fluent_ui/linux/flutter/generated_plugins.cmake diff --git a/experimental/desktop_photo_search/linux/main.cc b/desktop_photo_search/fluent_ui/linux/main.cc similarity index 100% rename from experimental/desktop_photo_search/linux/main.cc rename to desktop_photo_search/fluent_ui/linux/main.cc diff --git a/experimental/desktop_photo_search/linux/my_application.cc b/desktop_photo_search/fluent_ui/linux/my_application.cc similarity index 100% rename from experimental/desktop_photo_search/linux/my_application.cc rename to desktop_photo_search/fluent_ui/linux/my_application.cc diff --git a/experimental/desktop_photo_search/linux/my_application.h b/desktop_photo_search/fluent_ui/linux/my_application.h similarity index 100% rename from experimental/desktop_photo_search/linux/my_application.h rename to desktop_photo_search/fluent_ui/linux/my_application.h diff --git a/experimental/desktop_photo_search/macos/.gitignore b/desktop_photo_search/fluent_ui/macos/.gitignore similarity index 100% rename from experimental/desktop_photo_search/macos/.gitignore rename to desktop_photo_search/fluent_ui/macos/.gitignore diff --git a/experimental/desktop_photo_search/macos/Flutter/Flutter-Debug.xcconfig b/desktop_photo_search/fluent_ui/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from experimental/desktop_photo_search/macos/Flutter/Flutter-Debug.xcconfig rename to desktop_photo_search/fluent_ui/macos/Flutter/Flutter-Debug.xcconfig diff --git a/experimental/desktop_photo_search/macos/Flutter/Flutter-Release.xcconfig b/desktop_photo_search/fluent_ui/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from experimental/desktop_photo_search/macos/Flutter/Flutter-Release.xcconfig rename to desktop_photo_search/fluent_ui/macos/Flutter/Flutter-Release.xcconfig diff --git a/experimental/desktop_photo_search/macos/Flutter/GeneratedPluginRegistrant.swift b/desktop_photo_search/fluent_ui/macos/Flutter/GeneratedPluginRegistrant.swift similarity index 100% rename from experimental/desktop_photo_search/macos/Flutter/GeneratedPluginRegistrant.swift rename to desktop_photo_search/fluent_ui/macos/Flutter/GeneratedPluginRegistrant.swift diff --git a/experimental/desktop_photo_search/macos/Podfile b/desktop_photo_search/fluent_ui/macos/Podfile similarity index 100% rename from experimental/desktop_photo_search/macos/Podfile rename to desktop_photo_search/fluent_ui/macos/Podfile diff --git a/experimental/desktop_photo_search/macos/Podfile.lock b/desktop_photo_search/fluent_ui/macos/Podfile.lock similarity index 100% rename from experimental/desktop_photo_search/macos/Podfile.lock rename to desktop_photo_search/fluent_ui/macos/Podfile.lock diff --git a/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 000000000..4f5b4346e --- /dev/null +++ b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,632 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 6D537A3FDA594DC5503EA037 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C50174A22B22BED5DB30AB67 /* Pods_Runner.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* fluent_ui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = fluent_ui.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + A8F75D32B4F5056CAC9235F5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + C40FEF4F88D6CC7B2242F051 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + C50174A22B22BED5DB30AB67 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C86753C161891598F592CA15 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6D537A3FDA594DC5503EA037 /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 3093EE7BB096B666F4EA245D /* Pods */ = { + isa = PBXGroup; + children = ( + C86753C161891598F592CA15 /* Pods-Runner.debug.xcconfig */, + C40FEF4F88D6CC7B2242F051 /* Pods-Runner.release.xcconfig */, + A8F75D32B4F5056CAC9235F5 /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + 3093EE7BB096B666F4EA245D /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* fluent_ui.app */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + C50174A22B22BED5DB30AB67 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + C6FB9C29B68E6DEF8529C06C /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + A4BDB29A994AF8CE17785608 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* fluent_ui.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; + A4BDB29A994AF8CE17785608 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + C6FB9C29B68E6DEF8529C06C /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/experimental/desktop_photo_search/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from experimental/desktop_photo_search/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/experimental/desktop_photo_search/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 95% rename from experimental/desktop_photo_search/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8e41586a7..dd5781da5 100644 --- a/experimental/desktop_photo_search/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/experimental/desktop_photo_search/macos/Runner/Configs/AppInfo.xcconfig b/desktop_photo_search/fluent_ui/macos/Runner/Configs/AppInfo.xcconfig similarity index 100% rename from experimental/desktop_photo_search/macos/Runner/Configs/AppInfo.xcconfig rename to desktop_photo_search/fluent_ui/macos/Runner/Configs/AppInfo.xcconfig diff --git a/experimental/desktop_photo_search/macos/Runner/Configs/Debug.xcconfig b/desktop_photo_search/fluent_ui/macos/Runner/Configs/Debug.xcconfig similarity index 100% rename from experimental/desktop_photo_search/macos/Runner/Configs/Debug.xcconfig rename to desktop_photo_search/fluent_ui/macos/Runner/Configs/Debug.xcconfig diff --git a/experimental/desktop_photo_search/macos/Runner/Configs/Release.xcconfig b/desktop_photo_search/fluent_ui/macos/Runner/Configs/Release.xcconfig similarity index 100% rename from experimental/desktop_photo_search/macos/Runner/Configs/Release.xcconfig rename to desktop_photo_search/fluent_ui/macos/Runner/Configs/Release.xcconfig diff --git a/experimental/desktop_photo_search/macos/Runner/Configs/Warnings.xcconfig b/desktop_photo_search/fluent_ui/macos/Runner/Configs/Warnings.xcconfig similarity index 100% rename from experimental/desktop_photo_search/macos/Runner/Configs/Warnings.xcconfig rename to desktop_photo_search/fluent_ui/macos/Runner/Configs/Warnings.xcconfig diff --git a/experimental/desktop_photo_search/macos/Runner/DebugProfile.entitlements b/desktop_photo_search/fluent_ui/macos/Runner/DebugProfile.entitlements similarity index 100% rename from experimental/desktop_photo_search/macos/Runner/DebugProfile.entitlements rename to desktop_photo_search/fluent_ui/macos/Runner/DebugProfile.entitlements diff --git a/experimental/desktop_photo_search/macos/Runner/Info.plist b/desktop_photo_search/fluent_ui/macos/Runner/Info.plist similarity index 100% rename from experimental/desktop_photo_search/macos/Runner/Info.plist rename to desktop_photo_search/fluent_ui/macos/Runner/Info.plist diff --git a/experimental/desktop_photo_search/macos/Runner/MainFlutterWindow.swift b/desktop_photo_search/fluent_ui/macos/Runner/MainFlutterWindow.swift similarity index 100% rename from experimental/desktop_photo_search/macos/Runner/MainFlutterWindow.swift rename to desktop_photo_search/fluent_ui/macos/Runner/MainFlutterWindow.swift diff --git a/experimental/desktop_photo_search/macos/Runner/Release.entitlements b/desktop_photo_search/fluent_ui/macos/Runner/Release.entitlements similarity index 100% rename from experimental/desktop_photo_search/macos/Runner/Release.entitlements rename to desktop_photo_search/fluent_ui/macos/Runner/Release.entitlements diff --git a/desktop_photo_search/fluent_ui/pubspec.lock b/desktop_photo_search/fluent_ui/pubspec.lock new file mode 100644 index 000000000..9a47ce5d7 --- /dev/null +++ b/desktop_photo_search/fluent_ui/pubspec.lock @@ -0,0 +1,721 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + url: "https://pub.dartlang.org" + source: hosted + version: "34.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.0" + ansicolor: + dependency: transitive + description: + name: ansicolor + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.11" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.0" + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.2" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + build: + dependency: "direct dev" + description: + name: build + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + build_config: + dependency: transitive + description: + name: build_config + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + build_daemon: + dependency: transitive + description: + name: build_daemon + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.6" + build_runner: + dependency: "direct dev" + description: + name: build_runner + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.7" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + url: "https://pub.dartlang.org" + source: hosted + version: "7.2.3" + built_collection: + dependency: "direct main" + description: + name: built_collection + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.1" + built_value: + dependency: "direct main" + description: + name: built_value + url: "https://pub.dartlang.org" + source: hosted + version: "8.1.4" + built_value_generator: + dependency: "direct dev" + description: + name: built_value_generator + url: "https://pub.dartlang.org" + source: hosted + version: "8.1.4" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.5" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + code_builder: + dependency: transitive + description: + name: code_builder + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.0" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.15.0" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + cross_file: + dependency: transitive + description: + name: cross_file + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.2" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + dart_style: + dependency: transitive + description: + name: dart_style + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + file: + dependency: transitive + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.2" + file_selector: + dependency: "direct main" + description: + name: file_selector + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.3" + file_selector_linux: + dependency: "direct main" + description: + name: file_selector_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2+1" + file_selector_macos: + dependency: "direct main" + description: + name: file_selector_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4+1" + file_selector_platform_interface: + dependency: transitive + description: + name: file_selector_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + file_selector_web: + dependency: transitive + description: + name: file_selector_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.1+3" + file_selector_windows: + dependency: "direct main" + description: + name: file_selector_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.2" + fixnum: + dependency: transitive + description: + name: fixnum + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + fluent_ui: + dependency: "direct main" + description: + name: fluent_ui + url: "https://pub.dartlang.org" + source: hosted + version: "3.7.0" + fluentui_system_icons: + dependency: "direct main" + description: + name: fluentui_system_icons + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.157" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.2" + glob: + dependency: transitive + description: + name: glob + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + graphs: + dependency: transitive + description: + name: graphs + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + grinder: + dependency: "direct dev" + description: + name: grinder + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.0" + http: + dependency: "direct main" + description: + name: http + url: "https://pub.dartlang.org" + source: hosted + version: "0.13.4" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.0" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.1" + intl: + dependency: transitive + description: + name: intl + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.0" + io: + dependency: transitive + description: + name: io + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3" + json_annotation: + dependency: transitive + description: + name: json_annotation + url: "https://pub.dartlang.org" + source: hosted + version: "4.4.0" + lints: + dependency: transitive + description: + name: lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + logging: + dependency: "direct main" + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" + menubar: + dependency: "direct main" + description: + path: "plugins/menubar" + ref: HEAD + resolved-ref: "89c350f787e1d7bff12b3517e5671146211ee70e" + url: "https://github.com/google/flutter-desktop-embedding.git" + source: git + version: "0.1.0" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.0" + mime: + dependency: transitive + description: + name: mime + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + msix: + dependency: "direct dev" + description: + name: msix + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.5" + nested: + dependency: transitive + description: + name: nested + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "4.4.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.2" + pool: + dependency: transitive + description: + name: pool + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.0" + provider: + dependency: "direct main" + description: + name: provider + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.2" + pub_semver: + dependency: transitive + description: + name: pub_semver + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1+1" + recase: + dependency: transitive + description: + name: recase + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.0" + scroll_pos: + dependency: transitive + description: + name: scroll_pos + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.0" + shelf: + dependency: transitive + description: + name: shelf + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.1" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "1.10.0" + stream_channel: + dependency: transitive + description: + name: stream_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + stream_transform: + dependency: transitive + description: + name: stream_transform + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + test_api: + dependency: transitive + description: + name: test_api + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.8" + timing: + dependency: transitive + description: + name: timing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + transparent_image: + dependency: "direct main" + description: + name: transparent_image + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.18" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.14" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.14" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.3" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.3" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.5" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.6" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + uuid: + dependency: "direct main" + description: + name: uuid + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.5" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + watcher: + dependency: transitive + description: + name: watcher + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "5.3.1" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" +sdks: + dart: ">=2.15.0 <3.0.0" + flutter: ">=2.8.0" diff --git a/desktop_photo_search/fluent_ui/pubspec.yaml b/desktop_photo_search/fluent_ui/pubspec.yaml new file mode 100644 index 000000000..3887f2ef1 --- /dev/null +++ b/desktop_photo_search/fluent_ui/pubspec.yaml @@ -0,0 +1,55 @@ +name: desktop_photo_search +description: Search for Photos, using the Unsplash API. +publish_to: 'none' +version: 1.0.0+1 + +environment: + sdk: ">=2.15.0 <3.0.0" + +dependencies: + built_collection: ^5.1.1 + built_value: ^8.1.4 + cupertino_icons: ^1.0.2 + file_selector: ^0.8.3 + file_selector_linux: ^0.0.2+1 + file_selector_macos: ^0.0.4+1 + file_selector_windows: ^0.8.2 + fluent_ui: ^3.7.0 + fluentui_system_icons: ^1.1.157 + flutter: + sdk: flutter + http: ^0.13.4 + logging: ^1.0.2 + menubar: + git: + url: https://github.com/google/flutter-desktop-embedding.git + path: plugins/menubar + provider: ^6.0.2 + transparent_image: ^2.0.0 + url_launcher: ^6.0.18 + uuid: ^3.0.5 + +dev_dependencies: + build: ^2.2.1 + build_runner: ^2.1.7 + built_value_generator: ^8.1.4 + flutter_lints: ^1.0.0 + flutter_test: + sdk: flutter + grinder: ^0.9.0 + msix: ^2.8.5 + +flutter: + uses-material-design: true + +msix_config: + display_name: Flutter Desktop Photo Search + publisher_display_name: flutter.dev + store: false # Set to true to deploy to Microsoft Store + publisher: CN=01A6D5C0-D51A-4EEE-8DD0-F134DDD378F7 + identity_name: 16354flutter.dev.FlutterDesktopPhotoSearch + msix_version: 1.0.0.1 + icons_background_color: "#ffffff" + architecture: x64 + # See https://docs.microsoft.com/en-us/windows/uwp/packaging/app-capability-declarations + capabilities: "internetClient" diff --git a/experimental/desktop_photo_search/test/unsplash_test.dart b/desktop_photo_search/fluent_ui/test/unsplash_test.dart similarity index 100% rename from experimental/desktop_photo_search/test/unsplash_test.dart rename to desktop_photo_search/fluent_ui/test/unsplash_test.dart diff --git a/experimental/desktop_photo_search/test/widget_test.dart b/desktop_photo_search/fluent_ui/test/widget_test.dart similarity index 100% rename from experimental/desktop_photo_search/test/widget_test.dart rename to desktop_photo_search/fluent_ui/test/widget_test.dart diff --git a/experimental/desktop_photo_search/tool/grind.dart b/desktop_photo_search/fluent_ui/tool/grind.dart similarity index 100% rename from experimental/desktop_photo_search/tool/grind.dart rename to desktop_photo_search/fluent_ui/tool/grind.dart diff --git a/experimental/desktop_photo_search/windows/.gitignore b/desktop_photo_search/fluent_ui/windows/.gitignore similarity index 100% rename from experimental/desktop_photo_search/windows/.gitignore rename to desktop_photo_search/fluent_ui/windows/.gitignore diff --git a/experimental/desktop_photo_search/windows/CMakeLists.txt b/desktop_photo_search/fluent_ui/windows/CMakeLists.txt similarity index 98% rename from experimental/desktop_photo_search/windows/CMakeLists.txt rename to desktop_photo_search/fluent_ui/windows/CMakeLists.txt index 430969943..3adb3c6ad 100644 --- a/experimental/desktop_photo_search/windows/CMakeLists.txt +++ b/desktop_photo_search/fluent_ui/windows/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.14) project(desktop_photo_search LANGUAGES CXX) set(BINARY_NAME "desktop_photo_search") diff --git a/experimental/desktop_photo_search/windows/flutter/CMakeLists.txt b/desktop_photo_search/fluent_ui/windows/flutter/CMakeLists.txt similarity index 98% rename from experimental/desktop_photo_search/windows/flutter/CMakeLists.txt rename to desktop_photo_search/fluent_ui/windows/flutter/CMakeLists.txt index b02c5485c..b2e4bd8d6 100644 --- a/experimental/desktop_photo_search/windows/flutter/CMakeLists.txt +++ b/desktop_photo_search/fluent_ui/windows/flutter/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.14) set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") diff --git a/experimental/desktop_photo_search/windows/flutter/generated_plugin_registrant.cc b/desktop_photo_search/fluent_ui/windows/flutter/generated_plugin_registrant.cc similarity index 73% rename from experimental/desktop_photo_search/windows/flutter/generated_plugin_registrant.cc rename to desktop_photo_search/fluent_ui/windows/flutter/generated_plugin_registrant.cc index f717faa7b..b16c80c6e 100644 --- a/experimental/desktop_photo_search/windows/flutter/generated_plugin_registrant.cc +++ b/desktop_photo_search/fluent_ui/windows/flutter/generated_plugin_registrant.cc @@ -6,13 +6,13 @@ #include "generated_plugin_registrant.h" -#include +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { - FileSelectorPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FileSelectorPlugin")); + FileSelectorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FileSelectorWindows")); MenubarPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("MenubarPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/experimental/desktop_photo_search/windows/flutter/generated_plugin_registrant.h b/desktop_photo_search/fluent_ui/windows/flutter/generated_plugin_registrant.h similarity index 100% rename from experimental/desktop_photo_search/windows/flutter/generated_plugin_registrant.h rename to desktop_photo_search/fluent_ui/windows/flutter/generated_plugin_registrant.h diff --git a/experimental/desktop_photo_search/windows/flutter/generated_plugins.cmake b/desktop_photo_search/fluent_ui/windows/flutter/generated_plugins.cmake similarity index 100% rename from experimental/desktop_photo_search/windows/flutter/generated_plugins.cmake rename to desktop_photo_search/fluent_ui/windows/flutter/generated_plugins.cmake diff --git a/experimental/desktop_photo_search/windows/runner/CMakeLists.txt b/desktop_photo_search/fluent_ui/windows/runner/CMakeLists.txt similarity index 93% rename from experimental/desktop_photo_search/windows/runner/CMakeLists.txt rename to desktop_photo_search/fluent_ui/windows/runner/CMakeLists.txt index 0b899a0bc..de2d8916b 100644 --- a/experimental/desktop_photo_search/windows/runner/CMakeLists.txt +++ b/desktop_photo_search/fluent_ui/windows/runner/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.14) project(runner LANGUAGES CXX) add_executable(${BINARY_NAME} WIN32 diff --git a/experimental/desktop_photo_search/windows/runner/Runner.rc b/desktop_photo_search/fluent_ui/windows/runner/Runner.rc similarity index 97% rename from experimental/desktop_photo_search/windows/runner/Runner.rc rename to desktop_photo_search/fluent_ui/windows/runner/Runner.rc index 3220e9950..8e5b48869 100644 --- a/experimental/desktop_photo_search/windows/runner/Runner.rc +++ b/desktop_photo_search/fluent_ui/windows/runner/Runner.rc @@ -90,7 +90,7 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "A new Flutter project." "\0" + VALUE "FileDescription", "A Photo Search sample app." "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "desktop_photo_search" "\0" VALUE "LegalCopyright", "Copyright (C) 2020 com.example. All rights reserved." "\0" diff --git a/experimental/desktop_photo_search/windows/runner/flutter_window.cpp b/desktop_photo_search/fluent_ui/windows/runner/flutter_window.cpp similarity index 100% rename from experimental/desktop_photo_search/windows/runner/flutter_window.cpp rename to desktop_photo_search/fluent_ui/windows/runner/flutter_window.cpp diff --git a/experimental/desktop_photo_search/windows/runner/flutter_window.h b/desktop_photo_search/fluent_ui/windows/runner/flutter_window.h similarity index 100% rename from experimental/desktop_photo_search/windows/runner/flutter_window.h rename to desktop_photo_search/fluent_ui/windows/runner/flutter_window.h diff --git a/experimental/desktop_photo_search/windows/runner/main.cpp b/desktop_photo_search/fluent_ui/windows/runner/main.cpp similarity index 94% rename from experimental/desktop_photo_search/windows/runner/main.cpp rename to desktop_photo_search/fluent_ui/windows/runner/main.cpp index 06cafd81c..a20675a4f 100644 --- a/experimental/desktop_photo_search/windows/runner/main.cpp +++ b/desktop_photo_search/fluent_ui/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.CreateAndShow(L"Desktop Photo Search", origin, size)) { + if (!window.CreateAndShow(L"Photo Search", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/experimental/desktop_photo_search/windows/runner/resource.h b/desktop_photo_search/fluent_ui/windows/runner/resource.h similarity index 100% rename from experimental/desktop_photo_search/windows/runner/resource.h rename to desktop_photo_search/fluent_ui/windows/runner/resource.h diff --git a/experimental/desktop_photo_search/windows/runner/resources/app_icon.ico b/desktop_photo_search/fluent_ui/windows/runner/resources/app_icon.ico similarity index 100% rename from experimental/desktop_photo_search/windows/runner/resources/app_icon.ico rename to desktop_photo_search/fluent_ui/windows/runner/resources/app_icon.ico diff --git a/experimental/desktop_photo_search/windows/runner/runner.exe.manifest b/desktop_photo_search/fluent_ui/windows/runner/runner.exe.manifest similarity index 100% rename from experimental/desktop_photo_search/windows/runner/runner.exe.manifest rename to desktop_photo_search/fluent_ui/windows/runner/runner.exe.manifest diff --git a/experimental/desktop_photo_search/windows/runner/utils.cpp b/desktop_photo_search/fluent_ui/windows/runner/utils.cpp similarity index 100% rename from experimental/desktop_photo_search/windows/runner/utils.cpp rename to desktop_photo_search/fluent_ui/windows/runner/utils.cpp diff --git a/experimental/desktop_photo_search/windows/runner/utils.h b/desktop_photo_search/fluent_ui/windows/runner/utils.h similarity index 100% rename from experimental/desktop_photo_search/windows/runner/utils.h rename to desktop_photo_search/fluent_ui/windows/runner/utils.h diff --git a/experimental/desktop_photo_search/windows/runner/win32_window.cpp b/desktop_photo_search/fluent_ui/windows/runner/win32_window.cpp similarity index 100% rename from experimental/desktop_photo_search/windows/runner/win32_window.cpp rename to desktop_photo_search/fluent_ui/windows/runner/win32_window.cpp diff --git a/experimental/desktop_photo_search/windows/runner/win32_window.h b/desktop_photo_search/fluent_ui/windows/runner/win32_window.h similarity index 100% rename from experimental/desktop_photo_search/windows/runner/win32_window.h rename to desktop_photo_search/fluent_ui/windows/runner/win32_window.h diff --git a/desktop_photo_search/material/.gitignore b/desktop_photo_search/material/.gitignore new file mode 100644 index 000000000..0fa6b675c --- /dev/null +++ b/desktop_photo_search/material/.gitignore @@ -0,0 +1,46 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/desktop_photo_search/material/.metadata b/desktop_photo_search/material/.metadata new file mode 100644 index 000000000..356d05d6d --- /dev/null +++ b/desktop_photo_search/material/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: fdd0af78bbda27e1084ec859b27765d927cbe27e + channel: beta + +project_type: app diff --git a/desktop_photo_search/material/README.md b/desktop_photo_search/material/README.md new file mode 100644 index 000000000..68663a62a --- /dev/null +++ b/desktop_photo_search/material/README.md @@ -0,0 +1,64 @@ +# Photo Search app + +This desktop application enables you to search +[Unsplash](https://unsplash.com/) for photographs that interest you. +To use it, you need to add an **Access Key** from +[Unsplash API](https://unsplash.com/developers) to +`lib/unsplash_access_key.dart`. + +This sample works on Windows, macOS and Linux. + +## A quick tour of the code + +This Flutter project builds a desktop application. It utilises the following +desktop specific plugins: + + - [file_chooser] to enable the application user to select where to save a photo + from the Unsplash API. + - [menubar] for exposing Image Search functionality through the menu bar. + - [url_launcher] to open external links. + +The Unsplash API client entry point is in the [Unsplash] class, and is built +atop [http], [built_value] and [built_collection] for JSON Rest API access. + +## Deploying to the Microsoft Store + +This sample uses Yehuda Kremer's [MSIX pub package] to bundle up the Windows +release build for distribution to the [Microsoft Store]. Microsoft maintains +a [plethora of documentation][ms_store_publishing_doc] on deploying to the +Microsoft Store. + +See the `msix_config` stanza in this sample's `pubspec.yaml` for an +example configuration. Make sure the `display_name`, `publisher_display_name`, +`publisher` and `identity_name` attributes match the settings in your +Microsoft Partner Center application submission. + +## macOS Network and File entitlements + +To access the network, macOS requires applications enable the +[com.apple.security.network.client entitlement][macOS-client]. For this +sample, this entitlement is required to access the Unsplash API. + +Likewise, to save a Photo to the local file system using the `file_chooser` plugin requires the +[com.apple.security.files.user-selected.read-write entitlement][macOS-read-write]. + +Please see [macOS Signing and Security][macOS-security] for more detail. + + +[Unsplash]: lib/src/unsplash/unsplash.dart + +[built_collection]: https://pub.dev/packages/built_collection +[built_value]: https://pub.dev/packages/built_value +[file_chooser]: https://github.com/google/flutter-desktop-embedding/tree/master/plugins/file_chooser +[flutter_channels]: https://github.com/flutter/flutter/wiki/Flutter-build-release-channels +[http]: https://pub.dev/packages/http +[macOS-client]: https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_network_client +[macOS-read-write]: https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_files_user-selected_read-write +[macOS-security]: https://github.com/google/flutter-desktop-embedding/blob/master/macOS-Security.md +[menubar]: https://github.com/google/flutter-desktop-embedding/tree/master/plugins/menubar +[setup documentation]: https://flutter.dev/desktop#set-up +[url_launcher]: https://pub.dev/packages/url_launcher + +[MSIX pub package]: https://pub.dev/packages/msix +[Microsoft Store]: https://www.microsoft.com/en-au/p/flutter-desktop-photo-search/9nh719dxcpj4 +[ms_store_publishing_doc]: https://docs.microsoft.com/en-us/windows/uwp/publish/ diff --git a/desktop_photo_search/material/analysis_options.yaml b/desktop_photo_search/material/analysis_options.yaml new file mode 100644 index 000000000..f04c6cf0f --- /dev/null +++ b/desktop_photo_search/material/analysis_options.yaml @@ -0,0 +1 @@ +include: ../../analysis_options.yaml diff --git a/desktop_photo_search/material/lib/main.dart b/desktop_photo_search/material/lib/main.dart new file mode 100644 index 000000000..50ec3c646 --- /dev/null +++ b/desktop_photo_search/material/lib/main.dart @@ -0,0 +1,113 @@ +// Copyright 2019 The Flutter team. 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:io'; + +import 'package:flutter/material.dart'; +import 'package:logging/logging.dart'; +import 'package:menubar/menubar.dart' as menubar; +import 'package:provider/provider.dart'; + +import 'src/model/photo_search_model.dart'; +import 'src/unsplash/unsplash.dart'; +import 'src/widgets/photo_search_dialog.dart'; +import 'src/widgets/policy_dialog.dart'; +import 'src/widgets/unsplash_notice.dart'; +import 'src/widgets/unsplash_search_content.dart'; +import 'unsplash_access_key.dart'; + +void main() { + Logger.root.level = Level.ALL; + Logger.root.onRecord.listen((rec) { + // ignore: avoid_print + print('${rec.loggerName} ${rec.level.name}: ${rec.time}: ${rec.message}'); + }); + + if (unsplashAccessKey.isEmpty) { + Logger('main').severe('Unsplash Access Key is required. ' + 'Please add to `lib/unsplash_access_key.dart`.'); + exit(1); + } + + runApp( + ChangeNotifierProvider( + create: (context) => PhotoSearchModel( + Unsplash(accessKey: unsplashAccessKey), + ), + child: const UnsplashSearchApp(), + ), + ); +} + +class UnsplashSearchApp extends StatelessWidget { + const UnsplashSearchApp({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Photo Search', + theme: ThemeData( + primarySwatch: Colors.orange, + ), + home: const UnsplashHomePage(title: 'Photo Search'), + ); + } +} + +class UnsplashHomePage extends StatelessWidget { + const UnsplashHomePage({required this.title, Key? key}) : super(key: key); + final String title; + + @override + Widget build(BuildContext context) { + final photoSearchModel = Provider.of(context); + menubar.setApplicationMenu([ + menubar.Submenu(label: 'Search', children: [ + menubar.MenuItem( + label: 'Search...', + onClicked: () { + showDialog( + context: context, + builder: (context) => + PhotoSearchDialog(callback: photoSearchModel.addSearch), + ); + }, + ), + ]), + menubar.Submenu(label: 'About', children: [ + menubar.MenuItem( + label: 'About...', + onClicked: () { + showDialog( + context: context, + builder: (context) => const PolicyDialog(), + ); + }, + ), + ]) + ]); + + return UnsplashNotice( + child: Scaffold( + appBar: AppBar( + title: Text(title), + ), + body: photoSearchModel.entries.isNotEmpty + ? const UnsplashSearchContent() + : const Center( + child: Text('Search for Photos using the Fab button'), + ), + floatingActionButton: FloatingActionButton( + onPressed: () => showDialog( + context: context, + builder: (context) => + PhotoSearchDialog(callback: photoSearchModel.addSearch), + ), + tooltip: 'Search for a photo', + child: const Icon(Icons.search), + ), + ), + ); + } +} diff --git a/desktop_photo_search/material/lib/src/model/photo_search_model.dart b/desktop_photo_search/material/lib/src/model/photo_search_model.dart new file mode 100644 index 000000000..dcb839894 --- /dev/null +++ b/desktop_photo_search/material/lib/src/model/photo_search_model.dart @@ -0,0 +1,51 @@ +// Copyright 2019 The Flutter team. 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:typed_data'; + +import 'package:flutter/foundation.dart'; + +import '../unsplash/photo.dart'; +import '../unsplash/unsplash.dart'; +import 'search.dart'; + +class SearchEntry { + const SearchEntry(this.query, this.photos, this.model); + final String query; + final List photos; + final PhotoSearchModel model; +} + +class PhotoSearchModel extends ChangeNotifier { + PhotoSearchModel(this._client); + final Unsplash _client; + + List get entries => List.unmodifiable(_entries); + final List _entries = []; + + Photo? get selectedPhoto => _selectedPhoto; + set selectedPhoto(Photo? photo) { + _selectedPhoto = photo; + notifyListeners(); + } + + Photo? _selectedPhoto; + + Future addSearch(String query) async { + final result = await _client.searchPhotos( + query: query, + orientation: SearchPhotosOrientation.portrait, + ); + final search = Search((s) { + s + ..query = query + ..results.addAll(result!.results); + }); + + _entries.add(SearchEntry(query, search.results.toList(), this)); + notifyListeners(); + } + + Future download({required Photo photo}) => _client.download(photo); +} diff --git a/desktop_photo_search/material/lib/src/model/search.dart b/desktop_photo_search/material/lib/src/model/search.dart new file mode 100644 index 000000000..be2487a9e --- /dev/null +++ b/desktop_photo_search/material/lib/src/model/search.dart @@ -0,0 +1,36 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; +import '../unsplash/photo.dart'; + +part 'search.g.dart'; + +abstract class Search implements Built { + factory Search([void Function(SearchBuilder)? updates]) = _$Search; + Search._(); + + @BuiltValueField(wireName: 'query') + String get query; + + @BuiltValueField(wireName: 'results') + BuiltList get results; + + String toJson() { + return json.encode(serializers.serializeWith(Search.serializer, this)); + } + + static Search? fromJson(String jsonString) { + return serializers.deserializeWith( + Search.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$searchSerializer; +} diff --git a/desktop_photo_search/material/lib/src/model/search.g.dart b/desktop_photo_search/material/lib/src/model/search.g.dart new file mode 100644 index 000000000..37172fcf0 --- /dev/null +++ b/desktop_photo_search/material/lib/src/model/search.g.dart @@ -0,0 +1,166 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'search.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$searchSerializer = new _$SearchSerializer(); + +class _$SearchSerializer implements StructuredSerializer { + @override + final Iterable types = const [Search, _$Search]; + @override + final String wireName = 'Search'; + + @override + Iterable serialize(Serializers serializers, Search object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'query', + serializers.serialize(object.query, + specifiedType: const FullType(String)), + 'results', + serializers.serialize(object.results, + specifiedType: + const FullType(BuiltList, const [const FullType(Photo)])), + ]; + + return result; + } + + @override + Search deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new SearchBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'query': + result.query = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'results': + result.results.replace(serializers.deserialize(value, + specifiedType: + const FullType(BuiltList, const [const FullType(Photo)]))! + as BuiltList); + break; + } + } + + return result.build(); + } +} + +class _$Search extends Search { + @override + final String query; + @override + final BuiltList results; + + factory _$Search([void Function(SearchBuilder)? updates]) => + (new SearchBuilder()..update(updates)).build(); + + _$Search._({required this.query, required this.results}) : super._() { + BuiltValueNullFieldError.checkNotNull(query, 'Search', 'query'); + BuiltValueNullFieldError.checkNotNull(results, 'Search', 'results'); + } + + @override + Search rebuild(void Function(SearchBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SearchBuilder toBuilder() => new SearchBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is Search && query == other.query && results == other.results; + } + + @override + int get hashCode { + return $jf($jc($jc(0, query.hashCode), results.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('Search') + ..add('query', query) + ..add('results', results)) + .toString(); + } +} + +class SearchBuilder implements Builder { + _$Search? _$v; + + String? _query; + String? get query => _$this._query; + set query(String? query) => _$this._query = query; + + ListBuilder? _results; + ListBuilder get results => + _$this._results ??= new ListBuilder(); + set results(ListBuilder? results) => _$this._results = results; + + SearchBuilder(); + + SearchBuilder get _$this { + final $v = _$v; + if ($v != null) { + _query = $v.query; + _results = $v.results.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(Search other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$Search; + } + + @override + void update(void Function(SearchBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$Search build() { + _$Search _$result; + try { + _$result = _$v ?? + new _$Search._( + query: BuiltValueNullFieldError.checkNotNull( + query, 'Search', 'query'), + results: results.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'results'; + results.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + 'Search', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/serializers.dart b/desktop_photo_search/material/lib/src/serializers.dart new file mode 100644 index 000000000..6153a3d45 --- /dev/null +++ b/desktop_photo_search/material/lib/src/serializers.dart @@ -0,0 +1,27 @@ +// Copyright 2019 The Flutter team. 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:built_collection/built_collection.dart'; +import 'package:built_value/serializer.dart'; +import 'package:built_value/standard_json_plugin.dart'; + +import 'model/search.dart'; +import 'unsplash/api_error.dart'; +import 'unsplash/current_user_collections.dart'; +import 'unsplash/exif.dart'; +import 'unsplash/links.dart'; +import 'unsplash/location.dart'; +import 'unsplash/photo.dart'; +import 'unsplash/position.dart'; +import 'unsplash/search_photos_response.dart'; +import 'unsplash/tags.dart'; +import 'unsplash/urls.dart'; +import 'unsplash/user.dart'; + +part 'serializers.g.dart'; + +//add all of the built value types that require serialization +@SerializersFor([Search, ApiError, Photo, SearchPhotosResponse]) +final Serializers serializers = + (_$serializers.toBuilder()..addPlugin(StandardJsonPlugin())).build(); diff --git a/desktop_photo_search/material/lib/src/serializers.g.dart b/desktop_photo_search/material/lib/src/serializers.g.dart new file mode 100644 index 000000000..ad330123c --- /dev/null +++ b/desktop_photo_search/material/lib/src/serializers.g.dart @@ -0,0 +1,44 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'serializers.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializers _$serializers = (new Serializers().toBuilder() + ..add(ApiError.serializer) + ..add(CurrentUserCollections.serializer) + ..add(Exif.serializer) + ..add(Links.serializer) + ..add(Location.serializer) + ..add(Photo.serializer) + ..add(Position.serializer) + ..add(Search.serializer) + ..add(SearchPhotosResponse.serializer) + ..add(Tags.serializer) + ..add(Urls.serializer) + ..add(User.serializer) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(Photo)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(Photo)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(String)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(Tags)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType( + BuiltList, const [const FullType(CurrentUserCollections)]), + () => new ListBuilder())) + .build(); + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/api_error.dart b/desktop_photo_search/material/lib/src/unsplash/api_error.dart new file mode 100644 index 000000000..72e48a691 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/api_error.dart @@ -0,0 +1,33 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; + +part 'api_error.g.dart'; + +abstract class ApiError implements Built { + factory ApiError([void Function(ApiErrorBuilder)? updates]) = _$ApiError; + + ApiError._(); + + @BuiltValueField(wireName: 'errors') + BuiltList? get errors; + + String toJson() { + return json.encode(serializers.serializeWith(ApiError.serializer, this)); + } + + static ApiError? fromJson(String jsonString) { + return serializers.deserializeWith( + ApiError.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$apiErrorSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/api_error.g.dart b/desktop_photo_search/material/lib/src/unsplash/api_error.g.dart new file mode 100644 index 000000000..1c900a54d --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/api_error.g.dart @@ -0,0 +1,146 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'api_error.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$apiErrorSerializer = new _$ApiErrorSerializer(); + +class _$ApiErrorSerializer implements StructuredSerializer { + @override + final Iterable types = const [ApiError, _$ApiError]; + @override + final String wireName = 'ApiError'; + + @override + Iterable serialize(Serializers serializers, ApiError object, + {FullType specifiedType = FullType.unspecified}) { + final result = []; + Object? value; + value = object.errors; + if (value != null) { + result + ..add('errors') + ..add(serializers.serialize(value, + specifiedType: + const FullType(BuiltList, const [const FullType(String)]))); + } + return result; + } + + @override + ApiError deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new ApiErrorBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'errors': + result.errors.replace(serializers.deserialize(value, + specifiedType: const FullType( + BuiltList, const [const FullType(String)]))! + as BuiltList); + break; + } + } + + return result.build(); + } +} + +class _$ApiError extends ApiError { + @override + final BuiltList? errors; + + factory _$ApiError([void Function(ApiErrorBuilder)? updates]) => + (new ApiErrorBuilder()..update(updates)).build(); + + _$ApiError._({this.errors}) : super._(); + + @override + ApiError rebuild(void Function(ApiErrorBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + ApiErrorBuilder toBuilder() => new ApiErrorBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is ApiError && errors == other.errors; + } + + @override + int get hashCode { + return $jf($jc(0, errors.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('ApiError')..add('errors', errors)) + .toString(); + } +} + +class ApiErrorBuilder implements Builder { + _$ApiError? _$v; + + ListBuilder? _errors; + ListBuilder get errors => + _$this._errors ??= new ListBuilder(); + set errors(ListBuilder? errors) => _$this._errors = errors; + + ApiErrorBuilder(); + + ApiErrorBuilder get _$this { + final $v = _$v; + if ($v != null) { + _errors = $v.errors?.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(ApiError other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$ApiError; + } + + @override + void update(void Function(ApiErrorBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$ApiError build() { + _$ApiError _$result; + try { + _$result = _$v ?? new _$ApiError._(errors: _errors?.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'errors'; + _errors?.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + 'ApiError', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/current_user_collections.dart b/desktop_photo_search/material/lib/src/unsplash/current_user_collections.dart new file mode 100644 index 000000000..205b3e755 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/current_user_collections.dart @@ -0,0 +1,46 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; + +part 'current_user_collections.g.dart'; + +abstract class CurrentUserCollections + implements Built { + factory CurrentUserCollections( + [void Function(CurrentUserCollectionsBuilder)? updates]) = + _$CurrentUserCollections; + + CurrentUserCollections._(); + + @BuiltValueField(wireName: 'id') + int get id; + + @BuiltValueField(wireName: 'title') + String? get title; + + @BuiltValueField(wireName: 'published_at') + String? get publishedAt; + + @BuiltValueField(wireName: 'updated_at') + String? get updatedAt; + + String toJson() { + return json.encode( + serializers.serializeWith(CurrentUserCollections.serializer, this)); + } + + static CurrentUserCollections? fromJson(String jsonString) { + return serializers.deserializeWith( + CurrentUserCollections.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => + _$currentUserCollectionsSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/current_user_collections.g.dart b/desktop_photo_search/material/lib/src/unsplash/current_user_collections.g.dart new file mode 100644 index 000000000..73e703b83 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/current_user_collections.g.dart @@ -0,0 +1,210 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'current_user_collections.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$currentUserCollectionsSerializer = + new _$CurrentUserCollectionsSerializer(); + +class _$CurrentUserCollectionsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + CurrentUserCollections, + _$CurrentUserCollections + ]; + @override + final String wireName = 'CurrentUserCollections'; + + @override + Iterable serialize( + Serializers serializers, CurrentUserCollections object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'id', + serializers.serialize(object.id, specifiedType: const FullType(int)), + ]; + Object? value; + value = object.title; + if (value != null) { + result + ..add('title') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.publishedAt; + if (value != null) { + result + ..add('published_at') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.updatedAt; + if (value != null) { + result + ..add('updated_at') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + return result; + } + + @override + CurrentUserCollections deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new CurrentUserCollectionsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'id': + result.id = serializers.deserialize(value, + specifiedType: const FullType(int)) as int; + break; + case 'title': + result.title = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'published_at': + result.publishedAt = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'updated_at': + result.updatedAt = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + } + } + + return result.build(); + } +} + +class _$CurrentUserCollections extends CurrentUserCollections { + @override + final int id; + @override + final String? title; + @override + final String? publishedAt; + @override + final String? updatedAt; + + factory _$CurrentUserCollections( + [void Function(CurrentUserCollectionsBuilder)? updates]) => + (new CurrentUserCollectionsBuilder()..update(updates)).build(); + + _$CurrentUserCollections._( + {required this.id, this.title, this.publishedAt, this.updatedAt}) + : super._() { + BuiltValueNullFieldError.checkNotNull(id, 'CurrentUserCollections', 'id'); + } + + @override + CurrentUserCollections rebuild( + void Function(CurrentUserCollectionsBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + CurrentUserCollectionsBuilder toBuilder() => + new CurrentUserCollectionsBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is CurrentUserCollections && + id == other.id && + title == other.title && + publishedAt == other.publishedAt && + updatedAt == other.updatedAt; + } + + @override + int get hashCode { + return $jf($jc( + $jc($jc($jc(0, id.hashCode), title.hashCode), publishedAt.hashCode), + updatedAt.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('CurrentUserCollections') + ..add('id', id) + ..add('title', title) + ..add('publishedAt', publishedAt) + ..add('updatedAt', updatedAt)) + .toString(); + } +} + +class CurrentUserCollectionsBuilder + implements Builder { + _$CurrentUserCollections? _$v; + + int? _id; + int? get id => _$this._id; + set id(int? id) => _$this._id = id; + + String? _title; + String? get title => _$this._title; + set title(String? title) => _$this._title = title; + + String? _publishedAt; + String? get publishedAt => _$this._publishedAt; + set publishedAt(String? publishedAt) => _$this._publishedAt = publishedAt; + + String? _updatedAt; + String? get updatedAt => _$this._updatedAt; + set updatedAt(String? updatedAt) => _$this._updatedAt = updatedAt; + + CurrentUserCollectionsBuilder(); + + CurrentUserCollectionsBuilder get _$this { + final $v = _$v; + if ($v != null) { + _id = $v.id; + _title = $v.title; + _publishedAt = $v.publishedAt; + _updatedAt = $v.updatedAt; + _$v = null; + } + return this; + } + + @override + void replace(CurrentUserCollections other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$CurrentUserCollections; + } + + @override + void update(void Function(CurrentUserCollectionsBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$CurrentUserCollections build() { + final _$result = _$v ?? + new _$CurrentUserCollections._( + id: BuiltValueNullFieldError.checkNotNull( + id, 'CurrentUserCollections', 'id'), + title: title, + publishedAt: publishedAt, + updatedAt: updatedAt); + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/exif.dart b/desktop_photo_search/material/lib/src/unsplash/exif.dart new file mode 100644 index 000000000..709b5b209 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/exif.dart @@ -0,0 +1,47 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; + +part 'exif.g.dart'; + +abstract class Exif implements Built { + factory Exif([void Function(ExifBuilder)? updates]) = _$Exif; + + Exif._(); + + @BuiltValueField(wireName: 'make') + String? get make; + + @BuiltValueField(wireName: 'model') + String? get model; + + @BuiltValueField(wireName: 'exposure_time') + String? get exposureTime; + + @BuiltValueField(wireName: 'aperture') + String? get aperture; + + @BuiltValueField(wireName: 'focal_length') + String? get focalLength; + + @BuiltValueField(wireName: 'iso') + int? get iso; + + String toJson() { + return json.encode(serializers.serializeWith(Exif.serializer, this)); + } + + static Exif? fromJson(String jsonString) { + return serializers.deserializeWith( + Exif.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$exifSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/exif.g.dart b/desktop_photo_search/material/lib/src/unsplash/exif.g.dart new file mode 100644 index 000000000..e2b81a351 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/exif.g.dart @@ -0,0 +1,251 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'exif.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$exifSerializer = new _$ExifSerializer(); + +class _$ExifSerializer implements StructuredSerializer { + @override + final Iterable types = const [Exif, _$Exif]; + @override + final String wireName = 'Exif'; + + @override + Iterable serialize(Serializers serializers, Exif object, + {FullType specifiedType = FullType.unspecified}) { + final result = []; + Object? value; + value = object.make; + if (value != null) { + result + ..add('make') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.model; + if (value != null) { + result + ..add('model') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.exposureTime; + if (value != null) { + result + ..add('exposure_time') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.aperture; + if (value != null) { + result + ..add('aperture') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.focalLength; + if (value != null) { + result + ..add('focal_length') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.iso; + if (value != null) { + result + ..add('iso') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + return result; + } + + @override + Exif deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new ExifBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'make': + result.make = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'model': + result.model = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'exposure_time': + result.exposureTime = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'aperture': + result.aperture = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'focal_length': + result.focalLength = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'iso': + result.iso = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + } + } + + return result.build(); + } +} + +class _$Exif extends Exif { + @override + final String? make; + @override + final String? model; + @override + final String? exposureTime; + @override + final String? aperture; + @override + final String? focalLength; + @override + final int? iso; + + factory _$Exif([void Function(ExifBuilder)? updates]) => + (new ExifBuilder()..update(updates)).build(); + + _$Exif._( + {this.make, + this.model, + this.exposureTime, + this.aperture, + this.focalLength, + this.iso}) + : super._(); + + @override + Exif rebuild(void Function(ExifBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + ExifBuilder toBuilder() => new ExifBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is Exif && + make == other.make && + model == other.model && + exposureTime == other.exposureTime && + aperture == other.aperture && + focalLength == other.focalLength && + iso == other.iso; + } + + @override + int get hashCode { + return $jf($jc( + $jc( + $jc( + $jc($jc($jc(0, make.hashCode), model.hashCode), + exposureTime.hashCode), + aperture.hashCode), + focalLength.hashCode), + iso.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('Exif') + ..add('make', make) + ..add('model', model) + ..add('exposureTime', exposureTime) + ..add('aperture', aperture) + ..add('focalLength', focalLength) + ..add('iso', iso)) + .toString(); + } +} + +class ExifBuilder implements Builder { + _$Exif? _$v; + + String? _make; + String? get make => _$this._make; + set make(String? make) => _$this._make = make; + + String? _model; + String? get model => _$this._model; + set model(String? model) => _$this._model = model; + + String? _exposureTime; + String? get exposureTime => _$this._exposureTime; + set exposureTime(String? exposureTime) => _$this._exposureTime = exposureTime; + + String? _aperture; + String? get aperture => _$this._aperture; + set aperture(String? aperture) => _$this._aperture = aperture; + + String? _focalLength; + String? get focalLength => _$this._focalLength; + set focalLength(String? focalLength) => _$this._focalLength = focalLength; + + int? _iso; + int? get iso => _$this._iso; + set iso(int? iso) => _$this._iso = iso; + + ExifBuilder(); + + ExifBuilder get _$this { + final $v = _$v; + if ($v != null) { + _make = $v.make; + _model = $v.model; + _exposureTime = $v.exposureTime; + _aperture = $v.aperture; + _focalLength = $v.focalLength; + _iso = $v.iso; + _$v = null; + } + return this; + } + + @override + void replace(Exif other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$Exif; + } + + @override + void update(void Function(ExifBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$Exif build() { + final _$result = _$v ?? + new _$Exif._( + make: make, + model: model, + exposureTime: exposureTime, + aperture: aperture, + focalLength: focalLength, + iso: iso); + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/links.dart b/desktop_photo_search/material/lib/src/unsplash/links.dart new file mode 100644 index 000000000..612195b1b --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/links.dart @@ -0,0 +1,41 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; + +part 'links.g.dart'; + +abstract class Links implements Built { + factory Links([void Function(LinksBuilder)? updates]) = _$Links; + + Links._(); + + @BuiltValueField(wireName: 'self') + String? get self; + + @BuiltValueField(wireName: 'html') + String? get html; + + @BuiltValueField(wireName: 'download') + String? get download; + + @BuiltValueField(wireName: 'download_location') + String? get downloadLocation; + + String toJson() { + return json.encode(serializers.serializeWith(Links.serializer, this)); + } + + static Links? fromJson(String jsonString) { + return serializers.deserializeWith( + Links.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$linksSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/links.g.dart b/desktop_photo_search/material/lib/src/unsplash/links.g.dart new file mode 100644 index 000000000..503f2d39a --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/links.g.dart @@ -0,0 +1,200 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'links.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$linksSerializer = new _$LinksSerializer(); + +class _$LinksSerializer implements StructuredSerializer { + @override + final Iterable types = const [Links, _$Links]; + @override + final String wireName = 'Links'; + + @override + Iterable serialize(Serializers serializers, Links object, + {FullType specifiedType = FullType.unspecified}) { + final result = []; + Object? value; + value = object.self; + if (value != null) { + result + ..add('self') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.html; + if (value != null) { + result + ..add('html') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.download; + if (value != null) { + result + ..add('download') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.downloadLocation; + if (value != null) { + result + ..add('download_location') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + return result; + } + + @override + Links deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new LinksBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'self': + result.self = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'html': + result.html = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'download': + result.download = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'download_location': + result.downloadLocation = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + } + } + + return result.build(); + } +} + +class _$Links extends Links { + @override + final String? self; + @override + final String? html; + @override + final String? download; + @override + final String? downloadLocation; + + factory _$Links([void Function(LinksBuilder)? updates]) => + (new LinksBuilder()..update(updates)).build(); + + _$Links._({this.self, this.html, this.download, this.downloadLocation}) + : super._(); + + @override + Links rebuild(void Function(LinksBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + LinksBuilder toBuilder() => new LinksBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is Links && + self == other.self && + html == other.html && + download == other.download && + downloadLocation == other.downloadLocation; + } + + @override + int get hashCode { + return $jf($jc( + $jc($jc($jc(0, self.hashCode), html.hashCode), download.hashCode), + downloadLocation.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('Links') + ..add('self', self) + ..add('html', html) + ..add('download', download) + ..add('downloadLocation', downloadLocation)) + .toString(); + } +} + +class LinksBuilder implements Builder { + _$Links? _$v; + + String? _self; + String? get self => _$this._self; + set self(String? self) => _$this._self = self; + + String? _html; + String? get html => _$this._html; + set html(String? html) => _$this._html = html; + + String? _download; + String? get download => _$this._download; + set download(String? download) => _$this._download = download; + + String? _downloadLocation; + String? get downloadLocation => _$this._downloadLocation; + set downloadLocation(String? downloadLocation) => + _$this._downloadLocation = downloadLocation; + + LinksBuilder(); + + LinksBuilder get _$this { + final $v = _$v; + if ($v != null) { + _self = $v.self; + _html = $v.html; + _download = $v.download; + _downloadLocation = $v.downloadLocation; + _$v = null; + } + return this; + } + + @override + void replace(Links other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$Links; + } + + @override + void update(void Function(LinksBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$Links build() { + final _$result = _$v ?? + new _$Links._( + self: self, + html: html, + download: download, + downloadLocation: downloadLocation); + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/location.dart b/desktop_photo_search/material/lib/src/unsplash/location.dart new file mode 100644 index 000000000..e426bef97 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/location.dart @@ -0,0 +1,39 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; +import 'position.dart'; + +part 'location.g.dart'; + +abstract class Location implements Built { + factory Location([void Function(LocationBuilder)? updates]) = _$Location; + + Location._(); + + @BuiltValueField(wireName: 'city') + String? get city; + + @BuiltValueField(wireName: 'country') + String? get country; + + @BuiltValueField(wireName: 'position') + Position? get position; + + String toJson() { + return json.encode(serializers.serializeWith(Location.serializer, this)); + } + + static Location? fromJson(String jsonString) { + return serializers.deserializeWith( + Location.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$locationSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/location.g.dart b/desktop_photo_search/material/lib/src/unsplash/location.g.dart new file mode 100644 index 000000000..54b96ae73 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/location.g.dart @@ -0,0 +1,187 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'location.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$locationSerializer = new _$LocationSerializer(); + +class _$LocationSerializer implements StructuredSerializer { + @override + final Iterable types = const [Location, _$Location]; + @override + final String wireName = 'Location'; + + @override + Iterable serialize(Serializers serializers, Location object, + {FullType specifiedType = FullType.unspecified}) { + final result = []; + Object? value; + value = object.city; + if (value != null) { + result + ..add('city') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.country; + if (value != null) { + result + ..add('country') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.position; + if (value != null) { + result + ..add('position') + ..add(serializers.serialize(value, + specifiedType: const FullType(Position))); + } + return result; + } + + @override + Location deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new LocationBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'city': + result.city = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'country': + result.country = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'position': + result.position.replace(serializers.deserialize(value, + specifiedType: const FullType(Position))! as Position); + break; + } + } + + return result.build(); + } +} + +class _$Location extends Location { + @override + final String? city; + @override + final String? country; + @override + final Position? position; + + factory _$Location([void Function(LocationBuilder)? updates]) => + (new LocationBuilder()..update(updates)).build(); + + _$Location._({this.city, this.country, this.position}) : super._(); + + @override + Location rebuild(void Function(LocationBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + LocationBuilder toBuilder() => new LocationBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is Location && + city == other.city && + country == other.country && + position == other.position; + } + + @override + int get hashCode { + return $jf( + $jc($jc($jc(0, city.hashCode), country.hashCode), position.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('Location') + ..add('city', city) + ..add('country', country) + ..add('position', position)) + .toString(); + } +} + +class LocationBuilder implements Builder { + _$Location? _$v; + + String? _city; + String? get city => _$this._city; + set city(String? city) => _$this._city = city; + + String? _country; + String? get country => _$this._country; + set country(String? country) => _$this._country = country; + + PositionBuilder? _position; + PositionBuilder get position => _$this._position ??= new PositionBuilder(); + set position(PositionBuilder? position) => _$this._position = position; + + LocationBuilder(); + + LocationBuilder get _$this { + final $v = _$v; + if ($v != null) { + _city = $v.city; + _country = $v.country; + _position = $v.position?.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(Location other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$Location; + } + + @override + void update(void Function(LocationBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$Location build() { + _$Location _$result; + try { + _$result = _$v ?? + new _$Location._( + city: city, country: country, position: _position?.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'position'; + _position?.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + 'Location', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/photo.dart b/desktop_photo_search/material/lib/src/unsplash/photo.dart new file mode 100644 index 000000000..e303fad4c --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/photo.dart @@ -0,0 +1,88 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; +import 'current_user_collections.dart'; +import 'exif.dart'; +import 'links.dart'; +import 'location.dart'; +import 'tags.dart'; +import 'urls.dart'; +import 'user.dart'; + +part 'photo.g.dart'; + +abstract class Photo implements Built { + factory Photo([void Function(PhotoBuilder)? updates]) = _$Photo; + + Photo._(); + + @BuiltValueField(wireName: 'id') + String get id; + + @BuiltValueField(wireName: 'created_at') + String? get createdAt; + + @BuiltValueField(wireName: 'updated_at') + String? get updatedAt; + + @BuiltValueField(wireName: 'width') + int? get width; + + @BuiltValueField(wireName: 'height') + int? get height; + + @BuiltValueField(wireName: 'color') + String? get color; + + @BuiltValueField(wireName: 'downloads') + int? get downloads; + + @BuiltValueField(wireName: 'likes') + int? get likes; + + @BuiltValueField(wireName: 'liked_by_user') + bool? get likedByUser; + + @BuiltValueField(wireName: 'description') + String? get description; + + @BuiltValueField(wireName: 'exif') + Exif? get exif; + + @BuiltValueField(wireName: 'location') + Location? get location; + + @BuiltValueField(wireName: 'tags') + BuiltList? get tags; + + @BuiltValueField(wireName: 'current_user_collections') + BuiltList? get currentUserCollections; + + @BuiltValueField(wireName: 'urls') + Urls? get urls; + + @BuiltValueField(wireName: 'links') + Links? get links; + + @BuiltValueField(wireName: 'user') + User? get user; + + String toJson() { + return json.encode(serializers.serializeWith(Photo.serializer, this)); + } + + static Photo? fromJson(String jsonString) { + return serializers.deserializeWith( + Photo.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$photoSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/photo.g.dart b/desktop_photo_search/material/lib/src/unsplash/photo.g.dart new file mode 100644 index 000000000..69bcb8b28 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/photo.g.dart @@ -0,0 +1,553 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'photo.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$photoSerializer = new _$PhotoSerializer(); + +class _$PhotoSerializer implements StructuredSerializer { + @override + final Iterable types = const [Photo, _$Photo]; + @override + final String wireName = 'Photo'; + + @override + Iterable serialize(Serializers serializers, Photo object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'id', + serializers.serialize(object.id, specifiedType: const FullType(String)), + ]; + Object? value; + value = object.createdAt; + if (value != null) { + result + ..add('created_at') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.updatedAt; + if (value != null) { + result + ..add('updated_at') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.width; + if (value != null) { + result + ..add('width') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + value = object.height; + if (value != null) { + result + ..add('height') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + value = object.color; + if (value != null) { + result + ..add('color') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.downloads; + if (value != null) { + result + ..add('downloads') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + value = object.likes; + if (value != null) { + result + ..add('likes') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + value = object.likedByUser; + if (value != null) { + result + ..add('liked_by_user') + ..add( + serializers.serialize(value, specifiedType: const FullType(bool))); + } + value = object.description; + if (value != null) { + result + ..add('description') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.exif; + if (value != null) { + result + ..add('exif') + ..add( + serializers.serialize(value, specifiedType: const FullType(Exif))); + } + value = object.location; + if (value != null) { + result + ..add('location') + ..add(serializers.serialize(value, + specifiedType: const FullType(Location))); + } + value = object.tags; + if (value != null) { + result + ..add('tags') + ..add(serializers.serialize(value, + specifiedType: + const FullType(BuiltList, const [const FullType(Tags)]))); + } + value = object.currentUserCollections; + if (value != null) { + result + ..add('current_user_collections') + ..add(serializers.serialize(value, + specifiedType: const FullType( + BuiltList, const [const FullType(CurrentUserCollections)]))); + } + value = object.urls; + if (value != null) { + result + ..add('urls') + ..add( + serializers.serialize(value, specifiedType: const FullType(Urls))); + } + value = object.links; + if (value != null) { + result + ..add('links') + ..add( + serializers.serialize(value, specifiedType: const FullType(Links))); + } + value = object.user; + if (value != null) { + result + ..add('user') + ..add( + serializers.serialize(value, specifiedType: const FullType(User))); + } + return result; + } + + @override + Photo deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new PhotoBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'id': + result.id = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'created_at': + result.createdAt = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'updated_at': + result.updatedAt = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'width': + result.width = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'height': + result.height = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'color': + result.color = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'downloads': + result.downloads = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'likes': + result.likes = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'liked_by_user': + result.likedByUser = serializers.deserialize(value, + specifiedType: const FullType(bool)) as bool?; + break; + case 'description': + result.description = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'exif': + result.exif.replace(serializers.deserialize(value, + specifiedType: const FullType(Exif))! as Exif); + break; + case 'location': + result.location.replace(serializers.deserialize(value, + specifiedType: const FullType(Location))! as Location); + break; + case 'tags': + result.tags.replace(serializers.deserialize(value, + specifiedType: + const FullType(BuiltList, const [const FullType(Tags)]))! + as BuiltList); + break; + case 'current_user_collections': + result.currentUserCollections.replace(serializers.deserialize(value, + specifiedType: const FullType(BuiltList, const [ + const FullType(CurrentUserCollections) + ]))! as BuiltList); + break; + case 'urls': + result.urls.replace(serializers.deserialize(value, + specifiedType: const FullType(Urls))! as Urls); + break; + case 'links': + result.links.replace(serializers.deserialize(value, + specifiedType: const FullType(Links))! as Links); + break; + case 'user': + result.user.replace(serializers.deserialize(value, + specifiedType: const FullType(User))! as User); + break; + } + } + + return result.build(); + } +} + +class _$Photo extends Photo { + @override + final String id; + @override + final String? createdAt; + @override + final String? updatedAt; + @override + final int? width; + @override + final int? height; + @override + final String? color; + @override + final int? downloads; + @override + final int? likes; + @override + final bool? likedByUser; + @override + final String? description; + @override + final Exif? exif; + @override + final Location? location; + @override + final BuiltList? tags; + @override + final BuiltList? currentUserCollections; + @override + final Urls? urls; + @override + final Links? links; + @override + final User? user; + + factory _$Photo([void Function(PhotoBuilder)? updates]) => + (new PhotoBuilder()..update(updates)).build(); + + _$Photo._( + {required this.id, + this.createdAt, + this.updatedAt, + this.width, + this.height, + this.color, + this.downloads, + this.likes, + this.likedByUser, + this.description, + this.exif, + this.location, + this.tags, + this.currentUserCollections, + this.urls, + this.links, + this.user}) + : super._() { + BuiltValueNullFieldError.checkNotNull(id, 'Photo', 'id'); + } + + @override + Photo rebuild(void Function(PhotoBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + PhotoBuilder toBuilder() => new PhotoBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is Photo && + id == other.id && + createdAt == other.createdAt && + updatedAt == other.updatedAt && + width == other.width && + height == other.height && + color == other.color && + downloads == other.downloads && + likes == other.likes && + likedByUser == other.likedByUser && + description == other.description && + exif == other.exif && + location == other.location && + tags == other.tags && + currentUserCollections == other.currentUserCollections && + urls == other.urls && + links == other.links && + user == other.user; + } + + @override + int get hashCode { + return $jf($jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + 0, + id + .hashCode), + createdAt + .hashCode), + updatedAt + .hashCode), + width.hashCode), + height.hashCode), + color.hashCode), + downloads.hashCode), + likes.hashCode), + likedByUser.hashCode), + description.hashCode), + exif.hashCode), + location.hashCode), + tags.hashCode), + currentUserCollections.hashCode), + urls.hashCode), + links.hashCode), + user.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('Photo') + ..add('id', id) + ..add('createdAt', createdAt) + ..add('updatedAt', updatedAt) + ..add('width', width) + ..add('height', height) + ..add('color', color) + ..add('downloads', downloads) + ..add('likes', likes) + ..add('likedByUser', likedByUser) + ..add('description', description) + ..add('exif', exif) + ..add('location', location) + ..add('tags', tags) + ..add('currentUserCollections', currentUserCollections) + ..add('urls', urls) + ..add('links', links) + ..add('user', user)) + .toString(); + } +} + +class PhotoBuilder implements Builder { + _$Photo? _$v; + + String? _id; + String? get id => _$this._id; + set id(String? id) => _$this._id = id; + + String? _createdAt; + String? get createdAt => _$this._createdAt; + set createdAt(String? createdAt) => _$this._createdAt = createdAt; + + String? _updatedAt; + String? get updatedAt => _$this._updatedAt; + set updatedAt(String? updatedAt) => _$this._updatedAt = updatedAt; + + int? _width; + int? get width => _$this._width; + set width(int? width) => _$this._width = width; + + int? _height; + int? get height => _$this._height; + set height(int? height) => _$this._height = height; + + String? _color; + String? get color => _$this._color; + set color(String? color) => _$this._color = color; + + int? _downloads; + int? get downloads => _$this._downloads; + set downloads(int? downloads) => _$this._downloads = downloads; + + int? _likes; + int? get likes => _$this._likes; + set likes(int? likes) => _$this._likes = likes; + + bool? _likedByUser; + bool? get likedByUser => _$this._likedByUser; + set likedByUser(bool? likedByUser) => _$this._likedByUser = likedByUser; + + String? _description; + String? get description => _$this._description; + set description(String? description) => _$this._description = description; + + ExifBuilder? _exif; + ExifBuilder get exif => _$this._exif ??= new ExifBuilder(); + set exif(ExifBuilder? exif) => _$this._exif = exif; + + LocationBuilder? _location; + LocationBuilder get location => _$this._location ??= new LocationBuilder(); + set location(LocationBuilder? location) => _$this._location = location; + + ListBuilder? _tags; + ListBuilder get tags => _$this._tags ??= new ListBuilder(); + set tags(ListBuilder? tags) => _$this._tags = tags; + + ListBuilder? _currentUserCollections; + ListBuilder get currentUserCollections => + _$this._currentUserCollections ??= + new ListBuilder(); + set currentUserCollections( + ListBuilder? currentUserCollections) => + _$this._currentUserCollections = currentUserCollections; + + UrlsBuilder? _urls; + UrlsBuilder get urls => _$this._urls ??= new UrlsBuilder(); + set urls(UrlsBuilder? urls) => _$this._urls = urls; + + LinksBuilder? _links; + LinksBuilder get links => _$this._links ??= new LinksBuilder(); + set links(LinksBuilder? links) => _$this._links = links; + + UserBuilder? _user; + UserBuilder get user => _$this._user ??= new UserBuilder(); + set user(UserBuilder? user) => _$this._user = user; + + PhotoBuilder(); + + PhotoBuilder get _$this { + final $v = _$v; + if ($v != null) { + _id = $v.id; + _createdAt = $v.createdAt; + _updatedAt = $v.updatedAt; + _width = $v.width; + _height = $v.height; + _color = $v.color; + _downloads = $v.downloads; + _likes = $v.likes; + _likedByUser = $v.likedByUser; + _description = $v.description; + _exif = $v.exif?.toBuilder(); + _location = $v.location?.toBuilder(); + _tags = $v.tags?.toBuilder(); + _currentUserCollections = $v.currentUserCollections?.toBuilder(); + _urls = $v.urls?.toBuilder(); + _links = $v.links?.toBuilder(); + _user = $v.user?.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(Photo other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$Photo; + } + + @override + void update(void Function(PhotoBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$Photo build() { + _$Photo _$result; + try { + _$result = _$v ?? + new _$Photo._( + id: BuiltValueNullFieldError.checkNotNull(id, 'Photo', 'id'), + createdAt: createdAt, + updatedAt: updatedAt, + width: width, + height: height, + color: color, + downloads: downloads, + likes: likes, + likedByUser: likedByUser, + description: description, + exif: _exif?.build(), + location: _location?.build(), + tags: _tags?.build(), + currentUserCollections: _currentUserCollections?.build(), + urls: _urls?.build(), + links: _links?.build(), + user: _user?.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'exif'; + _exif?.build(); + _$failedField = 'location'; + _location?.build(); + _$failedField = 'tags'; + _tags?.build(); + _$failedField = 'currentUserCollections'; + _currentUserCollections?.build(); + _$failedField = 'urls'; + _urls?.build(); + _$failedField = 'links'; + _links?.build(); + _$failedField = 'user'; + _user?.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + 'Photo', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/position.dart b/desktop_photo_search/material/lib/src/unsplash/position.dart new file mode 100644 index 000000000..4399eb23f --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/position.dart @@ -0,0 +1,35 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; + +part 'position.g.dart'; + +abstract class Position implements Built { + factory Position([void Function(PositionBuilder)? updates]) = _$Position; + + Position._(); + + @BuiltValueField(wireName: 'latitude') + double get latitude; + + @BuiltValueField(wireName: 'longitude') + double get longitude; + + String toJson() { + return json.encode(serializers.serializeWith(Position.serializer, this)); + } + + static Position? fromJson(String jsonString) { + return serializers.deserializeWith( + Position.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$positionSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/position.g.dart b/desktop_photo_search/material/lib/src/unsplash/position.g.dart new file mode 100644 index 000000000..6fb2a843e --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/position.g.dart @@ -0,0 +1,152 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'position.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$positionSerializer = new _$PositionSerializer(); + +class _$PositionSerializer implements StructuredSerializer { + @override + final Iterable types = const [Position, _$Position]; + @override + final String wireName = 'Position'; + + @override + Iterable serialize(Serializers serializers, Position object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'latitude', + serializers.serialize(object.latitude, + specifiedType: const FullType(double)), + 'longitude', + serializers.serialize(object.longitude, + specifiedType: const FullType(double)), + ]; + + return result; + } + + @override + Position deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new PositionBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'latitude': + result.latitude = serializers.deserialize(value, + specifiedType: const FullType(double)) as double; + break; + case 'longitude': + result.longitude = serializers.deserialize(value, + specifiedType: const FullType(double)) as double; + break; + } + } + + return result.build(); + } +} + +class _$Position extends Position { + @override + final double latitude; + @override + final double longitude; + + factory _$Position([void Function(PositionBuilder)? updates]) => + (new PositionBuilder()..update(updates)).build(); + + _$Position._({required this.latitude, required this.longitude}) : super._() { + BuiltValueNullFieldError.checkNotNull(latitude, 'Position', 'latitude'); + BuiltValueNullFieldError.checkNotNull(longitude, 'Position', 'longitude'); + } + + @override + Position rebuild(void Function(PositionBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + PositionBuilder toBuilder() => new PositionBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is Position && + latitude == other.latitude && + longitude == other.longitude; + } + + @override + int get hashCode { + return $jf($jc($jc(0, latitude.hashCode), longitude.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('Position') + ..add('latitude', latitude) + ..add('longitude', longitude)) + .toString(); + } +} + +class PositionBuilder implements Builder { + _$Position? _$v; + + double? _latitude; + double? get latitude => _$this._latitude; + set latitude(double? latitude) => _$this._latitude = latitude; + + double? _longitude; + double? get longitude => _$this._longitude; + set longitude(double? longitude) => _$this._longitude = longitude; + + PositionBuilder(); + + PositionBuilder get _$this { + final $v = _$v; + if ($v != null) { + _latitude = $v.latitude; + _longitude = $v.longitude; + _$v = null; + } + return this; + } + + @override + void replace(Position other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$Position; + } + + @override + void update(void Function(PositionBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$Position build() { + final _$result = _$v ?? + new _$Position._( + latitude: BuiltValueNullFieldError.checkNotNull( + latitude, 'Position', 'latitude'), + longitude: BuiltValueNullFieldError.checkNotNull( + longitude, 'Position', 'longitude')); + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/search_photos_response.dart b/desktop_photo_search/material/lib/src/unsplash/search_photos_response.dart new file mode 100644 index 000000000..2d4905024 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/search_photos_response.dart @@ -0,0 +1,45 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; +import 'photo.dart'; + +part 'search_photos_response.g.dart'; + +abstract class SearchPhotosResponse + implements Built { + factory SearchPhotosResponse( + [void Function(SearchPhotosResponseBuilder)? updates]) = + _$SearchPhotosResponse; + + SearchPhotosResponse._(); + + @BuiltValueField(wireName: 'total') + int? get total; + + @BuiltValueField(wireName: 'total_pages') + int? get totalPages; + + @BuiltValueField(wireName: 'results') + BuiltList get results; + + String toJson() { + return json.encode( + serializers.serializeWith(SearchPhotosResponse.serializer, this)); + } + + static SearchPhotosResponse? fromJson(String jsonString) { + return serializers.deserializeWith( + SearchPhotosResponse.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => + _$searchPhotosResponseSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/search_photos_response.g.dart b/desktop_photo_search/material/lib/src/unsplash/search_photos_response.g.dart new file mode 100644 index 000000000..f967573a4 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/search_photos_response.g.dart @@ -0,0 +1,201 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'search_photos_response.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$searchPhotosResponseSerializer = + new _$SearchPhotosResponseSerializer(); + +class _$SearchPhotosResponseSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + SearchPhotosResponse, + _$SearchPhotosResponse + ]; + @override + final String wireName = 'SearchPhotosResponse'; + + @override + Iterable serialize( + Serializers serializers, SearchPhotosResponse object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'results', + serializers.serialize(object.results, + specifiedType: + const FullType(BuiltList, const [const FullType(Photo)])), + ]; + Object? value; + value = object.total; + if (value != null) { + result + ..add('total') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + value = object.totalPages; + if (value != null) { + result + ..add('total_pages') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + return result; + } + + @override + SearchPhotosResponse deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new SearchPhotosResponseBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'total': + result.total = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'total_pages': + result.totalPages = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'results': + result.results.replace(serializers.deserialize(value, + specifiedType: + const FullType(BuiltList, const [const FullType(Photo)]))! + as BuiltList); + break; + } + } + + return result.build(); + } +} + +class _$SearchPhotosResponse extends SearchPhotosResponse { + @override + final int? total; + @override + final int? totalPages; + @override + final BuiltList results; + + factory _$SearchPhotosResponse( + [void Function(SearchPhotosResponseBuilder)? updates]) => + (new SearchPhotosResponseBuilder()..update(updates)).build(); + + _$SearchPhotosResponse._({this.total, this.totalPages, required this.results}) + : super._() { + BuiltValueNullFieldError.checkNotNull( + results, 'SearchPhotosResponse', 'results'); + } + + @override + SearchPhotosResponse rebuild( + void Function(SearchPhotosResponseBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SearchPhotosResponseBuilder toBuilder() => + new SearchPhotosResponseBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SearchPhotosResponse && + total == other.total && + totalPages == other.totalPages && + results == other.results; + } + + @override + int get hashCode { + return $jf($jc( + $jc($jc(0, total.hashCode), totalPages.hashCode), results.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('SearchPhotosResponse') + ..add('total', total) + ..add('totalPages', totalPages) + ..add('results', results)) + .toString(); + } +} + +class SearchPhotosResponseBuilder + implements Builder { + _$SearchPhotosResponse? _$v; + + int? _total; + int? get total => _$this._total; + set total(int? total) => _$this._total = total; + + int? _totalPages; + int? get totalPages => _$this._totalPages; + set totalPages(int? totalPages) => _$this._totalPages = totalPages; + + ListBuilder? _results; + ListBuilder get results => + _$this._results ??= new ListBuilder(); + set results(ListBuilder? results) => _$this._results = results; + + SearchPhotosResponseBuilder(); + + SearchPhotosResponseBuilder get _$this { + final $v = _$v; + if ($v != null) { + _total = $v.total; + _totalPages = $v.totalPages; + _results = $v.results.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(SearchPhotosResponse other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SearchPhotosResponse; + } + + @override + void update(void Function(SearchPhotosResponseBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$SearchPhotosResponse build() { + _$SearchPhotosResponse _$result; + try { + _$result = _$v ?? + new _$SearchPhotosResponse._( + total: total, totalPages: totalPages, results: results.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'results'; + results.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + 'SearchPhotosResponse', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/tags.dart b/desktop_photo_search/material/lib/src/unsplash/tags.dart new file mode 100644 index 000000000..0073a6f34 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/tags.dart @@ -0,0 +1,32 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; + +part 'tags.g.dart'; + +abstract class Tags implements Built { + factory Tags([void Function(TagsBuilder)? updates]) = _$Tags; + + Tags._(); + + @BuiltValueField(wireName: 'title') + String get title; + + String toJson() { + return json.encode(serializers.serializeWith(Tags.serializer, this)); + } + + static Tags? fromJson(String jsonString) { + return serializers.deserializeWith( + Tags.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$tagsSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/tags.g.dart b/desktop_photo_search/material/lib/src/unsplash/tags.g.dart new file mode 100644 index 000000000..11a0de32f --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/tags.g.dart @@ -0,0 +1,131 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'tags.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$tagsSerializer = new _$TagsSerializer(); + +class _$TagsSerializer implements StructuredSerializer { + @override + final Iterable types = const [Tags, _$Tags]; + @override + final String wireName = 'Tags'; + + @override + Iterable serialize(Serializers serializers, Tags object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'title', + serializers.serialize(object.title, + specifiedType: const FullType(String)), + ]; + + return result; + } + + @override + Tags deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new TagsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'title': + result.title = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + } + } + + return result.build(); + } +} + +class _$Tags extends Tags { + @override + final String title; + + factory _$Tags([void Function(TagsBuilder)? updates]) => + (new TagsBuilder()..update(updates)).build(); + + _$Tags._({required this.title}) : super._() { + BuiltValueNullFieldError.checkNotNull(title, 'Tags', 'title'); + } + + @override + Tags rebuild(void Function(TagsBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + TagsBuilder toBuilder() => new TagsBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is Tags && title == other.title; + } + + @override + int get hashCode { + return $jf($jc(0, title.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('Tags')..add('title', title)) + .toString(); + } +} + +class TagsBuilder implements Builder { + _$Tags? _$v; + + String? _title; + String? get title => _$this._title; + set title(String? title) => _$this._title = title; + + TagsBuilder(); + + TagsBuilder get _$this { + final $v = _$v; + if ($v != null) { + _title = $v.title; + _$v = null; + } + return this; + } + + @override + void replace(Tags other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$Tags; + } + + @override + void update(void Function(TagsBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$Tags build() { + final _$result = _$v ?? + new _$Tags._( + title: + BuiltValueNullFieldError.checkNotNull(title, 'Tags', 'title')); + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/unsplash.dart b/desktop_photo_search/material/lib/src/unsplash/unsplash.dart new file mode 100644 index 000000000..09637a4d6 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/unsplash.dart @@ -0,0 +1,118 @@ +// Copyright 2019 The Flutter team. 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:convert'; +import 'dart:typed_data'; + +import 'package:http/http.dart' as http; +import 'package:logging/logging.dart'; + +import 'api_error.dart'; +import 'photo.dart'; +import 'search_photos_response.dart'; + +final _unsplashBaseUrl = Uri.parse('https://api.unsplash.com/'); + +/// Unsplash API Client. Requires an +/// [Unsplash API](https://unsplash.com/developers) `accessKey` to make +/// requests to the Unsplash API. +class Unsplash { + Unsplash({ + required String accessKey, + http.BaseClient? httpClient, + }) : _accessKey = accessKey, + _client = httpClient ?? http.Client(); + + final String _accessKey; + final http.Client _client; + final _log = Logger('Unsplash'); + + Future searchPhotos({ + required String query, + num page = 1, + num perPage = 10, + List collections = const [], + SearchPhotosOrientation? orientation, + }) async { + final searchPhotosUrl = _unsplashBaseUrl + .replace(path: '/search/photos', queryParameters: { + 'query': query, + if (page != 1) 'page': '$page', + if (perPage != 10) 'per_page': '$perPage', + if (collections.isNotEmpty) 'collections': collections.join(','), + if (orientation == SearchPhotosOrientation.landscape) + 'orientation': 'landscape', + if (orientation == SearchPhotosOrientation.portrait) + 'orientation': 'portrait', + if (orientation == SearchPhotosOrientation.squarish) + 'orientation': 'squarish', + }); + _log.info('GET $searchPhotosUrl'); + + final response = await _client.get( + searchPhotosUrl, + headers: { + 'Accept-Version': 'v1', + 'Authorization': 'Client-ID $_accessKey', + }, + ); + + dynamic body; + try { + body = json.fuse(utf8).decode(response.bodyBytes); + } catch (e) { + throw UnsplashException('Invalid JSON received'); + } + + if (body is Map && + body['errors'] is List && + body['errors'].isNotEmpty as bool) { + final apiError = ApiError.fromJson(response.body)!; + throw UnsplashException(apiError.errors!.join(', ')); + } + + return SearchPhotosResponse.fromJson( + response.body, + ); + } + + Future download(Photo photo) async { + // For detail on how downloading photos from Unsplash, please see + // https://help.unsplash.com/en/articles/2511258-guideline-triggering-a-download + + _log.info('GET ${photo.urls!.full}'); + final futureBytes = http.readBytes(Uri.parse(photo.urls!.full!), headers: { + 'Accept-Version': 'v1', + 'Authorization': 'Client-ID $_accessKey', + }); + + _log.info('GET ${photo.links!.downloadLocation}'); + http.get(Uri.parse(photo.links!.downloadLocation!), headers: { + 'Accept-Version': 'v1', + 'Authorization': 'Client-ID $_accessKey', + }); + + return futureBytes; + } +} + +enum SearchPhotosOrientation { + landscape, + portrait, + squarish, +} + +class UnsplashException implements Exception { + UnsplashException([this.message]); + + final String? message; + + @override + String toString() { + if (message == null) { + return 'UnsplashException'; + } + return 'UnsplashException: $message'; + } +} diff --git a/desktop_photo_search/material/lib/src/unsplash/urls.dart b/desktop_photo_search/material/lib/src/unsplash/urls.dart new file mode 100644 index 000000000..1a834304b --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/urls.dart @@ -0,0 +1,44 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; + +part 'urls.g.dart'; + +abstract class Urls implements Built { + factory Urls([void Function(UrlsBuilder b)? updates]) = _$Urls; + + Urls._(); + + @BuiltValueField(wireName: 'raw') + String? get raw; + + @BuiltValueField(wireName: 'full') + String? get full; + + @BuiltValueField(wireName: 'regular') + String? get regular; + + @BuiltValueField(wireName: 'small') + String? get small; + + @BuiltValueField(wireName: 'thumb') + String? get thumb; + + String toJson() { + return json.encode(serializers.serializeWith(Urls.serializer, this)); + } + + static Urls? fromJson(String jsonString) { + return serializers.deserializeWith( + Urls.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$urlsSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/urls.g.dart b/desktop_photo_search/material/lib/src/unsplash/urls.g.dart new file mode 100644 index 000000000..5983509e9 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/urls.g.dart @@ -0,0 +1,217 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'urls.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$urlsSerializer = new _$UrlsSerializer(); + +class _$UrlsSerializer implements StructuredSerializer { + @override + final Iterable types = const [Urls, _$Urls]; + @override + final String wireName = 'Urls'; + + @override + Iterable serialize(Serializers serializers, Urls object, + {FullType specifiedType = FullType.unspecified}) { + final result = []; + Object? value; + value = object.raw; + if (value != null) { + result + ..add('raw') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.full; + if (value != null) { + result + ..add('full') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.regular; + if (value != null) { + result + ..add('regular') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.small; + if (value != null) { + result + ..add('small') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.thumb; + if (value != null) { + result + ..add('thumb') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + return result; + } + + @override + Urls deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new UrlsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'raw': + result.raw = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'full': + result.full = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'regular': + result.regular = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'small': + result.small = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'thumb': + result.thumb = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + } + } + + return result.build(); + } +} + +class _$Urls extends Urls { + @override + final String? raw; + @override + final String? full; + @override + final String? regular; + @override + final String? small; + @override + final String? thumb; + + factory _$Urls([void Function(UrlsBuilder)? updates]) => + (new UrlsBuilder()..update(updates)).build(); + + _$Urls._({this.raw, this.full, this.regular, this.small, this.thumb}) + : super._(); + + @override + Urls rebuild(void Function(UrlsBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + UrlsBuilder toBuilder() => new UrlsBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is Urls && + raw == other.raw && + full == other.full && + regular == other.regular && + small == other.small && + thumb == other.thumb; + } + + @override + int get hashCode { + return $jf($jc( + $jc($jc($jc($jc(0, raw.hashCode), full.hashCode), regular.hashCode), + small.hashCode), + thumb.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('Urls') + ..add('raw', raw) + ..add('full', full) + ..add('regular', regular) + ..add('small', small) + ..add('thumb', thumb)) + .toString(); + } +} + +class UrlsBuilder implements Builder { + _$Urls? _$v; + + String? _raw; + String? get raw => _$this._raw; + set raw(String? raw) => _$this._raw = raw; + + String? _full; + String? get full => _$this._full; + set full(String? full) => _$this._full = full; + + String? _regular; + String? get regular => _$this._regular; + set regular(String? regular) => _$this._regular = regular; + + String? _small; + String? get small => _$this._small; + set small(String? small) => _$this._small = small; + + String? _thumb; + String? get thumb => _$this._thumb; + set thumb(String? thumb) => _$this._thumb = thumb; + + UrlsBuilder(); + + UrlsBuilder get _$this { + final $v = _$v; + if ($v != null) { + _raw = $v.raw; + _full = $v.full; + _regular = $v.regular; + _small = $v.small; + _thumb = $v.thumb; + _$v = null; + } + return this; + } + + @override + void replace(Urls other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$Urls; + } + + @override + void update(void Function(UrlsBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$Urls build() { + final _$result = _$v ?? + new _$Urls._( + raw: raw, full: full, regular: regular, small: small, thumb: thumb); + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/desktop_photo_search/material/lib/src/unsplash/user.dart b/desktop_photo_search/material/lib/src/unsplash/user.dart new file mode 100644 index 000000000..c8b141179 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/user.dart @@ -0,0 +1,63 @@ +// Copyright 2019 The Flutter team. 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:convert'; + +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +import '../serializers.dart'; +import 'links.dart'; + +part 'user.g.dart'; + +abstract class User implements Built { + factory User([void Function(UserBuilder)? updates]) = _$User; + + User._(); + + @BuiltValueField(wireName: 'id') + String get id; + + @BuiltValueField(wireName: 'updated_at') + String? get updatedAt; + + @BuiltValueField(wireName: 'username') + String get username; + + @BuiltValueField(wireName: 'name') + String get name; + + @BuiltValueField(wireName: 'portfolio_url') + String? get portfolioUrl; + + @BuiltValueField(wireName: 'bio') + String? get bio; + + @BuiltValueField(wireName: 'location') + String? get location; + + @BuiltValueField(wireName: 'total_likes') + int? get totalLikes; + + @BuiltValueField(wireName: 'total_photos') + int? get totalPhotos; + + @BuiltValueField(wireName: 'total_collections') + int? get totalCollections; + + @BuiltValueField(wireName: 'links') + Links? get links; + + String toJson() { + return json.encode(serializers.serializeWith(User.serializer, this)); + } + + static User? fromJson(String jsonString) { + return serializers.deserializeWith( + User.serializer, json.decode(jsonString)); + } + + static Serializer get serializer => _$userSerializer; +} diff --git a/desktop_photo_search/material/lib/src/unsplash/user.g.dart b/desktop_photo_search/material/lib/src/unsplash/user.g.dart new file mode 100644 index 000000000..dfb9987d3 --- /dev/null +++ b/desktop_photo_search/material/lib/src/unsplash/user.g.dart @@ -0,0 +1,377 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'user.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$userSerializer = new _$UserSerializer(); + +class _$UserSerializer implements StructuredSerializer { + @override + final Iterable types = const [User, _$User]; + @override + final String wireName = 'User'; + + @override + Iterable serialize(Serializers serializers, User object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'id', + serializers.serialize(object.id, specifiedType: const FullType(String)), + 'username', + serializers.serialize(object.username, + specifiedType: const FullType(String)), + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + ]; + Object? value; + value = object.updatedAt; + if (value != null) { + result + ..add('updated_at') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.portfolioUrl; + if (value != null) { + result + ..add('portfolio_url') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.bio; + if (value != null) { + result + ..add('bio') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.location; + if (value != null) { + result + ..add('location') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.totalLikes; + if (value != null) { + result + ..add('total_likes') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + value = object.totalPhotos; + if (value != null) { + result + ..add('total_photos') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + value = object.totalCollections; + if (value != null) { + result + ..add('total_collections') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + value = object.links; + if (value != null) { + result + ..add('links') + ..add( + serializers.serialize(value, specifiedType: const FullType(Links))); + } + return result; + } + + @override + User deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new UserBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'id': + result.id = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'updated_at': + result.updatedAt = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'username': + result.username = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'name': + result.name = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'portfolio_url': + result.portfolioUrl = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'bio': + result.bio = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'location': + result.location = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'total_likes': + result.totalLikes = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'total_photos': + result.totalPhotos = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'total_collections': + result.totalCollections = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + case 'links': + result.links.replace(serializers.deserialize(value, + specifiedType: const FullType(Links))! as Links); + break; + } + } + + return result.build(); + } +} + +class _$User extends User { + @override + final String id; + @override + final String? updatedAt; + @override + final String username; + @override + final String name; + @override + final String? portfolioUrl; + @override + final String? bio; + @override + final String? location; + @override + final int? totalLikes; + @override + final int? totalPhotos; + @override + final int? totalCollections; + @override + final Links? links; + + factory _$User([void Function(UserBuilder)? updates]) => + (new UserBuilder()..update(updates)).build(); + + _$User._( + {required this.id, + this.updatedAt, + required this.username, + required this.name, + this.portfolioUrl, + this.bio, + this.location, + this.totalLikes, + this.totalPhotos, + this.totalCollections, + this.links}) + : super._() { + BuiltValueNullFieldError.checkNotNull(id, 'User', 'id'); + BuiltValueNullFieldError.checkNotNull(username, 'User', 'username'); + BuiltValueNullFieldError.checkNotNull(name, 'User', 'name'); + } + + @override + User rebuild(void Function(UserBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + UserBuilder toBuilder() => new UserBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is User && + id == other.id && + updatedAt == other.updatedAt && + username == other.username && + name == other.name && + portfolioUrl == other.portfolioUrl && + bio == other.bio && + location == other.location && + totalLikes == other.totalLikes && + totalPhotos == other.totalPhotos && + totalCollections == other.totalCollections && + links == other.links; + } + + @override + int get hashCode { + return $jf($jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + $jc($jc(0, id.hashCode), + updatedAt.hashCode), + username.hashCode), + name.hashCode), + portfolioUrl.hashCode), + bio.hashCode), + location.hashCode), + totalLikes.hashCode), + totalPhotos.hashCode), + totalCollections.hashCode), + links.hashCode)); + } + + @override + String toString() { + return (newBuiltValueToStringHelper('User') + ..add('id', id) + ..add('updatedAt', updatedAt) + ..add('username', username) + ..add('name', name) + ..add('portfolioUrl', portfolioUrl) + ..add('bio', bio) + ..add('location', location) + ..add('totalLikes', totalLikes) + ..add('totalPhotos', totalPhotos) + ..add('totalCollections', totalCollections) + ..add('links', links)) + .toString(); + } +} + +class UserBuilder implements Builder { + _$User? _$v; + + String? _id; + String? get id => _$this._id; + set id(String? id) => _$this._id = id; + + String? _updatedAt; + String? get updatedAt => _$this._updatedAt; + set updatedAt(String? updatedAt) => _$this._updatedAt = updatedAt; + + String? _username; + String? get username => _$this._username; + set username(String? username) => _$this._username = username; + + String? _name; + String? get name => _$this._name; + set name(String? name) => _$this._name = name; + + String? _portfolioUrl; + String? get portfolioUrl => _$this._portfolioUrl; + set portfolioUrl(String? portfolioUrl) => _$this._portfolioUrl = portfolioUrl; + + String? _bio; + String? get bio => _$this._bio; + set bio(String? bio) => _$this._bio = bio; + + String? _location; + String? get location => _$this._location; + set location(String? location) => _$this._location = location; + + int? _totalLikes; + int? get totalLikes => _$this._totalLikes; + set totalLikes(int? totalLikes) => _$this._totalLikes = totalLikes; + + int? _totalPhotos; + int? get totalPhotos => _$this._totalPhotos; + set totalPhotos(int? totalPhotos) => _$this._totalPhotos = totalPhotos; + + int? _totalCollections; + int? get totalCollections => _$this._totalCollections; + set totalCollections(int? totalCollections) => + _$this._totalCollections = totalCollections; + + LinksBuilder? _links; + LinksBuilder get links => _$this._links ??= new LinksBuilder(); + set links(LinksBuilder? links) => _$this._links = links; + + UserBuilder(); + + UserBuilder get _$this { + final $v = _$v; + if ($v != null) { + _id = $v.id; + _updatedAt = $v.updatedAt; + _username = $v.username; + _name = $v.name; + _portfolioUrl = $v.portfolioUrl; + _bio = $v.bio; + _location = $v.location; + _totalLikes = $v.totalLikes; + _totalPhotos = $v.totalPhotos; + _totalCollections = $v.totalCollections; + _links = $v.links?.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(User other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$User; + } + + @override + void update(void Function(UserBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + _$User build() { + _$User _$result; + try { + _$result = _$v ?? + new _$User._( + id: BuiltValueNullFieldError.checkNotNull(id, 'User', 'id'), + updatedAt: updatedAt, + username: BuiltValueNullFieldError.checkNotNull( + username, 'User', 'username'), + name: BuiltValueNullFieldError.checkNotNull(name, 'User', 'name'), + portfolioUrl: portfolioUrl, + bio: bio, + location: location, + totalLikes: totalLikes, + totalPhotos: totalPhotos, + totalCollections: totalCollections, + links: _links?.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'links'; + _links?.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + 'User', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new diff --git a/experimental/desktop_photo_search/lib/src/widgets/photo_details.dart b/desktop_photo_search/material/lib/src/widgets/photo_details.dart similarity index 100% rename from experimental/desktop_photo_search/lib/src/widgets/photo_details.dart rename to desktop_photo_search/material/lib/src/widgets/photo_details.dart diff --git a/experimental/desktop_photo_search/lib/src/widgets/photo_search_dialog.dart b/desktop_photo_search/material/lib/src/widgets/photo_search_dialog.dart similarity index 94% rename from experimental/desktop_photo_search/lib/src/widgets/photo_search_dialog.dart rename to desktop_photo_search/material/lib/src/widgets/photo_search_dialog.dart index 63c216717..827bdc1d9 100644 --- a/experimental/desktop_photo_search/lib/src/widgets/photo_search_dialog.dart +++ b/desktop_photo_search/material/lib/src/widgets/photo_search_dialog.dart @@ -54,7 +54,7 @@ class _PhotoSearchDialogState extends State { onPressed: () { Navigator.of(context).pop(); }, - child: Text('Cancel'.toUpperCase()), + child: const Text('CANCEL'), ), TextButton( onPressed: _searchEnabled @@ -63,7 +63,7 @@ class _PhotoSearchDialogState extends State { Navigator.of(context).pop(); } : null, - child: Text('Search'.toUpperCase()), + child: const Text('SEARCH'), ), ], ); diff --git a/desktop_photo_search/material/lib/src/widgets/policy_dialog.dart b/desktop_photo_search/material/lib/src/widgets/policy_dialog.dart new file mode 100644 index 000000000..409bdbec7 --- /dev/null +++ b/desktop_photo_search/material/lib/src/widgets/policy_dialog.dart @@ -0,0 +1,74 @@ +// Copyright 2019 The Flutter team. 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:flutter/gestures.dart'; +import 'package:flutter/material.dart'; +import 'package:url_launcher/url_launcher.dart' as url_launcher; + +class PolicyDialog extends StatelessWidget { + const PolicyDialog({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return AlertDialog( + title: const Text('Terms & Conditions'), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + RichText( + textAlign: TextAlign.left, + text: TextSpan( + text: '• ', + style: const TextStyle(color: Colors.black, fontSize: 18), + children: [ + TextSpan( + text: 'https://policies.google.com/terms', + style: const TextStyle( + fontWeight: FontWeight.bold, color: Colors.lightBlue), + recognizer: TapGestureRecognizer() + ..onTap = () async { + const url = 'https://policies.google.com/terms'; + if (await url_launcher.canLaunch(url)) { + await url_launcher.launch(url); + } + }, + ) + ], + ), + ), + RichText( + textAlign: TextAlign.left, + text: TextSpan( + text: '• ', + style: const TextStyle(color: Colors.black, fontSize: 18), + children: [ + TextSpan( + text: 'https://unsplash.com/terms', + style: const TextStyle( + fontWeight: FontWeight.bold, color: Colors.lightBlue), + recognizer: TapGestureRecognizer() + ..onTap = () async { + const url = 'https://unsplash.com/terms'; + if (await url_launcher.canLaunch(url)) { + await url_launcher.launch(url); + } + }, + ) + ], + ), + ), + ], + ), + actions: [ + TextButton( + onPressed: () { + Navigator.of(context).pop(); + }, + child: const Text('CLOSE'), + ), + ], + ); + } +} diff --git a/desktop_photo_search/material/lib/src/widgets/split.dart b/desktop_photo_search/material/lib/src/widgets/split.dart new file mode 100644 index 000000000..95a2e30d1 --- /dev/null +++ b/desktop_photo_search/material/lib/src/widgets/split.dart @@ -0,0 +1,190 @@ +// Copyright 2019 The Chromium 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:math'; + +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; + +/// A widget that takes two children, lays them out along [axis], and allows +/// the user to resize them. +/// +/// The user can customize the amount of space allocated to each child by +/// dragging a divider between them. +/// +/// [initialFirstFraction] defines how much space to give the [firstChild] +/// when first building this widget. [secondChild] will take the remaining +/// space. +/// +/// The user can drag the widget with key [dividerKey] to change +/// the space allocated between [firstChild] and [secondChild]. +// TODO(djshuckerow): introduce support for a minimum fraction a child +// is allowed. +class Split extends StatefulWidget { + /// Builds a split oriented along [axis]. + const Split({ + Key? key, + required this.axis, + required this.firstChild, + required this.secondChild, + double? initialFirstFraction, + }) : initialFirstFraction = initialFirstFraction ?? 0.5, + super(key: key); + + /// The main axis the children will lay out on. + /// + /// If [Axis.horizontal], the children will be placed in a [Row] + /// and they will be horizontally resizable. + /// + /// If [Axis.vertical], the children will be placed in a [Column] + /// and they will be vertically resizable. + /// + /// Cannot be null. + final Axis axis; + + /// The child that will be laid out first along [axis]. + final Widget firstChild; + + /// The child that will be laid out last along [axis]. + final Widget secondChild; + + /// The fraction of the layout to allocate to [firstChild]. + /// + /// [secondChild] will receive a fraction of `1 - initialFirstFraction`. + final double initialFirstFraction; + + /// The key passed to the divider between [firstChild] and [secondChild]. + /// + /// Visible to grab it in tests. + @visibleForTesting + Key get dividerKey => Key('$this dividerKey'); + + /// The size of the divider between [firstChild] and [secondChild] in + /// logical pixels (dp, not px). + static const double dividerMainAxisSize = 10; + + static Axis axisFor(BuildContext context, double horizontalAspectRatio) { + final screenSize = MediaQuery.of(context).size; + final aspectRatio = screenSize.width / screenSize.height; + if (aspectRatio >= horizontalAspectRatio) { + return Axis.horizontal; + } + return Axis.vertical; + } + + @override + State createState() => _SplitState(); +} + +class _SplitState extends State { + late double firstFraction; + + double get secondFraction => 1 - firstFraction; + + bool get isHorizontal => widget.axis == Axis.horizontal; + + @override + void initState() { + super.initState(); + firstFraction = widget.initialFirstFraction; + } + + @override + Widget build(BuildContext context) { + return LayoutBuilder(builder: _buildLayout); + } + + Widget _buildLayout(BuildContext context, BoxConstraints constraints) { + final width = constraints.maxWidth; + final height = constraints.maxHeight; + final axisSize = isHorizontal ? width : height; + final crossAxisSize = isHorizontal ? height : width; + const halfDivider = Split.dividerMainAxisSize / 2.0; + + // Determine what fraction to give each child, including enough space to + // display the divider. + var firstSize = axisSize * firstFraction; + var secondSize = axisSize * secondFraction; + + // Clamp the sizes to be sure there is enough space for the dividers. + firstSize = firstSize.clamp(halfDivider, axisSize - halfDivider); + secondSize = secondSize.clamp(halfDivider, axisSize - halfDivider); + + // Remove space from each child to place the divider in the middle. + firstSize = firstSize - halfDivider; + secondSize = secondSize - halfDivider; + + void updateSpacing(DragUpdateDetails dragDetails) { + final delta = isHorizontal ? dragDetails.delta.dx : dragDetails.delta.dy; + final fractionalDelta = delta / axisSize; + setState(() { + // Update the fraction of space consumed by the children, + // being sure not to allocate any negative space. + firstFraction += fractionalDelta; + firstFraction = firstFraction.clamp(0.0, 1.0); + }); + } + + // TODO(https://github.com/flutter/flutter/issues/43747): use an icon. + // The material icon for a drag handle is not currently available. + // For now, draw an indicator that is 3 lines running in the direction + // of the main axis, like a hamburger menu. + // TODO(https://github.com/flutter/devtools/issues/1265): update mouse + // to indicate that this is resizable. + final dragIndicator = Flex( + direction: isHorizontal ? Axis.vertical : Axis.horizontal, + mainAxisSize: MainAxisSize.min, + children: [ + for (var i = 0; i < min(crossAxisSize / 6.0, 3).floor(); i++) + Padding( + padding: EdgeInsets.symmetric( + vertical: isHorizontal ? 2.0 : 0.0, + horizontal: isHorizontal ? 0.0 : 2.0, + ), + child: DecoratedBox( + decoration: BoxDecoration( + color: Theme.of(context).dividerColor, + borderRadius: BorderRadius.circular(Split.dividerMainAxisSize), + ), + child: SizedBox( + height: isHorizontal ? 2.0 : Split.dividerMainAxisSize - 2.0, + width: isHorizontal ? Split.dividerMainAxisSize - 2.0 : 2.0, + ), + ), + ), + ], + ); + + final children = [ + SizedBox( + width: isHorizontal ? firstSize : width, + height: isHorizontal ? height : firstSize, + child: widget.firstChild, + ), + GestureDetector( + key: widget.dividerKey, + behavior: HitTestBehavior.translucent, + onHorizontalDragUpdate: isHorizontal ? updateSpacing : null, + onVerticalDragUpdate: isHorizontal ? null : updateSpacing, + // DartStartBehavior.down is needed to keep the mouse pointer stuck to + // the drag bar. There still appears to be a few frame lag before the + // drag action triggers which is't ideal but isn't a launch blocker. + dragStartBehavior: DragStartBehavior.down, + child: SizedBox( + width: isHorizontal ? Split.dividerMainAxisSize : width, + height: isHorizontal ? height : Split.dividerMainAxisSize, + child: Center( + child: dragIndicator, + ), + ), + ), + SizedBox( + width: isHorizontal ? secondSize : width, + height: isHorizontal ? height : secondSize, + child: widget.secondChild, + ), + ]; + return Flex(direction: widget.axis, children: children); + } +} diff --git a/desktop_photo_search/material/lib/src/widgets/unsplash_notice.dart b/desktop_photo_search/material/lib/src/widgets/unsplash_notice.dart new file mode 100644 index 000000000..7012ac6ab --- /dev/null +++ b/desktop_photo_search/material/lib/src/widgets/unsplash_notice.dart @@ -0,0 +1,107 @@ +// Copyright 2022 The Flutter team. 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:flutter/gestures.dart'; +import 'package:flutter/material.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../../unsplash_access_key.dart'; + +final _unsplashHomepage = + 'https://unsplash.com/?utm_source=${Uri.encodeFull(unsplashAppName)}&utm_medium=referral'; +final _unsplashPrivacyPolicy = + 'https://unsplash.com/privacy?utm_source=${Uri.encodeFull(unsplashAppName)}&utm_medium=referral'; + +class UnsplashNotice extends StatefulWidget { + const UnsplashNotice({Key? key, required this.child}) : super(key: key); + final Widget child; + + @override + State createState() => _UnsplashNoticeState(); +} + +class _UnsplashNoticeState extends State { + bool noticeAccepted = false; + + @override + void initState() { + super.initState(); + WidgetsBinding.instance!.addPostFrameCallback((timeStamp) { + showDialog( + barrierDismissible: false, + context: context, + builder: (context) { + return _UnsplashDialog(accepted: () { + setState(() { + noticeAccepted = true; + }); + }); + }); + }); + } + + @override + Widget build(BuildContext context) { + return widget.child; + } +} + +class _UnsplashDialog extends StatelessWidget { + const _UnsplashDialog({Key? key, required this.accepted}) : super(key: key); + final Function accepted; + + @override + Widget build(BuildContext context) { + return AlertDialog( + title: const Text('Unsplash Notice'), + content: RichText( + text: TextSpan( + text: 'This is a sample desktop application provided by Google' + ' that enables you to search ', + style: const TextStyle(color: Colors.grey), + children: [ + TextSpan( + text: 'Unsplash', + recognizer: TapGestureRecognizer() + ..onTap = () async { + if (!await launch(_unsplashHomepage)) { + throw 'Could not launch $_unsplashHomepage'; + } + }, + style: const TextStyle(color: Colors.blue), + ), + const TextSpan( + text: ' for photographs that interest you. When you search' + ' for and interact with photos, Unsplash will collect' + ' information about you and your use of the Unsplash' + ' services. Learn more about ', + style: TextStyle(color: Colors.grey), + ), + TextSpan( + text: 'how Unsplash collects and uses data', + recognizer: TapGestureRecognizer() + ..onTap = () async { + if (!await launch(_unsplashPrivacyPolicy)) { + throw 'Could not launch $_unsplashPrivacyPolicy'; + } + }, + style: const TextStyle(color: Colors.blue), + ), + const TextSpan( + text: '.', + style: TextStyle(color: Colors.grey), + ), + ]), + ), + actions: [ + TextButton( + child: const Text('GOT IT'), + onPressed: () { + accepted(); + Navigator.pop(context); + }) + ], + ); + } +} diff --git a/desktop_photo_search/material/lib/src/widgets/unsplash_search_content.dart b/desktop_photo_search/material/lib/src/widgets/unsplash_search_content.dart new file mode 100644 index 000000000..8d66212be --- /dev/null +++ b/desktop_photo_search/material/lib/src/widgets/unsplash_search_content.dart @@ -0,0 +1,105 @@ +// Copyright 2022 The Flutter team. 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/file_selector.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_simple_treeview/flutter_simple_treeview.dart'; +import 'package:provider/provider.dart'; + +import '../model/photo_search_model.dart'; +import '../unsplash/photo.dart'; +import '../widgets/photo_details.dart'; +import '../widgets/split.dart'; + +class UnsplashSearchContent extends StatefulWidget { + const UnsplashSearchContent({Key? key}) : super(key: key); + + @override + State createState() => _UnsplashSearchContentState(); +} + +class _UnsplashSearchContentState extends State { + final _treeViewScrollController = ScrollController(); + + @override + Widget build(BuildContext context) { + final photoSearchModel = Provider.of(context); + + return Split( + axis: Axis.horizontal, + initialFirstFraction: 0.4, + firstChild: Scrollbar( + controller: _treeViewScrollController, + child: SingleChildScrollView( + controller: _treeViewScrollController, + child: TreeView( + nodes: photoSearchModel.entries.map(_buildSearchEntry).toList(), + indent: 0, + ), + ), + ), + secondChild: Center( + child: photoSearchModel.selectedPhoto != null + ? PhotoDetails( + photo: photoSearchModel.selectedPhoto!, + onPhotoSave: (photo) async { + final path = await getSavePath( + suggestedName: '${photo.id}.jpg', + acceptedTypeGroups: [ + XTypeGroup( + label: 'JPG', + extensions: ['jpg'], + mimeTypes: ['image/jpeg'], + ), + ], + ); + if (path != null) { + final fileData = + await photoSearchModel.download(photo: photo); + final photoFile = + XFile.fromData(fileData, mimeType: 'image/jpeg'); + await photoFile.saveTo(path); + } + }, + ) + : Container(), + ), + ); + } + + TreeNode _buildSearchEntry(SearchEntry searchEntry) { + void selectPhoto(Photo photo) { + searchEntry.model.selectedPhoto = photo; + } + + String labelForPhoto(Photo photo) => 'Photo by ${photo.user!.name}'; + + return TreeNode( + content: Expanded( + child: Text(searchEntry.query), + ), + children: searchEntry.photos + .map( + (photo) => TreeNode( + content: Expanded( + child: Semantics( + button: true, + onTap: () => selectPhoto(photo), + label: labelForPhoto(photo), + excludeSemantics: true, + child: InkWell( + onTap: () => selectPhoto(photo), + child: Padding( + padding: const EdgeInsets.all(12), + child: Text(labelForPhoto(photo)), + ), + ), + ), + ), + ), + ) + .toList(), + ); + } +} diff --git a/desktop_photo_search/material/lib/unsplash_access_key.dart b/desktop_photo_search/material/lib/unsplash_access_key.dart new file mode 100644 index 000000000..b78324753 --- /dev/null +++ b/desktop_photo_search/material/lib/unsplash_access_key.dart @@ -0,0 +1,9 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// TODO: Retrieve an API Access Key from https://unsplash.com/developers +const String unsplashAccessKey = ''; + +// The application name for the above API Access Key. +const unsplashAppName = ''; diff --git a/desktop_photo_search/material/linux/.gitignore b/desktop_photo_search/material/linux/.gitignore new file mode 100644 index 000000000..d3896c984 --- /dev/null +++ b/desktop_photo_search/material/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/desktop_photo_search/material/linux/CMakeLists.txt b/desktop_photo_search/material/linux/CMakeLists.txt new file mode 100644 index 000000000..ec2a7ab66 --- /dev/null +++ b/desktop_photo_search/material/linux/CMakeLists.txt @@ -0,0 +1,116 @@ +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +set(BINARY_NAME "desktop_photo_search") +set(APPLICATION_ID "com.example.desktop_photo_search") + +cmake_policy(SET CMP0063 NEW) + +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Configure build options. +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() + +# Compilation settings that should be applied to most targets. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") + +# Flutter library and tool build rules. +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Application build +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) +apply_standard_settings(${BINARY_NAME}) +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) +add_dependencies(${BINARY_NAME} flutter_assemble) +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +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. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/desktop_photo_search/material/linux/flutter/CMakeLists.txt b/desktop_photo_search/material/linux/flutter/CMakeLists.txt new file mode 100644 index 000000000..33fd5801e --- /dev/null +++ b/desktop_photo_search/material/linux/flutter/CMakeLists.txt @@ -0,0 +1,87 @@ +cmake_minimum_required(VERSION 3.10) + +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. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# 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/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter 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. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/desktop_photo_search/material/linux/flutter/generated_plugin_registrant.cc b/desktop_photo_search/material/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 000000000..cab1d272f --- /dev/null +++ b/desktop_photo_search/material/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,23 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); + file_selector_plugin_register_with_registrar(file_selector_linux_registrar); + g_autoptr(FlPluginRegistrar) menubar_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "MenubarPlugin"); + menubar_plugin_register_with_registrar(menubar_registrar); + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); +} diff --git a/desktop_photo_search/material/linux/flutter/generated_plugin_registrant.h b/desktop_photo_search/material/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 000000000..e0f0a47bc --- /dev/null +++ b/desktop_photo_search/material/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/desktop_photo_search/material/linux/flutter/generated_plugins.cmake b/desktop_photo_search/material/linux/flutter/generated_plugins.cmake new file mode 100644 index 000000000..9f989b9f4 --- /dev/null +++ b/desktop_photo_search/material/linux/flutter/generated_plugins.cmake @@ -0,0 +1,18 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + file_selector_linux + menubar + url_launcher_linux +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux 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/desktop_photo_search/material/linux/main.cc b/desktop_photo_search/material/linux/main.cc new file mode 100644 index 000000000..e7c5c5437 --- /dev/null +++ b/desktop_photo_search/material/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/desktop_photo_search/material/linux/my_application.cc b/desktop_photo_search/material/linux/my_application.cc new file mode 100644 index 000000000..92ee84310 --- /dev/null +++ b/desktop_photo_search/material/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "Desktop Photo Search"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "Desktop Photo Search"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/desktop_photo_search/material/linux/my_application.h b/desktop_photo_search/material/linux/my_application.h new file mode 100644 index 000000000..72271d5e4 --- /dev/null +++ b/desktop_photo_search/material/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/desktop_photo_search/material/macos/.gitignore b/desktop_photo_search/material/macos/.gitignore new file mode 100644 index 000000000..746adbb6b --- /dev/null +++ b/desktop_photo_search/material/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/desktop_photo_search/material/macos/Flutter/Flutter-Debug.xcconfig b/desktop_photo_search/material/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 000000000..4b81f9b2d --- /dev/null +++ b/desktop_photo_search/material/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/desktop_photo_search/material/macos/Flutter/Flutter-Release.xcconfig b/desktop_photo_search/material/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 000000000..5caa9d157 --- /dev/null +++ b/desktop_photo_search/material/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/desktop_photo_search/material/macos/Flutter/GeneratedPluginRegistrant.swift b/desktop_photo_search/material/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 000000000..a6ebf3c9d --- /dev/null +++ b/desktop_photo_search/material/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,16 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import file_selector_macos +import menubar +import url_launcher_macos + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) + MenubarPlugin.register(with: registry.registrar(forPlugin: "MenubarPlugin")) + UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) +} diff --git a/desktop_photo_search/material/macos/Podfile b/desktop_photo_search/material/macos/Podfile new file mode 100644 index 000000000..dade8dfad --- /dev/null +++ b/desktop_photo_search/material/macos/Podfile @@ -0,0 +1,40 @@ +platform :osx, '10.11' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/desktop_photo_search/material/macos/Podfile.lock b/desktop_photo_search/material/macos/Podfile.lock new file mode 100644 index 000000000..a7171cf03 --- /dev/null +++ b/desktop_photo_search/material/macos/Podfile.lock @@ -0,0 +1,34 @@ +PODS: + - file_selector_macos (0.0.1): + - FlutterMacOS + - FlutterMacOS (1.0.0) + - menubar (0.0.2): + - FlutterMacOS + - url_launcher_macos (0.0.1): + - FlutterMacOS + +DEPENDENCIES: + - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) + - FlutterMacOS (from `Flutter/ephemeral`) + - menubar (from `Flutter/ephemeral/.symlinks/plugins/menubar/macos`) + - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) + +EXTERNAL SOURCES: + file_selector_macos: + :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos + FlutterMacOS: + :path: Flutter/ephemeral + menubar: + :path: Flutter/ephemeral/.symlinks/plugins/menubar/macos + url_launcher_macos: + :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos + +SPEC CHECKSUMS: + file_selector_macos: ff6dc948d4ddd34e8602a1f60b7d0b4cc6051a47 + FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 + menubar: 4e3d461d62d775540277ce6639acafe2a111a231 + url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4 + +PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c + +COCOAPODS: 1.11.2 diff --git a/experimental/desktop_photo_search/macos/Runner.xcodeproj/project.pbxproj b/desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj similarity index 95% rename from experimental/desktop_photo_search/macos/Runner.xcodeproj/project.pbxproj rename to desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj index 8a7c92de0..cb1674700 100644 --- a/experimental/desktop_photo_search/macos/Runner.xcodeproj/project.pbxproj +++ b/desktop_photo_search/material/macos/Runner.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 8ABDE709CC9129175CD43B5F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21AE7B3C5CDD0DA1EAFA8192 /* Pods_Runner.framework */; }; + 6002899F6E18B7FFE0C9EB82 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B467EF3E00BE38B76A068558 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -53,8 +53,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 046E9402D77CB52F3798A183 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 21AE7B3C5CDD0DA1EAFA8192 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = desktop_photo_search.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -69,10 +67,12 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 60162069BE152E865D1D4DAB /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 7681488724F671F9825CB4FD /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 8A4814596EAB9B7ADDF3E8A0 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - DC7189FCCB4FDF54645192CA /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + B467EF3E00BE38B76A068558 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + EE4F864883849F01384DDDFB /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8ABDE709CC9129175CD43B5F /* Pods_Runner.framework in Frameworks */, + 6002899F6E18B7FFE0C9EB82 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +105,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - E89324751EAA25FFD85ED79A /* Pods */, + F1C6C7A5568EB45EC3403989 /* Pods */, ); sourceTree = ""; }; @@ -155,17 +155,17 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 21AE7B3C5CDD0DA1EAFA8192 /* Pods_Runner.framework */, + B467EF3E00BE38B76A068558 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; }; - E89324751EAA25FFD85ED79A /* Pods */ = { + F1C6C7A5568EB45EC3403989 /* Pods */ = { isa = PBXGroup; children = ( - 60162069BE152E865D1D4DAB /* Pods-Runner.debug.xcconfig */, - DC7189FCCB4FDF54645192CA /* Pods-Runner.release.xcconfig */, - 046E9402D77CB52F3798A183 /* Pods-Runner.profile.xcconfig */, + EE4F864883849F01384DDDFB /* Pods-Runner.debug.xcconfig */, + 7681488724F671F9825CB4FD /* Pods-Runner.release.xcconfig */, + 8A4814596EAB9B7ADDF3E8A0 /* Pods-Runner.profile.xcconfig */, ); name = Pods; path = Pods; @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 2986F46935953F8FA456F0C3 /* [CP] Check Pods Manifest.lock */, + 1CBBE64A6575E8A816E9F646 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 9F18BB647558AC903DBF34ED /* [CP] Embed Pods Frameworks */, + 27E561F948E8861BA7C18B11 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -203,7 +203,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -254,7 +254,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2986F46935953F8FA456F0C3 /* [CP] Check Pods Manifest.lock */ = { + 1CBBE64A6575E8A816E9F646 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -276,59 +276,59 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 3399D490228B24CF009A79C7 /* ShellScript */ = { + 27E561F948E8861BA7C18B11 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; - 33CC111E2044C6BF0003C045 /* ShellScript */ = { + 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - Flutter/ephemeral/FlutterInputs.xcfilelist, ); inputPaths = ( - Flutter/ephemeral/tripwire, ); outputFileListPaths = ( - Flutter/ephemeral/FlutterOutputs.xcfilelist, ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; }; - 9F18BB647558AC903DBF34ED /* [CP] Embed Pods Frameworks */ = { + 33CC111E2044C6BF0003C045 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, ); - name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/desktop_photo_search/material/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/desktop_photo_search/material/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/desktop_photo_search/material/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/desktop_photo_search/material/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 000000000..dd5781da5 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/desktop_photo_search/material/macos/Runner.xcworkspace/contents.xcworkspacedata b/desktop_photo_search/material/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..21a3cc14c --- /dev/null +++ b/desktop_photo_search/material/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/desktop_photo_search/material/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/desktop_photo_search/material/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/desktop_photo_search/material/macos/Runner/AppDelegate.swift b/desktop_photo_search/material/macos/Runner/AppDelegate.swift new file mode 100644 index 000000000..5f372dd3a --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..a2ec33f19 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..3c4935a7ca84f0976aca34b7f2895d65fb94d1ea GIT binary patch literal 46993 zcmZ5|3p`X?`~OCwR3s6~xD(})N~M}fiXn6%NvKp3QYhuNN0*apqmfHdR7#ShNQ99j zQi+P9nwlXbmnktZ_WnO>bl&&<{m*;O=RK!cd#$zCdM@AR`#jH%+2~+BeX7b-48x|= zZLBt9*d+MZNtpCx_&asa{+CselLUV<<&ceQ5QfRjLjQDSL-t4eq}5znmIXDtfA|D+VRV$*2jxU)JopC)!37FtD<6L^&{ia zgVf1p(e;c3|HY;%uD5<-oSFkC2JRh- z&2RTL)HBG`)j5di8ys|$z_9LSm^22*uH-%MmUJs|nHKLHxy4xTmG+)JoA`BN7#6IN zK-ylvs+~KN#4NWaH~o5Wuwd@W?H@diExdcTl0!JJq9ZOA24b|-TkkeG=Q(pJw7O;i z`@q+n|@eeW7@ z&*NP+)wOyu^5oNJ=yi4~s_+N)#M|@8nfw=2#^BpML$~dJ6yu}2JNuq!)!;Uwxic(z zM@Wa-v|U{v|GX4;P+s#=_1PD7h<%8ey$kxVsS1xt&%8M}eOF98&Rx7W<)gY(fCdmo{y*FPC{My!t`i=PS1cdV7DD=3S1J?b2<5BevW7!rWJ%6Q?D9UljULd*7SxX05PP^5AklWu^y` z-m9&Oq-XNSRjd|)hZ44DK?3>G%kFHSJ8|ZXbAcRb`gH~jk}Iwkl$@lqg!vu)ihSl= zjhBh%%Hq|`Vm>T7+SYyf4bI-MgiBq4mZlZmsKv+S>p$uAOoNxPT)R6owU%t*#aV}B z5@)X8nhtaBhH=={w;Du=-S*xvcPz26EI!gt{(hf;TllHrvku`^8wMj7-9=By>n{b= zHzQ?Wn|y=;)XM#St@o%#8idxfc`!oVz@Lv_=y(t-kUC`W)c0H2TX}Lop4121;RHE(PPHKfe_e_@DoHiPbVP%JzNudGc$|EnIv`qww1F5HwF#@l(=V zyM!JQO>Rt_PTRF1hI|u^2Uo#w*rdF*LXJky0?|fhl4-M%zN_2RP#HFhSATE3&{sos zIE_?MdIn!sUH*vjs(teJ$7^7#|M_7m`T>r>qHw>TQh?yhhc8=TJk2B;KNXw3HhnQs za(Uaz2VwP;82rTy(T3FJNKA86Y7;L(K=~BW_Q=jjRh=-k_=wh-$`nY+#au+v^C4VV z)U?X(v-_#i=3bAylP1S*pM_y*DB z2fR!imng6Dk$>dl*K@AIj<~zw_f$T!-xLO8r{OkE(l?W#W<={460Y02*K#)O4xp?W zAN+isO}!*|mN7B#jUt&!KNyFOpUxv&ybM>jmkfn8z^llBslztv!!`TBEPwu;#eR3d z@_VDa)|ByvXx1V=^Up4{;M8ji3FC7gm(C7Ty-#1gs+U<{Ouc(iV67{< zam#KwvR&s=k4W<13`}DxzJ9{TUa97N-cgWkCDc+C339)EEnC@^HQK6OvKDSCvNz(S zOFAF_6omgG!+zaPC8fBO3kH8YVBx9_AoM?->pv~@$saf(Myo|e@onD`a=;kO*Utem ze=eUH&;JB2I4}?Pm@=VnE+yb$PD~sA5+)|iH3bi|s?ExIePeoAMd(Z4Z%$mCu{t;B9(sgdG~Q}0ShAwe!l8nw0tJn zJ+m?ogrgty$3=T&6+JJa!1oS3AtQQ1gJ z3gR1<=hXU>{SB-zq!okl4c+V9N;vo4{fyGeqtgBIt%TPC1P&k!pR-GZ7O8b}9=%>3 zQrV%FQdB+CcCRKK)0}v>U25rbQk(1^9Ax|WcAo5?L(H&H@%zAoT2RH$iN6boyXpsYqME}WJZI6T%OMlkWXK>R`^7AHG&31 z&MIU}igQ7$;)7AEm#dXA+!I&6ymb7n6D;F7c$tO3Ql(`ht z1sFrzIk_q5#=!#D(e~#SdWz5K;tPF*R883Yu>*@jTeOGUjQekw zM+7HlfP{y8p}jA9bLfyKC_Ti8k#;AVp@RML^9MQp-E+Ns-Y zKA!aAZV-sfm<23fy#@TZZlQVQxH%R7rD}00LxHPUF!Yg3%OX ziDe4m<4fp{7ivBS?*AlJz$~vw5m)Ei8`|+~xOSqJ$waA0+Yys$z$9iN9TIXu8 zaYacjd09uRAsU|)g|03w`F|b1Xg#K~*Mp2X^K^)r3P^juoc}-me&YhkW3#G|H<~jK zoKD?lE@jOw7>4cpKkh!8qU!bF(i~Oa8a!EGy-j46eZYbKUvF=^^nq`EtWFK}gwrsB zeu<6~?mk+;+$whP)8ud8vjqh+NofU+Nu`~|pb&CN1y_idxxf6cGbT=fBZR_hl&G)GgnW$*oDrN-zz;cKs18n+dAn95w z)Y>l6!5eYpebJGw7it~Q5m}8$7@%p&KS=VtydFj4HPJ{xqUVS_Ih}c(^4nUdwG|0% zw8Fnm{IT`8MqoL(1BNtu_#7alS@3WSUUOFT@U*`V!zrPIeCbbO=pE%|g92$EU|lw; z^;^AqMVWVf-R5^OI79TzIyYf}HX%0Y)=aYH;EKo}?=R~ZM&s&F;W>u%hFUfNafb;- z8OkmkK3k||J#3`xdLuMJAhj9oPI?Cjt}cDN7hw26n7irWS0hsy`fs&Y?Y&(QF*Nu! z!p`NggHXaBU6$P42LkqnKsPG@363DHYGXg{!|z6VMAQt??>FK1B4x4{j;iY8A+7o% z*!0qt&w+w#Ob@pQp;q)u0;v^9FlY=AK>2!qku)!%TO<^lNBr!6R8X)iXgXi^1p`T8 z6sU@Y_Fsp6E89E1*jz~Tm2kF=mjYz_q99r^v0h-l7SP6azzL%woM6!7>IFWyizrNwAqoia3nN0q343q zFztMPh0)?ugQg5Izbk{5$EGcMzt*|=S8ZFK%O&^YV@V;ZRL>f!iG?s5z{(*Xq20c^ z(hkk~PljBo%U`$q>mz!ir7chKlE-oHA2&0i@hn4O5scsI&nIWsM>sYg;Ph5IO~VpT z%c-3_{^N>4kECzk?2~Z@V|jWio&a&no;boiNxqXOpS;ph)gEDFJ6E=zPJ$>y5w`U0 z;h9_6ncIEY?#j1+IDUuixRg&(hw+QSSEmFi%_$ua$^K%(*jUynGU@FlvsyThxqMRw z7_ALpqTj~jOSu2_(@wc_Z?>X&(5jezB6w-@0X_34f&cZ=cA-t%#}>L7Q3QRx1$qyh zG>NF=Ts>)wA)fZIlk-kz%Xa;)SE(PLu(oEC8>9GUBgd$(^_(G6Y((Hi{fsV; zt*!IBWx_$5D4D&ezICAdtEU!WS3`YmC_?+o&1RDSfTbuOx<*v`G<2SP;5Q4TqFV&q zJL=90Lcm^TL7a9xck}XPMRnQ`l0%w-fi@bRI&c*VDj!W4nj=qaQd$2U?^9RTT{*qS_)Q9OL>s}2P3&da^Pf(*?> z#&2bt;Q7N2`P{{KH@>)Tf5&za?crRmQ%8xZi<9f=EV3={K zwMet=oA0-@`8F;u`8j-!8G~0TiH5yKemY+HU@Zw3``1nT>D ziK465-m?Nm^~@G@RW2xH&*C#PrvCWU)#M4jQ`I*>_^BZB_c!z5Wn9W&eCBE(oc1pw zmMr)iu74Xl5>pf&D7Ml>%uhpFGJGyj6Mx=t#`}Mt3tDZQDn~K`gp0d)P>>4{FGiP$sPK*ExVs!1)aGgAX z6eA;-9@@Muti3xYv$8U{?*NxlHxs?)(6%!Iw&&l79K86h+Z8;)m9+(zzX?cS zH*~)yk)X^H1?AfL!xctY-8T0G0Vh~kcP=8%Wg*zZxm*;eb)TEh&lGuNkqJib_}i;l z*35qQ@}I#v;EwCGM2phE1{=^T4gT63m`;UEf5x2Get-WSWmt6%T6NJM`|tk-~4<#HHwCXuduB4+vW!BywlH8murH@|32CNxx7} zAoF?Gu02vpSl|q1IFO0tNEvKwyH5V^3ZtEO(su1sIYOr{t@Tr-Ot@&N*enq;Je38} zOY+C1bZ?P~1=Qb%oStI-HcO#|WHrpgIDR0GY|t)QhhTg*pMA|%C~>;R4t_~H1J3!i zyvQeDi&|930wZlA$`Wa9)m(cB!lPKD>+Ag$5v-}9%87`|7mxoNbq7r^U!%%ctxiNS zM6pV6?m~jCQEKtF3vLnpag``|bx+eJ8h=(8b;R+8rzueQvXgFhAW*9y$!DgSJgJj% zWIm~}9(R6LdlXEg{Y3g_i7dP^98=-3qa z$*j&xC_$5btF!80{D&2*mp(`rNLAM$JhkB@3al3s=1k^Ud6HHontlcZw&y?`uPT#a za8$RD%e8!ph8Ow7kqI@_vd7lgRhkMvpzp@4XJ`9dA@+Xk1wYf`0Dk!hIrBxhnRR(_ z%jd(~x^oqA>r>`~!TEyhSyrwNA(i}={W+feUD^8XtX^7^Z#c7att{ot#q6B;;t~oq zct7WAa?UK0rj0yhRuY$7RPVoO29JV$o1Z|sJzG5<%;7pCu%L-deUon-X_wAtzY@_d z6S}&5xXBtsf8TZ13chR&vOMYs0F1?SJcvPn>SFe#+P3r=6=VIqcCU7<6-vxR*BZUm zO^DkE{(r8!e56)2U;+8jH4tuD2c(ptk0R{@wWK?%Wz?fJckr9vpIU27^UN*Q$}VyHWx)reWgmEls}t+2#Zm z_I5?+htcQl)}OTqF<`wht89>W*2f6e)-ewk^XU5!sW2A2VtaI=lggR&I z;Rw{xd)WMqw`VUPbhrx!!1Eg_*O0Si6t@ny)~X^Gu8wZZDockr)5)6tm+<=z+rYu? zCof+;!nq6r9MAfh zp4|^2w^-3vFK~{JFX|F5BIWecBJkkEuE%iP8AZ z^&e|C+VEH&i(4Y|oWPCa#C3T$129o5xaJa=y8f(!k&q+x=M|rq{?Zw_n?1X-bt&bP zD{*>Io`F4(i+5eE2oEo6iF}jNAZ52VN&Cp>LD{MyB=mCeiwP+v#gRvr%W)}?JBTMY z_hc2r8*SksC%(pp$KGmWSa|fx;r^9c;~Q(Jqw1%;$#azZf}#Fca9NZOh{*YxV9(1ivVA^2Wz>!A&Xvmm-~{y8n!^Jdl8c>`J#=2~!P{ zC1g_5Ye3={{fB`R%Q|%9<1p1;XmPo5lH5PHvX$bCIYzQhGqj7hZ?@P4M0^mkejD|H zVzARm7LRy|8`jSG^GpxRIs=aD>Y{Cb>^IwGEKCMd5LAoI;b{Q<-G}x*e>86R8dNAV z<@jb1q%@QQanW1S72kOQ$9_E#O?o}l{mHd=%Dl{WQcPio$baXZN!j{2m)TH1hfAp{ zM`EQ=4J`fMj4c&T+xKT!I0CfT^UpcgJK22vC962ulgV7FrUrII5!rx1;{@FMg(dIf zAC}stNqooiVol%%TegMuWnOkWKKA}hg6c)ssp~EnTUVUI98;a}_8UeTgT|<%G3J=n zKL;GzAhIQ_@$rDqqc1PljwpfUwiB)w!#cLAkgR_af;>}(BhnC9N zqL|q8-?jsO&Srv54TxVuJ=rfcX=C7{JNV zSmW@s0;$(#!hNuU0|YyXLs{9$_y2^fRmM&g#toh}!K8P}tlJvYyrs6yjTtHU>TB0} zNy9~t5F47ocE_+%V1(D!mKNBQc{bnrAbfPC2KO?qdnCv8DJzEBeDbW}gd!g2pyRyK`H6TVU^~K# z488@^*&{foHKthLu?AF6l-wEE&g1CTKV|hN7nP+KJnkd0sagHm&k{^SE-woW9^fYD z7y?g*jh+ELt;$OgP>Se3o#~w9qS}!%#vBvB?|I-;GM63oYrJ}HFRW6D+{54v@PN8K z2kG8`!VVc+DHl^8y#cevo4VCnTaPTzCB%*)sr&+=p{Hh#(MwaJbeuvvd!5fd67J_W za`oKxTR=mtM7P}i2qHG8=A(39l)_rHHKduDVA@^_Ueb7bq1A5#zHAi**|^H@fD`_W z#URdSG86hhQ#&S-Vf_8b`TIAmM55XhaHX7}Ci-^(ZDs*yb-WrWV&(oAQu3vMv%u$5 zc;!ADkeNBN_@47r!;%G3iFzo;?k)xTS-;1D-YeS5QXN7`p2PzGK~e6ib;8COBa5)p zfMn}dA--&A12~zr&GVk?qnBGfIEo`5yir;-Q;ZLn{Fimdrk;e!)q`sAkYh^~^>4Q@ zN5RT>s38+`V{|6@k&vZW!W0*BEqV&~34d+Ev8h)ObYL7Bd_hgbUzjdJaXP=S@Dp6X z)i013q3K4Gr5d%2YIp>218pYK!xwH;k)j?uUrT-yVKLg*L3y~=a+qd!RWGTL`z>29 z-Zb4Y{%pT%`R-iA#?T58c-i@?jf-Ckol9O>HAZPUxN%Z=<4ad9BL7n`_kH0i#E(m& zaNb039+z~ONUCLsf_a|x*&ptU?`=R*n}rm-tOdCDrS!@>>xBg)B3Sy8?x^e=U=i8< zy7H-^BPfM}$hf*d_`Qhk_V$dRYZw<)_mbC~gPPxf0$EeXhl-!(ZH3rkDnf`Nrf4$+ zh?jsRS+?Zc9Cx7Vzg?q53ffpp43po22^8i1Obih&$oBufMR;cT2bHlSZ#fDMZZr~u zXIfM5SRjBj4N1}#0Ez|lHjSPQoL&QiT4mZn=SxHJg~R`ZjP!+hJ?&~tf$N!spvKPi zfY;x~laI9X`&#i#Z}RJ`0+MO_j^3#3TQJu2r;A-maLD8xfI+2Y*iDf4LsQ$9xiu?~ z?^wHEf^qlgtjdj(u_(W5sbGx1;maVPDHvI-76u2uUywf;>()=e>0le;bO0LIvs)iy z*lJTO+7gyf^)2uS-PhS_O-+RToQmc6VT>ej^y^stNkwIxUg?E|YMAAwQ}U!dC&cXL ziXKU?zT~xbh6C};rICGbdX~;8Z%L~Jdg|`senVEJo-CiDsX47Kc`;EiXWO<9o)(`4 zGj(9@c+Me=F~y(HUehcAy!tkoM&e1y#(qqCkE(0lik_U>wg8vOhGR(=gBGFSbR`mh zn-%j3VTD4 zwA1Kqw!OSgi_v0;6?=Bk4Z{l-7Fl4`ZT535OC{73{rBwpNHMPH>((4G`sh zZhr!v{zM@4Q$5?8)Jm;v$A2v$Yp9qFG7y`9j7O-zhzC+7wr3Cb8sS$O{yOFOODdL) zV2pU{=nHne51{?^kh%a$WEro~o(rKQmM!p?#>5Pt`;!{0$2jkmVzsl|Nr^UF^IHxG z8?HmZEVMY~ec%Ow6hjfg6!9hCC4xY?V;5Ipo-myV=3TmfT^@XkKME`+=_inm4h7ki z->K~a+20?)zic^zc&7h=0)T{Aa24FU_}(O|9DMW3Bf>MW=O%~8{unFxp4}B+>>_KN zU%rKs3Va&&27&OX4-o&y2ie|sN2p-=S^V<2wa2NUQ4)?0e|hgna*1R7(#R_ys3xmG zE#(ry+q=O~&t|RX@ZMD`-)0QmE*x%SBc(Yvq60JtCQ4RL(gdA(@=}0rYo5yKz36bW zkvLOosP6I?7qH!rce(}q@cH-{oM2ThKV2RZe+{{25hkc?T>=Tky12xHr0jmfH@SZi zLHPJ@^Oo^Zo%`gZk_hrbCzS+t|=O!Bt zWi|>M8mz~sD|Z>C1ZPf_Cs&R!S5E2qK+@j*UpP>;5_|+h+y{gb=zub7#QKSUabet# zFH2H0ul;zO+uc+V=W_W@_Ig-791T7J9&=5)wrBE?JEHS_A6P~VQ)u6s1)Pu|VxP(aYJV*(e<)(42R zm3AK>dr1QLbC1RMoQ|M5k+TWBjY9q+_vY=K-tUte35m4RWl51A<4O0ptqV3)KzL7U z0gpp-I1)|zvtA8V7-e-o9H)lB_Rx6;Bu7A2yE)6)SuDqWDs}~Ojfk?DFwI% z3E1(>LbbB7I(&E@B7nlulhvY=Wa1mGXD@ijD7WF^y@L1e55h)-hzoq}eWe!fh9m3V{)x^6F8?ed1z>+4;qW6A4hYYj zZCYP=c#I8+$pAIVyiY*#%!j3ySAnH`tp|=^lh{)#JimWaP_rXK40A0WcsEUj`G1}O zG?XQ~qK4F!lqauv6-BL_Up3+-l1=kVfD;D*C)yr>o9>W=%mIyATtn_OBLK+h@p)j5jRAb;m&Ok?TZH-5Q)~#UwdYFp~rEE{judWa9E)z zE>135C-xMdHYY&AZGR)tb`K}s0CK9 z1!))p^ZaUC*e50t`sL+)@`)#kJ}?C_cCMH@k{f4wh~0`OFnGQ2nzUuuu;=r4BYRcI z){G#a6Y$S(mIc6B#YS;jFcU{0`c)Raa$nG+hV(K|2|^ZWOI566zlF0N;t~$jD<_AX zjnD?HN-G>xRmHwtL3BcJX7)Q^YGfc?cS4Nj=yYl5MB(uBD?r@VTB|mIYs=au$e)e{ zLHWd!+EN*v2*(=y%G1JzyQdY&%|?~R5NPb)`S2dw1AJW8O;L=p?yVxJs=X?U#-l1O zk6xh8yyY;OTR7aF{P=kQ>y`*EFivnw%rQioA-I67WS+~hVamG4_sI)(Jo4vHS|@F@ zqrBHbxHd_Y8+?8Gfq=Z1O^Fs5moGayCHVUHY^8)^j)Aj*RB!S2-FA?4#-`puwBW`` zJ_6OQj(FGo8DotHYRKq;;$4xDn9=4rgw}5xvxhi)?n?W5{*%4%h9Tg)zlQl&fN~Z1)gL(Dn7X!P428I zwA+U-x5!cQ57g1N=2bLqAWF z!&cbvsD)dvYoqP5vaQz%rL@kv*J>0AMzWAKn~Mxi5g2GlI7qvVZo)Z5oj=#O!M&*O z`3O3)uvrjNTeremC}nW@(m%#E-sITB>j-!yBM#(=FN`~c#@XjL3e)SjR9&%QO%tUg zzGv=SLH()`ZIt?Ayym;9VG1Muq+a+7Zo+59?SuRu_`k>@S4!yS3roMnq+SDO?`C7V#2 z8vHf4&0k;{kLT)fa==7EILSu3e|ZnxtFO;1 zGqP-;Xo(>_QKcYUhsi-X72BqH#7Zb-TsiNIF>G9xOHT3XoA*qX^10+#XCU0)UO4_%A_s_vO=uDd3_Q%D{OsvLMW9wGvuuRnF52{2vH06D~7N672!bIMt@it_D}& zwjZ7gV!RzZ86*wbEB5cnMJRbEqMM{G!K)bfJjyPH^9nGnrOI9S{~!dm4~P#&b*~)h zCMwM8mR+y5i~E5*JAopwZ>F`=ORfA&IF%O8(aS<}^H6wcY1g^=lYLPtFpyvW9F z3;FCS-TGFYPr#Y$ue>}?rTYrmWr^VbUu>!eL$cEdh1e>5_UDnZ@Mu$l*KVo_NDEu^ zBn*!qVnzYv>t|<(>nt8%CoNPhN!qGP|sANRN^#+2YSSYHa>R1mss->c0f=#g@U58@? zA4sUbrA7)&KrTddS0M6pTSRaz)wqUgsT3&8-0eG|d;ULOUztdaiD3~>!10H`rRHWY z1iNu6=UaA8LUBoaH9G*;m`Mzm6d1d+A#I8sdkl*zfvbmV0}+u` zDMv=HJJm?IOwbP;f~yn|AI_J7`~+5&bPq6Iv?ILo2kk$%vIlGsI0%nf1z9Mth8cy! zWumMn=RL1O9^~bVEFJ}QVvss?tHIwci#ldC`~&KFS~DU5K5zzneq_Q91T~%-SVU4S zJ6nVI5jeqfh~*2{AY#b(R*Ny95RQBGIp^fxDK{I9nG0uHCqc-Ib;pUUh$t0-4wX*< z=RzW~;iR3xfRnW<>5Jr5O1MP)brA3+ei@H8Hjkt7yuYIpd7c-4j%U=8vn8HD#TPJo zSe+7~Db}4U3Y^4dl1)4XuKZ67f(ZP;?TYg9te>hbAr4R_0K$oq3y5m-gb?fR$UtF9 zS~S^=aDyFSE}9W2;Okj%uoG-Um^&Qo^bB#!W?|%=6+P>``bumeA2E7ti7Aj%Fr~qm z2gbOY{WTyX$!s5_0jPGPQQ0#&zQ0Zj0=_74X8|(#FMzl`&9G_zX*j$NMf?i3M;FCU z6EUr4vnUOnZd`*)Uw#6yI!hSIXr%OF5H z5QlF8$-|yjc^Y89Qfl!Er_H$@khM6&N*VKjIZ15?&DB?);muI`r;7r0{mI03v9#31 z#4O*vNqb=1b}TjLY`&ww@u^SE{4ZiO=jOP3!|6cKUV2*@kI9Aw0ASwn-OAV~0843$1_FGl7}eF6C57dJb3grW)*jtoUd zpqXvfJSCIv4G*_@XZE?> z4Lt=jTSc*hG3`qVq!PVMR2~G-1P{%amYoIg!8Odf4~nv6wnEVrBt-R5Au=g~4=X|n zHRJGVd|$>4@y#w;g!wz>+z%x?XM^xY%iw%QoqY@`vSqg0c>n_}g^lrV))+9n$zGOP zs%d&JWT2Jjxaz`_V%XtANP$#kLLlW=OG2?!Q%#ThY#Sj}*XzMsYis2HiU2OlfeC>d z8n8j-{Npr1ri$Jv2E_QqKsbc$6vedBiugD~S`_0QjTTtX(mS}j6)6e;xdh*sp5U0aMpuN}qTP=^_Qn zh~0padPWs&aXmf6b~}{7Raglc)$~p?G89N4)&a}`izf|bA)IUmFLQ8UM$T!6siQxr z=%)pPsWYXWCNdGMS3fK6cxVuhp7>mug|>DVtxGd~O8v@NFz<+l`8^#e^KS3})bovWb^ zILp4a_9#%Y*b6m$VH8#)2NL@6a9|q!@#XOXyU-oAe)RR$Auj6?p2LEp*lD!KP{%(- z@5}`S$R)Kxf@m68b}Tr7eUTO=dh2wBjlx;PuO~gbbS2~9KK1szxbz$R|Frl8NqGn= z2RDp@$u5Obk&sxp!<;h=C=ZKPZB+jk zBxrCc_gxabNnh6Gl;RR6>Yt8c$vkv>_o@KDMFW1bM-3krWm|>RG>U`VedjCz2lAB1 zg(qb_C@Z~^cR=_BmGB@f;-Is3Z=*>wR2?r({x}qymVe?YnczkKG%k?McZ2v3OVpT* z(O$vnv}*Tle9WVK_@X@%tR^Z!3?FT_3s@jb3KBVf#)4!p~AFGgmn%1fBbZe3T53$_+UX_A!@Kz63qSLeH@8(augJDJ;RA>6rNxQYkd6t(sqK=*zv4j;O#N(%*2cdD z3FjN6`owjbF%UFbCO=haP<;Y1KozVgUy(nnnoV7{_l5OYK>DKEgy%~)Rjb0meL49X z7Fg;d!~;Wh63AcY--x{1XWn^J%DQMg*;dLKxs$;db`_0so$qO!>~yPDNd-CrdN!ea zMgHt24mD%(w>*7*z-@bNFaTJlz;N0SU4@J(zDH*@!0V00y{QfFTt>Vx7y5o2Mv9*( z1J#J27gHPEI3{!^cbKr^;T8 z{knt%bS@nrExJq1{mz2x~tc$Dm+yw=~vZD|A3q>d534za^{X9e7qF29H5yu};J)vlJkKq}< zXObu*@ioXGp!F=WVG3eUtfIA$GGgv0N?d&3C47`Zo)ms*qO}A9BAEke!nh#AfQ0d_ z&_N)E>5BsoR0rPqZb)YN}b~6Ppjyev;MMis-HkWF!az%G? z#&it84hv!%_Q>bnwch!nZKxB05M=jgiFaB^M=e-sj1xR?dPYUzZ#jua`ggyCAcWY> z-L$r#a{=;JP5X}9(ZPC&PdG~h5>_8SueX($_)Qu(;()N3*ZQH(VGnkWq^C}0r)~G3_?a10y*LsFz zokU5AKsW9DUr-ylK61shLS#4@vPcteK-Ga9xvRnPq=xSD_zC=Q_%6IuM?GpL(9aDx z|8d_;^6_D4{IQ1ndMAcFz5ZaT+Ww0wWN`xP(U#^=POs(BpKm;(H(lmYp+XCb7Kaw0 z;LT945Ev3IkhP6$lQBiMgr+vAL}{8xO&IObqJBEP4Y^x&V?iGC=1lVIbH^Z!eXxr@ zz)D7Fon`z~N|Pq>Bsue&_T9d;G+d8#@k^cq~F^I8ETsZ*cGOf*gZ4ghlAzW|aZ;WA13^B!Tlr0sWA zosgXD-%zvO-*GLU@hVV(bbQ`s@f~Ux=4}(@7O)%o5EH((gYflccBC@jbLF3IgPozv zglX2IL}kL1rtn4mu~`J(MMY83Rz6gc1}cX4RB+tZO2~;3FI# z@dU(xa5J_KvL0)oSkvwz9|!QcEA$jKR@a-4^SU3O449TrO+x$1fkBU<<=E_IHnF6> zPmZ7I2E+9A_>j6og$>Nih~b2F_^@6ef|Hm-K2(>`6ag{Vpd`g35n`yW|Jme78-cSy z2Jz7V#5=~u#0eLSh3U4uM3Smk31>xEh^-Os%&5tK6hSAX83jJi%5l!MmL4E?=FerNG#3lj^;-F1VISY!4E)__J~gY zP{o~Xo!8DW{5lsBFKL~OJiQoH>yBZ+b^};UL&UUs!Hbu7Gsf<9sLAsOPD4?-3CP{Q zIDu8jLk6(U3VQPyTP{Esf)1-trW5Mi#zfpgoc-!H>F$J#8uDRwDwOaohB(_I%SuHg zGP)11((V9rRAG>80NrW}d`=G(Kh>nzPa1M?sP;UNfGQaOMG1@_D0EMIWhIn#$u2_$ zlG-ED(PU+v<1Dd?q-O#bsA)LwrwL>q#_&75H)_X4sJK{n%SGvVsWH7@1QZqq|LM`l zDhX8m%Pe5`p1qR{^wuQ&>A+{{KWhXs<4RD< z=qU6)+btESL>kZWH8w}Q%=>NJTj=b%SKV3q%jSW>r*Qv1j$bX>}sQ%KO7Il zm?7>4%Q6Nk!2^z})Kchu%6lv-7i=rS26q7)-02q?2$yNt7Y={z<^<+wy6ja-_X6P4 zoqZ1PW#`qSqD4qH&UR57+z0-hm1lRO2-*(xN-42|%wl2i^h8I{d8lS+b=v9_>2C2> zz(-(%#s*fpe18pFi+EIHHeQvxJT*^HFj2QyP0cHJw?Kg+hC?21K&4>=jmwcu-dOqEs{%c+yaQ z2z6rB>nPdwuUR*j{BvM-)_XMd^S1U|6kOQ$rR`lHO3z~*QZ71(y(42g`csRZ1M@K7 zGeZ27hWA%v`&zQExDnc@cm9?ZO?$?0mWaO7E(Js|3_MAlXFB$^4#Zpo;x~xOEbay( zq=N;ZD9RVV7`dZNzz+p@YqH@dW*ij8g053Cbd=Mo!Ad8*L<5m1c4Kk ziuca5CyQ05z7gOMecqu!vU=y93p+$+;m=;s-(45taf_P(2%vER<8q3}actBuhfk)( zf7nccmO{8zL?N5oynmJM4T?8E))e;;+HfHZHr` zdK}~!JG}R#5Bk%M5FlTSPv}Eb9qs1r0ZH{tSk@I{KB|$|16@&`0h3m7S+)$k*3QbQ zasW2`9>hwc)dVNgx46{Io zZ}aJHHNf1?!K|P;>g7(>TefcLJk%!vM`gH8V3!b= z>YS+)1nw9U(G&;7;PV4eIl{=6DT^Vw<2Elnox;u@xF5ad*9Fo|yKgq<>*?C$jaG2j z|29>K)fI^U!v?55+kQ*d2#3}*libC4>Dl4 zIo3Jvsk?)edMnpH<|*l<*0Pf{2#KedIt>~-QiB{4+KEpSjUAYOhGDpn3H_N9$lxaP ztZwagSRY~x@81bqe^3fb;|_A7{FmMBvwHN*Xu006qKo{1i!RbN__2q!Q*A;U*g-Mz zg)-3FZ`VJdognZ~WrWW^2J$ArQAr1&jl~kWhn+osG5wAlE5W&V%GI{8iMQ!5lmV~# zeb3SKZ@?7p;?7{uviY6`Oz16t0=B70`im=`D@xJa16j2eHoCtElU*~7={YUzN41sE z#Th>DvJq-#UwEpJGKx;;wfDhShgO0cM|e!Ej){RX#~>a?)c2|7Hjhh2d=)VUVJL<^Aq|>_df4DX>b9W2$_DM zTjF#j(9?Co`yor?pK<16@{h#F&F8~1PG|qQNZPX^b!L*L&?PH#W8za0c~v6I2W($Jderl%4gufl z#s;C*7APQJP46xHqw;mUyKp3}W^hjJ-Dj>h%`^XS7WAab^C^aRu1?*vh-k2df&y9E z=0p*sn0<83UL4w30FqnZ0EvXCBIMVSY9Zf?H1%IrwQybOvn~4*NKYubcyVkBZ4F$z zkqcP*S>k6!_MiTKIdGlG+pfw>o{ni`;Z7pup#g z4tDx3Kl$)-msHd1r(YpVz7`VW=fx9{ zP}U8rJ-IP)m}~5t&0Y$~Quyjflm!-eXC?_LMGCkZtNDZf0?w<{f^zp&@U@sQxcPOZ zBbfQTFDWL_>HytC*QQG_=K7ZRbL!`q{m8IjE0cz(t`V0Ee}v!C74^!Fy~-~?@}rdn zABORRmgOLz8{r!anhFgghZc>0l7EpqWKU|tG$`VM=141@!EQ$=@Zmjc zTs`)!A&yNGY6WfKa?)h>zHn!)=Jd73@T^(m_j|Z;f?avJ{EOr~O~Q2gox6dkyY@%M zBU+#=T?P8tvGG|D5JTR}XXwjgbH(uwnW%W?9<-OQU9|6H{09v#+jmnxwaQ-V;q{v% zA8srmJX7Fn@7mr*ZQ@)haPjWVN@e3K z_`+@X$k*ocx*uF^_mTqJpwpuhBX~CSu=zPE(Sy%fYz&lzZmz3xo4~-xBBvU0Ao?;I-81*Z%8Do+*}pqg>bt^{w-`V6Sj>{Znj+ z70GS2evXinf|S#9=NNoXoS;$BTW*G0!xuTSZUY45yPE+~*&a-XC+3_YPqhd*&aQ>f z$oMUq^jjA;x#?iJKrpAqa<2<21h*_lx9a}VMib;a6c$~=PJOj6XJXJ|+rc7O7PEN5uE7!4n9nllo@BI4$VW2Nf_jqnkz%cvU4O4umV z#n6oXGWOt3tuIjmX*b!!$t~94@a@QgybLpQo3icAyU`iNbY~XNAArFAn$nFJ()d-U zFaO#nxxVF-%J{UB**uRo0*+?S>=^il)1m7v-u`PDy*ln%|3E-{3U~R=QcE&zhiG_c zDnGMgf1}3h1gWz8IV0Oc7FmEt>6W?Eva;J`(!;IIny}PvD?vztz`F6su_tUO`M%K5 z%C#=nXbX})#uE!zcq2mB;hPUVU1!`9^2K303XfOIVS{mlnMqJyt}FV=$&fgoquO+N zU6!gWoL%3N1kyrhd^3!u>?l6|cIl*t4$Z$=ihyzD7FFY~U~{RaZmfyO4+$kC7+m zo+-*f-VwpUjTi_Idyl~efx)!$GpE!h+in4G1WQkoUr<#2BtxLNn*2A>a-2BL#z%QO@w0v^{s=`*I6=ew2nUj1=mvi%^U@2#Wf& zs1@q6l8WqrqGm!)Yr|*``||#A+4#du6`mR^_#?CymIr}O!8Zm?(XY$u-RGH;?HFMGIEYVuA1& z`3RlG_y0%Mo5w@-_W$E&#>g6j5|y1)2$hg(6k<{&NsACgQQ0c8&8Tdth-{@srKE*I zAW64%AvJJ+Z-|I~8`+eWv&+k8vhdJk5%jolc%e`^%_vul0~U8t)>=bU&^ z6qXW&GDP%~1{L1-nKK>IsFgDJrh>!wr3?Vu-cmi#wn`;F`$GNc_>D|>RSuC8Vh21N z|G;J1%1YxwLZDD400Ggw+FirsoXVWYtOwg-srm}6woBb!8@OIc`P$!?kH>E55zbMB z8rdpODYfVmf>cF`1;>9N>Fl(Rov!pm=okW>I(GNJoNZ6jfIunKna-h6zXZPoZ9E2PythpyYk3HRN%xhq2c?gT$?4}Ybl42kip$QiA+ab zf-!EqBXkT1OLW>C4;|irG4sMfh;hYVSD_t6!MISn-IW)w#8kgY0cI>A`yl?j@x)hc z=wMU^=%71lcELG|Q-og8R{RC9cZ%6f7a#815zaPmyWPN*LS3co#vcvJ%G+>a3sYE`9Xc&ucfU0bB}c_3*W#V7btcG|iC>LctSZUfMOK zlIUt>NBmx6Ed}w_WQARG+9fLiRjS1;g49srN1Xi&DRd|r+zz*OPLWOu>M?V>@!i49 zPLZ3Q(99%(t|l%5=+9=t$slX0Pq(K@S`^n|MKTZL_Sj+DUZY?GU8sG=*6xu)k5V3v zd-flrufs*;j-rU9;qM zyJMlz(uBh0IkV<(HkUxJ747~|gDR6xFu?QvXn`Kr|IWY-Y!UsDCEqsE#Jp*RQpnc# z8y3RX%c2lY9D*aL!VS`xgQ^u0rvl#61yjg03CBER7-#t7Z++5h_4pw{ZZ~j0n_S_g zR=eVrlZDiH4y2}EZMq2(0#uU|XHnU!+}(H*l~J&)BUDN~&$ju@&a=s$tH5L`_wLeB z944k;)JIH^T9GEFlXiNJ6JRymqtLGZc?#Mqk2XIWMuGIt#z#*kJtnk+uS;Gp}zp$(O%LOC|U4ibw%ce-6>id$j5^y?wv zp1At~Sp7Fp_z24oIbOREU!Mji-M;a|15$#ZnBpa^h+HS&4TCU-ul0{^n1aPzkSi1i zuGcMSC@(3Ac6tdQ&TkMI|5n7(6P4(qUTCr)vt5F&iIj9_%tlb|fQ{DyVu!X(gn<3c zCN6?RwFjgCJ2EfV&6mjcfgKQ^rpUedLTsEu8z7=q;WsYb>)E}8qeLhxjhj9K**-Ti z9Z2A=gg+}6%r9HXF!Z~du|jPz&{zgWHpcE+j@p0WhyHpkA6`@q{wXl6g6rL5Z|j~G zbBS~X7QXr3Pq0$@mUH1Snk^1WJ0Fx2nTyCGkWKok$bJZV0*W?kjT|mkUpK<)_!_K^OoTjMc+CWc^~{ZP8vgm`f&=ppzKtw}cxwV^gppu}^df1|va7Q?@=(076-( z4KJVmu?l(aQwmQ*y_mke>YLW^^Rsj@diLY$uUBHL3yGMwNwb7OR3VD%%4tDW(nC984jBWCd90yY(GEdE8s(j>(uPfknLwh!i6*LX}@vvrRCG`c?EdB8uYU zqgsI4=akCeC+&iMNpVu56Fj2xZQHs6SdWssIF#Q@u@f9kab0&y*PlG+PynjHy`}GT zg%aTjRs2+7CknhTQKI%YZhFq1quSM{u24Oy2As@4g(bpbi%y1i0^TwI)%1Whpa~qE zX4MD(PgFEK@jZBPXkFd437aL6#COs$WrNT#U=er-X1FX{{v9!0AS$HR{!_u;zldwY zKko!`w2u@($c&k_3uLFE0Z*2vms?uw1A{AqZw^jwg$|D7jAY20j`s*l##=4Ne_K5) zOtu6_kziEF@vPsS7+@UwqOW6>OUwF$j{r4=nOSf-{UC(rEKidie7IUn>5`UoNJ9k) zxJXXEBQifng+Pte3mPQ76pVlZ<`jnI##F1*YFA*)ZCEncvgF-%)0dUXV*pXTT^L`n zL=?A5Vty#{R9W4K)m$`me~*_(&a88M?Eon$P-YdVG}#Gq4=hh#w=`>8f`9}}zhv;~ za?I=Gb3v$Ln?-SDTBow0J5Tt&xPlw|%`*VTyVee1Oh<-&;mA|;$ zoPl;^f7Q~}km#_#HT2|!;LEqORn%~KJaM)r#x_{PstSGOiZ!zX2c}^!ea3+HSWrwE z=6SJ!7sNDPdbVr#vnUf}hr&g@7_Yj&=sY=q(v^BwLKQm|oSB}172GpPlj?a3GqX#B zJko4zRRttIY>Fv#2b#A<_DLx=T@eUj+f}!u?p)hmN)u4(Jp(`9j58ze{&~rV?WVbP z%A=|J96mQjtD037%>=yk3lkF5EOIYwcE;uQ5J6wRfI^P3{9U$(b>BlcJF$2O;>-{+a1l4;FSlb z_LRpoy$L%S<&ATf#SE z;L?-lQlUDX_s&jz;Q1Lr@5>p_RPPReGnBNxgpD!5R#3)#thAI3ufgc^L)u%Rr+Hlb zT(pLDt%wP7<%z(utq=l%1M78jveI@T$dF#su(&>JkE(#=f4;D54l*%(-^(nfbCUQe)FV9non9F%K+KZ(4_`uOciy82CO)OolxisUd0m^cqueIRnY< z;BgA4S1&XC3uUP?U$}4o&r|0VCC7fkuMZBa|2n4asR>*5`zBaOJPWT$bNn(W_CK%L$c2AsfSlwq?A8Q6 zhK&USSV=^-4vZ^5<}pnAOb&IKseHNxv_!|B{g@d^&w%{?x;i3iSo)+vt^VnMmS!v) zM)W)05vXqzH5^hOWWw~$#&7HoIw}}DD3bCQgc=I8Rv|G5fM8O^58?--_-*>%Nwk)j zIfvfok0n05!w%tZ=-dpffezI7(+}yX5XhwYk#0@KW%PkR;%#t|P6Ze_K*N6ns%jOt zNeW(bRsv0BK7ah~9U~UBAVA_L34F+;14x6-;I|o=%>?sS3@dpRv|GKxilsa#7N#@! z!RX~>&JX&r{A^^>S~n_hPKkPR_(~~g>SuPj5Kx6VI%8BOa(Iit&xSMU8B#EY-Wr?9 zOaRPw0PEbVSW@Wk{8kkVn34;D1pV2mUXnXWp{V-M9+d}|qfb6F`!a9JQO_-wlH?zf z4Sn0F4-q-tzkaJ?1fV0+cJBF$f0g6*DL6U3y`Tr`1wzCiwY#muw7Q-Ki)uN}{MoCWP%tQ@~J4}tyr1^_bV9PScNKQHK=BZFV!`0gRe?mVxhcA4hW5?p0B<5oK+?vG^NM%B%NDOvu0FMq#)u&zt_-g&2 z7?z%~p&32OAUSQV{<=pc_j2^<;)`8$zxCEomh=rvMiliShS?ahdYI1grE-M&+qkK_ zD=5Hexi<&8qb4hgtgj81OD(tfX3EJSqy9KFcxpeBerG`apI4!#93xpEFT??vLt>kf zac28;86CpMu=BWIe$NOT~+Es!y#+$ zvm2s*c`J9Gy*ERvLSI<9<=j*O=0xUG>7rYh^R4bGsvz;j-SBO|P^OQ1>G9_akF}D; zlRmB@k3c5!s|Vz3OMZ8M*n0AMTiSt5ZpRy+R1|ckna&w`UQjklt9f&0Z~=->XImVA zLXizO2h=<|wM~w>%}3q1!E{oSq7LBPwQ~93p-peDq-W?wCm8NOKgTSz-P)|cm}S5&HBsx#C@Ba5;hzi#Yw@y-kC~)@u4}Rf?KV0$lPjv}} zcFpNy=YJfsS||9&!-JFjw=@NU96ESzU^gme0_oNy?})II`>Sy>bUCHs_(m&)vn^&isCl+`F~qu8elAO z)-ZP7`gYE2H(1)5tKalz&NJbcutAU&&JFV~$Jrai31^j>vZ|HV1f}#C1<5>F8 zS1RWIzM%b{@2dAF^$+i4p>TC8-weiLAPN+Aa#(bxXo9%Vz2NEkgF&s#_>V?YPye^_ z`` z-h3Cv^m6K%28I$e2i=cFdhZN?JTWhqJC{Q9mg0Vg|FiPEWDl&K)_;Bz_K`jH7W7QX^d$WQF*iF@#4_P*D36w9&iJr2E{w?LRFapwZIIVHGH ziTp*5>T{=;(E}z{1VL4;_H`BAXA~&zpeWX!gN9m|AfcJ{`!XVz48O^&+0Gd|w;udP zzU|DbGTS|7qZoEoDZEH9Kb0%DZvCaWDzuJ=8jZz}pqPn+I!c_+*~>m>BQqN2560*< z$6sx_y8WRqj$SugYGip+et$;iJ!SQAx=HgVSh_3e)MOFHuXD@sg>Yi_p8Sh`{lP=5 zo?AFv1h;KqR`Yj!8Pjji3lr+qae2|a1GmlxE*su%_V)K0Xu0(#2LcO!*k11w*V12$ z;f~i{kI#9PzvFLZ3pz@d558HeK2BTvk*JvS^J8L^_?q4q z);;4Z!DsV!P*M>F>FiF*{|p_nUgy;pDh?J8vwO;emgOAAcxrgDXiSDS5ag?0l*jj< z(khZ3-)>eiwPwpb6T9meeL)!2C-K@z9fF`0j|t@;^f5+dx86R3ZM{bnx9Hm1O$s)N zk$OvZR0u2`Z^QP8V%{8sEhW~_xbZMad2jtz&0+ekxmp;9`ae;_f%-ltk5E%)VT*a6 zRbMnpCLPnalu+1TafJ4M0xNV8g}U4Mjk{le6MA|0y0rk)is}M%Z9tUU22SvIAh7`w zTysd{Pztfkk=jD^*!lA+rBcqb)Fx`A5iaU2tl&XdL1D)U@pLEXdu%#YB*ol1N?4ti zHBQcU#_%UqiQ1)J^u-ovU@-7l?`YzYFvA2#tM0mEh3?CpyEh_NUuVajD16t zyg$C*5du9R=K~6mCJ`W+dFI$9WZZauO)p2H)*SKpHVsIu2CxfJvi2>; zcit#57RP7DpSwMF-VBm|4V5d=tRgX7RM9%KQ0JRo6d<)RmiIPWe2zh6tmswP`fs^) zwy};#jk|NXMqCSfwIR3QZ#W2`(%sJ>qvk=53CYoLmQt9q|2Gm$sB;rEuBqGJA1OUM zoyl4Wy-HYn0J6L=cad8o)R!Ea^;`rSMg9hYo3?Fw6B9dUq75a-MSb56n8~AAsS(JP zZ!1khPu}!GRpsj+jvl`N1tDD8m1myJCI3c-c<9U-1Vg`xJO~}5_wvPXYh^=Boo^|V z3Tp}|lH!9m4Ipa_$p;b8fjUd=zc4iO7vr)M&Xs0_m$fgY@+hB9%K~4*9$p0d)m2bO ze5JH`W0fnIKdcW!oO#^g1YceSQ4u->{>u@>tLi!fky)o&$h(=he?Fe_6?}O~iSf(F zV&(P~*5h>BW{3e1H%8*7#_%L1#>W97b0@jHtliES^w6w5oldI7QL+?I(Pl$DaN>~d5nXx z;CO1E+S?3E2PLq~)-?ygkHAO1m&hOYmj7?;2XM!$D^f0l9K4P{n}mgb{CoYH6RJ8o ztydc6dNqA)`CG?=Gd~EIbi`UM)eyzGF^+i?&TOdyW~mFH_^Gye(D}clDVFQ@V2Tvy z7rQIaq8Xx`kC;AO-_{k%VI2e6X@bIy^mupEX%{u0=KDUGu~r6lS*7GOeppy{&I&Ly zjOTz=9~jC|qWXznRbrfjg!1`cE!Hzyjzw6l{%>X)TK(UEGi9Uy3f9D6bbn0gT-s`< z8%$Msh!^8WidX7S;)n2jh_n1-QCtSyOAKcPQc(Xlf0*Q|5CSBjo(I-u!R0GJgzTkL z|6QdQRrUMbUO|q0dQ%+d^4)*Mjbm$R}RUcz(7|E0Bq-bAYY@)OsM<+2>}CV zzPBgeD~kBHE(Y+@l2orJrdtV7XXq_V8IETas%7OCYo`oi)+h&v#YN!Qpp7drXFS>6 z?r-q7px+(rIy+bo1uU#I2A5s@ASe01FgGMbouFkhbkm-9yZ8Q2@Q1vuhDQ3D3L+zA z(uz8^rc24VmE5r0Gbd;yOrXnQKAEBfa3@T7fcF$#QYv^00)VZPYehpSc@?^8we}o{ zlX0~o_I<`xSfI8xF(WXO-DX1>wJ`XN?4rw@}_RLD*${$}UaXL=oM(=SDMIxZj1Ji#jAcrH7nYG`r z#ewodj>F5Bf9j(j`a;>)=*2j_ZN}vf!~Hq`2Eyt;9UH1_(yjq1OUO(1M0lI3FZ2j-fU9)L59v&OiQ>5$;d!jg?Fo{Svf5t5FCZbb?)* zJN=Q!?2BztV$7)CWtG0MO~Lr4E5>aoHD5N4(+@~gQEbZTc4s3HrIl_G23PCng4Y3f zbLZK1A-x9x!)WwuI=UBkQ5QyE^&Nrw?@fsRKK41G9-xq=#VyO%CEo`{_eioDj%M!3x=>I zfOPFiFX{1t-|+3E@?UuK=0miGN04hW0=JnJrEyWw{Bg-jMvAA}cg<5LN1c5BQdrIZ z#+bxj9Jbu`11@IUjU|RKfL(UzRlVB4XT ze|(WaxL$KiRqkgCr3^Al(19!_Y7b=E(4Xm7LCO$y5+k;Fu6B#=OSzW`-7p{zRv-_) zPr!|km?8aF}+3hm)QG92YaI+jctX&5IrvTUGf{Y$)TK6)s9v!SMhU=HIpEC~2 z4>o14mG$El2sTA(Ct?xS!l*x7^)oo}|3+BF8QNe;bBHcqdHVmb?#cbS*NqZ%mYS~z z`KLoq7B#KULt%9a#DE%VTEo4TV03T2nr`FK5jUTA$FP0JH6F9oD*|0z1Yf2b5?H0_ zD|K|_5Zk`uu?ZN0U! z_mL>>F;mnHU=@to!Vv*s4;TQr9y)L@1BXXz^a85NSifPTL4h6I>+m_S3~FkXB{N?E zS<3ue_(wqaIS5;4e9{HB`Okl9Y}iFiju+oTqb)BY)QT?~3Oag7nGu-NB5VCOFsiRs zs@m%Ruwl^FuJ1b}g^=*_R?=SYJQ@7o>c9j>)1HgB zyN9LI9ifwu{Shlb6QO2#MWhxq~IG!U^I!6%5}(sbi>=bq8!8@s;4Iaun#kvh7NPwX34Rjbp2f!D)cF&sNIO%9~;C`cs&ZY2=d@c3PpN$YZjUT}X7rY`dlWX$yc znw(7=fzWapI=KzQnJ(6!o0K_aDk!^dZ#)pSTif+jQtQXga$bPApM z=);jZ5c*?*GoeGMnV0=RrZucRRYBjx>tx`A3OuY)#tp2w7mh}&kj)SKoAvbbf;uO! z?+RItUow0xc*6StuO4D--+qY!o}Isy}s;ts5aM5X~eJUZoLOq@dGv=a4hHJD<* z5q{dZSN{bv_(Vj#pFm7Q<$C;MwL|Qizm~QCFx~xQyJoCOZ$`sYD}}q>PwRZjb<=E< zAeMP?qVfM>xu2}Il2xT6={KBdDIstxY-`5IWXN zUiWV&Oiy5R_=2X9Y$ug9Ee=ZSCaza!>dWBMYWrq7uqp>25`btLn^@ydwz?+v?-?2V z?yVwD=rAO!JEABUU1hQ|cY+_OZ14Hb-Ef`qemxp+ZSK?Z;r!gDkJ}&ayJBx+7>#~^ zTm<>LzxR^t-P;1x3$h;-xzQgveY$^C28?jNM6@8$uJiY81sCwNi~+F=78qJZ@bIsz1CO! zgtPM~p6kaCR~-M>zpRCpQI}kUfaiZS`ez6%P6%*!$YCfF=sn}dg!593GFRw>OV2nQ ztTF6uB&}1J`r>gJuBP(z%KW{I^Uz%(^r5#$SK~%w1agl)Gg9Zy9fSK0kyLE24Z(34 zYtihZMQO^*=eY=<5R6LztHaB1AcuIrXoFuQ=7&C}L{c?Z$rto$%n=!whqoqG>#vvC z2%J5LVkU%Ta8hoM($p1WqN}wurA!d@#mQGU5Nb>~#XC84EYH)Zf&DZR!uY+-;VqS< z@q?$ggdX#auS#%%%oS^EN)?JhSR4JYpSgGRQZD<9!YvvF+zp0>C#$!x*x}l8U|Bb& zv?v*im5Bq_(5Wi40b1^nKun$XTST(a8yOAcqQZmKTgGLo)Ig6JuEh5J9NnqJXin@Gxzz-k6xXWYJ&@=JZw=$+ zFPGde%HsR`gI+y`rtiPaMYwbtyp!sVb!pX~;c3zLoPO0eaZSV+O_z z%9H@UhqNowzBTPcMfL6kC>LRaFF6KVaSv1R@%4}rtleX!EMnL`rethYrhTLj1x$tj z;)H!fKo08&T(;i|FT&rPgZ*D0d=B2dXuO_(Uaoi9+vEhs4%{AD{Fl@4^|`X=PvH(s zI7$6bWJiWndP$;&!kSCIR1l57F2?yzmZm~lA5%JKVb;1rQwj*O=^WW~`+n*+fQkK0 zydInOU1Be2`jhA!rnk1iRWR=1SOZpzFoU5{OPpc&A#j6Oc?D&>fAw=>x@H7?SN;d^ z-o&}WR;E|OR`QKItu(y4mT)%Pgqju-3uyH?Y@5>oSLO2Y(0(P!?_xOL=@5+R7rWw# z3J8%Hb@%Pzf^`=J6fEJ_aG6+e7>OUnhaO1(R1<6>f}L z?d@Wnqw9?^;2?q(b@?Wd=T6r_8a@Z4)*_@Q7A`+ zW3w?j!HW0KbhxF%D`9d2HpvIrBxM!36W3Yh5=8_0qYfnHm*yiLB?Ay|V10N%F9XYq zanaDtDk$rS+|_H_r|a${C}C7b{E)Ii20-a?Grff$E?&|gWF<#Ern2GqhCiS0~Y%knIi8zY^lE4qLaR-3M;_Rkz(s;wu z9207W1PXIe#4h4Zw}dvdV&FYcnUlD5_C4hzJ@bPSBVBLpl$&52mi+wwH;svyVIzAB zoA+NQ;Hpqh?A}^Et~xhl>YQNQwh20!muW{ zq}|Pg3jHZWnDBN?r1KhiVG$%Sm-4+=Q2MZzlNr3{#Abqb9j}KK%sHZj{Vr2y4~GIQ zA3Mz1DjQ3q(CC~OyCaZn0M2!){)S!!L~t>-wA&%01?-*H5?nzW?LJB`{r&)vLB4!K zrSm({8SeZ0w(bL9%ZZAZ*^jf=8mAjK^ZR0q9004|3%73z#`-Npqx*X^Ozbja!C1MW z-M~84#=rU1r>p{+h9JU<#K_x$eWqJ+aP%e?7KTSK&1>dlxwhQmkr69uG~0iD@y|L- zlY0vSR2|IhZoS6PpfUai_AhKo2HfdD&mhv#k51CX;T z*sU)XbDyfKjxYC$*_^(U)2-c0>GJ(zVm$CihHKlFSw&1A$mq$vsRt-!$jJe3GTaZ6 z3GcVvmwZ0D>`U+f3i*pQ>${p1UeyF~G9g~g-n{ThVOuC#9=ok`Zgz@qKCSN!1&P`N z=pdlGNwal%9;)ujwWH*#K6CQG*fJDAQiKlO2vKJHeA1lj&WQC+VU^@ea8$#~UOX$*Q!V^8L- zL0$W5(Y3=??%&j_WUq6*x>=?BfmI*d8fmDF*-!XVvxL8p7$r+}Igd_(&`|D*;Z#GE zqm{tHx&aHBpXw&~l6>7-FlyiSPJtTJblAjLU5Ho$FeN0mDguFAq?r+6^~o6|b+rfE zGVcZ&O-X~tE3liGcdI~hHSCT+&F&uH8rr&f{6pr^1y5061`fu~=^_|Idrgti5+*U7 zQOb9G?Rz$j-G0Y}x+i{HB0!4ZmKzykB<0;Rbmo2)T4|VdcwujI_otLG@@8OOKg3kw zP|0ST0D4@zT?O=(0Pikp)Rpwxw_VsmW4!^j^sFd6r5l zw}SG_HQPs>ae%Bq{sye_SaBX%|F-}&^)Wz@Xi<)YNbO?lPs7z@3c;$b^Aw@>E%mOj zW^c%IdtC(Kk@s*}9NbKxEf8SZtP+32ZTxjnrNWS7;W&D~ft{QY?oqOmxlV7JP!kW!Yj`Ur{QbbM1h=0KMaIAmWiISb7TKd4=gMeo+Tcz2>e#NihnOV%iNdx` zeiuoOK^{}D+M+p(Y7EC=&-`$B0F< zQ=zHaM;&QQR4jM$sG=N&sqOvD_Bx*drQ6c@u0()g05cwl`Xm{!S_Nuaa2KlL*rmmk z51yPE)q?Bl$sNM474Y!=zZ zc{EVGpdJ!Su{Qq%llR5O6#zK8l(ld*UVl87@|iaH@C3+*;XBxjEg&fsQrzpMo3EEG zv*Tpms7a;7!|iz8WY7={0a$0ItO-(ajXl;wX_$$yzEF5k9nc>L3wv!p{8h2)G0W?h z{v6vH=7+>$Ho^+)9hDtCd+S_yh8pzS9$)hYev-=eDu?lGIR;-fgz+dr+wcmM-^dZp z9}`&kAf$~z1ovF)>Hgxc!Xe3cju-jQRluCm;c_1=PYQygb?Oxe z!QG0L3sT_k=WpfOPL#|EPlD^t;ENCC39O?tHd<(kfx7SOcxl+E#;ff19_+{vbkZSvbS$I{#>31KZj^$n%ayX0jj}EvsgnHg16P z_A6Y)pdp>kLW<;PtR*Vs#mVb%)ao7AXw{O&hBDmD;?mc3iMH;Ac@rZZ_BQa8CQ~|0 z&d1L{in-z--lBO|pxqc%bqy^~LAGv=E*eaVU~OeuVV{d`Vv#-_W7EYdTDzVraG9H+LC_dWcgZMn~KcP)XvKWbcr5&d+=a>{*(Ha6Y1$==bR z{O-?$7H;`2dt0B%Vm?6`_?ZOjJkyu9ZJsh^WH*+es&^@KDcR%Zej%3PJ*XovgyhTbaH(!H1H_OF~=*f55Jr8A%uW zz5IoAB~1e2-tDGp9}`MnavAMy?jgPM5F%y`%$}dFLrz_* zIrO=afT8+AkK5B1s3{ZDVP$g6y$-*U*=?-fh!cNyn3q6YhNhfRxW&GLIJ2#>9bYMD7-F%{|Iw%@a=DoAAU;3k9p$`V zImKm{5HU~wq|nQFwab)_7lNckW#1z2$|oW5x7vDbBURVjw8674P?L1ogMKpHoV>;# zO%*1OwI|($UOr#hL(*M~qsn3PF%_|15uc%Hy9@D>_~N|?<%lig6yKX0a#1s$o(^Laj8bF#5fGPOFMGmMiUaxSwE}Qf#SG_f79d2Iv=TFBXzTpr$^avJ?=|arh2<+ce}&248Kw0} zhlva`wD6X~s7|37la4FnFOgIHhBiFo`lw~?lSbk{>)P(3jyVhM4O)a=GX3(sW1vIC zz0mJ>;J{!eN5#nf2>$u=3Kq>`7u9QnChi8>CjONBN-b+W_UQIuN#{N$Q<$}IOvpQP zB&5ZrY{V&D=4)voh;6<1U`PFA>V%XUW73S9D^J>cQYfzIyIV5i35WNb5K9c^|M}=* zN_C3rnjCZP1^v{;EaGK7Tp5z~B#?f5NZaAsFUOLK)mI~bJTaL8DF_eRikE{%^J?y9-n_U32EKHPCkB^ZN2*zk{bC=GM%_I z61}nkr+Plg6S0V=mY>H_KQU&)P~=y3$#$*U8FunXkb_e1O-7t@m$5re%u!_G%^?_| zRIJzg+lX$}+ba|qx)Ec6c^ip;`_QfQrD~SPa4MoyRUOtX&~^XWcO^a}KBkXK9J{ZFOA~rovYa0!7btTC*=xNQrwJ)$Eu`TT$;%V&2@y@$ISdNn ztbM7|nO+U9r;ae{{;QiNEYpe4nrFq_x3 z4Tvf^b(I@_3odwhVe!aC0X&~inrYFu# zh)+eF__8ly&nLr4KlLWl%B_ZMo=zCH2QfO^$lJ zBvU*LQ#M(5HQ}2Z9_^y~i@C#h)1C*?N3v68pY+7DD09nxowdG#_AAM5z&*|-9NcB{ z_xKUY>Ya7>TO#Bat}yM}o(~8Ck^!QHnIj8N9}c*uyIs}IEqGn`xP;q3vhW6gsqUe>`m1 z)~ad@y1=?H`1SNl?ANCs5ZD`8tG&Hi=j|R%pP(%gB8pd)Q--E?hWU@)e?>SLV4s(- z!_I^oVC0x97@I(;cnEm$ttKBnI3gXE>>`K?vAq~SK?0YSBsx{@s1ZdiKfFb|zf}ju z7@rJb3mC{U`$R`YS(Z#KyxQx_*nU`kf;}QL%bw17%5~6!mMao^-{FFmX}|ItFuR~F zAAvTF%f4XKYo>2-PJ~ro@Ly#t@Sf69CrA+rmMRpihqH7V&SXX+$Sw`HZF`I*_3Vjz z%kPMyN0J3sl>X{-h12)j&XRhAAI;Aou%%z}gI>G+32z*qpZg{m`CezFrzg#&yc<1` z%j~}PN!F5Ddq(>R{+t0v{j6v^0XwWGu@5+`-$m`_>pCzM`r}wz*8Qv=$|P0R$%tJp z>D+N4GZ|Tg>XL<6XP9_wQRGDs^1icY*5GP4>*7mGMr;V zI%kT_^_SQml6$#uRE4Ps>}?ES)_XI8m-%GN{o^itb^S7e_bM$-wo_Ws)W? zx4_6#*X;T$n2N==N0#xzb~BQU#%^NF6|~898JGDbQxjK(ex;Q}_Qn@?Y>!kkUYUeY z&VclG1#eDPU78K@^p3tAUvZi1(nFfk6AAVHWt)Wbi7dPbjA4isOY~?*1&asp!wg#Q zSpSI6*!TGn3|-%vuJE<9V_1EKkz_0%z}Mb7;E!uz)+0^k;@x+<5tzj5 z!InbRtc`YwNCbCac{plY&Y}hWp#PC{o@5UsBj#tv3f^ns^`;$MVN?>q!pW+MYeC7= zkWr1kAX(0xVQ<{qny&CO*|g1{Mk_yE>1t}_YT<5#p8P7QXf;o|s>XQ#SoA&!ddE+8 zOM&VsxsRGS(Spli?P$^pK7Ty{v86RP_6h|MU^J z`J>vn0|BG3Vf!uR0zM|GwtiTPZNb;a@@1+V5+$P4GI_&$%6m!YRGL=lz5kh?z#5f55 z76COi1`R(5p69;ThuQnJ$R3w?I?jigai2arApagd=^tT~oMUWp^u|H_@zXBjpI)Dv zEFc^_`mVu5U*;ClT?x-t9{#fto_+92GF^dotz0sFWTDwZ`s40AY@mv+Qh5c-Ts8Zp z!(v7!zPvFhUZ-xkR!IvaW`{PqN|k)L4*anbtmK+UU&K*awl?DhxRalbtmDw`$#VzK zYFaG}?$F)1j`Qx7wbn|XzMJ&g@3Ai#u5M?%CLPghk;lD^)-|21{Sr+M(suBU4}6CMTMxc_tD;X;z<1-{FeHte=kh1B9O6Hl z!v2i$d1VFC&z&58zU0`G#7^K3Cs@9LYN16O%Vz)?-iQL!G6&sg6aaX>DBZmm@lFrRJpcL{K3(;+`$9GDFDw62Mud@LZjabzVC=w$dx>TQa}U z-{dhKYTYx*C=Fio`ez@wrzx+p%Fk3i&v?6ENXMb3p^?;_&huLLueDwr zpRqHbU%i;9TmexFxCS8F1rPo-ea3!}!ew7{(($76Rdnfa`~$9{8H@f7U&0&HjZ3TZ zuBc||%FljS_e&wNZ$1ezT$*})XAfm??$_cY_?13vM^tT0EKY2ptb+v5P10}a%aTk_ zh8@_T{ns2@jTFhv`)-Vxh}u(0DiL0MUi(We_eic$;gCoqj(T_S{jDo^PahnKJUp3@ zMOk+%weP*c%K6VFXR2icY`J~-&fVMYUg6fsFI->jlA|9`+07y~$Fsz}^;w;mNk$ms zu?y)VA@QH__tvYDudhEWuDD20H&uvrf_boY{($?5{s-SDjyRxSC%%2Xs5d2dpjdk$ zU*NURD#ovwIfd^H{fXR@UuaooJtQr7$d0+(K+1UEwtG9_T?sb$ExV$e-bpf}a@YUe zuzInI59w!x;<)>Be;a7ukLW>V=8~J6nKU<0@H+SQ!Be;1Za_pw#hiuW_PMPBo8W2G z*WDtiIAN<>HQOmh)DMi{s-0H^GmV3QMf4Zu(zXT!-c;2)uv4gUwt(-}-N*|KUOo$h z+Ak^R)h8yB5UD8 zsSjHgY}KguNi?xV=tdCWqJR!~dDpFQoRJOwxrWH^vfRq4%)v;sDfIjsLXF^)uy>!i z*S8Njd7yfa`+7(|8H9j73Rh|TwFpF(8H-p;RLLIU>k<*qI%A*SL{u$%<=X@Jm1QFe zVkQ(X8P4Tohl?_tSO__^aqaI?k$CC8uNLv2mp_zD@4oDaZfEN5;3#XY!L{8B!;Dtt zb~Zge@JF|#Gsk^5$-|(OPI73po|WZh<`UxaH#Y2!&p05Ph?H)d3Bc3J4sDi$f(6K`?&D&~eHVuE@_Prkt>_&8&aq=OzoN!ANkvho;qIX(g|d#EKQbJ@;-%_iARmgSF1fEK z@B4W@5mDME7AzfL**c&2#B7xO9>rA4x$rM{N=%0=goumK1kL{TF@CSk0yvqR2oo&m z)?nyiL$9~Jt(qnEuWt9Hc_duim%|zJQYiaF*~orVNDvJB;`%ZW_2x%Uu01LeX-JP& zD&fas6d3=igAgcfeki79{5!XPHHYR#nfLYRKv^wkv~cnEbLHMwQ8%yCZI^rK!D2qT zk40Vg;e!_!3d56&umIuidN?6MTZFzHot}AdqKzDh#w0s`)cV!2A74RSH1@lDXtC38 z+UhO4A9?oZEOV{bIgGd1{2qMR&xT+}q!=I8m)W23v!W2WPC?Tf!F!e%_(m^lQZtq* zYwi}gY(KZ*Y^OWRNj$Ph#uEEBM+wtN8QFQ@^`GDOln^ioNrmtvzNNi*qS5lPHxI96#sMil*teLVaa%$msF>@5p#SjT%q8|<4ZOUB#!-kG+|eFSED z!|3c8fXaym9qH`L;pmqTWcG}WE$(h1sZ3seM>)E3ptoP<;~h~qe6XA)lGVanf&->P zjZwi;_;Dt+bYdAeD_XSQ-DgXRXqLv`3Wcgl}myA-JlzBBIh zWq4Q*9#(zjAk_H8VS_AJ`?OS*^gB-rp|~qt;v(C5ef=SErv;~zL64hW`#g!UZQcvZ zF6Ra@S@YhVSkSWVAY=Z1w)w-hfJDRwKTUH0o-OG5TlW0HDH36hIjnP=?A+8u1)Qyy5U8Gi$! zt^!vy|f=YHfQ`ZRK?D zXXn*kItRg50vr2+_hV5kjOleg#s~z(J2p#`=1Tq4#JS`MC^e4p&s7Ir=3m(K$LW#` z=ULCoWtna!so+QQ*JHb~6Ps9_&Ag>9qsUskp0pKbi`n?(u3&@QT!?}N}rXn z>1eHi6(@LicU*AR1obe+nbzTCD#VTJ`PFLRT(nc$NWrhsgRwFni*D(#?W^x=J6?|b zENSc^D}s>Y55)PzFs2d_2;yh89E0ZIgs&>6JV=pL6k9g_(`$04EoY+Zjn}}8e#n83 zJ=zB>BU<253Erdo$wE4^+@QQJFZyAj#(InFlN;!UGg96R@{Y&%OlGG;dM)^X8=Ddw@&2Vx?zui$tO z-{zgaU7&F!xs=e`Mn}r+xrdIAmkraRN_7P1?qu1|TZ%1QR(Mn?k+pq`Xys2v9Gs=a z?r@g&;UKcM#?36r9k*eVD(}9qe8?irotsn0+eHH8*4 zPX@Lusr)$J%8jarx5ssEJ?twFyu4kAbrf`96_z{6at^&UkyDzFa69RXP>PeK+dAWqE5<5P+aHa zs<<*+OO_2ObTXau%y)Nn{(p5`XIPWlvi|asjYcui;E@)Ig{YKBXi}spqC!-P5owwL z3L*+9;0C0G!xoN;4KNfDaElv>1#DMDglI&MAVoK2+c2Pr8&sl*1dYj=^>NRS`{O&%YV25@5*eoOvpD_(xdKsnqb^`T}bm;n0BN9ben1Ynyi*OOf;qLpf^ z!T{}GzkXSszN_Xqzp>}S*Im)_Y8~2|B*ybw(U=Q)5_NcMkT;)1&52YQJB)Tn%kPK! z@3;^AI){B(&UOv<{v9KKJrInkdcXV0%O1%1=7vYV*j?v(Kp~arZio$#(A@$kYB3aM zRdm4!^Je15%66($EkCIWGhi@=kNAyLJ3ydlJnCpPuxH0+OA}J)+t8d7nT->##Nz4w-L=S7ExQt=Rx}S*mpT91(>t~qe7tM%e|O)TIO^dP zfo61GNS=cJbLutqUh84?7X#bq)bv57s&D_zm{+xNv7vHjb=_}j-Lrj-Ss*pcD@ts$ z)5Dol8Z_&*1@JdAQE7SL$*!TXI|YE7q=YGkIiUeLvT0)14Q-ivs|+cqeT6DTi9eQ)h?Pu9pqmH51B* zFMd|;l2@D4*56|EhMFlDxl2i<8qq=c+AhMYS3(A28#3DZ;_Ln>RA3q#IAdJq7M#N> zTZ8t=_>lq0=W&w|bdQ^sy&m^@KR)mNi3|1<6|OL(0KLtP#I6ix$2b{-Y9GP5I7 z8AJUSCnlia5vWawX%ZLWTC2UV$cn^sfv68W!6)QO;ZjnX=7#`$ZPRG~irfl)ZUJ^D z{lUk?(*SU7XIiS^H{Lpxn%542#PgxdeG)Ociej#(uvX)z;Z3)<16Yhd z-sv?qQ5D4a)ZYoYPRep2Zvom@U)HKq*54ZEwdaEq^FZG#(CyG!=Vw(0j8CCmP~`_z z=OR^i&WkDCf2cLvWm@d?)mEgme{hA(o#xAL023LZ3(82SGRg6jJF7$kZ4! z6*FTm4y6v~CP!3$+fxg{QeFo24<3iucgI!oyjV|9Dsx}r~4X@lt^VaH$u zD?87}1Jh=?G8OYg*ts2k;X9{f*Za?yu8IUUfyuQ**wbcWT+KncjD^qQ3h&w2+S(Mj zZM~?Ot%ggTIHwkBkL-4&jI5R=B+MCOR42bKzC2M>l?1%x2Iv7amIfQ1B#wwfD`z|m z+E?G+o(tde*Ws?;Wo4p#Yy>Nnf|*b<nj@-s(rZ)-U@ z(Xe(qZ1(_dH|J3yWu|bAPINK}DwF(kZ>FKx(?ZmU^KFC6*bh$;FKGh~pH1 zozA+kgcIk9@2aAwEJ=VYizT!sxDXX$N?XDiGKaaT-OU@Ib=~4DmgEk&{2D@IvyjF* zuF@sDcuuqx_FAgx;B@@8gqjMh!kQeEKA*y4+q+^4&uc0|>M;$Xb+ z@X%eUx1m%$WSP}Qchx68NQ?dO!h`6;Quq+A1(RORsQ-;6bZ90vj#^0(7>cLR+-_;9 zCd@b~B5V>$tpjkQU#BD%9^zu7-l>U8nzt+XuX5cYDCHYaX5t~~3?lpa;)Mr>q;5XW zu(Th;fr}-GkP`K)u97(#UB|L3f;H7Cd#Pox+auV`=m?a=mSv1v)(V!E=$%gkIJZ;` zZj{Lb@bhs%bRa znZw9cD$cDFVHPtpXwY1K)wys@LS~;!qdqkR>@&RtP>?M^>xe{4N#EtZy4zZ5Ar$ZF zV=X=(!xin-58MC<+b~;jk8Q|3B3THGIA$cM8Bg)Yd6ygP#i?4VrX3OvP_k5i{Cppw z-{$XwrJ-+X$ccJ(Q{|?T@U9=-?qlsfA43%8t247KZn?`+C4e`b-e^(df*iW66=Oc2 z3w9UhohfdY@pH1MZ}vc<1osV(2CGG)Ree$E-T;8>$zw*>x-505b&4(shMGIjbAfLS zEZ3ys(`SmCWc(75)^=aKer}>67qj^nGKtCK{35I|tA}wQa!uM!suX%Gb~ylORGGc( ze^|m|N!}G0#Ph|;wSXz`SByQM>lPM#8>mdSQs`7RxkXaSAADYA24u6xWqkIXY?o%z z%TEFL+wNW^&nrvaA1_#P%&Hbzrjl!*hIft>F0@g0IVydUU4MJgS3_3Js8{*>|G2jC z4%n#cOy9b2Xf&Pw=14;0Dtf00C^Z$I-v05OqtvN9>sAC&oV1Tk;;ku7VR`sQK4oFq zQ8)yoZNuTwV$t13|GCUIC{ID_r7M5&R*zhsxbrkg;EgMtL|9ne=^}BM!dxV!KDeXkWA^MfQTkQEt8~t>JznNh%ULvn@dbQ2cyf} z|C%ns#NJU}SHU(7Pg$<&8uDK>d5GZJ&`;CcfGP(~b-#UusXevc^q!km1X6_wVMqGk z^m&ZS6#42?p4c_t1TA$_+}h1L2c<<=$k%;v+D!<@j5hs|{>d18>~~v#oq4yGyS@QP zgTX2oJbEy@eJbo-f{ZQ>-nmB-#AqWcHbMQXFi*T)0n!(HIexz=pp<(O*DMh7CMupX z)ei1ZYuIW~E={-ND*nD;okiZdm!?^|LjLZhs*FHZvWld5TDj zcvWB)`-1Me9bu`*4M=CO6ye=pMgxlgYvsh2rV#5Z$hFKw0GX30%oufb=hJ0BFIJH` z+Fii4gQ+7!)8K^yc*PVEW^#f!|BW0Q5*`IewQ5YDFh?{x1L7tlaUAX@3Y+D>6FPVf zJzOGex~H34`8eq+TL$FsHm+27RS>3$CG;>0Jj4*1ukX$za})*b^S5p}I2jbFCHLsA zzYwAyftMz`uo2c8ieQcy-p&9iP3fMk(uRw+OlBPm`KCLei6g!|Vnk*-kjs>A25MTE z5GLDMV$70AC0j-tx*0sCruvKh{fSM)3X}13U>m|KeaOb`9^}v^44!$`06-JHf@L4EKyxV)M!8cL zi5p9kF97RiAT92!e?%9CP=qX3wyv^A8q!w%07d(9f-U))uDgsr4FDVL;|%r)fw}-@ zlB$F79X^EKYF%8J7mU?3VzJoYQ0<;NczW1jH4=4kEh_)q|^9wj zIsn-SsmRx0_EJ7(6WypwptIwZ)-T<__UgUu?BXt zoIf|a!5`?&JEb$w2PZSqhA>J;GIA^rJ-Cpz8MKX~bcqZNOUzPtu|NMvEP>+cO;V*W zNQ8YPENkr!)lN+tlxB79RUD20$)+_P6Jc`+4q@%Kno{F+#1qR*zrj%T>nTSceO?a5 zyqGDa59#G6k*RXu6+#=e=e!~i1Y&15!cHmE6sLh_K%Ppv$tFE-Le3RQs-nx5LB>gy z5A))kwkxWSy73{@I{%{DY8X+2o{CLJb~R$3r=oT^P~Xo$2lKz8?Z!3QLn$5l#L2k2 zb1=?UT&c<8!&9gW1M&jI!5%dhJbD3nQXpaeNJ>=zR+EL!4iY(nMBQI+|2J+Hw-WMr z08Mt9h8(PGbY?zKtk=cqw(yW}1A#htn* z8&}5Y>$uc>Lv!bSuWQ5UB&ct7*jiZAFpxz|%xO&5kg zzlf?6xy7H3G^*wvP5scW*Wf(<&eP!YIUf%&HT?K)RWmKg$G^=mSoi~;&9dU%{o}WV z#BX;9+q)fpVU`>Vdo~AtYK)`7z*H;dc-e|q6Qt;3J0APUL!~g&Q literal 0 HcmV?d00001 diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..ed4cc16421680a50164ba74381b4b35ceaa0ccfc GIT binary patch literal 3276 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 N;OXk;vd$@?2>?>Ex^Vyi literal 0 HcmV?d00001 diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000000000000000000000000000000000000..bcbf36df2f2aaaa0a63c7dabc94e600184229d0d GIT binary patch literal 5933 zcmZ{Idpwix|Np(&m_yAF>K&UIn{t*2ZOdsShYs(MibU!|=pZCJq~7E>B$QJr)hC5| zmk?V?ES039lQ~RC!kjkl-TU4?|NZ{>J$CPLUH9vHy`Hbhhnc~SD_vpzBp6Xw4`$%jfmPw(;etLCccvfU-s)1A zLl8-RiSx!#?Kwzd0E&>h;Fc z^;S84cUH7gMe#2}MHYcDXgbkI+Qh^X4BV~6y<@s`gMSNX!4@g8?ojjj5hZj5X4g9D zavr_NoeZ=4vim%!Y`GnF-?2_Gb)g$xAo>#zCOLB-jPww8a%c|r&DC=eVdE;y+HwH@ zy`JK(oq+Yw^-hLvWO4B8orWwLiKT!hX!?xw`kz%INd5f)>k1PZ`ZfM&&Ngw)HiXA| ze=+%KkiLe1hd>h!ZO2O$45alH0O|E+>G2oCiJ|3y2c$;XedBozx93BprOr$#d{W5sb*hQQ~M@+v_m!8s?9+{Q0adM?ip3qQ*P5$R~dFvP+5KOH_^A+l-qu5flE*KLJp!rtjqTVqJsmpc1 zo>T>*ja-V&ma7)K?CE9RTsKQKk7lhx$L`9d6-Gq`_zKDa6*>csToQ{&0rWf$mD7x~S3{oA z1wUZl&^{qbX>y*T71~3NWd1Wfgjg)<~BnK96Ro#om&~8mU{}D!Fu# zTrKKSM8gY^*47b2Vr|ZZe&m9Y`n+Y8lHvtlBbIjNl3pGxU{!#Crl5RPIO~!L5Y({ym~8%Ox-9g>IW8 zSz2G6D#F|L^lcotrZx4cFdfw6f){tqITj6>HSW&ijlgTJTGbc7Q#=)*Be0-s0$fCk z^YaG;7Q1dfJq#p|EJ~YYmqjs`M0jPl=E`Id{+h%Lo*|8xp6K7yfgjqiH7{61$4x~A zNnH+65?QCtL;_w(|mDNJXybin=rOy-i7A@lXEu z&jY(5jhjlP{TsjMe$*b^2kp8LeAXu~*q&5;|3v|4w4Ij_4c{4GG8={;=K#lh{#C8v z&t9d7bf{@9aUaE94V~4wtQ|LMT*Ruuu0Ndjj*vh2pWW@|KeeXi(vt!YXi~I6?r5PG z$_{M*wrccE6x42nPaJUO#tBu$l#MInrZhej_Tqki{;BT0VZeb$Ba%;>L!##cvieb2 zwn(_+o!zhMk@l~$$}hivyebloEnNQmOy6biopy`GL?=hN&2)hsA0@fj=A^uEv~TFE z<|ZJIWplBEmufYI)<>IXMv(c+I^y6qBthESbAnk?0N(PI>4{ASayV1ErZ&dsM4Z@E-)F&V0>tIF+Oubl zin^4Qx@`Un4kRiPq+LX5{4*+twI#F~PE7g{FpJ`{)K()FH+VG^>)C-VgK>S=PH!m^ zE$+Cfz!Ja`s^Vo(fd&+U{W|K$e(|{YG;^9{D|UdadmUW;j;&V!rU)W_@kqQj*Frp~ z7=kRxk)d1$$38B03-E_|v=<*~p3>)2w*eXo(vk%HCXeT5lf_Z+D}(Uju=(WdZ4xa( zg>98lC^Z_`s-=ra9ZC^lAF?rIvQZpAMz8-#EgX;`lc6*53ckpxG}(pJp~0XBd9?RP zq!J-f`h0dC*nWxKUh~8YqN{SjiJ6vLBkMRo?;|eA(I!akhGm^}JXoL_sHYkGEQWWf zTR_u*Ga~Y!hUuqb`h|`DS-T)yCiF#s<KR}hC~F%m)?xjzj6w#Za%~XsXFS@P0E3t*qs)tR43%!OUxs(|FTR4Sjz(N zppN>{Ip2l3esk9rtB#+To92s~*WGK`G+ECt6D>Bvm|0`>Img`jUr$r@##&!1Ud{r| zgC@cPkNL_na`74%fIk)NaP-0UGq`|9gB}oHRoRU7U>Uqe!U61fY7*Nj(JiFa-B7Av z;VNDv7Xx&CTwh(C2ZT{ot`!E~1i1kK;VtIh?;a1iLWifv8121n6X!{C%kw|h-Z8_U z9Y8M38M2QG^=h+dW*$CJFmuVcrvD*0hbFOD=~wU?C5VqNiIgAs#4axofE*WFYd|K;Et18?xaI|v-0hN#D#7j z5I{XH)+v0)ZYF=-qloGQ>!)q_2S(Lg3<=UsLn%O)V-mhI-nc_cJZu(QWRY)*1il%n zOR5Kdi)zL-5w~lOixilSSF9YQ29*H+Br2*T2lJ?aSLKBwv7}*ZfICEb$t>z&A+O3C z^@_rpf0S7MO<3?73G5{LWrDWfhy-c7%M}E>0!Q(Iu71MYB(|gk$2`jH?!>ND0?xZu z1V|&*VsEG9U zm)!4#oTcgOO6Hqt3^vcHx>n}%pyf|NSNyTZX*f+TODT`F%IyvCpY?BGELP#s<|D{U z9lUTj%P6>^0Y$fvIdSj5*=&VVMy&nms=!=2y<5DP8x;Z13#YXf7}G)sc$_TQQ=4BD zQ1Le^y+BwHl7T6)`Q&9H&A2fJ@IPa;On5n!VNqWUiA*XXOnvoSjEIKW<$V~1?#zts>enlSTQaG2A|Ck4WkZWQoeOu(te znV;souKbA2W=)YWldqW@fV^$6EuB`lFmXYm%WqI}X?I1I7(mQ8U-pm+Ya* z|7o6wac&1>GuQfIvzU7YHIz_|V;J*CMLJolXMx^9CI;I+{Nph?sf2pX@%OKT;N@Uz9Y zzuNq11Ccdwtr(TDLx}N!>?weLLkv~i!xfI0HGWff*!12E*?7QzzZT%TX{5b7{8^*A z3ut^C4uxSDf=~t4wZ%L%gO_WS7SR4Ok7hJ;tvZ9QBfVE%2)6hE>xu9y*2%X5y%g$8 z*8&(XxwN?dO?2b4VSa@On~5A?zZZ{^s3rXm54Cfi-%4hBFSk|zY9u(3d1ButJuZ1@ zfOHtpSt)uJnL`zg9bBvUkjbPO0xNr{^{h0~$I$XQzel_OIEkgT5L!dW1uSnKsEMVp z9t^dfkxq=BneR9`%b#nWSdj)u1G=Ehv0$L@xe_eG$Ac%f7 zy`*X(p0r3FdCTa1AX^BtmPJNR4%S1nyu-AM-8)~t-KII9GEJU)W^ng7C@3%&3lj$2 z4niLa8)fJ2g>%`;;!re+Vh{3V^}9osx@pH8>b0#d8p`Dgm{I?y@dUJ4QcSB<+FAuT)O9gMlwrERIy z6)DFLaEhJkQ7S4^Qr!JA6*SYni$THFtE)0@%!vAw%X7y~!#k0?-|&6VIpFY9>5GhK zr;nM-Z`Omh>1>7;&?VC5JQoKi<`!BU_&GLzR%92V$kMohNpMDB=&NzMB&w-^SF~_# zNsTca>J{Y555+z|IT75yW;wi5A1Z zyzv|4l|xZ-Oy8r8_c8X)h%|a8#(oWcgS5P6gtuCA_vA!t=)IFTL{nnh8iW!B$i=Kd zj1ILrL;ht_4aRKF(l1%^dUyVxgK!2QsL)-{x$`q5wWjjN6B!Cj)jB=bii;9&Ee-;< zJfVk(8EOrbM&5mUciP49{Z43|TLoE#j(nQN_MaKt16dp#T6jF7z?^5*KwoT-Y`rs$ z?}8)#5Dg-Rx!PTa2R5; zx0zhW{BOpx_wKPlTu;4ev-0dUwp;g3qqIi|UMC@A?zEb3RXY`z_}gbwju zzlNht0WR%g@R5CVvg#+fb)o!I*Zpe?{_+oGq*wOmCWQ=(Ra-Q9mx#6SsqWAp*-Jzb zKvuPthpH(Fn_k>2XPu!=+C{vZsF8<9p!T}U+ICbNtO}IAqxa57*L&T>M6I0ogt&l> z^3k#b#S1--$byAaU&sZL$6(6mrf)OqZXpUPbVW%T|4T}20q9SQ&;3?oRz6rSDP4`b z(}J^?+mzbp>MQDD{ziSS0K(2^V4_anz9JV|Y_5{kF3spgW%EO6JpJ(rnnIN%;xkKf zn~;I&OGHKII3ZQ&?sHlEy)jqCyfeusjPMo7sLVr~??NAknqCbuDmo+7tp8vrKykMb z(y`R)pVp}ZgTErmi+z`UyQU*G5stQRsx*J^XW}LHi_af?(bJ8DPho0b)^PT|(`_A$ zFCYCCF={BknK&KYTAVaHE{lqJs4g6B@O&^5oTPLkmqAB#T#m!l9?wz!C}#a6w)Z~Z z6jx{dsXhI(|D)x%Yu49%ioD-~4}+hCA8Q;w_A$79%n+X84jbf?Nh?kRNRzyAi{_oV zU)LqH-yRdPxp;>vBAWqH4E z(WL)}-rb<_R^B~fI%ddj?Qxhp^5_~)6-aB`D~Nd$S`LY_O&&Fme>Id)+iI>%9V-68 z3crl=15^%0qA~}ksw@^dpZ`p;m=ury;-OV63*;zQyRs4?1?8lbUL!bR+C~2Zz1O+E@6ZQW!wvv z|NLqSP0^*J2Twq@yws%~V0^h05B8BMNHv_ZZT+=d%T#i{faiqN+ut5Bc`uQPM zgO+b1uj;)i!N94RJ>5RjTNXN{gAZel|L8S4r!NT{7)_=|`}D~ElU#2er}8~UE$Q>g zZryBhOd|J-U72{1q;Lb!^3mf+H$x6(hJHn$ZJRqCp^In_PD+>6KWnCnCXA35(}g!X z;3YI1luR&*1IvESL~*aF8(?4deU`9!cxB{8IO?PpZ{O5&uY<0DIERh2wEoAP@bayv z#$WTjR*$bN8^~AGZu+85uHo&AulFjmh*pupai?o?+>rZ7@@Xk4muI}ZqH`n&<@_Vn zvT!GF-_Ngd$B7kLge~&3qC;TE=tEid(nQB*qzXI0m46ma*2d(Sd*M%@Zc{kCFcs;1 zky%U)Pyg3wm_g12J`lS4n+Sg=L)-Y`bU705E5wk&zVEZw`eM#~AHHW96@D>bz#7?- zV`xlac^e`Zh_O+B5-kO=$04{<cKUG?R&#bnF}-?4(Jq+?Ph!9g zx@s~F)Uwub>Ratv&v85!6}3{n$bYb+p!w(l8Na6cSyEx#{r7>^YvIj8L?c*{mcB^x zqnv*lu-B1ORFtrmhfe}$I8~h*3!Ys%FNQv!P2tA^wjbH f$KZHO*s&vt|9^w-6P?|#0pRK8NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&& zS>O>_%)r1c48n{Iv*t(u1=&kHeO=ifbFy+6aSK)V_AxLppYn8Z42d|rc6w}vOsL55 z`t&mC&y2@JTEyg!eDiFX^k#CC!jq%>erB=yHqUP0XcDOTw6ko}L zX;EmMrq(fKk*eygEuA616;0)>@A{TK|55PV@70 z$OfzS*(VJxQev3J?yY?O=ul(v`fp}?u9z`JK3ugibK>)DyCwImZOF4d{xK%%Ks1*} zv$oa)9anR%lXIBUqYnhLmT>VOzHfNP?ZwJNZ!5$s9M08RynIvaXw>@G^T9@r9^KH1 zVy??F&uuk)bH9Y4pQY!hP58i_H6 znl-NcuCpLV6ZWU;4C zu@9exF&OZi`Bovq_m%T+WhU2kvkz@^_LpycBvqm3bMpLw8X-Or5sL>0AKE1$(k_L=_Zc=CUq#=x1-QZf)G7nHu@fmsQ1eN_N3+nTEz`4HI4Z6uVlE zJH+X&det8JU?tO?upcM4Z=cV!JV;yF>FfL5Q$M|W_2Z!P`S=}Wzp|_1^#d%e?_H`> zV@%vA$+bFVqhw9`U;TfP|5|PD{||OiYdor8P*i??|NJcb%kzT_73*7WE?Ua5hAnR2 z=7WE=PhTlJ#ZeRznjTUb;`E(wkMZrj4e|Hilz-mK>9cZHQY**5TUPw~u}k;u73KI}xAx!0m-)GVia|x^d3p~s_9gh83jA&Ra<8rM%`>U3x69t&NzbwWY}7Ar?)FK#IZ0z|d0H0EkRO w3{9;}4Xg|ebq&m|3=9_N6z8I7$jwj5OsmAL;bP(Gi$Dzwp00i_>zopr02+f8CIA2c literal 0 HcmV?d00001 diff --git a/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/desktop_photo_search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000000000000000000000000000000000000..e71a726136a47ed24125c7efc79d68a4a01961b4 GIT binary patch literal 14800 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 - - + - + @@ -14,7 +13,7 @@ - + @@ -324,10 +323,15 @@ + + + + - + + @@ -335,7 +339,6 @@ - diff --git a/desktop_photo_search/material/macos/Runner/Configs/AppInfo.xcconfig b/desktop_photo_search/material/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 000000000..5eb9d254a --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = Photo Search + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.desktopPhotoSearch + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2020 com.example. All rights reserved. diff --git a/desktop_photo_search/material/macos/Runner/Configs/Debug.xcconfig b/desktop_photo_search/material/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 000000000..36b0fd946 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/desktop_photo_search/material/macos/Runner/Configs/Release.xcconfig b/desktop_photo_search/material/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 000000000..dff4f4956 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/desktop_photo_search/material/macos/Runner/Configs/Warnings.xcconfig b/desktop_photo_search/material/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 000000000..42bcbf478 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/desktop_photo_search/material/macos/Runner/DebugProfile.entitlements b/desktop_photo_search/material/macos/Runner/DebugProfile.entitlements new file mode 100644 index 000000000..0eaccf141 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,16 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.files.user-selected.read-write + + com.apple.security.network.client + + com.apple.security.network.server + + + diff --git a/desktop_photo_search/material/macos/Runner/Info.plist b/desktop_photo_search/material/macos/Runner/Info.plist new file mode 100644 index 000000000..4789daa6a --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/desktop_photo_search/material/macos/Runner/MainFlutterWindow.swift b/desktop_photo_search/material/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 000000000..e1cf22cb7 --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,19 @@ +// Copyright 2019 The Flutter team. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/desktop_photo_search/material/macos/Runner/Release.entitlements b/desktop_photo_search/material/macos/Runner/Release.entitlements new file mode 100644 index 000000000..a0463869a --- /dev/null +++ b/desktop_photo_search/material/macos/Runner/Release.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-write + + com.apple.security.network.client + + + diff --git a/experimental/desktop_photo_search/pubspec.lock b/desktop_photo_search/material/pubspec.lock similarity index 95% rename from experimental/desktop_photo_search/pubspec.lock rename to desktop_photo_search/material/pubspec.lock index 732ceace5..51132a83c 100644 --- a/experimental/desktop_photo_search/pubspec.lock +++ b/desktop_photo_search/material/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "31.0.0" + version: "34.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "2.8.0" + version: "3.2.0" ansicolor: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.8" + version: "3.1.11" args: dependency: transitive description: @@ -37,7 +37,7 @@ packages: source: hosted version: "2.3.0" async: - dependency: "direct dev" + dependency: transitive description: name: async url: "https://pub.dartlang.org" @@ -105,14 +105,14 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.3" + version: "8.1.4" built_value_generator: dependency: "direct dev" description: name: built_value_generator url: "https://pub.dartlang.org" source: hosted - version: "8.1.3" + version: "8.1.4" characters: dependency: transitive description: @@ -217,7 +217,7 @@ packages: name: file_selector url: "https://pub.dartlang.org" source: hosted - version: "0.8.2+1" + version: "0.8.3" file_selector_linux: dependency: "direct main" description: @@ -238,21 +238,21 @@ packages: name: file_selector_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.4" file_selector_web: dependency: transitive description: name: file_selector_web url: "https://pub.dartlang.org" source: hosted - version: "0.8.1+2" + version: "0.8.1+3" file_selector_windows: dependency: "direct main" description: name: file_selector_windows url: "https://pub.dartlang.org" source: hosted - version: "0.0.2+1" + version: "0.8.2" fixnum: dependency: transitive description: @@ -344,14 +344,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" - injector: - dependency: transitive - description: - name: injector - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" + version: "3.1.1" io: dependency: transitive description: @@ -394,17 +387,24 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" menubar: dependency: "direct main" description: path: "plugins/menubar" ref: HEAD - resolved-ref: c339fe7dd2e17a80f7bb839bfad89d21a6e084ba + resolved-ref: "89c350f787e1d7bff12b3517e5671146211ee70e" url: "https://github.com/google/flutter-desktop-embedding.git" source: git version: "0.1.0" meta: - dependency: "direct main" + dependency: transitive description: name: meta url: "https://pub.dartlang.org" @@ -423,7 +423,7 @@ packages: name: msix url: "https://pub.dartlang.org" source: hosted - version: "2.8.0" + version: "2.8.5" nested: dependency: transitive description: @@ -458,7 +458,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.1.2" pool: dependency: transitive description: @@ -472,7 +472,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.2" pub_semver: dependency: transitive description: @@ -514,7 +514,7 @@ packages: source: sdk version: "0.0.99" source_gen: - dependency: "direct dev" + dependency: transitive description: name: source_gen url: "https://pub.dartlang.org" @@ -568,7 +568,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" timing: dependency: transitive description: @@ -596,49 +596,49 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.0.18" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.14" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" url_launcher_windows: dependency: transitive description: @@ -689,5 +689,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.15.0 <3.0.0" flutter: ">=2.5.0" diff --git a/experimental/desktop_photo_search/pubspec.yaml b/desktop_photo_search/material/pubspec.yaml similarity index 65% rename from experimental/desktop_photo_search/pubspec.yaml rename to desktop_photo_search/material/pubspec.yaml index a67b4e94c..0060d96db 100644 --- a/experimental/desktop_photo_search/pubspec.yaml +++ b/desktop_photo_search/material/pubspec.yaml @@ -1,46 +1,42 @@ name: desktop_photo_search description: Search for Photos, using the Unsplash API. +publish_to: 'none' version: 1.0.0+1 -publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' - flutter: ^2.0.0 + sdk: ">=2.15.0 <3.0.0" dependencies: + built_collection: ^5.1.1 + built_value: ^8.1.4 + cupertino_icons: ^1.0.2 + file_selector: ^0.8.3 + file_selector_linux: ^0.0.2+1 + file_selector_macos: ^0.0.4+1 + file_selector_windows: ^0.8.2 flutter: sdk: flutter - built_collection: ^5.0.0 - built_value: ^8.0.3 - cupertino_icons: ^1.0.2 - file_selector: ^0.8.2 - file_selector_linux: ^0.0.1 - file_selector_macos: ^0.0.1 - file_selector_windows: ^0.0.1 - http: ^0.13.0 - logging: ^1.0.1 flutter_simple_treeview: ^3.0.0-nullsafety.1 + http: ^0.13.4 + logging: ^1.0.2 menubar: git: url: https://github.com/google/flutter-desktop-embedding.git path: plugins/menubar - meta: ^1.1.8 - provider: ^5.0.0 + provider: ^6.0.2 transparent_image: ^2.0.0 - uuid: ^3.0.1 - url_launcher: ^6.0.2 + url_launcher: ^6.0.18 + uuid: ^3.0.5 dev_dependencies: + build: ^2.2.1 + build_runner: ^2.1.7 + built_value_generator: ^8.1.4 + flutter_lints: ^1.0.0 flutter_test: sdk: flutter - async: ^2.4.0 - build: ^2.0.2 - build_runner: ^2.0.4 - built_value_generator: ^8.0.3 grinder: ^0.9.0 - msix: ^2.1.2 - source_gen: ^1.0.1 - flutter_lints: ^1.0.0 + msix: ^2.8.5 flutter: uses-material-design: true @@ -48,9 +44,10 @@ flutter: msix_config: display_name: Flutter Desktop Photo Search publisher_display_name: flutter.dev + store: false # Set to true to deploy to Microsoft Store publisher: CN=01A6D5C0-D51A-4EEE-8DD0-F134DDD378F7 identity_name: 16354flutter.dev.FlutterDesktopPhotoSearch - msix_version: 1.0.0.0 + msix_version: 1.0.0.1 icons_background_color: "#ffffff" architecture: x64 # See https://docs.microsoft.com/en-us/windows/uwp/packaging/app-capability-declarations diff --git a/desktop_photo_search/material/test/unsplash_test.dart b/desktop_photo_search/material/test/unsplash_test.dart new file mode 100644 index 000000000..41a2789f2 --- /dev/null +++ b/desktop_photo_search/material/test/unsplash_test.dart @@ -0,0 +1,536 @@ +// Copyright 2019 The Flutter team. 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:desktop_photo_search/src/unsplash/photo.dart'; +import 'package:desktop_photo_search/src/unsplash/search_photos_response.dart'; +import 'package:desktop_photo_search/src/unsplash/unsplash.dart'; +import 'package:desktop_photo_search/src/unsplash/user.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:http/http.dart'; +import 'package:http/testing.dart'; + +void main() { + test('Photo.fromJson', () { + const input = ''' +{ + "id": "Dwu85P9SOIk", + "created_at": "2016-05-03T11:00:28-04:00", + "updated_at": "2016-07-10T11:00:01-05:00", + "width": 2448, + "height": 3264, + "color": "#6E633A", + "downloads": 1345, + "likes": 24, + "liked_by_user": false, + "description": "A man drinking a coffee.", + "exif": { + "make": "Canon", + "model": "Canon EOS 40D", + "exposure_time": "0.011111111111111112", + "aperture": "4.970854", + "focal_length": "37", + "iso": 100 + }, + "location": { + "city": "Montreal", + "country": "Canada", + "position": { + "latitude": 45.4732984, + "longitude": -73.6384879 + } + }, + "tags": [ + { "title": "man" }, + { "title": "drinking" }, + { "title": "coffee" } + ], + "current_user_collections": [ + { + "id": 206, + "title": "Makers: Cat and Ben", + "published_at": "2016-01-12T18:16:09-05:00", + "updated_at": "2016-07-10T11:00:01-05:00", + "cover_photo": null, + "user": null + } + ], + "urls": { + "raw": "https://images.unsplash.com/photo-1417325384643-aac51acc9e5d", + "full": "https://images.unsplash.com/photo-1417325384643-aac51acc9e5d?q=75&fm=jpg", + "regular": "https://images.unsplash.com/photo-1417325384643-aac51acc9e5d?q=75&fm=jpg&w=1080&fit=max", + "small": "https://images.unsplash.com/photo-1417325384643-aac51acc9e5d?q=75&fm=jpg&w=400&fit=max", + "thumb": "https://images.unsplash.com/photo-1417325384643-aac51acc9e5d?q=75&fm=jpg&w=200&fit=max" + }, + "links": { + "self": "https://api.unsplash.com/photos/Dwu85P9SOIk", + "html": "https://unsplash.com/photos/Dwu85P9SOIk", + "download": "https://unsplash.com/photos/Dwu85P9SOIk/download", + "download_location": "https://api.unsplash.com/photos/Dwu85P9SOIk/download" + }, + "user": { + "id": "QPxL2MGqfrw", + "updated_at": "2016-07-10T11:00:01-05:00", + "username": "exampleuser", + "name": "Joe Example", + "portfolio_url": "https://example.com/", + "bio": "Just an everyday Joe", + "location": "Montreal", + "total_likes": 5, + "total_photos": 10, + "total_collections": 13, + "links": { + "self": "https://api.unsplash.com/users/exampleuser", + "html": "https://unsplash.com/exampleuser", + "photos": "https://api.unsplash.com/users/exampleuser/photos", + "likes": "https://api.unsplash.com/users/exampleuser/likes", + "portfolio": "https://api.unsplash.com/users/exampleuser/portfolio" + } + } +} + '''; + + final photo = Photo.fromJson(input)!; + expect(photo.id, 'Dwu85P9SOIk'); + expect(photo.createdAt, '2016-05-03T11:00:28-04:00'); + expect(photo.updatedAt, '2016-07-10T11:00:01-05:00'); + expect(photo.width, 2448); + expect(photo.height, 3264); + expect(photo.color, '#6E633A'); + expect(photo.downloads, 1345); + expect(photo.likedByUser, false); + expect(photo.exif!.make, 'Canon'); + expect(photo.exif!.iso, 100); + expect(photo.location!.city, 'Montreal'); + expect(photo.location!.country, 'Canada'); + expect(photo.location!.position!.latitude, 45.4732984); + expect(photo.location!.position!.longitude, -73.6384879); + }); + + test('User.fromJson', () { + const input = ''' +{ + "id": "pXhwzz1JtQU", + "updated_at": "2016-07-10T11:00:01-05:00", + "username": "jimmyexample", + "name": "James Example", + "first_name": "James", + "last_name": "Example", + "instagram_username": "instantgrammer", + "twitter_username": "jimmy", + "portfolio_url": null, + "bio": "The user's bio", + "location": "Montreal, Qc", + "total_likes": 20, + "total_photos": 10, + "total_collections": 5, + "followed_by_user": false, + "followers_count": 300, + "following_count": 25, + "downloads": 225974, + "profile_image": { + "small": "https://images.unsplash.com/face-springmorning.jpg?q=80&fm=jpg&crop=faces&fit=crop&h=32&w=32", + "medium": "https://images.unsplash.com/face-springmorning.jpg?q=80&fm=jpg&crop=faces&fit=crop&h=64&w=64", + "large": "https://images.unsplash.com/face-springmorning.jpg?q=80&fm=jpg&crop=faces&fit=crop&h=128&w=128" + }, + "badge": { + "title": "Book contributor", + "primary": true, + "slug": "book-contributor", + "link": "https://book.unsplash.com" + }, + "links": { + "self": "https://api.unsplash.com/users/jimmyexample", + "html": "https://unsplash.com/jimmyexample", + "photos": "https://api.unsplash.com/users/jimmyexample/photos", + "likes": "https://api.unsplash.com/users/jimmyexample/likes", + "portfolio": "https://api.unsplash.com/users/jimmyexample/portfolio" + } +} + '''; + + final user = User.fromJson(input)!; + expect(user.id, 'pXhwzz1JtQU'); + }); + + test('SearchPhotosResponse.fromJson', () { + const input = ''' +{ + "total": 133, + "total_pages": 7, + "results": [ + { + "id": "eOLpJytrbsQ", + "created_at": "2014-11-18T14:35:36-05:00", + "width": 4000, + "height": 3000, + "color": "#A7A2A1", + "likes": 286, + "liked_by_user": false, + "description": "A man drinking a coffee.", + "user": { + "id": "Ul0QVz12Goo", + "username": "ugmonk", + "name": "Jeff Sheldon", + "first_name": "Jeff", + "last_name": "Sheldon", + "instagram_username": "instantgrammer", + "twitter_username": "ugmonk", + "portfolio_url": "http://ugmonk.com/", + "profile_image": { + "small": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=32&w=32&s=7cfe3b93750cb0c93e2f7caec08b5a41", + "medium": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=64&w=64&s=5a9dc749c43ce5bd60870b129a40902f", + "large": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=128&w=128&s=32085a077889586df88bfbe406692202" + }, + "links": { + "self": "https://api.unsplash.com/users/ugmonk", + "html": "http://unsplash.com/@ugmonk", + "photos": "https://api.unsplash.com/users/ugmonk/photos", + "likes": "https://api.unsplash.com/users/ugmonk/likes" + } + }, + "current_user_collections": [], + "urls": { + "raw": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f", + "full": "https://hd.unsplash.com/photo-1416339306562-f3d12fefd36f", + "regular": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=1080&fit=max&s=92f3e02f63678acc8416d044e189f515", + "small": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=400&fit=max&s=263af33585f9d32af39d165b000845eb", + "thumb": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&s=8aae34cf35df31a592f0bef16e6342ef" + }, + "links": { + "self": "https://api.unsplash.com/photos/eOLpJytrbsQ", + "html": "http://unsplash.com/photos/eOLpJytrbsQ", + "download": "http://unsplash.com/photos/eOLpJytrbsQ/download" + } + } + ] +} + '''; + + final response = SearchPhotosResponse.fromJson(input)!; + expect(response.total, 133); + expect(response.totalPages, 7); + expect(response.results[0].id, 'eOLpJytrbsQ'); + expect(response.results[0].user!.id, 'Ul0QVz12Goo'); + }); + + group('Unsplash API client', () { + test('handles success', () async { + const searchPhotosResponseBody = ''' +{ + "total": 133, + "total_pages": 7, + "results": [ + { + "id": "eOLpJytrbsQ", + "created_at": "2014-11-18T14:35:36-05:00", + "width": 4000, + "height": 3000, + "color": "#A7A2A1", + "likes": 286, + "liked_by_user": false, + "description": "A man drinking a coffee.", + "user": { + "id": "Ul0QVz12Goo", + "username": "ugmonk", + "name": "Jeff Sheldon", + "first_name": "Jeff", + "last_name": "Sheldon", + "instagram_username": "instantgrammer", + "twitter_username": "ugmonk", + "portfolio_url": "http://ugmonk.com/", + "profile_image": { + "small": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=32&w=32&s=7cfe3b93750cb0c93e2f7caec08b5a41", + "medium": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=64&w=64&s=5a9dc749c43ce5bd60870b129a40902f", + "large": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=128&w=128&s=32085a077889586df88bfbe406692202" + }, + "links": { + "self": "https://api.unsplash.com/users/ugmonk", + "html": "http://unsplash.com/@ugmonk", + "photos": "https://api.unsplash.com/users/ugmonk/photos", + "likes": "https://api.unsplash.com/users/ugmonk/likes" + } + }, + "current_user_collections": [], + "urls": { + "raw": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f", + "full": "https://hd.unsplash.com/photo-1416339306562-f3d12fefd36f", + "regular": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=1080&fit=max&s=92f3e02f63678acc8416d044e189f515", + "small": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=400&fit=max&s=263af33585f9d32af39d165b000845eb", + "thumb": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&s=8aae34cf35df31a592f0bef16e6342ef" + }, + "links": { + "self": "https://api.unsplash.com/photos/eOLpJytrbsQ", + "html": "http://unsplash.com/photos/eOLpJytrbsQ", + "download": "http://unsplash.com/photos/eOLpJytrbsQ/download" + } + } + ] +} + '''; + + final httpClient = MockClient((req) async { + return Response( + searchPhotosResponseBody, + 200, + request: req, + headers: {'content-type': 'application/json'}, + ); + }); + + final unsplashClient = Unsplash( + accessKey: 'not-an-access-key', + httpClient: httpClient, + ); + + final response = (await unsplashClient.searchPhotos(query: 'red'))!; + + expect(response.total, 133); + expect(response.totalPages, 7); + expect(response.results[0].id, 'eOLpJytrbsQ'); + expect(response.results[0].user!.id, 'Ul0QVz12Goo'); + }); + + test('handles failure', () async { + const apiError = + '{"errors":["OAuth error: The access token is invalid"]}'; + + final httpClient = MockClient((req) async { + return Response( + apiError, + 401, + request: req, + headers: {'content-type': 'application/json'}, + ); + }); + + final unsplashClient = Unsplash( + accessKey: 'not-an-access-key', + httpClient: httpClient, + ); + + try { + await unsplashClient.searchPhotos(query: 'red'); + fail('UnsplashException should have been thrown'); + } on UnsplashException catch (e) { + expect(e.toString(), + 'UnsplashException: OAuth error: The access token is invalid'); + } + }); + + test('handles broken JSON', () async { + const apiError = '{"tot'; // truncated JSON. + + final httpClient = MockClient((req) async { + return Response( + apiError, + 401, + request: req, + headers: {'content-type': 'application/json'}, + ); + }); + + final unsplashClient = Unsplash( + accessKey: 'not-an-access-key', + httpClient: httpClient, + ); + + try { + await unsplashClient.searchPhotos(query: 'red'); + fail('UnsplashException should have been thrown'); + } on UnsplashException catch (e) { + expect(e.toString(), 'UnsplashException: Invalid JSON received'); + } + }); + }); + + test('handles utf8 content in JSON', () async { + const searchPhotosResponseBody = ''' +{ + "total": 22395, + "total_pages": 2240, + "results": [ + { + "id": "E4u_Zo9PET8", + "created_at": "2019-12-29T13:45:28-05:00", + "updated_at": "2020-11-05T17:12:18-05:00", + "promoted_at": null, + "width": 2598, + "height": 4618, + "color": "#A53E40", + "blur_hash": "LlO{8lL#XSbu*Jtla0jZOrb^ozjF", + "description": null, + "alt_description": "red apparel", + "urls": { + "raw": "https://images.unsplash.com/photo-1577645113639-32537a4a938b?ixlib=rb-1.2.1\u0026ixid=eyJhcHBfaWQiOjM5NTU5fQ", + "full": "https://images.unsplash.com/photo-1577645113639-32537a4a938b?ixlib=rb-1.2.1\u0026q=85\u0026fm=jpg\u0026crop=entropy\u0026cs=srgb\u0026ixid=eyJhcHBfaWQiOjM5NTU5fQ", + "regular": "https://images.unsplash.com/photo-1577645113639-32537a4a938b?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=entropy\u0026cs=tinysrgb\u0026w=1080\u0026fit=max\u0026ixid=eyJhcHBfaWQiOjM5NTU5fQ", + "small": "https://images.unsplash.com/photo-1577645113639-32537a4a938b?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=entropy\u0026cs=tinysrgb\u0026w=400\u0026fit=max\u0026ixid=eyJhcHBfaWQiOjM5NTU5fQ", + "thumb": "https://images.unsplash.com/photo-1577645113639-32537a4a938b?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=entropy\u0026cs=tinysrgb\u0026w=200\u0026fit=max\u0026ixid=eyJhcHBfaWQiOjM5NTU5fQ" + }, + "links": { + "self": "https://api.unsplash.com/photos/E4u_Zo9PET8", + "html": "https://unsplash.com/photos/E4u_Zo9PET8", + "download": "https://unsplash.com/photos/E4u_Zo9PET8/download", + "download_location": "https://api.unsplash.com/photos/E4u_Zo9PET8/download" + }, + "categories": [], + "likes": 132, + "liked_by_user": false, + "current_user_collections": [], + "sponsorship": null, + "user": { + "id": "_2nQcPrbyuE", + "updated_at": "2020-11-06T01:37:51-05:00", + "username": "svalenas", + "name": "Sergiu Vălenaș", + "first_name": "Sergiu", + "last_name": "Vălenaș", + "twitter_username": null, + "portfolio_url": null, + "bio": "Gifted psychologist and enthusiast photographer", + "location": "Cluj-Napoca, Romania", + "links": { + "self": "https://api.unsplash.com/users/svalenas", + "html": "https://unsplash.com/@svalenas", + "photos": "https://api.unsplash.com/users/svalenas/photos", + "likes": "https://api.unsplash.com/users/svalenas/likes", + "portfolio": "https://api.unsplash.com/users/svalenas/portfolio", + "following": "https://api.unsplash.com/users/svalenas/following", + "followers": "https://api.unsplash.com/users/svalenas/followers" + }, + "profile_image": { + "small": "https://images.unsplash.com/profile-1597067601066-d43176d68553image?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=faces\u0026cs=tinysrgb\u0026fit=crop\u0026h=32\u0026w=32", + "medium": "https://images.unsplash.com/profile-1597067601066-d43176d68553image?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=faces\u0026cs=tinysrgb\u0026fit=crop\u0026h=64\u0026w=64", + "large": "https://images.unsplash.com/profile-1597067601066-d43176d68553image?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=faces\u0026cs=tinysrgb\u0026fit=crop\u0026h=128\u0026w=128" + }, + "instagram_username": "svalenas", + "total_collections": 0, + "total_likes": 413, + "total_photos": 129, + "accepted_tos": true + }, + "tags": [ + { + "type": "landing_page", + "title": "red", + "source": { + "ancestry": { + "type": { + "slug": "wallpapers", + "pretty_slug": "HD Wallpapers" + }, + "category": { + "slug": "colors", + "pretty_slug": "Color" + }, + "subcategory": { + "slug": "red", + "pretty_slug": "Red" + } + }, + "title": "HD Red Wallpapers", + "subtitle": "Download Free Red Wallpapers", + "description": "Choose from a curated selection of red wallpapers for your mobile and desktop screens. Always free on Unsplash.", + "meta_title": "Red Wallpapers: Free HD Download [500+ HQ] | Unsplash", + "meta_description": "Choose from hundreds of free red wallpapers. Download HD wallpapers for free on Unsplash.", + "cover_photo": { + "id": "HyBXy5PHQR8", + "created_at": "2018-02-17T13:44:58-05:00", + "updated_at": "2020-10-21T01:07:42-04:00", + "promoted_at": null, + "width": 3024, + "height": 4032, + "color": "#C51918", + "blur_hash": "L9Bmx_o1o1Jl|cwxWpWpN]\$5N]sU", + "description": null, + "alt_description": "red textile", + "urls": { + "raw": "https://images.unsplash.com/photo-1518893063132-36e46dbe2428?ixlib=rb-1.2.1", + "full": "https://images.unsplash.com/photo-1518893063132-36e46dbe2428?ixlib=rb-1.2.1\u0026q=85\u0026fm=jpg\u0026crop=entropy\u0026cs=srgb", + "regular": "https://images.unsplash.com/photo-1518893063132-36e46dbe2428?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=entropy\u0026cs=tinysrgb\u0026w=1080\u0026fit=max", + "small": "https://images.unsplash.com/photo-1518893063132-36e46dbe2428?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=entropy\u0026cs=tinysrgb\u0026w=400\u0026fit=max", + "thumb": "https://images.unsplash.com/photo-1518893063132-36e46dbe2428?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=entropy\u0026cs=tinysrgb\u0026w=200\u0026fit=max" + }, + "links": { + "self": "https://api.unsplash.com/photos/HyBXy5PHQR8", + "html": "https://unsplash.com/photos/HyBXy5PHQR8", + "download": "https://unsplash.com/photos/HyBXy5PHQR8/download", + "download_location": "https://api.unsplash.com/photos/HyBXy5PHQR8/download" + }, + "categories": [], + "likes": 1243, + "liked_by_user": false, + "current_user_collections": [], + "sponsorship": null, + "user": { + "id": "6nkkrwW9M-s", + "updated_at": "2020-10-22T20:44:54-04:00", + "username": "montylov", + "name": "MontyLov", + "first_name": "MontyLov", + "last_name": null, + "twitter_username": "MontyLov", + "portfolio_url": "http://montylov.com", + "bio": "Stay humble and innovate.", + "location": null, + "links": { + "self": "https://api.unsplash.com/users/montylov", + "html": "https://unsplash.com/@montylov", + "photos": "https://api.unsplash.com/users/montylov/photos", + "likes": "https://api.unsplash.com/users/montylov/likes", + "portfolio": "https://api.unsplash.com/users/montylov/portfolio", + "following": "https://api.unsplash.com/users/montylov/following", + "followers": "https://api.unsplash.com/users/montylov/followers" + }, + "profile_image": { + "small": "https://images.unsplash.com/profile-1588478301600-b5e5203a574aimage?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=faces\u0026cs=tinysrgb\u0026fit=crop\u0026h=32\u0026w=32", + "medium": "https://images.unsplash.com/profile-1588478301600-b5e5203a574aimage?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=faces\u0026cs=tinysrgb\u0026fit=crop\u0026h=64\u0026w=64", + "large": "https://images.unsplash.com/profile-1588478301600-b5e5203a574aimage?ixlib=rb-1.2.1\u0026q=80\u0026fm=jpg\u0026crop=faces\u0026cs=tinysrgb\u0026fit=crop\u0026h=128\u0026w=128" + }, + "instagram_username": "montylov", + "total_collections": 1, + "total_likes": 0, + "total_photos": 79, + "accepted_tos": false + } + } + } + }, + { + "type": "search", + "title": "rug" + }, + { + "type": "search", + "title": "plant" + } + ] + } + ] +} + '''; + + final httpClient = MockClient((req) async { + return Response( + searchPhotosResponseBody, + 200, + request: req, + headers: {'content-type': 'application/json; charset=utf-8'}, + ); + }); + + final unsplashClient = Unsplash( + accessKey: 'not-an-access-key', + httpClient: httpClient, + ); + + final response = (await unsplashClient.searchPhotos(query: 'red'))!; + + expect(response.total, 22395); + expect(response.totalPages, 2240); + expect(response.results[0].id, 'E4u_Zo9PET8'); + expect(response.results[0].user!.id, '_2nQcPrbyuE'); + expect(response.results[0].user!.name, 'Sergiu Vălenaș'); + }); +} diff --git a/desktop_photo_search/material/test/widget_test.dart b/desktop_photo_search/material/test/widget_test.dart new file mode 100644 index 000000000..b549af430 --- /dev/null +++ b/desktop_photo_search/material/test/widget_test.dart @@ -0,0 +1,134 @@ +// Copyright 2019 The Flutter team. 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:typed_data'; + +import 'package:desktop_photo_search/src/model/photo_search_model.dart'; +import 'package:desktop_photo_search/src/unsplash/photo.dart'; +import 'package:desktop_photo_search/src/unsplash/search_photos_response.dart'; +import 'package:desktop_photo_search/src/unsplash/unsplash.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:provider/provider.dart'; + +class FakeUnsplash implements Unsplash { + static const searchPhotosResponse = ''' +{ + "total": 133, + "total_pages": 7, + "results": [ + { + "id": "eOLpJytrbsQ", + "created_at": "2014-11-18T14:35:36-05:00", + "width": 4000, + "height": 3000, + "color": "#A7A2A1", + "likes": 286, + "liked_by_user": false, + "description": "A man drinking a coffee.", + "user": { + "id": "Ul0QVz12Goo", + "username": "ugmonk", + "name": "Jeff Sheldon", + "first_name": "Jeff", + "last_name": "Sheldon", + "instagram_username": "instantgrammer", + "twitter_username": "ugmonk", + "portfolio_url": "http://ugmonk.com/", + "profile_image": { + "small": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=32&w=32&s=7cfe3b93750cb0c93e2f7caec08b5a41", + "medium": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=64&w=64&s=5a9dc749c43ce5bd60870b129a40902f", + "large": "https://images.unsplash.com/profile-1441298803695-accd94000cac?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&fit=crop&h=128&w=128&s=32085a077889586df88bfbe406692202" + }, + "links": { + "self": "https://api.unsplash.com/users/ugmonk", + "html": "http://unsplash.com/@ugmonk", + "photos": "https://api.unsplash.com/users/ugmonk/photos", + "likes": "https://api.unsplash.com/users/ugmonk/likes" + } + }, + "current_user_collections": [], + "urls": { + "raw": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f", + "full": "https://hd.unsplash.com/photo-1416339306562-f3d12fefd36f", + "regular": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=1080&fit=max&s=92f3e02f63678acc8416d044e189f515", + "small": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=400&fit=max&s=263af33585f9d32af39d165b000845eb", + "thumb": "https://images.unsplash.com/photo-1416339306562-f3d12fefd36f?ixlib=rb-0.3.5&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&s=8aae34cf35df31a592f0bef16e6342ef" + }, + "links": { + "self": "https://api.unsplash.com/photos/eOLpJytrbsQ", + "html": "http://unsplash.com/photos/eOLpJytrbsQ", + "download": "http://unsplash.com/photos/eOLpJytrbsQ/download" + } + } + ] +} + '''; + + @override + Future searchPhotos( + {String? query, + num page = 1, + num perPage = 10, + List collections = const [], + SearchPhotosOrientation? orientation}) async { + return SearchPhotosResponse.fromJson(searchPhotosResponse); + } + + @override + Future download(Photo photo) { + throw UnimplementedError(); + } +} + +const fabKey = Key('fab'); + +class PhotoSearchModelTester extends StatelessWidget { + const PhotoSearchModelTester({required this.query, Key? key}) + : super(key: key); + final String query; + @override + Widget build(BuildContext context) { + return MaterialApp( + home: TextButton( + key: fabKey, + onPressed: () async { + await Provider.of( + context, + listen: false, + ).addSearch(query); + }, + child: const Text('Search for a Photo'), + ), + ); + } +} + +void main() { + group('search_list', () { + testWidgets('starts empty', (tester) async { + final unsplashSearches = PhotoSearchModel(FakeUnsplash()); + final testWidget = ChangeNotifierProvider( + create: (context) => unsplashSearches, + child: const PhotoSearchModelTester(query: 'clouds'), + ); + await tester.pumpWidget(testWidget); + expect(unsplashSearches.entries.length, 0); + }); + + testWidgets('addSearch adds searches', (tester) async { + final unsplashSearches = PhotoSearchModel(FakeUnsplash()); + final testWidget = ChangeNotifierProvider( + create: (context) => unsplashSearches, + child: const PhotoSearchModelTester(query: 'clouds'), + ); + await tester.pumpWidget(testWidget); + await tester.tap(find.byKey(fabKey)); + await tester.tap(find.byKey(fabKey)); + await tester.pumpAndSettle(); + + expect(unsplashSearches.entries.length, 2); + }); + }); +} diff --git a/desktop_photo_search/material/tool/grind.dart b/desktop_photo_search/material/tool/grind.dart new file mode 100644 index 000000000..1f6bb89db --- /dev/null +++ b/desktop_photo_search/material/tool/grind.dart @@ -0,0 +1,72 @@ +// Copyright 2019 The Flutter team. 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 'dart:convert'; +import 'dart:io'; + +import 'package:async/async.dart' show StreamGroup; +import 'package:grinder/grinder.dart'; + +void main(List args) => grind(args); + +@DefaultTask() +@Depends(pubGet, generateJsonBindings, analyzeSource, test) +void build() {} + +@Task() +Future pubGet() async => _logProcessOutput( + Process.start( + 'flutter', + ['pub', 'get'], + ), + ); + +@Task() +Future generateJsonBindings() async => _logProcessOutput( + Process.start( + 'flutter', + ['pub', 'run', 'build_runner', 'build', '--delete-conflicting-outputs'], + ), + ); + +@Task() +Future watch() async => _logProcessOutput( + Process.start( + 'flutter', + ['pub', 'run', 'build_runner', 'watch'], + ), + ); + +@Task() +Future analyzeSource() async => _logProcessOutput( + Process.start( + 'flutter', + ['analyze'], + ), + ); + +@Task() +Future test() async => _logProcessOutput( + Process.start( + 'flutter', + ['test'], + ), + ); + +@Task() +Future clean() => _logProcessOutput( + Process.start( + 'flutter', + ['clean'], + ), + ); + +Future _logProcessOutput(Future proc) async { + final process = await proc; + final output = StreamGroup.merge([process.stdout, process.stderr]); + await for (final message in output) { + log(utf8.decode(message)); + } +} diff --git a/desktop_photo_search/material/windows/.gitignore b/desktop_photo_search/material/windows/.gitignore new file mode 100644 index 000000000..d492d0d98 --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/CMakeLists.txt b/desktop_photo_search/material/windows/CMakeLists.txt new file mode 100644 index 000000000..3adb3c6ad --- /dev/null +++ b/desktop_photo_search/material/windows/CMakeLists.txt @@ -0,0 +1,95 @@ +cmake_minimum_required(VERSION 3.14) +project(desktop_photo_search LANGUAGES CXX) + +set(BINARY_NAME "desktop_photo_search") + +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/desktop_photo_search/material/windows/flutter/CMakeLists.txt b/desktop_photo_search/material/windows/flutter/CMakeLists.txt new file mode 100644 index 000000000..b2e4bd8d6 --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/flutter/generated_plugin_registrant.cc b/desktop_photo_search/material/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 000000000..b16c80c6e --- /dev/null +++ b/desktop_photo_search/material/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,20 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + FileSelectorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FileSelectorWindows")); + MenubarPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("MenubarPlugin")); + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); +} diff --git a/desktop_photo_search/material/windows/flutter/generated_plugin_registrant.h b/desktop_photo_search/material/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 000000000..dc139d85a --- /dev/null +++ b/desktop_photo_search/material/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/desktop_photo_search/material/windows/flutter/generated_plugins.cmake b/desktop_photo_search/material/windows/flutter/generated_plugins.cmake new file mode 100644 index 000000000..50ab93cd5 --- /dev/null +++ b/desktop_photo_search/material/windows/flutter/generated_plugins.cmake @@ -0,0 +1,18 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + file_selector_windows + menubar + url_launcher_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/desktop_photo_search/material/windows/runner/CMakeLists.txt b/desktop_photo_search/material/windows/runner/CMakeLists.txt new file mode 100644 index 000000000..de2d8916b --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/Runner.rc b/desktop_photo_search/material/windows/runner/Runner.rc new file mode 100644 index 000000000..8e5b48869 --- /dev/null +++ b/desktop_photo_search/material/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", "A Photo Search sample app." "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "desktop_photo_search" "\0" + VALUE "LegalCopyright", "Copyright (C) 2020 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "desktop_photo_search.exe" "\0" + VALUE "ProductName", "desktop_photo_search" "\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/desktop_photo_search/material/windows/runner/flutter_window.cpp b/desktop_photo_search/material/windows/runner/flutter_window.cpp new file mode 100644 index 000000000..b43b9095e --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/flutter_window.h b/desktop_photo_search/material/windows/runner/flutter_window.h new file mode 100644 index 000000000..6da0652f0 --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/main.cpp b/desktop_photo_search/material/windows/runner/main.cpp new file mode 100644 index 000000000..a20675a4f --- /dev/null +++ b/desktop_photo_search/material/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"Photo Search", 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/desktop_photo_search/material/windows/runner/resource.h b/desktop_photo_search/material/windows/runner/resource.h new file mode 100644 index 000000000..66a65d1e4 --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/resources/app_icon.ico b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/runner.exe.manifest b/desktop_photo_search/material/windows/runner/runner.exe.manifest new file mode 100644 index 000000000..c977c4a42 --- /dev/null +++ b/desktop_photo_search/material/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/desktop_photo_search/material/windows/runner/utils.cpp b/desktop_photo_search/material/windows/runner/utils.cpp new file mode 100644 index 000000000..d19bdbbcc --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/utils.h b/desktop_photo_search/material/windows/runner/utils.h new file mode 100644 index 000000000..3879d5475 --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/win32_window.cpp b/desktop_photo_search/material/windows/runner/win32_window.cpp new file mode 100644 index 000000000..c10f08dc7 --- /dev/null +++ b/desktop_photo_search/material/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/desktop_photo_search/material/windows/runner/win32_window.h b/desktop_photo_search/material/windows/runner/win32_window.h new file mode 100644 index 000000000..17ba43112 --- /dev/null +++ b/desktop_photo_search/material/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/experimental/desktop_photo_search/README.md b/experimental/desktop_photo_search/README.md index d58821077..74bbab5b8 100644 --- a/experimental/desktop_photo_search/README.md +++ b/experimental/desktop_photo_search/README.md @@ -1,74 +1,3 @@ # Photo Search app -This desktop application enables you to search -[Unsplash](https://unsplash.com/) for photographs that interest you. -To use it, you need to add an **Access Key** from -[Unsplash API](https://unsplash.com/developers) to -`lib/unsplash_access_key.dart`. - -This sample works on Windows, macOS and Linux. - -## A quick tour of the code - -This Flutter project builds a desktop application. It utilises the following -desktop specific plugins: - - - [file_chooser] to enable the application user to select where to save a photo - from the Unsplash API. - - [menubar] for exposing Image Search functionality through the menu bar. - - [url_launcher] to open external links. - -The Unsplash API client entry point is in the [Unsplash] class, and is built -atop [http], [built_value] and [built_collection] for JSON Rest API access. - -The [DataTreeNode] and widget family, along with the [Split] widget capture -desktop file explorer master/detail view idioms. - -## Deploying to the Microsoft Store - -This sample uses Yehuda Kremer's [MSIX pub package][msix_pub_package] -to bundle up the Windows release build for distribution to the -[Microsoft Store][]. Microsoft maintains a [plethora of documentation][ms_store_publishing_doc] -on deploying to the Microsoft Store. - -See the `msix_config` stanza in this sample's `pubspec.yaml` for an -example configuration. Make sure the `display_name`, `publisher_display_name`, -`publisher` and `identity_name` attributes match the settings in your -Microsoft Partner Center application submission. - -## macOS Network and File entitlements - -To access the network, macOS requires applications enable the -[com.apple.security.network.client entitlement][macOS-client]. For this -sample, this entitlement is required to access the Unsplash API. - -Likewise, to save a Photo to the local file system using the `file_chooser` plugin requires the -[com.apple.security.files.user-selected.read-write entitlement][macOS-read-write]. - -Please see [macOS Signing and Security][macOS-security] for more detail. - -## Flutter Desktop is in Beta - -Flutter's Desktop support is now in `beta`, with a snapshot available in the -`stable` channel. Please see the [setup documentation][] for how to configure -your development environment to enable Flutter's Desktop support. - -[DataTreeNode]: lib/src/widgets/data_tree.dart -[Split]: lib/src/widgets/split.dart -[Unsplash]: lib/src/unsplash/unsplash.dart - -[built_collection]: https://pub.dev/packages/built_collection -[built_value]: https://pub.dev/packages/built_value -[file_chooser]: https://github.com/google/flutter-desktop-embedding/tree/master/plugins/file_chooser -[flutter_channels]: https://github.com/flutter/flutter/wiki/Flutter-build-release-channels -[http]: https://pub.dev/packages/http -[macOS-client]: https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_network_client -[macOS-read-write]: https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_files_user-selected_read-write -[macOS-security]: https://github.com/google/flutter-desktop-embedding/blob/master/macOS-Security.md -[menubar]: https://github.com/google/flutter-desktop-embedding/tree/master/plugins/menubar -[setup documentation]: https://flutter.dev/desktop#set-up -[url_launcher]: https://pub.dev/packages/url_launcher - -[msix_pub_package]: https://pub.dev/packages/msix -[Microsoft Store]: https://www.microsoft.com/en-au/p/flutter-desktop-photo-search/9nh719dxcpj4 -[ms_store_publishing_doc]: https://docs.microsoft.com/en-us/windows/uwp/publish/ +This application has been moved to the [top level of this repo](../../desktop_photo_search). \ No newline at end of file diff --git a/experimental/desktop_photo_search/lib/main.dart b/experimental/desktop_photo_search/lib/main.dart deleted file mode 100644 index 8fbae1404..000000000 --- a/experimental/desktop_photo_search/lib/main.dart +++ /dev/null @@ -1,188 +0,0 @@ -// Copyright 2019 The Flutter team. 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:io'; - -import 'package:file_selector/file_selector.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_simple_treeview/flutter_simple_treeview.dart'; -import 'package:logging/logging.dart'; -import 'package:menubar/menubar.dart' as menubar; -import 'package:provider/provider.dart'; - -import 'src/model/photo_search_model.dart'; -import 'src/unsplash/photo.dart'; -import 'src/unsplash/unsplash.dart'; -import 'src/widgets/about_dialog.dart'; -import 'src/widgets/photo_details.dart'; -import 'src/widgets/photo_search_dialog.dart'; -import 'src/widgets/split.dart'; -import 'unsplash_access_key.dart'; - -void main() { - Logger.root.level = Level.ALL; - Logger.root.onRecord.listen((rec) { - // ignore: avoid_print - print('${rec.loggerName} ${rec.level.name}: ${rec.time}: ${rec.message}'); - }); - - if (unsplashAccessKey.isEmpty) { - Logger('main').severe('Unsplash Access Key is required. ' - 'Please add to `lib/unsplash_access_key.dart`.'); - exit(1); - } - - runApp( - ChangeNotifierProvider( - create: (context) => PhotoSearchModel( - Unsplash(accessKey: unsplashAccessKey), - ), - child: const UnsplashSearchApp(), - ), - ); -} - -class UnsplashSearchApp extends StatelessWidget { - const UnsplashSearchApp({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return MaterialApp( - title: 'Photo Search', - theme: ThemeData( - primarySwatch: Colors.orange, - ), - home: const UnsplashHomePage(title: 'Photo Search'), - ); - } -} - -class UnsplashHomePage extends StatelessWidget { - const UnsplashHomePage({required this.title, Key? key}) : super(key: key); - final String title; - - @override - Widget build(BuildContext context) { - final photoSearchModel = Provider.of(context); - menubar.setApplicationMenu([ - menubar.Submenu(label: 'Search', children: [ - menubar.MenuItem( - label: 'Search ...', - onClicked: () { - showDialog( - context: context, - builder: (context) => - PhotoSearchDialog(callback: photoSearchModel.addSearch), - ); - }, - ), - ]), - menubar.Submenu(label: 'About', children: [ - menubar.MenuItem( - label: 'About ...', - onClicked: () { - showDialog( - context: context, - builder: (context) => const PolicyDialog(), - ); - }, - ), - ]) - ]); - - return Scaffold( - appBar: AppBar( - title: Text(title), - ), - body: photoSearchModel.entries.isNotEmpty - ? Split( - axis: Axis.horizontal, - initialFirstFraction: 0.4, - firstChild: Scrollbar( - child: SingleChildScrollView( - child: TreeView( - nodes: photoSearchModel.entries - .map(_buildSearchEntry) - .toList(), - indent: 0, - ), - ), - ), - secondChild: Center( - child: photoSearchModel.selectedPhoto != null - ? PhotoDetails( - photo: photoSearchModel.selectedPhoto!, - onPhotoSave: (photo) async { - final path = await getSavePath( - suggestedName: '${photo.id}.jpg', - acceptedTypeGroups: [ - XTypeGroup( - label: 'JPG', - extensions: ['jpg'], - mimeTypes: ['image/jpeg'], - ), - ], - ); - if (path != null) { - final fileData = - await photoSearchModel.download(photo: photo); - final photoFile = XFile.fromData(fileData, - mimeType: 'image/jpeg'); - await photoFile.saveTo(path); - } - }, - ) - : Container(), - ), - ) - : const Center( - child: Text('Search for Photos using the Fab button'), - ), - floatingActionButton: FloatingActionButton( - onPressed: () => showDialog( - context: context, - builder: (context) => - PhotoSearchDialog(callback: photoSearchModel.addSearch), - ), - tooltip: 'Search for a photo', - child: const Icon(Icons.search), - ), - ); - } - - TreeNode _buildSearchEntry(SearchEntry searchEntry) { - void selectPhoto(Photo photo) { - searchEntry.model.selectedPhoto = photo; - } - - String labelForPhoto(Photo photo) => 'Photo by ${photo.user!.name}'; - - return TreeNode( - content: Expanded( - child: Text(searchEntry.query), - ), - children: searchEntry.photos - .map( - (photo) => TreeNode( - content: Expanded( - child: Semantics( - button: true, - onTap: () => selectPhoto(photo), - label: labelForPhoto(photo), - excludeSemantics: true, - child: InkWell( - onTap: () => selectPhoto(photo), - child: Padding( - padding: const EdgeInsets.all(12.0), - child: Text(labelForPhoto(photo)), - ), - ), - ), - ), - ), - ) - .toList(), - ); - } -} diff --git a/experimental/desktop_photo_search/lib/src/widgets/about_dialog.dart b/experimental/desktop_photo_search/lib/src/widgets/about_dialog.dart deleted file mode 100644 index 2849281bc..000000000 --- a/experimental/desktop_photo_search/lib/src/widgets/about_dialog.dart +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2019 The Flutter team. 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:flutter/gestures.dart'; -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart' as url_launcher; - -class PolicyDialog extends StatelessWidget { - const PolicyDialog({ - Key? key, - this.radius = 8, - }) : super(key: key); - - final double radius; - - @override - Widget build(BuildContext context) { - return AlertDialog( - shape: - RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius)), - content: Builder( - builder: (context) { - var height = MediaQuery.of(context).size.height; - var width = MediaQuery.of(context).size.width; - return SizedBox( - height: height / 4, - width: width / 4, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - RichText( - textAlign: TextAlign.center, - text: TextSpan( - text: 'Terms & Conditions:\n', - style: Theme.of(context).textTheme.headline5, - ), - ), - RichText( - textAlign: TextAlign.left, - text: TextSpan( - text: '• ', - style: const TextStyle(color: Colors.black, fontSize: 18), - children: [ - TextSpan( - text: 'https://policies.google.com/terms', - style: const TextStyle( - fontWeight: FontWeight.bold, - color: Colors.lightBlue), - recognizer: TapGestureRecognizer() - ..onTap = () async { - const url = 'https://policies.google.com/terms'; - if (await url_launcher.canLaunch(url)) { - await url_launcher.launch(url); - } - }, - ) - ], - ), - ), - RichText( - textAlign: TextAlign.left, - text: TextSpan( - text: '• ', - style: const TextStyle(color: Colors.black, fontSize: 18), - children: [ - TextSpan( - text: 'https://unsplash.com/terms', - style: const TextStyle( - fontWeight: FontWeight.bold, - color: Colors.lightBlue), - recognizer: TapGestureRecognizer() - ..onTap = () async { - const url = 'https://unsplash.com/terms'; - if (await url_launcher.canLaunch(url)) { - await url_launcher.launch(url); - } - }, - ) - ], - ), - ), - ], - ), - ); - }, - ), - actions: [ - TextButton( - onPressed: () { - Navigator.of(context).pop(); - }, - child: Text( - 'CLOSE'.toUpperCase(), - style: const TextStyle(fontSize: 20), - ), - ), - ], - ); - } -} diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh index 96e1df85f..755051df7 100755 --- a/tool/flutter_ci_script_beta.sh +++ b/tool/flutter_ci_script_beta.sh @@ -15,7 +15,8 @@ declare -ar PROJECT_NAMES=( "add_to_app/prebuilt_module/flutter_module" "android_splash_screen" "animations" - "experimental/desktop_photo_search" + "desktop_photo_search/fluent_ui" + "desktop_photo_search/material" "experimental/federated_plugin/federated_plugin" "experimental/web_dashboard" "experimental/linting_tool" diff --git a/tool/flutter_ci_script_stable.sh b/tool/flutter_ci_script_stable.sh index cf2801ec8..cb14a60b0 100755 --- a/tool/flutter_ci_script_stable.sh +++ b/tool/flutter_ci_script_stable.sh @@ -15,7 +15,8 @@ declare -ar PROJECT_NAMES=( "add_to_app/prebuilt_module/flutter_module" "android_splash_screen" "animations" - "experimental/desktop_photo_search" + "desktop_photo_search/fluent_ui" + "desktop_photo_search/material" "experimental/federated_plugin/federated_plugin" "experimental/web_dashboard" "experimental/linting_tool"