From 0acac9c8cfa3df393de64cc9acb31fe1d41c5fe0 Mon Sep 17 00:00:00 2001 From: Mati Date: Thu, 19 Oct 2023 14:03:56 -0300 Subject: [PATCH 1/2] Revert "Revert "Merge pull request #1414 from ardriveapp/PE-3697-large-downloads"" This reverts commit e1a9e8a12f51aedf72fa63c184a84bf9c7e56459. --- .fvm/fvm_config.json | 2 +- .github/workflows/test.yml | 3 +- README.md | 2 +- android/build.gradle | 2 +- assets/config/dev.json | 5 +- assets/config/prod.json | 3 +- assets/config/staging.json | 3 +- lib/app_shell.dart | 2 +- .../login/blocs/login_bloc.dart | 2 +- .../login/views/login_page.dart | 2 +- .../create_snapshot_cubit.dart | 5 +- .../drive_attach/drive_attach_cubit.dart | 4 +- .../drive_create/drive_create_cubit.dart | 10 +- .../file_download/file_download_cubit.dart | 6 +- .../file_download/file_download_state.dart | 2 + .../personal_file_download_cubit.dart | 101 +- .../shared_file_download_cubit.dart | 6 +- lib/blocs/file_share/file_share_cubit.dart | 6 +- .../fs_entry_preview_cubit.dart | 10 +- lib/blocs/pin_file/pin_file_bloc.dart | 3 +- lib/blocs/profile/profile_cubit.dart | 2 +- lib/blocs/profile_add/profile_add_cubit.dart | 4 +- lib/blocs/shared_file/shared_file_cubit.dart | 3 +- lib/blocs/sync/sync_cubit.dart | 3 +- lib/blocs/upload/limits.dart | 8 +- lib/blocs/upload/upload_cubit.dart | 554 +++++++- .../upload_handles/bundle_upload_handle.dart | 5 +- .../file_data_item_upload_handle.dart | 1 + .../folder_data_item_upload_handle.dart | 1 + lib/blocs/upload/upload_state.dart | 17 + lib/components/create_snapshot_dialog.dart | 2 +- lib/components/details_panel.dart | 2 +- lib/components/file_download_dialog.dart | 116 +- lib/components/file_picker_modal.dart | 2 + lib/components/keyboard_handler.dart | 3 +- lib/components/side_bar.dart | 2 +- lib/components/upload_form.dart | 274 +++- lib/components/wallet_switch_dialog.dart | 2 +- lib/core/crypto/crypto.dart | 95 +- lib/core/download_service.dart | 13 +- lib/core/upload/bundle_signer.dart | 4 +- lib/core/upload/transaction_signer.dart | 4 +- lib/core/upload/upload_metadata.dart | 19 +- lib/core/upload/uploader.dart | 4 +- lib/download/ardrive_downloader.dart | 156 +++ lib/download/limits.dart | 3 +- lib/download/multiple_download_bloc.dart | 3 +- lib/entities/constants.dart | 54 - lib/entities/drive_entity.dart | 11 +- lib/entities/entity.dart | 4 +- lib/entities/file_entity.dart | 9 +- lib/entities/folder_entity.dart | 3 +- lib/entities/manifest_data.dart | 1 + lib/entities/snapshot_entity.dart | 3 +- lib/main.dart | 12 +- lib/models/daos/drive_dao/drive_dao.dart | 12 +- lib/models/drive.dart | 11 +- lib/pages/app_route_information_parser.dart | 24 +- lib/pages/app_router_delegate.dart | 2 +- .../components/drive_explorer_item_tile.dart | 72 +- lib/pst/community_oracle.dart | 2 +- lib/services/app/app_info_services.dart | 2 +- lib/services/arweave/arweave_service.dart | 23 +- lib/services/arweave/graphql/graphql.dart | 6 +- lib/services/config/app_config.dart | 4 + lib/turbo/services/upload_service.dart | 6 +- lib/turbo/turbo.dart | 2 +- lib/utils/arfs_txs_filter.dart | 2 +- lib/utils/bundles/fake_tags.dart | 4 +- lib/utils/logger/logger.dart | 4 +- .../snapshot_item_to_be_created.dart | 4 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 + macos/Runner/Release.entitlements | 2 +- packages/.vscode/launch.json | 108 ++ packages/arconnect/.gitignore | 30 + packages/arconnect/.metadata | 10 + packages/arconnect/CHANGELOG.md | 3 + packages/arconnect/LICENSE | 1 + packages/arconnect/README.md | 39 + packages/arconnect/analysis_options.yaml | 4 + packages/arconnect/lib/arconnect.dart | 5 + .../lib/src/arconnect/arconnect.dart | 34 + .../lib/src/arconnect/arconnect_wallet.dart | 25 + .../implementations/arconnect_stub.dart | 31 + .../implementations/arconnect_web.dart | 59 + .../lib/src}/safe_arconnect_action.dart | 13 +- packages/arconnect/pubspec.yaml | 63 + packages/arconnect/test/arconnect_test.dart | 1 + packages/ardrive_crypto/.gitignore | 30 + packages/ardrive_crypto/.metadata | 10 + packages/ardrive_crypto/CHANGELOG.md | 3 + packages/ardrive_crypto/LICENSE | 1 + packages/ardrive_crypto/README.md | 39 + packages/ardrive_crypto/analysis_options.yaml | 4 + .../ardrive_crypto/lib/ardrive_crypto.dart | 10 + .../ardrive_crypto/lib/src/authenticate.dart | 84 ++ packages/ardrive_crypto/lib/src/ciphers.dart | 45 + .../ardrive_crypto/lib/src/constants.dart | 10 + packages/ardrive_crypto/lib/src/crypto.dart | 23 + packages/ardrive_crypto/lib/src/entities.dart | 159 +++ packages/ardrive_crypto/lib/src/keys.dart | 62 + .../ardrive_crypto/lib/src/stream_aes.dart | 161 +++ .../ardrive_crypto/lib/src/stream_cipher.dart | 84 ++ packages/ardrive_crypto/lib/src/streams.dart | 40 + packages/ardrive_crypto/pubspec.yaml | 67 + .../test/ardrive_crypto_test.dart | 1 + packages/ardrive_uploader/.gitignore | 7 + packages/ardrive_uploader/CHANGELOG.md | 3 + packages/ardrive_uploader/README.md | 39 + .../ardrive_uploader/analysis_options.yaml | 30 + packages/ardrive_uploader/example/.gitignore | 44 + packages/ardrive_uploader/example/.metadata | 45 + packages/ardrive_uploader/example/README.md | 16 + .../example/analysis_options.yaml | 29 + .../example/android/.gitignore | 13 + .../example/android/app/build.gradle | 72 + .../android/app/src/debug/AndroidManifest.xml | 7 + .../android/app/src/main/AndroidManifest.xml | 34 + .../com/example/example/MainActivity.kt | 6 + .../res/drawable-v21/launch_background.xml | 12 + .../main/res/drawable/launch_background.xml | 12 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 + .../app/src/main/res/values/styles.xml | 18 + .../app/src/profile/AndroidManifest.xml | 7 + .../example/android/build.gradle | 31 + .../example/android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 5 + .../example/android/settings.gradle | 11 + .../ardrive_uploader/example/ios/.gitignore | 34 + .../ios/Flutter/AppFrameworkInfo.plist | 26 + .../example/ios/Flutter/Debug.xcconfig | 2 + .../example/ios/Flutter/Release.xcconfig | 2 + packages/ardrive_uploader/example/ios/Podfile | 44 + .../ardrive_uploader/example/ios/Podfile.lock | 136 ++ .../ios/Runner.xcodeproj/project.pbxproj | 729 ++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 98 ++ .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../example/ios/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 122 ++ .../Icon-App-1024x1024@1x.png | Bin 0 -> 10932 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 295 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 450 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 282 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 462 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 704 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 586 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 1674 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 762 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 1226 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 1418 bytes .../LaunchImage.imageset/Contents.json | 23 + .../LaunchImage.imageset/LaunchImage.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/README.md | 5 + .../Runner/Base.lproj/LaunchScreen.storyboard | 37 + .../ios/Runner/Base.lproj/Main.storyboard | 26 + .../example/ios/Runner/Info.plist | 51 + .../ios/Runner/Runner-Bridging-Header.h | 1 + .../example/ios/RunnerTests/RunnerTests.swift | 12 + .../ardrive_uploader/example/lib/main.dart | 299 ++++ .../ardrive_uploader/example/linux/.gitignore | 1 + .../example/linux/CMakeLists.txt | 139 ++ .../example/linux/flutter/CMakeLists.txt | 88 ++ .../flutter/generated_plugin_registrant.cc | 23 + .../flutter/generated_plugin_registrant.h | 15 + .../linux/flutter/generated_plugins.cmake | 26 + .../ardrive_uploader/example/linux/main.cc | 6 + .../example/linux/my_application.cc | 104 ++ .../example/linux/my_application.h | 18 + .../ardrive_uploader/example/macos/.gitignore | 7 + .../macos/Flutter/Flutter-Debug.xcconfig | 2 + .../macos/Flutter/Flutter-Release.xcconfig | 2 + .../Flutter/GeneratedPluginRegistrant.swift | 20 + .../ardrive_uploader/example/macos/Podfile | 43 + .../example/macos/Podfile.lock | 47 + .../macos/Runner.xcodeproj/project.pbxproj | 791 +++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 98 ++ .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../example/macos/Runner/AppDelegate.swift | 9 + .../AppIcon.appiconset/Contents.json | 68 + .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 102994 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 5680 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 520 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 14142 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1066 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 36406 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 2218 bytes .../macos/Runner/Base.lproj/MainMenu.xib | 343 +++++ .../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 | 12 + .../example/macos/Runner/Info.plist | 32 + .../macos/Runner/MainFlutterWindow.swift | 15 + .../example/macos/Runner/Release.entitlements | 8 + .../macos/RunnerTests/RunnerTests.swift | 12 + .../ardrive_uploader/example/pubspec.yaml | 107 ++ .../example/test/widget_test.dart | 1 + .../ardrive_uploader/example/web/favicon.png | Bin 0 -> 917 bytes .../example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes .../example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes .../example/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes .../example/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes .../ardrive_uploader/example/web/index.html | 59 + .../example/web/manifest.json | 35 + .../example/windows/.gitignore | 17 + .../example/windows/CMakeLists.txt | 102 ++ .../example/windows/flutter/CMakeLists.txt | 104 ++ .../flutter/generated_plugin_registrant.cc | 20 + .../flutter/generated_plugin_registrant.h | 15 + .../windows/flutter/generated_plugins.cmake | 26 + .../example/windows/runner/CMakeLists.txt | 40 + .../example/windows/runner/Runner.rc | 121 ++ .../example/windows/runner/flutter_window.cpp | 66 + .../example/windows/runner/flutter_window.h | 33 + .../example/windows/runner/main.cpp | 43 + .../example/windows/runner/resource.h | 16 + .../windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes .../windows/runner/runner.exe.manifest | 20 + .../example/windows/runner/utils.cpp | 65 + .../example/windows/runner/utils.h | 19 + .../example/windows/runner/win32_window.cpp | 288 ++++ .../example/windows/runner/win32_window.h | 102 ++ .../lib/ardrive_uploader.dart | 7 + .../lib/src/ardrive_uploader.dart | 406 ++++++ .../lib/src/arfs_upload_metadata.dart | 107 ++ .../lib/src/d2n_streamed_upload.dart | 50 + .../lib/src/data_bundler.dart | 702 ++++++++++ .../lib/src}/metadata_generator.dart | 248 +++- .../lib/src/streamed_upload.dart | 32 + .../lib/src/turbo_streamed_upload.dart | 88 ++ .../lib/src/turbo_upload_service_base.dart | 16 + .../lib/src/turbo_upload_service_dart_io.dart | 66 + .../lib/src/turbo_upload_service_web.dart | 203 +++ .../lib/src/upload_controller.dart | 413 ++++++ .../lib/src/utils/data_item_utils.dart | 12 + packages/ardrive_uploader/pubspec.yaml | 51 + .../test/ardrive_uploader_test.dart | 9 + packages/ardrive_utils/.gitignore | 30 + packages/ardrive_utils/.metadata | 10 + packages/ardrive_utils/CHANGELOG.md | 3 + packages/ardrive_utils/LICENSE | 1 + packages/ardrive_utils/README.md | 39 + packages/ardrive_utils/analysis_options.yaml | 4 + packages/ardrive_utils/lib/ardrive_utils.dart | 7 + .../lib/src/app_info_services.dart | 51 + .../ardrive_utils/lib/src}/app_platform.dart | 4 +- .../ardrive_utils/lib/src/entity_tag.dart | 64 + packages/ardrive_utils/lib/src/html/html.dart | 1 + .../lib/src}/html/html_util.dart | 1 + .../src}/html/implementations/html_stub.dart | 0 .../src}/html/implementations/html_web.dart | 2 +- .../lib/src/html/is_document_focused.dart | 4 + .../lib/src/sign_nounce_and_data.dart | 18 + packages/ardrive_utils/pubspec.yaml | 64 + .../test/ardrive_utils_test.dart | 1 + packages/arfs/.gitignore | 30 + packages/arfs/.metadata | 10 + packages/arfs/CHANGELOG.md | 3 + packages/arfs/LICENSE | 1 + packages/arfs/README.md | 39 + packages/arfs/analysis_options.yaml | 4 + packages/arfs/lib/arfs.dart | 3 + packages/arfs/lib/src/arfs_entities.dart | 141 ++ packages/arfs/pubspec.yaml | 57 + packages/arfs/test/arfs_test.dart | 1 + packages/build/.last_build_id | 1 + pubspec.lock | 606 +++++---- pubspec.yaml | 39 +- test/blocs/drive_attach_cubit_test.dart | 13 +- test/blocs/drive_create_cubit_test.dart | 50 +- test/blocs/fs_entry_move_bloc_test.dart | 4 +- .../personal_file_download_cubit_test.dart | 1200 +++++++++-------- test/core/upload/metadata_generator_test.dart | 498 ------- test/core/upload/uploader_test.dart | 4 +- test/download/limits_test.dart | 3 +- .../download/multiple_download_bloc_test.dart | 10 +- test/entities/custom_json_metadata_test.dart | 3 +- test/entities/manifest_data_test.dart | 2 +- test/entities/snapshot_entity_test.dart | 3 +- test/models/entity_version_tag_test.dart | 4 +- .../arweave/arweave_service_test.dart | 2 +- test/test_utils/mocks.dart | 5 +- test/test_utils/utils.dart | 4 +- test/utils/app_platform_test.dart | 5 +- test/utils/fake_tags_test.dart | 3 +- .../tab_visibility_singleton_test.dart | 3 +- test/utils/link_generators_test.dart | 6 +- web/index.html | 1 + web/js/sha384.js | 24 + 308 files changed, 12140 insertions(+), 1833 deletions(-) create mode 100644 lib/download/ardrive_downloader.dart create mode 100644 packages/.vscode/launch.json create mode 100644 packages/arconnect/.gitignore create mode 100644 packages/arconnect/.metadata create mode 100644 packages/arconnect/CHANGELOG.md create mode 100644 packages/arconnect/LICENSE create mode 100644 packages/arconnect/README.md create mode 100644 packages/arconnect/analysis_options.yaml create mode 100644 packages/arconnect/lib/arconnect.dart create mode 100644 packages/arconnect/lib/src/arconnect/arconnect.dart create mode 100644 packages/arconnect/lib/src/arconnect/arconnect_wallet.dart create mode 100644 packages/arconnect/lib/src/arconnect/implementations/arconnect_stub.dart create mode 100644 packages/arconnect/lib/src/arconnect/implementations/arconnect_web.dart rename {lib/core/arconnect => packages/arconnect/lib/src}/safe_arconnect_action.dart (61%) create mode 100644 packages/arconnect/pubspec.yaml create mode 100644 packages/arconnect/test/arconnect_test.dart create mode 100644 packages/ardrive_crypto/.gitignore create mode 100644 packages/ardrive_crypto/.metadata create mode 100644 packages/ardrive_crypto/CHANGELOG.md create mode 100644 packages/ardrive_crypto/LICENSE create mode 100644 packages/ardrive_crypto/README.md create mode 100644 packages/ardrive_crypto/analysis_options.yaml create mode 100644 packages/ardrive_crypto/lib/ardrive_crypto.dart create mode 100644 packages/ardrive_crypto/lib/src/authenticate.dart create mode 100644 packages/ardrive_crypto/lib/src/ciphers.dart create mode 100644 packages/ardrive_crypto/lib/src/constants.dart create mode 100644 packages/ardrive_crypto/lib/src/crypto.dart create mode 100644 packages/ardrive_crypto/lib/src/entities.dart create mode 100644 packages/ardrive_crypto/lib/src/keys.dart create mode 100644 packages/ardrive_crypto/lib/src/stream_aes.dart create mode 100644 packages/ardrive_crypto/lib/src/stream_cipher.dart create mode 100644 packages/ardrive_crypto/lib/src/streams.dart create mode 100644 packages/ardrive_crypto/pubspec.yaml create mode 100644 packages/ardrive_crypto/test/ardrive_crypto_test.dart create mode 100644 packages/ardrive_uploader/.gitignore create mode 100644 packages/ardrive_uploader/CHANGELOG.md create mode 100644 packages/ardrive_uploader/README.md create mode 100644 packages/ardrive_uploader/analysis_options.yaml create mode 100644 packages/ardrive_uploader/example/.gitignore create mode 100644 packages/ardrive_uploader/example/.metadata create mode 100644 packages/ardrive_uploader/example/README.md create mode 100644 packages/ardrive_uploader/example/analysis_options.yaml create mode 100644 packages/ardrive_uploader/example/android/.gitignore create mode 100644 packages/ardrive_uploader/example/android/app/build.gradle create mode 100644 packages/ardrive_uploader/example/android/app/src/debug/AndroidManifest.xml create mode 100644 packages/ardrive_uploader/example/android/app/src/main/AndroidManifest.xml create mode 100644 packages/ardrive_uploader/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/drawable/launch_background.xml create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/values-night/styles.xml create mode 100644 packages/ardrive_uploader/example/android/app/src/main/res/values/styles.xml create mode 100644 packages/ardrive_uploader/example/android/app/src/profile/AndroidManifest.xml create mode 100644 packages/ardrive_uploader/example/android/build.gradle create mode 100644 packages/ardrive_uploader/example/android/gradle.properties create mode 100644 packages/ardrive_uploader/example/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 packages/ardrive_uploader/example/android/settings.gradle create mode 100644 packages/ardrive_uploader/example/ios/.gitignore create mode 100644 packages/ardrive_uploader/example/ios/Flutter/AppFrameworkInfo.plist create mode 100644 packages/ardrive_uploader/example/ios/Flutter/Debug.xcconfig create mode 100644 packages/ardrive_uploader/example/ios/Flutter/Release.xcconfig create mode 100644 packages/ardrive_uploader/example/ios/Podfile create mode 100644 packages/ardrive_uploader/example/ios/Podfile.lock create mode 100644 packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.pbxproj create mode 100644 packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 packages/ardrive_uploader/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 packages/ardrive_uploader/example/ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 packages/ardrive_uploader/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/ardrive_uploader/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 packages/ardrive_uploader/example/ios/Runner/AppDelegate.swift create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md create mode 100644 packages/ardrive_uploader/example/ios/Runner/Base.lproj/LaunchScreen.storyboard create mode 100644 packages/ardrive_uploader/example/ios/Runner/Base.lproj/Main.storyboard create mode 100644 packages/ardrive_uploader/example/ios/Runner/Info.plist create mode 100644 packages/ardrive_uploader/example/ios/Runner/Runner-Bridging-Header.h create mode 100644 packages/ardrive_uploader/example/ios/RunnerTests/RunnerTests.swift create mode 100644 packages/ardrive_uploader/example/lib/main.dart create mode 100644 packages/ardrive_uploader/example/linux/.gitignore create mode 100644 packages/ardrive_uploader/example/linux/CMakeLists.txt create mode 100644 packages/ardrive_uploader/example/linux/flutter/CMakeLists.txt create mode 100644 packages/ardrive_uploader/example/linux/flutter/generated_plugin_registrant.cc create mode 100644 packages/ardrive_uploader/example/linux/flutter/generated_plugin_registrant.h create mode 100644 packages/ardrive_uploader/example/linux/flutter/generated_plugins.cmake create mode 100644 packages/ardrive_uploader/example/linux/main.cc create mode 100644 packages/ardrive_uploader/example/linux/my_application.cc create mode 100644 packages/ardrive_uploader/example/linux/my_application.h create mode 100644 packages/ardrive_uploader/example/macos/.gitignore create mode 100644 packages/ardrive_uploader/example/macos/Flutter/Flutter-Debug.xcconfig create mode 100644 packages/ardrive_uploader/example/macos/Flutter/Flutter-Release.xcconfig create mode 100644 packages/ardrive_uploader/example/macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 packages/ardrive_uploader/example/macos/Podfile create mode 100644 packages/ardrive_uploader/example/macos/Podfile.lock create mode 100644 packages/ardrive_uploader/example/macos/Runner.xcodeproj/project.pbxproj create mode 100644 packages/ardrive_uploader/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/ardrive_uploader/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 packages/ardrive_uploader/example/macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 packages/ardrive_uploader/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/ardrive_uploader/example/macos/Runner/AppDelegate.swift create mode 100644 packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 packages/ardrive_uploader/example/macos/Runner/Base.lproj/MainMenu.xib create mode 100644 packages/ardrive_uploader/example/macos/Runner/Configs/AppInfo.xcconfig create mode 100644 packages/ardrive_uploader/example/macos/Runner/Configs/Debug.xcconfig create mode 100644 packages/ardrive_uploader/example/macos/Runner/Configs/Release.xcconfig create mode 100644 packages/ardrive_uploader/example/macos/Runner/Configs/Warnings.xcconfig create mode 100644 packages/ardrive_uploader/example/macos/Runner/DebugProfile.entitlements create mode 100644 packages/ardrive_uploader/example/macos/Runner/Info.plist create mode 100644 packages/ardrive_uploader/example/macos/Runner/MainFlutterWindow.swift create mode 100644 packages/ardrive_uploader/example/macos/Runner/Release.entitlements create mode 100644 packages/ardrive_uploader/example/macos/RunnerTests/RunnerTests.swift create mode 100644 packages/ardrive_uploader/example/pubspec.yaml create mode 100644 packages/ardrive_uploader/example/test/widget_test.dart create mode 100644 packages/ardrive_uploader/example/web/favicon.png create mode 100644 packages/ardrive_uploader/example/web/icons/Icon-192.png create mode 100644 packages/ardrive_uploader/example/web/icons/Icon-512.png create mode 100644 packages/ardrive_uploader/example/web/icons/Icon-maskable-192.png create mode 100644 packages/ardrive_uploader/example/web/icons/Icon-maskable-512.png create mode 100644 packages/ardrive_uploader/example/web/index.html create mode 100644 packages/ardrive_uploader/example/web/manifest.json create mode 100644 packages/ardrive_uploader/example/windows/.gitignore create mode 100644 packages/ardrive_uploader/example/windows/CMakeLists.txt create mode 100644 packages/ardrive_uploader/example/windows/flutter/CMakeLists.txt create mode 100644 packages/ardrive_uploader/example/windows/flutter/generated_plugin_registrant.cc create mode 100644 packages/ardrive_uploader/example/windows/flutter/generated_plugin_registrant.h create mode 100644 packages/ardrive_uploader/example/windows/flutter/generated_plugins.cmake create mode 100644 packages/ardrive_uploader/example/windows/runner/CMakeLists.txt create mode 100644 packages/ardrive_uploader/example/windows/runner/Runner.rc create mode 100644 packages/ardrive_uploader/example/windows/runner/flutter_window.cpp create mode 100644 packages/ardrive_uploader/example/windows/runner/flutter_window.h create mode 100644 packages/ardrive_uploader/example/windows/runner/main.cpp create mode 100644 packages/ardrive_uploader/example/windows/runner/resource.h create mode 100644 packages/ardrive_uploader/example/windows/runner/resources/app_icon.ico create mode 100644 packages/ardrive_uploader/example/windows/runner/runner.exe.manifest create mode 100644 packages/ardrive_uploader/example/windows/runner/utils.cpp create mode 100644 packages/ardrive_uploader/example/windows/runner/utils.h create mode 100644 packages/ardrive_uploader/example/windows/runner/win32_window.cpp create mode 100644 packages/ardrive_uploader/example/windows/runner/win32_window.h create mode 100644 packages/ardrive_uploader/lib/ardrive_uploader.dart create mode 100644 packages/ardrive_uploader/lib/src/ardrive_uploader.dart create mode 100644 packages/ardrive_uploader/lib/src/arfs_upload_metadata.dart create mode 100644 packages/ardrive_uploader/lib/src/d2n_streamed_upload.dart create mode 100644 packages/ardrive_uploader/lib/src/data_bundler.dart rename {lib/core/upload => packages/ardrive_uploader/lib/src}/metadata_generator.dart (52%) create mode 100644 packages/ardrive_uploader/lib/src/streamed_upload.dart create mode 100644 packages/ardrive_uploader/lib/src/turbo_streamed_upload.dart create mode 100644 packages/ardrive_uploader/lib/src/turbo_upload_service_base.dart create mode 100644 packages/ardrive_uploader/lib/src/turbo_upload_service_dart_io.dart create mode 100644 packages/ardrive_uploader/lib/src/turbo_upload_service_web.dart create mode 100644 packages/ardrive_uploader/lib/src/upload_controller.dart create mode 100644 packages/ardrive_uploader/lib/src/utils/data_item_utils.dart create mode 100644 packages/ardrive_uploader/pubspec.yaml create mode 100644 packages/ardrive_uploader/test/ardrive_uploader_test.dart create mode 100644 packages/ardrive_utils/.gitignore create mode 100644 packages/ardrive_utils/.metadata create mode 100644 packages/ardrive_utils/CHANGELOG.md create mode 100644 packages/ardrive_utils/LICENSE create mode 100644 packages/ardrive_utils/README.md create mode 100644 packages/ardrive_utils/analysis_options.yaml create mode 100644 packages/ardrive_utils/lib/ardrive_utils.dart create mode 100644 packages/ardrive_utils/lib/src/app_info_services.dart rename {lib/utils => packages/ardrive_utils/lib/src}/app_platform.dart (94%) create mode 100644 packages/ardrive_utils/lib/src/entity_tag.dart create mode 100644 packages/ardrive_utils/lib/src/html/html.dart rename {lib/utils => packages/ardrive_utils/lib/src}/html/html_util.dart (94%) rename {lib/utils => packages/ardrive_utils/lib/src}/html/implementations/html_stub.dart (100%) rename {lib/utils => packages/ardrive_utils/lib/src}/html/implementations/html_web.dart (91%) create mode 100644 packages/ardrive_utils/lib/src/html/is_document_focused.dart create mode 100644 packages/ardrive_utils/lib/src/sign_nounce_and_data.dart create mode 100644 packages/ardrive_utils/pubspec.yaml create mode 100644 packages/ardrive_utils/test/ardrive_utils_test.dart create mode 100644 packages/arfs/.gitignore create mode 100644 packages/arfs/.metadata create mode 100644 packages/arfs/CHANGELOG.md create mode 100644 packages/arfs/LICENSE create mode 100644 packages/arfs/README.md create mode 100644 packages/arfs/analysis_options.yaml create mode 100644 packages/arfs/lib/arfs.dart create mode 100644 packages/arfs/lib/src/arfs_entities.dart create mode 100644 packages/arfs/pubspec.yaml create mode 100644 packages/arfs/test/arfs_test.dart create mode 100644 packages/build/.last_build_id delete mode 100644 test/core/upload/metadata_generator_test.dart create mode 100644 web/js/sha384.js diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index ba129cfda0..9acb749cda 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.10.0", + "flutterSdkVersion": "3.13.6", "flavors": {} } \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7c8c5522c3..b2ec2eac58 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,8 @@ jobs: run: flutter pub global activate script_runner - name: Build app - run: scr setup + run: | + scr setup - name: Lint run: flutter analyze diff --git a/README.md b/README.md index cf61192cab..86e3381e1f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The ArDrive Web App allows a user to log in to securely view, upload and manage Have any questions? Join the ArDrive Discord channel for support, news and updates. https://discord.gg/ya4hf2H ## Setting up the Development Environment - +**** Install lefthook for your platform from the intructions [here](https://github.com/evilmartians/lefthook/blob/master/docs/other.md). This will enable the use of git hooks. After installing lefthook you need to enable it by running: diff --git a/android/build.gradle b/android/build.gradle index 3cd27e6cd1..ad2241ae5e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = "1.7.10" + ext.kotlin_version = "1.9.10" repositories { google() jcenter() diff --git a/assets/config/dev.json b/assets/config/dev.json index 0c787c8d69..c3e711ae36 100644 --- a/assets/config/dev.json +++ b/assets/config/dev.json @@ -2,7 +2,7 @@ "defaultArweaveGatewayUrl": "https://arweave.net", "useTurboUpload": true, "useTurboPayment": true, - "defaultTurboUploadUrl": "https://upload.ardrive.dev", + "defaultTurboUploadUrl": "https://upload.ardrive.io", "defaultTurboPaymentUrl": "https://payment.ardrive.dev", "allowedDataItemSizeForTurbo": 500000, "enableQuickSyncAuthoring": true, @@ -10,5 +10,6 @@ "enableVideoPreview": true, "enableAudioPreview": true, "stripePublishableKey": "pk_test_51JUAtwC8apPOWkDLh2FPZkQkiKZEkTo6wqgLCtQoClL6S4l2jlbbc5MgOdwOUdU9Tn93NNvqAGbu115lkJChMikG00XUfTmo2z", - "enablePins": true + "enablePins": true, + "useNewUploader": true } diff --git a/assets/config/prod.json b/assets/config/prod.json index 519a8cabad..5f5cf65e46 100644 --- a/assets/config/prod.json +++ b/assets/config/prod.json @@ -10,5 +10,6 @@ "enableVideoPreview": true, "enableAudioPreview": true, "stripePublishableKey": "pk_live_51JUAtwC8apPOWkDLMQqNF9sPpfneNSPnwX8YZ8y1FNDl6v94hZIwzgFSYl27bWE4Oos8CLquunUswKrKcaDhDO6m002Yj9AeKj", - "enablePins": true + "enablePins": true, + "useNewUploader": false } diff --git a/assets/config/staging.json b/assets/config/staging.json index 519a8cabad..904caa6cdb 100644 --- a/assets/config/staging.json +++ b/assets/config/staging.json @@ -10,5 +10,6 @@ "enableVideoPreview": true, "enableAudioPreview": true, "stripePublishableKey": "pk_live_51JUAtwC8apPOWkDLMQqNF9sPpfneNSPnwX8YZ8y1FNDl6v94hZIwzgFSYl27bWE4Oos8CLquunUswKrKcaDhDO6m002Yj9AeKj", - "enablePins": true + "enablePins": true, + "useNewUploader": true } diff --git a/lib/app_shell.dart b/lib/app_shell.dart index dc80c88e0e..c56868717c 100644 --- a/lib/app_shell.dart +++ b/lib/app_shell.dart @@ -1,10 +1,10 @@ import 'package:ardrive/components/profile_card.dart'; import 'package:ardrive/components/side_bar.dart'; import 'package:ardrive/pages/drive_detail/components/hover_widget.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/size_constants.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:responsive_builder/responsive_builder.dart'; diff --git a/lib/authentication/login/blocs/login_bloc.dart b/lib/authentication/login/blocs/login_bloc.dart index ab944e2ff4..698a603b6f 100644 --- a/lib/authentication/login/blocs/login_bloc.dart +++ b/lib/authentication/login/blocs/login_bloc.dart @@ -7,9 +7,9 @@ import 'package:ardrive/services/arconnect/arconnect.dart'; import 'package:ardrive/services/arconnect/arconnect_wallet.dart'; import 'package:ardrive/user/repositories/user_repository.dart'; import 'package:ardrive/user/user.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:bip39/bip39.dart' as bip39; import 'package:equatable/equatable.dart'; diff --git a/lib/authentication/login/views/login_page.dart b/lib/authentication/login/views/login_page.dart index e02de25fd8..09ef0e2b65 100644 --- a/lib/authentication/login/views/login_page.dart +++ b/lib/authentication/login/views/login_page.dart @@ -18,7 +18,6 @@ import 'package:ardrive/services/authentication/biometric_permission_dialog.dart import 'package:ardrive/services/config/config_service.dart'; import 'package:ardrive/user/repositories/user_repository.dart'; import 'package:ardrive/utils/app_localizations_wrapper.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/io_utils.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/open_url.dart'; @@ -26,6 +25,7 @@ import 'package:ardrive/utils/pre_cache_assets.dart'; import 'package:ardrive/utils/show_general_dialog.dart'; import 'package:ardrive/utils/split_localizations.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:bip39/bip39.dart' as bip39; import 'package:flutter/gestures.dart'; diff --git a/lib/blocs/create_snapshot/create_snapshot_cubit.dart b/lib/blocs/create_snapshot/create_snapshot_cubit.dart index 6c1c733f9a..2c6e6b41fe 100644 --- a/lib/blocs/create_snapshot/create_snapshot_cubit.dart +++ b/lib/blocs/create_snapshot/create_snapshot_cubit.dart @@ -7,7 +7,6 @@ import 'package:ardrive/blocs/constants.dart'; import 'package:ardrive/blocs/profile/profile_cubit.dart'; import 'package:ardrive/blocs/upload/upload_cubit.dart'; import 'package:ardrive/core/upload/cost_calculator.dart'; -import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/entities/snapshot_entity.dart'; import 'package:ardrive/entities/string_types.dart'; import 'package:ardrive/models/daos/daos.dart'; @@ -16,12 +15,12 @@ import 'package:ardrive/turbo/services/payment_service.dart'; import 'package:ardrive/turbo/services/upload_service.dart'; import 'package:ardrive/turbo/turbo.dart'; import 'package:ardrive/turbo/utils/utils.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/metadata_cache.dart'; import 'package:ardrive/utils/snapshots/height_range.dart'; import 'package:ardrive/utils/snapshots/range.dart'; import 'package:ardrive/utils/snapshots/snapshot_item_to_be_created.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart'; @@ -550,7 +549,7 @@ class CreateSnapshotCubit extends Cubit { Future _jsonMetadataOfTxId(String txId) async { final drive = await _driveDao.driveById(driveId: _driveId).getSingleOrNull(); - final isPrivate = drive != null && drive.privacy != DrivePrivacy.public; + final isPrivate = drive != null && drive.privacy != DrivePrivacyTag.public; final metadataCache = await MetadataCache.fromCacheStore( await newSharedPreferencesCacheStore(), diff --git a/lib/blocs/drive_attach/drive_attach_cubit.dart b/lib/blocs/drive_attach/drive_attach_cubit.dart index f3a12ad94f..acb431a16d 100644 --- a/lib/blocs/drive_attach/drive_attach_cubit.dart +++ b/lib/blocs/drive_attach/drive_attach_cubit.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'dart:convert'; import 'package:ardrive/blocs/blocs.dart'; -import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/entities/string_types.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:equatable/equatable.dart'; @@ -218,7 +218,7 @@ class DriveAttachCubit extends Cubit { final drivePrivacy = await _arweave.getDrivePrivacyForId(driveId); switch (drivePrivacy) { - case DrivePrivacy.private: + case DrivePrivacyTag.private: emit(DriveAttachPrivate()); break; case null: diff --git a/lib/blocs/drive_create/drive_create_cubit.dart b/lib/blocs/drive_create/drive_create_cubit.dart index 7050d2e5f7..e6e6960717 100644 --- a/lib/blocs/drive_create/drive_create_cubit.dart +++ b/lib/blocs/drive_create/drive_create_cubit.dart @@ -1,13 +1,13 @@ import 'package:ardrive/blocs/blocs.dart'; import 'package:ardrive/core/arfs/entities/arfs_entities.dart' show DrivePrivacy; -import 'package:ardrive/entities/constants.dart' as constants; import 'package:ardrive/entities/drive_entity.dart'; import 'package:ardrive/entities/folder_entity.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/turbo/services/upload_service.dart'; import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart'; @@ -19,9 +19,7 @@ part 'drive_create_state.dart'; class DriveCreateCubit extends Cubit { final form = FormGroup({ 'privacy': FormControl( - value: DrivePrivacy.private.name, - validators: [Validators.required], - ), + value: DrivePrivacyTag.private, validators: [Validators.required]), }); final ArweaveService _arweave; @@ -85,8 +83,8 @@ class DriveCreateCubit extends Cubit { name: driveName, rootFolderId: createRes.rootFolderId, privacy: drivePrivacy, - authMode: drivePrivacy == constants.DrivePrivacy.private - ? constants.DriveAuthMode.password + authMode: drivePrivacy == DrivePrivacyTag.private + ? DriveAuthModeTag.password : null, ); diff --git a/lib/blocs/file_download/file_download_cubit.dart b/lib/blocs/file_download/file_download_cubit.dart index 539e0ac800..5b6810a37b 100644 --- a/lib/blocs/file_download/file_download_cubit.dart +++ b/lib/blocs/file_download/file_download_cubit.dart @@ -4,15 +4,15 @@ import 'package:ardrive/blocs/blocs.dart'; import 'package:ardrive/core/arfs/entities/arfs_entities.dart'; import 'package:ardrive/core/arfs/repository/arfs_repository.dart'; import 'package:ardrive/core/crypto/crypto.dart'; -import 'package:ardrive/core/download_service.dart'; -import 'package:ardrive/entities/constants.dart' as constants; +import 'package:ardrive/download/ardrive_downloader.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/data_size.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive_http/ardrive_http.dart'; +import 'package:ardrive_io/ardrive_io.dart' as io; import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/blocs/file_download/file_download_state.dart b/lib/blocs/file_download/file_download_state.dart index a1cb8def9c..cb0da652e1 100644 --- a/lib/blocs/file_download/file_download_state.dart +++ b/lib/blocs/file_download/file_download_state.dart @@ -27,11 +27,13 @@ class FileDownloadWithProgress extends FileDownloadState { required this.fileName, required this.progress, required this.fileSize, + required this.contentType, }); final int progress; final int fileSize; final String fileName; + final String contentType; @override List get props => [progress, fileName]; diff --git a/lib/blocs/file_download/personal_file_download_cubit.dart b/lib/blocs/file_download/personal_file_download_cubit.dart index a05408dc61..64de257da5 100644 --- a/lib/blocs/file_download/personal_file_download_cubit.dart +++ b/lib/blocs/file_download/personal_file_download_cubit.dart @@ -22,26 +22,24 @@ class ProfileFileDownloadCubit extends FileDownloadCubit { final DriveDao _driveDao; final ArweaveService _arweave; - final ArDriveDownloader _downloader; - final DownloadService _downloadService; + final io.ArDriveMobileDownloader _downloader; + final ArDriveDownloader _arDriveDownloader; final ARFSRepository _arfsRepository; - final ArDriveCrypto _crypto; ProfileFileDownloadCubit({ required ARFSFileEntity file, required DriveDao driveDao, required ArweaveService arweave, - required ArDriveDownloader downloader, - required DownloadService downloadService, + required io.ArDriveMobileDownloader downloader, + required ArDriveDownloader arDriveDownloader, required ARFSRepository arfsRepository, required ArDriveCrypto crypto, }) : _driveDao = driveDao, _arweave = arweave, + _arDriveDownloader = arDriveDownloader, _file = file, _downloader = downloader, - _downloadService = downloadService, _arfsRepository = arfsRepository, - _crypto = crypto, super(FileDownloadStarting()); Future download(SecretKey? cipherKey) async { @@ -78,6 +76,7 @@ class ProfileFileDownloadCubit extends FileDownloadCubit { final stream = _downloader.downloadFile( '${_arweave.client.api.gatewayUrl.origin}/${_file.txId}', _file.name, + _file.contentType, ); await for (int progress in stream) { @@ -90,6 +89,8 @@ class ProfileFileDownloadCubit extends FileDownloadCubit { fileName: _file.name, progress: progress, fileSize: _file.size, + contentType: _file.contentType ?? + lookupMimeTypeWithDefaultType(_file.name), ), ); _downloadProgress.sink.add(FileDownloadProgress(progress / 100)); @@ -119,25 +120,16 @@ class ProfileFileDownloadCubit extends FileDownloadCubit { ), ); - final dataBytes = await _downloadService.download( - _file.txId, _file.contentType == constants.ContentType.manifest); + logger + .d('Downloading file ${_file.name} and dataTxId is ${_file.dataTxId}'); + + String? cipher; + String? cipherIvTag; + SecretKey? fileKey; if (drive.drivePrivacy == DrivePrivacy.private) { SecretKey? driveKey; - final isPinFile = _file.pinnedDataOwnerAddress != null; - if (isPinFile) { - emit( - FileDownloadSuccess( - bytes: dataBytes, - fileName: _file.name, - mimeType: _file.contentType ?? lookupMimeType(_file.name), - lastModified: _file.lastModifiedDate, - ), - ); - return; - } - if (cipherKey != null) { driveKey = await _driveDao.getDriveKey( drive.driveId, @@ -146,41 +138,58 @@ class ProfileFileDownloadCubit extends FileDownloadCubit { } else { driveKey = await _driveDao.getDriveKeyFromMemory(_file.driveId); } - if (driveKey == null) { throw StateError('Drive Key not found'); } + fileKey = await _driveDao.getFileKey(_file.id, driveKey); - final fileKey = await _driveDao.getFileKey(_file.id, driveKey); final dataTx = await (_arweave.getTransactionDetails(_file.txId)); - if (dataTx != null) { - final decryptedData = await _crypto.decryptTransactionData( - dataTx, - dataBytes, - fileKey, - ); + if (dataTx == null) { + throw StateError('Data transaction not found'); + } - emit( - FileDownloadSuccess( - bytes: decryptedData, - fileName: _file.name, - mimeType: _file.contentType ?? lookupMimeType(_file.name), - lastModified: _file.lastModifiedDate, - ), - ); + cipher = dataTx.getTag(EntityTag.cipher); + cipherIvTag = dataTx.getTag(EntityTag.cipherIv); + } + + final downloadStream = _arDriveDownloader.downloadFile( + dataTx: _file.txId, + fileName: _file.name, + fileSize: _file.size, + lastModifiedDate: _file.lastModifiedDate, + contentType: + _file.contentType ?? lookupMimeTypeWithDefaultType(_file.name), + cipher: cipher, + cipherIvString: cipherIvTag, + fileKey: fileKey, + ); + + await for (var progress in downloadStream) { + if (state is FileDownloadAborted) { + return; + } + + if (progress == 100) { + emit(FileDownloadFinishedWithSuccess(fileName: _file.name)); return; } + + logger.d('Download progress: $progress'); + + emit( + FileDownloadWithProgress( + fileName: _file.name, + progress: progress.toInt(), + fileSize: _file.size, + contentType: + _file.contentType ?? lookupMimeTypeWithDefaultType(_file.name), + ), + ); + _downloadProgress.sink.add(FileDownloadProgress(progress / 100)); } - emit( - FileDownloadSuccess( - bytes: dataBytes, - fileName: _file.name, - mimeType: _file.contentType ?? lookupMimeType(_file.name), - lastModified: _file.lastModifiedDate, - ), - ); + emit(FileDownloadFinishedWithSuccess(fileName: _file.name)); } @visibleForTesting diff --git a/lib/blocs/file_download/shared_file_download_cubit.dart b/lib/blocs/file_download/shared_file_download_cubit.dart index aabb20ed40..e0a4fc4a90 100644 --- a/lib/blocs/file_download/shared_file_download_cubit.dart +++ b/lib/blocs/file_download/shared_file_download_cubit.dart @@ -47,7 +47,7 @@ class SharedFileDownloadCubit extends FileDownloadCubit { FileDownloadSuccess( bytes: dataRes.data, fileName: revision.name, - mimeType: revision.contentType ?? lookupMimeType(revision.name), + mimeType: revision.contentType ?? io.lookupMimeType(revision.name), lastModified: revision.lastModifiedDate, ), ); @@ -57,7 +57,7 @@ class SharedFileDownloadCubit extends FileDownloadCubit { final dataTx = await (_arweave.getTransactionDetails(revision.dataTxId!)); if (dataTx != null) { - dataBytes = await _crypto.decryptTransactionData( + dataBytes = await _crypto.decryptDataFromTransaction( dataTx, dataRes.data, fileKey!, @@ -71,7 +71,7 @@ class SharedFileDownloadCubit extends FileDownloadCubit { FileDownloadSuccess( bytes: dataBytes, fileName: revision.name, - mimeType: revision.contentType ?? lookupMimeType(revision.name), + mimeType: revision.contentType ?? io.lookupMimeType(revision.name), lastModified: revision.lastModifiedDate, ), ); diff --git a/lib/blocs/file_share/file_share_cubit.dart b/lib/blocs/file_share/file_share_cubit.dart index 02a1136ffe..b680124d91 100644 --- a/lib/blocs/file_share/file_share_cubit.dart +++ b/lib/blocs/file_share/file_share_cubit.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:ardrive/blocs/blocs.dart'; -import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/utils/link_generators.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart'; @@ -51,7 +51,7 @@ class FileShareCubit extends Cubit { SecretKey? fileKey; switch (drive.privacy) { - case DrivePrivacy.private: + case DrivePrivacyTag.private: final profile = _profileCubit.state; SecretKey? driveKey; @@ -73,7 +73,7 @@ class FileShareCubit extends Cubit { ); break; - case DrivePrivacy.public: + case DrivePrivacyTag.public: fileShareLink = generatePublicFileShareLink(fileId: file.id); break; default: diff --git a/lib/blocs/fs_entry_preview/fs_entry_preview_cubit.dart b/lib/blocs/fs_entry_preview/fs_entry_preview_cubit.dart index 4e01584c74..e614a8bc10 100644 --- a/lib/blocs/fs_entry_preview/fs_entry_preview_cubit.dart +++ b/lib/blocs/fs_entry_preview/fs_entry_preview_cubit.dart @@ -2,13 +2,13 @@ import 'dart:async'; import 'package:ardrive/blocs/profile/profile_cubit.dart'; import 'package:ardrive/core/crypto/crypto.dart'; -import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/pages/pages.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/utils/constants.dart'; import 'package:ardrive/utils/mime_lookup.dart'; import 'package:ardrive_http/ardrive_http.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:drift/drift.dart'; import 'package:equatable/equatable.dart'; @@ -134,7 +134,7 @@ class FsEntryPreviewCubit extends Cubit { } try { - final decodedBytes = await _crypto.decryptTransactionData( + final decodedBytes = await _crypto.decryptDataFromTransaction( dataTx, dataRes.data, _fileKey!, @@ -276,12 +276,12 @@ class FsEntryPreviewCubit extends Cubit { final drive = await _driveDao.driveById(driveId: driveId).getSingle(); switch (drive.privacy) { - case DrivePrivacy.public: + case DrivePrivacyTag.public: emit( FsEntryPreviewImage(imageBytes: dataBytes, previewUrl: dataUrl), ); break; - case DrivePrivacy.private: + case DrivePrivacyTag.private: final profile = _profileCubit.state; SecretKey? driveKey; @@ -308,7 +308,7 @@ class FsEntryPreviewCubit extends Cubit { } final fileKey = await _driveDao.getFileKey(file.id, driveKey); - final decodedBytes = await _crypto.decryptTransactionData( + final decodedBytes = await _crypto.decryptDataFromTransaction( dataTx, dataBytes, fileKey, diff --git a/lib/blocs/pin_file/pin_file_bloc.dart b/lib/blocs/pin_file/pin_file_bloc.dart index 257fdffb0a..9257cb8538 100644 --- a/lib/blocs/pin_file/pin_file_bloc.dart +++ b/lib/blocs/pin_file/pin_file_bloc.dart @@ -3,13 +3,14 @@ import 'dart:async'; import 'package:ardrive/blocs/blocs.dart'; import 'package:ardrive/core/arfs/entities/arfs_entities.dart'; import 'package:ardrive/core/crypto/crypto.dart'; -import 'package:ardrive/entities/entities.dart' show EntityTag, FileEntity; +import 'package:ardrive/entities/entities.dart' show FileEntity; import 'package:ardrive/entities/string_types.dart'; import 'package:ardrive/misc/misc.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/turbo/services/upload_service.dart'; import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; diff --git a/lib/blocs/profile/profile_cubit.dart b/lib/blocs/profile/profile_cubit.dart index f9d4919d6d..e4b21f204d 100644 --- a/lib/blocs/profile/profile_cubit.dart +++ b/lib/blocs/profile/profile_cubit.dart @@ -5,8 +5,8 @@ import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/arconnect/arconnect_wallet.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/turbo/services/upload_service.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:cryptography/cryptography.dart'; import 'package:equatable/equatable.dart'; diff --git a/lib/blocs/profile_add/profile_add_cubit.dart b/lib/blocs/profile_add/profile_add_cubit.dart index eec59b71e3..ec32a4e236 100644 --- a/lib/blocs/profile_add/profile_add_cubit.dart +++ b/lib/blocs/profile_add/profile_add_cubit.dart @@ -7,10 +7,10 @@ import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/arconnect/arconnect_wallet.dart'; import 'package:ardrive/services/authentication/biometric_authentication.dart'; import 'package:ardrive/services/services.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/constants.dart'; import 'package:ardrive/utils/key_value_store.dart'; import 'package:ardrive/utils/secure_key_value_store.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; @@ -168,7 +168,7 @@ class ProfileAddCubit extends Cubit { final String password = form.control('password').value; final privateDriveTxs = _driveTxs.where( - (tx) => tx.getTag(EntityTag.drivePrivacy) == DrivePrivacy.private); + (tx) => tx.getTag(EntityTag.drivePrivacy) == DrivePrivacyTag.private); // Try and decrypt one of the user's private drive entities to check if they are entering the // right password. diff --git a/lib/blocs/shared_file/shared_file_cubit.dart b/lib/blocs/shared_file/shared_file_cubit.dart index d9745a5eb8..67181ed8e5 100644 --- a/lib/blocs/shared_file/shared_file_cubit.dart +++ b/lib/blocs/shared_file/shared_file_cubit.dart @@ -4,6 +4,7 @@ import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/open_url.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:equatable/equatable.dart'; @@ -83,7 +84,7 @@ class SharedFileCubit extends Cubit { Future loadFileDetails(SecretKey? fileKey) async { emit(SharedFileLoadInProgress()); final privacy = await _arweave.getFilePrivacyForId(fileId); - if (fileKey == null && privacy == DrivePrivacy.private) { + if (fileKey == null && privacy == DrivePrivacyTag.private) { emit(SharedFileIsPrivate()); return; } diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index 53dc11a1d7..3f9709d360 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -17,6 +17,7 @@ import 'package:ardrive/utils/snapshots/height_range.dart'; import 'package:ardrive/utils/snapshots/range.dart'; import 'package:ardrive/utils/snapshots/snapshot_drive_history.dart'; import 'package:ardrive/utils/snapshots/snapshot_item.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:drift/drift.dart'; import 'package:equatable/equatable.dart'; @@ -24,8 +25,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:retry/retry.dart'; -import '../../utils/html/html_util.dart'; - part 'sync_progress.dart'; part 'sync_state.dart'; part 'utils/add_drive_entity_revisions.dart'; diff --git a/lib/blocs/upload/limits.dart b/lib/blocs/upload/limits.dart index 017174a6e7..e6efa9d72a 100644 --- a/lib/blocs/upload/limits.dart +++ b/lib/blocs/upload/limits.dart @@ -1,16 +1,16 @@ import 'package:ardrive/utils/data_size.dart'; import 'package:flutter/foundation.dart'; -final privateFileSizeLimit = const MiB(100).size; +final privateFileSizeLimit = const MiB(100000).size; -final mobilePrivateFileSizeLimit = const GiB(1).size; +final mobilePrivateFileSizeLimit = const GiB(10).size; final publicFileSafeSizeLimit = const GiB(5).size; final bundleSizeLimit = kIsWeb ? webBundleSizeLimit : mobileBundleSizeLimit; -final webBundleSizeLimit = const MiB(480).size; -final mobileBundleSizeLimit = const MiB(200).size; +final webBundleSizeLimit = const MiB(65000).size; +final mobileBundleSizeLimit = const MiB(65000).size; const maxBundleDataItemCount = 500; const maxFilesPerBundle = maxBundleDataItemCount ~/ 2; const maxFilesSizePerBundleUsingTurbo = 1; diff --git a/lib/blocs/upload/upload_cubit.dart b/lib/blocs/upload/upload_cubit.dart index 6a6f685f6c..e94fbac76c 100644 --- a/lib/blocs/upload/upload_cubit.dart +++ b/lib/blocs/upload/upload_cubit.dart @@ -7,14 +7,18 @@ import 'package:ardrive/blocs/upload/models/models.dart'; import 'package:ardrive/blocs/upload/upload_file_checker.dart'; import 'package:ardrive/core/upload/cost_calculator.dart'; import 'package:ardrive/core/upload/uploader.dart'; +import 'package:ardrive/entities/file_entity.dart'; +import 'package:ardrive/entities/folder_entity.dart'; +import 'package:ardrive/main.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/turbo/services/upload_service.dart'; import 'package:ardrive/turbo/utils/utils.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/upload_plan_utils.dart'; import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_uploader/ardrive_uploader.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -79,6 +83,7 @@ class UploadCubit extends Cubit { } List files = []; + IOFolder? folder; Map foldersByPath = {}; /// Map of conflicting file ids keyed by their file names. @@ -99,6 +104,7 @@ class UploadCubit extends Cubit { required UploadFileChecker uploadFileChecker, required ArDriveAuth auth, required ArDriveUploadPreparationManager arDriveUploadManager, + this.folder, this.uploadFolders = false, }) : _profileCubit = profileCubit, _uploadFileChecker = uploadFileChecker, @@ -450,6 +456,20 @@ class UploadCubit extends Cubit { logger.i( 'Wallet verified. Starting bundle preparation.... Number of bundles: ${uploadPlanForAr.bundleUploadHandles.length}. Number of V2 files: ${uploadPlanForAr.fileV2UploadHandles.length}'); + if (configService.config.useNewUploader) { + logger.i('Uploading folder using the new uploader'); + + if (uploadFolders) { + await _uploadFolderUsingArDriveUploader(); + return; + } + + await _uploadUsingArDriveUploader(); + + return; + } + + logger.i('Uploading using the old uploader'); final uploader = _getUploader(); await for (final progress in uploader.uploadFromHandles( @@ -471,67 +491,421 @@ class UploadCubit extends Cubit { emit(UploadComplete()); } - Future skipLargeFilesAndCheckForConflicts() async { - emit(UploadPreparationInProgress()); - final List filesToSkip = await _uploadFileChecker - .checkAndReturnFilesAbovePrivateLimit(files: files); + Future _uploadFolderUsingArDriveUploader() async { + final ardriveUploader = ArDriveUploader( + turboUploadUri: Uri.parse(configService.config.defaultTurboUploadUrl!), + metadataGenerator: ARFSUploadMetadataGenerator( + tagsGenerator: ARFSTagsGenetator( + appInfoServices: AppInfoServices(), + ), + ), + ); - files.removeWhere( - (file) => filesToSkip.contains(file.getIdentifier()), + final private = _targetDrive.isPrivate; + final driveKey = private + ? await _driveDao.getDriveKey( + _targetDrive.id, _auth.currentUser.cipherKey) + : null; + + List<(ARFSUploadMetadataArgs, IOEntity)> entities = []; + + for (var folder in foldersByPath.values) { + final folderMetadata = ARFSUploadMetadataArgs( + isPrivate: _targetDrive.isPrivate, + driveId: _targetDrive.id, + parentFolderId: folder.parentFolderId, + privacy: _targetDrive.isPrivate ? 'private' : 'public', + entityId: folder.id, + ); + + entities.add(( + folderMetadata, + UploadFolder( + lastModifiedDate: DateTime.now(), + name: folder.name, + path: folder.path, + ), + )); + } + + for (var file in files) { + final id = conflictingFiles.containsKey(file.getIdentifier()) + ? conflictingFiles[file.getIdentifier()] + : null; + logger.d('File id: $id'); + logger.d( + 'Reusing id? ${conflictingFiles.containsKey(file.getIdentifier())}'); + final fileMetadata = ARFSUploadMetadataArgs( + isPrivate: _targetDrive.isPrivate, + driveId: _targetDrive.id, + parentFolderId: file.parentFolderId, + privacy: _targetDrive.isPrivate ? 'private' : 'public', + entityId: id, + ); + + entities.add((fileMetadata, file.ioFile)); + } + + final uploadController = await ardriveUploader.uploadEntities( + entities: entities, + wallet: _auth.currentUser.wallet, + type: + _uploadMethod == UploadMethod.ar ? UploadType.d2n : UploadType.turbo, + driveKey: driveKey, ); - await checkConflicts(); - } + uploadController.onError((tasks) { + logger.e('Error uploading', tasks); + addError(Exception('Error uploading')); + hasEmittedError = true; + }); - void _removeFilesWithFileNameConflicts() { - files.removeWhere( - (file) => conflictingFiles.containsKey(file.getIdentifier()), + uploadController.onProgressChange( + (progress) { + emit( + UploadInProgressUsingNewUploader( + totalProgress: progress.progress, + equatableBust: UniqueKey(), + progress: progress, + controller: uploadController, + ), + ); + }, + ); + + uploadController.onDone( + (tasks) async { + logger.d('Upload finished'); + + try { + final List foldersMetadata = []; + final List filesMetadata = []; + + for (var metadata + in tasks.expand((element) => element.content ?? [])) { + if (metadata is ARFSFolderUploadMetatadata) { + foldersMetadata.add(metadata); + } else if (metadata is ARFSFileUploadMetadata) { + filesMetadata.add(metadata); + } + } + + for (var metadata in foldersMetadata) { + final revisionAction = conflictingFolders.contains(metadata.name) + ? RevisionAction.uploadNewVersion + : RevisionAction.create; + + final entity = FolderEntity( + driveId: metadata.driveId, + id: metadata.id, + name: metadata.name, + parentFolderId: metadata.parentFolderId, + ); + + if (metadata.metadataTxId == null) { + logger.e('Metadata tx id is null'); + throw Exception('Metadata tx id is null'); + } + + entity.txId = metadata.metadataTxId!; + + final folderPath = foldersByPath.values + .firstWhere((element) => + element.name == metadata.name && + element.parentFolderId == metadata.parentFolderId) + .path; + + await _driveDao.transaction(() async { + await _driveDao.createFolder( + driveId: _targetDrive.id, + parentFolderId: metadata.parentFolderId, + folderName: metadata.name, + path: folderPath, + folderId: metadata.id, + ); + await _driveDao.insertFolderRevision( + entity.toRevisionCompanion( + performedAction: revisionAction, + ), + ); + }); + } + + logger.d('Files metadata: ${filesMetadata.length}'); + + for (var file in filesMetadata) { + final revisionAction = conflictingFiles.values.contains(file.id) + ? RevisionAction.uploadNewVersion + : RevisionAction.create; + + logger.d('File id: ${file.id}'); + logger + .d('Reusing id? ${conflictingFiles.values.contains(file.id)}'); + + final entity = FileEntity( + dataContentType: file.dataContentType, + dataTxId: file.dataTxId, + driveId: file.driveId, + id: file.id, + lastModifiedDate: file.lastModifiedDate, + name: file.name, + parentFolderId: file.parentFolderId, + size: file.size, + ); + + if (file.metadataTxId == null) { + logger.e('Metadata tx id is null'); + throw Exception('Metadata tx id is null'); + } + + entity.txId = file.metadataTxId!; + + try { + files.first.getIdentifier(); + // If path is a blob from drag and drop, use file name. Else use the path field from folder upload + // TODO: Changed this logic. PLEASE REVIEW IT. + if (revisionAction == RevisionAction.uploadNewVersion) { + final existingFile = await _driveDao + .fileById(driveId: driveId, fileId: file.id) + .getSingle(); + + final filePath = existingFile.path; + await _driveDao.writeFileEntity(entity, filePath); + await _driveDao.insertFileRevision( + entity.toRevisionCompanion( + performedAction: revisionAction, + ), + ); + } else { + logger.d(files.first.getIdentifier()); + final parentFolderPath = (await _driveDao + .folderById( + driveId: driveId, folderId: file.parentFolderId) + .getSingle()) + .path; + await _driveDao.writeFileEntity(entity, parentFolderPath); + await _driveDao.insertFileRevision( + entity.toRevisionCompanion( + performedAction: revisionAction, + ), + ); + } + } catch (e) { + logger.e('Error saving file', e); + } + } + } catch (e) { + logger.e('Error saving folder', e); + } + emit(UploadComplete()); + + unawaited(_profileCubit.refreshBalance()); + }, ); } - void _removeFilesWithFolderNameConflicts() { - files.removeWhere((file) => conflictingFolders.contains(file.ioFile.name)); + void retryUploads(UploadController controller) { + controller.retryFailedTasks(_auth.currentUser.wallet); } - Future verifyFilesAboveWarningLimit() async { - if (!_targetDrive.isPrivate) { - bool fileAboveWarningLimit = - await _uploadFileChecker.hasFileAboveSafePublicSizeLimit( - files: files, - ); + void retryTask(UploadController controller, UploadTask task) { + controller.retryTask(task, _auth.currentUser.wallet); + } - if (fileAboveWarningLimit) { - emit(UploadShowingWarning(reason: UploadWarningReason.fileTooLarge)); + Future _uploadUsingArDriveUploader() async { + final ardriveUploader = ArDriveUploader( + turboUploadUri: Uri.parse(configService.config.defaultTurboUploadUrl!), + metadataGenerator: ARFSUploadMetadataGenerator( + tagsGenerator: ARFSTagsGenetator( + appInfoServices: AppInfoServices(), + ), + ), + ); - return; - } - await prepareUploadPlanAndCostEstimates(); + final private = _targetDrive.isPrivate; + final driveKey = private + ? await _driveDao.getDriveKey( + _targetDrive.id, _auth.currentUser.cipherKey) + : null; + + List<(ARFSUploadMetadataArgs, IOFile)> uploadFiles = []; + + for (var file in files) { + final revisionAction = conflictingFiles.containsKey(file.getIdentifier()) + ? RevisionAction.uploadNewVersion + : RevisionAction.create; + + final args = ARFSUploadMetadataArgs( + isPrivate: _targetDrive.isPrivate, + driveId: _targetDrive.id, + parentFolderId: _targetFolder.id, + privacy: _targetDrive.isPrivate ? 'private' : 'public', + entityId: revisionAction == RevisionAction.uploadNewVersion + ? conflictingFiles[file.getIdentifier()] + : null, + ); + + uploadFiles.add((args, file.ioFile)); } - checkFilesAboveLimit(); - } + /// Creates the uploader and starts the upload. + final uploadController = await ardriveUploader.uploadFiles( + files: uploadFiles, + wallet: _auth.currentUser.wallet, + driveKey: driveKey, + type: + _uploadMethod == UploadMethod.ar ? UploadType.d2n : UploadType.turbo, + ); - @visibleForTesting - bool isPrivateForTesting = false; + List completedTasks = []; - bool _isAPrivateUpload() { - return isPrivateForTesting || _targetDrive.isPrivate; + uploadController.onError((tasks) { + logger.e('Error uploading', tasks); + addError(Exception('Error uploading')); + hasEmittedError = true; + }); + + uploadController.onProgressChange( + (progress) { + final newCompletedTasks = progress.task.where( + (element) => + element.status == UploadStatus.complete && + !completedTasks.contains(element), + ); + + for (var element in newCompletedTasks) { + completedTasks.add(element); + // TODO: Save as the file is finished the upload + // _saveEntityOnDB(element); + for (var metadata in element.content!) { + logger.d(metadata.metadataTxId ?? 'METADATA IS NULL'); + } + } + + emit( + UploadInProgressUsingNewUploader( + progress: progress, + totalProgress: progress.progress, + controller: uploadController, + equatableBust: UniqueKey(), + ), + ); + }, + ); + + uploadController.onDone( + (tasks) async { + if (tasks.any((element) => element.status == UploadStatus.failed)) { + final progress = state as UploadInProgressUsingNewUploader; + emit( + UploadInProgressUsingNewUploader( + progress: progress.progress, + totalProgress: progress.progress.progress, + controller: uploadController, + equatableBust: UniqueKey(), + ), + ); + return; + } + + for (var task in tasks) { + await _saveEntityOnDB(task); + } + + unawaited(_profileCubit.refreshBalance()); + }, + ); } - @override - void onError(Object error, StackTrace stackTrace) { - if (error is TurboUploadTimeoutException) { - emit(UploadFailure(error: UploadErrors.turboTimeout)); + Future _saveEntityOnDB(UploadTask task) async { + // Single file only + // TODO: abstract to the database interface. + // TODO: improve API for finishing a file upload. + final metadatas = task.content; + + if (metadatas != null) { + for (var metadata in metadatas) { + if (metadata is ARFSFileUploadMetadata) { + final fileMetadata = metadata; + + final revisionAction = conflictingFiles.containsKey(fileMetadata.name) + ? RevisionAction.uploadNewVersion + : RevisionAction.create; + + final entity = FileEntity( + dataContentType: fileMetadata.dataContentType, + dataTxId: fileMetadata.dataTxId, + driveId: fileMetadata.driveId, + id: fileMetadata.id, + lastModifiedDate: fileMetadata.lastModifiedDate, + name: fileMetadata.name, + parentFolderId: fileMetadata.parentFolderId, + size: fileMetadata.size, + // TODO: pinnedDataOwnerAddress + ); + + if (fileMetadata.metadataTxId == null) { + logger.e('Metadata tx id is null'); + throw Exception('Metadata tx id is null'); + } + + entity.txId = fileMetadata.metadataTxId!; + + await _driveDao.transaction(() async { + // If path is a blob from drag and drop, use file name. Else use the path field from folder upload + // TODO: Changed this logic. PLEASE REVIEW IT. + final filePath = '${_targetFolder.path}/${metadata.name}'; + logger.d('File path: $filePath'); + await _driveDao.writeFileEntity(entity, filePath); + await _driveDao.insertFileRevision( + entity.toRevisionCompanion( + performedAction: revisionAction, + ), + ); + }); + } else if (metadata is ARFSFolderUploadMetatadata) { + final folderMetadata = metadata; + + final revisionAction = + conflictingFolders.contains(folderMetadata.name) + ? RevisionAction.uploadNewVersion + : RevisionAction.create; + + final entity = FolderEntity( + driveId: folderMetadata.driveId, + id: folderMetadata.id, + name: folderMetadata.name, + parentFolderId: folderMetadata.parentFolderId, + ); + + await _driveDao.transaction(() async { + final id = await _driveDao.createFolder( + driveId: _targetDrive.id, + parentFolderId: folderMetadata.parentFolderId, + folderName: folderMetadata.name, + path: '${_targetFolder.path}/${metadata.name}', + folderId: folderMetadata.id, + ); + + logger.i('Folder created with id: $id'); + + entity.txId = metadata.metadataTxId!; + + await _driveDao.insertFolderRevision( + entity.toRevisionCompanion( + performedAction: revisionAction, + ), + ); + }); + } - return; + // all files are uploaded + emit(UploadComplete()); + } } - - emit(UploadFailure(error: UploadErrors.unknown)); - logger.e('Failed to upload file', error, stackTrace); - super.onError(error, stackTrace); } - ArDriveUploader _getUploader() { + ArDriveUploaderFromHandles _getUploader() { final wallet = _auth.currentUser.wallet; final turboUploader = TurboUploader(_turbo, wallet); @@ -548,7 +922,7 @@ class UploadCubit extends Cubit { final v2Uploader = FileV2Uploader(_arweave.client, _arweave); - final uploader = ArDriveUploader( + final uploader = ArDriveUploaderFromHandles( bundleUploader: bundleUploader, fileV2Uploader: v2Uploader, prepareBundle: (handle) async { @@ -598,4 +972,100 @@ class UploadCubit extends Cubit { return uploader; } + + Future skipLargeFilesAndCheckForConflicts() async { + emit(UploadPreparationInProgress()); + final List filesToSkip = await _uploadFileChecker + .checkAndReturnFilesAbovePrivateLimit(files: files); + + files.removeWhere( + (file) => filesToSkip.contains(file.getIdentifier()), + ); + + await checkConflicts(); + } + + void _removeFilesWithFileNameConflicts() { + files.removeWhere( + (file) => conflictingFiles.containsKey(file.getIdentifier()), + ); + } + + void _removeFilesWithFolderNameConflicts() { + files.removeWhere((file) => conflictingFolders.contains(file.ioFile.name)); + } + + Future verifyFilesAboveWarningLimit() async { + if (!_targetDrive.isPrivate) { + bool fileAboveWarningLimit = + await _uploadFileChecker.hasFileAboveSafePublicSizeLimit( + files: files, + ); + + if (fileAboveWarningLimit) { + emit(UploadShowingWarning(reason: UploadWarningReason.fileTooLarge)); + + return; + } + await prepareUploadPlanAndCostEstimates(); + } + + checkFilesAboveLimit(); + } + + @visibleForTesting + bool isPrivateForTesting = false; + + bool _isAPrivateUpload() { + return isPrivateForTesting || _targetDrive.isPrivate; + } + + @override + void onError(Object error, StackTrace stackTrace) { + if (error is TurboUploadTimeoutException) { + emit(UploadFailure(error: UploadErrors.turboTimeout)); + + return; + } + + emit(UploadFailure(error: UploadErrors.unknown)); + logger.e('Failed to upload file', error, stackTrace); + super.onError(error, stackTrace); + } +} + +class UploadFolder extends IOFolder { + UploadFolder({ + required this.name, + required this.path, + required this.lastModifiedDate, + }); + + @override + final DateTime lastModifiedDate; + + @override + Future> listContent() { + throw UnimplementedError(); + } + + @override + Future> listFiles() { + throw UnimplementedError(); + } + + @override + Future> listSubfolders() { + throw UnimplementedError(); + } + + @override + final String name; + + @override + // TODO: implement path + final String path; + + @override + List get props => [name, path, lastModifiedDate]; } diff --git a/lib/blocs/upload/upload_handles/bundle_upload_handle.dart b/lib/blocs/upload/upload_handles/bundle_upload_handle.dart index da84d5f336..7ad1e2cddb 100644 --- a/lib/blocs/upload/upload_handles/bundle_upload_handle.dart +++ b/lib/blocs/upload/upload_handles/bundle_upload_handle.dart @@ -1,14 +1,14 @@ +import 'package:arconnect/arconnect.dart'; import 'package:ardrive/blocs/upload/upload_handles/file_data_item_upload_handle.dart'; import 'package:ardrive/blocs/upload/upload_handles/folder_data_item_upload_handle.dart'; import 'package:ardrive/blocs/upload/upload_handles/upload_handle.dart'; -import 'package:ardrive/core/arconnect/safe_arconnect_action.dart'; import 'package:ardrive/core/upload/bundle_signer.dart'; import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/models/daos/daos.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/turbo/services/upload_service.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:flutter/foundation.dart'; @@ -157,6 +157,7 @@ class BundleUploadHandle implements UploadHandle { for (var folder in folderDataItemUploadHandles) { await folder.writeFolderToDatabase(driveDao: driveDao); } + for (var file in fileDataItemUploadHandles) { await file.writeFileEntityToDatabase( bundledInTxId: bundleId, diff --git a/lib/blocs/upload/upload_handles/file_data_item_upload_handle.dart b/lib/blocs/upload/upload_handles/file_data_item_upload_handle.dart index 7689817a08..4d834edbe2 100644 --- a/lib/blocs/upload/upload_handles/file_data_item_upload_handle.dart +++ b/lib/blocs/upload/upload_handles/file_data_item_upload_handle.dart @@ -7,6 +7,7 @@ import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/utils/bundles/fake_tags.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:arweave/utils.dart'; import 'package:cryptography/cryptography.dart'; diff --git a/lib/blocs/upload/upload_handles/folder_data_item_upload_handle.dart b/lib/blocs/upload/upload_handles/folder_data_item_upload_handle.dart index 28a579a0c0..f76c145790 100644 --- a/lib/blocs/upload/upload_handles/folder_data_item_upload_handle.dart +++ b/lib/blocs/upload/upload_handles/folder_data_item_upload_handle.dart @@ -65,6 +65,7 @@ class FolderDataItemUploadHandle implements UploadHandle, DataItemHandle { wallet, key: driveKey, ); + await folderEntityTx.sign(wallet); } diff --git a/lib/blocs/upload/upload_state.dart b/lib/blocs/upload/upload_state.dart index d3096eeea8..06e4a419e4 100644 --- a/lib/blocs/upload/upload_state.dart +++ b/lib/blocs/upload/upload_state.dart @@ -207,6 +207,23 @@ class UploadInProgress extends UploadState { List get props => [uploadPlan, _equatableBust]; } +class UploadInProgressUsingNewUploader extends UploadState { + final UploadProgress progress; + final UploadController controller; + final double totalProgress; + final Key? equatableBust; + + UploadInProgressUsingNewUploader({ + required this.progress, + required this.totalProgress, + required this.controller, + this.equatableBust, + }); + + @override + List get props => [progress, totalProgress, equatableBust]; +} + class UploadFailure extends UploadState { final UploadErrors error; diff --git a/lib/components/create_snapshot_dialog.dart b/lib/components/create_snapshot_dialog.dart index 1203565c16..509a1f1d20 100644 --- a/lib/components/create_snapshot_dialog.dart +++ b/lib/components/create_snapshot_dialog.dart @@ -14,10 +14,10 @@ import 'package:ardrive/turbo/services/upload_service.dart'; import 'package:ardrive/turbo/turbo.dart'; import 'package:ardrive/utils/app_localizations_wrapper.dart'; import 'package:ardrive/utils/filesize.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/split_localizations.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/components/details_panel.dart b/lib/components/details_panel.dart index ae8d305c54..cfb587e41d 100644 --- a/lib/components/details_panel.dart +++ b/lib/components/details_panel.dart @@ -17,13 +17,13 @@ import 'package:ardrive/pages/drive_detail/components/hover_widget.dart'; import 'package:ardrive/pages/pages.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/utils/app_localizations_wrapper.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/filesize.dart'; import 'package:ardrive/utils/num_to_string_parsers.dart'; import 'package:ardrive/utils/open_url.dart'; import 'package:ardrive/utils/size_constants.dart'; import 'package:ardrive/utils/user_utils.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/lib/components/file_download_dialog.dart b/lib/components/file_download_dialog.dart index 16c3b6d4f1..3d86337058 100644 --- a/lib/components/file_download_dialog.dart +++ b/lib/components/file_download_dialog.dart @@ -1,12 +1,12 @@ import 'dart:async'; import 'package:ardrive/blocs/blocs.dart'; -import 'package:ardrive/components/progress_bar.dart'; import 'package:ardrive/core/arfs/entities/arfs_entities.dart'; import 'package:ardrive/core/arfs/repository/arfs_repository.dart'; import 'package:ardrive/core/crypto/crypto.dart'; -import 'package:ardrive/core/download_service.dart'; +import 'package:ardrive/download/ardrive_downloader.dart'; import 'package:ardrive/models/models.dart'; +import 'package:ardrive/pages/drive_detail/components/drive_explorer_item_tile.dart'; import 'package:ardrive/pages/pages.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/theme/theme.dart'; @@ -36,8 +36,9 @@ Future promptToDownloadProfileFile({ context.read(), ARFSFactory(), ), - downloadService: DownloadService(arweave), - downloader: ArDriveDownloader(), + arDriveDownloader: ArDriveDownloader( + ardriveIo: ArDriveIO(), ioFileAdapter: IOFileAdapter()), + downloader: ArDriveMobileDownloader(), file: arfsFile, driveDao: context.read(), arweave: arweave, @@ -70,8 +71,9 @@ Future promptToDownloadFileRevision({ context.read(), ARFSFactory(), ), - downloadService: DownloadService(arweave), - downloader: ArDriveDownloader(), + arDriveDownloader: ArDriveDownloader( + ardriveIo: ArDriveIO(), ioFileAdapter: IOFileAdapter()), + downloader: ArDriveMobileDownloader(), file: arfsFile, driveDao: context.read(), arweave: arweave, @@ -278,27 +280,95 @@ class FileDownloadDialog extends StatelessWidget { ArDriveStandardModal _downloadingFileWithProgressDialog( BuildContext context, FileDownloadWithProgress state) { + final progressText = + '${filesize(((state.fileSize) * (state.progress / 100)).ceil())}/${filesize(state.fileSize)}'; return _modalWrapper( title: appLocalizationsOf(context).downloadingFile, child: SizedBox( - width: kMediumDialogWidth, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ListTile( - contentPadding: EdgeInsets.zero, - title: Text( - state.fileName, - ), - subtitle: Text( - '${filesize((state.fileSize * (state.progress / 100)).round())} / ${filesize(state.fileSize)}'), + width: kLargeDialogWidth, + child: Column(mainAxisSize: MainAxisSize.min, children: [ + ListTile( + contentPadding: EdgeInsets.zero, + leading: getIconForContentType( + state.contentType, + size: 24, ), - ProgressBar( - percentage: (context.read() - as ProfileFileDownloadCubit) - .downloadProgress) - ], - ), + title: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Flexible( + flex: 1, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + state.fileName, + style: ArDriveTypography.body.bodyBold( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgDefault, + ), + ), + AnimatedSwitcher( + duration: const Duration(seconds: 1), + child: Text( + 'Downloading', + style: ArDriveTypography.body.buttonNormalBold( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgOnDisabled, + ), + ), + ), + Text( + progressText, + style: ArDriveTypography.body.buttonNormalRegular( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgOnDisabled, + ), + ), + ], + ), + ), + ], + ), + ), + Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + children: [ + Expanded( + flex: 2, + child: ArDriveProgressBar( + height: 4, + indicatorColor: state.progress == 100 + ? ArDriveTheme.of(context) + .themeData + .colors + .themeSuccessDefault + : ArDriveTheme.of(context) + .themeData + .colors + .themeFgDefault, + percentage: state.progress / 100, + ), + ), + Text( + '${(state.progress).toInt()}%', + style: ArDriveTypography.body.buttonNormalBold( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgDefault, + ), + ), + ], + ), + ]), ), actions: [ ModalAction( diff --git a/lib/components/file_picker_modal.dart b/lib/components/file_picker_modal.dart index 69d02fe258..54d1d407d8 100644 --- a/lib/components/file_picker_modal.dart +++ b/lib/components/file_picker_modal.dart @@ -107,6 +107,7 @@ class __FilePickerContentState extends State<_FilePickerContent> { widget.onClose(content); } catch (e) { if (e is FileSystemPermissionDeniedException) { + // ignore: use_build_context_synchronously await _showCameraPermissionModal(context); logger.e('Camera permission denied', e); } @@ -217,6 +218,7 @@ Future verifyStoragePermissionAndShowModalWhenDenied( await verifyStoragePermission(); } catch (e) { if (e is FileSystemPermissionDeniedException) { + // ignore: use_build_context_synchronously await showStoragePermissionModal(context); } return false; diff --git a/lib/components/keyboard_handler.dart b/lib/components/keyboard_handler.dart index 301711d04a..950bfe165d 100644 --- a/lib/components/keyboard_handler.dart +++ b/lib/components/keyboard_handler.dart @@ -2,8 +2,9 @@ import 'package:ardrive/blocs/blocs.dart'; import 'package:ardrive/dev_tools/app_dev_tools.dart'; import 'package:ardrive/dev_tools/shortcut_handler.dart'; import 'package:ardrive/services/config/config_service.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +// ignore: depend_on_referenced_packages import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/lib/components/side_bar.dart b/lib/components/side_bar.dart index cd4c974e87..37aab83cd9 100644 --- a/lib/components/side_bar.dart +++ b/lib/components/side_bar.dart @@ -8,12 +8,12 @@ import 'package:ardrive/misc/resources.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/pages/drive_detail/components/hover_widget.dart'; import 'package:ardrive/utils/app_localizations_wrapper.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/open_url.dart'; import 'package:ardrive/utils/show_general_dialog.dart'; import 'package:ardrive/utils/size_constants.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/components/upload_form.dart b/lib/components/upload_form.dart index a169b7c685..f218f6a711 100644 --- a/lib/components/upload_form.dart +++ b/lib/components/upload_form.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import 'package:ardrive/authentication/ardrive_auth.dart'; import 'package:ardrive/blocs/blocs.dart'; import 'package:ardrive/blocs/feedback_survey/feedback_survey_cubit.dart'; @@ -25,11 +27,13 @@ import 'package:ardrive/utils/show_general_dialog.dart'; import 'package:ardrive/utils/upload_plan_utils.dart'; import 'package:ardrive_io/ardrive_io.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_uploader/ardrive_uploader.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import '../blocs/upload/upload_handles/bundle_upload_handle.dart'; +import '../pages/drive_detail/components/drive_explorer_item_tile.dart'; Future promptToUpload( BuildContext context, { @@ -39,14 +43,15 @@ Future promptToUpload( }) async { final selectedFiles = []; final io = ArDriveIO(); + IOFolder? ioFolder; if (isFolderUpload) { - final ioFolder = await io.pickFolder(); + ioFolder = await io.pickFolder(); final ioFiles = await ioFolder.listFiles(); final uploadFiles = ioFiles.map((file) { return UploadFile( ioFile: file, parentFolderId: parentFolderId, - relativeTo: ioFolder.path.isEmpty ? null : getDirname(ioFolder.path), + relativeTo: ioFolder!.path.isEmpty ? null : getDirname(ioFolder.path), ); }).toList(); selectedFiles.addAll(uploadFiles); @@ -55,6 +60,7 @@ Future promptToUpload( // Open file picker on Web final ioFiles = kIsWeb ? await io.pickFiles(fileSource: FileSource.fileSystem) + // ignore: use_build_context_synchronously : await showMultipleFilesFilePickerModal(context); final uploadFiles = ioFiles @@ -71,6 +77,7 @@ Future promptToUpload( context, content: BlocProvider( create: (context) => UploadCubit( + folder: ioFolder, arDriveUploadManager: ArDriveUploadPreparationManager( uploadPreparePaymentOptions: UploadPaymentEvaluator( appConfig: context.read().config, @@ -137,6 +144,11 @@ class UploadForm extends StatefulWidget { class _UploadFormState extends State { final _scrollController = ScrollController(); + @override + initState() { + super.initState(); + } + @override Widget build(BuildContext context) => BlocConsumer( listener: (context, state) async { @@ -563,6 +575,8 @@ class _UploadFormState extends State { ), ), ); + } else if (state is UploadInProgressUsingNewUploader) { + return _uploadUsingNewUploader(state: state); } else if (state is UploadInProgress) { final numberOfFilesInBundles = state.uploadPlan.bundleUploadHandles.isNotEmpty @@ -748,4 +762,260 @@ class _UploadFormState extends State { return const SizedBox(); }, ); + + Widget _uploadUsingNewUploader({ + required UploadInProgressUsingNewUploader state, + }) { + final progress = state.progress; + return ArDriveStandardModal( + width: kLargeDialogWidth, + title: + '${appLocalizationsOf(context).uploadingNFiles(state.progress.getNumberOfItems())} ${(state.totalProgress * 100).toStringAsFixed(2)}%', + content: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: kLargeDialogWidth, + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 256 * 1.5), + child: Container( + padding: const EdgeInsets.all(8), + child: Scrollbar( + child: ListView.builder( + shrinkWrap: true, + itemCount: progress.task.length, + itemBuilder: (BuildContext context, int index) { + final task = progress.task[index]; + + String progressText; + String status = ''; + + switch (task.status) { + case UploadStatus.notStarted: + status = 'Not started'; + break; + case UploadStatus.inProgress: + status = 'In progress'; + break; + case UploadStatus.paused: + status = 'Paused'; + break; + case UploadStatus.bundling: + status = 'Bundling'; + break; + case UploadStatus.encryting: + status = 'Encrypting'; + break; + case UploadStatus.complete: + status = 'Complete'; + break; + case UploadStatus.failed: + status = 'Failed'; + break; + case UploadStatus.preparationDone: + status = 'Preparation done'; + break; + } + + if (task.isProgressAvailable) { + if (task.uploadItem != null) { + progressText = + '${filesize(((task.uploadItem!.size) * task.progress).ceil())}/${filesize(task.uploadItem!.size)}'; + } else { + progressText = 'Preparing...'; + } + } else { + progressText = + 'Your upload is in progress, but for large files the progress it not available. Please wait...'; + } + + return Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + if (task.content != null) + for (var file in task.content!) + ListTile( + leading: file is ARFSFileUploadMetadata + ? getIconForContentType( + file.dataContentType, + size: 24, + ) + : file is ARFSFolderUploadMetatadata + ? getIconForContentType( + 'folder', + size: 24, + ) + : null, + contentPadding: EdgeInsets.zero, + title: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Flexible( + flex: 1, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + file.name, + style: ArDriveTypography.body + .buttonNormalBold( + color: + ArDriveTheme.of(context) + .themeData + .colors + .themeFgDefault, + ) + .copyWith( + fontWeight: + FontWeight.bold), + ), + AnimatedSwitcher( + duration: + const Duration(seconds: 1), + child: Text( + status, + style: ArDriveTypography.body + .buttonNormalBold( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgOnDisabled, + ), + ), + ), + Text( + progressText, + style: ArDriveTypography.body + .buttonNormalRegular( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgOnDisabled, + ), + ), + ], + ), + ), + Flexible( + flex: 1, + child: Row( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + children: [ + Flexible( + flex: 2, + child: ArDriveProgressBar( + height: 4, + indicatorColor: task.status == + UploadStatus.failed + ? ArDriveTheme.of(context) + .themeData + .colors + .themeErrorDefault + : task.progress == 1 + ? ArDriveTheme.of(context) + .themeData + .colors + .themeSuccessDefault + : ArDriveTheme.of(context) + .themeData + .colors + .themeFgDefault, + percentage: task.progress, + ), + ), + Flexible( + child: Text( + '${(task.progress * 100).toInt()}%', + style: ArDriveTypography.body + .buttonNormalBold( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgDefault, + ), + ), + ), + const SizedBox( + width: 8, + ), + if (task.status == + UploadStatus.failed) + SizedBox( + height: 24, + child: ArDriveClickArea( + child: GestureDetector( + onTap: () { + context + .read() + .retryTask( + state.controller, + task, + ); + }, + child: ArDriveIcons.refresh(), + ), + ), + ) + ], + ), + ), + ], + ), + ), + Divider( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgSubtle + .withOpacity(0.5), + thickness: 0.5, + height: 8, + ) + ], + ); + }, + ), + ), + ), + ), + ), + const SizedBox( + height: 8, + ), + Text( + 'Total uploaded: ${filesize(state.progress.totalUploaded)} of ${filesize(state.progress.totalSize)}', + style: ArDriveTypography.body + .buttonNormalBold( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgDefault) + .copyWith(fontWeight: FontWeight.bold), + ), + Text( + 'Files uploaded: ${state.progress.tasksContentCompleted()} of ${state.progress.tasksContentLength()}', + style: ArDriveTypography.body + .buttonNormalBold( + color: ArDriveTheme.of(context) + .themeData + .colors + .themeFgDefault) + .copyWith(fontWeight: FontWeight.bold), + ), + Text( + 'Upload speed: ${filesize(state.progress.calculateUploadSpeed().toInt())}/s', + style: ArDriveTypography.body.buttonNormalBold( + color: + ArDriveTheme.of(context).themeData.colors.themeFgDefault), + ), + ], + ), + ); + } } diff --git a/lib/components/wallet_switch_dialog.dart b/lib/components/wallet_switch_dialog.dart index b418e31239..849db22a16 100644 --- a/lib/components/wallet_switch_dialog.dart +++ b/lib/components/wallet_switch_dialog.dart @@ -1,7 +1,7 @@ import 'package:ardrive/blocs/blocs.dart'; import 'package:ardrive/components/app_dialog.dart'; import 'package:ardrive/utils/app_localizations_wrapper.dart'; -import 'package:ardrive/utils/html/html_util.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/core/crypto/crypto.dart b/lib/core/crypto/crypto.dart index 0a31cc456d..561fe1959f 100644 --- a/lib/core/crypto/crypto.dart +++ b/lib/core/crypto/crypto.dart @@ -1,8 +1,11 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:ardrive/entities/entities.dart'; +import 'package:ardrive/entities/entity.dart'; import 'package:ardrive/services/services.dart'; +import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_crypto/ardrive_crypto.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:arweave/utils.dart' as utils; import 'package:cryptography/cryptography.dart' hide Cipher; @@ -22,6 +25,9 @@ final pbkdf2 = Pbkdf2( final hkdf = Hkdf(hmac: Hmac(sha256), outputLength: keyByteLength); +// TODO: Decouple this class from the TransactionCommonMixin, Transaction, and DataItem classes. +// and implement it on the `ardrive_crypto` package. + class ArDriveCrypto { Future deriveProfileKey(String password, [List? salt]) async { @@ -82,37 +88,67 @@ class ArDriveCrypto { Uint8List data, SecretKey key, ) async { - final decryptedData = await decryptTransactionData(transaction, data, key); - return json.decode(utf8.decode(decryptedData)); + try { + final cipher = transaction.getTag(EntityTag.cipher); + final cipherIvTag = transaction.getTag(EntityTag.cipherIv); + + logger.d('starting decryption'); + + if (cipher == null || cipherIvTag == null) { + throw TransactionDecryptionException(); + } + + logger.d('cipher: $cipher'); + + final cipherIv = utils.decodeBase64ToBytes(cipherIvTag); + + final keyData = Uint8List.fromList(await key.extractBytes()); + + final decryptedData = await decryptTransactionDataStream( + cipher, + cipherIv, + Stream.fromIterable([data]), + keyData, + data.length, + ); + + final bytes = await streamToUint8List(decryptedData); + logger.d('decryptedData: $bytes'); + + final jsonStr = utf8.decode(bytes); + + logger.d('json str: $jsonStr'); + + final jsonMap = json.decode(jsonStr); + + logger.d('json map: $jsonMap'); + + return jsonMap; + } catch (e) { + logger.e('Failed to decrypt entity json', e); + throw TransactionDecryptionException(); + } } - /// Decrypts the provided transaction details and data into a [Uint8List] using the provided key. + /// Decrypts the provided transaction details and data into JSON using the provided key. /// /// Throws a [TransactionDecryptionException] if decryption fails. - Future decryptTransactionData( + Future decryptDataFromTransaction( TransactionCommonMixin transaction, Uint8List data, SecretKey key, ) async { final cipher = transaction.getTag(EntityTag.cipher); + final cipherIvTag = transaction.getTag(EntityTag.cipherIv); - try { - if (cipher == Cipher.aes256) { - final cipherIv = - utils.decodeBase64ToBytes(transaction.getTag(EntityTag.cipherIv)!); - - return aesGcm - .decrypt( - secretBoxFromDataWithMacConcatenation(data, nonce: cipherIv), - secretKey: key, - ) - .then((res) => Uint8List.fromList(res)); - } - } on SecretBoxAuthenticationError catch (_) { + if (cipher == null || cipherIvTag == null) { throw TransactionDecryptionException(); } - throw ArgumentError(); + final decryptedData = + await decryptTransactionData(cipher, cipherIvTag, data, key); + + return decryptedData; } /// Creates a transaction with the provided entity's JSON data encrypted along with the appropriate cipher tags. @@ -128,6 +164,7 @@ class ArDriveCrypto { utf8.encode(json.encode(entity)) as Uint8List, key); /// Creates a [Transaction] with the provided data encrypted along with the appropriate cipher tags. + /// TODO: remove it as we won't use it anymore Future createEncryptedTransaction( Uint8List data, SecretKey key, @@ -138,7 +175,7 @@ class ArDriveCrypto { // The encrypted data should be a concatenation of the cipher text and MAC. data: encryptionRes.concatenation(nonce: false)) ..addTag(EntityTag.contentType, ContentType.octetStream) - ..addTag(EntityTag.cipher, Cipher.aes256) + ..addTag(EntityTag.cipher, Cipher.aes256gcm) ..addTag( EntityTag.cipherIv, utils.encodeBytesToBase64(encryptionRes.nonce), @@ -156,7 +193,7 @@ class ArDriveCrypto { // The encrypted data should be a concatenation of the cipher text and MAC. data: encryptionRes.concatenation(nonce: false)) ..addTag(EntityTag.contentType, ContentType.octetStream) - ..addTag(EntityTag.cipher, Cipher.aes256) + ..addTag(EntityTag.cipher, Cipher.aes256gcm) ..addTag( EntityTag.cipherIv, utils.encodeBytesToBase64(encryptionRes.nonce), @@ -172,3 +209,19 @@ class ProfileKeyDerivationResult { ProfileKeyDerivationResult(this.key, this.salt); } + +Future streamToUint8List(Stream stream) async { + List collectedData = await stream.toList(); + int totalLength = + collectedData.fold(0, (prev, element) => prev + element.length); + + final result = Uint8List(totalLength); + int offset = 0; + + for (var data in collectedData) { + result.setRange(offset, offset + data.length, data); + offset += data.length; + } + + return result; +} diff --git a/lib/core/download_service.dart b/lib/core/download_service.dart index 6de3e96dd9..a6f2a43537 100644 --- a/lib/core/download_service.dart +++ b/lib/core/download_service.dart @@ -2,9 +2,12 @@ import 'dart:typed_data'; import 'package:ardrive/services/arweave/arweave.dart'; import 'package:ardrive_http/ardrive_http.dart'; +import 'package:arweave/arweave.dart' as arweave; abstract class DownloadService { - Future download(String fileId, bool isManifest); + Future download(String fileTxId, bool isManifest); + Future>> downloadStream(String fileTxId, bool isManifest); + factory DownloadService(ArweaveService arweaveService) => _DownloadService(arweaveService); } @@ -28,4 +31,12 @@ class _DownloadService implements DownloadService { throw Exception('Download failed'); } + + @override + Future>> downloadStream( + String fileTxId, bool isManifest) async { + final downloadResponse = await arweave.download(txId: fileTxId); + + return downloadResponse.$1; + } } diff --git a/lib/core/upload/bundle_signer.dart b/lib/core/upload/bundle_signer.dart index 6aa50e6aa7..567995ce19 100644 --- a/lib/core/upload/bundle_signer.dart +++ b/lib/core/upload/bundle_signer.dart @@ -1,8 +1,8 @@ -import 'package:ardrive/core/arconnect/safe_arconnect_action.dart'; +import 'package:arconnect/arconnect.dart'; import 'package:ardrive/services/arweave/arweave_service.dart'; import 'package:ardrive/services/pst/pst.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; abstract class BundleSigner { diff --git a/lib/core/upload/transaction_signer.dart b/lib/core/upload/transaction_signer.dart index af777397fa..8f5cfcbdc3 100644 --- a/lib/core/upload/transaction_signer.dart +++ b/lib/core/upload/transaction_signer.dart @@ -1,11 +1,11 @@ -import 'package:ardrive/core/arconnect/safe_arconnect_action.dart'; +import 'package:arconnect/arconnect.dart'; import 'package:ardrive/core/crypto/crypto.dart'; import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/services/arweave/arweave_service.dart'; import 'package:ardrive/services/pst/pst.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:cryptography/cryptography.dart'; import 'package:package_info_plus/package_info_plus.dart'; diff --git a/lib/core/upload/upload_metadata.dart b/lib/core/upload/upload_metadata.dart index d71bb52d43..67729e461a 100644 --- a/lib/core/upload/upload_metadata.dart +++ b/lib/core/upload/upload_metadata.dart @@ -56,10 +56,24 @@ class ARFSFileUploadMetadata extends ARFSUploadMetadata { required super.isPrivate, }); + // without dataTxId @override - Map toJson() => _$ARFSFileUploadMetadataToJson(this); + Map toJson() => { + 'name': name, + 'size': size, + 'lastModifiedDate': lastModifiedDate.millisecondsSinceEpoch, + 'dataContentType': dataContentType, + }; } +// { +// "name": "420-3", +// "size": 420000, +// "lastModifiedDate": 1682024476785, +// "dataTxId": "vjjdo85A_XjpZuZV3zwEiECoArmFNqU8VizHirCoXUQ", +// "dataContentType": "application/octet-stream" +// } + abstract class ARFSUploadMetadata extends UploadMetadata { final String name; final List tags; @@ -74,4 +88,7 @@ abstract class ARFSUploadMetadata extends UploadMetadata { }); Map toJson(); + + @override + String toString() => toJson().toString(); } diff --git a/lib/core/upload/uploader.dart b/lib/core/upload/uploader.dart index 94cd53eae3..b1c35de288 100644 --- a/lib/core/upload/uploader.dart +++ b/lib/core/upload/uploader.dart @@ -21,7 +21,7 @@ import 'package:ardrive/utils/upload_plan_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:tuple/tuple.dart'; -class ArDriveUploader { +class ArDriveUploaderFromHandles { final BundleUploader _bundleUploader; final FileV2Uploader _fileV2Uploader; final Future Function(BundleUploadHandle handle) _prepareBundle; @@ -33,7 +33,7 @@ class ArDriveUploader { final Future Function(FileV2UploadHandle handle, Object error) _onUploadFileError; - ArDriveUploader({ + ArDriveUploaderFromHandles({ required BundleUploader bundleUploader, required FileV2Uploader fileV2Uploader, required Future Function(BundleUploadHandle handle) prepareBundle, diff --git a/lib/download/ardrive_downloader.dart b/lib/download/ardrive_downloader.dart new file mode 100644 index 0000000000..213026580d --- /dev/null +++ b/lib/download/ardrive_downloader.dart @@ -0,0 +1,156 @@ +import 'dart:async'; +import 'dart:typed_data'; + +import 'package:ardrive/blocs/blocs.dart'; +import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_crypto/ardrive_crypto.dart'; +import 'package:ardrive_io/ardrive_io.dart'; +import 'package:arweave/arweave.dart' as arweave; +import 'package:arweave/utils.dart'; +import 'package:cryptography/cryptography.dart' hide Cipher; + +abstract class ArDriveDownloader { + Stream downloadFile({ + required String dataTx, + required int fileSize, + required String fileName, + required DateTime lastModifiedDate, + required String contentType, + Completer? cancelWithReason, + SecretKey? fileKey, + String? cipher, + String? cipherIvString, + }); + + factory ArDriveDownloader({ + required IOFileAdapter ioFileAdapter, + required ArDriveIO ardriveIo, + }) { + return _ArDriveDownloader(ioFileAdapter, ardriveIo); + } +} + +class _ArDriveDownloader implements ArDriveDownloader { + final IOFileAdapter _ioFileAdapter; + final ArDriveIO _ardriveIo; + + _ArDriveDownloader(this._ioFileAdapter, this._ardriveIo); + + final Completer _cancelWithReason = Completer(); + + final StreamController downloadProgressController = + StreamController.broadcast(); + + Stream get downloadProgress => + downloadProgressController.stream; + + @override + Stream downloadFile({ + required String dataTx, + required int fileSize, + required String fileName, + required DateTime lastModifiedDate, + required String contentType, + Completer? cancelWithReason, + SecretKey? fileKey, + String? cipher, + String? cipherIvString, + }) async* { + final streamDownloadResponse = await arweave.download( + txId: dataTx, + onProgress: (progress, speed) => logger.d(progress.toString()), + ); + + final streamDownload = streamDownloadResponse.$1; + + Stream saveStream; + + if (fileKey != null && cipher != null && cipherIvString != null) { + final cipherIv = decodeBase64ToBytes(cipherIvString); + + final keyData = Uint8List.fromList(await fileKey.extractBytes()); + + if (cipher == Cipher.aes256ctr) { + saveStream = await decryptTransactionDataStream( + cipher, + cipherIv, + streamDownload.transform(transformer), + keyData, + fileSize, + ); + } else if (cipher == Cipher.aes256gcm) { + List bytes = []; + + await for (var chunk in streamDownload) { + bytes.addAll(chunk); + yield bytes.length / fileSize * 100; + } + + final encryptedData = await decryptTransactionData( + cipher, + cipherIvString, + Uint8List.fromList(bytes), + fileKey, + ); + + _ardriveIo.saveFile( + await IOFile.fromData(encryptedData, + name: fileName, + lastModifiedDate: lastModifiedDate, + contentType: contentType), + ); + + return; + } else { + throw Exception('Unknown cipher: $cipher'); + } + } else { + saveStream = streamDownload.transform(transformer); + } + + final file = await _ioFileAdapter.fromReadStreamGenerator( + ([s, e]) => saveStream, + fileSize, + name: fileName, + lastModifiedDate: lastModifiedDate, + ); + + final finalize = Completer(); + Future.any([ + _cancelWithReason.future.then((_) => false), + ]).then((value) => finalize.complete(value)); + + bool? saveResult; + + await for (final saveStatus in _ardriveIo.saveFileStream(file, finalize)) { + if (saveStatus.saveResult == null) { + if (saveStatus.bytesSaved == 0) continue; + + final progress = saveStatus.bytesSaved / saveStatus.totalBytes; + + yield progress * 100; + + // final progressPercentInt = (progress * 100).round(); + // emit(FileDownloadWithProgress( + // fileName: _file.name, + // progress: progressPercentInt, + // fileSize: saveStatus.totalBytes, + // )); + } else { + saveResult = saveStatus.saveResult!; + } + } + + if (_cancelWithReason.isCompleted) { + throw Exception('Download cancelled: ${await _cancelWithReason.future}'); + } + if (saveResult != true) throw Exception('Failed to save file'); + } +} + +final StreamTransformer, Uint8List> transformer = + StreamTransformer.fromHandlers( + handleData: (List data, EventSink sink) { + sink.add(Uint8List.fromList(data)); + }, +); diff --git a/lib/download/limits.dart b/lib/download/limits.dart index cf96b2f90c..90c3bc195e 100644 --- a/lib/download/limits.dart +++ b/lib/download/limits.dart @@ -1,7 +1,8 @@ import 'package:ardrive/utils/data_size.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +// ignore: depend_on_referenced_packages import 'package:device_info_plus/device_info_plus.dart'; -import '../utils/app_platform.dart'; import 'download_utils.dart'; final publicDownloadUnknownPlatformSizeLimit = const GiB(2).size; diff --git a/lib/download/multiple_download_bloc.dart b/lib/download/multiple_download_bloc.dart index 8affeddedd..d9f32ee70a 100644 --- a/lib/download/multiple_download_bloc.dart +++ b/lib/download/multiple_download_bloc.dart @@ -13,6 +13,7 @@ import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive_http/ardrive_http.dart'; import 'package:collection/collection.dart'; import 'package:cryptography/cryptography.dart'; +// ignore: depend_on_referenced_packages import 'package:device_info_plus/device_info_plus.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart'; @@ -194,7 +195,7 @@ class MultipleDownloadBloc try { if (dataTx != null) { - final decryptedData = await _crypto.decryptTransactionData( + final decryptedData = await _crypto.decryptDataFromTransaction( dataTx, dataBytes, fileKey, diff --git a/lib/entities/constants.dart b/lib/entities/constants.dart index 8d904258c7..90b0ae71e0 100644 --- a/lib/entities/constants.dart +++ b/lib/entities/constants.dart @@ -1,67 +1,13 @@ -class EntityTag { - static const appName = 'App-Name'; - static const appPlatform = 'App-Platform'; - static const appPlatformVersion = 'App-Platform-Version'; - static const appVersion = 'App-Version'; - static const contentType = 'Content-Type'; - static const unixTime = 'Unix-Time'; - - static const arFs = 'ArFS'; - static const entityType = 'Entity-Type'; - - static const driveId = 'Drive-Id'; - static const folderId = 'Folder-Id'; - static const parentFolderId = 'Parent-Folder-Id'; - static const fileId = 'File-Id'; - static const snapshotId = 'Snapshot-Id'; - - static const drivePrivacy = 'Drive-Privacy'; - static const driveAuthMode = 'Drive-Auth-Mode'; - - static const cipher = 'Cipher'; - static const cipherIv = 'Cipher-IV'; - - static const protocolName = 'Protocol-Name'; - static const action = 'Action'; - static const input = 'Input'; - static const contract = 'Contract'; - - static const blockStart = 'Block-Start'; - static const blockEnd = 'Block-End'; - static const dataStart = 'Data-Start'; - static const dataEnd = 'Data-End'; - - static const pinnedDataTx = 'Pinned-Data-Tx'; - static const arFsPin = 'ArFS-Pin'; -} - class ContentType { static const json = 'application/json'; static const octetStream = 'application/octet-stream'; static const manifest = 'application/x.arweave-manifest+json'; } -class EntityType { - static const drive = 'drive'; - static const folder = 'folder'; - static const file = 'file'; - static const snapshot = 'snapshot'; -} - class Cipher { static const aes256 = 'AES256-GCM'; } -class DrivePrivacy { - static const public = 'public'; - static const private = 'private'; -} - -class DriveAuthMode { - static const password = 'password'; - static const none = 'none'; -} - const String rootPath = ''; const int maxConcurrentUploadCount = 32; const String linkOriginProduction = 'https://app.ardrive.io'; diff --git a/lib/entities/drive_entity.dart b/lib/entities/drive_entity.dart index 7dbd36def0..4d227fba0f 100644 --- a/lib/entities/drive_entity.dart +++ b/lib/entities/drive_entity.dart @@ -3,6 +3,7 @@ import 'dart:typed_data'; import 'package:ardrive/core/crypto/crypto.dart'; import 'package:ardrive/services/services.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:cryptography/cryptography.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -54,12 +55,12 @@ class DriveEntity extends EntityWithCustomMetadata { ]) async { try { final drivePrivacy = - transaction.getTag(EntityTag.drivePrivacy) ?? DrivePrivacy.public; + transaction.getTag(EntityTag.drivePrivacy) ?? DrivePrivacyTag.public; Map? entityJson; - if (drivePrivacy == DrivePrivacy.public) { + if (drivePrivacy == DrivePrivacyTag.public) { entityJson = json.decode(utf8.decode(data)); - } else if (drivePrivacy == DrivePrivacy.private) { + } else if (drivePrivacy == DrivePrivacyTag.private) { entityJson = await crypto.decryptEntityJson(transaction, data, driveKey!); } @@ -95,11 +96,11 @@ class DriveEntity extends EntityWithCustomMetadata { tx ..addArFsTag() - ..addTag(EntityTag.entityType, EntityType.drive) + ..addTag(EntityTag.entityType, EntityTypeTag.drive) ..addTag(EntityTag.driveId, id!) ..addTag(EntityTag.drivePrivacy, privacy!); - if (privacy == DrivePrivacy.private) { + if (privacy == DrivePrivacyTag.private) { tx.addTag(EntityTag.driveAuthMode, authMode!); } } diff --git a/lib/entities/entity.dart b/lib/entities/entity.dart index f7195fe47d..0d1bb07e51 100644 --- a/lib/entities/entity.dart +++ b/lib/entities/entity.dart @@ -1,15 +1,13 @@ import 'dart:convert'; import 'package:ardrive/core/crypto/crypto.dart'; -import 'package:ardrive/utils/app_platform.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:cryptography/cryptography.dart'; import 'package:flutter/foundation.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:package_info_plus/package_info_plus.dart'; -import 'entities.dart'; - abstract class Entity { final ArDriveCrypto _crypto; diff --git a/lib/entities/file_entity.dart b/lib/entities/file_entity.dart index 1c8678eaf8..c8bf0a330f 100644 --- a/lib/entities/file_entity.dart +++ b/lib/entities/file_entity.dart @@ -3,6 +3,8 @@ import 'dart:typed_data'; import 'package:ardrive/core/crypto/crypto.dart'; import 'package:ardrive/services/services.dart'; +import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:cryptography/cryptography.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -91,6 +93,8 @@ class FileEntity extends EntityWithCustomMetadata { data, fileKey, ); + + logger.d('entityJson: $entityJson'); } final commitTime = transaction.getCommitTime(); @@ -116,7 +120,8 @@ class FileEntity extends EntityWithCustomMetadata { ); return file; - } catch (_) { + } catch (e, s) { + logger.e('Failed to parse transaction: ${transaction.id}', e, s); throw EntityTransactionParseException(transactionId: transaction.id); } } @@ -131,7 +136,7 @@ class FileEntity extends EntityWithCustomMetadata { tx ..addArFsTag() - ..addTag(EntityTag.entityType, EntityType.file) + ..addTag(EntityTag.entityType, EntityTypeTag.file) ..addTag(EntityTag.driveId, driveId!) ..addTag(EntityTag.parentFolderId, parentFolderId!) ..addTag(EntityTag.fileId, id!); diff --git a/lib/entities/folder_entity.dart b/lib/entities/folder_entity.dart index 2ed48534b2..06d81fc9b2 100644 --- a/lib/entities/folder_entity.dart +++ b/lib/entities/folder_entity.dart @@ -3,6 +3,7 @@ import 'dart:typed_data'; import 'package:ardrive/core/crypto/crypto.dart'; import 'package:ardrive/services/services.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:cryptography/cryptography.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -91,7 +92,7 @@ class FolderEntity extends EntityWithCustomMetadata { tx ..addArFsTag() - ..addTag(EntityTag.entityType, EntityType.folder) + ..addTag(EntityTag.entityType, EntityTypeTag.folder) ..addTag(EntityTag.driveId, driveId!) ..addTag(EntityTag.folderId, id!); diff --git a/lib/entities/manifest_data.dart b/lib/entities/manifest_data.dart index 0eec2b9a4c..5356a18f35 100644 --- a/lib/entities/manifest_data.dart +++ b/lib/entities/manifest_data.dart @@ -4,6 +4,7 @@ import 'dart:typed_data'; import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/entities/string_types.dart'; import 'package:ardrive/models/daos/drive_dao/drive_dao.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:collection/collection.dart'; import 'package:json_annotation/json_annotation.dart'; diff --git a/lib/entities/snapshot_entity.dart b/lib/entities/snapshot_entity.dart index 5b03f7edcc..14cea599d9 100644 --- a/lib/entities/snapshot_entity.dart +++ b/lib/entities/snapshot_entity.dart @@ -4,6 +4,7 @@ import 'package:ardrive/core/crypto/crypto.dart'; import 'package:ardrive/entities/string_types.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:cryptography/cryptography.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -75,7 +76,7 @@ class SnapshotEntity extends Entity { tx ..addArFsTag() - ..addTag(EntityTag.entityType, EntityType.snapshot) + ..addTag(EntityTag.entityType, EntityTypeTag.snapshot) ..addTag(EntityTag.driveId, driveId!) ..addTag(EntityTag.snapshotId, id!) ..addTag(EntityTag.blockStart, '$blockStart') diff --git a/lib/main.dart b/lib/main.dart index b218517b07..f7a1682b29 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -12,8 +12,6 @@ import 'package:ardrive/models/database/database_helpers.dart'; import 'package:ardrive/pst/ardrive_contract_oracle.dart'; import 'package:ardrive/pst/community_oracle.dart'; import 'package:ardrive/pst/contract_oracle.dart'; -import 'package:ardrive/pst/contract_readers/redstone_contract_reader.dart'; -import 'package:ardrive/pst/contract_readers/smartweave_contract_reader.dart'; import 'package:ardrive/pst/contract_readers/verto_contract_reader.dart'; import 'package:ardrive/services/authentication/biometric_authentication.dart'; import 'package:ardrive/services/config/config_fetcher.dart'; @@ -24,7 +22,6 @@ import 'package:ardrive/turbo/services/upload_service.dart'; import 'package:ardrive/user/repositories/user_preferences_repository.dart'; import 'package:ardrive/user/repositories/user_repository.dart'; import 'package:ardrive/utils/app_flavors.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/local_key_value_store.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/pre_cache_assets.dart'; @@ -32,6 +29,7 @@ import 'package:ardrive/utils/secure_key_value_store.dart'; import 'package:ardrive_http/ardrive_http.dart'; import 'package:ardrive_io/ardrive_io.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_crashlytics/firebase_crashlytics.dart'; @@ -64,6 +62,8 @@ void main() async { final localStore = await LocalKeyValueStore.getInstance(); + await AppInfoServices().loadAppInfo(); + configService = ConfigService( appFlavors: AppFlavors(EnvFetcher()), configFetcher: ConfigFetcher(localStore: localStore), @@ -99,7 +99,7 @@ Future _initialize() async { logger.i('Initializing with config: $config'); - ArDriveDownloader.initialize(); + ArDriveMobileDownloader.initialize(); _arweave = ArweaveService( Arweave( @@ -207,8 +207,8 @@ class AppState extends State { communityOracle: CommunityOracle( ArDriveContractOracle([ ContractOracle(VertoContractReader()), - ContractOracle(RedstoneContractReader()), - ContractOracle(SmartweaveContractReader()), + // ContractOracle(RedstoneContractReader()), + // ContractOracle(SmartweaveContractReader()), ]), ), ), diff --git a/lib/models/daos/drive_dao/drive_dao.dart b/lib/models/daos/drive_dao/drive_dao.dart index a5c901b38a..c3e9f83401 100644 --- a/lib/models/daos/drive_dao/drive_dao.dart +++ b/lib/models/daos/drive_dao/drive_dao.dart @@ -4,6 +4,7 @@ import 'package:ardrive/core/crypto/crypto.dart'; import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/entities/string_types.dart'; import 'package:ardrive/models/models.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:cryptography/cryptography.dart'; import 'package:drift/drift.dart'; @@ -49,7 +50,8 @@ class DriveDao extends DatabaseAccessor with _$DriveDaoMixin { Future deleteSharedPrivateDrives(String? owner) async { final drives = (await allDrives().get()).where( (drive) => - drive.ownerAddress != owner && drive.privacy == DrivePrivacy.private, + drive.ownerAddress != owner && + drive.privacy == DrivePrivacyTag.private, ); for (var drive in drives) { await detachDrive(drive.id); @@ -111,12 +113,12 @@ class DriveDao extends DatabaseAccessor with _$DriveDaoMixin { SecretKey? driveKey; switch (privacy) { - case DrivePrivacy.private: + case DrivePrivacyTag.private: driveKey = await _crypto.deriveDriveKey(wallet, driveId, password); insertDriveOp = await _addDriveKeyToDriveCompanion( insertDriveOp, profileKey, driveKey); break; - case DrivePrivacy.public: + case DrivePrivacyTag.public: // Nothing to do break; } @@ -182,7 +184,7 @@ class DriveDao extends DatabaseAccessor with _$DriveDaoMixin { lastUpdated: Value(entity.createdAt), ); - if (entity.privacy == DrivePrivacy.private) { + if (entity.privacy == DrivePrivacyTag.private) { driveCompanion = await _addDriveKeyToDriveCompanion( driveCompanion, profileKey!, entry.value!); } @@ -213,7 +215,7 @@ class DriveDao extends DatabaseAccessor with _$DriveDaoMixin { lastUpdated: Value(entity.createdAt), ); - if (entity.privacy == DrivePrivacy.private) { + if (entity.privacy == DrivePrivacyTag.private) { if (profileKey != null) { companion = await _addDriveKeyToDriveCompanion( companion, diff --git a/lib/models/drive.dart b/lib/models/drive.dart index 466a588afb..2d70a1b26e 100644 --- a/lib/models/drive.dart +++ b/lib/models/drive.dart @@ -1,11 +1,12 @@ import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/utils/custom_metadata.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import './database/database.dart'; extension DriveExtensions on Drive { - bool get isPublic => privacy == DrivePrivacy.public; - bool get isPrivate => privacy == DrivePrivacy.private; + bool get isPublic => privacy == DrivePrivacyTag.public; + bool get isPrivate => privacy == DrivePrivacyTag.private; DriveEntity asEntity() { final drive = DriveEntity( @@ -13,9 +14,9 @@ extension DriveExtensions on Drive { name: name, rootFolderId: rootFolderId, privacy: privacy, - authMode: privacy == DrivePrivacy.private - ? DriveAuthMode.password - : DriveAuthMode.none, + authMode: privacy == DrivePrivacyTag.private + ? DriveAuthModeTag.password + : DriveAuthModeTag.none, ); drive.customJsonMetadata = parseCustomJsonMetadata(customJsonMetadata); diff --git a/lib/pages/app_route_information_parser.dart b/lib/pages/app_route_information_parser.dart index 48081f04a9..a07f9e85f5 100644 --- a/lib/pages/app_route_information_parser.dart +++ b/lib/pages/app_route_information_parser.dart @@ -11,7 +11,9 @@ class AppRouteInformationParser extends RouteInformationParser { @override Future parseRouteInformation( RouteInformation routeInformation) async { - final uri = Uri.parse(routeInformation.location!); + // TODO: Remove deprecated member use + // ignore: deprecated_member_use + final uri = Uri.parse(routeInformation.location); // Handle '/' if (uri.pathSegments.isEmpty) { return AppRoutePath.unknown(); @@ -75,36 +77,36 @@ class AppRouteInformationParser extends RouteInformationParser { @override RouteInformation restoreRouteInformation(AppRoutePath configuration) { if (configuration.signingIn) { - return const RouteInformation(location: '/sign-in'); + return RouteInformation(uri: Uri.parse('/sign-in')); } else if (configuration.driveId != null) { if (configuration.driveName != null && configuration.sharedRawDriveKey != null) { return RouteInformation( - location: + uri: Uri.parse( '/drives/${configuration.driveId}?name=${configuration.driveName}' - '&$driveKeyQueryParamName=${configuration.sharedRawDriveKey}', + '&$driveKeyQueryParamName=${configuration.sharedRawDriveKey}'), ); } return configuration.driveFolderId == null - ? RouteInformation(location: '/drives/${configuration.driveId}') + ? RouteInformation(uri: Uri.parse('/drives/${configuration.driveId}')) : RouteInformation( - location: - '/drives/${configuration.driveId}/folders/${configuration.driveFolderId}', + uri: Uri.parse( + '/drives/${configuration.driveId}/folders/${configuration.driveFolderId}'), ); } else if (configuration.sharedFileId != null) { final sharedFilePath = '/file/${configuration.sharedFileId}/view'; if (configuration.sharedRawFileKey != null) { return RouteInformation( - location: - '$sharedFilePath?$fileKeyQueryParamName=${configuration.sharedRawFileKey}', + uri: Uri.parse( + '$sharedFilePath?$fileKeyQueryParamName=${configuration.sharedRawFileKey}'), ); } else { - return RouteInformation(location: sharedFilePath); + return RouteInformation(uri: Uri.parse(sharedFilePath)); } } - return const RouteInformation(location: '/'); + return RouteInformation(uri: Uri.parse('/')); } } diff --git a/lib/pages/app_router_delegate.dart b/lib/pages/app_router_delegate.dart index c4501c4597..662b13c431 100644 --- a/lib/pages/app_router_delegate.dart +++ b/lib/pages/app_router_delegate.dart @@ -15,9 +15,9 @@ import 'package:ardrive/services/services.dart'; import 'package:ardrive/theme/theme_switcher_bloc.dart'; import 'package:ardrive/theme/theme_switcher_state.dart'; import 'package:ardrive/utils/app_localizations_wrapper.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/pages/drive_detail/components/drive_explorer_item_tile.dart b/lib/pages/drive_detail/components/drive_explorer_item_tile.dart index 8bd3d40751..bdd9908ce7 100644 --- a/lib/pages/drive_detail/components/drive_explorer_item_tile.dart +++ b/lib/pages/drive_detail/components/drive_explorer_item_tile.dart @@ -66,7 +66,7 @@ class DriveExplorerItemTileLeading extends StatelessWidget { children: [ Align( alignment: Alignment.center, - child: _getIconForContentType( + child: getIconForContentType( item.contentType, ), ), @@ -110,43 +110,41 @@ class DriveExplorerItemTileLeading extends StatelessWidget { ), ); } +} - ArDriveIcon _getIconForContentType(String contentType) { - const size = 18.0; - - if (contentType == 'folder') { - return ArDriveIcons.folderOutline( - size: size, - ); - } else if (FileTypeHelper.isZip(contentType)) { - return ArDriveIcons.zip( - size: size, - ); - } else if (FileTypeHelper.isImage(contentType)) { - return ArDriveIcons.image( - size: size, - ); - } else if (FileTypeHelper.isVideo(contentType)) { - return ArDriveIcons.video( - size: size, - ); - } else if (FileTypeHelper.isAudio(contentType)) { - return ArDriveIcons.music( - size: size, - ); - } else if (FileTypeHelper.isDoc(contentType)) { - return ArDriveIcons.fileOutlined( - size: size, - ); - } else if (FileTypeHelper.isCode(contentType)) { - return ArDriveIcons.fileOutlined( - size: size, - ); - } else { - return ArDriveIcons.fileOutlined( - size: size, - ); - } +ArDriveIcon getIconForContentType(String contentType, {double size = 18}) { + if (contentType == 'folder') { + return ArDriveIcons.folderOutline( + size: size, + ); + } else if (FileTypeHelper.isZip(contentType)) { + return ArDriveIcons.zip( + size: size, + ); + } else if (FileTypeHelper.isImage(contentType)) { + return ArDriveIcons.image( + size: size, + ); + } else if (FileTypeHelper.isVideo(contentType)) { + return ArDriveIcons.video( + size: size, + ); + } else if (FileTypeHelper.isAudio(contentType)) { + return ArDriveIcons.music( + size: size, + ); + } else if (FileTypeHelper.isDoc(contentType)) { + return ArDriveIcons.fileOutlined( + size: size, + ); + } else if (FileTypeHelper.isCode(contentType)) { + return ArDriveIcons.fileOutlined( + size: size, + ); + } else { + return ArDriveIcons.fileOutlined( + size: size, + ); } } diff --git a/lib/pst/community_oracle.dart b/lib/pst/community_oracle.dart index 01b613f6f2..72e8dc98d6 100644 --- a/lib/pst/community_oracle.dart +++ b/lib/pst/community_oracle.dart @@ -73,7 +73,7 @@ class CommunityOracle { final Map weighted = {}; for (final addr in balances.keys) { weighted[addr] = balances[addr]! / total; - } + } // Get a random holder based off of the weighted list of holders final randomHolder = weightedRandom(weighted, testingRandom: testingRandom); diff --git a/lib/services/app/app_info_services.dart b/lib/services/app/app_info_services.dart index ef3098d62d..7f433e8b77 100644 --- a/lib/services/app/app_info_services.dart +++ b/lib/services/app/app_info_services.dart @@ -1,4 +1,4 @@ -import 'package:ardrive/utils/app_platform.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:package_info_plus/package_info_plus.dart'; class AppInfo { diff --git a/lib/services/arweave/arweave_service.dart b/lib/services/arweave/arweave_service.dart index 4afa342aaf..ba7de43596 100644 --- a/lib/services/arweave/arweave_service.dart +++ b/lib/services/arweave/arweave_service.dart @@ -14,6 +14,7 @@ import 'package:ardrive/utils/logger/logger.dart'; import 'package:ardrive/utils/metadata_cache.dart'; import 'package:ardrive/utils/snapshots/snapshot_item.dart'; import 'package:ardrive_http/ardrive_http.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:artemis/artemis.dart'; import 'package:arweave/arweave.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; @@ -260,7 +261,7 @@ class ArweaveService { final isSnapshot = tags.any( (tag) => tag.name == EntityTag.entityType && - tag.value == EntityType.snapshot.toString(), + tag.value == EntityTypeTag.snapshot.toString(), ); // don't fetch data for snapshots @@ -306,20 +307,20 @@ class ArweaveService { await metadataCache.put(transaction.id, rawEntityData); Entity? entity; - if (entityType == EntityType.drive) { + if (entityType == EntityTypeTag.drive) { entity = await DriveEntity.fromTransaction( transaction, _crypto, rawEntityData, driveKey); - } else if (entityType == EntityType.folder) { + } else if (entityType == EntityTypeTag.folder) { entity = await FolderEntity.fromTransaction( transaction, _crypto, rawEntityData, driveKey); - } else if (entityType == EntityType.file) { + } else if (entityType == EntityTypeTag.file) { entity = await FileEntity.fromTransaction( transaction, rawEntityData, driveKey: driveKey, crypto: _crypto, ); - } else if (entityType == EntityType.snapshot) { + } else if (entityType == EntityTypeTag.snapshot) { // TODO: instantiate entity and add to blockHistory } @@ -371,7 +372,7 @@ class ArweaveService { ); final privateDriveTxs = driveTxs.where( - (tx) => tx.getTag(EntityTag.drivePrivacy) == DrivePrivacy.private); + (tx) => tx.getTag(EntityTag.drivePrivacy) == DrivePrivacyTag.private); return privateDriveTxs.isNotEmpty; } @@ -495,7 +496,7 @@ class ArweaveService { ); final privateDriveTxs = driveTxs.where( - (tx) => tx.getTag(EntityTag.drivePrivacy) == DrivePrivacy.private); + (tx) => tx.getTag(EntityTag.drivePrivacy) == DrivePrivacyTag.private); return privateDriveTxs.isNotEmpty ? privateDriveTxs.first.getTag(EntityTag.driveId)! @@ -529,7 +530,7 @@ class ArweaveService { } final driveKey = - driveTx.getTag(EntityTag.drivePrivacy) == DrivePrivacy.private + driveTx.getTag(EntityTag.drivePrivacy) == DrivePrivacyTag.private ? await _crypto.deriveDriveKey( wallet, driveTx.getTag(EntityTag.driveId)!, @@ -720,8 +721,8 @@ class ArweaveService { final fileTx = filteredEdges.first.node; return fileTx.getTag(EntityTag.cipherIv) != null - ? DrivePrivacy.private - : DrivePrivacy.public; + ? DrivePrivacyTag.private + : DrivePrivacyTag.public; } } @@ -778,7 +779,7 @@ class ArweaveService { ) async { final driveTxs = await getUniqueUserDriveEntityTxs(profileId); final privateDriveTxs = driveTxs.where( - (tx) => tx.getTag(EntityTag.drivePrivacy) == DrivePrivacy.private); + (tx) => tx.getTag(EntityTag.drivePrivacy) == DrivePrivacyTag.private); if (privateDriveTxs.isEmpty) { return null; diff --git a/lib/services/arweave/graphql/graphql.dart b/lib/services/arweave/graphql/graphql.dart index b048972692..69cb1f2e38 100644 --- a/lib/services/arweave/graphql/graphql.dart +++ b/lib/services/arweave/graphql/graphql.dart @@ -1,10 +1,10 @@ -import 'package:ardrive/entities/entities.dart'; import 'package:collection/collection.dart' show IterableExtension; - -import 'graphql_api.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; export 'graphql_api.dart'; +import 'graphql_api.dart'; + extension TransactionMixinExtensions on TransactionCommonMixin { String? getTag(String tagName) => tags.firstWhereOrNull((t) => t.name == tagName)?.value; diff --git a/lib/services/config/app_config.dart b/lib/services/config/app_config.dart index 8d2600754c..cbb35f623a 100644 --- a/lib/services/config/app_config.dart +++ b/lib/services/config/app_config.dart @@ -18,6 +18,7 @@ class AppConfig { final int autoSyncIntervalInSeconds; final bool enableSyncFromSnapshot; final bool enableSeedPhraseLogin; + final bool useNewUploader; final String stripePublishableKey; final bool forceNoFreeThanksToTurbo; final BigInt? fakeTurboCredits; @@ -38,6 +39,7 @@ class AppConfig { this.enableSyncFromSnapshot = true, this.enableSeedPhraseLogin = true, required this.stripePublishableKey, + this.useNewUploader = false, this.forceNoFreeThanksToTurbo = false, this.fakeTurboCredits, this.topUpDryRun = false, @@ -58,6 +60,7 @@ class AppConfig { bool? enableSyncFromSnapshot, bool? enableSeedPhraseLogin, String? stripePublishableKey, + bool? useNewUploader, bool? forceNoFreeThanksToTurbo, BigInt? fakeTurboCredits, bool? topUpDryRun, @@ -68,6 +71,7 @@ class AppConfig { : fakeTurboCredits ?? this.fakeTurboCredits; return AppConfig( + useNewUploader: useNewUploader ?? this.useNewUploader, defaultArweaveGatewayUrl: defaultArweaveGatewayUrl ?? this.defaultArweaveGatewayUrl, useTurboUpload: useTurboUpload ?? this.useTurboUpload, diff --git a/lib/turbo/services/upload_service.dart b/lib/turbo/services/upload_service.dart index f1937be6a5..ed0a142f93 100644 --- a/lib/turbo/services/upload_service.dart +++ b/lib/turbo/services/upload_service.dart @@ -1,12 +1,10 @@ import 'dart:async'; -import 'package:ardrive/core/arconnect/safe_arconnect_action.dart'; -import 'package:ardrive/utils/app_platform.dart'; +import 'package:arconnect/arconnect.dart'; import 'package:ardrive/utils/data_item_utils.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/logger/logger.dart'; -import 'package:ardrive/utils/turbo_utils.dart'; import 'package:ardrive_http/ardrive_http.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:uuid/uuid.dart'; diff --git a/lib/turbo/turbo.dart b/lib/turbo/turbo.dart index dc0e49bc2a..ef8d74b57f 100644 --- a/lib/turbo/turbo.dart +++ b/lib/turbo/turbo.dart @@ -313,7 +313,7 @@ class TurboBalanceRetriever { } } -class TurboPriceEstimator extends Disposable with ConvertForUSD { +class TurboPriceEstimator extends Disposable implements ConvertForUSD { TurboPriceEstimator({ required Wallet? wallet, required this.paymentService, diff --git a/lib/utils/arfs_txs_filter.dart b/lib/utils/arfs_txs_filter.dart index 2179a861a1..434d44c8be 100644 --- a/lib/utils/arfs_txs_filter.dart +++ b/lib/utils/arfs_txs_filter.dart @@ -1,4 +1,4 @@ -import 'package:ardrive/entities/constants.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; final supportedArFSVersions = ['0.10', '0.11', '0.12', '0.13']; diff --git a/lib/utils/bundles/fake_tags.dart b/lib/utils/bundles/fake_tags.dart index 4f80d9e318..99cecd783b 100644 --- a/lib/utils/bundles/fake_tags.dart +++ b/lib/utils/bundles/fake_tags.dart @@ -1,5 +1,5 @@ import 'package:ardrive/entities/entities.dart'; -import 'package:ardrive/utils/app_platform.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; final fakePrivateTags = [ @@ -28,7 +28,7 @@ List fakeApplicationTags({ List createFakeEntityTags(FileEntity entity) => [ Tag(EntityTag.arFs, '0.12'), - Tag(EntityTag.entityType, EntityType.file), + Tag(EntityTag.entityType, EntityTypeTag.file), Tag(EntityTag.driveId, entity.driveId!), Tag(EntityTag.parentFolderId, entity.parentFolderId!), Tag(EntityTag.fileId, entity.id!), diff --git a/lib/utils/logger/logger.dart b/lib/utils/logger/logger.dart index 8e1d5fe82e..2adc3aefbd 100644 --- a/lib/utils/logger/logger.dart +++ b/lib/utils/logger/logger.dart @@ -24,7 +24,7 @@ Future _convertTextToIOFile({ } final logger = Logger( - logLevel: kReleaseMode ? LogLevel.warning : LogLevel.debug, + logLevel: LogLevel.debug, storeLogsInMemory: true, logExporter: LogExporter(), ); @@ -45,7 +45,7 @@ class Logger { late ListQueue inMemoryLogs; Logger({ - LogLevel logLevel = LogLevel.warning, + LogLevel logLevel = LogLevel.debug, bool storeLogsInMemory = false, LogLevel memoryLogLevel = LogLevel.debug, int memoryLogSize = 500, diff --git a/lib/utils/snapshots/snapshot_item_to_be_created.dart b/lib/utils/snapshots/snapshot_item_to_be_created.dart index 48374ec2f1..a9c648fa27 100644 --- a/lib/utils/snapshots/snapshot_item_to_be_created.dart +++ b/lib/utils/snapshots/snapshot_item_to_be_created.dart @@ -1,11 +1,11 @@ import 'dart:async'; import 'dart:typed_data'; -import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/entities/string_types.dart'; import 'package:ardrive/services/arweave/graphql/graphql_api.graphql.dart'; import 'package:ardrive/utils/snapshots/snapshot_types.dart'; import 'package:ardrive/utils/snapshots/tx_snapshot_to_snapshot_data.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'height_range.dart'; @@ -83,6 +83,6 @@ class SnapshotItemToBeCreated { final entityTypeTags = tags.where((tag) => tag.name == EntityTag.entityType); - return entityTypeTags.any((tag) => tag.value == EntityType.snapshot); + return entityTypeTags.any((tag) => tag.value == EntityTypeTag.snapshot); } } diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 471da09221..ada08ba427 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -22,6 +22,7 @@ import shared_preferences_foundation import sqflite import sqlite3_flutter_libs import url_launcher_macos +import video_player_avfoundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) @@ -41,4 +42,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) + FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin")) } diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements index d92de2dd14..38da9a9768 100644 --- a/macos/Runner/Release.entitlements +++ b/macos/Runner/Release.entitlements @@ -7,6 +7,6 @@ com.apple.security.network.client com.apple.security.files.user-selected.read-write - + diff --git a/packages/.vscode/launch.json b/packages/.vscode/launch.json new file mode 100644 index 0000000000..9cf90fea5b --- /dev/null +++ b/packages/.vscode/launch.json @@ -0,0 +1,108 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "arconnect", + "cwd": "arconnect", + "request": "launch", + "type": "dart" + }, + { + "name": "arconnect (profile mode)", + "cwd": "arconnect", + "request": "launch", + "type": "dart", + "flutterMode": "profile" + }, + { + "name": "arconnect (release mode)", + "cwd": "arconnect", + "request": "launch", + "type": "dart", + "flutterMode": "release" + }, + { + "name": "ardrive_uploader", + "cwd": "ardrive_uploader", + "request": "launch", + "type": "dart" + }, + { + "name": "ardrive_uploader (profile mode)", + "cwd": "ardrive_uploader", + "request": "launch", + "type": "dart", + "flutterMode": "profile" + }, + { + "name": "ardrive_uploader (release mode)", + "cwd": "ardrive_uploader", + "request": "launch", + "type": "dart", + "flutterMode": "release" + }, + { + "name": "ardrive_utils", + "cwd": "ardrive_utils", + "request": "launch", + "type": "dart" + }, + { + "name": "ardrive_utils (profile mode)", + "cwd": "ardrive_utils", + "request": "launch", + "type": "dart", + "flutterMode": "profile" + }, + { + "name": "ardrive_utils (release mode)", + "cwd": "ardrive_utils", + "request": "launch", + "type": "dart", + "flutterMode": "release" + }, + { + "name": "arfs", + "cwd": "arfs", + "request": "launch", + "type": "dart" + }, + { + "name": "arfs (profile mode)", + "cwd": "arfs", + "request": "launch", + "type": "dart", + "flutterMode": "profile" + }, + { + "name": "arfs (release mode)", + "cwd": "arfs", + "request": "launch", + "type": "dart", + "flutterMode": "release" + }, + { + "name": "example", + "cwd": "ardrive_uploader/example", + "request": "launch", + "type": "dart" + }, + { + "name": "example (profile mode)", + "cwd": "ardrive_uploader/example", + "request": "launch", + "type": "dart", + "flutterMode": "profile" + }, + { + "name": "example (release mode)", + "cwd": "ardrive_uploader/example", + "request": "launch", + "type": "dart", + "flutterMode": "release" + } + ] +} \ No newline at end of file diff --git a/packages/arconnect/.gitignore b/packages/arconnect/.gitignore new file mode 100644 index 0000000000..96486fd930 --- /dev/null +++ b/packages/arconnect/.gitignore @@ -0,0 +1,30 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# 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 +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.packages +build/ diff --git a/packages/arconnect/.metadata b/packages/arconnect/.metadata new file mode 100644 index 0000000000..10542d27f6 --- /dev/null +++ b/packages/arconnect/.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: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + channel: stable + +project_type: package diff --git a/packages/arconnect/CHANGELOG.md b/packages/arconnect/CHANGELOG.md new file mode 100644 index 0000000000..41cc7d8192 --- /dev/null +++ b/packages/arconnect/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/packages/arconnect/LICENSE b/packages/arconnect/LICENSE new file mode 100644 index 0000000000..ba75c69f7f --- /dev/null +++ b/packages/arconnect/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/packages/arconnect/README.md b/packages/arconnect/README.md new file mode 100644 index 0000000000..02fe8ecabc --- /dev/null +++ b/packages/arconnect/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/packages/arconnect/analysis_options.yaml b/packages/arconnect/analysis_options.yaml new file mode 100644 index 0000000000..a5744c1cfb --- /dev/null +++ b/packages/arconnect/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/arconnect/lib/arconnect.dart b/packages/arconnect/lib/arconnect.dart new file mode 100644 index 0000000000..fe7b9e8b2a --- /dev/null +++ b/packages/arconnect/lib/arconnect.dart @@ -0,0 +1,5 @@ +library arconnect; + +export 'src/arconnect/arconnect.dart'; +export 'src/arconnect/arconnect_wallet.dart'; +export 'src/safe_arconnect_action.dart'; diff --git a/packages/arconnect/lib/src/arconnect/arconnect.dart b/packages/arconnect/lib/src/arconnect/arconnect.dart new file mode 100644 index 0000000000..8f1a401d8f --- /dev/null +++ b/packages/arconnect/lib/src/arconnect/arconnect.dart @@ -0,0 +1,34 @@ +import 'dart:typed_data'; + +import 'implementations/arconnect_web.dart' + if (dart.library.io) 'implementations/arconnect_stub.dart' + as implementation; + +class ArConnectService { + /// Returns true is the ArConnect browser extension is installed and available + bool isExtensionPresent() => implementation.isExtensionPresent(); + + /// Connects with ArConnect. If the user is not logged into it, asks user to login and + /// requests permissions. + Future connect() => implementation.connect(); + + /// Returns true if necessary permissions have been provided + Future checkPermissions() => implementation.checkPermissions(); + + /// Disonnects from the extensions and revokes permissions + Future disconnect() => implementation.disconnect(); + + /// Posts a 'walletSwitch' message to the window.parent DOM object when a wallet + /// switch occurs + void listenForWalletSwitch() => implementation.listenForWalletSwitch(); + + /// Returns the wallet address + Future getWalletAddress() => implementation.getWalletAddress(); + + /// Returns the wallet public key + Future getPublicKey() async => await implementation.getPublicKey(); + + /// Takes a message and returns the signature + Future getSignature(Uint8List message) async => + await implementation.getSignature(message); +} diff --git a/packages/arconnect/lib/src/arconnect/arconnect_wallet.dart b/packages/arconnect/lib/src/arconnect/arconnect_wallet.dart new file mode 100644 index 0000000000..585354ec14 --- /dev/null +++ b/packages/arconnect/lib/src/arconnect/arconnect_wallet.dart @@ -0,0 +1,25 @@ +import 'dart:typed_data'; + +import 'package:arconnect/src/arconnect/arconnect.dart'; +import 'package:arweave/arweave.dart'; + +class ArConnectWallet extends Wallet { + ArConnectWallet(this.arConnectService); + + final ArConnectService arConnectService; + + @override + Future getOwner() async { + return await arConnectService.getPublicKey(); + } + + @override + Future getAddress() async { + return await arConnectService.getWalletAddress(); + } + + @override + Future sign(Uint8List message) async { + return await arConnectService.getSignature(message); + } +} diff --git a/packages/arconnect/lib/src/arconnect/implementations/arconnect_stub.dart b/packages/arconnect/lib/src/arconnect/implementations/arconnect_stub.dart new file mode 100644 index 0000000000..5a501ddc98 --- /dev/null +++ b/packages/arconnect/lib/src/arconnect/implementations/arconnect_stub.dart @@ -0,0 +1,31 @@ +import 'dart:typed_data'; + +bool isExtensionPresent() => false; + +Future connect() { + throw UnimplementedError(); +} + +Future checkPermissions() { + throw UnimplementedError(); +} + +Future disconnect() { + throw UnimplementedError(); +} + +void listenForWalletSwitch() { + throw UnimplementedError(); +} + +Future getWalletAddress() { + throw UnimplementedError(); +} + +Future getPublicKey() async { + throw UnimplementedError(); +} + +Future getSignature(Uint8List message) async { + throw UnimplementedError(); +} diff --git a/packages/arconnect/lib/src/arconnect/implementations/arconnect_web.dart b/packages/arconnect/lib/src/arconnect/implementations/arconnect_web.dart new file mode 100644 index 0000000000..acdec1f69b --- /dev/null +++ b/packages/arconnect/lib/src/arconnect/implementations/arconnect_web.dart @@ -0,0 +1,59 @@ +@JS() +library arconnect; + +import 'dart:typed_data'; + +import 'package:js/js.dart'; +import 'package:js/js_util.dart'; + +@JS('isExtensionPresent') +external bool isExtensionPresent(); + +@JS('connect') +external dynamic _connect(); + +@JS('checkPermissions') +external bool _checkPermissions(); + +@JS('disconnect') +external dynamic _disconnect(); + +@JS('listenForWalletSwitch') +external void _listenForWalletSwitch(); + +@JS('getWalletAddress') +external String _getWalletAddress(); + +@JS('getPublicKey') +external String _getPublicKey(); + +@JS('getSignature') +external Uint8List _getSignature(Uint8List message); + +Future connect() { + return promiseToFuture(_connect()); +} + +Future checkPermissions() { + return promiseToFuture(_checkPermissions()); +} + +Future disconnect() { + return promiseToFuture(_disconnect()); +} + +void listenForWalletSwitch() { + _listenForWalletSwitch(); +} + +Future getWalletAddress() { + return promiseToFuture(_getWalletAddress()); +} + +Future getPublicKey() async { + return await promiseToFuture(_getPublicKey()); +} + +Future getSignature(Uint8List message) async { + return await promiseToFuture(_getSignature(message)); +} diff --git a/lib/core/arconnect/safe_arconnect_action.dart b/packages/arconnect/lib/src/safe_arconnect_action.dart similarity index 61% rename from lib/core/arconnect/safe_arconnect_action.dart rename to packages/arconnect/lib/src/safe_arconnect_action.dart index 0af1586c66..8546673a5d 100644 --- a/lib/core/arconnect/safe_arconnect_action.dart +++ b/packages/arconnect/lib/src/safe_arconnect_action.dart @@ -1,5 +1,4 @@ -import 'package:ardrive/utils/html/html_util.dart'; -import 'package:ardrive/utils/logger/logger.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; Future safeArConnectAction( TabVisibilitySingleton tabVisibility, @@ -14,10 +13,10 @@ Future safeArConnectAction( late R result; if (!tabVisibility.isTabFocused()) { - logger.i( - 'Running safe ArConnect action while user is not focusing the tab.' - 'Waiting...', - ); + // logger.i( + // 'Running safe ArConnect action while user is not focusing the tab.' + // 'Waiting...', + // ); await tabVisibility.onTabGetsFocusedFuture(() async { result = await safeArConnectAction(tabVisibility, action, args); @@ -25,7 +24,7 @@ Future safeArConnectAction( return result; } else { - logger.d('Error while running safe ArConnect action. Re-throwing...'); + // logger.sd('Error while running safe ArConnect action. Re-throwing...'); rethrow; } } diff --git a/packages/arconnect/pubspec.yaml b/packages/arconnect/pubspec.yaml new file mode 100644 index 0000000000..c60f41a863 --- /dev/null +++ b/packages/arconnect/pubspec.yaml @@ -0,0 +1,63 @@ +name: arconnect +description: A new Flutter package project. +version: 0.0.1 +homepage: +publish_to: none + +environment: + sdk: '>=3.0.2 <4.0.0' + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + arweave: + git: + url: https://github.com/ardriveapp/arweave-dart.git + ref: PE-3697 + ardrive_utils: + path: ../ardrive_utils + js: ^0.6.7 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^2.0.0 + + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # To add assets to your package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/assets-and-images/#from-packages + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware + + # To add custom fonts to your package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/arconnect/test/arconnect_test.dart b/packages/arconnect/test/arconnect_test.dart new file mode 100644 index 0000000000..ab73b3a234 --- /dev/null +++ b/packages/arconnect/test/arconnect_test.dart @@ -0,0 +1 @@ +void main() {} diff --git a/packages/ardrive_crypto/.gitignore b/packages/ardrive_crypto/.gitignore new file mode 100644 index 0000000000..96486fd930 --- /dev/null +++ b/packages/ardrive_crypto/.gitignore @@ -0,0 +1,30 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# 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 +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.packages +build/ diff --git a/packages/ardrive_crypto/.metadata b/packages/ardrive_crypto/.metadata new file mode 100644 index 0000000000..10542d27f6 --- /dev/null +++ b/packages/ardrive_crypto/.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: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + channel: stable + +project_type: package diff --git a/packages/ardrive_crypto/CHANGELOG.md b/packages/ardrive_crypto/CHANGELOG.md new file mode 100644 index 0000000000..41cc7d8192 --- /dev/null +++ b/packages/ardrive_crypto/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/packages/ardrive_crypto/LICENSE b/packages/ardrive_crypto/LICENSE new file mode 100644 index 0000000000..ba75c69f7f --- /dev/null +++ b/packages/ardrive_crypto/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/packages/ardrive_crypto/README.md b/packages/ardrive_crypto/README.md new file mode 100644 index 0000000000..02fe8ecabc --- /dev/null +++ b/packages/ardrive_crypto/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/packages/ardrive_crypto/analysis_options.yaml b/packages/ardrive_crypto/analysis_options.yaml new file mode 100644 index 0000000000..a5744c1cfb --- /dev/null +++ b/packages/ardrive_crypto/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/ardrive_crypto/lib/ardrive_crypto.dart b/packages/ardrive_crypto/lib/ardrive_crypto.dart new file mode 100644 index 0000000000..7aa3ec6be8 --- /dev/null +++ b/packages/ardrive_crypto/lib/ardrive_crypto.dart @@ -0,0 +1,10 @@ +library ardrive_crypto; + +export 'src/authenticate.dart'; +export 'src/ciphers.dart'; +export 'src/constants.dart'; +export 'src/crypto.dart'; +export 'src/entities.dart'; +export 'src/keys.dart'; +export 'src/stream_aes.dart'; +export 'src/stream_cipher.dart'; diff --git a/packages/ardrive_crypto/lib/src/authenticate.dart b/packages/ardrive_crypto/lib/src/authenticate.dart new file mode 100644 index 0000000000..051a99ee2b --- /dev/null +++ b/packages/ardrive_crypto/lib/src/authenticate.dart @@ -0,0 +1,84 @@ +// import 'package:ardrive/services/arweave/graphql/graphql_api.graphql.dart'; +// import 'package:ardrive/utils/data_size.dart'; +// import 'package:arweave/arweave.dart'; +// import 'package:arweave/utils.dart'; +// import 'package:async/async.dart'; +// import 'package:flutter/foundation.dart'; + +// import '../arweave/arweave_service.dart'; + +// /// Service for authenticating a transaction +// class Authenticate { +// final ArweaveService _arweaveService; + +// Authenticate(this._arweaveService); + +// /// Authenticate the owner of an entity +// Future authenticateOwner( +// Stream authStream, +// int authStreamSize, +// String entityTxId, +// TransactionCommonMixin dataTx, +// ) async { +// final dataTxIsBundled = dataTx.bundledIn != null; +// if (dataTxIsBundled) { +// try { +// // Owner claimed by GraphQL query +// final owner = dataTx.owner.key; + +// // No stream support for DataItems, so buffer all the data +// if (authStreamSize > const MiB(500).size) +// throw Exception('Stream oversized for DataItem'); +// final dataItemData = await collectBytes(authStream); + +// // Construct DataItem manually from the GraphQL data +// final dataItem = DataItem.withBlobData( +// owner: owner, +// target: dataTx.recipient, +// nonce: dataTx.anchor, +// tags: [], +// data: dataItemData, +// ); + +// // GraphQL returns tags in the correct order so just add them all +// for (final tag in dataTx.tags) { +// dataItem.addTag(tag.name, tag.value); +// } + +// await dataItem.setSignature(dataTx.signature); + +// if (dataItem.id != entityTxId) +// throw Exception('DataItem txId does not match Entity txId'); +// if (!await dataItem.verify()) +// throw Exception('DataItem signature is invalid'); + +// // Verified owner +// return await ownerToAddress(dataItem.owner); +// } catch (e, s) { +// debugPrintStack( +// stackTrace: s, label: 'Error authenticating DataItem: $e'); +// return null; +// } +// } else { +// try { +// final transaction = (await _arweaveService +// .getTransaction(entityTxId))!; + +// // Ensure that the data_root matches +// await transaction.processDataStream(authStream, authStreamSize); + +// if (transaction.id != entityTxId) +// throw Exception('Transaction txId does not match Entity txId'); +// if (!await transaction.verify()) +// throw Exception('Transaction signature is invalid'); + +// // Verified owner +// return await ownerToAddress(transaction.owner!); +// } catch (e, s) { +// debugPrintStack( +// stackTrace: s, label: 'Error authenticating Transaction: $e'); +// return null; +// } +// } +// } +// } diff --git a/packages/ardrive_crypto/lib/src/ciphers.dart b/packages/ardrive_crypto/lib/src/ciphers.dart new file mode 100644 index 0000000000..dd427bb867 --- /dev/null +++ b/packages/ardrive_crypto/lib/src/ciphers.dart @@ -0,0 +1,45 @@ +import 'dart:async'; +import 'dart:typed_data'; + +import 'package:ardrive_crypto/src/constants.dart'; +import 'package:ardrive_crypto/src/stream_aes.dart'; +import 'package:ardrive_crypto/src/stream_cipher.dart'; +import 'package:cryptography/cryptography.dart' hide Cipher; + +StreamingCipher cipherBufferImpl(String cipherName) { + final impls = { + Cipher.aes256gcm: AesGcm.with256bits(), + // Avoid this implementation because it generates a 16 byte nonce by default... + // Cipher.aes256ctr: AesCtr.with256bits(macAlgorithm: MacAlgorithm.empty), + }; + final impl = impls[cipherName]; + if (impl == null) throw ArgumentError(); + return impl as StreamingCipher; +} + +FutureOr cipherStreamDecryptImpl( + String cipherName, { + required Uint8List keyData, +}) async { + final Map Function(Uint8List)> ctrs = { + Cipher.aes256gcm: AesGcmStream.fromKeyData, + Cipher.aes256ctr: AesCtrStream.fromKeyData, + }; + final ctr = ctrs[cipherName]; + if (ctr == null) throw ArgumentError(); + final impl = await ctr(keyData); + return impl; +} + +FutureOr cipherStreamEncryptImpl( + String cipherName, { + required Uint8List keyData, +}) async { + final Map Function(Uint8List)> ctrs = { + Cipher.aes256ctr: AesCtrStream.fromKeyData, + }; + final ctr = ctrs[cipherName]; + if (ctr == null) throw ArgumentError(); + final impl = await ctr(keyData); + return impl; +} diff --git a/packages/ardrive_crypto/lib/src/constants.dart b/packages/ardrive_crypto/lib/src/constants.dart new file mode 100644 index 0000000000..924ec0dc8d --- /dev/null +++ b/packages/ardrive_crypto/lib/src/constants.dart @@ -0,0 +1,10 @@ +class Cipher { + static const aes256gcm = 'AES256-GCM'; + static const aes256ctr = 'AES256-CTR'; +} + +class ContentType { + static const json = 'application/json'; + static const octetStream = 'application/octet-stream'; + static const manifest = 'application/x.arweave-manifest+json'; +} diff --git a/packages/ardrive_crypto/lib/src/crypto.dart b/packages/ardrive_crypto/lib/src/crypto.dart new file mode 100644 index 0000000000..6bdfc0db9d --- /dev/null +++ b/packages/ardrive_crypto/lib/src/crypto.dart @@ -0,0 +1,23 @@ +import 'dart:typed_data'; + +import 'package:cryptography/cryptography.dart'; + +export 'ciphers.dart'; +export 'entities.dart'; +export 'keys.dart'; +export 'stream_aes.dart'; + +final sha256 = Sha256(); + +/// Returns a [SecretBox] that is compatible with our past use of AES-GCM where the cipher text +/// was appended with the MAC and the nonce was stored separately. +SecretBox secretBoxFromDataWithGcmMacConcatenation( + Uint8List data, { + int macByteLength = 16, + required Uint8List nonce, +}) => + SecretBox( + Uint8List.sublistView(data, 0, data.lengthInBytes - macByteLength), + mac: Mac(Uint8List.sublistView(data, data.lengthInBytes - macByteLength)), + nonce: nonce, + ); diff --git a/packages/ardrive_crypto/lib/src/entities.dart b/packages/ardrive_crypto/lib/src/entities.dart new file mode 100644 index 0000000000..9e150d32f3 --- /dev/null +++ b/packages/ardrive_crypto/lib/src/entities.dart @@ -0,0 +1,159 @@ +import 'dart:async'; + +import 'package:ardrive_crypto/src/constants.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +import 'package:arweave/arweave.dart'; +import 'package:arweave/utils.dart' as utils; +import 'package:cryptography/cryptography.dart' hide Cipher; +import 'package:flutter/foundation.dart'; + +import 'crypto.dart'; + +/// Decrypts the provided transaction details and data into JSON using the provided key. +/// +/// Throws a [TransactionDecryptionException] if decryption fails. +// Future?> decryptEntityJson( +// TransactionCommonMixin transaction, +// Uint8List data, +// SecretKey key, +// ) async { +// final decryptedData = await decryptTransactionData(transaction, data, key); +// return json.decode(utf8.decode(decryptedData)); +// } + +/// Decrypts the provided transaction details and data into a [Uint8List] using the provided key. +/// +/// Throws a [TransactionDecryptionException] if decryption fails. +Future decryptTransactionData( + String cipher, + String cipherIvString, + Uint8List data, + SecretKey key, +) async { + final impl = cipherBufferImpl(cipher); + + final cipherIv = utils.decodeBase64ToBytes(cipherIvString); + + final SecretBox secretBox; + switch (cipher) { + case Cipher.aes256gcm: + secretBox = + secretBoxFromDataWithGcmMacConcatenation(data, nonce: cipherIv); + break; + case Cipher.aes256ctr: + secretBox = SecretBox(data, nonce: cipherIv, mac: Mac.empty); + break; + + default: + throw ArgumentError(); + } + + try { + return impl + .decrypt(secretBox, secretKey: key) + .then((res) => Uint8List.fromList(res)); + } on SecretBoxAuthenticationError catch (e, s) { + debugPrint('Failed to decrypt transaction data with $e and $s'); + throw TransactionDecryptionException(); + } +} + +/// Decrypts the provided transaction details and data into a [Uint8List] using the provided key. +/// +/// Throws a [TransactionDecryptionException] if decryption fails. +Future> decryptTransactionDataStream( + String cipher, + Uint8List cipherIv, + Stream dataStream, + Uint8List keyData, + int dataSize, +) async { + final impl = await cipherStreamDecryptImpl(cipher, keyData: keyData); + + // final cipherIv = utils.decodeBase64ToBytes(cipherIvString); + + final res = await impl.decryptStream(cipherIv, dataStream, dataSize); + return res.stream; +} + +/// Creates a transaction with the provided entity's JSON data encrypted along with the appropriate cipher tags. +// Future createEncryptedEntityTransaction( +// Entity entity, SecretKey key) => +// createEncryptedTransaction( +// utf8.encode(json.encode(entity)) as Uint8List, key); + +/// Creates a data item with the provided entity's JSON data encrypted along with the appropriate cipher tags. +// Future createEncryptedEntityDataItem(Entity entity, SecretKey key) => +// createEncryptedDataItem(utf8.encode(json.encode(entity)) as Uint8List, key); + +/// Creates a [Transaction] with the provided data encrypted along with the appropriate cipher tags. +Future createEncryptedTransaction( + Uint8List data, + SecretKey key, { + String cipher = Cipher.aes256gcm, +}) async { + final impl = cipherBufferImpl(cipher); + + final encryptionRes = await impl.encrypt(data, secretKey: key); + + return Transaction.withBlobData( + // The encrypted data should be a concatenation of the cipher text and MAC. + data: encryptionRes.concatenation(nonce: false)) + ..addTag(EntityTag.contentType, ContentType.octetStream) + ..addTag(EntityTag.cipher, cipher) + ..addTag( + EntityTag.cipherIv, + utils.encodeBytesToBase64(encryptionRes.nonce), + ); +} + +/// Creates a [TransactionStream] with the provided data encrypted along with the appropriate cipher tags. +/// Does not support AES256-GCM. +Future createEncryptedTransactionStream( + DataStreamGenerator plaintextDataStreamGenerator, + int streamLength, + SecretKey key, { + String cipher = Cipher.aes256ctr, +}) async { + final keyData = Uint8List.fromList(await key.extractBytes()); + final impl = await cipherStreamEncryptImpl(cipher, keyData: keyData); + + final encryptStreamResult = await impl.encryptStreamGenerator( + plaintextDataStreamGenerator, streamLength); + final cipherIv = encryptStreamResult.nonce; + final ciphertextDataStreamGenerator = encryptStreamResult.streamGenerator; + + return TransactionStream.withBlobData( + dataStreamGenerator: ciphertextDataStreamGenerator, + dataSize: streamLength, + ) + ..addTag(EntityTag.contentType, ContentType.octetStream) + ..addTag(EntityTag.cipher, Cipher.aes256ctr) + ..addTag( + EntityTag.cipherIv, + utils.encodeBytesToBase64(cipherIv), + ); +} + +/// Creates a [DataItem] with the provided data encrypted along with the appropriate cipher tags. +Future createEncryptedDataItem( + Uint8List data, + SecretKey key, { + String cipher = Cipher.aes256gcm, +}) async { + final impl = cipherBufferImpl(cipher); + + final encryptionRes = await impl.encrypt(data.toList(), secretKey: key); + + return DataItem.withBlobData( + // The encrypted data should be a concatenation of the cipher text and MAC. + data: encryptionRes.concatenation(nonce: false)) + ..addTag(EntityTag.contentType, ContentType.octetStream) + ..addTag(EntityTag.cipher, cipher) + ..addTag( + EntityTag.cipherIv, + utils.encodeBytesToBase64(encryptionRes.nonce), + ); +} + +class TransactionDecryptionException implements Exception {} diff --git a/packages/ardrive_crypto/lib/src/keys.dart b/packages/ardrive_crypto/lib/src/keys.dart new file mode 100644 index 0000000000..7bfffa8629 --- /dev/null +++ b/packages/ardrive_crypto/lib/src/keys.dart @@ -0,0 +1,62 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:arweave/arweave.dart'; +import 'package:cryptography/cryptography.dart'; +import 'package:uuid/uuid.dart'; + +import 'crypto.dart'; + +const keyByteLength = 256 ~/ 8; + +final pbkdf2 = Pbkdf2( + macAlgorithm: Hmac(sha256), + iterations: 100000, + bits: 256, +); +final hkdf = Hkdf(hmac: Hmac(sha256), outputLength: keyByteLength); +final aesGcm = AesGcm.with256bits(); + +Future deriveProfileKey(String password, + [List? salt]) async { + salt ??= aesGcm.newNonce(); + + final profileKey = await pbkdf2.deriveKey( + secretKey: SecretKey(utf8.encode(password)), + nonce: salt, + ); + + return ProfileKeyDerivationResult(profileKey, salt); +} + +Future deriveDriveKey( + Wallet wallet, + String driveId, + String password, +) async { + final message = + Uint8List.fromList(utf8.encode('drive') + Uuid.parse(driveId)); + final walletSignature = await wallet.sign(message); + return hkdf.deriveKey( + secretKey: SecretKey(walletSignature), + info: utf8.encode(password), + nonce: Uint8List(1), + ); +} + +Future deriveFileKey(SecretKey driveKey, String fileId) async { + final fileIdBytes = Uint8List.fromList(Uuid.parse(fileId)); + + return hkdf.deriveKey( + secretKey: driveKey, + info: fileIdBytes, + nonce: Uint8List(1), + ); +} + +class ProfileKeyDerivationResult { + final SecretKey key; + final List salt; + + ProfileKeyDerivationResult(this.key, this.salt); +} diff --git a/packages/ardrive_crypto/lib/src/stream_aes.dart b/packages/ardrive_crypto/lib/src/stream_aes.dart new file mode 100644 index 0000000000..83410d8d11 --- /dev/null +++ b/packages/ardrive_crypto/lib/src/stream_aes.dart @@ -0,0 +1,161 @@ +import 'dart:async'; +import 'dart:typed_data'; + +import 'package:ardrive_crypto/src/stream_cipher.dart'; +import 'package:ardrive_crypto/src/streams.dart'; +import 'package:convert/convert.dart'; +import 'package:flutter/material.dart'; +import 'package:webcrypto/webcrypto.dart'; + +const _aesBlockLengthBytes = 16; +const _aesNonceLengthBytes = 12; +const _aesCounterLengthBytes = _aesBlockLengthBytes - _aesNonceLengthBytes; +const _aesGcmTagLengthBytes = 16; + +const _aes128KeyLengthBytes = 16; +const _aes192KeyLengthBytes = 24; +const _aes256KeyLengthBytes = 32; + +const _webCryptoChunkSizeBytes = 256 * 1024; +const _webCryptoChuckSizeBlocks = _webCryptoChunkSizeBytes ~/ 16; + +enum AesKeyLength { aes128, aes192, aes256 } + +abstract class AesStream extends CipherStream { + static Map keyLengthsBytes = { + AesKeyLength.aes128: _aes128KeyLengthBytes, + AesKeyLength.aes192: _aes192KeyLengthBytes, + AesKeyLength.aes256: _aes256KeyLengthBytes, + }; + + static Future generateKey(AesKeyLength keyLength) { + final key = Uint8List(keyLengthsBytes[keyLength]!); + fillRandomBytes(key); + return Future.value(key); + } + + @override + FutureOr generateNonce([int lengthBytes = _aesNonceLengthBytes]) { + final nonce = Uint8List(lengthBytes); + fillRandomBytes(nonce); + return nonce; + } + + @protected + StreamTransformer aesStreamTransformer( + Future Function(List, List, int) aesProcessBlock, + Uint8List nonce, + ) { + if (nonce.length != _aesNonceLengthBytes) { + throw ArgumentError.value( + nonce, + 'nonce', + 'Nonce must be $_aesNonceLengthBytes bytes long', + ); + } + + return StreamTransformer.fromBind((inputStream) async* { + final inputStreamChunked = + inputStream.transform(chunkTransformer(_webCryptoChunkSizeBytes)); + + var offsetBlocks = BigInt.from(0); + await for (final chunk in inputStreamChunked) { + // print('offsetBlocks: $offsetBlocks'); + // print('chunk length: ${chunk.length}'); + final counterInitBytes = await counterBlock(nonce, offsetBlocks); + // print('counterInitBytes: ${hex.encode(counterInitBytes)}'); + try { + yield await aesProcessBlock( + chunk, + counterInitBytes, + _aesCounterLengthBytes * 8, + ); + } catch (e) { + // print('aesProcessBlock error: $e'); + rethrow; + } + offsetBlocks += BigInt.from(_webCryptoChuckSizeBlocks); + // print('next offsetBlocks: $offsetBlocks'); + } + }); + } + + @protected + FutureOr counterBlock(Uint8List nonce, BigInt offset); +} + +class AesCtrStream extends AesStream with EncryptStream, DecryptStream { + late final AesCtrSecretKey _aesCtr; + + AesCtrStream._(this._aesCtr); + + static FutureOr fromKeyData(Uint8List keyData) async { + return AesCtrStream._(await AesCtrSecretKey.importRawKey(keyData)); + } + + @override + StreamTransformer encryptTransformer( + Uint8List nonce, + int streamLength, + ) { + return aesStreamTransformer(_aesCtr.encryptBytes, nonce); + } + + @override + StreamTransformer decryptTransformer( + Uint8List nonce, + int streamLength, + ) { + return aesStreamTransformer(_aesCtr.decryptBytes, nonce); + } + + @override + Uint8List counterBlock(Uint8List nonce, BigInt offset) { + final countValue = offset; + final countValueHex = countValue.toRadixString(16).padLeft(8, '0'); + final counter = Uint8List.fromList(hex.decode(countValueHex)); + return Uint8List.fromList(nonce.toList()..addAll(counter)); + } +} + +// AesGcmStream uses AES-CTR under the hood, as AES-GCM does not have +// a streaming interface. As a result, the MAC cannot be generated or verified. +// Therefore, encryption is not supported, and decryption is dangerous unless +// using another data authentication method (i.e. validating the transaction) +class AesGcmStream extends AesStream with DecryptStream { + late final AesCtrSecretKey _aesCtr; + + AesGcmStream._(this._aesCtr); + + static FutureOr fromKeyData(Uint8List keyData) async { + return AesGcmStream._(await AesCtrSecretKey.importRawKey(keyData)); + } + + @override + StreamTransformer decryptTransformer( + Uint8List nonce, int streamLength) { + debugPrint( + 'WARNING: Decrypting AES-GCM without MAC verification! Only do this if you know what you are doing.'); + + final streamLengthNoMac = streamLength - _aesGcmTagLengthBytes; + + return StreamTransformer.fromBind((ciphertextStream) { + final ciphertextStreamNoMac = + ciphertextStream.transform(trimData(streamLengthNoMac)); + return ciphertextStreamNoMac + .transform(aesStreamTransformer(_aesCtr.decryptBytes, nonce)); + }); + } + + // Despite using an AES-CTR implementation under the hood, we can + // generating the counter block the same way as AES-GCM by simply + // adding two! + // More details: https://crypto.stackexchange.com/a/57905 + @override + Uint8List counterBlock(Uint8List nonce, BigInt offset) { + final countValue = offset + BigInt.from(2); + final countValueHex = countValue.toRadixString(16).padLeft(8, '0'); + final counter = Uint8List.fromList(hex.decode(countValueHex)); + return Uint8List.fromList(nonce.toList()..addAll(counter)); + } +} diff --git a/packages/ardrive_crypto/lib/src/stream_cipher.dart b/packages/ardrive_crypto/lib/src/stream_cipher.dart new file mode 100644 index 0000000000..331edc6649 --- /dev/null +++ b/packages/ardrive_crypto/lib/src/stream_cipher.dart @@ -0,0 +1,84 @@ +import 'dart:async'; +import 'dart:typed_data'; + +import 'package:arweave/arweave.dart'; +import 'package:flutter/material.dart'; + +class CipherStreamRes { + final Uint8List nonce; + final Stream stream; + + CipherStreamRes(this.nonce, this.stream); +} + +class CipherStreamGenRes { + final Uint8List nonce; + final DataStreamGenerator streamGenerator; + + CipherStreamGenRes(this.nonce, this.streamGenerator); +} + +abstract class CipherStream { + @protected + FutureOr generateNonce(); +} + +mixin EncryptStream implements CipherStream { + @protected + StreamTransformer encryptTransformer( + Uint8List nonce, + int streamLength, + ); + + FutureOr encryptStream( + Stream plaintextStream, + int streamLength, + ) async { + final nonce = await generateNonce(); + final streamCipher = + plaintextStream.transform(encryptTransformer(nonce, streamLength)); + + return CipherStreamRes(nonce, streamCipher); + } + + FutureOr encryptStreamGenerator( + DataStreamGenerator plaintextStreamGenerator, + int streamLength, + ) async { + final nonce = await generateNonce(); + dataStreamGenerator() => plaintextStreamGenerator() + .transform(encryptTransformer(nonce, streamLength)); + + return CipherStreamGenRes(nonce, dataStreamGenerator); + } +} + +mixin DecryptStream implements CipherStream { + @protected + StreamTransformer decryptTransformer( + Uint8List nonce, + int streamLength, + ); + + FutureOr decryptStream( + Uint8List nonce, + Stream plaintextStream, + int streamLength, + ) async { + final streamCipher = + plaintextStream.transform(decryptTransformer(nonce, streamLength)); + + return CipherStreamRes(nonce, streamCipher); + } + + FutureOr decryptStreamGenerator( + Uint8List nonce, + DataStreamGenerator plaintextStreamGenerator, + int streamLength, + ) async { + dataStreamGenerator() => plaintextStreamGenerator() + .transform(decryptTransformer(nonce, streamLength)); + + return CipherStreamGenRes(nonce, dataStreamGenerator); + } +} diff --git a/packages/ardrive_crypto/lib/src/streams.dart b/packages/ardrive_crypto/lib/src/streams.dart new file mode 100644 index 0000000000..a92f03861b --- /dev/null +++ b/packages/ardrive_crypto/lib/src/streams.dart @@ -0,0 +1,40 @@ +import 'dart:async'; +import 'dart:typed_data'; + +import 'package:async/async.dart'; + +StreamTransformer trimData(int byteCount) { + var complete = false; + var processedBytes = 0; + return StreamTransformer.fromHandlers( + handleData: (data, sink) { + if (complete) return; + if (processedBytes + data.length >= byteCount) { + sink.add(Uint8List.sublistView(data, 0, byteCount - processedBytes)); + sink.close(); + complete = true; + } else { + sink.add(data); + processedBytes += data.length; + } + }, + ); +} + +StreamTransformer chunkTransformer(int chunkSize) { + Stream chunkStream( + Stream> inputStream, int chunkSize) async* { + final chunker = ChunkedStreamReader(inputStream); + while (true) { + final chunk = await chunker.readBytes(chunkSize); + + if (chunk.isEmpty) break; + yield chunk; + + if (chunk.length < chunkSize) break; + } + } + + return StreamTransformer.fromBind( + ((stream) => chunkStream(stream, chunkSize))); +} diff --git a/packages/ardrive_crypto/pubspec.yaml b/packages/ardrive_crypto/pubspec.yaml new file mode 100644 index 0000000000..3909d25698 --- /dev/null +++ b/packages/ardrive_crypto/pubspec.yaml @@ -0,0 +1,67 @@ +name: ardrive_crypto +description: A new Flutter package project. +version: 0.0.1 +homepage: +publish_to: none + +environment: + sdk: '>=3.0.2 <4.0.0' + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + arweave: + git: + url: https://github.com/ardriveapp/arweave-dart.git + ref: PE-3697 + ardrive_utils: + path: ../ardrive_utils + uuid: ^3.0.4 + webcrypto: ^0.5.3 + async: ^2.11.0 + cryptography: ^2.5.0 + convert: ^3.1.1 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^2.0.0 + + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # To add assets to your package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/assets-and-images/#from-packages + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware + + # To add custom fonts to your package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/ardrive_crypto/test/ardrive_crypto_test.dart b/packages/ardrive_crypto/test/ardrive_crypto_test.dart new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/ardrive_crypto/test/ardrive_crypto_test.dart @@ -0,0 +1 @@ + diff --git a/packages/ardrive_uploader/.gitignore b/packages/ardrive_uploader/.gitignore new file mode 100644 index 0000000000..3cceda5578 --- /dev/null +++ b/packages/ardrive_uploader/.gitignore @@ -0,0 +1,7 @@ +# https://dart.dev/guides/libraries/private-files +# Created by `dart pub` +.dart_tool/ + +# Avoid committing pubspec.lock for library packages; see +# https://dart.dev/guides/libraries/private-files#pubspeclock. +pubspec.lock diff --git a/packages/ardrive_uploader/CHANGELOG.md b/packages/ardrive_uploader/CHANGELOG.md new file mode 100644 index 0000000000..effe43c82c --- /dev/null +++ b/packages/ardrive_uploader/CHANGELOG.md @@ -0,0 +1,3 @@ +## 1.0.0 + +- Initial version. diff --git a/packages/ardrive_uploader/README.md b/packages/ardrive_uploader/README.md new file mode 100644 index 0000000000..8b55e735b5 --- /dev/null +++ b/packages/ardrive_uploader/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/packages/ardrive_uploader/analysis_options.yaml b/packages/ardrive_uploader/analysis_options.yaml new file mode 100644 index 0000000000..dee8927aaf --- /dev/null +++ b/packages/ardrive_uploader/analysis_options.yaml @@ -0,0 +1,30 @@ +# This file configures the static analysis results for your project (errors, +# warnings, and lints). +# +# This enables the 'recommended' set of lints from `package:lints`. +# This set helps identify many issues that may lead to problems when running +# or consuming Dart code, and enforces writing Dart using a single, idiomatic +# style and format. +# +# If you want a smaller set of lints you can change this to specify +# 'package:lints/core.yaml'. These are just the most critical lints +# (the recommended set includes the core lints). +# The core lints are also what is used by pub.dev for scoring packages. + +include: package:lints/recommended.yaml + +# Uncomment the following section to specify additional rules. + +# linter: +# rules: +# - camel_case_types + +# analyzer: +# exclude: +# - path/to/excluded/files/** + +# For more information about the core and recommended set of lints, see +# https://dart.dev/go/core-lints + +# For additional information about configuring this file, see +# https://dart.dev/guides/language/analysis-options diff --git a/packages/ardrive_uploader/example/.gitignore b/packages/ardrive_uploader/example/.gitignore new file mode 100644 index 0000000000..24476c5d1e --- /dev/null +++ b/packages/ardrive_uploader/example/.gitignore @@ -0,0 +1,44 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# 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/ + +# 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/packages/ardrive_uploader/example/.metadata b/packages/ardrive_uploader/example/.metadata new file mode 100644 index 0000000000..0cffca3b71 --- /dev/null +++ b/packages/ardrive_uploader/example/.metadata @@ -0,0 +1,45 @@ +# 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. + +version: + revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + channel: stable + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + - platform: android + create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + - platform: ios + create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + - platform: linux + create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + - platform: macos + create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + - platform: web + create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + - platform: windows + create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/ardrive_uploader/example/README.md b/packages/ardrive_uploader/example/README.md new file mode 100644 index 0000000000..2b3fce4c86 --- /dev/null +++ b/packages/ardrive_uploader/example/README.md @@ -0,0 +1,16 @@ +# example + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/packages/ardrive_uploader/example/analysis_options.yaml b/packages/ardrive_uploader/example/analysis_options.yaml new file mode 100644 index 0000000000..61b6c4de17 --- /dev/null +++ b/packages/ardrive_uploader/example/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/ardrive_uploader/example/android/.gitignore b/packages/ardrive_uploader/example/android/.gitignore new file mode 100644 index 0000000000..6f568019d3 --- /dev/null +++ b/packages/ardrive_uploader/example/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/packages/ardrive_uploader/example/android/app/build.gradle b/packages/ardrive_uploader/example/android/app/build.gradle new file mode 100644 index 0000000000..1803de5753 --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/build.gradle @@ -0,0 +1,72 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + namespace "com.example.example" + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.example" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdkVersion 26 + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/packages/ardrive_uploader/example/android/app/src/debug/AndroidManifest.xml b/packages/ardrive_uploader/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000000..399f6981d5 --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/ardrive_uploader/example/android/app/src/main/AndroidManifest.xml b/packages/ardrive_uploader/example/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..1c44ba239f --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + diff --git a/packages/ardrive_uploader/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/packages/ardrive_uploader/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt new file mode 100644 index 0000000000..e793a000d6 --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/packages/ardrive_uploader/example/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/ardrive_uploader/example/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000000..f74085f3f6 --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/ardrive_uploader/example/android/app/src/main/res/drawable/launch_background.xml b/packages/ardrive_uploader/example/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000000..304732f884 --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/ardrive_uploader/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/ardrive_uploader/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/ardrive_uploader/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/ardrive_uploader/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/ardrive_uploader/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/android/app/src/main/res/values-night/styles.xml b/packages/ardrive_uploader/example/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000000..06952be745 --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/ardrive_uploader/example/android/app/src/main/res/values/styles.xml b/packages/ardrive_uploader/example/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000000..cb1ef88056 --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/ardrive_uploader/example/android/app/src/profile/AndroidManifest.xml b/packages/ardrive_uploader/example/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000000..399f6981d5 --- /dev/null +++ b/packages/ardrive_uploader/example/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/ardrive_uploader/example/android/build.gradle b/packages/ardrive_uploader/example/android/build.gradle new file mode 100644 index 0000000000..e90901803d --- /dev/null +++ b/packages/ardrive_uploader/example/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.9.10' + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.3.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +tasks.register("clean", Delete) { + delete rootProject.buildDir +} diff --git a/packages/ardrive_uploader/example/android/gradle.properties b/packages/ardrive_uploader/example/android/gradle.properties new file mode 100644 index 0000000000..94adc3a3f9 --- /dev/null +++ b/packages/ardrive_uploader/example/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/packages/ardrive_uploader/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/ardrive_uploader/example/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..3c472b99c6 --- /dev/null +++ b/packages/ardrive_uploader/example/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/packages/ardrive_uploader/example/android/settings.gradle b/packages/ardrive_uploader/example/android/settings.gradle new file mode 100644 index 0000000000..44e62bcf06 --- /dev/null +++ b/packages/ardrive_uploader/example/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/packages/ardrive_uploader/example/ios/.gitignore b/packages/ardrive_uploader/example/ios/.gitignore new file mode 100644 index 0000000000..7a7f9873ad --- /dev/null +++ b/packages/ardrive_uploader/example/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/packages/ardrive_uploader/example/ios/Flutter/AppFrameworkInfo.plist b/packages/ardrive_uploader/example/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000000..9625e105df --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 11.0 + + diff --git a/packages/ardrive_uploader/example/ios/Flutter/Debug.xcconfig b/packages/ardrive_uploader/example/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000000..ec97fc6f30 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Flutter/Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/packages/ardrive_uploader/example/ios/Flutter/Release.xcconfig b/packages/ardrive_uploader/example/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000000..c4855bfe20 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/packages/ardrive_uploader/example/ios/Podfile b/packages/ardrive_uploader/example/ios/Podfile new file mode 100644 index 0000000000..fdcc671eb3 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Podfile @@ -0,0 +1,44 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '11.0' + +# 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', '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 Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/packages/ardrive_uploader/example/ios/Podfile.lock b/packages/ardrive_uploader/example/ios/Podfile.lock new file mode 100644 index 0000000000..095bcace19 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Podfile.lock @@ -0,0 +1,136 @@ +PODS: + - device_info_plus (0.0.1): + - Flutter + - DKImagePickerController/Core (4.3.4): + - DKImagePickerController/ImageDataManager + - DKImagePickerController/Resource + - DKImagePickerController/ImageDataManager (4.3.4) + - DKImagePickerController/PhotoGallery (4.3.4): + - DKImagePickerController/Core + - DKPhotoGallery + - DKImagePickerController/Resource (4.3.4) + - DKPhotoGallery (0.0.17): + - DKPhotoGallery/Core (= 0.0.17) + - DKPhotoGallery/Model (= 0.0.17) + - DKPhotoGallery/Preview (= 0.0.17) + - DKPhotoGallery/Resource (= 0.0.17) + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Core (0.0.17): + - DKPhotoGallery/Model + - DKPhotoGallery/Preview + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Model (0.0.17): + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Preview (0.0.17): + - DKPhotoGallery/Model + - DKPhotoGallery/Resource + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Resource (0.0.17): + - SDWebImage + - SwiftyGif + - file_picker (0.0.1): + - DKImagePickerController/PhotoGallery + - Flutter + - file_saver (0.0.1): + - Flutter + - file_selector_ios (0.0.1): + - Flutter + - Flutter (1.0.0) + - flutter_downloader (0.0.1): + - Flutter + - image_picker_ios (0.0.1): + - Flutter + - package_info_plus (0.4.5): + - Flutter + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - permission_handler_apple (9.1.1): + - Flutter + - SDWebImage (5.17.0): + - SDWebImage/Core (= 5.17.0) + - SDWebImage/Core (5.17.0) + - security_scoped_resource (0.0.1): + - Flutter + - SwiftyGif (5.4.4) + - system_info_plus (0.0.1): + - Flutter + - webcrypto (0.1.1): + - Flutter + +DEPENDENCIES: + - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) + - file_picker (from `.symlinks/plugins/file_picker/ios`) + - file_saver (from `.symlinks/plugins/file_saver/ios`) + - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`) + - Flutter (from `Flutter`) + - flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) + - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) + - security_scoped_resource (from `.symlinks/plugins/security_scoped_resource/ios`) + - system_info_plus (from `.symlinks/plugins/system_info_plus/ios`) + - webcrypto (from `.symlinks/plugins/webcrypto/ios`) + +SPEC REPOS: + trunk: + - DKImagePickerController + - DKPhotoGallery + - SDWebImage + - SwiftyGif + +EXTERNAL SOURCES: + device_info_plus: + :path: ".symlinks/plugins/device_info_plus/ios" + file_picker: + :path: ".symlinks/plugins/file_picker/ios" + file_saver: + :path: ".symlinks/plugins/file_saver/ios" + file_selector_ios: + :path: ".symlinks/plugins/file_selector_ios/ios" + Flutter: + :path: Flutter + flutter_downloader: + :path: ".symlinks/plugins/flutter_downloader/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" + package_info_plus: + :path: ".symlinks/plugins/package_info_plus/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + permission_handler_apple: + :path: ".symlinks/plugins/permission_handler_apple/ios" + security_scoped_resource: + :path: ".symlinks/plugins/security_scoped_resource/ios" + system_info_plus: + :path: ".symlinks/plugins/system_info_plus/ios" + webcrypto: + :path: ".symlinks/plugins/webcrypto/ios" + +SPEC CHECKSUMS: + device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed + DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac + DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 + file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 + file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808 + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39 + image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 + package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 + SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9 + security_scoped_resource: ff26d31a9c6de0e45e5e8e0d7f43f3da0a1c6444 + SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f + system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa + webcrypto: 58dac29c85327d3d72a47d19d44128f10905f58e + +PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189 + +COCOAPODS: 1.12.1 diff --git a/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.pbxproj b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..ef6dfb69ef --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,729 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 87204C533C2C11B12A71FE60 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C7DDB998625DDEEB085F0A59 /* Pods_RunnerTests.framework */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + BFC22457C221B4C07FB6563D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 719A870D5A3C83DA22817CD3 /* Pods_Runner.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 30A3B1511B741B19027CF8F8 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3A21B231B49D69F65EA80A01 /* 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 = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 4D79D3CBFFE30D1B6C4A1565 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 719A870D5A3C83DA22817CD3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C7DDB998625DDEEB085F0A59 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CD5618AB58B498DC235E4A78 /* 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 = ""; }; + DC375846370DDF080B704C4E /* 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 = ""; }; + EEE100C4519771D22F285E6C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + BFC22457C221B4C07FB6563D /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + AEA5102CAAB40340C8F9BB98 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 87204C533C2C11B12A71FE60 /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 039F911B0E08578EEAD27692 /* Pods */ = { + isa = PBXGroup; + children = ( + CD5618AB58B498DC235E4A78 /* Pods-Runner.debug.xcconfig */, + DC375846370DDF080B704C4E /* Pods-Runner.release.xcconfig */, + 3A21B231B49D69F65EA80A01 /* Pods-Runner.profile.xcconfig */, + 4D79D3CBFFE30D1B6C4A1565 /* Pods-RunnerTests.debug.xcconfig */, + EEE100C4519771D22F285E6C /* Pods-RunnerTests.release.xcconfig */, + 30A3B1511B741B19027CF8F8 /* Pods-RunnerTests.profile.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 946C59AC1CEEC9D982B23148 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 719A870D5A3C83DA22817CD3 /* Pods_Runner.framework */, + C7DDB998625DDEEB085F0A59 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + 039F911B0E08578EEAD27692 /* Pods */, + 946C59AC1CEEC9D982B23148 /* Frameworks */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + A2E5C99265289DA36C660F5A /* [CP] Check Pods Manifest.lock */, + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + AEA5102CAAB40340C8F9BB98 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 2E66C06910CF0E3BBE9BB8FF /* [CP] Check Pods Manifest.lock */, + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 8D1C641CFB8AD3BBC04769CD /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 2E66C06910CF0E3BBE9BB8FF /* [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; + }; + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 8D1C641CFB8AD3BBC04769CD /* [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; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; + A2E5C99265289DA36C660F5A /* [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-RunnerTests-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 */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + 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_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + 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_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = X7A4X25YGP; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.ardrive.example; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 4D79D3CBFFE30D1B6C4A1565 /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = EEE100C4519771D22F285E6C /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 30A3B1511B741B19027CF8F8 /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + 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_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + 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_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + 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_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + 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_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + 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_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = X7A4X25YGP; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.ardrive.example; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = X7A4X25YGP; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.ardrive.example; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..919434a625 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000000..f9b0d7c5ea --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/packages/ardrive_uploader/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000000..e42adcb34c --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/ardrive_uploader/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/ardrive_uploader/example/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..21a3cc14c7 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/packages/ardrive_uploader/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/ardrive_uploader/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/ardrive_uploader/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/ardrive_uploader/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000000..f9b0d7c5ea --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/packages/ardrive_uploader/example/ios/Runner/AppDelegate.swift b/packages/ardrive_uploader/example/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000000..70693e4a8c --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..d36b1fab2d --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9ada4725e9b0ddb1deab583e5b5102493aa332 GIT binary patch literal 10932 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 literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..797d452e458972bab9d994556c8305db4c827017 GIT binary patch literal 406 zcmV;H0crk;P))>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed2d933e1120817fe9182483a228007b18ab6ae GIT binary patch literal 450 zcmV;z0X_bSP)iGWQ_5NJQ_~rNh*z)}eT%KUb z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%^UsMS#KsYnTF*!YeDOytlP4VhV?b} z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x? zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7 literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd7b0099ca80c806f8fe495613e8d6c69460d76 GIT binary patch literal 282 zcmV+#0p(^bcu7P-R4C8Q z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fe730945a01f64a61e2235dbe3f45b08f7729182 GIT binary patch literal 462 zcmV;<0WtoGP)-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_& zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9 zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179 zp<)v6Y}pRl100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0 z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq} zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9 z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe? zvTv``=%b1zrol#=R`JB)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..502f463a9bc882b461c96aadf492d1729e49e725 GIT binary patch literal 586 zcmV-Q0=4~#P)+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{ z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou zxz!_Xr~yNF+waPe00049Nkl*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G! zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2 zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IGu{`Fy8r+H07*qoM6N<$f20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec303439225b78712f49115768196d8d76f6790 GIT binary patch literal 862 zcmV-k1EKthP)20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e9f5fea27c705180eb716271f41b582e76dcbd90 GIT binary patch literal 1674 zcmV;526g#~P){YQnis^a@{&-nmRmq)<&%Mztj67_#M}W?l>kYSliK<%xAp;0j{!}J0!o7b zE>q9${Lb$D&h7k=+4=!ek^n+`0zq>LL1O?lVyea53S5x`Nqqo2YyeuIrQrJj9XjOp z{;T5qbj3}&1vg1VK~#9!?b~^C5-}JC@Pyrv-6dSEqJqT}#j9#dJ@GzT@B8}x zU&J@bBI>f6w6en+CeI)3^kC*U?}X%OD8$Fd$H&LV$H&LV$H&LV#|K5~mLYf|VqzOc zkc7qL~0sOYuM{tG`rYEDV{DWY`Z8&)kW*hc2VkBuY+^Yx&92j&StN}Wp=LD zxoGxXw6f&8sB^u})h@b@z0RBeD`K7RMR9deyL(ZJu#39Z>rT)^>v}Khq8U-IbIvT> z?4pV9qGj=2)TNH3d)=De<+^w;>S7m_eFKTvzeaBeir45xY!^m!FmxnljbSS_3o=g( z->^wC9%qkR{kbGnW8MfFew_o9h3(r55Is`L$8KI@d+*%{=Nx+FXJ98L0PjFIu;rGnnfY zn1R5Qnp<{Jq0M1vX=X&F8gtLmcWv$1*M@4ZfF^9``()#hGTeKeP`1!iED ztNE(TN}M5}3Bbc*d=FIv`DNv&@|C6yYj{sSqUj5oo$#*0$7pu|Dd2TLI>t5%I zIa4Dvr(iayb+5x=j*Vum9&irk)xV1`t509lnPO0%skL8_1c#Xbamh(2@f?4yUI zhhuT5<#8RJhGz4%b$`PJwKPAudsm|at?u;*hGgnA zU1;9gnxVBC)wA(BsB`AW54N{|qmikJR*%x0c`{LGsSfa|NK61pYH(r-UQ4_JXd!Rsz)=k zL{GMc5{h138)fF5CzHEDM>+FqY)$pdN3}Ml+riTgJOLN0F*Vh?{9ESR{SVVg>*>=# zix;VJHPtvFFCRY$Ks*F;VX~%*r9F)W`PmPE9F!(&s#x07n2<}?S{(ygpXgX-&B&OM zONY&BRQ(#%0%jeQs?oJ4P!p*R98>qCy5p8w>_gpuh39NcOlp)(wOoz0sY-Qz55eB~ z7OC-fKBaD1sE3$l-6QgBJO!n?QOTza`!S_YK z_v-lm^7{VO^8Q@M_^8F)09Ki6%=s?2_5eupee(w1FB%aqSweusQ-T+CH0Xt{` zFjMvW{@C&TB)k25()nh~_yJ9coBRL(0oO@HK~z}7?bm5j;y@69;bvlHb2tf!$ReA~x{22wTq550 z?f?Hnw(;m3ip30;QzdV~7pi!wyMYhDtXW#cO7T>|f=bdFhu+F!zMZ2UFj;GUKX7tI z;hv3{q~!*pMj75WP_c}>6)IWvg5_yyg<9Op()eD1hWC19M@?_9_MHec{Z8n3FaF{8 z;u`Mw0ly(uE>*CgQYv{be6ab2LWhlaH1^iLIM{olnag$78^Fd}%dR7;JECQ+hmk|o z!u2&!3MqPfP5ChDSkFSH8F2WVOEf0(E_M(JL17G}Y+fg0_IuW%WQ zG(mG&u?|->YSdk0;8rc{yw2@2Z&GA}z{Wb91Ooz9VhA{b2DYE7RmG zjL}?eq#iX%3#k;JWMx_{^2nNax`xPhByFiDX+a7uTGU|otOvIAUy|dEKkXOm-`aWS z27pUzD{a)Ct<6p{{3)+lq@i`t@%>-wT4r?*S}k)58e09WZYP0{{R3FC5Sl00039P)t-s|Ns9~ z#rP?<_5oL$Q^olD{r_0T`27C={r>*`|Nj71npVa5OTzc(_WfbW_({R{p56NV{r*M2 z_xt?)2V0#0NsfV0u>{42ctGP(8vQj-Btk1n|O0ZD=YLwd&R{Ko41Gr9H= zY@z@@bOAMB5Ltl$E>bJJ{>JP30ZxkmI%?eW{k`b?Wy<&gOo;dS`~CR$Vwb@XWtR|N zi~t=w02?-0&j0TD{>bb6sNwsK*!p?V`RMQUl(*DVjk-9Cx+-z1KXab|Ka2oXhX5f% z`$|e!000AhNklrxs)5QTeTVRiEmz~MKK1WAjCw(c-JK6eox;2O)?`? zTG`AHia671e^vgmp!llKp|=5sVHk#C7=~epA~VAf-~%aPC=%Qw01h8mnSZ|p?hz91 z7p83F3%LVu9;S$tSI$C^%^yud1dfTM_6p2|+5Ejp$bd`GDvbR|xit>i!ZD&F>@CJrPmu*UjD&?DfZs=$@e3FQA(vNiU+$A*%a} z?`XcG2jDxJ_ZQ#Md`H{4Lpf6QBDp81_KWZ6Tk#yCy1)32zO#3<7>b`eT7UyYH1eGz z;O(rH$=QR*L%%ZcBpc=eGua?N55nD^K(8<#gl2+pN_j~b2MHs4#mcLmv%DkspS-3< zpI1F=^9siI0s-;IN_IrA;5xm~3?3!StX}pUv0vkxMaqm+zxrg7X7(I&*N~&dEd0kD z-FRV|g=|QuUsuh>-xCI}vD2imzYIOIdcCVV=$Bz@*u0+Bs<|L^)32nN*=wu3n%Ynw z@1|eLG>!8ruU1pFXUfb`j>(=Gy~?Rn4QJ-c3%3T|(Frd!bI`9u&zAnyFYTqlG#&J7 zAkD(jpw|oZLNiA>;>hgp1KX7-wxC~31II47gc zHcehD6Uxlf%+M^^uN5Wc*G%^;>D5qT{>=uxUhX%WJu^Z*(_Wq9y}npFO{Hhb>s6<9 zNi0pHXWFaVZnb)1+RS&F)xOv6&aeILcI)`k#0YE+?e)5&#r7J#c`3Z7x!LpTc01dx zrdC3{Z;joZ^KN&))zB_i)I9fWedoN>Zl-6_Iz+^G&*ak2jpF07*qoM6N<$f;w%0(f|Me literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0467bf12aa4d28f374bb26596605a46dcbb3e7c8 GIT binary patch literal 1418 zcmV;51$Fv~P)q zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&&>|-UCa7_51w+ zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq z^={4hPQv)y=I|4n+?>7Fim=dxt1 z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf` zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_> z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0NEx*{soY=0MZExqA5XHQkqi#4gW3 zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62( zdqY93Zy}v&c4n($Vv!UybR8ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;? zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-< z{s<&cCV_1`^TD^ia9!*mQDq& zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000000..0bedcf2fd4 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000000..89c2725b70 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/packages/ardrive_uploader/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/ardrive_uploader/example/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..f2e259c7c9 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/ardrive_uploader/example/ios/Runner/Base.lproj/Main.storyboard b/packages/ardrive_uploader/example/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..f3c28516fb --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/ardrive_uploader/example/ios/Runner/Info.plist b/packages/ardrive_uploader/example/ios/Runner/Info.plist new file mode 100644 index 0000000000..a581248451 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner/Info.plist @@ -0,0 +1,51 @@ + + + + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Example + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + example + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UIApplicationSupportsIndirectInputEvents + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/packages/ardrive_uploader/example/ios/Runner/Runner-Bridging-Header.h b/packages/ardrive_uploader/example/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000000..308a2a560b --- /dev/null +++ b/packages/ardrive_uploader/example/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/packages/ardrive_uploader/example/ios/RunnerTests/RunnerTests.swift b/packages/ardrive_uploader/example/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000000..86a7c3b1b6 --- /dev/null +++ b/packages/ardrive_uploader/example/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/packages/ardrive_uploader/example/lib/main.dart b/packages/ardrive_uploader/example/lib/main.dart new file mode 100644 index 0000000000..ffd64b2ecc --- /dev/null +++ b/packages/ardrive_uploader/example/lib/main.dart @@ -0,0 +1,299 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; +import 'dart:typed_data'; + +import 'package:ardrive_crypto/ardrive_crypto.dart'; +import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_uploader/ardrive_uploader.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +import 'package:arweave/arweave.dart'; +import 'package:arweave/utils.dart'; +import 'package:cryptography/cryptography.dart' hide Cipher; +import 'package:flutter/material.dart'; +import 'package:uuid/uuid.dart'; + +void main() async { + WidgetsFlutterBinding.ensureInitialized(); + await AppInfoServices().loadAppInfo(); + HttpClient.enableTimelineLogging = false; + + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + home: Scaffold( + appBar: AppBar(title: const Text('ARFS File Upload Example')), + body: const Center( + child: Padding( + padding: EdgeInsets.all(24.0), + child: UploadForm(), + ), + ), + ), + ); + } +} + +class UploadForm extends StatefulWidget { + const UploadForm({super.key}); + + @override + // ignore: library_private_types_in_public_api + _UploadFormState createState() => _UploadFormState(); +} + +class _UploadFormState extends State { + String _statusText = "Pick wallet"; + IOFile? walletFile; + IOFile? file; + IOFile? decryptedFile; + UploadController? controller; + final driveIdController = TextEditingController(); + final passwordController = TextEditingController(); + final parentFolderIdController = TextEditingController(); + String dropdownValue = 'public'; + final _streamController = StreamController(); + + Future pickWallet() async { + final walletFile = + await ArDriveIO().pickFile(fileSource: FileSource.fileSystem); + + setState(() { + this.walletFile = walletFile; + _statusText = "Wallet selected"; + }); + + return walletFile.path; + } + + Future pickFile() async { + final file = await ArDriveIO().pickFiles(fileSource: FileSource.fileSystem); + + setState(() { + this.file = file.first; + _statusText = "File selected"; + }); + + return file.first.path; + } + + static const keyByteLength = 256 ~/ 8; + + void _uploadFile() async { + final uploader = ArDriveUploader( + turboUploadUri: Uri.parse('https://arfs.arweave.net'), + ); + + setState(() { + _statusText = "Uploading File..."; + }); + + final wallet = Wallet.fromJwk( + json.decode( + await walletFile!.readAsString(), + ), + ); + SecretKey? driveKey; + + if (dropdownValue == 'private') { + final kdf = Hkdf(hmac: Hmac(Sha256()), outputLength: keyByteLength); + + final driveIdBytes = Uuid.parse(driveIdController.text); + + final walletSignature = await wallet + .sign(Uint8List.fromList(utf8.encode('drive') + driveIdBytes)); + + const password = '123'; + + driveKey = await kdf.deriveKey( + secretKey: SecretKey(walletSignature), + info: utf8.encode(password), + nonce: Uint8List(1), + ); + } + + controller = await uploader.upload( + file: file!, + driveKey: driveKey, + type: UploadType.turbo, + args: ARFSUploadMetadataArgs( + driveId: driveIdController.text, + parentFolderId: parentFolderIdController.text, + isPrivate: false, + ), + wallet: wallet, + ); + controller?.onProgressChange((progress) { + _streamController.add(progress.progress); + }); + + setState(() { + _statusText = 'File uploaded'; + }); + } + + @override + Widget build(BuildContext context) { + return Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ElevatedButton( + onPressed: pickWallet, + child: const Text("Select wallet"), + ), + if (walletFile != null) ...[ + TextField( + controller: driveIdController, + onChanged: (value) { + setState(() {}); + }, + decoration: const InputDecoration( + labelText: 'Drive ID', + ), + ), + if (driveIdController.text.isNotEmpty) ...[ + TextField( + controller: parentFolderIdController, + onChanged: (value) { + setState(() {}); + }, + decoration: const InputDecoration( + labelText: 'Parent Folder ID', + ), + ), + if (parentFolderIdController.text.isNotEmpty) ...[ + ElevatedButton( + onPressed: () async { + await pickFile(); + }, + child: const Text("Select file"), + ), + ], + ], + ], + if (file != null) ...[ + DropdownButton( + value: dropdownValue, + onChanged: (String? newValue) { + setState(() { + dropdownValue = newValue!; + }); + }, + items: ['public', 'private'] + .map>((String value) { + return DropdownMenuItem( + value: value, + child: Text(value.toUpperCase()), + ); + }).toList(), + ), + if (dropdownValue == 'private') + TextField( + controller: passwordController, + onChanged: (value) { + setState(() {}); + }, + decoration: const InputDecoration( + labelText: 'Drive Password', + ), + ), + if (dropdownValue == 'public' || + passwordController.text.isNotEmpty) ...[ + ElevatedButton( + onPressed: _uploadFile, + child: const Text("Upload file"), + ), + ], + ], + Text(_statusText), + ElevatedButton( + onPressed: decryptFile, + child: const Text("Decrypt file"), + ), + StreamBuilder( + stream: _streamController.stream, + builder: (context, snapshot) { + return Text(snapshot.data?.toStringAsFixed(2) ?? ''); + }) + ], + ); + } + + Future decryptFile() async { + final wallet = Wallet.fromJwk( + json.decode( + await walletFile!.readAsString(), + ), + ); + + final encryptedFile = + await ArDriveIO().pickFile(fileSource: FileSource.fileSystem); + + final kdf = Hkdf(hmac: Hmac(Sha256()), outputLength: keyByteLength); + + final driveIdBytes = Uuid.parse(driveIdController.text); + final walletSignature = await wallet + .sign(Uint8List.fromList(utf8.encode('drive') + driveIdBytes)); + const password = '123'; + + final fileIdBytes = + Uint8List.fromList(Uuid.parse('2a038da9-5ebd-4892-898f-8d0a456d25c3')); + + final driveKey = await kdf.deriveKey( + secretKey: SecretKey(walletSignature), + info: utf8.encode(password), + nonce: Uint8List(1), + ); + + final fileKey = await kdf.deriveKey( + secretKey: driveKey, + info: fileIdBytes, + nonce: Uint8List(1), + ); + + final keyData = Uint8List.fromList(await fileKey.extractBytes()); + + final cipherIv = decodeBase64ToBytes('ypXMDf2ls3Nw_A2n'); + + final decrypted = await decryptTransactionDataStream( + Cipher.aes256ctr, + cipherIv, + encryptedFile.openReadStream(), + keyData, + await encryptedFile.length, + ); + + final Uint8List combinedData = await streamToUint8List(decrypted); + + ArDriveIO().saveFile( + await IOFile.fromData( + combinedData, + name: 'decryptedfile.json', + lastModifiedDate: DateTime.now(), + contentType: 'application/json', + ), + ); + } +} + +Future streamToUint8List(Stream stream) async { + List collectedData = await stream.toList(); + int totalLength = + collectedData.fold(0, (prev, element) => prev + element.length); + + final result = Uint8List(totalLength); + int offset = 0; + + for (var data in collectedData) { + result.setRange(offset, offset + data.length, data); + offset += data.length; + } + + return result; +} diff --git a/packages/ardrive_uploader/example/linux/.gitignore b/packages/ardrive_uploader/example/linux/.gitignore new file mode 100644 index 0000000000..d3896c9844 --- /dev/null +++ b/packages/ardrive_uploader/example/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/packages/ardrive_uploader/example/linux/CMakeLists.txt b/packages/ardrive_uploader/example/linux/CMakeLists.txt new file mode 100644 index 0000000000..d67bd4e03e --- /dev/null +++ b/packages/ardrive_uploader/example/linux/CMakeLists.txt @@ -0,0 +1,139 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "example") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.example") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +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() + +# Define build configuration 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. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +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() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +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}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +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) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# 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/packages/ardrive_uploader/example/linux/flutter/CMakeLists.txt b/packages/ardrive_uploader/example/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000000..d5bd01648a --- /dev/null +++ b/packages/ardrive_uploader/example/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +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/packages/ardrive_uploader/example/linux/flutter/generated_plugin_registrant.cc b/packages/ardrive_uploader/example/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000000..18bcac76f6 --- /dev/null +++ b/packages/ardrive_uploader/example/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_saver_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FileSaverPlugin"); + file_saver_plugin_register_with_registrar(file_saver_registrar); + 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) webcrypto_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WebcryptoPlugin"); + webcrypto_plugin_register_with_registrar(webcrypto_registrar); +} diff --git a/packages/ardrive_uploader/example/linux/flutter/generated_plugin_registrant.h b/packages/ardrive_uploader/example/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000000..e0f0a47bc0 --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/linux/flutter/generated_plugins.cmake b/packages/ardrive_uploader/example/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000000..e0aae0036c --- /dev/null +++ b/packages/ardrive_uploader/example/linux/flutter/generated_plugins.cmake @@ -0,0 +1,26 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + file_saver + file_selector_linux + webcrypto +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +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) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/ardrive_uploader/example/linux/main.cc b/packages/ardrive_uploader/example/linux/main.cc new file mode 100644 index 0000000000..e7c5c54370 --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/linux/my_application.cc b/packages/ardrive_uploader/example/linux/my_application.cc new file mode 100644 index 0000000000..0ba8f43096 --- /dev/null +++ b/packages/ardrive_uploader/example/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, "example"); + 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, "example"); + } + + 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/packages/ardrive_uploader/example/linux/my_application.h b/packages/ardrive_uploader/example/linux/my_application.h new file mode 100644 index 0000000000..72271d5e41 --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/macos/.gitignore b/packages/ardrive_uploader/example/macos/.gitignore new file mode 100644 index 0000000000..746adbb6b9 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/packages/ardrive_uploader/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/ardrive_uploader/example/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000000..4b81f9b2d2 --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/macos/Flutter/Flutter-Release.xcconfig b/packages/ardrive_uploader/example/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000000..5caa9d1579 --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/ardrive_uploader/example/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000000..baaa2369d1 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,20 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import device_info_plus +import file_saver +import file_selector_macos +import package_info_plus +import path_provider_foundation + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) + FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin")) + FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) +} diff --git a/packages/ardrive_uploader/example/macos/Podfile b/packages/ardrive_uploader/example/macos/Podfile new file mode 100644 index 0000000000..c795730db8 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Podfile @@ -0,0 +1,43 @@ +platform :osx, '10.14' + +# 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__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/packages/ardrive_uploader/example/macos/Podfile.lock b/packages/ardrive_uploader/example/macos/Podfile.lock new file mode 100644 index 0000000000..24cbad08fe --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Podfile.lock @@ -0,0 +1,47 @@ +PODS: + - device_info_plus (0.0.1): + - FlutterMacOS + - file_saver (0.0.1): + - FlutterMacOS + - file_selector_macos (0.0.1): + - FlutterMacOS + - FlutterMacOS (1.0.0) + - package_info_plus (0.0.1): + - FlutterMacOS + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + +DEPENDENCIES: + - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) + - file_saver (from `Flutter/ephemeral/.symlinks/plugins/file_saver/macos`) + - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) + - FlutterMacOS (from `Flutter/ephemeral`) + - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) + - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) + +EXTERNAL SOURCES: + device_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos + file_saver: + :path: Flutter/ephemeral/.symlinks/plugins/file_saver/macos + file_selector_macos: + :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos + FlutterMacOS: + :path: Flutter/ephemeral + package_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos + path_provider_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin + +SPEC CHECKSUMS: + device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f + file_saver: 44e6fbf666677faf097302460e214e977fdd977b + file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + +PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 + +COCOAPODS: 1.12.1 diff --git a/packages/ardrive_uploader/example/macos/Runner.xcodeproj/project.pbxproj b/packages/ardrive_uploader/example/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..fd891d7dc4 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,791 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + 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 */ + 2F3893C4FA394857EDE6985E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EC48C20670DB57F3EE070706 /* Pods_RunnerTests.framework */; }; + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 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 */; }; + BC0B97D1FCB6F6BD136B8D8C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604410A5FC6A20385A6C2FD /* Pods_Runner.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 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 */ + 19BCFE05DEF2AD6EBC7C3B23 /* 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 = ""; }; + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 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 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.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 = ""; }; + 4195362940A2359DB9D03EDC /* 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 = ""; }; + 6604410A5FC6A20385A6C2FD /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 95D75D3386E13DC0201B8D8B /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + B6F330916364E96B7469FC83 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + C2A452CD14090972BDFE9EDE /* 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 = ""; }; + D9E170A71A3B23AC44F0D06A /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + EC48C20670DB57F3EE070706 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 2F3893C4FA394857EDE6985E /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + BC0B97D1FCB6F6BD136B8D8C /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + 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 */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + A1F822E977F0235EE003EFF5 /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* example.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + 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 = ""; + }; + A1F822E977F0235EE003EFF5 /* Pods */ = { + isa = PBXGroup; + children = ( + 4195362940A2359DB9D03EDC /* Pods-Runner.debug.xcconfig */, + 19BCFE05DEF2AD6EBC7C3B23 /* Pods-Runner.release.xcconfig */, + C2A452CD14090972BDFE9EDE /* Pods-Runner.profile.xcconfig */, + B6F330916364E96B7469FC83 /* Pods-RunnerTests.debug.xcconfig */, + 95D75D3386E13DC0201B8D8B /* Pods-RunnerTests.release.xcconfig */, + D9E170A71A3B23AC44F0D06A /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 6604410A5FC6A20385A6C2FD /* Pods_Runner.framework */, + EC48C20670DB57F3EE070706 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + A12A9EA9E799E40782444B86 /* [CP] Check Pods Manifest.lock */, + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + DE945EA8D5C131ACB31808C5 /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + F179D27B6B5B0E24A6BE4F48 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* example.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 = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 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 */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 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; + alwaysOutOfDate = 1; + 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"; + }; + A12A9EA9E799E40782444B86 /* [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-RunnerTests-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; + }; + DE945EA8D5C131ACB31808C5 /* [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; + }; + F179D27B6B5B0E24A6BE4F48 /* [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; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 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 */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 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 */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B6F330916364E96B7469FC83 /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/example"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 95D75D3386E13DC0201B8D8B /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/example"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D9E170A71A3B23AC44F0D06A /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/example"; + }; + name = Profile; + }; + 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.14; + 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.14; + 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.14; + 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 */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 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/packages/ardrive_uploader/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/ardrive_uploader/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/ardrive_uploader/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/ardrive_uploader/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000000..8fedab682d --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/ardrive_uploader/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/ardrive_uploader/example/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..21a3cc14c7 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/packages/ardrive_uploader/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/ardrive_uploader/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/ardrive_uploader/example/macos/Runner/AppDelegate.swift b/packages/ardrive_uploader/example/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000000..d53ef64377 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..a2ec33f19f --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..82b6f9d9a33e198f5747104729e1fcef999772a5 GIT binary patch literal 102994 zcmeEugo5nb1G~3xi~y`}h6XHx5j$(L*3|5S2UfkG$|UCNI>}4f?MfqZ+HW-sRW5RKHEm z^unW*Xx{AH_X3Xdvb%C(Bh6POqg==@d9j=5*}oEny_IS;M3==J`P0R!eD6s~N<36C z*%-OGYqd0AdWClO!Z!}Y1@@RkfeiQ$Ib_ z&fk%T;K9h`{`cX3Hu#?({4WgtmkR!u3ICS~|NqH^fdNz>51-9)OF{|bRLy*RBv#&1 z3Oi_gk=Y5;>`KbHf~w!`u}!&O%ou*Jzf|Sf?J&*f*K8cftMOKswn6|nb1*|!;qSrlw= zr-@X;zGRKs&T$y8ENnFU@_Z~puu(4~Ir)>rbYp{zxcF*!EPS6{(&J}qYpWeqrPWW< zfaApz%<-=KqxrqLLFeV3w0-a0rEaz9&vv^0ZfU%gt9xJ8?=byvNSb%3hF^X_n7`(fMA;C&~( zM$cQvQ|g9X)1AqFvbp^B{JEX$o;4iPi?+v(!wYrN{L}l%e#5y{j+1NMiT-8=2VrCP zmFX9=IZyAYA5c2!QO96Ea-6;v6*$#ZKM-`%JCJtrA3d~6h{u+5oaTaGE)q2b+HvdZ zvHlY&9H&QJ5|uG@wDt1h99>DdHy5hsx)bN`&G@BpxAHh$17yWDyw_jQhhjSqZ=e_k z_|r3=_|`q~uA47y;hv=6-o6z~)gO}ZM9AqDJsR$KCHKH;QIULT)(d;oKTSPDJ}Jx~G#w-(^r<{GcBC*~4bNjfwHBumoPbU}M)O za6Hc2ik)2w37Yyg!YiMq<>Aov?F2l}wTe+>h^YXcK=aesey^i)QC_p~S zp%-lS5%)I29WfywP(r4@UZ@XmTkqo51zV$|U|~Lcap##PBJ}w2b4*kt7x6`agP34^ z5fzu_8rrH+)2u*CPcr6I`gL^cI`R2WUkLDE5*PX)eJU@H3HL$~o_y8oMRoQ0WF9w| z6^HZDKKRDG2g;r8Z4bn+iJNFV(CG;K-j2>aj229gl_C6n12Jh$$h!}KVhn>*f>KcH z;^8s3t(ccVZ5<{>ZJK@Z`hn_jL{bP8Yn(XkwfRm?GlEHy=T($8Z1Mq**IM`zxN9>-yXTjfB18m_$E^JEaYn>pj`V?n#Xu;Z}#$- zw0Vw;T*&9TK$tKI7nBk9NkHzL++dZ^;<|F6KBYh2+XP-b;u`Wy{~79b%IBZa3h*3^ zF&BKfQ@Ej{7ku_#W#mNJEYYp=)bRMUXhLy2+SPMfGn;oBsiG_6KNL8{p1DjuB$UZB zA)a~BkL)7?LJXlCc}bB~j9>4s7tlnRHC5|wnycQPF_jLl!Avs2C3^lWOlHH&v`nGd zf&U!fn!JcZWha`Pl-B3XEe;(ks^`=Z5R zWyQR0u|do2`K3ec=YmWGt5Bwbu|uBW;6D8}J3{Uep7_>L6b4%(d=V4m#(I=gkn4HT zYni3cnn>@F@Wr<hFAY3Y~dW+3bte;70;G?kTn4Aw5nZ^s5|47 z4$rCHCW%9qa4)4vE%^QPMGf!ET!^LutY$G zqdT(ub5T5b+wi+OrV}z3msoy<4)`IPdHsHJggmog0K*pFYMhH!oZcgc5a)WmL?;TPSrerTVPp<#s+imF3v#!FuBNNa`#6 z!GdTCF|IIpz#(eV^mrYKThA4Bnv&vQet@%v9kuRu3EHx1-2-it@E`%9#u`)HRN#M? z7aJ{wzKczn#w^`OZ>Jb898^Xxq)0zd{3Tu7+{-sge-rQ z&0PME&wIo6W&@F|%Z8@@N3)@a_ntJ#+g{pUP7i?~3FirqU`rdf8joMG^ld?(9b7Iv z>TJgBg#)(FcW)h!_if#cWBh}f+V08GKyg|$P#KTS&%=!+0a%}O${0$i)kn9@G!}En zv)_>s?glPiLbbx)xk(lD-QbY(OP3;MSXM5E*P&_`Zks2@46n|-h$Y2L7B)iH{GAAq19h5-y0q>d^oy^y+soJu9lXxAe%jcm?=pDLFEG2kla40e!5a}mpe zdL=WlZ=@U6{>g%5a+y-lx)01V-x;wh%F{=qy#XFEAqcd+m}_!lQ)-9iiOL%&G??t| z?&NSdaLqdPdbQs%y0?uIIHY7rw1EDxtQ=DU!i{)Dkn~c$LG5{rAUYM1j5*G@oVn9~ zizz{XH(nbw%f|wI=4rw^6mNIahQpB)OQy10^}ACdLPFc2@ldVi|v@1nWLND?)53O5|fg`RZW&XpF&s3@c-R?aad!$WoH6u0B|}zt)L($E^@U- zO#^fxu9}Zw7Xl~nG1FVM6DZSR0*t!4IyUeTrnp@?)Z)*!fhd3)&s(O+3D^#m#bAem zpf#*aiG_0S^ofpm@9O7j`VfLU0+{$x!u^}3!zp=XST0N@DZTp!7LEVJgqB1g{psNr za0uVmh3_9qah14@M_pi~vAZ#jc*&aSm$hCNDsuQ-zPe&*Ii#2=2gP+DP4=DY z_Y0lUsyE6yaV9)K)!oI6+*4|spx2at*30CAx~6-5kfJzQ`fN8$!lz%hz^J6GY?mVH zbYR^JZ(Pmj6@vy-&!`$5soyy-NqB^8cCT40&R@|6s@m+ZxPs=Bu77-+Os7+bsz4nA3DrJ8#{f98ZMaj-+BD;M+Jk?pgFcZIb}m9N z{ct9T)Kye&2>l^39O4Q2@b%sY?u#&O9PO4@t0c$NUXG}(DZJ<;_oe2~e==3Z1+`Zo zFrS3ns-c}ZognVBHbg#e+1JhC(Yq7==rSJQ8J~}%94(O#_-zJKwnBXihl#hUd9B_>+T& z7eHHPRC?5ONaUiCF7w|{J`bCWS7Q&xw-Sa={j-f)n5+I=9s;E#fBQB$`DDh<^mGiF zu-m_k+)dkBvBO(VMe2O4r^sf3;sk9K!xgXJU>|t9Vm8Ty;fl5pZzw z9j|}ZD}6}t;20^qrS?YVPuPRS<39d^y0#O1o_1P{tN0?OX!lc-ICcHI@2#$cY}_CY zev|xdFcRTQ_H)1fJ7S0*SpPs8e{d+9lR~IZ^~dKx!oxz?=Dp!fD`H=LH{EeC8C&z-zK$e=!5z8NL=4zx2{hl<5z*hEmO=b-7(k5H`bA~5gT30Sjy`@-_C zKM}^so9Ti1B;DovHByJkTK87cfbF16sk-G>`Q4-txyMkyQS$d}??|Aytz^;0GxvOs zPgH>h>K+`!HABVT{sYgzy3CF5ftv6hI-NRfgu613d|d1cg^jh+SK7WHWaDX~hlIJ3 z>%WxKT0|Db1N-a4r1oPKtF--^YbP=8Nw5CNt_ZnR{N(PXI>Cm$eqi@_IRmJ9#)~ZHK_UQ8mi}w^`+4$OihUGVz!kW^qxnCFo)-RIDbA&k-Y=+*xYv5y4^VQ9S)4W5Pe?_RjAX6lS6Nz#!Hry=+PKx2|o_H_3M`}Dq{Bl_PbP(qel~P@=m}VGW*pK96 zI@fVag{DZHi}>3}<(Hv<7cVfWiaVLWr@WWxk5}GDEbB<+Aj;(c>;p1qmyAIj+R!`@#jf$ zy4`q23L-72Zs4j?W+9lQD;CYIULt%;O3jPWg2a%Zs!5OW>5h1y{Qof!p&QxNt5=T( zd5fy&7=hyq;J8%86YBOdc$BbIFxJx>dUyTh`L z-oKa=OhRK9UPVRWS`o2x53bAv+py)o)kNL6 z9W1Dlk-g6Ht@-Z^#6%`9S9`909^EMj?9R^4IxssCY-hYzei^TLq7Cj>z$AJyaU5=z zl!xiWvz0U8kY$etrcp8mL;sYqGZD!Hs-U2N{A|^oEKA482v1T%cs%G@X9M?%lX)p$ zZoC7iYTPe8yxY0Jne|s)fCRe1mU=Vb1J_&WcIyP|x4$;VSVNC`M+e#oOA`#h>pyU6 z?7FeVpk`Hsu`~T3i<_4<5fu?RkhM;@LjKo6nX>pa%8dSdgPO9~Jze;5r>Tb1Xqh5q z&SEdTXevV@PT~!O6z|oypTk7Qq+BNF5IQ(8s18c=^0@sc8Gi|3e>VKCsaZ?6=rrck zl@oF5Bd0zH?@15PxSJIRroK4Wa?1o;An;p0#%ZJ^tI=(>AJ2OY0GP$E_3(+Zz4$AQ zW)QWl<4toIJ5TeF&gNXs>_rl}glkeG#GYbHHOv-G!%dJNoIKxn)FK$5&2Zv*AFic! z@2?sY&I*PSfZ8bU#c9fdIJQa_cQijnj39-+hS@+~e*5W3bj%A}%p9N@>*tCGOk+cF zlcSzI6j%Q|2e>QG3A<86w?cx6sBtLNWF6_YR?~C)IC6_10SNoZUHrCpp6f^*+*b8` zlx4ToZZuI0XW1W)24)92S)y0QZa);^NRTX6@gh8@P?^=#2dV9s4)Q@K+gnc{6|C}& zDLHr7nDOLrsH)L@Zy{C_2UrYdZ4V{|{c8&dRG;wY`u>w%$*p>PO_}3`Y21pk?8Wtq zGwIXTulf7AO2FkPyyh2TZXM1DJv>hI`}x`OzQI*MBc#=}jaua&czSkI2!s^rOci|V zFkp*Vbiz5vWa9HPFXMi=BV&n3?1?%8#1jq?p^3wAL`jgcF)7F4l<(H^!i=l-(OTDE zxf2p71^WRIExLf?ig0FRO$h~aA23s#L zuZPLkm>mDwBeIu*C7@n@_$oSDmdWY7*wI%aL73t~`Yu7YwE-hxAATmOi0dmB9|D5a zLsR7OQcA0`vN9m0L|5?qZ|jU+cx3_-K2!K$zDbJ$UinQy<9nd5ImWW5n^&=Gg>Gsh zY0u?m1e^c~Ug39M{{5q2L~ROq#c{eG8Oy#5h_q=#AJj2Yops|1C^nv0D1=fBOdfAG z%>=vl*+_w`&M7{qE#$xJJp_t>bSh7Mpc(RAvli9kk3{KgG5K@a-Ue{IbU{`umXrR3ra5Y7xiX42+Q%N&-0#`ae_ z#$Y6Wa++OPEDw@96Zz##PFo9sADepQe|hUy!Zzc2C(L`k9&=a8XFr+!hIS>D2{pdGP1SzwyaGLiH3j--P>U#TWw90t8{8Bt%m7Upspl#=*hS zhy|(XL6HOqBW}Og^tLX7 z+`b^L{O&oqjwbxDDTg2B;Yh2(fW>%S5Pg8^u1p*EFb z`(fbUM0`afawYt%VBfD&b3MNJ39~Ldc@SAuzsMiN%E}5{uUUBc7hc1IUE~t-Y9h@e7PC|sv$xGx=hZiMXNJxz5V(np%6u{n24iWX#!8t#>Ob$in<>dw96H)oGdTHnU zSM+BPss*5)Wz@+FkooMxxXZP1{2Nz7a6BB~-A_(c&OiM)UUNoa@J8FGxtr$)`9;|O z(Q?lq1Q+!E`}d?KemgC!{nB1JJ!B>6J@XGQp9NeQvtbM2n7F%v|IS=XWPVZY(>oq$ zf=}8O_x`KOxZoGnp=y24x}k6?gl_0dTF!M!T`={`Ii{GnT1jrG9gPh)R=RZG8lIR| z{ZJ6`x8n|y+lZuy${fuEDTAf`OP!tGySLXD}ATJO5UoZv|Xo3%7O~L63+kw}v)Ci=&tWx3bQJfL@5O18CbPlkR^IcKA zy1=^Vl-K-QBP?9^R`@;czcUw;Enbbyk@vJQB>BZ4?;DM%BUf^eZE+sOy>a){qCY6Y znYy;KGpch-zf=5|p#SoAV+ie8M5(Xg-{FoLx-wZC9IutT!(9rJ8}=!$!h%!J+vE2e z(sURwqCC35v?1>C1L)swfA^sr16{yj7-zbT6Rf26-JoEt%U?+|rQ zeBuGohE?@*!zR9)1P|3>KmJSgK*fOt>N>j}LJB`>o(G#Dduvx7@DY7};W7K;Yj|8O zGF<+gTuoIKe7Rf+LQG3-V1L^|E;F*}bQ-{kuHq}| ze_NwA7~US19sAZ)@a`g*zkl*ykv2v3tPrb4Og2#?k6Lc7@1I~+ew48N&03hW^1Cx+ zfk5Lr4-n=#HYg<7ka5i>2A@ZeJ60gl)IDX!!p zzfXZQ?GrT>JEKl7$SH!otzK6=0dIlqN)c23YLB&Krf9v-{@V8p+-e2`ujFR!^M%*; ze_7(Jh$QgoqwB!HbX=S+^wqO15O_TQ0-qX8f-|&SOuo3ZE{{9Jw5{}>MhY}|GBhO& zv48s_B=9aYQfa;d>~1Z$y^oUUaDer>7ve5+Gf?rIG4GZ!hRKERlRNgg_C{W_!3tsI2TWbX8f~MY)1Q`6Wj&JJ~*;ay_0@e zzx+mE-pu8{cEcVfBqsnm=jFU?H}xj@%CAx#NO>3 z_re3Rq%d1Y7VkKy{=S73&p;4^Praw6Y59VCP6M?!Kt7{v#DG#tz?E)`K95gH_mEvb z%$<~_mQ$ad?~&T=O0i0?`YSp?E3Dj?V>n+uTRHAXn`l!pH9Mr}^D1d@mkf+;(tV45 zH_yfs^kOGLXlN*0GU;O&{=awxd?&`{JPRr$z<1HcAO2K`K}92$wC}ky&>;L?#!(`w z68avZGvb728!vgw>;8Z8I@mLtI`?^u6R>sK4E7%=y)jpmE$fH!Dj*~(dy~-2A5Cm{ zl{1AZw`jaDmfvaB?jvKwz!GC}@-Dz|bFm1OaPw(ia#?>vF7Y5oh{NVbyD~cHB1KFn z9C@f~X*Wk3>sQH9#D~rLPslAd26@AzMh=_NkH_yTNXx6-AdbAb z{Ul89YPHslD?xAGzOlQ*aMYUl6#efCT~WI zOvyiewT=~l1W(_2cEd(8rDywOwjM-7P9!8GCL-1<9KXXO=6%!9=W++*l1L~gRSxLVd8K=A7&t52ql=J&BMQu{fa6y zXO_e>d?4X)xp2V8e3xIQGbq@+vo#&n>-_WreTTW0Yr?|YRPP43cDYACMQ(3t6(?_k zfgDOAU^-pew_f5U#WxRXB30wcfDS3;k~t@b@w^GG&<5n$Ku?tT(%bQH(@UHQGN)N|nfC~7?(etU`}XB)$>KY;s=bYGY#kD%i9fz= z2nN9l?UPMKYwn9bX*^xX8Y@%LNPFU>s#Ea1DaP%bSioqRWi9JS28suTdJycYQ+tW7 zrQ@@=13`HS*dVKaVgcem-45+buD{B;mUbY$YYULhxK)T{S?EB<8^YTP$}DA{(&)@S zS#<8S96y9K2!lG^VW-+CkfXJIH;Vo6wh)N}!08bM$I7KEW{F6tqEQ?H@(U zAqfi%KCe}2NUXALo;UN&k$rU0BLNC$24T_mcNY(a@lxR`kqNQ0z%8m>`&1ro40HX} z{{3YQ;2F9JnVTvDY<4)x+88i@MtXE6TBd7POk&QfKU-F&*C`isS(T_Q@}K)=zW#K@ zbXpcAkTT-T5k}Wj$dMZl7=GvlcCMt}U`#Oon1QdPq%>9J$rKTY8#OmlnNWBYwafhx zqFnym@okL#Xw>4SeRFejBnZzY$jbO)e^&&sHBgMP%Ygfi!9_3hp17=AwLBNFTimf0 zw6BHNXw19Jg_Ud6`5n#gMpqe%9!QB^_7wAYv8nrW94A{*t8XZu0UT&`ZHfkd(F{Px zD&NbRJP#RX<=+sEeGs2`9_*J2OlECpR;4uJie-d__m*(aaGE}HIo+3P{my@;a~9Y$ zHBXVJ83#&@o6{M+pE9^lI<4meLLFN_3rwgR4IRyp)~OF0n+#ORrcJ2_On9-78bWbG zuCO0esc*n1X3@p1?lN{qWS?l7J$^jbpeel{w~51*0CM+q9@9X=>%MF(ce~om(}?td zjkUmdUR@LOn-~6LX#=@a%rvj&>DFEoQscOvvC@&ZB5jVZ-;XzAshwx$;Qf@U41W=q zOSSjQGQV8Qi3*4DngNMIM&Cxm7z*-K`~Bl(TcEUxjQ1c=?)?wF8W1g;bAR%sM#LK( z_Op?=P%)Z+J!>vpN`By0$?B~Out%P}kCriDq@}In&fa_ZyKV+nLM0E?hfxuu%ciUz z>yAk}OydbWNl7{)#112j&qmw;*Uj&B;>|;Qwfc?5wIYIHH}s6Mve@5c5r+y)jK9i( z_}@uC(98g)==AGkVN?4>o@w=7x9qhW^ zB(b5%%4cHSV?3M?k&^py)j*LK16T^Ef4tb05-h-tyrjt$5!oo4spEfXFK7r_Gfv7#x$bsR7T zs;dqxzUg9v&GjsQGKTP*=B(;)be2aN+6>IUz+Hhw-n>^|`^xu*xvjGPaDoFh2W4-n z@Wji{5Y$m>@Vt7TE_QVQN4*vcfWv5VY-dT0SV=l=8LAEq1go*f zkjukaDV=3kMAX6GAf0QOQHwP^{Z^=#Lc)sh`QB)Ftl&31jABvq?8!3bt7#8vxB z53M{4{GR4Hl~;W3r}PgXSNOt477cO62Yj(HcK&30zsmWpvAplCtpp&mC{`2Ue*Bwu zF&UX1;w%`Bs1u%RtGPFl=&sHu@Q1nT`z={;5^c^^S~^?2-?<|F9RT*KQmfgF!7=wD@hytxbD;=9L6PZrK*1<4HMObNWehA62DtTy)q5H|57 z9dePuC!1;0MMRRl!S@VJ8qG=v^~aEU+}2Qx``h1LII!y{crP2ky*R;Cb;g|r<#ryo zju#s4dE?5CTIZKc*O4^3qWflsQ(voX>(*_JP7>Q&$%zCAIBTtKC^JUi@&l6u&t0hXMXjz_y!;r@?k|OU9aD%938^TZ>V? zqJmom_6dz4DBb4Cgs_Ef@}F%+cRCR%UMa9pi<-KHN;t#O@cA%(LO1Rb=h?5jiTs93 zPLR78p+3t>z4|j=<>2i4b`ketv}9Ax#B0)hn7@bFl;rDfP8p7u9XcEb!5*PLKB(s7wQC2kzI^@ae)|DhNDmSy1bOLid%iIap@24A(q2XI!z_hkl-$1T10 z+KKugG4-}@u8(P^S3PW4x>an;XWEF-R^gB{`t8EiP{ZtAzoZ!JRuMRS__-Gg#Qa3{<;l__CgsF+nfmFNi}p z>rV!Y6B@cC>1up)KvaEQiAvQF!D>GCb+WZsGHjDeWFz?WVAHP65aIA8u6j6H35XNYlyy8>;cWe3ekr};b;$9)0G`zsc9LNsQ&D?hvuHRpBxH)r-1t9|Stc*u<}Ol&2N+wPMom}d15_TA=Aprp zjN-X3*Af$7cDWMWp##kOH|t;c2Pa9Ml4-)o~+7P;&q8teF-l}(Jt zTGKOQqJTeT!L4d}Qw~O0aanA$Vn9Rocp-MO4l*HK)t%hcp@3k0%&_*wwpKD6ThM)R z8k}&7?)YS1ZYKMiy?mn>VXiuzX7$Ixf7EW8+C4K^)m&eLYl%#T=MC;YPvD&w#$MMf zQ=>`@rh&&r!@X&v%ZlLF42L_c=5dSU^uymKVB>5O?AouR3vGv@ei%Z|GX5v1GK2R* zi!!}?+-8>J$JH^fPu@)E6(}9$d&9-j51T^n-e0Ze%Q^)lxuex$IL^XJ&K2oi`wG}QVGk2a7vC4X?+o^z zsCK*7`EUfSuQA*K@Plsi;)2GrayQOG9OYF82Hc@6aNN5ulqs1Of-(iZQdBI^U5of^ zZg2g=Xtad7$hfYu6l~KDQ}EU;oIj(3nO#u9PDz=eO3(iax7OCmgT2p_7&^3q zg7aQ;Vpng*)kb6=sd5?%j5Dm|HczSChMo8HHq_L8R;BR5<~DVyU$8*Tk5}g0eW5x7 z%d)JFZ{(Y<#OTKLBA1fwLM*fH7Q~7Sc2Ne;mVWqt-*o<;| z^1@vo_KTYaMnO$7fbLL+qh#R$9bvnpJ$RAqG+z8h|} z3F5iwG*(sCn9Qbyg@t0&G}3fE0jGq3J!JmG2K&$urx^$z95) z7h?;4vE4W=v)uZ*Eg3M^6f~|0&T)2D;f+L_?M*21-I1pnK(pT$5l#QNlT`SidYw~o z{`)G)Asv#cue)Ax1RNWiRUQ(tQ(bzd-f2U4xlJK+)ZWBxdq#fp=A>+Qc%-tl(c)`t z$e2Ng;Rjvnbu7((;v4LF9Y1?0el9hi!g>G{^37{ z`^s-03Z5jlnD%#Mix19zkU_OS|86^_x4<0(*YbPN}mi-$L?Z4K(M|2&VV*n*ZYN_UqI?eKZi3!b)i z%n3dzUPMc-dc|q}TzvPy!VqsEWCZL(-eURDRG4+;Eu!LugSSI4Fq$Ji$Dp08`pfP_C5Yx~`YKcywlMG;$F z)R5!kVml_Wv6MSpeXjG#g?kJ0t_MEgbXlUN3k|JJ%N>|2xn8yN>>4qxh!?dGI}s|Y zDTKd^JCrRSN+%w%D_uf=Tj6wIV$c*g8D96jb^Kc#>5Fe-XxKC@!pIJw0^zu;`_yeb zhUEm-G*C=F+jW%cP(**b61fTmPn2WllBr4SWNdKe*P8VabZsh0-R|?DO=0x`4_QY) zR7sthW^*BofW7{Sak&S1JdiG?e=SfL24Y#w_)xrBVhGB-13q$>mFU|wd9Xqe-o3{6 zSn@@1@&^)M$rxb>UmFuC+pkio#T;mSnroMVZJ%nZ!uImi?%KsIX#@JU2VY(`kGb1A z7+1MEG)wd@)m^R|a2rXeviv$!emwcY(O|M*xV!9%tBzarBOG<4%gI9SW;Um_gth4=gznYzOFd)y8e+3APCkL)i-OI`;@7-mCJgE`js(M} z;~ZcW{{FMVVO)W>VZ}ILouF#lWGb%Couu}TI4kubUUclW@jEn6B_^v!Ym*(T*4HF9 zWhNKi8%sS~viSdBtnrq!-Dc5(G^XmR>DFx8jhWvR%*8!m*b*R8e1+`7{%FACAK`7 zzdy8TmBh?FVZ0vtw6npnWwM~XjF2fNvV#ZlGG z?FxHkXHN>JqrBYoPo$)zNC7|XrQfcqmEXWud~{j?La6@kbHG@W{xsa~l1=%eLly8B z4gCIH05&Y;6O2uFSopNqP|<$ml$N40^ikxw0`o<~ywS1(qKqQN!@?Ykl|bE4M?P+e zo$^Vs_+x)iuw?^>>`$&lOQOUkZ5>+OLnRA)FqgpDjW&q*WAe(_mAT6IKS9;iZBl8M z<@=Y%zcQUaSBdrs27bVK`c$)h6A1GYPS$y(FLRD5Yl8E3j0KyH08#8qLrsc_qlws; znMV%Zq8k+&T2kf%6ZO^2=AE9>?a587g%-={X}IS~P*I(NeCF9_9&`)|ok0iiIun zo+^odT0&Z4k;rn7I1v87=z!zKU(%gfB$(1mrRYeO$sbqM22Kq68z9wgdg8HBxp>_< zn9o%`f?sVO=IN#5jSX&CGODWlZfQ9A)njK2O{JutYwRZ?n0G_p&*uwpE`Md$iQxrd zoQfF^b8Ou)+3BO_3_K5y*~?<(BF@1l+@?Z6;^;U>qlB)cdro;rxOS1M{Az$s^9o5sXDCg8yD<=(pKI*0e zLk>@lo#&s0)^*Q+G)g}C0IErqfa9VbL*Qe=OT@&+N8m|GJF7jd83vY#SsuEv2s{Q> z>IpoubNs>D_5?|kXGAPgF@mb_9<%hjU;S0C8idI)a=F#lPLuQJ^7OnjJlH_Sks9JD zMl1td%YsWq3YWhc;E$H1<0P$YbSTqs`JKY%(}svsifz|h8BHguL82dBl+z0^YvWk8 zGy;7Z0v5_FJ2A$P0wIr)lD?cPR%cz>kde!=W%Ta^ih+Dh4UKdf7ip?rBz@%y2&>`6 zM#q{JXvW9ZlaSk1oD!n}kSmcDa2v6T^Y-dy+#fW^y>eS8_%<7tWXUp8U@s$^{JFfKMjDAvR z$YmVB;n3ofl!ro9RNT!TpQpcycXCR}$9k5>IPWDXEenQ58os?_weccrT+Bh5sLoiH zZ_7~%t(vT)ZTEO= zb0}@KaD{&IyK_sd8b$`Qz3%UA`nSo zn``!BdCeN!#^G;lK@G2ron*0jQhbdw)%m$2;}le@z~PSLnU-z@tL)^(p%P>OO^*Ff zNRR9oQ`W+x^+EU+3BpluwK77|B3=8QyT|$V;02bn_LF&3LhLA<#}{{)jE)}CiW%VEU~9)SW+=F%7U-iYlQ&q!#N zwI2{(h|Pi&<8_fqvT*}FLN^0CxN}#|3I9G_xmVg$gbn2ZdhbmGk7Q5Q2Tm*ox8NMo zv`iaZW|ZEOMyQga5fts?&T-eCCC9pS0mj7v0SDkD=*^MxurP@89v&Z#3q{FM!a_nr zb?KzMv`BBFOew>4!ft@A&(v-kWXny-j#egKef|#!+3>26Qq0 zv!~8ev4G`7Qk>V1TaMT-&ziqoY3IJp8_S*%^1j73D|=9&;tDZH^!LYFMmME4*Wj(S zRt~Q{aLb_O;wi4u&=}OYuj}Lw*j$@z*3>4&W{)O-oi@9NqdoU!=U%d|se&h?^$Ip# z)BY+(1+cwJz!yy4%l(aLC;T!~Ci>yAtXJb~b*yr&v7f{YCU8P|N1v~H`xmGsG)g)y z4%mv=cPd`s7a*#OR7f0lpD$ueP>w8qXj0J&*7xX+U!uat5QNk>zwU$0acn5p=$88L=jn_QCSYkTV;1~(yUem#0gB`FeqY98sf=>^@ z_MCdvylv~WL%y_%y_FE1)j;{Szj1+K7Lr_y=V+U zk6Tr;>XEqlEom~QGL!a+wOf(@ZWoxE<$^qHYl*H1a~kk^BLPn785%nQb$o;Cuz0h& za9LMx^bKEbPS%e8NM33Jr|1T|ELC(iE!FUci38xW_Y7kdHid#2ie+XZhP;2!Z;ZAM zB_cXKm)VrPK!SK|PY00Phwrpd+x0_Aa;}cDQvWKrwnQrqz##_gvHX2ja?#_{f#;bz`i>C^^ zTLDy;6@HZ~XQi7rph!mz9k!m;KchA)uMd`RK4WLK7)5Rl48m#l>b(#`WPsl<0j z-sFkSF6>Nk|LKnHtZ`W_NnxZP62&w)S(aBmmjMDKzF%G;3Y?FUbo?>b5;0j8Lhtc4 zr*8d5Y9>g@FFZaViw7c16VsHcy0u7M%6>cG1=s=Dtx?xMJSKIu9b6GU8$uSzf43Y3 zYq|U+IWfH;SM~*N1v`KJo!|yfLxTFS?oHsr3qvzeVndVV^%BWmW6re_S!2;g<|Oao z+N`m#*i!)R%i1~NO-xo{qpwL0ZrL7hli;S z3L0lQ_z}z`fdK39Mg~Zd*%mBdD;&5EXa~@H(!###L`ycr7gW`f)KRuqyHL3|uyy3h zSS^td#E&Knc$?dXs*{EnPYOp^-vjAc-h4z#XkbG&REC7;0>z^^Z}i8MxGKerEY z>l?(wReOlXEsNE5!DO&ZWyxY)gG#FSZs%fXuzA~XIAPVp-%yb2XLSV{1nH6{)5opg z(dZKckn}Q4Li-e=eUDs1Psg~5zdn1>ql(*(nn6)iD*OcVkwmKL(A{fix(JhcVB&}V zVt*Xb!{gzvV}dc446>(D=SzfCu7KB`oMjv6kPzSv&B>>HLSJP|wN`H;>oRw*tl#N) z*zZ-xwM7D*AIsBfgqOjY1Mp9aq$kRa^dZU_xw~KxP;|q(m+@e+YSn~`wEJzM|Ippb zzb@%;hB7iH4op9SqmX?j!KP2chsb79(mFossBO-Zj8~L}9L%R%Bw<`^X>hjkCY5SG z7lY!8I2mB#z)1o;*3U$G)3o0A&{0}#B;(zPd2`OF`Gt~8;0Re8nIseU z_yzlf$l+*-wT~_-cYk$^wTJ@~7i@u(CZs9FVkJCru<*yK8&>g+t*!JqCN6RH%8S-P zxH8+Cy#W?!;r?cLMC(^BtAt#xPNnwboI*xWw#T|IW^@3|q&QYY6Ehxoh@^URylR|T zne-Y6ugE^7p5bkRDWIh)?JH5V^ub82l-LuVjDr7UT^g`q4dB&mBFRWGL_C?hoeL(% zo}ocH5t7|1Mda}T!^{Qt9vmA2ep4)dQSZO>?Eq8}qRp&ZJ?-`Tnw+MG(eDswP(L*X3ahC2Ad0_wD^ff9hfzb%Jd`IXx5 zae@NMzBXJDwJS?7_%!TB^E$N8pvhOHDK$7YiOelTY`6KX8hK6YyT$tk*adwN>s^Kp zwM3wGVPhwKU*Yq-*BCs}l`l#Tej(NQ>jg*S0TN%D+GcF<14Ms6J`*yMY;W<-mMN&-K>((+P}+t+#0KPGrzjP zJ~)=Bcz%-K!L5ozIWqO(LM)l_9lVOc4*S65&DKM#TqsiWNG{(EZQw!bc>qLW`=>p-gVJ;T~aN2D_- z{>SZC=_F+%hNmH6ub%Ykih0&YWB!%sd%W5 zHC2%QMP~xJgt4>%bU>%6&uaDtSD?;Usm}ari0^fcMhi_)JZgb1g5j zFl4`FQ*%ROfYI}e7RIq^&^a>jZF23{WB`T>+VIxj%~A-|m=J7Va9FxXV^%UwccSZd zuWINc-g|d6G5;95*%{e;9S(=%yngpfy+7ao|M7S|Jb0-4+^_q-uIqVS&ufU880UDH*>(c)#lt2j zzvIEN>>$Y(PeALC-D?5JfH_j+O-KWGR)TKunsRYKLgk7eu4C{iF^hqSz-bx5^{z0h ze2+u>Iq0J4?)jIo)}V!!m)%)B;a;UfoJ>VRQ*22+ncpe9f4L``?v9PH&;5j{WF?S_C>Lq>nkChZB zjF8(*v0c(lU^ZI-)_uGZnnVRosrO4`YinzI-RSS-YwjYh3M`ch#(QMNw*)~Et7Qpy z{d<3$4FUAKILq9cCZpjvKG#yD%-juhMj>7xIO&;c>_7qJ%Ae8Z^m)g!taK#YOW3B0 zKKSMOd?~G4h}lrZbtPk)n*iOC1~mDhASGZ@N{G|dF|Q^@1ljhe=>;wusA&NvY*w%~ zl+R6B^1yZiF)YN>0ms%}qz-^U-HVyiN3R9k1q4)XgDj#qY4CE0)52%evvrrOc898^ z*^)XFR?W%g0@?|6Mxo1ZBp%(XNv_RD-<#b^?-Fs+NL^EUW=iV|+Vy*F%;rBz~pN7%-698U-VMfGEVnmEz7fL1p)-5sLT zL;Iz>FCLM$p$c}g^tbkGK1G$IALq1Gd|We@&TtW!?4C7x4l*=4oF&&sr0Hu`x<5!m zhX&&Iyjr?AkNXU_5P_b^Q3U9sy#f6ZF@2C96$>1k*E-E%DjwvA{VL0PdU~suN~DZo zm{T!>sRdp`Ldpp9olrH@(J$QyGq!?#o1bUo=XP2OEuT3`XzI>s^0P{manUaE4pI%! zclQq;lbT;nx7v3tR9U)G39h?ryrxzd0xq4KX7nO?piJZbzT_CU&O=T(Vt;>jm?MgC z2vUL#*`UcMsx%w#vvjdamHhmN!(y-hr~byCA-*iCD};#l+bq;gkwQ0oN=AyOf@8ow>Pj<*A~2*dyjK}eYdN);%!t1 z6Y=|cuEv-|5BhA?n2Db@4s%y~(%Wse4&JXw=HiO48%c6LB~Z0SL1(k^9y?ax%oj~l zf7(`iAYLdPRq*ztFC z7VtAb@s{as%&Y;&WnyYl+6Wm$ru*u!MKIg_@01od-iQft0rMjIj8e7P9eKvFnx_X5 zd%pDg-|8<>T2Jdqw>AII+fe?CgP+fL(m0&U??QL8YzSjV{SFi^vW~;wN@or_(q<0Y zRt~L}#JRcHOvm$CB)T1;;7U>m%)QYBLTR)KTARw%zoDxgssu5#v{UEVIa<>{8dtkm zXgbCGp$tfue+}#SD-PgiNT{Zu^YA9;4BnM(wZ9-biRo_7pN}=aaimjYgC=;9@g%6< zxol5sT_$<8{LiJ6{l1+sV)Z_QdbsfEAEMw!5*zz6)Yop?T0DMtR_~wfta)E6_G@k# zZRP11D}$ir<`IQ`<(kGfAS?O-DzCyuzBq6dxGTNNTK?r^?zT30mLY!kQ=o~Hv*k^w zvq!LBjW=zzIi%UF@?!g9vt1CqdwV(-2LYy2=E@Z?B}JDyVkluHtzGsWuI1W5svX~K z&?UJ45$R7g>&}SFnLnmw09R2tUgmr_w6mM9C}8GvQX>nL&5R#xBqnp~Se(I>R42`T zqZe9p6G(VzNB3QD><8+y%{e%6)sZDRXTR|MI zM#eZmao-~_`N|>Yf;a;7yvd_auTG#B?Vz5D1AHx=zpVUFe7*hME z+>KH5h1In8hsVhrstc>y0Q!FHR)hzgl+*Q&5hU9BVJlNGRkXiS&06eOBV^dz3;4d5 zeYX%$62dNOprZV$px~#h1RH?_E%oD6y;J;pF%~y8M)8pQ0olYKj6 zE+hd|7oY3ot=j9ZZ))^CCPADL6Jw%)F@A{*coMApcA$7fZ{T@3;WOQ352F~q6`Mgi z$RI6$8)a`Aaxy<8Bc;{wlDA%*%(msBh*xy$L-cBJvQ8hj#FCyT^%+Phw1~PaqyDou^JR0rxDkSrmAdjeYDFDZ`E z)G3>XtpaSPDlydd$RGHg;#4|4{aP5c_Om z2u5xgnhnA)K%8iU==}AxPxZCYC)lyOlj9as#`5hZ=<6<&DB%i_XCnt5=pjh?iusH$ z>)E`@HNZcAG&RW3Ys@`Ci{;8PNzE-ZsPw$~Wa!cP$ye+X6;9ceE}ah+3VY7Mx}#0x zbqYa}eO*FceiY2jNS&2cH9Y}(;U<^^cWC5Ob&)dZedvZA9HewU3R;gRQ)}hUdf+~Q zS_^4ds*W1T#bxS?%RH&<739q*n<6o|mV;*|1s>ly-Biu<2*{!!0#{_234&9byvn0* z5=>{95Zfb{(?h_Jk#ocR$FZ78O*UTOxld~0UF!kyGM|nH%B*qf)Jy}N!uT9NGeM19 z-@=&Y0yGGo_dw!FD>juk%P$6$qJkj}TwLBoefi;N-$9LAeV|)|-ET&culW9Sb_pc_ zp{cXI0>I0Jm_i$nSvGnYeLSSj{ccVS2wyL&0x~&5v;3Itc82 z5lIAkfn~wcY-bQB$G!ufWt%qO;P%&2B_R5UKwYxMemIaFm)qF1rA zc>gEihb=jBtsXCi0T%J37s&kt*3$s7|6)L(%UiY)6axuk{6RWIS8^+u;)6!R?Sgap z9|6<0bx~AgVi|*;zL@2x>Pbt2Bz*uv4x-`{F)XatTs`S>unZ#P^ZiyjpfL_q2z^fqgR-fbOcG=Y$q>ozkw1T6dH8-)&ww+z?E0 zR|rV(9bi6zpX3Ub>PrPK!{X>e$C66qCXAeFm)Y+lX8n2Olt7PNs*1^si)j!QmFV#t z0P2fyf$N^!dyTot&`Ew5{i5u<8D`8U`qs(KqaWq5iOF3x2!-z65-|HsyYz(MAKZ?< zCpQR;E)wn%s|&q(LVm0Ab>gdmCFJeKwVTnv@Js%!At;I=A>h=l=p^&<4;Boc{$@h< z38v`3&2wJtka@M}GS%9!+SpJ}sdtoYzMevVbnH+d_eMxN@~~ zZq@k)7V5f8u!yAX2qF3qjS7g%n$JuGrMhQF!&S^7(%Y{rP*w2FWj(v_J{+Hg*}wdWOd~pHQ19&n3RWeljK9W%sz&Y3Tm3 zR`>6YR54%qBHGa)2xbs`9cs_EsNHxsfraEgZ)?vrtooeA0sPKJK7an){ngtV@{SBa zkO6ORr1_Xqp+`a0e}sC*_y(|RKS13ikmHp3C^XkE@&wjbGWrt^INg^9lDz#B;bHiW zkK4{|cg08b!yHFSgPca5)vF&gqCgeu+c82%&FeM^Bb}GUxLy-zo)}N;#U?sJ2?G2BNe*9u_7kE5JeY!it=f`A_4gV3} z`M!HXZy#gN-wS!HvHRqpCHUmjiM;rVvpkC!voImG%OFVN3k(QG@X%e``VJSJ@Z7tb z*Onlf>z^D+&$0!4`IE$;2-NSO9HQWd+UFW(r;4hh;(j^p4H-~6OE!HQp^96v?{9Zt z;@!ZcccV%C2s6FMP#qvo4kG6C04A>XILt>JW}%0oE&HM5f6 zYLD!;My>CW+j<~=Wzev{aYtx2ZNw|ptTFV(4;9`6Tmbz6K1)fv4qPXa2mtoPt&c?P zhmO+*o8uP3ykL6E$il00@TDf6tOW7fmo?Oz_6GU^+5J=c22bWyuH#aNj!tT-^IHrJ zu{aqTYw@q;&$xDE*_kl50Jb*dp`(-^p={z}`rqECTi~3 z>0~A7L6X)=L5p#~$V}gxazgGT7$3`?a)zen>?TvAuQ+KAIAJ-s_v}O6@`h9n-sZk> z`3{IJeb2qu9w=P*@q>iC`5wea`KxCxrx{>(4{5P+!cPg|pn~;n@DiZ0Y>;k5mnKeS z!LIfT4{Lgd=MeysR5YiQKCeNhUQ;Os1kAymg6R!u?j%LF z4orCszIq_n52ulpes{(QN|zirdtBsc{9^Z72Ycb2ht?G^opkT_#|4$wa9`)8k3ilU z%ntAi`nakS1r10;#k^{-ZGOD&Z2|k=p40hRh5D7(&JG#Cty|ECOvwsSHkkSa)36$4 z?;v#%@D(=Raw(HP5s>#4Bm?f~n1@ebH}2tv#7-0l-i^H#H{PC|F@xeNS+Yw{F-&wH z07)bj8MaE6`|6NoqKM~`4%X> zKFl&7g1$Z3HB>lxn$J`P`6GSb6CE6_^NA1V%=*`5O!zP$a7Vq)IwJAki~XBLf=4TF zPYSL}>4nOGZ`fyHChq)jy-f{PKFp6$plHB2=;|>%Z^%)ecVue(*mf>EH_uO^+_zm? zJATFa9SF~tFwR#&0xO{LLf~@}s_xvCPU8TwIJgBs%FFzjm`u?1699RTui;O$rrR{# z1^MqMl5&6)G%@_k*$U5Kxq84!AdtbZ!@8FslBML}<`(Jr zenXrC6bFJP=R^FMBg7P?Pww-!a%G@kJH_zezKvuWU0>m1uyy}#Vf<$>u?Vzo3}@O% z1JR`B?~Tx2)Oa|{DQ_)y9=oY%haj!80GNHw3~qazgU-{|q+Bl~H94J!a%8UR?XsZ@ z0*ZyQugyru`V9b(0OrJOKISfi89bSVR zQy<+i_1XY}4>|D%X_`IKZUPz6=TDb)t1mC9eg(Z=tv zq@|r37AQM6A%H%GaH3szv1L^ku~H%5_V*fv$UvHl*yN4iaqWa69T2G8J2f3kxc7UE zOia@p0YNu_q-IbT%RwOi*|V|&)e5B-u>4=&n@`|WzH}BK4?33IPpXJg%`b=dr_`hU z8JibW_3&#uIN_#D&hX<)x(__jUT&lIH$!txEC@cXv$7yB&Rgu){M`9a`*PH} zRcU)pMWI2O?x;?hzR{WdzKt^;_pVGJAKKd)F$h;q=Vw$MP1XSd<;Mu;EU5ffyKIg+ z&n-Nb?h-ERN7(fix`htopPIba?0Gd^y(4EHvfF_KU<4RpN0PgVxt%7Yo99X*Pe|zR z?ytK&5qaZ$0KSS$3ZNS$$k}y(2(rCl=cuYZg{9L?KVgs~{?5adxS))Upm?LDo||`H zV)$`FF3icFmxcQshXX*1k*w3O+NjBR-AuE70=UYM*7>t|I-oix=bzDwp2*RoIwBp@r&vZukG; zyi-2zdyWJ3+E?{%?>e2Ivk`fAn&Ho(KhGSVE4C-zxM-!j01b~mTr>J|5={PrZHOgO zw@ND3=z(J7D>&C7aw{zT>GHhL2BmUX0GLt^=31RRPSnjoUO9LYzh_yegyPoAKhAQE z>#~O27dR4&LdQiak6={9_{LN}Z>;kyVYKH^d^*!`JVSXJlx#&r4>VnP$zb{XoTb=> zZsLvh>keP3fkLTIDdpf-@(ADfq4=@X=&n>dyU0%dwD{zsjCWc;r`-e~X$Q3NTz_TJ zOXG|LMQQIjGXY3o5tBm9>k6y<6XNO<=9H@IXF;63rzsC=-VuS*$E{|L_i;lZmHOD< zY92;>4spdeRn4L6pY4oUKZG<~+8U-q7ZvNOtW0i*6Q?H`9#U3M*k#4J;ek(MwF02x zUo1wgq9o6XG#W^mxl>pAD)Ll-V5BNsdVQ&+QS0+K+?H-gIBJ-ccB1=M_hxB6qcf`C zJ?!q!J4`kLhAMry4&a_0}up{CFevcjBl|N(uDM^N5#@&-nQt2>z*U}eJGi}m5f}l|IRVj-Q;a>wcLpK5RRWJ> zysdd$)Nv0tS?b~bw1=gvz3L_ZAIdDDPj)y|bp1;LE`!av!rODs-tlc}J#?erTgXRX z$@ph%*~_wr^bQYHM7<7=Q=45v|Hk7T=mDpW@OwRy3A_v`ou@JX5h!VI*e((v*5Aq3 zVYfB4<&^Dq5%^?~)NcojqK`(VXP$`#w+&VhQOn%;4pCkz;NEH6-FPHTQ+7I&JE1+Ozq-g43AEZV>ceQ^9PCx zZG@OlEF~!Lq@5dttlr%+gNjRyMwJdJU(6W_KpuVnd{3Yle(-p#6erIRc${l&qx$HA z89&sp=rT7MJ=DuTL1<5{)wtUfpPA|Gr6Q2T*=%2RFm@jyo@`@^*{5{lFPgv>84|pv z%y{|cVNz&`9C*cUely>-PRL)lHVErAKPO!NQ3<&l5(>Vp(MuJnrOf^4qpIa!o3D7( z1bjn#Vv$#or|s7Hct5D@%;@48mM%ISY7>7@ft8f?q~{s)@BqGiupoK1BAg?PyaDQ1 z`YT8{0Vz{zBwJ={I4)#ny{RP{K1dqzAaQN_aaFC%Z>OZ|^VhhautjDavGtsQwx@WH zr|1UKk^+X~S*RjCY_HN!=Jx>b6J8`Q(l4y|mc<6jnkHVng^Wk(A13-;AhawATsmmE#H%|8h}f1frs2x@Fwa_|ea+$tdG2Pz{7 z!ox^w^>^Cv4e{Xo7EQ7bxCe8U+LZG<_e$RnR?p3t?s^1Mb!ieB z#@45r*PTc_yjh#P=O8Zogo+>1#|a2nJvhOjIqKK1U&6P)O%5s~M;99O<|Y9zomWTL z666lK^QW`)cXV_^Y05yQZH3IRCW%25BHAM$c0>w`x!jh^15Zp6xYb!LoQ zr+RukTw0X2mxN%K0%=8|JHiaA3pg5+GMfze%9o5^#upx0M?G9$+P^DTx7~qq9$Qoi zV$o)yy zuUq>3c{_q+HA5OhdN*@*RkxRuD>Bi{Ttv_hyaaB;XhB%mJ2Cb{yL;{Zu@l{N?!GKE7es6_9J{9 zO(tmc0ra2;@oC%SS-8|D=omQ$-Dj>S)Utkthh{ovD3I%k}HoranSepC_yco2Q8 zY{tAuPIhD{X`KbhQIr%!t+GeH%L%q&p z3P%<-S0YY2Emjc~Gb?!su85}h_qdu5XN2XJUM}X1k^!GbwuUPT(b$Ez#LkG6KEWQB z7R&IF4srHe$g2R-SB;inW9T{@+W+~wi7VQd?}7||zi!&V^~o0kM^aby7YE_-B63^d zf_uo8#&C77HBautt_YH%v6!Q>H?}(0@4pv>cM6_7dHJ)5JdyV0Phi!)vz}dv{*n;t zf(+#Hdr=f8DbJqbMez)(n>@QT+amJ7g&w6vZ-vG^H1v~aZqG~u!1D(O+jVAG0EQ*aIsr*bsBdbD`)i^FNJ z&B@yxqPFCRGT#}@dmu-{0vp47xk(`xNM6E=7QZ5{tg6}#zFrd8Pb_bFg7XP{FsYP8 zbvWqG6#jfg*4gvY9!gJxJ3l2UjP}+#QMB(*(?Y&Q4PO`EknE&Cb~Yb@lCbk;-KY)n zzbjS~W5KZ3FV%y>S#$9Sqi$FIBCw`GfPDP|G=|y32VV-g@a1D&@%_oAbB@cAUx#aZ zlAPTJ{iz#Qda8(aNZE&0q+8r3&z_Ln)b=5a%U|OEcc3h1f&8?{b8ErEbilrun}mh3 z$1o^$-XzIiH|iGoJA`w`o|?w3m*NX|sd$`Mt+f*!hyJvQ2fS*&!SYn^On-M|pHGlu z4SC5bM7f6BAkUhGuN*w`97LLkbCx=p@K5RL2p>YpDtf{WTD|d3ucb6iVZ-*DRtoEA zCC5(x)&e=giR_id>5bE^l%Mxx>0@FskpCD4oq@%-Fg$8IcdRwkfn;DsjoX(v;mt3d z_4Mnf#Ft4x!bY!7Hz?RRMq9;5FzugD(sbt4up~6j?-or+ch~y_PqrM2hhTToJjR_~ z)E1idgt7EW>G*9%Q^K;o_#uFjX!V2pwfpgi>}J&p_^QlZki!@#dkvR`p?bckC`J*g z=%3PkFT3HAX2Q+dShHUbb1?ZcK8U7oaufLTCB#1W{=~k0Jabgv>q|H+GU=f-y|{p4 zwN|AE+YbCgx=7vlXE?@gkXW9PaqbO#GB=4$o0FkNT#EI?aLVd2(qnPK$Yh%YD%v(mdwn}bgsxyIBI^)tY?&G zi^2JfClZ@4b{xFjyTY?D61w@*ez2@5rWLpG#34id?>>oPg{`4F-l`7Lg@D@Hc}On} zx%BO4MsLYosLGACJ-d?ifZ35r^t*}wde>AAWO*J-X%jvD+gL9`u`r=kP zyeJ%FqqKfz8e_3K(M1RmB?gIYi{W7Z<THP2ihue0mbpu5n(x_l|e1tw(q!#m5lmef6ktqIb${ zV+ee#XRU}_dDDUiV@opHZ@EbQ<9qIZJMDsZDkW0^t3#j`S)G#>N^ZBs8k+FJhAfu< z%u!$%dyP3*_+jUvCf-%{x#MyDAK?#iPfE<(@Q0H7;a125eD%I(+!x1f;Sy`e<9>nm zQH4czZDQmW7^n>jL)@P@aAuAF$;I7JZE5a8~AJI5CNDqyf$gjloKR7C?OPt9yeH}n5 zNF8Vhmd%1O>T4EZD&0%Dt7YWNImmEV{7QF(dy!>q5k>Kh&Xy8hcBMUvVV~Xn8O&%{ z&q=JCYw#KlwM8%cu-rNadu(P~i3bM<_a{3!J*;vZhR6dln6#eW0^0kN)Vv3!bqM`w z{@j*eyzz=743dgFPY`Cx3|>ata;;_hQ3RJd+kU}~p~aphRx`03B>g4*~f%hUV+#D9rYRbsGD?jkB^$3XcgB|3N1L& zrmk9&Dg450mAd=Q_p?gIy5Zx7vRL?*rpNq76_rysFo)z)tp0B;7lSb9G5wX1vC9Lc z5Q8tb-alolVNWFsxO_=12o}X(>@Mwz1mkYh1##(qQwN=7VKz?61kay8A9(94Ky(4V zq6qd2+4a20Z0QRrmp6C?4;%U?@MatfXnkj&U6bP_&2Ny}BF%4{QhNx*Tabik9Y-~Z z@0WV6XD}aI(%pN}oW$X~Qo_R#+1$@J8(31?zM`#e`#(0f<-AZ^={^NgH#lc?oi(Mu zMk|#KR^Q;V@?&(sh5)D;-fu)rx%gXZ1&5)MR+Mhssy+W>V%S|PRNyTAd}74<(#J>H zR(1BfM%eIv0+ngHH6(i`?-%_4!6PpK*0X)79SX0X$`lv_q>9(E2kkkP;?c@rW2E^Q zs<;`9dg|lDMNECFrD3jTM^Mn-C$44}9d9Kc z#>*k&e#25;D^%82^1d@Yt{Y91MbEu0C}-;HR4+IaCeZ`l?)Q8M2~&E^FvJ?EBJJ(% zz1>tCW-E~FB}DI}z#+fUo+=kQME^=eH>^%V8w)dh*ugPFdhMUi3R2Cg}Zak4!k_8YW(JcR-)hY8C zXja}R7@%Q0&IzQTk@M|)2ViZDNCDRLNI)*lH%SDa^2TG4;%jE4n`8`aQAA$0SPH2@ z)2eWZuP26+uGq+m8F0fZn)X^|bNe z#f{qYZS!(CdBdM$N2(JH_a^b#R2=>yVf%JI_ieRFB{w&|o9txwMrVxv+n78*aXFGb z>Rkj2yq-ED<)A46T9CL^$iPynv`FoEhUM10@J+UZ@+*@_gyboQ>HY9CiwTUo7OM=w zd~$N)1@6U8H#Zu(wGLa_(Esx%h@*pmm5Y9OX@CY`3kPYPQx@z8yAgtm(+agDU%4?c zy8pR4SYbu8vY?JX6HgVq7|f=?w(%`m-C+a@E{euXo>XrGmkmFGzktI*rj*8D z)O|CHKXEzH{~iS+6)%ybRD|JRQ6j<+u_+=SgnJP%K+4$st+~XCVcAjI9e5`RYq$n{ zzy!X9Nv7>T4}}BZpSj9G9|(4ei-}Du<_IZw+CB`?fd$w^;=j8?vlp(#JOWiHaXJjB0Q00RHJ@sG6N#y^H7t^&V} z;VrDI4?75G$q5W9mV=J2iP24NHJy&d|HWHva>FaS#3AO?+ohh1__FMx;?`f{HG3v0 ztiO^Wanb>U4m9eLhoc_2B(ca@YdnHMB*~aYO+AE(&qh@?WukLbf_y z>*3?Xt-lxr?#}y%kTv+l8;!q?Hq8XSU+1E8x~o@9$)zO2z9K#(t`vPDri`mKhv|sh z{KREcy`#pnV>cTT7dm7M9B@9qJRt3lfo(C`CNkIq@>|2<(yn!AmVN?ST zbX_`JjtWa3&N*U{K7FYX8})*D#2@KBae` zhKS~s!r%SrXdhCsv~sF}7?ocyS?afya6%rDBu6g^b2j#TOGp^1zrMR}|70Z>CeYq- z1o|-=FBKlu{@;pm@QQJ_^!&hzi;0Z_Ho){x3O1KQ#TYk=rAt9`YKC0Y^}8GWIN{QW znYJyVTrmNvl!L=YS1G8BAxGmMUPi+Q7yb0XfG`l+L1NQVSbe^BICYrD;^(rke{jWCEZOtVv3xFze!=Z&(7}!)EcN;v0Dbit?RJ6bOr;N$ z=nk8}H<kCEE+IK3z<+3mkn4q!O7TMWpKShWWWM)X*)m6k%3luF6c>zOsFccvfLWf zH+mNkh!H@vR#~oe=ek}W3!71z$Dlj0c(%S|sJr>rvw!x;oCek+8f8s!U{DmfHcNpO z9>(IKOMfJwv?ey`V2ysSx2Npeh_x#bMh)Ngdj$al;5~R7Ac5R2?*f{hI|?{*$0qU- zY$6}ME%OGh^zA^z9zJUs-?a4ni8cw_{cYED*8x{bWg!Fn9)n;E9@B+t;#k}-2_j@# zg#b%R(5_SJAOtfgFCBZc`n<&z6)%nOIu@*yo!a% zpLg#36KBN$01W{b;qWN`Tp(T#jh%;Zp_zpS64lvBVY2B#UK)p`B4Oo)IO3Z&D6<3S zfF?ZdeNEnzE{}#gyuv)>;z6V{!#bx)` zY;hL*f(WVD*D9A4$WbRKF2vf;MoZVdhfWbWhr{+Db5@M^A4wrFReuWWimA4qp`GgoL2`W4WPUL5A=y3Y3P z%G?8lLUhqo@wJW8VDT`j&%YY7xh51NpVYlsrk_i4J|pLO(}(b8_>%U2M`$iVRDc-n zQiOdJbroQ%*vhN{!{pL~N|cfGooK_jTJCA3g_qs4c#6a&_{&$OoSQr_+-O^mKP=Fu zGObEx`7Qyu{nHTGNj(XSX*NPtAILL(0%8Jh)dQh+rtra({;{W2=f4W?Qr3qHi*G6B zOEj7%nw^sPy^@05$lOCjAI)?%B%&#cZ~nC|=g1r!9W@C8T0iUc%T*ne z)&u$n>Ue3FN|hv+VtA+WW)odO-sdtDcHfJ7s&|YCPfWaVHpTGN46V7Lx@feE#Od%0XwiZy40plD%{xl+K04*se zw@X4&*si2Z_0+FU&1AstR)7!Th(fdaOlsWh`d!y=+3m!QC$Zlkg8gnz!}_B7`+wSz z&kD?6{zPnE3uo~Tv8mLP%RaNt2hcCJBq=0T>%MW~Q@Tpt2pPP1?KcywH>in5@ zx+5;xu-ltFfo5vLU;2>r$-KCHjwGR&1XZ0YNyrXXAUK!FLM_7mV&^;;X^*YH(FLRr z`0Jjg7wiq2bisa`CG%o9i)o1`uG?oFjU_Zrv1S^ipz$G-lc^X@~6*)#%nn+RbgksJfl{w=k31(q>7a!PCMp5YY{+Neh~mo zG-3dd!0cy`F!nWR?=9f_KP$X?Lz&cLGm_ohy-|u!VhS1HG~e7~xKpYOh=GmiiU;nu zrZ5tWfan3kp-q_vO)}vY6a$19Q6UL0r znJ+iSHN-&w@vDEZ0V%~?(XBr|jz&vrBNLOngULxtH(Rp&U*rMY42n;05F11xh?k;n_DX2$4|vWIkXnbwfC z=ReH=(O~a;VEgVO?>qsP*#eOC9Y<_9Yt<6X}X{PyF7UXIA$f)>NR5P&4G_Ygq(9TwwQH*P>Rq>3T4I+t2X(b5ogXBAfNf!xiF#Gilm zp2h{&D4k!SkKz-SBa%F-ZoVN$7GX2o=(>vkE^j)BDSGXw?^%RS9F)d_4}PN+6MlI8*Uk7a28CZ)Gp*EK)`n5i z){aq=0SFSO-;sw$nAvJU-$S-cW?RSc7kjEBvWDr1zxb1J7i;!i+3PQwb=)www?7TZ zE~~u)vO>#55eLZW;)F(f0KFf8@$p)~llV{nO7K_Nq-+S^h%QV_CnXLi)p*Pq&`s!d zK2msiR;Hk_rO8`kqe_jfTmmv|$MMo0ll}mI)PO4!ikVd(ZThhi&4ZwK?tD-}noj}v zBJ?jH-%VS|=t)HuTk?J1XaDUjd_5p1kPZi6y#F6$lLeRQbj4hsr=hX z4tXkX2d5DeLMcAYTeYm|u(XvG5JpW}hcOs4#s8g#ihK%@hVz|kL=nfiBqJ{*E*WhC zht3mi$P3a(O5JiDq$Syu9p^HY&9~<#H89D8 zJm84@%TaL_BZ+qy8+T3_pG7Q%z80hnjN;j>S=&WZWF48PDD%55lVuC0%#r5(+S;WH zS7!HEzmn~)Ih`gE`faPRjPe^t%g=F ztpGVW=Cj5ZkpghCf~`ar0+j@A=?3(j@7*pq?|9)n*B4EQTA1xj<+|(Y72?m7F%&&& zdO44owDBPT(8~RO=dT-K4#Ja@^4_0v$O3kn73p6$s?mCmVDUZ+Xl@QcpR6R3B$=am z%>`r9r2Z79Q#RNK?>~lwk^nQlR=Hr-ji$Ss3ltbmB)x@0{VzHL-rxVO(++@Yr@Iu2 zTEX)_9sVM>cX$|xuqz~Y8F-(n;KLAfi*63M7mh&gsPR>N0pd9h!0bm%nA?Lr zS#iEmG|wQd^BSDMk0k?G>S-uE$vtKEF8Dq}%vLD07zK4RLoS?%F1^oZZI$0W->7Z# z?v&|a`u#UD=_>i~`kzBGaPj!mYX5g?3RC4$5EV*j0sV)>H#+$G6!ci=6`)85LWR=FCp-NUff`;2zG9nU6F~ z;3ZyE*>*LvUgae+uMf}aV}V*?DCM>{o31+Sx~6+sz;TI(VmIpDrN3z+BUj`oGGgLP z>h9~MP}Pw#YwzfGP8wSkz`V#}--6}7S9yZvb{;SX?6PM_KuYpbi~*=teZr-ga2QqIz{QrEyZ@>eN*qmy;N@FCBbRNEeeoTmQyrX;+ zCkaJ&vOIbc^2BD6_H+Mrcl?Nt7O{xz9R_L0ZPV_u!sz+TKbXmhK)0QWoe-_HwtKJ@@7=L+ z+K8hhf=4vbdg3GqGN<;v-SMIzvX=Z`WUa_91Yf89^#`G(f-Eq>odB^p-Eqx}ENk#&MxJ+%~Ad2-*`1LNT>2INPw?*V3&kE;tt?rQyBw? zI+xJD04GTz1$7~KMnfpkPRW>f%n|0YCML@ODe`10;^DXX-|Hb*IE%_Vi#Pn9@#ufA z_8NY*1U%VseqYrSm?%>F@`laz+f?+2cIE4Jg6 z_VTcx|DSEA`g!R%RS$2dSRM|9VQClsW-G<~=j5T`pTbu-x6O`R z98b;}`rPM(2={YiytrqX+uh65f?%XiPp`;4CcMT*E*dQJ+if9^D>c_Dk8A(cE<#r=&!& z_`Z01=&MEE+2@yr!|#El=yM}v>i=?w^2E_FLPy(*4A9XmCNy>cBWdx3U>1RylsItO z4V8T$z3W-qqq*H`@}lYpfh=>C!tieKhoMGUi)EpWDr;yIL&fy};Y&l|)f^QE*k~4C zH>y`Iu%#S)z)YUqWO%el*Z)ME#p{1_8-^~6UF;kBTW zMQ!eXQuzkR#}j{qb(y9^Y!X7&T}}-4$%4w@w=;w+>Z%uifR9OoQ>P?0d9xpcwa>7kTv2U zT-F?3`Q`7xOR!gS@j>7In>_h){j#@@(ynYh;nB~}+N6qO(JO1xA z@59Pxc#&I~I64slNR?#hB-4XE>EFU@lUB*D)tu%uEa))B#eJ@ZOX0hIulfnDQz-y8 z`CX@(O%_VC{Ogh&ot``jlDL%R!f>-8yq~oLGxBO?+tQb5%k@a9zTs!+=NOwSVH-cR zqFo^jHeXDA_!rx$NzdP;>{-j5w3QUrR<;}=u2|FBJ;D#v{SK@Z6mjeV7_kFmWt95$ zeGaF{IU?U>?W`jzrG_9=9}yN*LKyzz))PLE+)_jc#4Rd$yFGol;NIk(qO1$5VXR)+ zxF7%f4=Q!NzR>DVXUB&nUT&>Nyf+5QRF+Z`X-bB*7=`|Go5D1&h~ zflKLw??kpiRm0h3|1GvySC2^#kcFz^5{79KKlq@`(leBa=_4CgV9sSHr{RIJ^KwR_ zY??M}-x^=MD+9`v@I3jue=OCn0kxno#6i>b(XKk_XTp_LpI}X*UA<#* zsgvq@yKTe_dTh>q1aeae@8yur08S(Q^8kXkP_ty48V$pX#y9)FQa~E7P7}GP_CbCm zc2dQxTeW(-~Y6}im24*XOC8ySfH*HMEnW3 z4CXp8iK(Nk<^D$g0kUW`8PXn2kdcDk-H@P0?G8?|YVlIFb?a>QunCx%B9TzsqQQ~HD!UO7zq^V!v9jho_FUob&Hxi ztU1nNOK)a!gkb-K4V^QVX05*>-^i|{b`hhvQLyj`E1vAnj0fbqqO%r z6Q;X1x0dL~GqMv%8QindZ4CZ%7pYQW~ z9)I*#Gjref-q(4Z*E#1c&rE0-_(4;_M(V7rgH_7H;ps1s%GBmU z{4a|X##j#XUF2n({v?ZUUAP5k>+)^F)7n-npbV3jAlY8V3*W=fwroDS$c&r$>8aH` zH+irV{RG3^F3oW2&E%5hXgMH9>$WlqX76Cm+iFmFC-DToTa`AcuN9S!SB+BT-IA#3P)JW1m~Cuwjs`Ep(wDXE4oYmt*aU z!Naz^lM}B)JFp7ejro7MU9#cI>wUoi{lylR2~s)3M!6a=_W~ITXCPd@U9W)qA5(mdOf zd3PntGPJyRX<9cgX?(9~TZB5FdEHW~gkJXY51}?s4ZT_VEdwOwD{T2E-B>oC8|_ZwsPNj=-q(-kwy%xX2K0~H z{*+W`-)V`7@c#Iuaef=?RR2O&x>W0A^xSwh5MsjTz(DVG-EoD@asu<>72A_h<39_# zawWVU<9t{r*e^u-5Q#SUI6dV#p$NYEGyiowT>>d*or=Ps!H$-3={bB|An$GPkP5F1 zTnu=ktmF|6E*>ZQvk^~DX(k!N`tiLut*?3FZhs$NUEa4ccDw66-~P;x+0b|<!ZN7Z%A`>2tN#CdoG>((QR~IV_Gj^Yh%!HdA~4C3jOXaqb6Ou z21T~Wmi9F6(_K0@KR@JDTh3-4mv2=T7&ML<+$4;b9SAtv*Uu`0>;VVZHB{4?aIl3J zL(rMfk?1V@l)fy{J5DhVlj&cWKJCcrpOAad(7mC6#%|Sn$VwMjtx6RDx1zbQ|Ngg8N&B56DGhu;dYg$Z{=YmCNn+?ceDclp65c_RnKs4*vefnhudSlrCy6-96vSB4_sFAj# zftzECwmNEOtED^NUt{ZDjT7^g>k1w<=af>+0)%NA;IPq6qx&ya7+QAu=pk8t>KTm` zEBj9J*2t|-(h)xc>Us*jHs)w9qmA>8@u21UqzKk*Ei#0kCeW6o z-2Q+Tvt25IUkb}-_LgD1_FUJ!U8@8OC^9(~Kd*0#zr*8IQkD)6Keb(XFai5*DYf~` z@U?-{)9X&BTf!^&@^rjmvea#9OE~m(D>qfM?CFT9Q4RxqhO0sA7S)=--^*Q=kNh7Y zq%2mu_d_#23d`+v`Ol263CZ<;D%D8Njj6L4T`S*^{!lPL@pXSm>2;~Da- zBX97TS{}exvSva@J5FJVCM$j4WDQuME`vTw>PWS0!;J7R+Kq zVUy6%#n5f7EV(}J#FhDpts;>=d6ow!yhJj8j>MJ@Wr_?x30buuutIG97L1A*QFT$c ziC5rBS;#qj=~yP-yWm-p(?llTwDuhS^f&<(9vA9@UhMH2-Fe_YAG$NvK6X{!mvPK~ zuEA&PA}meylmaIbbJXDOzuIn8cJNCV{tUA<$Vb?57JyAM`*GpEfMmFq>)6$E(9e1@W`l|R%-&}38#bl~levA#fx2wiBk^)mPj?<=S&|gv zQO)4*91$n08@W%2b|QxEiO0KxABAZC{^4BX^6r>Jm?{!`ZId9jjz<%pl(G5l));*`UU3KfnuXSDj2aP>{ zRIB$9pm7lj3*Xg)c1eG!cb+XGt&#?7yJ@C)(Ik)^OZ5><4u$VLCqZ#q2NMCt5 z6$|VN(RWM;5!JV?-h<JkEZ(SZF zC(6J+>A6Am9H7OlOFq6S62-2&z^Np=#xXsOq0WUKr zY_+Ob|CQd1*!Hirj5rn*=_bM5_zKmq6lG zn*&_=x%?ATxZ8ZTzd%biKY_qyNC#ZQ1vX+vc48N>aJXEjs{Y*3Op`Q7-oz8jyAh>d zNt_qvn`>q9aO~7xm{z`ree%lJ3YHCyC`q`-jUVCn*&NIml!uuMNm|~u3#AV?6kC+B z?qrT?xu2^mobSlzb&m(8jttB^je0mx;TT8}`_w(F11IKz83NLj@OmYDpCU^u?fD{) z&=$ptwVw#uohPb2_PrFX;X^I=MVXPDpqTuYhRa>f-=wy$y3)40-;#EUDYB1~V9t%$ z^^<7Zbs0{eB93Pcy)96%XsAi2^k`Gmnypd-&x4v9rAq<>a(pG|J#+Q>E$FvMLmy7T z5_06W=*ASUyPRfgCeiPIe{b47Hjqpb`9Xyl@$6*ntH@SV^bgH&Fk3L9L=6VQb)Uqa z33u#>ecDo&bK(h1WqSH)b_Th#Tvk&%$NXC@_pg5f-Ma#7q;&0QgtsFO~`V&{1b zbSP*X)jgLtd@9XdZ#2_BX4{X~pS8okF7c1xUhEV9>PZco>W-qz7YMD`+kCGULdK|^ zE7VwQ-at{%&fv`a+b&h`TjzxsyQX05UB~a0cuU-}{*%jR48J+yGWyl3Kdz5}U>;lE zgkba*yI5>xqIPz*Y!-P$#_mhHB!0Fpnv{$k-$xxjLAc`XdmHd1k$V@2QlblfJPrly z*~-4HVCq+?9vha>&I6aRGyq2VUon^L1a)g`-Xm*@bl2|hi2b|UmVYW|b+Gy?!aS-p z86a}Jep6Mf>>}n^*Oca@Xz}kxh)Y&pX$^CFAmi#$YVf57X^}uQD!IQSN&int=D> zJ>_|au3Be?hmPKK)1^JQ(O29eTf`>-x^jF2xYK6j_9d_qFkWHIan5=7EmDvZoQWz5 zZGb<{szHc9Nf@om)K_<=FuLR<&?5RKo3LONFQZ@?dyjemAe4$yDrnD zglU#XYo6|~L+YpF#?deK6S{8A*Ou;9G`cdC4S0U74EW18bc5~4>)<*}?Z!1Y)j;Ot zosEP!pc$O^wud(={WG%hY07IE^SwS-fGbvpP?;l8>H$;}urY2JF$u#$q}E*ZG%fR# z`p{xslcvG)kBS~B*^z6zVT@e}imYcz_8PRzM4GS52#ms5Jg9z~ME+uke`(Tq1w3_6 zxUa{HerS7!Wq&y(<9yyN@P^PrQT+6ij_qW3^Q)I53iIFCJE?MVyGLID!f?QHUi1tq z0)RNIMGO$2>S%3MlBc09l!6_(ECxXTU>$KjWdZX^3R~@3!SB zah5Za2$63;#y!Y}(wg1#shMePQTzfQfXyJ-Tf`R05KYcyvo8UW9-IWGWnzxR6Vj8_la;*-z5vWuwUe7@sKr#Tr51d z2PWn5h@|?QU3>k=s{pZ9+(}oye zc*95N_iLmtmu}H-t$smi49Y&ovX}@mKYt2*?C-i3Lh4*#q5YDg1Mh`j9ovRDf9&& zp_UMQh`|pC!|=}1uWoMK5RAjdTg3pXPCsYmRkWW}^m&)u-*c_st~gcss(`haA)xVw zAf=;s>$`Gq_`A}^MjY_BnCjktBNHY1*gzh(i0BFZ{Vg^F?Pbf`8_clvdZ)5(J4EWzAP}Ba5zX=S(2{gDugTQ3`%!q`h7kYSnwC`zEWeuFlODKiityMaM9u{Z%E@@y1jmZA#ⅅ8MglG&ER{i5lN315cO?EdHNLrg? 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 z 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 Pe7HEdAEg|=c=LY&YVNkY literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..13b35eba55c6dabc3aac36f33d859266c18fa0d0 GIT binary patch literal 5680 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 literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3f5fa40fb3d1e0710331a48de5d256da3f275d GIT binary patch literal 520 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 literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/ardrive_uploader/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1632cfddf3d9dade342351e627a0a75609fb46 GIT binary patch literal 2218 zcmV;b2vzrqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuE6iGxuRCodHTWf3-RTMruyW6Fu zQYeUM04eX6D5c0FCjKKPrco1(K`<0SL=crI{PC3-^hZU0kQie$gh-5!7z6SH6Q0J% zqot*`H1q{R5fHFYS}dje@;kG=v$L0(yY0?wY2%*c?A&{2?!D*x?m71{of2gv!$5|C z3>qG_BW}7K_yUcT3A5C6QD<+{aq?x;MAUyAiJn#Jv8_zZtQ{P zTRzbL3U9!qVuZzS$xKU10KiW~Bgdcv1-!uAhQxf3a7q+dU6lj?yoO4Lq4TUN4}h{N z*fIM=SS8|C2$(T>w$`t@3Tka!(r!7W`x z-isCVgQD^mG-MJ;XtJuK3V{Vy72GQ83KRWsHU?e*wrhKk=ApIYeDqLi;JI1e zuvv}5^Dc=k7F7?nm3nIw$NVmU-+R>> zyqOR$-2SDpJ}Pt;^RkJytDVXNTsu|mI1`~G7yw`EJR?VkGfNdqK9^^8P`JdtTV&tX4CNcV4 z&N06nZa??Fw1AgQOUSE2AmPE@WO(Fvo`%m`cDgiv(fAeRA%3AGXUbsGw{7Q`cY;1BI#ac3iN$$Hw z0LT0;xc%=q)me?Y*$xI@GRAw?+}>=9D+KTk??-HJ4=A>`V&vKFS75@MKdSF1JTq{S zc1!^8?YA|t+uKigaq!sT;Z!&0F2=k7F0PIU;F$leJLaw2UI6FL^w}OG&!;+b%ya1c z1n+6-inU<0VM-Y_s5iTElq)ThyF?StVcebpGI znw#+zLx2@ah{$_2jn+@}(zJZ{+}_N9BM;z)0yr|gF-4=Iyu@hI*Lk=-A8f#bAzc9f z`Kd6K--x@t04swJVC3JK1cHY-Hq+=|PN-VO;?^_C#;coU6TDP7Bt`;{JTG;!+jj(` zw5cLQ-(Cz-Tlb`A^w7|R56Ce;Wmr0)$KWOUZ6ai0PhzPeHwdl0H(etP zUV`va_i0s-4#DkNM8lUlqI7>YQLf)(lz9Q3Uw`)nc(z3{m5ZE77Ul$V%m)E}3&8L0 z-XaU|eB~Is08eORPk;=<>!1w)Kf}FOVS2l&9~A+@R#koFJ$Czd%Y(ENTV&A~U(IPI z;UY+gf+&6ioZ=roly<0Yst8ck>(M=S?B-ys3mLdM&)ex!hbt+ol|T6CTS+Sc0jv(& z7ijdvFwBq;0a{%3GGwkDKTeG`b+lyj0jjS1OMkYnepCdoosNY`*zmBIo*981BU%%U z@~$z0V`OVtIbEx5pa|Tct|Lg#ZQf5OYMUMRD>Wdxm5SAqV2}3!ceE-M2 z@O~lQ0OiKQp}o9I;?uxCgYVV?FH|?Riri*U$Zi_`V2eiA>l zdSm6;SEm6#T+SpcE8Ro_f2AwxzI z44hfe^WE3!h@W3RDyA_H440cpmYkv*)6m1XazTqw%=E5Xv7^@^^T7Q2wxr+Z2kVYr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/ardrive_uploader/example/macos/Runner/Configs/AppInfo.xcconfig b/packages/ardrive_uploader/example/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000000..dda192bcdf --- /dev/null +++ b/packages/ardrive_uploader/example/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 = example + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.example + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2023 com.example. All rights reserved. diff --git a/packages/ardrive_uploader/example/macos/Runner/Configs/Debug.xcconfig b/packages/ardrive_uploader/example/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000000..36b0fd9464 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/packages/ardrive_uploader/example/macos/Runner/Configs/Release.xcconfig b/packages/ardrive_uploader/example/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000000..dff4f49561 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/packages/ardrive_uploader/example/macos/Runner/Configs/Warnings.xcconfig b/packages/ardrive_uploader/example/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000000..42bcbf4780 --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/macos/Runner/DebugProfile.entitlements b/packages/ardrive_uploader/example/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000000..dddb8a30c8 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/packages/ardrive_uploader/example/macos/Runner/Info.plist b/packages/ardrive_uploader/example/macos/Runner/Info.plist new file mode 100644 index 0000000000..4789daa6a4 --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/macos/Runner/MainFlutterWindow.swift b/packages/ardrive_uploader/example/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000000..3cc05eb234 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/packages/ardrive_uploader/example/macos/Runner/Release.entitlements b/packages/ardrive_uploader/example/macos/Runner/Release.entitlements new file mode 100644 index 0000000000..852fa1a472 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/packages/ardrive_uploader/example/macos/RunnerTests/RunnerTests.swift b/packages/ardrive_uploader/example/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000000..5418c9f539 --- /dev/null +++ b/packages/ardrive_uploader/example/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import FlutterMacOS +import Cocoa +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/packages/ardrive_uploader/example/pubspec.yaml b/packages/ardrive_uploader/example/pubspec.yaml new file mode 100644 index 0000000000..97858f5ba4 --- /dev/null +++ b/packages/ardrive_uploader/example/pubspec.yaml @@ -0,0 +1,107 @@ +name: example +description: A new Flutter project. +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +# In Windows, build-name is used as the major, minor, and patch parts +# of the product and file versions while build-number is used as the build suffix. +version: 1.0.0+1 + +environment: + sdk: '>=3.0.2 <4.0.0' + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + ardrive_uploader: + path: ../ + ardrive_io: + git: + url: https://github.com/ar-io/ardrive_io.git + ref: PE-3699-uploads-large-files-for-public-drives + arweave: + git: + url: https://github.com/ardriveapp/arweave-dart.git + ref: PE-3697 + ardrive_utils: + path: ../../ardrive_utils + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.2 + ardrive_crypto: + path: ../../ardrive_crypto + uuid: ^3.0.4 + cryptography: ^2.5.0 + dio: ^5.3.2 + http: + +dev_dependencies: + flutter_test: + sdk: flutter + +dependency_overrides: + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^2.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/assets-and-images/#from-packages + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/ardrive_uploader/example/test/widget_test.dart b/packages/ardrive_uploader/example/test/widget_test.dart new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/ardrive_uploader/example/test/widget_test.dart @@ -0,0 +1 @@ + diff --git a/packages/ardrive_uploader/example/web/favicon.png b/packages/ardrive_uploader/example/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/web/icons/Icon-192.png b/packages/ardrive_uploader/example/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/web/icons/Icon-512.png b/packages/ardrive_uploader/example/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 zcmd5=2T+s!lYZ%-(h(2@5fr2dC?F^$C=i-}R6$UX8af(!je;W5yC_|HmujSgN*6?W z3knF*TL1$|?oD*=zPbBVex*RUIKsL<(&Rj9%^UD2IK3W?2j>D?eWQgvS-HLymHo9%~|N2Q{~j za?*X-{b9JRowv_*Mh|;*-kPFn>PI;r<#kFaxFqbn?aq|PduQg=2Q;~Qc}#z)_T%x9 zE|0!a70`58wjREmAH38H1)#gof)U3g9FZ^ zF7&-0^Hy{4XHWLoC*hOG(dg~2g6&?-wqcpf{ z&3=o8vw7lMi22jCG9RQbv8H}`+}9^zSk`nlR8?Z&G2dlDy$4#+WOlg;VHqzuE=fM@ z?OI6HEJH4&tA?FVG}9>jAnq_^tlw8NbjNhfqk2rQr?h(F&WiKy03Sn=-;ZJRh~JrD zbt)zLbnabttEZ>zUiu`N*u4sfQaLE8-WDn@tHp50uD(^r-}UsUUu)`!Rl1PozAc!a z?uj|2QDQ%oV-jxUJmJycySBINSKdX{kDYRS=+`HgR2GO19fg&lZKyBFbbXhQV~v~L za^U944F1_GtuFXtvDdDNDvp<`fqy);>Vw=ncy!NB85Tw{&sT5&Ox%-p%8fTS;OzlRBwErvO+ROe?{%q-Zge=%Up|D4L#>4K@Ke=x%?*^_^P*KD zgXueMiS63!sEw@fNLB-i^F|@Oib+S4bcy{eu&e}Xvb^(mA!=U=Xr3||IpV~3K zQWzEsUeX_qBe6fky#M zzOJm5b+l;~>=sdp%i}}0h zO?B?i*W;Ndn02Y0GUUPxERG`3Bjtj!NroLoYtyVdLtl?SE*CYpf4|_${ku2s`*_)k zN=a}V8_2R5QANlxsq!1BkT6$4>9=-Ix4As@FSS;1q^#TXPrBsw>hJ}$jZ{kUHoP+H zvoYiR39gX}2OHIBYCa~6ERRPJ#V}RIIZakUmuIoLF*{sO8rAUEB9|+A#C|@kw5>u0 zBd=F!4I)Be8ycH*)X1-VPiZ+Ts8_GB;YW&ZFFUo|Sw|x~ZajLsp+_3gv((Q#N>?Jz zFBf`~p_#^${zhPIIJY~yo!7$-xi2LK%3&RkFg}Ax)3+dFCjGgKv^1;lUzQlPo^E{K zmCnrwJ)NuSaJEmueEPO@(_6h3f5mFffhkU9r8A8(JC5eOkux{gPmx_$Uv&|hyj)gN zd>JP8l2U&81@1Hc>#*su2xd{)T`Yw< zN$dSLUN}dfx)Fu`NcY}TuZ)SdviT{JHaiYgP4~@`x{&h*Hd>c3K_To9BnQi@;tuoL z%PYQo&{|IsM)_>BrF1oB~+`2_uZQ48z9!)mtUR zdfKE+b*w8cPu;F6RYJiYyV;PRBbThqHBEu_(U{(gGtjM}Zi$pL8Whx}<JwE3RM0F8x7%!!s)UJVq|TVd#hf1zVLya$;mYp(^oZQ2>=ZXU1c$}f zm|7kfk>=4KoQoQ!2&SOW5|JP1)%#55C$M(u4%SP~tHa&M+=;YsW=v(Old9L3(j)`u z2?#fK&1vtS?G6aOt@E`gZ9*qCmyvc>Ma@Q8^I4y~f3gs7*d=ATlP>1S zyF=k&6p2;7dn^8?+!wZO5r~B+;@KXFEn^&C=6ma1J7Au6y29iMIxd7#iW%=iUzq&C=$aPLa^Q zncia$@TIy6UT@69=nbty5epP>*fVW@5qbUcb2~Gg75dNd{COFLdiz3}kODn^U*=@E z0*$7u7Rl2u)=%fk4m8EK1ctR!6%Ve`e!O20L$0LkM#f+)n9h^dn{n`T*^~d+l*Qlx z$;JC0P9+en2Wlxjwq#z^a6pdnD6fJM!GV7_%8%c)kc5LZs_G^qvw)&J#6WSp< zmsd~1-(GrgjC56Pdf6#!dt^y8Rg}!#UXf)W%~PeU+kU`FeSZHk)%sFv++#Dujk-~m zFHvVJC}UBn2jN& zs!@nZ?e(iyZPNo`p1i#~wsv9l@#Z|ag3JR>0#u1iW9M1RK1iF6-RbJ4KYg?B`dET9 zyR~DjZ>%_vWYm*Z9_+^~hJ_|SNTzBKx=U0l9 z9x(J96b{`R)UVQ$I`wTJ@$_}`)_DyUNOso6=WOmQKI1e`oyYy1C&%AQU<0-`(ow)1 zT}gYdwWdm4wW6|K)LcfMe&psE0XGhMy&xS`@vLi|1#Za{D6l@#D!?nW87wcscUZgELT{Cz**^;Zb~7 z(~WFRO`~!WvyZAW-8v!6n&j*PLm9NlN}BuUN}@E^TX*4Or#dMMF?V9KBeLSiLO4?B zcE3WNIa-H{ThrlCoN=XjOGk1dT=xwwrmt<1a)mrRzg{35`@C!T?&_;Q4Ce=5=>z^*zE_c(0*vWo2_#TD<2)pLXV$FlwP}Ik74IdDQU@yhkCr5h zn5aa>B7PWy5NQ!vf7@p_qtC*{dZ8zLS;JetPkHi>IvPjtJ#ThGQD|Lq#@vE2xdl%`x4A8xOln}BiQ92Po zW;0%A?I5CQ_O`@Ad=`2BLPPbBuPUp@Hb%a_OOI}y{Rwa<#h z5^6M}s7VzE)2&I*33pA>e71d78QpF>sNK;?lj^Kl#wU7G++`N_oL4QPd-iPqBhhs| z(uVM}$ItF-onXuuXO}o$t)emBO3Hjfyil@*+GF;9j?`&67GBM;TGkLHi>@)rkS4Nj zAEk;u)`jc4C$qN6WV2dVd#q}2X6nKt&X*}I@jP%Srs%%DS92lpDY^K*Sx4`l;aql$ zt*-V{U&$DM>pdO?%jt$t=vg5|p+Rw?SPaLW zB6nvZ69$ne4Z(s$3=Rf&RX8L9PWMV*S0@R zuIk&ba#s6sxVZ51^4Kon46X^9`?DC9mEhWB3f+o4#2EXFqy0(UTc>GU| zGCJmI|Dn-dX#7|_6(fT)>&YQ0H&&JX3cTvAq(a@ydM4>5Njnuere{J8p;3?1az60* z$1E7Yyxt^ytULeokgDnRVKQw9vzHg1>X@@jM$n$HBlveIrKP5-GJq%iWH#odVwV6cF^kKX(@#%%uQVb>#T6L^mC@)%SMd4DF? zVky!~ge27>cpUP1Vi}Z32lbLV+CQy+T5Wdmva6Fg^lKb!zrg|HPU=5Qu}k;4GVH+x z%;&pN1LOce0w@9i1Mo-Y|7|z}fbch@BPp2{&R-5{GLoeu8@limQmFF zaJRR|^;kW_nw~0V^ zfTnR!Ni*;-%oSHG1yItARs~uxra|O?YJxBzLjpeE-=~TO3Dn`JL5Gz;F~O1u3|FE- zvK2Vve`ylc`a}G`gpHg58Cqc9fMoy1L}7x7T>%~b&irrNMo?np3`q;d3d;zTK>nrK zOjPS{@&74-fA7j)8uT9~*g23uGnxwIVj9HorzUX#s0pcp2?GH6i}~+kv9fWChtPa_ z@T3m+$0pbjdQw7jcnHn;Pi85hk_u2-1^}c)LNvjdam8K-XJ+KgKQ%!?2n_!#{$H|| zLO=%;hRo6EDmnOBKCL9Cg~ETU##@u^W_5joZ%Et%X_n##%JDOcsO=0VL|Lkk!VdRJ z^|~2pB@PUspT?NOeO?=0Vb+fAGc!j%Ufn-cB`s2A~W{Zj{`wqWq_-w0wr@6VrM zbzni@8c>WS!7c&|ZR$cQ;`niRw{4kG#e z70e!uX8VmP23SuJ*)#(&R=;SxGAvq|&>geL&!5Z7@0Z(No*W561n#u$Uc`f9pD70# z=sKOSK|bF~#khTTn)B28h^a1{;>EaRnHj~>i=Fnr3+Fa4 z`^+O5_itS#7kPd20rq66_wH`%?HNzWk@XFK0n;Z@Cx{kx==2L22zWH$Yg?7 zvDj|u{{+NR3JvUH({;b*$b(U5U z7(lF!1bz2%06+|-v(D?2KgwNw7( zJB#Tz+ZRi&U$i?f34m7>uTzO#+E5cbaiQ&L}UxyOQq~afbNB4EI{E04ZWg53w0A{O%qo=lF8d zf~ktGvIgf-a~zQoWf>loF7pOodrd0a2|BzwwPDV}ShauTK8*fmF6NRbO>Iw9zZU}u zw8Ya}?seBnEGQDmH#XpUUkj}N49tP<2jYwTFp!P+&Fd(%Z#yo80|5@zN(D{_pNow*&4%ql zW~&yp@scb-+Qj-EmErY+Tu=dUmf@*BoXY2&oKT8U?8?s1d}4a`Aq>7SV800m$FE~? zjmz(LY+Xx9sDX$;vU`xgw*jLw7dWOnWWCO8o|;}f>cu0Q&`0I{YudMn;P;L3R-uz# zfns_mZED_IakFBPP2r_S8XM$X)@O-xVKi4`7373Jkd5{2$M#%cRhWer3M(vr{S6>h zj{givZJ3(`yFL@``(afn&~iNx@B1|-qfYiZu?-_&Z8+R~v`d6R-}EX9IVXWO-!hL5 z*k6T#^2zAXdardU3Ao~I)4DGdAv2bx{4nOK`20rJo>rmk3S2ZDu}))8Z1m}CKigf0 z3L`3Y`{huj`xj9@`$xTZzZc3je?n^yG<8sw$`Y%}9mUsjUR%T!?k^(q)6FH6Af^b6 zlPg~IEwg0y;`t9y;#D+uz!oE4VP&Je!<#q*F?m5L5?J3i@!0J6q#eu z!RRU`-)HeqGi_UJZ(n~|PSNsv+Wgl{P-TvaUQ9j?ZCtvb^37U$sFpBrkT{7Jpd?HpIvj2!}RIq zH{9~+gErN2+}J`>Jvng2hwM`=PLNkc7pkjblKW|+Fk9rc)G1R>Ww>RC=r-|!m-u7( zc(a$9NG}w#PjWNMS~)o=i~WA&4L(YIW25@AL9+H9!?3Y}sv#MOdY{bb9j>p`{?O(P zIvb`n?_(gP2w3P#&91JX*md+bBEr%xUHMVqfB;(f?OPtMnAZ#rm5q5mh;a2f_si2_ z3oXWB?{NF(JtkAn6F(O{z@b76OIqMC$&oJ_&S|YbFJ*)3qVX_uNf5b8(!vGX19hsG z(OP>RmZp29KH9Ge2kKjKigUmOe^K_!UXP`von)PR8Qz$%=EmOB9xS(ZxE_tnyzo}7 z=6~$~9k0M~v}`w={AeqF?_)9q{m8K#6M{a&(;u;O41j)I$^T?lx5(zlebpY@NT&#N zR+1bB)-1-xj}R8uwqwf=iP1GbxBjneCC%UrSdSxK1vM^i9;bUkS#iRZw2H>rS<2<$ zNT3|sDH>{tXb=zq7XZi*K?#Zsa1h1{h5!Tq_YbKFm_*=A5-<~j63he;4`77!|LBlo zR^~tR3yxcU=gDFbshyF6>o0bdp$qmHS7D}m3;^QZq9kBBU|9$N-~oU?G5;jyFR7>z hN`IR97YZXIo@y!QgFWddJ3|0`sjFx!m))><{BI=FK%f8s literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/web/icons/Icon-maskable-192.png b/packages/ardrive_uploader/example/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 zcmdT|`#%%j|KDb2V@0DPm$^(Lx5}lO%Yv(=e*7hl@QqKS50#~#^IQPxBmuh|i9sXnt4ch@VT0F7% zMtrs@KWIOo+QV@lSs66A>2pz6-`9Jk=0vv&u?)^F@HZ)-6HT=B7LF;rdj zskUyBfbojcX#CS>WrIWo9D=DIwcXM8=I5D{SGf$~=gh-$LwY?*)cD%38%sCc?5OsX z-XfkyL-1`VavZ?>(pI-xp-kYq=1hsnyP^TLb%0vKRSo^~r{x?ISLY1i7KjSp z*0h&jG(Rkkq2+G_6eS>n&6>&Xk+ngOMcYrk<8KrukQHzfx675^^s$~<@d$9X{VBbg z2Fd4Z%g`!-P}d#`?B4#S-9x*eNlOVRnDrn#jY@~$jfQ-~3Od;A;x-BI1BEDdvr`pI z#D)d)!2_`GiZOUu1crb!hqH=ezs0qk<_xDm_Kkw?r*?0C3|Io6>$!kyDl;eH=aqg$B zsH_|ZD?jP2dc=)|L>DZmGyYKa06~5?C2Lc0#D%62p(YS;%_DRCB1k(+eLGXVMe+=4 zkKiJ%!N6^mxqM=wq`0+yoE#VHF%R<{mMamR9o_1JH8jfnJ?NPLs$9U!9!dq8 z0B{dI2!M|sYGH&9TAY34OlpIsQ4i5bnbG>?cWwat1I13|r|_inLE?FS@Hxdxn_YZN z3jfUO*X9Q@?HZ>Q{W0z60!bbGh557XIKu1?)u|cf%go`pwo}CD=0tau-}t@R2OrSH zQzZr%JfYa`>2!g??76=GJ$%ECbQh7Q2wLRp9QoyiRHP7VE^>JHm>9EqR3<$Y=Z1K^SHuwxCy-5@z3 zVM{XNNm}yM*pRdLKp??+_2&!bp#`=(Lh1vR{~j%n;cJv~9lXeMv)@}Odta)RnK|6* zC+IVSWumLo%{6bLDpn)Gz>6r&;Qs0^+Sz_yx_KNz9Dlt^ax`4>;EWrIT#(lJ_40<= z750fHZ7hI{}%%5`;lwkI4<_FJw@!U^vW;igL0k+mK)-j zYuCK#mCDK3F|SC}tC2>m$ZCqNB7ac-0UFBJ|8RxmG@4a4qdjvMzzS&h9pQmu^x&*= zGvapd1#K%Da&)8f?<9WN`2H^qpd@{7In6DNM&916TRqtF4;3`R|Nhwbw=(4|^Io@T zIjoR?tB8d*sO>PX4vaIHF|W;WVl6L1JvSmStgnRQq zTX4(>1f^5QOAH{=18Q2Vc1JI{V=yOr7yZJf4Vpfo zeHXdhBe{PyY;)yF;=ycMW@Kb>t;yE>;f79~AlJ8k`xWucCxJfsXf2P72bAavWL1G#W z;o%kdH(mYCM{$~yw4({KatNGim49O2HY6O07$B`*K7}MvgI=4x=SKdKVb8C$eJseA$tmSFOztFd*3W`J`yIB_~}k%Sd_bPBK8LxH)?8#jM{^%J_0|L z!gFI|68)G}ex5`Xh{5pB%GtlJ{Z5em*e0sH+sU1UVl7<5%Bq+YrHWL7?X?3LBi1R@_)F-_OqI1Zv`L zb6^Lq#H^2@d_(Z4E6xA9Z4o3kvf78ZDz!5W1#Mp|E;rvJz&4qj2pXVxKB8Vg0}ek%4erou@QM&2t7Cn5GwYqy%{>jI z)4;3SAgqVi#b{kqX#$Mt6L8NhZYgonb7>+r#BHje)bvaZ2c0nAvrN3gez+dNXaV;A zmyR0z@9h4@6~rJik-=2M-T+d`t&@YWhsoP_XP-NsVO}wmo!nR~QVWU?nVlQjNfgcTzE-PkfIX5G z1?&MwaeuzhF=u)X%Vpg_e@>d2yZwxl6-r3OMqDn8_6m^4z3zG##cK0Fsgq8fcvmhu z{73jseR%X%$85H^jRAcrhd&k!i^xL9FrS7qw2$&gwAS8AfAk#g_E_tP;x66fS`Mn@SNVrcn_N;EQm z`Mt3Z%rw%hDqTH-s~6SrIL$hIPKL5^7ejkLTBr46;pHTQDdoErS(B>``t;+1+M zvU&Se9@T_BeK;A^p|n^krIR+6rH~BjvRIugf`&EuX9u69`9C?9ANVL8l(rY6#mu^i z=*5Q)-%o*tWl`#b8p*ZH0I}hn#gV%|jt6V_JanDGuekR*-wF`u;amTCpGG|1;4A5$ zYbHF{?G1vv5;8Ph5%kEW)t|am2_4ik!`7q{ymfHoe^Z99c|$;FAL+NbxE-_zheYbV z3hb0`uZGTsgA5TG(X|GVDSJyJxsyR7V5PS_WSnYgwc_D60m7u*x4b2D79r5UgtL18 zcCHWk+K6N1Pg2c;0#r-)XpwGX?|Iv)^CLWqwF=a}fXUSM?n6E;cCeW5ER^om#{)Jr zJR81pkK?VoFm@N-s%hd7@hBS0xuCD0-UDVLDDkl7Ck=BAj*^ps`393}AJ+Ruq@fl9 z%R(&?5Nc3lnEKGaYMLmRzKXow1+Gh|O-LG7XiNxkG^uyv zpAtLINwMK}IWK65hOw&O>~EJ}x@lDBtB`yKeV1%GtY4PzT%@~wa1VgZn7QRwc7C)_ zpEF~upeDRg_<#w=dLQ)E?AzXUQpbKXYxkp>;c@aOr6A|dHA?KaZkL0svwB^U#zmx0 zzW4^&G!w7YeRxt<9;d@8H=u(j{6+Uj5AuTluvZZD4b+#+6Rp?(yJ`BC9EW9!b&KdPvzJYe5l7 zMJ9aC@S;sA0{F0XyVY{}FzW0Vh)0mPf_BX82E+CD&)wf2!x@{RO~XBYu80TONl3e+ zA7W$ra6LcDW_j4s-`3tI^VhG*sa5lLc+V6ONf=hO@q4|p`CinYqk1Ko*MbZ6_M05k zSwSwkvu;`|I*_Vl=zPd|dVD0lh&Ha)CSJJvV{AEdF{^Kn_Yfsd!{Pc1GNgw}(^~%)jk5~0L~ms|Rez1fiK~s5t(p1ci5Gq$JC#^JrXf?8 z-Y-Zi_Hvi>oBzV8DSRG!7dm|%IlZg3^0{5~;>)8-+Nk&EhAd(}s^7%MuU}lphNW9Q zT)DPo(ob{tB7_?u;4-qGDo!sh&7gHaJfkh43QwL|bbFVi@+oy;i;M zM&CP^v~lx1U`pi9PmSr&Mc<%HAq0DGH?Ft95)WY`P?~7O z`O^Nr{Py9M#Ls4Y7OM?e%Y*Mvrme%=DwQaye^Qut_1pOMrg^!5u(f9p(D%MR%1K>% zRGw%=dYvw@)o}Fw@tOtPjz`45mfpn;OT&V(;z75J*<$52{sB65$gDjwX3Xa!x_wE- z!#RpwHM#WrO*|~f7z}(}o7US(+0FYLM}6de>gQdtPazXz?OcNv4R^oYLJ_BQOd_l172oSK$6!1r@g+B@0ofJ4*{>_AIxfe-#xp>(1 z@Y3Nfd>fmqvjL;?+DmZk*KsfXJf<%~(gcLwEez%>1c6XSboURUh&k=B)MS>6kw9bY z{7vdev7;A}5fy*ZE23DS{J?8at~xwVk`pEwP5^k?XMQ7u64;KmFJ#POzdG#np~F&H ze-BUh@g54)dsS%nkBb}+GuUEKU~pHcYIg4vSo$J(J|U36bs0Use+3A&IMcR%6@jv$ z=+QI+@wW@?iu}Hpyzlvj-EYeop{f65GX0O%>w#0t|V z1-svWk`hU~m`|O$kw5?Yn5UhI%9P-<45A(v0ld1n+%Ziq&TVpBcV9n}L9Tus-TI)f zd_(g+nYCDR@+wYNQm1GwxhUN4tGMLCzDzPqY$~`l<47{+l<{FZ$L6(>J)|}!bi<)| zE35dl{a2)&leQ@LlDxLQOfUDS`;+ZQ4ozrleQwaR-K|@9T{#hB5Z^t#8 zC-d_G;B4;F#8A2EBL58s$zF-=SCr`P#z zNCTnHF&|X@q>SkAoYu>&s9v@zCpv9lLSH-UZzfhJh`EZA{X#%nqw@@aW^vPcfQrlPs(qQxmC|4tp^&sHy!H!2FH5eC{M@g;ElWNzlb-+ zxpfc0m4<}L){4|RZ>KReag2j%Ot_UKkgpJN!7Y_y3;Ssz{9 z!K3isRtaFtQII5^6}cm9RZd5nTp9psk&u1C(BY`(_tolBwzV_@0F*m%3G%Y?2utyS zY`xM0iDRT)yTyYukFeGQ&W@ReM+ADG1xu@ruq&^GK35`+2r}b^V!m1(VgH|QhIPDE X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/web/icons/Icon-maskable-512.png b/packages/ardrive_uploader/example/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 zcmeFZ_gj-)&^4Nb2tlbLMU<{!p(#yjqEe+=0IA_oih%ScH9@5#MNp&}Y#;;(h=A0@ zh7{>lT2MkSQ344eAvrhici!td|HJuyvJm#Y_w1Q9Yu3!26dNlO-oxUDK_C#XnW^Co z5C{VN6#{~B0)K2j7}*1Xq(Nqemv23A-6&=ZpEijkVnSwVGqLv40?n0=p;k3-U5e5+ z+z3>aS`u9DS=!wg8ROu?X4TFoW6CFLL&{GzoVT)ldhLekLM|+j3tIxRd|*5=c{=s&*vfPdBr(Fyj(v@%eQj1Soy7m4^@VRl1~@-PV7y+c!xz$8436WBn$t{=}mEdK#k`aystimGgI{(IBx$!pAwFoE9Y`^t^;> zKAD)C(Dl^s%`?q5$P|fZf8Xymrtu^Pv(7D`rn>Z-w$Ahs!z9!94WNVxrJuXfHAaxg zC6s@|Z1$7R$(!#t%Jb{{s6(Y?NoQXDYq)!}X@jKPhe`{9KQ@sAU8y-5`xt?S9$jKH zoi}6m5PcG*^{kjvt+kwPpyQzVg4o)a>;LK`aaN2x4@itBD3Aq?yWTM20VRn1rrd+2 zKO=P0rMjEGq_UqpMa`~7B|p?xAN1SCoCp}QxAv8O`jLJ5CVh@umR%c%i^)6!o+~`F zaalSTQcl5iwOLC&H)efzd{8(88mo`GI(56T<(&p7>Qd^;R1hn1Y~jN~tApaL8>##U zd65bo8)79CplWxr#z4!6HvLz&N7_5AN#x;kLG?zQ(#p|lj<8VUlKY=Aw!ATqeL-VG z42gA!^cMNPj>(`ZMEbCrnkg*QTsn*u(nQPWI9pA{MQ=IsPTzd7q5E#7+z>Ch=fx$~ z;J|?(5jTo5UWGvsJa(Sx0?S#56+8SD!I^tftyeh_{5_31l6&Hywtn`bbqYDqGZXI( zCG7hBgvksX2ak8+)hB4jnxlO@A32C_RM&g&qDSb~3kM&)@A_j1*oTO@nicGUyv+%^ z=vB)4(q!ykzT==Z)3*3{atJ5}2PV*?Uw+HhN&+RvKvZL3p9E?gHjv{6zM!A|z|UHK z-r6jeLxbGn0D@q5aBzlco|nG2tr}N@m;CJX(4#Cn&p&sLKwzLFx1A5izu?X_X4x8r@K*d~7>t1~ zDW1Mv5O&WOxbzFC`DQ6yNJ(^u9vJdj$fl2dq`!Yba_0^vQHXV)vqv1gssZYzBct!j zHr9>ydtM8wIs}HI4=E}qAkv|BPWzh3^_yLH(|kdb?x56^BlDC)diWyPd*|f!`^12_U>TD^^94OCN0lVv~Sgvs94ecpE^}VY$w`qr_>Ue zTfH~;C<3H<0dS5Rkf_f@1x$Gms}gK#&k()IC0zb^QbR!YLoll)c$Agfi6MKI0dP_L z=Uou&u~~^2onea2%XZ@>`0x^L8CK6=I{ge;|HXMj)-@o~h&O{CuuwBX8pVqjJ*o}5 z#8&oF_p=uSo~8vn?R0!AMWvcbZmsrj{ZswRt(aEdbi~;HeVqIe)-6*1L%5u$Gbs}| zjFh?KL&U(rC2izSGtwP5FnsR@6$-1toz?RvLD^k~h9NfZgzHE7m!!7s6(;)RKo2z} zB$Ci@h({l?arO+vF;s35h=|WpefaOtKVx>l399}EsX@Oe3>>4MPy%h&^3N_`UTAHJ zI$u(|TYC~E4)|JwkWW3F!Tib=NzjHs5ii2uj0^m|Qlh-2VnB#+X~RZ|`SA*}}&8j9IDv?F;(Y^1=Z0?wWz;ikB zewU>MAXDi~O7a~?jx1x=&8GcR-fTp>{2Q`7#BE#N6D@FCp`?ht-<1|y(NArxE_WIu zP+GuG=Qq>SHWtS2M>34xwEw^uvo4|9)4s|Ac=ud?nHQ>ax@LvBqusFcjH0}{T3ZPQ zLO1l<@B_d-(IS682}5KA&qT1+{3jxKolW+1zL4inqBS-D>BohA!K5++41tM@ z@xe<-qz27}LnV#5lk&iC40M||JRmZ*A##K3+!j93eouU8@q-`W0r%7N`V$cR&JV;iX(@cS{#*5Q>~4BEDA)EikLSP@>Oo&Bt1Z~&0d5)COI%3$cLB_M?dK# z{yv2OqW!al-#AEs&QFd;WL5zCcp)JmCKJEdNsJlL9K@MnPegK23?G|O%v`@N{rIRa zi^7a}WBCD77@VQ-z_v{ZdRsWYrYgC$<^gRQwMCi6);%R~uIi31OMS}=gUTE(GKmCI z$zM>mytL{uNN+a&S38^ez(UT=iSw=l2f+a4)DyCA1Cs_N-r?Q@$3KTYosY!;pzQ0k zzh1G|kWCJjc(oZVBji@kN%)UBw(s{KaYGy=i{g3{)Z+&H8t2`^IuLLKWT6lL<-C(! zSF9K4xd-|VO;4}$s?Z7J_dYqD#Mt)WCDnsR{Kpjq275uUq6`v0y*!PHyS(}Zmv)_{>Vose9-$h8P0|y;YG)Bo}$(3Z%+Gs0RBmFiW!^5tBmDK-g zfe5%B*27ib+7|A*Fx5e)2%kIxh7xWoc3pZcXS2zik!63lAG1;sC1ja>BqH7D zODdi5lKW$$AFvxgC-l-)!c+9@YMC7a`w?G(P#MeEQ5xID#<}W$3bSmJ`8V*x2^3qz zVe<^^_8GHqYGF$nIQm0Xq2kAgYtm#UC1A(=&85w;rmg#v906 zT;RyMgbMpYOmS&S9c38^40oUp?!}#_84`aEVw;T;r%gTZkWeU;;FwM@0y0adt{-OK z(vGnPSlR=Nv2OUN!2=xazlnHPM9EWxXg2EKf0kI{iQb#FoP>xCB<)QY>OAM$Dcdbm zU6dU|%Mo(~avBYSjRc13@|s>axhrPl@Sr81{RSZUdz4(=|82XEbV*JAX6Lfbgqgz584lYgi0 z2-E{0XCVON$wHfvaLs;=dqhQJ&6aLn$D#0i(FkAVrXG9LGm3pSTf&f~RQb6|1_;W> z?n-;&hrq*~L=(;u#jS`*Yvh@3hU-33y_Kv1nxqrsf>pHVF&|OKkoC)4DWK%I!yq?P z=vXo8*_1iEWo8xCa{HJ4tzxOmqS0&$q+>LroMKI*V-rxhOc%3Y!)Y|N6p4PLE>Yek>Y(^KRECg8<|%g*nQib_Yc#A5q8Io z6Ig&V>k|~>B6KE%h4reAo*DfOH)_01tE0nWOxX0*YTJgyw7moaI^7gW*WBAeiLbD?FV9GSB zPv3`SX*^GRBM;zledO`!EbdBO_J@fEy)B{-XUTVQv}Qf~PSDpK9+@I`7G7|>Dgbbu z_7sX9%spVo$%qwRwgzq7!_N;#Td08m5HV#?^dF-EV1o)Q=Oa+rs2xH#g;ykLbwtCh znUnA^dW!XjspJ;otq$yV@I^s9Up(5k7rqhQd@OLMyyxVLj_+$#Vc*}Usevp^I(^vH zmDgHc0VMme|K&X?9&lkN{yq_(If)O`oUPW8X}1R5pSVBpfJe0t{sPA(F#`eONTh_) zxeLqHMfJX#?P(@6w4CqRE@Eiza; z;^5)Kk=^5)KDvd9Q<`=sJU8rjjxPmtWMTmzcH={o$U)j=QBuHarp?=}c??!`3d=H$nrJMyr3L-& zA#m?t(NqLM?I3mGgWA_C+0}BWy3-Gj7bR+d+U?n*mN$%5P`ugrB{PeV>jDUn;eVc- zzeMB1mI4?fVJatrNyq|+zn=!AiN~<}eoM#4uSx^K?Iw>P2*r=k`$<3kT00BE_1c(02MRz4(Hq`L^M&xt!pV2 zn+#U3@j~PUR>xIy+P>51iPayk-mqIK_5rlQMSe5&tDkKJk_$i(X&;K(11YGpEc-K= zq4Ln%^j>Zi_+Ae9eYEq_<`D+ddb8_aY!N;)(&EHFAk@Ekg&41ABmOXfWTo)Z&KotA zh*jgDGFYQ^y=m)<_LCWB+v48DTJw*5dwMm_YP0*_{@HANValf?kV-Ic3xsC}#x2h8 z`q5}d8IRmqWk%gR)s~M}(Qas5+`np^jW^oEd-pzERRPMXj$kS17g?H#4^trtKtq;C?;c ztd|%|WP2w2Nzg@)^V}!Gv++QF2!@FP9~DFVISRW6S?eP{H;;8EH;{>X_}NGj^0cg@ z!2@A>-CTcoN02^r6@c~^QUa={0xwK0v4i-tQ9wQq^=q*-{;zJ{Qe%7Qd!&X2>rV@4 z&wznCz*63_vw4>ZF8~%QCM?=vfzW0r_4O^>UA@otm_!N%mH)!ERy&b!n3*E*@?9d^ zu}s^By@FAhG(%?xgJMuMzuJw2&@$-oK>n z=UF}rt%vuaP9fzIFCYN-1&b#r^Cl6RDFIWsEsM|ROf`E?O(cy{BPO2Ie~kT+^kI^i zp>Kbc@C?}3vy-$ZFVX#-cx)Xj&G^ibX{pWggtr(%^?HeQL@Z( zM-430g<{>vT*)jK4aY9(a{lSy{8vxLbP~n1MXwM527ne#SHCC^F_2@o`>c>>KCq9c(4c$VSyMl*y3Nq1s+!DF| z^?d9PipQN(mw^j~{wJ^VOXDCaL$UtwwTpyv8IAwGOg<|NSghkAR1GSNLZ1JwdGJYm zP}t<=5=sNNUEjc=g(y)1n5)ynX(_$1-uGuDR*6Y^Wgg(LT)Jp><5X|}bt z_qMa&QP?l_n+iVS>v%s2Li_;AIeC=Ca^v1jX4*gvB$?H?2%ndnqOaK5-J%7a} zIF{qYa&NfVY}(fmS0OmXA70{znljBOiv5Yod!vFU{D~*3B3Ka{P8?^ zfhlF6o7aNT$qi8(w<}OPw5fqA7HUje*r*Oa(YV%*l0|9FP9KW@U&{VSW{&b0?@y)M zs%4k1Ax;TGYuZ9l;vP5@?3oQsp3)rjBeBvQQ>^B;z5pc=(yHhHtq6|0m(h4envn_j787fizY@V`o(!SSyE7vlMT zbo=Z1c=atz*G!kwzGB;*uPL$Ei|EbZLh8o+1BUMOpnU(uX&OG1MV@|!&HOOeU#t^x zr9=w2ow!SsTuJWT7%Wmt14U_M*3XiWBWHxqCVZI0_g0`}*^&yEG9RK9fHK8e+S^m? zfCNn$JTswUVbiC#>|=wS{t>-MI1aYPLtzO5y|LJ9nm>L6*wpr_m!)A2Fb1RceX&*|5|MwrvOk4+!0p99B9AgP*9D{Yt|x=X}O% zgIG$MrTB=n-!q%ROT|SzH#A$Xm;|ym)0>1KR}Yl0hr-KO&qMrV+0Ej3d@?FcgZ+B3 ztEk16g#2)@x=(ko8k7^Tq$*5pfZHC@O@}`SmzT1(V@x&NkZNM2F#Q-Go7-uf_zKC( zB(lHZ=3@dHaCOf6C!6i8rDL%~XM@rVTJbZL09?ht@r^Z_6x}}atLjvH^4Vk#Ibf(^LiBJFqorm?A=lE zzFmwvp4bT@Nv2V>YQT92X;t9<2s|Ru5#w?wCvlhcHLcsq0TaFLKy(?nzezJ>CECqj zggrI~Hd4LudM(m{L@ezfnpELsRFVFw>fx;CqZtie`$BXRn#Ns%AdoE$-Pf~{9A8rV zf7FbgpKmVzmvn-z(g+&+-ID=v`;6=)itq8oM*+Uz**SMm_{%eP_c0{<%1JGiZS19o z@Gj7$Se~0lsu}w!%;L%~mIAO;AY-2i`9A*ZfFs=X!LTd6nWOZ7BZH2M{l2*I>Xu)0 z`<=;ObglnXcVk!T>e$H?El}ra0WmPZ$YAN0#$?|1v26^(quQre8;k20*dpd4N{i=b zuN=y}_ew9SlE~R{2+Rh^7%PA1H5X(p8%0TpJ=cqa$65XL)$#ign-y!qij3;2>j}I; ziO@O|aYfn&up5F`YtjGw68rD3{OSGNYmBnl?zdwY$=RFsegTZ=kkzRQ`r7ZjQP!H( zp4>)&zf<*N!tI00xzm-ME_a{_I!TbDCr;8E;kCH4LlL-tqLxDuBn-+xgPk37S&S2^ z2QZumkIimwz!c@!r0)j3*(jPIs*V!iLTRl0Cpt_UVNUgGZzdvs0(-yUghJfKr7;=h zD~y?OJ-bWJg;VdZ^r@vlDoeGV&8^--!t1AsIMZ5S440HCVr%uk- z2wV>!W1WCvFB~p$P$$_}|H5>uBeAe>`N1FI8AxM|pq%oNs;ED8x+tb44E) zTj{^fbh@eLi%5AqT?;d>Es5D*Fi{Bpk)q$^iF!!U`r2hHAO_?#!aYmf>G+jHsES4W zgpTKY59d?hsb~F0WE&dUp6lPt;Pm zcbTUqRryw^%{ViNW%Z(o8}dd00H(H-MmQmOiTq{}_rnwOr*Ybo7*}3W-qBT!#s0Ie z-s<1rvvJx_W;ViUD`04%1pra*Yw0BcGe)fDKUK8aF#BwBwMPU;9`!6E(~!043?SZx z13K%z@$$#2%2ovVlgFIPp7Q6(vO)ud)=*%ZSucL2Dh~K4B|%q4KnSpj#n@(0B})!9 z8p*hY@5)NDn^&Pmo;|!>erSYg`LkO?0FB@PLqRvc>4IsUM5O&>rRv|IBRxi(RX(gJ ztQ2;??L~&Mv;aVr5Q@(?y^DGo%pO^~zijld41aA0KKsy_6FeHIn?fNHP-z>$OoWer zjZ5hFQTy*-f7KENRiCE$ZOp4|+Wah|2=n@|W=o}bFM}Y@0e62+_|#fND5cwa3;P{^pEzlJbF1Yq^}>=wy8^^^$I2M_MH(4Dw{F6hm+vrWV5!q;oX z;tTNhz5`-V={ew|bD$?qcF^WPR{L(E%~XG8eJx(DoGzt2G{l8r!QPJ>kpHeOvCv#w zr=SSwMDaUX^*~v%6K%O~i)<^6`{go>a3IdfZ8hFmz&;Y@P%ZygShQZ2DSHd`m5AR= zx$wWU06;GYwXOf(%MFyj{8rPFXD};JCe85Bdp4$YJ2$TzZ7Gr#+SwCvBI1o$QP0(c zy`P51FEBV2HTisM3bHqpmECT@H!Y2-bv2*SoSPoO?wLe{M#zDTy@ujAZ!Izzky~3k zRA1RQIIoC*Mej1PH!sUgtkR0VCNMX(_!b65mo66iM*KQ7xT8t2eev$v#&YdUXKwGm z7okYAqYF&bveHeu6M5p9xheRCTiU8PFeb1_Rht0VVSbm%|1cOVobc8mvqcw!RjrMRM#~=7xibH&Fa5Imc|lZ{eC|R__)OrFg4@X_ ze+kk*_sDNG5^ELmHnZ7Ue?)#6!O)#Nv*Dl2mr#2)w{#i-;}0*_h4A%HidnmclH#;Q zmQbq+P4DS%3}PpPm7K_K3d2s#k~x+PlTul7+kIKol0@`YN1NG=+&PYTS->AdzPv!> zQvzT=)9se*Jr1Yq+C{wbK82gAX`NkbXFZ)4==j4t51{|-v!!$H8@WKA={d>CWRW+g z*`L>9rRucS`vbXu0rzA1#AQ(W?6)}1+oJSF=80Kf_2r~Qm-EJ6bbB3k`80rCv(0d` zvCf3;L2ovYG_TES%6vSuoKfIHC6w;V31!oqHM8-I8AFzcd^+_86!EcCOX|Ta9k1!s z_Vh(EGIIsI3fb&dF$9V8v(sTBC%!#<&KIGF;R+;MyC0~}$gC}}= zR`DbUVc&Bx`lYykFZ4{R{xRaUQkWCGCQlEc;!mf=+nOk$RUg*7 z;kP7CVLEc$CA7@6VFpsp3_t~m)W0aPxjsA3e5U%SfY{tp5BV5jH-5n?YX7*+U+Zs%LGR>U- z!x4Y_|4{gx?ZPJobISy991O znrmrC3otC;#4^&Rg_iK}XH(XX+eUHN0@Oe06hJk}F?`$)KmH^eWz@@N%wEc)%>?Ft z#9QAroDeyfztQ5Qe{m*#R#T%-h*&XvSEn@N$hYRTCMXS|EPwzF3IIysD2waj`vQD{ zv_#^Pgr?s~I*NE=acf@dWVRNWTr(GN0wrL)Z2=`Dr>}&ZDNX|+^Anl{Di%v1Id$_p zK5_H5`RDjJx`BW7hc85|> zHMMsWJ4KTMRHGu+vy*kBEMjz*^K8VtU=bXJYdhdZ-?jTXa$&n)C?QQIZ7ln$qbGlr zS*TYE+ppOrI@AoPP=VI-OXm}FzgXRL)OPvR$a_=SsC<3Jb+>5makX|U!}3lx4tX&L z^C<{9TggZNoeX!P1jX_K5HkEVnQ#s2&c#umzV6s2U-Q;({l+j^?hi7JnQ7&&*oOy9 z(|0asVTWUCiCnjcOnB2pN0DpuTglKq;&SFOQ3pUdye*eT<2()7WKbXp1qq9=bhMWlF-7BHT|i3TEIT77AcjD(v=I207wi-=vyiw5mxgPdTVUC z&h^FEUrXwWs9en2C{ywZp;nvS(Mb$8sBEh-*_d-OEm%~p1b2EpcwUdf<~zmJmaSTO zSX&&GGCEz-M^)G$fBvLC2q@wM$;n4jp+mt0MJFLuJ%c`tSp8$xuP|G81GEd2ci$|M z4XmH{5$j?rqDWoL4vs!}W&!?!rtj=6WKJcE>)?NVske(p;|#>vL|M_$as=mi-n-()a*OU3Okmk0wC<9y7t^D(er-&jEEak2!NnDiOQ99Wx8{S8}=Ng!e0tzj*#T)+%7;aM$ z&H}|o|J1p{IK0Q7JggAwipvHvko6>Epmh4RFRUr}$*2K4dz85o7|3#Bec9SQ4Y*;> zXWjT~f+d)dp_J`sV*!w>B%)#GI_;USp7?0810&3S=WntGZ)+tzhZ+!|=XlQ&@G@~3 z-dw@I1>9n1{+!x^Hz|xC+P#Ab`E@=vY?3%Bc!Po~e&&&)Qp85!I|U<-fCXy*wMa&t zgDk!l;gk;$taOCV$&60z+}_$ykz=Ea*)wJQ3-M|p*EK(cvtIre0Pta~(95J7zoxBN zS(yE^3?>88AL0Wfuou$BM{lR1hkrRibz=+I9ccwd`ZC*{NNqL)3pCcw^ygMmrG^Yp zn5f}Xf>%gncC=Yq96;rnfp4FQL#{!Y*->e82rHgY4Zwy{`JH}b9*qr^VA{%~Z}jtp z_t$PlS6}5{NtTqXHN?uI8ut8rOaD#F1C^ls73S=b_yI#iZDOGz3#^L@YheGd>L;<( z)U=iYj;`{>VDNzIxcjbTk-X3keXR8Xbc`A$o5# zKGSk-7YcoBYuAFFSCjGi;7b<;n-*`USs)IX z=0q6WZ=L!)PkYtZE-6)azhXV|+?IVGTOmMCHjhkBjfy@k1>?yFO3u!)@cl{fFAXnRYsWk)kpT?X{_$J=|?g@Q}+kFw|%n!;Zo}|HE@j=SFMvT8v`6Y zNO;tXN^036nOB2%=KzxB?n~NQ1K8IO*UE{;Xy;N^ZNI#P+hRZOaHATz9(=)w=QwV# z`z3+P>9b?l-@$@P3<;w@O1BdKh+H;jo#_%rr!ute{|YX4g5}n?O7Mq^01S5;+lABE+7`&_?mR_z7k|Ja#8h{!~j)| zbBX;*fsbUak_!kXU%HfJ2J+G7;inu#uRjMb|8a){=^))y236LDZ$$q3LRlat1D)%7K0!q5hT5V1j3qHc7MG9 z_)Q=yQ>rs>3%l=vu$#VVd$&IgO}Za#?aN!xY>-<3PhzS&q!N<=1Q7VJBfHjug^4|) z*fW^;%3}P7X#W3d;tUs3;`O&>;NKZBMR8au6>7?QriJ@gBaorz-+`pUWOP73DJL=M z(33uT6Gz@Sv40F6bN|H=lpcO z^AJl}&=TIjdevuDQ!w0K*6oZ2JBOhb31q!XDArFyKpz!I$p4|;c}@^bX{>AXdt7Bm zaLTk?c%h@%xq02reu~;t@$bv`b3i(P=g}~ywgSFpM;}b$zAD+=I!7`V~}ARB(Wx0C(EAq@?GuxOL9X+ffbkn3+Op0*80TqmpAq~EXmv%cq36celXmRz z%0(!oMp&2?`W)ALA&#|fu)MFp{V~~zIIixOxY^YtO5^FSox8v$#d0*{qk0Z)pNTt0QVZ^$`4vImEB>;Lo2!7K05TpY-sl#sWBz_W-aDIV`Ksabi zvpa#93Svo!70W*Ydh)Qzm{0?CU`y;T^ITg-J9nfWeZ-sbw)G@W?$Eomf%Bg2frfh5 zRm1{|E0+(4zXy){$}uC3%Y-mSA2-^I>Tw|gQx|7TDli_hB>``)Q^aZ`LJC2V3U$SABP}T)%}9g2pF9dT}aC~!rFFgkl1J$ z`^z{Arn3On-m%}r}TGF8KQe*OjSJ=T|caa_E;v89A{t@$yT^(G9=N9F?^kT*#s3qhJq!IH5|AhnqFd z0B&^gm3w;YbMNUKU>naBAO@fbz zqw=n!@--}o5;k6DvTW9pw)IJVz;X}ncbPVrmH>4x);8cx;q3UyiML1PWp%bxSiS|^ zC5!kc4qw%NSOGQ*Kcd#&$30=lDvs#*4W4q0u8E02U)7d=!W7+NouEyuF1dyH$D@G& zaFaxo9Ex|ZXA5y{eZT*i*dP~INSMAi@mvEX@q5i<&o&#sM}Df?Og8n8Ku4vOux=T% zeuw~z1hR}ZNwTn8KsQHKLwe2>p^K`YWUJEdVEl|mO21Bov!D0D$qPoOv=vJJ`)|%_ z>l%`eexY7t{BlVKP!`a^U@nM?#9OC*t76My_E_<16vCz1x_#82qj2PkWiMWgF8bM9 z(1t4VdHcJ;B~;Q%x01k_gQ0>u2*OjuEWNOGX#4}+N?Gb5;+NQMqp}Puqw2HnkYuKA zzKFWGHc&K>gwVgI1Sc9OT1s6fq=>$gZU!!xsilA$fF`kLdGoX*^t}ao@+^WBpk>`8 z4v_~gK|c2rCq#DZ+H)$3v~Hoi=)=1D==e3P zpKrRQ+>O^cyTuWJ%2}__0Z9SM_z9rptd*;-9uC1tDw4+A!=+K%8~M&+Zk#13hY$Y$ zo-8$*8dD5@}XDi19RjK6T^J~DIXbF5w&l?JLHMrf0 zLv0{7*G!==o|B%$V!a=EtVHdMwXLtmO~vl}P6;S(R2Q>*kTJK~!}gloxj)m|_LYK{ zl(f1cB=EON&wVFwK?MGn^nWuh@f95SHatPs(jcwSY#Dnl1@_gkOJ5=f`%s$ZHljRH0 z+c%lrb=Gi&N&1>^L_}#m>=U=(oT^vTA&3!xXNyqi$pdW1BDJ#^{h|2tZc{t^vag3& zAD7*8C`chNF|27itjBUo^CCDyEpJLX3&u+(L;YeeMwnXEoyN(ytoEabcl$lSgx~Ltatn}b$@j_yyMrBb03)shJE*$;Mw=;mZd&8e>IzE+4WIoH zCSZE7WthNUL$|Y#m!Hn?x7V1CK}V`KwW2D$-7&ODy5Cj;!_tTOOo1Mm%(RUt)#$@3 zhurA)t<7qik%%1Et+N1?R#hdBB#LdQ7{%-C zn$(`5e0eFh(#c*hvF>WT*07fk$N_631?W>kfjySN8^XC9diiOd#s?4tybICF;wBjp zIPzilX3{j%4u7blhq)tnaOBZ_`h_JqHXuI7SuIlNTgBk9{HIS&3|SEPfrvcE<@}E` zKk$y*nzsqZ{J{uWW9;#n=de&&h>m#A#q)#zRonr(?mDOYU&h&aQWD;?Z(22wY?t$U3qo`?{+amA$^TkxL+Ex2dh`q7iR&TPd0Ymwzo#b? zP$#t=elB5?k$#uE$K>C$YZbYUX_JgnXA`oF_Ifz4H7LEOW~{Gww&3s=wH4+j8*TU| zSX%LtJWqhr-xGNSe{;(16kxnak6RnZ{0qZ^kJI5X*It_YuynSpi(^-}Lolr{)#z_~ zw!(J-8%7Ybo^c3(mED`Xz8xecP35a6M8HarxRn%+NJBE;dw>>Y2T&;jzRd4FSDO3T zt*y+zXCtZQ0bP0yf6HRpD|WmzP;DR^-g^}{z~0x~z4j8m zucTe%k&S9Nt-?Jb^gYW1w6!Y3AUZ0Jcq;pJ)Exz%7k+mUOm6%ApjjSmflfKwBo6`B zhNb@$NHTJ>guaj9S{@DX)!6)b-Shav=DNKWy(V00k(D!v?PAR0f0vDNq*#mYmUp6> z76KxbFDw5U{{qx{BRj(>?|C`82ICKbfLxoldov-M?4Xl+3;I4GzLHyPOzYw7{WQST zPNYcx5onA%MAO9??41Po*1zW(Y%Zzn06-lUp{s<3!_9vv9HBjT02On0Hf$}NP;wF) zP<`2p3}A^~1YbvOh{ePMx$!JGUPX-tbBzp3mDZMY;}h;sQ->!p97GA)9a|tF(Gh{1$xk7 zUw?ELkT({Xw!KIr);kTRb1b|UL`r2_`a+&UFVCdJ)1T#fdh;71EQl9790Br0m_`$x z9|ZANuchFci8GNZ{XbP=+uXSJRe(;V5laQz$u18#?X*9}x7cIEbnr%<=1cX3EIu7$ zhHW6pe5M(&qEtsqRa>?)*{O;OJT+YUhG5{km|YI7I@JL_3Hwao9aXneiSA~a* z|Lp@c-oMNyeAEuUz{F?kuou3x#C*gU?lon!RC1s37gW^0Frc`lqQWH&(J4NoZg3m8 z;Lin#8Q+cFPD7MCzj}#|ws7b@?D9Q4dVjS4dpco=4yX5SSH=A@U@yqPdp@?g?qeia zH=Tt_9)G=6C2QIPsi-QipnK(mc0xXIN;j$WLf@n8eYvMk;*H-Q4tK%(3$CN}NGgO8n}fD~+>?<3UzvsrMf*J~%i;VKQHbF%TPalFi=#sgj)(P#SM^0Q=Tr>4kJVw8X3iWsP|e8tj}NjlMdWp z@2+M4HQu~3!=bZpjh;;DIDk&X}=c8~kn)FWWH z2KL1w^rA5&1@@^X%MjZ7;u(kH=YhH2pJPFQe=hn>tZd5RC5cfGYis8s9PKaxi*}-s6*W zRA^PwR=y^5Z){!(4D9-KC;0~;b*ploznFOaU`bJ_7U?qAi#mTo!&rIECRL$_y@yI27x2?W+zqDBD5~KCVYKFZLK+>ABC(Kj zeAll)KMgIlAG`r^rS{loBrGLtzhHY8$)<_S<(Dpkr(Ym@@vnQ&rS@FC*>2@XCH}M+an74WcRDcoQ+a3@A z9tYhl5$z7bMdTvD2r&jztBuo37?*k~wcU9GK2-)MTFS-lux-mIRYUuGUCI~V$?s#< z?1qAWb(?ZLm(N>%S%y10COdaq_Tm5c^%ooIxpR=`3e4C|@O5wY+eLik&XVi5oT7oe zmxH)Jd*5eo@!7t`x8!K=-+zJ-Sz)B_V$)s1pW~CDU$=q^&ABvf6S|?TOMB-RIm@CoFg>mjIQE)?+A1_3s6zmFU_oW&BqyMz1mY*IcP_2knjq5 zqw~JK(cVsmzc7*EvTT2rvpeqhg)W=%TOZ^>f`rD4|7Z5fq*2D^lpCttIg#ictgqZ$P@ru6P#f$x#KfnfTZj~LG6U_d-kE~`;kU_X)`H5so@?C zWmb!7x|xk@0L~0JFall*@ltyiL^)@3m4MqC7(7H0sH!WidId1#f#6R{Q&A!XzO1IAcIx;$k66dumt6lpUw@nL2MvqJ5^kbOVZ<^2jt5-njy|2@`07}0w z;M%I1$FCoLy`8xp8Tk)bFr;7aJeQ9KK6p=O$U0-&JYYy8woV*>b+FB?xLX`=pirYM z5K$BA(u)+jR{?O2r$c_Qvl?M{=Ar{yQ!UVsVn4k@0!b?_lA;dVz9uaQUgBH8Oz(Sb zrEs;&Ey>_ex8&!N{PmQjp+-Hlh|OA&wvDai#GpU=^-B70V0*LF=^bi+Nhe_o|azZ%~ZZ1$}LTmWt4aoB1 zPgccm$EwYU+jrdBaQFxQfn5gd(gM`Y*Ro1n&Zi?j=(>T3kmf94vdhf?AuS8>$Va#P zGL5F+VHpxdsCUa}+RqavXCobI-@B;WJbMphpK2%6t=XvKWWE|ruvREgM+|V=i6;;O zx$g=7^`$XWn0fu!gF=Xe9cMB8Z_SelD>&o&{1XFS`|nInK3BXlaeD*rc;R-#osyIS zWv&>~^TLIyBB6oDX+#>3<_0+2C4u2zK^wmHXXDD9_)kmLYJ!0SzM|%G9{pi)`X$uf zW}|%%#LgyK7m(4{V&?x_0KEDq56tk|0YNY~B(Sr|>WVz-pO3A##}$JCT}5P7DY+@W z#gJv>pA5>$|E3WO2tV7G^SuymB?tY`ooKcN3!vaQMnBNk-WATF{-$#}FyzgtJ8M^; zUK6KWSG)}6**+rZ&?o@PK3??uN{Q)#+bDP9i1W&j)oaU5d0bIWJ_9T5ac!qc?x66Q z$KUSZ`nYY94qfN_dpTFr8OW~A?}LD;Yty-BA)-be5Z3S#t2Io%q+cAbnGj1t$|qFR z9o?8B7OA^KjCYL=-!p}w(dkC^G6Nd%_I=1))PC0w5}ZZGJxfK)jP4Fwa@b-SYBw?% zdz9B-<`*B2dOn(N;mcTm%Do)rIvfXRNFX&1h`?>Rzuj~Wx)$p13nrDlS8-jwq@e@n zNIj_|8or==8~1h*Ih?w*8K7rYkGlwlTWAwLKc5}~dfz3y`kM&^Q|@C%1VAp_$wnw6zG~W4O+^ z>i?NY?oXf^Puc~+fDM$VgRNBpOZj{2cMP~gCqWAX4 z7>%$ux8@a&_B(pt``KSt;r+sR-$N;jdpY>|pyvPiN)9ohd*>mVST3wMo)){`B(&eX z1?zZJ-4u9NZ|~j1rdZYq4R$?swf}<6(#ex%7r{kh%U@kT)&kWuAszS%oJts=*OcL9 zaZwK<5DZw%1IFHXgFplP6JiL^dk8+SgM$D?8X+gE4172hXh!WeqIO>}$I9?Nry$*S zQ#f)RuH{P7RwA3v9f<-w>{PSzom;>(i&^l{E0(&Xp4A-*q-@{W1oE3K;1zb{&n28dSC2$N+6auXe0}e4b z)KLJ?5c*>@9K#I^)W;uU_Z`enquTUxr>mNq z1{0_puF-M7j${rs!dxxo3EelGodF1TvjV;Zpo;s{5f1pyCuRp=HDZ?s#IA4f?h|-p zGd|Mq^4hDa@Bh!c4ZE?O&x&XZ_ptZGYK4$9F4~{%R!}G1leCBx`dtNUS|K zL-7J5s4W@%mhXg1!}a4PD%!t&Qn%f_oquRajn3@C*)`o&K9o7V6DwzVMEhjVdDJ1fjhr#@=lp#@4EBqi=CCQ>73>R(>QKPNM&_Jpe5G`n4wegeC`FYEPJ{|vwS>$-`fuRSp3927qOv|NC3T3G-0 zA{K`|+tQy1yqE$ShWt8ny&5~)%ITb@^+x$w0)f&om;P8B)@}=Wzy59BwUfZ1vqw87 za2lB8J(&*l#(V}Id8SyQ0C(2amzkz3EqG&Ed0Jq1)$|&>4_|NIe=5|n=3?siFV0fI z{As5DLW^gs|B-b4C;Hd(SM-S~GQhzb>HgF2|2Usww0nL^;x@1eaB)=+Clj+$fF@H( z-fqP??~QMT$KI-#m;QC*&6vkp&8699G3)Bq0*kFZXINw=b9OVaed(3(3kS|IZ)CM? zJdnW&%t8MveBuK21uiYj)_a{Fnw0OErMzMN?d$QoPwkhOwcP&p+t>P)4tHlYw-pPN z^oJ=uc$Sl>pv@fZH~ZqxSvdhF@F1s=oZawpr^-#l{IIOGG=T%QXjtwPhIg-F@k@uIlr?J->Ia zpEUQ*=4g|XYn4Gez&aHr*;t$u3oODPmc2Ku)2Og|xjc%w;q!Zz+zY)*3{7V8bK4;& zYV82FZ+8?v)`J|G1w4I0fWdKg|2b#iaazCv;|?(W-q}$o&Y}Q5d@BRk^jL7#{kbCK zSgkyu;=DV+or2)AxCBgq-nj5=@n^`%T#V+xBGEkW4lCqrE)LMv#f;AvD__cQ@Eg3`~x| zW+h9mofSXCq5|M)9|ez(#X?-sxB%Go8};sJ?2abp(Y!lyi>k)|{M*Z$c{e1-K4ky` MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/web/index.html b/packages/ardrive_uploader/example/web/index.html new file mode 100644 index 0000000000..be820e83eb --- /dev/null +++ b/packages/ardrive_uploader/example/web/index.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + example + + + + + + + + + + diff --git a/packages/ardrive_uploader/example/web/manifest.json b/packages/ardrive_uploader/example/web/manifest.json new file mode 100644 index 0000000000..096edf8fe4 --- /dev/null +++ b/packages/ardrive_uploader/example/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "example", + "short_name": "example", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/packages/ardrive_uploader/example/windows/.gitignore b/packages/ardrive_uploader/example/windows/.gitignore new file mode 100644 index 0000000000..d492d0d98c --- /dev/null +++ b/packages/ardrive_uploader/example/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/packages/ardrive_uploader/example/windows/CMakeLists.txt b/packages/ardrive_uploader/example/windows/CMakeLists.txt new file mode 100644 index 0000000000..137867272c --- /dev/null +++ b/packages/ardrive_uploader/example/windows/CMakeLists.txt @@ -0,0 +1,102 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(example LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "example") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Define build configuration option. +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() +# Define settings for the Profile build mode. +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. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +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() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/packages/ardrive_uploader/example/windows/flutter/CMakeLists.txt b/packages/ardrive_uploader/example/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000000..930d2071a3 --- /dev/null +++ b/packages/ardrive_uploader/example/windows/flutter/CMakeLists.txt @@ -0,0 +1,104 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/packages/ardrive_uploader/example/windows/flutter/generated_plugin_registrant.cc b/packages/ardrive_uploader/example/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000000..7529be622c --- /dev/null +++ b/packages/ardrive_uploader/example/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) { + FileSaverPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FileSaverPlugin")); + FileSelectorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FileSelectorWindows")); + PermissionHandlerWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); +} diff --git a/packages/ardrive_uploader/example/windows/flutter/generated_plugin_registrant.h b/packages/ardrive_uploader/example/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000000..dc139d85a9 --- /dev/null +++ b/packages/ardrive_uploader/example/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/packages/ardrive_uploader/example/windows/flutter/generated_plugins.cmake b/packages/ardrive_uploader/example/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000000..df9fe7433e --- /dev/null +++ b/packages/ardrive_uploader/example/windows/flutter/generated_plugins.cmake @@ -0,0 +1,26 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + file_saver + file_selector_windows + permission_handler_windows +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +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) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/ardrive_uploader/example/windows/runner/CMakeLists.txt b/packages/ardrive_uploader/example/windows/runner/CMakeLists.txt new file mode 100644 index 0000000000..394917c053 --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +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 the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/packages/ardrive_uploader/example/windows/runner/Runner.rc b/packages/ardrive_uploader/example/windows/runner/Runner.rc new file mode 100644 index 0000000000..aecaa2b505 --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "example" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "example" "\0" + VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "example.exe" "\0" + VALUE "ProductName", "example" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/packages/ardrive_uploader/example/windows/runner/flutter_window.cpp b/packages/ardrive_uploader/example/windows/runner/flutter_window.cpp new file mode 100644 index 0000000000..b25e363efa --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/flutter_window.cpp @@ -0,0 +1,66 @@ +#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()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/packages/ardrive_uploader/example/windows/runner/flutter_window.h b/packages/ardrive_uploader/example/windows/runner/flutter_window.h new file mode 100644 index 0000000000..6da0652f05 --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/packages/ardrive_uploader/example/windows/runner/main.cpp b/packages/ardrive_uploader/example/windows/runner/main.cpp new file mode 100644 index 0000000000..a61bf80d31 --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"example", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/packages/ardrive_uploader/example/windows/runner/resource.h b/packages/ardrive_uploader/example/windows/runner/resource.h new file mode 100644 index 0000000000..66a65d1e4a --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/packages/ardrive_uploader/example/windows/runner/resources/app_icon.ico b/packages/ardrive_uploader/example/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/packages/ardrive_uploader/example/windows/runner/runner.exe.manifest b/packages/ardrive_uploader/example/windows/runner/runner.exe.manifest new file mode 100644 index 0000000000..a42ea7687c --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/packages/ardrive_uploader/example/windows/runner/utils.cpp b/packages/ardrive_uploader/example/windows/runner/utils.cpp new file mode 100644 index 0000000000..b2b08734db --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#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) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length <= 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/packages/ardrive_uploader/example/windows/runner/utils.h b/packages/ardrive_uploader/example/windows/runner/utils.h new file mode 100644 index 0000000000..3879d54755 --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/packages/ardrive_uploader/example/windows/runner/win32_window.cpp b/packages/ardrive_uploader/example/windows/runner/win32_window.cpp new file mode 100644 index 0000000000..60608d0fe5 --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// 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 registrar 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::Create(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, + 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; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// 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; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + 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. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/packages/ardrive_uploader/example/windows/runner/win32_window.h b/packages/ardrive_uploader/example/windows/runner/win32_window.h new file mode 100644 index 0000000000..e901dde684 --- /dev/null +++ b/packages/ardrive_uploader/example/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#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 a win32 window with |title| that is positioned and sized 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 this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // 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 + // responds 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; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/packages/ardrive_uploader/lib/ardrive_uploader.dart b/packages/ardrive_uploader/lib/ardrive_uploader.dart new file mode 100644 index 0000000000..2e21b73de4 --- /dev/null +++ b/packages/ardrive_uploader/lib/ardrive_uploader.dart @@ -0,0 +1,7 @@ + +library; + +export 'src/ardrive_uploader.dart'; +export 'src/arfs_upload_metadata.dart'; +export 'src/metadata_generator.dart'; +export 'src/upload_controller.dart'; diff --git a/packages/ardrive_uploader/lib/src/ardrive_uploader.dart b/packages/ardrive_uploader/lib/src/ardrive_uploader.dart new file mode 100644 index 0000000000..cdbb36ee14 --- /dev/null +++ b/packages/ardrive_uploader/lib/src/ardrive_uploader.dart @@ -0,0 +1,406 @@ +import 'dart:async'; + +import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_uploader/ardrive_uploader.dart'; +import 'package:ardrive_uploader/src/data_bundler.dart'; +import 'package:ardrive_uploader/src/streamed_upload.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +import 'package:arweave/arweave.dart'; +import 'package:cryptography/cryptography.dart' hide Cipher; + +enum UploadType { turbo, d2n } + +abstract class ArDriveUploader { + Future upload({ + required IOFile file, + required ARFSUploadMetadataArgs args, + required Wallet wallet, + SecretKey? driveKey, + required UploadType type, + }) { + throw UnimplementedError(); + } + + Future uploadFiles({ + required List<(ARFSUploadMetadataArgs, IOFile)> files, + required Wallet wallet, + SecretKey? driveKey, + required UploadType type, + }) { + throw UnimplementedError(); + } + + Future uploadEntities({ + required List<(ARFSUploadMetadataArgs, IOEntity)> entities, + required Wallet wallet, + SecretKey? driveKey, + Function(ARFSUploadMetadata)? skipMetadataUpload, + Function(ARFSUploadMetadata)? onCreateMetadata, + required UploadType type, + }) { + throw UnimplementedError(); + } + + factory ArDriveUploader({ + ARFSUploadMetadataGenerator? metadataGenerator, + required Uri turboUploadUri, + }) { + metadataGenerator ??= ARFSUploadMetadataGenerator( + tagsGenerator: ARFSTagsGenetator( + appInfoServices: AppInfoServices(), + ), + ); + + return _ArDriveUploader( + turboUploadUri: turboUploadUri, + dataBundlerFactory: DataBundlerFactory(), + metadataGenerator: metadataGenerator, + ); + } +} + +class _ArDriveUploader implements ArDriveUploader { + _ArDriveUploader({ + required DataBundlerFactory dataBundlerFactory, + required ARFSUploadMetadataGenerator metadataGenerator, + required Uri turboUploadUri, + }) : _dataBundlerFactory = dataBundlerFactory, + _turboUploadUri = turboUploadUri, + _metadataGenerator = metadataGenerator, + _streamedUploadFactory = StreamedUploadFactory(); + + final StreamedUploadFactory _streamedUploadFactory; + final DataBundlerFactory _dataBundlerFactory; + final ARFSUploadMetadataGenerator _metadataGenerator; + final Uri _turboUploadUri; + + @override + Future upload({ + required IOFile file, + required ARFSUploadMetadataArgs args, + required Wallet wallet, + SecretKey? driveKey, + required UploadType type, + }) async { + final dataBundler = _dataBundlerFactory.createDataBundler( + metadataGenerator: _metadataGenerator, + type: type, + ); + + final metadata = await _metadataGenerator.generateMetadata( + file, + args, + ); + + final streamedUpload = + _streamedUploadFactory.fromUploadType(type, _turboUploadUri); + + final controller = UploadController( + StreamController(), + streamedUpload, + ); + + await dataBundler.createDataBundle( + file: file, + metadata: metadata, + wallet: wallet, + driveKey: driveKey, + ); + + streamedUpload.send( + UploadTask( + status: UploadStatus.notStarted, + content: [metadata], + ), + wallet, + controller, + ); + + return controller; + } + + @override + Future uploadFiles({ + required List<(ARFSUploadMetadataArgs, IOFile)> files, + required Wallet wallet, + SecretKey? driveKey, + required UploadType type, + }) async { + print('Creating a new upload controller using the upload type $type'); + + final uploadController = UploadController( + StreamController(), + _streamedUploadFactory.fromUploadType(type, _turboUploadUri), + ); + + /// Attaches the upload controller to the upload service + _uploadFiles( + files: files, + wallet: wallet, + controller: uploadController, + driveKey: driveKey, + type: type, + ); + + return uploadController; + } + + Future _uploadFiles({ + required List<(ARFSUploadMetadataArgs, IOFile)> files, + required Wallet wallet, + SecretKey? driveKey, + required UploadController controller, + required UploadType type, + }) async { + List> activeUploads = []; + List contents = []; + List tasks = []; + int totalSize = 0; + + for (var f in files) { + final metadata = await _metadataGenerator.generateMetadata( + f.$2, + f.$1, + ); + + final uploadTask = UploadTask( + status: UploadStatus.notStarted, + content: [metadata], + ); + + tasks.add(uploadTask); + + controller.updateProgress(task: uploadTask); + + contents.add(metadata); + } + + for (int i = 0; i < files.length; i++) { + int fileSize = await files[i].$2.length; + + while (activeUploads.length >= 50 || + totalSize + fileSize >= 500 * 1024 * 1024) { + await Future.any(activeUploads); + + // Remove completed uploads and update totalSize + int recalculatedSize = 0; + List> ongoingUploads = []; + + for (var f in activeUploads) { + // You need to figure out how to get the file size for the ongoing upload here + // Add its size to recalculatedSize + int ongoingFileSize = await files[i].$2.length; + recalculatedSize += ongoingFileSize; + + ongoingUploads.add(f); + } + + activeUploads = ongoingUploads; + totalSize = recalculatedSize; + } + + totalSize += fileSize; + + Future uploadFuture = _uploadSingleFile( + file: files[i].$2, + uploadController: controller, + wallet: wallet, + driveKey: driveKey, + metadata: contents[i], + uploadTask: tasks[i], + type: type, + ); + + uploadFuture.then((_) { + activeUploads.remove(uploadFuture); + totalSize -= fileSize; + }).catchError((error) { + activeUploads.remove(uploadFuture); + totalSize -= fileSize; + // TODO: Handle error + }); + + activeUploads.add(uploadFuture); + } + + await Future.wait(activeUploads); + } + + Future _uploadSingleFile({ + required IOFile file, + required UploadController uploadController, + required Wallet wallet, + SecretKey? driveKey, + required UploadTask uploadTask, + required ARFSUploadMetadata metadata, + required UploadType type, + }) async { + final dataBundler = _dataBundlerFactory.createDataBundler( + metadataGenerator: _metadataGenerator, + type: type, + ); + + final bdi = await dataBundler.createDataBundle( + file: file, + metadata: metadata, + wallet: wallet, + driveKey: driveKey, + onStartBundling: () { + uploadTask = uploadTask.copyWith( + status: UploadStatus.bundling, + ); + uploadController.updateProgress( + task: uploadTask, + ); + }, + onStartEncryption: () { + uploadTask = uploadTask.copyWith( + status: UploadStatus.encryting, + ); + uploadController.updateProgress( + task: uploadTask, + ); + }, + ); + + switch (type) { + case UploadType.d2n: + uploadTask = uploadTask.copyWith( + uploadItem: TransactionUploadTask( + data: bdi, + size: bdi.dataSize, + ), + ); + break; + case UploadType.turbo: + uploadTask = uploadTask.copyWith( + uploadItem: DataItemUploadTask( + data: bdi, + size: bdi.dataItemSize, + ), + status: UploadStatus.preparationDone, + ); + break; + } + + uploadController.updateProgress( + task: uploadTask, + ); + + final streamedUpload = + _streamedUploadFactory.fromUploadType(type, _turboUploadUri); + + final value = await streamedUpload + .send(uploadTask, wallet, uploadController) + .then((value) { + print('Upload complete'); + }).catchError((err) {}); + + return value; + } + + @override + Future uploadEntities({ + required List<(ARFSUploadMetadataArgs, IOEntity)> entities, + required Wallet wallet, + SecretKey? driveKey, + Function(ARFSUploadMetadata p1)? skipMetadataUpload, + Function(ARFSUploadMetadata p1)? onCreateMetadata, + UploadType type = UploadType.turbo, + }) async { + final dataBundler = _dataBundlerFactory.createDataBundler( + metadataGenerator: _metadataGenerator, + type: type, + ); + final streamedUpload = _streamedUploadFactory.fromUploadType( + type, + _turboUploadUri, + ); + + final entitiesWithMedata = <(ARFSUploadMetadata, IOEntity)>[]; + + for (var e in entities) { + final metadata = await _metadataGenerator.generateMetadata( + e.$2, + e.$1, + ); + + entitiesWithMedata.add((metadata, e.$2)); + } + + final folderMetadatas = + entitiesWithMedata.where((element) => element.$2 is IOFolder).toList(); + + final uploadController = UploadController( + StreamController(), + streamedUpload, + ); + + if (folderMetadatas.isNotEmpty) { + final bundle = await dataBundler.createDataBundleForEntities( + entities: folderMetadatas, + wallet: wallet, + driveKey: driveKey, + ); + + /// folders always are generated in the first BDI. + final bundleForFolders = bundle.first; + + UploadTask folderBDITask = UploadTask( + status: UploadStatus.notStarted, + content: bundleForFolders.contents, + ); + + switch (type) { + case UploadType.turbo: + folderBDITask = folderBDITask.copyWith( + uploadItem: DataItemUploadTask( + size: bundleForFolders.dataItemResult.dataItemSize, + data: bundleForFolders.dataItemResult, + ), + status: UploadStatus.preparationDone, + ); + + case UploadType.d2n: + folderBDITask = folderBDITask.copyWith( + uploadItem: TransactionUploadTask( + data: bundleForFolders.dataItemResult, + size: bundleForFolders.dataItemResult.dataSize, + ), + ); + break; + } + + uploadController.updateProgress( + task: folderBDITask, + ); + + // sends the upload + streamedUpload + .send(folderBDITask, wallet, uploadController) + .then((value) { + print('Upload complete'); + }).catchError((err) {}); + } + + _uploadFiles( + files: entities.whereType<(ARFSUploadMetadataArgs, IOFile)>().toList(), + wallet: wallet, + driveKey: driveKey, + controller: uploadController, + type: type, + ); + + return uploadController; + } +} + +class DataResultWithContents { + final T dataItemResult; + final List contents; + + DataResultWithContents({ + required this.dataItemResult, + required this.contents, + }); +} diff --git a/packages/ardrive_uploader/lib/src/arfs_upload_metadata.dart b/packages/ardrive_uploader/lib/src/arfs_upload_metadata.dart new file mode 100644 index 0000000000..1f00fe9bce --- /dev/null +++ b/packages/ardrive_uploader/lib/src/arfs_upload_metadata.dart @@ -0,0 +1,107 @@ +import 'package:arweave/arweave.dart'; + +abstract class UploadMetadata {} + +class ARFSDriveUploadMetadata extends ARFSUploadMetadata { + ARFSDriveUploadMetadata({ + required super.entityMetadataTags, + required super.name, + required super.id, + required super.isPrivate, + required super.dataItemTags, + required super.bundleTags, + }); + + // TODO: implement toJson + @override + Map toJson() { + throw UnimplementedError(); + } +} + +class ARFSFolderUploadMetatadata extends ARFSUploadMetadata { + final String driveId; + final String? parentFolderId; + + ARFSFolderUploadMetatadata({ + required this.driveId, + this.parentFolderId, + required super.entityMetadataTags, + required super.name, + required super.id, + required super.isPrivate, + required super.dataItemTags, + required super.bundleTags, + }); + + @override + Map toJson() { + return { + 'name': name, + }; + } +} + +class ARFSFileUploadMetadata extends ARFSUploadMetadata { + final int size; + final DateTime lastModifiedDate; + final String dataContentType; + final String driveId; + final String parentFolderId; + + ARFSFileUploadMetadata({ + required this.size, + required this.lastModifiedDate, + required this.dataContentType, + required this.driveId, + required this.parentFolderId, + required super.entityMetadataTags, + required super.name, + required super.id, + required super.isPrivate, + required super.dataItemTags, + required super.bundleTags, + }); + + String? _dataTxId; + + set setDataTxId(String dataTxId) => _dataTxId = dataTxId; + + String? get dataTxId => _dataTxId; + + @override + Map toJson() => { + 'name': name, + 'size': size, + 'lastModifiedDate': lastModifiedDate.millisecondsSinceEpoch, + 'dataContentType': dataContentType, + 'dataTxId': dataTxId, + }; +} + +abstract class ARFSUploadMetadata extends UploadMetadata { + final String id; + final String name; + final List entityMetadataTags; + final List dataItemTags; + final List bundleTags; + final bool isPrivate; + String? _metadataTxId; + + ARFSUploadMetadata({ + required this.name, + required this.entityMetadataTags, + required this.dataItemTags, + required this.bundleTags, + required this.id, + required this.isPrivate, + }); + + set setMetadataTxId(String metadataTxId) => _metadataTxId = metadataTxId; + String? get metadataTxId => _metadataTxId; + + Map toJson(); + + @override + String toString() => toJson().toString(); +} diff --git a/packages/ardrive_uploader/lib/src/d2n_streamed_upload.dart b/packages/ardrive_uploader/lib/src/d2n_streamed_upload.dart new file mode 100644 index 0000000000..1991b4fc5b --- /dev/null +++ b/packages/ardrive_uploader/lib/src/d2n_streamed_upload.dart @@ -0,0 +1,50 @@ +import 'package:ardrive_uploader/ardrive_uploader.dart'; +import 'package:ardrive_uploader/src/streamed_upload.dart'; +import 'package:arweave/arweave.dart'; + +class D2NStreamedUpload implements StreamedUpload { + @override + Future send( + UploadTask handle, + Wallet wallet, + UploadController controller, + ) async { + if (handle.uploadItem is! TransactionUploadTask) { + throw ArgumentError('handle must be of type TransactionUploadTask'); + } + + print('D2NStreamedUpload.send'); + + handle = handle.copyWith(status: UploadStatus.inProgress); + + controller.updateProgress(task: handle); + + final progressStreamTask = await uploadTransaction( + (handle.uploadItem as TransactionUploadTask).data) + .run(); + + progressStreamTask.match((l) => print(''), (progressStream) async { + final listen = progressStream.listen( + (progress) { + // updates the progress. progress.$1 is the current chunk, progress.$2 is the total chunks + handle.progress = (progress.$1 / progress.$2); + controller.updateProgress(task: handle); + }, + onDone: () { + // finishes the upload + handle = handle.copyWith(status: UploadStatus.complete, progress: 1); + + controller.updateProgress(task: handle); + }, + onError: (e) { + handle = handle.copyWith( + status: UploadStatus.failed, + ); + controller.updateProgress(task: handle); + }, + ); + + listen.asFuture(); + }); + } +} diff --git a/packages/ardrive_uploader/lib/src/data_bundler.dart b/packages/ardrive_uploader/lib/src/data_bundler.dart new file mode 100644 index 0000000000..6dd3cf5d2b --- /dev/null +++ b/packages/ardrive_uploader/lib/src/data_bundler.dart @@ -0,0 +1,702 @@ +import 'dart:convert'; + +import 'package:ardrive_crypto/ardrive_crypto.dart'; +import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_uploader/ardrive_uploader.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +import 'package:arweave/arweave.dart'; +import 'package:arweave/utils.dart'; +import 'package:cryptography/cryptography.dart' hide Cipher; +import 'package:flutter/foundation.dart'; +import 'package:fpdart/fpdart.dart'; +import 'package:uuid/uuid.dart'; + +class DataBundlerFactory { + DataBundler createDataBundler({ + required ARFSUploadMetadataGenerator metadataGenerator, + required UploadType type, + }) { + if (type == UploadType.turbo) { + return BDIDataBundler(metadataGenerator); + } else { + return DataTransactionBundler(metadataGenerator); + } + } +} + +abstract class DataBundler { + Future createDataBundle({ + required IOFile file, + required ARFSUploadMetadata metadata, + required Wallet wallet, + SecretKey? driveKey, + Function? onStartEncryption, + Function? onStartBundling, + }); + + Future> createDataBundleForEntity({ + required IOEntity entity, + required ARFSUploadMetadata metadata, // top level metadata + required Wallet wallet, + SecretKey? driveKey, + required String driveId, + }); + + Future>> createDataBundleForEntities({ + required List<(ARFSUploadMetadata, IOEntity)> entities, + required Wallet wallet, + SecretKey? driveKey, + }); +} + +class DataTransactionBundler implements DataBundler { + final ARFSUploadMetadataGenerator metadataGenerator; + + DataTransactionBundler(this.metadataGenerator); + + @override + Future createDataBundle({ + required IOFile file, + required ARFSUploadMetadata metadata, + required Wallet wallet, + SecretKey? driveKey, + Function? onStartEncryption, + Function? onStartBundling, + }) async { + if (driveKey != null) { + onStartEncryption?.call(); + } else { + onStartBundling?.call(); + } + + // returns the encrypted or not file read stream and the cipherIv if it was encrypted + final dataGenerator = await _dataGenerator( + dataStream: file.openReadStream, + fileLength: await file.length, + metadata: metadata, + wallet: wallet, + driveKey: driveKey, + ); + + final metadataDataItem = await _generateMetadataDataItemForFile( + metadata: metadata, + dataStream: dataGenerator, + fileLength: await file.length, + wallet: wallet, + driveKey: driveKey, + ); + + print('file metadata: ${metadata.toJson()}'); + + for (var tag in metadata.dataItemTags) { + print('tag: ${tag.name} - ${tag.value}'); + } + + final fileDataItem = _generateFileDataItem( + metadata: metadata, + dataStream: dataGenerator.$1, + fileLength: await file.length, + cipherIv: dataGenerator.$2, + ); + + final transactionResult = await createDataBundleTransaction( + dataItemFiles: [ + metadataDataItem, + fileDataItem, + ], + wallet: wallet, + tags: metadata.bundleTags.map((e) => createTag(e.name, e.value)).toList(), + ); + + return transactionResult; + } + + @override + Future>> + createDataBundleForEntities({ + required List<(ARFSUploadMetadata, IOEntity)> entities, + required Wallet wallet, + SecretKey? driveKey, + }) async { + List folderMetadatas = []; + List folderDataItems = []; + List> transactionResults = []; + + if (entities.isEmpty) { + throw Exception('The list of entities is empty'); + } + + for (var e in entities) { + if (e.$2 is IOFile) { + transactionResults.add(DataResultWithContents( + dataItemResult: await createDataBundle( + wallet: wallet, + file: e.$2 as IOFile, + metadata: e.$1, + driveKey: driveKey, + ), + contents: [e.$1], + )); + } else if (e.$2 is IOFolder) { + final folderMetadata = e.$1; + + folderMetadatas.add(folderMetadata); + + final folderItem = await _generateMetadataDataItem( + metadata: e.$1, + wallet: wallet, + driveKey: driveKey, + ); + + folderDataItems.add(folderItem); + } + } + + final folderBundle = await createDataBundleTransaction( + dataItemFiles: folderDataItems, + wallet: wallet, + tags: folderMetadatas.first.bundleTags + .map((e) => createTag(e.name, e.value)) + .toList(), + ); + + /// All folders inside a single BDI, and the remaining files + return [ + DataResultWithContents( + dataItemResult: folderBundle, + contents: folderMetadatas, + ), + ...transactionResults + ]; + } + + @override + Future> createDataBundleForEntity({ + required IOEntity entity, + required ARFSUploadMetadata metadata, + required Wallet wallet, + SecretKey? driveKey, + required String driveId, + }) async { + if (entity is IOFile) { + final fileMetadata = await metadataGenerator.generateMetadata( + entity, + ARFSUploadMetadataArgs( + isPrivate: driveKey != null, + driveId: driveId, + parentFolderId: metadata.id, + ), + ); + + return DataResultWithContents( + dataItemResult: await createDataBundle( + wallet: wallet, + file: entity, + metadata: metadata, + driveKey: driveKey, + ), + contents: [fileMetadata], + ); + } else if (entity is IOFolder) { + final folderItem = await _generateMetadataDataItem( + metadata: metadata, + wallet: wallet, + driveKey: driveKey, + ); + + final transactionResult = await createDataBundleTransaction( + dataItemFiles: [folderItem], + wallet: wallet, + tags: + metadata.bundleTags.map((e) => createTag(e.name, e.value)).toList(), + ); + + return DataResultWithContents( + dataItemResult: transactionResult, + contents: [metadata], + ); + } else { + throw Exception('Invalid entity type'); + } + } + + Future createDataBundleTransaction({ + required final Wallet wallet, + required final List dataItemFiles, + required final List tags, + }) async { + final List dataItemList = []; + final dataItemCount = dataItemFiles.length; + for (var i = 0; i < dataItemCount; i++) { + final dataItem = dataItemFiles[i]; + await createDataItemTaskEither( + wallet: wallet, + dataStream: dataItem.streamGenerator, + dataStreamSize: dataItem.dataSize, + target: dataItem.target, + anchor: dataItem.anchor, + tags: dataItem.tags, + ).map((dataItem) => dataItemList.add(dataItem)).run(); + } + + final dataBundleTaskEither = + createDataBundleTaskEither(TaskEither.of(dataItemList)); + + final bundledDataItemTags = [ + createTag('Bundle-Format', 'binary'), + createTag('Bundle-Version', '2.0.0'), + ...tags, + ]; + + final taskEither = await dataBundleTaskEither.run(); + final result = taskEither.match( + (l) { + throw l; + }, + (r) async { + int size = 0; + + await for (var chunk in r.stream()) { + size += chunk.length; + } + + print('Size of the bundled data item: $size bytes'); + + return createTransactionTaskEither( + wallet: wallet, + dataStreamGenerator: r.stream, + dataSize: size, + tags: bundledDataItemTags, + ); + }, + ); + + return (await result).match( + (l) { + throw l; + }, + (r) => r, + ).run(); + } +} + +class BDIDataBundler implements DataBundler { + final ARFSUploadMetadataGenerator metadataGenerator; + + BDIDataBundler(this.metadataGenerator); + + @override + Future createDataBundle({ + required IOFile file, + required ARFSUploadMetadata metadata, + required Wallet wallet, + SecretKey? driveKey, + Function? onStartEncryption, + Function? onStartBundling, + }) { + return _createBundleStable( + file: file, + metadata: metadata, + wallet: wallet, + driveKey: driveKey, + onStartBundling: onStartBundling, + onStartEncryption: onStartEncryption, + ); + } + + Future _createBundleStable({ + required IOFile file, + required ARFSUploadMetadata metadata, + required Wallet wallet, + Function? onStartEncryption, + Function? onStartBundling, + SecretKey? driveKey, + }) async { + if (driveKey != null) { + onStartEncryption?.call(); + } else { + onStartBundling?.call(); + } + + // returns the encrypted or not file read stream and the cipherIv if it was encrypted + final dataGenerator = await _dataGenerator( + dataStream: file.openReadStream, + fileLength: await file.length, + metadata: metadata, + wallet: wallet, + driveKey: driveKey, + ); + + final metadataDataItem = await _generateMetadataDataItemForFile( + metadata: metadata, + dataStream: dataGenerator, + fileLength: await file.length, + wallet: wallet, + driveKey: driveKey, + ); + + final fileDataItem = _generateFileDataItem( + metadata: metadata, + dataStream: dataGenerator.$1, + fileLength: await file.length, + cipherIv: dataGenerator.$2, + ); + + final createBundledDataItem = createBundledDataItemTaskEither( + dataItemFiles: [ + metadataDataItem, + fileDataItem, + ], + wallet: wallet, + tags: metadata.bundleTags.map((e) => createTag(e.name, e.value)).toList(), + ); + + final bundledDataItem = await (await createBundledDataItem).run(); + + return bundledDataItem.match((l) { + // TODO: handle error + print('Error: $l'); + print(StackTrace.current); + throw l; + }, (bdi) async { + print('BDI id: ${bdi.id}'); + return bdi; + }); + } + + @override + Future> createDataBundleForEntity({ + required IOEntity entity, + required ARFSUploadMetadata metadata, + required Wallet wallet, + SecretKey? driveKey, + required String driveId, + Function(ARFSUploadMetadata metadata)? skipMetadata, + Function(ARFSUploadMetadata metadata)? onMetadataCreated, + }) async { + if (entity is IOFile) { + return DataResultWithContents( + dataItemResult: await _createBundleStable( + wallet: wallet, + file: entity, + metadata: metadata, + driveKey: driveKey, + ), + contents: [metadata], + ); + } else if (entity is IOFolder) { + /// Adds the Top level folder} + final folderItem = await _generateMetadataDataItem( + metadata: metadata, + wallet: wallet, + driveKey: driveKey, + ); + + final createBundledDataItem = createBundledDataItemTaskEither( + dataItemFiles: [folderItem], + wallet: wallet, + tags: + metadata.bundleTags.map((e) => createTag(e.name, e.value)).toList(), + ); + + final bundledDataItem = await (await createBundledDataItem).run(); + + return bundledDataItem.match((l) { + // TODO: handle error + print('Error: $l'); + print(StackTrace.current); + throw l; + }, (bdi) async { + return DataResultWithContents( + dataItemResult: bdi, + contents: [metadata], + ); + }); + } else { + throw Exception('Invalid entity type'); + } + } + + @override + Future>> + createDataBundleForEntities({ + required List<(ARFSUploadMetadata, IOEntity)> entities, + required Wallet wallet, + SecretKey? driveKey, + Function(ARFSUploadMetadata metadata)? skipMetadata, + Function(ARFSUploadMetadata metadata)? onMetadataCreated, + }) async { + List folderMetadatas = []; + List folderDataItems = []; + List> dataItemsResult = []; + + if (entities.isEmpty) { + throw Exception('The list of entities is empty'); + } + + for (var e in entities) { + if (e.$2 is IOFile) { + final fileMetadata = e.$1; + + final dataItemResult = await _createBundleStable( + file: e.$2 as IOFile, metadata: e.$1, wallet: wallet); + + dataItemsResult.add(DataResultWithContents( + dataItemResult: dataItemResult, contents: [fileMetadata])); + } else if (e.$2 is IOFolder) { + final folderMetadata = e.$1; + + folderMetadatas.add(folderMetadata); + + final folderItem = await _generateMetadataDataItem( + metadata: e.$1, + wallet: wallet, + driveKey: driveKey, + ); + + folderDataItems.add(folderItem); + } + } + + final folderBDITask = await (await createBundledDataItemTaskEither( + dataItemFiles: folderDataItems, + wallet: wallet, + tags: folderMetadatas.first.bundleTags + .map((e) => createTag(e.name, e.value)) + .toList(), + )) + .run(); + + // folder bdi + final folderBDIResult = await folderBDITask.match((l) { + // TODO: handle error + print('Error: $l'); + print(StackTrace.current); + throw l; + }, (bdi) async { + return bdi; + }); + + /// All folders inside a single BDI, and the remaining files + return [ + DataResultWithContents( + dataItemResult: folderBDIResult, + contents: folderMetadatas, + ), + ...dataItemsResult + ]; + } +} + +DataItemFile _generateFileDataItem({ + required ARFSUploadMetadata metadata, + required Stream Function() dataStream, + required int fileLength, + Uint8List? cipherIv, +}) { + final tags = metadata.dataItemTags; + + // if (cipherIv != null) { + // tags.add(Tag(EntityTag.cipher, Cipher.aes256ctr)); + // tags.add(Tag(EntityTag.cipherIv, encodeBytesToBase64(cipherIv))); + // } + + for (var tag in metadata.dataItemTags) { + print('tag: ${tag.name} - ${tag.value}'); + } + + final dataItemFile = DataItemFile( + dataSize: fileLength, + streamGenerator: dataStream, + tags: tags.map((e) => createTag(e.name, e.value)).toList(), + ); + + return dataItemFile; +} + +Future _generateMetadataDataItem({ + required ARFSUploadMetadata metadata, + required Wallet wallet, + SecretKey? driveKey, +}) async { + Stream Function() metadataStreamGenerator; + + final metadataJson = metadata.toJson(); + final metadataBytes = + utf8.encode(jsonEncode(metadataJson)).map((e) => Uint8List.fromList([e])); + + if (driveKey != null) { + final encryptedMetadata = await handleEncryption( + driveKey, + () => Stream.fromIterable(metadataBytes), + metadata.id, + metadataBytes.length, + keyByteLength, + ); + + metadataStreamGenerator = encryptedMetadata.$1; + final metadataCipherIv = encryptedMetadata.$2; + + metadata.entityMetadataTags + .add(Tag(EntityTag.cipherIv, encodeBytesToBase64(metadataCipherIv!))); + metadata.entityMetadataTags.add(Tag(EntityTag.cipher, Cipher.aes256ctr)); + } else { + metadataStreamGenerator = () => Stream.fromIterable(metadataBytes); + } + + final metadataTask = createDataItemTaskEither( + wallet: wallet, + dataStream: metadataStreamGenerator, + dataStreamSize: metadataBytes.length, + tags: metadata.entityMetadataTags + .map((e) => createTag(e.name, e.value)) + .toList(), + ).flatMap((metadataDataItem) => TaskEither.of(metadataDataItem)); + + final metadataTaskEither = await metadataTask.run(); + + metadataTaskEither.match((l) { + print('Error: $l'); + print(StackTrace.current); + throw l; + }, (metadataDataItem) { + metadata.setMetadataTxId = metadataDataItem.id; + return metadataDataItem; + }); + + return DataItemFile( + dataSize: metadataBytes.length, + streamGenerator: metadataStreamGenerator, + tags: metadata.entityMetadataTags + .map((e) => createTag(e.name, e.value)) + .toList(), + ); +} + +Future _generateMetadataDataItemForFile({ + required ARFSUploadMetadata metadata, + required (Stream Function(), Uint8List? dataStream) dataStream, + required int fileLength, + required Wallet wallet, + SecretKey? driveKey, +}) async { + final dataItemTags = metadata.dataItemTags; + + if (driveKey != null) { + dataItemTags.add(Tag(EntityTag.cipher, Cipher.aes256ctr)); + dataItemTags + .add(Tag(EntityTag.cipherIv, encodeBytesToBase64(dataStream.$2!))); + } + + final fileDataItemEither = createDataItemTaskEither( + wallet: wallet, + dataStream: dataStream.$1, + dataStreamSize: fileLength, + tags: dataItemTags.map((e) => createTag(e.name, e.value)).toList(), + ); + + final fileDataItemResult = await fileDataItemEither.run(); + + fileDataItemResult.match((l) { + print('Error: $l'); + print(StackTrace.current); + }, (fileDataItem) { + metadata as ARFSFileUploadMetadata; + print('File data item id: ${fileDataItem.id}'); + metadata.setDataTxId = fileDataItem.id; + }); + + final metadataBytes = utf8 + .encode(jsonEncode(metadata.toJson())) + .map((e) => Uint8List.fromList([e])); + + Stream Function() metadataGenerator; + + if (driveKey != null) { + final result = await handleEncryption( + driveKey, + () => Stream.fromIterable(metadataBytes), + metadata.id, + metadataBytes.length, + keyByteLength); + metadataGenerator = result.$1; + + metadata.entityMetadataTags + .add(Tag(EntityTag.cipherIv, encodeBytesToBase64(result.$2!))); + metadata.entityMetadataTags.add(Tag(EntityTag.cipher, AES256CTR)); + } else { + metadataGenerator = () => Stream.fromIterable(metadataBytes); + } + + final metadataTask = createDataItemTaskEither( + wallet: wallet, + dataStream: metadataGenerator, + dataStreamSize: metadataBytes.length, + tags: metadata.entityMetadataTags + .map((e) => createTag(e.name, e.value)) + .toList(), + ).flatMap((metadataDataItem) => TaskEither.of(metadataDataItem)); + + final metadataTaskEither = await metadataTask.run(); + + metadataTaskEither.match((l) { + print('Error: $l'); + print(StackTrace.current); + throw l; + }, (metadataDataItem) { + metadata.setMetadataTxId = metadataDataItem.id; + print('Metadata data item id: ${metadataDataItem.id}'); + return metadataDataItem; + }); + + return DataItemFile( + dataSize: metadataBytes.length, + streamGenerator: metadataGenerator, + tags: metadata.entityMetadataTags + .map((e) => createTag(e.name, e.value)) + .toList(), + ); +} + +// ignore: constant_identifier_names +const AES256CTR = Cipher.aes256ctr; +// ignore: non_constant_identifier_names +final UNIT_BYTE_LIST = Uint8List(1); + +Future deriveFileKey( + SecretKey driveKey, String fileId, int keyByteLength) async { + final fileIdBytes = Uint8List.fromList(Uuid.parse(fileId)); + final kdf = Hkdf(hmac: Hmac(Sha256()), outputLength: keyByteLength); + return await kdf.deriveKey( + secretKey: driveKey, info: fileIdBytes, nonce: UNIT_BYTE_LIST); +} + +Future<(Stream Function(), Uint8List? cipherIv)> handleEncryption( + SecretKey driveKey, + Stream Function() dataStream, + String fileId, + int fileLength, + int keyByteLength) async { + final fileKey = await deriveFileKey(driveKey, fileId, keyByteLength); + final keyData = Uint8List.fromList(await fileKey.extractBytes()); + final impl = await cipherStreamEncryptImpl(AES256CTR, keyData: keyData); + final encryptStreamResult = + await impl.encryptStreamGenerator(dataStream, fileLength); + return (encryptStreamResult.streamGenerator, encryptStreamResult.nonce); +} + +Future<(Stream Function() generator, Uint8List? cipherIv)> + _dataGenerator({ + required ARFSUploadMetadata metadata, + required Stream Function() dataStream, + required int fileLength, + required Wallet wallet, + SecretKey? driveKey, +}) async { + if (driveKey != null) { + return await handleEncryption( + driveKey, dataStream, metadata.id, fileLength, keyByteLength); + } else { + return (dataStream, null); + } +} diff --git a/lib/core/upload/metadata_generator.dart b/packages/ardrive_uploader/lib/src/metadata_generator.dart similarity index 52% rename from lib/core/upload/metadata_generator.dart rename to packages/ardrive_uploader/lib/src/metadata_generator.dart index bc99e431ce..6f185793ab 100644 --- a/lib/core/upload/metadata_generator.dart +++ b/packages/ardrive_uploader/lib/src/metadata_generator.dart @@ -1,8 +1,7 @@ -import 'package:ardrive/core/arfs/entities/arfs_entities.dart' as arfs; -import 'package:ardrive/core/upload/upload_metadata.dart'; -import 'package:ardrive/entities/constants.dart'; -import 'package:ardrive/services/app/app_info_services.dart'; import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_uploader/src/arfs_upload_metadata.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +import 'package:arfs/arfs.dart'; import 'package:arweave/arweave.dart'; import 'package:uuid/uuid.dart'; @@ -16,7 +15,7 @@ abstract class UploadMetadataGenerator { } abstract class TagsGenerator { - List generateTags(T arguments); + Map> generateTags(T arguments); } /// This abstract class acts as an interface for all upload metadata generators @@ -45,13 +44,43 @@ class ARFSUploadMetadataGenerator throw ArgumentError('arguments must not be null'); } - final id = const Uuid().v4(); + String id; + if (arguments.entityId != null) { + id = arguments.entityId!; + print('reusing id: $id'); + } else { + id = const Uuid().v4(); + } + + String contentType; + + if (arguments.isPrivate) { + contentType = 'application/octet-stream'; + } else { + if (entity is IOFile) { + contentType = entity.contentType; + } else { + // folders and drives are always json + contentType = 'application/json'; + } + } if (entity is IOFile) { - ARFSUploadMetadataArgsValidator.validate(arguments, arfs.EntityType.file); + ARFSUploadMetadataArgsValidator.validate(arguments, EntityType.file); final file = entity; + final tags = _tagsGenerator.generateTags( + ARFSTagsArgs( + driveId: arguments.driveId!, + parentFolderId: arguments.parentFolderId, + entityId: id, + entity: EntityType.file, + contentType: contentType, + isPrivate: arguments.isPrivate, + ), + ); + return ARFSFileUploadMetadata( isPrivate: arguments.isPrivate, size: await file.length, @@ -59,35 +88,37 @@ class ARFSUploadMetadataGenerator dataContentType: file.contentType, driveId: arguments.driveId!, parentFolderId: arguments.parentFolderId!, - tags: _tagsGenerator.generateTags( - ARFSTagsArgs( - driveId: arguments.driveId!, - parentFolderId: arguments.parentFolderId!, - entityId: id, - ), - ), name: file.name, id: id, + entityMetadataTags: tags['entity']!, + dataItemTags: tags['data-item']!, + bundleTags: tags['bundle-data-item']!, ); } else if (entity is IOFolder) { - ARFSUploadMetadataArgsValidator.validate( - arguments, arfs.EntityType.folder); + ARFSUploadMetadataArgsValidator.validate(arguments, EntityType.folder); final folder = entity; + final tags = _tagsGenerator.generateTags( + ARFSTagsArgs( + driveId: arguments.driveId!, + parentFolderId: arguments.parentFolderId, + entityId: id, + entity: EntityType.folder, + contentType: contentType, + isPrivate: arguments.isPrivate, + ), + ); + return ARFSFolderUploadMetatadata( + id: id, isPrivate: arguments.isPrivate, driveId: arguments.driveId!, parentFolderId: arguments.parentFolderId, - tags: _tagsGenerator.generateTags( - ARFSTagsArgs( - driveId: arguments.driveId!, - parentFolderId: arguments.parentFolderId, - entityId: id, - ), - ), name: folder.name, - id: id, + entityMetadataTags: tags['entity']!, + dataItemTags: tags['data-item']!, + bundleTags: tags['bundle-data-item']!, ); } @@ -104,15 +135,29 @@ class ARFSUploadMetadataGenerator }) async { final id = const Uuid().v4(); + String contentType; + + if (isPrivate) { + contentType = 'application/octet-stream'; + } else { + contentType = 'application/json'; + } + + final tags = _tagsGenerator.generateTags( + ARFSTagsArgs( + isPrivate: isPrivate, + entityId: id, + entity: EntityType.drive, + contentType: contentType, + ), + ); + return ARFSDriveUploadMetadata( isPrivate: isPrivate, name: name, - tags: _tagsGenerator.generateTags( - ARFSTagsArgs( - isPrivate: isPrivate, - entityId: id, - ), - ), + entityMetadataTags: tags['entity']!, + dataItemTags: tags['data-item']!, + bundleTags: tags['bundle-data-item']!, id: id, ); } @@ -123,37 +168,86 @@ class ARFSUploadMetadataArgs { final String? parentFolderId; final String? privacy; final bool isPrivate; + final String? entityId; + + factory ARFSUploadMetadataArgs.file({ + required String driveId, + required String parentFolderId, + required bool isPrivate, + String? entityId, + }) { + return ARFSUploadMetadataArgs( + driveId: driveId, + parentFolderId: parentFolderId, + isPrivate: isPrivate, + entityId: entityId, + ); + } + + factory ARFSUploadMetadataArgs.folder({ + required String driveId, + required bool isPrivate, + String? parentFolderId, + String? entityId, + }) { + return ARFSUploadMetadataArgs( + driveId: driveId, + isPrivate: isPrivate, + entityId: entityId, + parentFolderId: parentFolderId, + ); + } + + factory ARFSUploadMetadataArgs.drive({ + required bool isPrivate, + }) { + return ARFSUploadMetadataArgs( + isPrivate: isPrivate, + ); + } ARFSUploadMetadataArgs({ required this.isPrivate, this.driveId, this.parentFolderId, this.privacy, + this.entityId, }); } class ARFSTagsGenetator implements TagsGenerator { - final arfs.EntityType _entity; final AppInfoServices _appInfoServices; // constructor ARFSTagsGenetator({ - required arfs.EntityType entity, required AppInfoServices appInfoServices, - }) : _entity = entity, - _appInfoServices = appInfoServices; + }) : _appInfoServices = appInfoServices; // TODO: Review entity.dart file @override - List generateTags(ARFSTagsArgs arguments) { - return _appTags + _entityTags(_entity, arguments) + _uTags; + Map> generateTags(ARFSTagsArgs arguments) { + final bundleDataItemTags = _bundleDataItemTags; + final entityTags = _entityTags(arguments); + final appTags = _appTags; + + final dataItemTags = [ + ...appTags, + Tag(EntityTag.contentType, arguments.contentType), + ]; + + final entityMedataTags = [...entityTags, ...appTags]; + + return { + 'data-item': dataItemTags, + 'bundle-data-item': bundleDataItemTags, + 'entity': entityMedataTags, + }; } List _entityTags( - arfs.EntityType entity, ARFSTagsArgs arguments, ) { - ARFSTagsValidator.validate(arguments, entity); + ARFSTagsValidator.validate(arguments); List tags = []; @@ -161,28 +255,42 @@ class ARFSTagsGenetator implements TagsGenerator { tags.add(driveId); - switch (_entity) { - case arfs.EntityType.file: + final appInfo = _appInfoServices.appInfo; + + String contentType; + + if (arguments.isPrivate!) { + contentType = 'application/octet-stream'; + } else { + contentType = 'application/json'; + } + + tags.add(Tag(EntityTag.contentType, contentType)); + + tags.add(Tag(EntityTag.arFs, appInfo.arfsVersion)); + + switch (arguments.entity) { + case EntityType.file: tags.add(Tag(EntityTag.fileId, arguments.entityId!)); - tags.add(Tag(EntityTag.entityType, arfs.EntityType.file.name)); + tags.add(Tag(EntityTag.entityType, EntityTypeTag.file)); tags.add(Tag(EntityTag.parentFolderId, arguments.parentFolderId!)); break; - case arfs.EntityType.folder: + case EntityType.folder: tags.add(Tag(EntityTag.folderId, arguments.entityId!)); - tags.add(Tag(EntityTag.entityType, arfs.EntityType.folder.name)); + tags.add(Tag(EntityTag.entityType, EntityType.folder.name)); if (arguments.parentFolderId != null) { tags.add(Tag(EntityTag.parentFolderId, arguments.parentFolderId!)); } break; - case arfs.EntityType.drive: + case EntityType.drive: if (arguments.isPrivate ?? false) { tags.add(Tag(EntityTag.driveAuthMode, 'private')); } - tags.add(Tag(EntityTag.entityType, arfs.EntityType.drive.name)); + tags.add(Tag(EntityTag.entityType, EntityType.drive.name)); break; } @@ -195,34 +303,42 @@ class ARFSTagsGenetator implements TagsGenerator { final appVersion = Tag(EntityTag.appVersion, appInfo.version); final appPlatform = Tag(EntityTag.appPlatform, appInfo.platform); - final arfsTag = Tag(EntityTag.arFs, appInfo.arfsVersion); final unixTime = Tag( EntityTag.unixTime, (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString(), ); + final appName = Tag(EntityTag.appName, 'ArDrive-App'); return [ - appVersion, + appName, appPlatform, - arfsTag, + appVersion, unixTime, ]; } - List get _uTags { + List get _bundleDataItemTags { return [ - Tag(EntityTag.appName, 'SmartWeaveAction'), - Tag(EntityTag.appVersion, '0.3.0'), - Tag(EntityTag.input, '{"function":"mint"}'), - Tag(EntityTag.contract, 'KTzTXT_ANmF84fWEKHzWURD1LWd9QaFR9yfYUwH2Lxw'), + ..._appTags, + Tag('Tip-Type', 'data upload'), ]; } + + // TODO: Review this + // List get _uTags { + // return [ + // Tag(EntityTag.appName, 'SmartWeaveAction'), + // Tag(EntityTag.appVersion, '0.3.0'), + // Tag(EntityTag.input, '{"function":"mint"}'), + // Tag(EntityTag.contract, 'KTzTXT_ANmF84fWEK HzWURD1LWd9QaFR9yfYUwH2Lxw'), + // ]; + // } } class ARFSUploadMetadataArgsValidator { - static void validate(ARFSUploadMetadataArgs args, arfs.EntityType entity) { + static void validate(ARFSUploadMetadataArgs args, EntityType entity) { switch (entity) { - case arfs.EntityType.file: + case EntityType.file: if (args.driveId == null) { throw ArgumentError('driveId must not be null'); } @@ -231,13 +347,13 @@ class ARFSUploadMetadataArgsValidator { } break; - case arfs.EntityType.folder: + case EntityType.folder: if (args.driveId == null) { throw ArgumentError('driveId must not be null'); } break; - case arfs.EntityType.drive: + case EntityType.drive: if (args.privacy == null) { throw ArgumentError('privacy must not be null'); } @@ -250,13 +366,17 @@ class ARFSUploadMetadataArgsValidator { } class ARFSTagsValidator { - static void validate(ARFSTagsArgs args, arfs.EntityType entity) { + static void validate(ARFSTagsArgs args) { if (args.driveId == null) { throw ArgumentError('driveId must not be null'); } - switch (entity) { - case arfs.EntityType.file: + if (args.isPrivate == null) { + throw ArgumentError('isPrivate must not be null'); + } + + switch (args.entity) { + case EntityType.file: if (args.entityId == null) { throw ArgumentError('entityId must not be null'); } @@ -265,13 +385,13 @@ class ARFSTagsValidator { } break; - case arfs.EntityType.folder: + case EntityType.folder: if (args.entityId == null) { throw ArgumentError('entityId must not be null'); } break; - case arfs.EntityType.drive: + case EntityType.drive: if (args.isPrivate == null) { throw ArgumentError('privacy must not be null'); } @@ -285,11 +405,15 @@ class ARFSTagsArgs { final String? parentFolderId; final String? entityId; final bool? isPrivate; + final String contentType; + final EntityType entity; ARFSTagsArgs({ this.driveId, this.parentFolderId, this.isPrivate, this.entityId, + required this.entity, + required this.contentType, }); } diff --git a/packages/ardrive_uploader/lib/src/streamed_upload.dart b/packages/ardrive_uploader/lib/src/streamed_upload.dart new file mode 100644 index 0000000000..f9babaf9d6 --- /dev/null +++ b/packages/ardrive_uploader/lib/src/streamed_upload.dart @@ -0,0 +1,32 @@ +import 'package:ardrive_uploader/ardrive_uploader.dart'; +import 'package:ardrive_uploader/src/d2n_streamed_upload.dart'; +import 'package:ardrive_uploader/src/turbo_streamed_upload.dart'; +import 'package:ardrive_uploader/src/turbo_upload_service_base.dart'; +import 'package:arweave/arweave.dart'; + +abstract class StreamedUpload { + Future send( + T handle, + Wallet wallet, + UploadController controller, + ); +} + +class StreamedUploadFactory { + StreamedUpload fromUploadType( + UploadType type, + Uri turboUploadUri, + ) { + if (type == UploadType.d2n) { + return D2NStreamedUpload(); + } else if (type == UploadType.turbo) { + return TurboStreamedUpload( + TurboUploadServiceImpl( + turboUploadUri: turboUploadUri, + ), + ); + } else { + throw Exception('Invalid upload type'); + } + } +} diff --git a/packages/ardrive_uploader/lib/src/turbo_streamed_upload.dart b/packages/ardrive_uploader/lib/src/turbo_streamed_upload.dart new file mode 100644 index 0000000000..d90b775075 --- /dev/null +++ b/packages/ardrive_uploader/lib/src/turbo_streamed_upload.dart @@ -0,0 +1,88 @@ +import 'package:arconnect/arconnect.dart'; +import 'package:ardrive_uploader/ardrive_uploader.dart'; +import 'package:ardrive_uploader/src/streamed_upload.dart'; +import 'package:ardrive_uploader/src/turbo_upload_service_base.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +import 'package:arweave/arweave.dart'; +import 'package:flutter/foundation.dart'; +import 'package:uuid/uuid.dart'; + +class TurboStreamedUpload implements StreamedUpload { + final TurboUploadService _turbo; + final TabVisibilitySingleton _tabVisibility; + + TurboStreamedUpload( + this._turbo, { + TabVisibilitySingleton? tabVisibilitySingleton, + }) : _tabVisibility = tabVisibilitySingleton ?? TabVisibilitySingleton(); + + @override + Future send( + handle, + Wallet wallet, + UploadController controller, + ) async { + final nonce = const Uuid().v4(); + + final publicKey = await safeArConnectAction( + _tabVisibility, + (_) async { + return wallet.getOwner(); + }, + ); + + final signature = await safeArConnectAction( + _tabVisibility, + (_) async { + return signNonceAndData( + nonce: nonce, + wallet: wallet, + ); + }, + ); + + handle = handle.copyWith(status: UploadStatus.inProgress); + controller.updateProgress(task: handle); + + if (kIsWeb && handle.uploadItem!.size > 1024 * 1024 * 500) { + handle.isProgressAvailable = false; + controller.updateProgress(task: handle); + } + + // gets the streamed request + final streamedRequest = _turbo + .postStream( + wallet: wallet, + headers: { + 'x-nonce': nonce, + 'x-address': publicKey, + 'x-signature': signature, + }, + dataItem: handle.uploadItem!.data, + size: handle.uploadItem!.size, + onSendProgress: (progress) { + handle.progress = progress; + controller.updateProgress(task: handle); + }) + .then((value) async { + print('value: $value'); + if (!handle.isProgressAvailable) { + print('Progress is not available, setting to 1'); + handle.progress = 1; + } + + handle.status = UploadStatus.complete; + + controller.updateProgress(task: handle); + + return value; + }).onError((e, s) { + print(e.toString()); + handle.status = UploadStatus.failed; + print('handle.status: ${handle.status}'); + controller.updateProgress(task: handle); + }); + + return streamedRequest; + } +} diff --git a/packages/ardrive_uploader/lib/src/turbo_upload_service_base.dart b/packages/ardrive_uploader/lib/src/turbo_upload_service_base.dart new file mode 100644 index 0000000000..7f1b4fdb00 --- /dev/null +++ b/packages/ardrive_uploader/lib/src/turbo_upload_service_base.dart @@ -0,0 +1,16 @@ +import 'package:arweave/arweave.dart'; + +export 'package:ardrive_uploader/src/turbo_upload_service_dart_io.dart' + if (dart.library.html) 'package:ardrive_uploader/src/turbo_upload_service_web.dart'; + +abstract class TurboUploadService { + Future postStream({ + required DataItemResult dataItem, + required Wallet wallet, + Function(double p1)? onSendProgress, + required int size, + required Map headers, + }); + + bool get isPossibleGetProgress; +} diff --git a/packages/ardrive_uploader/lib/src/turbo_upload_service_dart_io.dart b/packages/ardrive_uploader/lib/src/turbo_upload_service_dart_io.dart new file mode 100644 index 0000000000..33c18b6383 --- /dev/null +++ b/packages/ardrive_uploader/lib/src/turbo_upload_service_dart_io.dart @@ -0,0 +1,66 @@ +import 'dart:async'; + +import 'package:ardrive_uploader/src/turbo_upload_service_base.dart'; +import 'package:arweave/arweave.dart'; +import 'package:dio/dio.dart'; + +class TurboUploadServiceImpl implements TurboUploadService { + final Uri turboUploadUri; + + /// We are using Dio directly here. In the future we must adapt our ArDriveHTTP to support + /// streaming uploads. + // ArDriveHTTP httpClient; + + TurboUploadServiceImpl({ + required this.turboUploadUri, + }); + + /// We are using Dio directly here. In the future we must adapt our ArDriveHTTP to support + /// streaming uploads. + /// This is a temporary solution. + @override + Future postStream({ + required DataItemResult dataItem, + required Wallet wallet, + Function(double)? onSendProgress, + required int size, + required Map headers, + }) async { + final url = '$turboUploadUri/v1/tx'; + + int dataItemSize = 0; + + await for (final data in dataItem.streamGenerator()) { + dataItemSize += data.length; + } + + final dio = Dio(); + + final response = await dio.post( + url, + onSendProgress: (sent, total) { + print('Sent: $sent, total: $total'); + onSendProgress?.call(sent / total); + }, + data: dataItem.streamGenerator(), // Creates a Stream>. + options: Options( + headers: { + // stream + Headers.contentTypeHeader: 'application/octet-stream', + Headers.contentLengthHeader: dataItemSize, // Set the content-length. + }..addAll(headers), + ), + ); + + print('Response from turbo: ${response.statusCode}'); + + return response; + } + + @override + bool get isPossibleGetProgress => true; +} + +class TurboUploadExceptions implements Exception {} + +class TurboUploadTimeoutException implements TurboUploadExceptions {} diff --git a/packages/ardrive_uploader/lib/src/turbo_upload_service_web.dart b/packages/ardrive_uploader/lib/src/turbo_upload_service_web.dart new file mode 100644 index 0000000000..aa21628f03 --- /dev/null +++ b/packages/ardrive_uploader/lib/src/turbo_upload_service_web.dart @@ -0,0 +1,203 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:ardrive_uploader/src/turbo_upload_service_base.dart'; +import 'package:arweave/arweave.dart'; +import 'package:dio/dio.dart'; +import 'package:fetch_client/fetch_client.dart'; +import 'package:http/http.dart' as http; + +class TurboUploadServiceImpl implements TurboUploadService { + final Uri turboUploadUri; + + /// We are using Dio directly here. In the future we must adapt our ArDriveHTTP to support + /// streaming uploads. + // ArDriveHTTP httpClient; + + TurboUploadServiceImpl({ + required this.turboUploadUri, + }); + + @override + Future postStream({ + required DataItemResult dataItem, + required Wallet wallet, + Function(double p1)? onSendProgress, + required int size, + required Map headers, + }) { + // max of 500mib + if (dataItem.dataItemSize <= 1024 * 1024 * 500) { + _isPossibleGetProgress = true; + + // TODO: Add this to the task instead of the controller + // controller.isPossibleGetProgress = true; + + return _uploadWithDio( + dataItem: dataItem, + wallet: wallet, + onSendProgress: onSendProgress, + size: size, + headers: headers, + ); + } + + return _uploadStreamWithFetchClient( + dataItem: dataItem, + wallet: wallet, + onSendProgress: onSendProgress, + size: size, + headers: headers, + ); + } + + Future _uploadWithDio({ + required DataItemResult dataItem, + required Wallet wallet, + Function(double p1)? onSendProgress, + required int size, + required Map headers, + }) async { + final url = '$turboUploadUri/v1/tx'; + + int dataItemSize = 0; + + // TODO: remove after fixing the issue with the size of the upload + await for (final data in dataItem.streamGenerator()) { + dataItemSize += data.length; + } + + final dio = Dio(); + + final response = await dio.post( + url, + onSendProgress: (sent, total) { + onSendProgress?.call(sent / total); + }, + data: dataItem.streamGenerator(), // Creates a Stream>. + options: Options( + headers: { + // stream + Headers.contentTypeHeader: 'application/octet-stream', + Headers.contentLengthHeader: dataItemSize, // Set the content-length. + }..addAll(headers), + ), + ); + + print('Response from turbo: ${response.statusCode}'); + + return response; + } + + Future _uploadStreamWithFetchClient({ + required DataItemResult dataItem, + required Wallet wallet, + Function(double)? onSendProgress, + required int size, + required Map headers, + }) async { + final url = '$turboUploadUri/v1/tx'; + + int dataItemSize = 0; + + // TODO: remove after fixing the issue with the size of the upload + await for (final data in dataItem.streamGenerator()) { + dataItemSize += data.length; + } + + StreamTransformer createPassthroughTransformer() { + return StreamTransformer.fromHandlers( + handleData: (Uint8List data, EventSink sink) { + sink.add(data); + }, + handleError: (Object error, StackTrace stackTrace, EventSink sink) { + sink.addError(error, stackTrace); + }, + handleDone: (EventSink sink) { + sink.close(); + }, + ); + } + + final client = FetchClient( + mode: RequestMode.cors, + streamRequests: true, + cache: RequestCache.noCache, + ); + + final controller = StreamController>(sync: false); + + final request = ArDriveStreamedRequest( + 'POST', + Uri.parse(url), + controller, + )..headers.addAll({ + 'content-type': 'application/octet-stream', + }); + + controller + .addStream( + dataItem.streamGenerator().transform( + createPassthroughTransformer(), + ), + ) + .then((value) { + print('Done'); + request.sink.close(); + }); + + controller.onPause = () { + print('Paused'); + }; + + controller.onResume = () { + print('Resumed'); + }; + + request.contentLength = dataItemSize; + + final response = await client.send(request); + + print(await utf8.decodeStream(response.stream)); + + return response; + } + + @override + bool get isPossibleGetProgress => _isPossibleGetProgress; + + bool _isPossibleGetProgress = false; +} + +class TurboUploadExceptions implements Exception {} + +class TurboUploadTimeoutException implements TurboUploadExceptions {} + +class ArDriveStreamedRequest extends http.BaseRequest { + /// The sink to which to write data that will be sent as the request body. + /// + /// This may be safely written to before the request is sent; the data will be + /// buffered. + /// + /// Closing this signals the end of the request. + EventSink> get sink => _controller.sink; + + /// The controller for [sink], from which [BaseRequest] will read data for + /// [finalize]. + final StreamController> _controller; + + /// Creates a new streaming request. + ArDriveStreamedRequest( + String method, Uri url, StreamController> controller) + : _controller = controller, + super(method, url); + + /// Freezes all mutable fields and returns a single-subscription [ByteStream] + /// that emits the data being written to [sink]. + @override + http.ByteStream finalize() { + super.finalize(); + return http.ByteStream(_controller.stream); + } +} diff --git a/packages/ardrive_uploader/lib/src/upload_controller.dart b/packages/ardrive_uploader/lib/src/upload_controller.dart new file mode 100644 index 0000000000..4b0cb6b77b --- /dev/null +++ b/packages/ardrive_uploader/lib/src/upload_controller.dart @@ -0,0 +1,413 @@ +import 'dart:async'; + +import 'package:ardrive_uploader/src/streamed_upload.dart'; +import 'package:arweave/arweave.dart'; +import 'package:rxdart/rxdart.dart'; +import 'package:uuid/uuid.dart'; + +import '../ardrive_uploader.dart'; + +abstract class UploadItem { + final int size; + final T data; + + UploadItem({required this.size, required this.data}); +} + +class DataItemUploadTask extends UploadItem { + DataItemUploadTask({required int size, required DataItemResult data}) + : super(size: size, data: data); +} + +class TransactionUploadTask extends UploadItem { + TransactionUploadTask({required int size, required TransactionResult data}) + : super(size: size, data: data); +} + +abstract class _UploadTask { + abstract final String id; + abstract final UploadItem? uploadItem; + abstract final List? content; + abstract double progress; + abstract bool isProgressAvailable; + abstract UploadStatus status; + + UploadTask copyWith({ + UploadItem? uploadItem, + double? progress, + bool? isProgressAvailable, + UploadStatus? status, + String? id, + List? content, + }); +} + +class UploadTask implements _UploadTask { + @override + final UploadItem? uploadItem; + + @override + final List? content; + + @override + double progress = 0; + + @override + final String id; + + @override + bool isProgressAvailable = true; + + UploadTask({ + this.uploadItem, + this.isProgressAvailable = true, + this.status = UploadStatus.notStarted, + this.content, + String? id, + }) : id = id ?? const Uuid().v4(); + + @override + UploadStatus status; + + @override + UploadTask copyWith({ + UploadItem? uploadItem, + double? progress, + bool? isProgressAvailable, + UploadStatus? status, + String? id, + List? content, + }) { + return UploadTask( + uploadItem: uploadItem ?? this.uploadItem, + content: content ?? this.content, + id: id ?? this.id, + isProgressAvailable: isProgressAvailable ?? this.isProgressAvailable, + status: status ?? this.status, + ); + } +} + +// TODO: Review this file +abstract class UploadController { + abstract final Map tasks; + + /// TODO: implement the sendTasks method + Future sendTasks(); + Future retryTask(UploadTask task, Wallet wallet); + Future retryFailedTasks(Wallet wallet); + Future close(); + void cancel(); + void onCancel(); + void onDone(Function(List tasks) callback); + void onError(Function(List tasks) callback); + void updateProgress({UploadTask? task}); + void onProgressChange(Function(UploadProgress progress) callback); + + factory UploadController( + StreamController progressStream, + StreamedUpload streamedUpload, + ) { + return _UploadController( + progressStream: progressStream, + streamedUpload: streamedUpload, + ); + } +} + +class _UploadController implements UploadController { + final StreamController _progressStream; + final StreamedUpload _streamedUpload; + + _UploadController({ + required StreamController progressStream, + required StreamedUpload streamedUpload, + }) : _progressStream = progressStream, + _streamedUpload = streamedUpload { + init(); + } + + bool _isCanceled = false; + bool get isCanceled => _isCanceled; + DateTime? _start; + + void init() { + _isCanceled = false; + late StreamSubscription subscription; + + subscription = + _progressStream.stream.debounceTime(Duration(milliseconds: 100)).listen( + (event) async { + _start ??= DateTime.now(); + + _onProgressChange!(event); + + if (_uploadProgress.progress == 1) { + await close(); + return; + } + }, + onDone: () { + print('Done upload'); + for (var task in tasks.values) { + print('Task: ${task.id} - ${task.status}'); + } + _onDone(tasks.values.toList()); + subscription.cancel(); + }, + onError: (err) { + print('Error: $err'); + subscription.cancel(); + }, + ); + } + + @override + Future close() async { + await _progressStream.close(); + } + + @override + void cancel() { + // TODO: it's uploading closing the progress stream. We need to cancel the upload + _isCanceled = true; + _progressStream.close(); + } + + @override + void onCancel() { + // TODO: implement onCancel + } + + @override + void onDone(Function(List tasks) callback) { + _onDone = callback; + } + + @override + void updateProgress({ + UploadTask? task, + }) { + if (_progressStream.isClosed) { + return; + } + + if (task != null) { + tasks[task.id] = task; + + // TODO: Check how to improve this + final taskList = tasks.values.toList(); + + // TODO: Check how to improve this + _uploadProgress = _uploadProgress.copyWith( + task: taskList, + progress: calculateTotalProgress(taskList), + totalSize: totalSize(taskList), + totalUploaded: totalUploaded(taskList), + startTime: _start, + ); + + _progressStream.add(_uploadProgress); + } + + return; + } + + UploadProgress _uploadProgress = UploadProgress.notStarted(); + + @override + void onError(Function(List tasks) callback) {} + + @override + void onProgressChange(Function(UploadProgress progress) callback) { + _onProgressChange = callback; + } + + void Function(UploadProgress progress)? _onProgressChange = (progress) {}; + + void Function(List tasks) _onDone = (List tasks) { + print('Upload Finished'); + }; + + @override + final Map tasks = {}; + + // TODO: CALCULATE BASED ON TOTAL SIZE NOT ONLY ON THE NUMBER OF TASKS + double calculateTotalProgress(List tasks) { + return tasks + .map((e) => e.progress) + .reduce((value, element) => value + element) / + tasks.length; + } + + int totalUploaded(List tasks) { + int totalUploaded = 0; + + for (var task in tasks) { + if (task.uploadItem != null) { + totalUploaded += (task.progress * task.uploadItem!.size).toInt(); + } + } + + return totalUploaded; + } + + int totalSize(List tasks) { + int totalSize = 0; + + for (var task in tasks) { + if (task.uploadItem != null) { + totalSize += task.uploadItem!.size; + } + } + + return totalSize; + } + + @override + Future sendTasks() async { + // TODO: implement sendTasks + } + + @override + Future retryFailedTasks(Wallet wallet) async { + final failedTasks = + tasks.values.where((e) => e.status == UploadStatus.failed).toList(); + + if (failedTasks.isEmpty) { + return Future.value(); + } + + for (var task in failedTasks) { + task.copyWith(status: UploadStatus.notStarted); + + updateProgress(task: task); + + _streamedUpload.send(task, wallet, this); + } + } + + @override + Future retryTask(UploadTask task, Wallet wallet) async { + task.copyWith(status: UploadStatus.notStarted); + + updateProgress(task: task); + + _streamedUpload.send(task, wallet, this); + } +} + +enum UploadStatus { + /// The upload is not started yet + notStarted, + + /// The upload is in progress + inProgress, + + /// The upload is paused + paused, + + bundling, + + preparationDone, + + encryting, + + /// The upload is complete + complete, + + /// The upload has failed + failed, +} + +class UploadProgress { + final double progress; + final int totalSize; + final int totalUploaded; + final List task; + + DateTime? startTime; + + UploadProgress({ + required this.progress, + required this.totalSize, + required this.task, + required this.totalUploaded, + this.startTime, + }); + + factory UploadProgress.notStarted() { + return UploadProgress( + progress: 0, + totalSize: 0, + task: [], + totalUploaded: 0, + ); + } + + UploadProgress copyWith({ + double? progress, + int? totalSize, + List? task, + int? totalUploaded, + DateTime? startTime, + }) { + return UploadProgress( + startTime: startTime ?? this.startTime, + progress: progress ?? this.progress, + totalSize: totalSize ?? this.totalSize, + task: task ?? this.task, + totalUploaded: totalUploaded ?? this.totalUploaded, + ); + } + + int getNumberOfItems() { + if (task.isEmpty) { + return 0; + } + + return task.map((e) { + if (e.content == null) { + return 0; + } + + return e.content!.length; + }).reduce((value, element) => value + element); + } + + int tasksContentLength() { + int totalUploaded = 0; + + for (var t in task) { + if (t.content != null) { + totalUploaded += t.content!.length; + } + } + + return totalUploaded; + } + + int tasksContentCompleted() { + int totalUploaded = 0; + + for (var t in task) { + if (t.content != null) { + if (t.status == UploadStatus.complete) { + totalUploaded += t.content!.length; + } + } + } + + return totalUploaded; + } + + double calculateUploadSpeed() { + if (startTime == null) return 0.0; + + final elapsedTime = DateTime.now().difference(startTime!).inSeconds; + + if (elapsedTime == 0) return 0.0; + + return (totalUploaded / elapsedTime).toDouble(); // Assuming speed in MB/s + } +} diff --git a/packages/ardrive_uploader/lib/src/utils/data_item_utils.dart b/packages/ardrive_uploader/lib/src/utils/data_item_utils.dart new file mode 100644 index 0000000000..5ea65e66ed --- /dev/null +++ b/packages/ardrive_uploader/lib/src/utils/data_item_utils.dart @@ -0,0 +1,12 @@ +import 'package:arweave/arweave.dart'; +import 'package:flutter/foundation.dart'; + +/// Converts a [DataItem] to a [Stream>] of bytes. +Future>> convertDataItemToStreamBytes( + DataItem dataItem) async { + Uint8List byteList = (await dataItem.asBinary()).toBytes(); + + Stream> stream = Stream.fromIterable([byteList]); + + return stream; +} diff --git a/packages/ardrive_uploader/pubspec.yaml b/packages/ardrive_uploader/pubspec.yaml new file mode 100644 index 0000000000..bba70e5666 --- /dev/null +++ b/packages/ardrive_uploader/pubspec.yaml @@ -0,0 +1,51 @@ +name: ardrive_uploader +description: A starting point for Dart libraries or applications. +version: 1.0.0 +publish_to: 'none' + +environment: + sdk: ^3.0.2 + +dependencies: + flutter: + sdk: flutter + ardrive_http: + git: + url: https://github.com/ar-io/ardrive_http.git + ref: v1.3.1 + ardrive_io: + git: + url: https://github.com/ar-io/ardrive_io.git + ref: PE-3699-uploads-large-files-for-public-drives + arweave: + git: + url: https://github.com/ardriveapp/arweave-dart.git + ref: PE-3697 + ardrive_utils: + path: ../ardrive_utils + ardrive_crypto: + path: ../ardrive_crypto + arconnect: + path: ../arconnect + arfs: + path: ../arfs + json_annotation: ^4.8.0 + uuid: ^3.0.4 + system_info_plus: ^0.0.5 + cryptography: ^2.5.0 + rxdart: ^0.27.7 + dio: ^5.3.2 + fpdart: ^1.1.0 + fetch_client: + git: + url: https://github.com/karlprieb/fetch_client.git + ref: ignore-headers + http: ^1.1.0 + +dev_dependencies: + lints: ^2.0.0 + test: ^1.21.0 + json_serializable: + build_runner: ^2.0.4 + +dependency_overrides: \ No newline at end of file diff --git a/packages/ardrive_uploader/test/ardrive_uploader_test.dart b/packages/ardrive_uploader/test/ardrive_uploader_test.dart new file mode 100644 index 0000000000..d12c182569 --- /dev/null +++ b/packages/ardrive_uploader/test/ardrive_uploader_test.dart @@ -0,0 +1,9 @@ +import 'package:test/test.dart'; + +void main() { + group('A group of tests', () { + setUp(() { + // Additional setup goes here. + }); + }); +} diff --git a/packages/ardrive_utils/.gitignore b/packages/ardrive_utils/.gitignore new file mode 100644 index 0000000000..96486fd930 --- /dev/null +++ b/packages/ardrive_utils/.gitignore @@ -0,0 +1,30 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# 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 +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.packages +build/ diff --git a/packages/ardrive_utils/.metadata b/packages/ardrive_utils/.metadata new file mode 100644 index 0000000000..10542d27f6 --- /dev/null +++ b/packages/ardrive_utils/.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: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + channel: stable + +project_type: package diff --git a/packages/ardrive_utils/CHANGELOG.md b/packages/ardrive_utils/CHANGELOG.md new file mode 100644 index 0000000000..41cc7d8192 --- /dev/null +++ b/packages/ardrive_utils/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/packages/ardrive_utils/LICENSE b/packages/ardrive_utils/LICENSE new file mode 100644 index 0000000000..ba75c69f7f --- /dev/null +++ b/packages/ardrive_utils/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/packages/ardrive_utils/README.md b/packages/ardrive_utils/README.md new file mode 100644 index 0000000000..02fe8ecabc --- /dev/null +++ b/packages/ardrive_utils/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/packages/ardrive_utils/analysis_options.yaml b/packages/ardrive_utils/analysis_options.yaml new file mode 100644 index 0000000000..a5744c1cfb --- /dev/null +++ b/packages/ardrive_utils/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/ardrive_utils/lib/ardrive_utils.dart b/packages/ardrive_utils/lib/ardrive_utils.dart new file mode 100644 index 0000000000..25dbec17a5 --- /dev/null +++ b/packages/ardrive_utils/lib/ardrive_utils.dart @@ -0,0 +1,7 @@ +library ardrive_utils; + +export 'src/app_info_services.dart'; +export 'src/app_platform.dart'; +export 'src/entity_tag.dart'; +export 'src/html/html.dart'; +export 'src/sign_nounce_and_data.dart'; diff --git a/packages/ardrive_utils/lib/src/app_info_services.dart b/packages/ardrive_utils/lib/src/app_info_services.dart new file mode 100644 index 0000000000..a8c6a12df4 --- /dev/null +++ b/packages/ardrive_utils/lib/src/app_info_services.dart @@ -0,0 +1,51 @@ +import 'package:ardrive_utils/src/app_platform.dart'; +import 'package:package_info_plus/package_info_plus.dart'; + +class AppInfo { + final String version; + final String arfsVersion; + final String appName; + final String platform; + + AppInfo({ + required this.version, + required this.appName, + required this.platform, + required this.arfsVersion, + }); +} + +class AppInfoServices { + static final AppInfoServices _instance = AppInfoServices._internal(); + + factory AppInfoServices() { + return _instance; + } + + AppInfoServices._internal(); + + AppInfo get appInfo { + if (_appInfo == null) { + throw StateError('AppInfoServices has not been initialized'); + } + + return _appInfo!; + } + + AppInfo? _appInfo; + + Future loadAppInfo() async { + final packageInfo = await PackageInfo.fromPlatform(); + final appPlatform = AppPlatform.getPlatform().name; + + _appInfo = AppInfo( + version: packageInfo.version, + appName: appName, + platform: appPlatform, + arfsVersion: arfsVersion, + ); + } +} + +const String appName = 'ArDrive-App'; +const String arfsVersion = '0.12'; diff --git a/lib/utils/app_platform.dart b/packages/ardrive_utils/lib/src/app_platform.dart similarity index 94% rename from lib/utils/app_platform.dart rename to packages/ardrive_utils/lib/src/app_platform.dart index c3d42708c9..6cd488c64e 100644 --- a/lib/utils/app_platform.dart +++ b/packages/ardrive_utils/lib/src/app_platform.dart @@ -1,6 +1,3 @@ -// ignore_for_file: constant_identifier_names -// ignore_for_file: depend_on_referenced_packages - import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/foundation.dart' show kIsWeb, defaultTargetPlatform, TargetPlatform, visibleForTesting; @@ -55,4 +52,5 @@ class AppPlatform { } } +// ignore: constant_identifier_names enum SystemPlatform { Android, iOS, Web, unknown } diff --git a/packages/ardrive_utils/lib/src/entity_tag.dart b/packages/ardrive_utils/lib/src/entity_tag.dart new file mode 100644 index 0000000000..e239436733 --- /dev/null +++ b/packages/ardrive_utils/lib/src/entity_tag.dart @@ -0,0 +1,64 @@ +// TODO: move for the ARFS package +class EntityTag { + static const appName = 'App-Name'; + static const appPlatform = 'App-Platform'; + static const appPlatformVersion = 'App-Platform-Version'; + static const appVersion = 'App-Version'; + static const contentType = 'Content-Type'; + static const unixTime = 'Unix-Time'; + + static const arFs = 'ArFS'; + static const entityType = 'Entity-Type'; + + static const driveId = 'Drive-Id'; + static const folderId = 'Folder-Id'; + static const parentFolderId = 'Parent-Folder-Id'; + static const fileId = 'File-Id'; + static const snapshotId = 'Snapshot-Id'; + + static const drivePrivacy = 'Drive-Privacy'; + static const driveAuthMode = 'Drive-Auth-Mode'; + + static const cipher = 'Cipher'; + static const cipherIv = 'Cipher-IV'; + + static const protocolName = 'Protocol-Name'; + static const action = 'Action'; + static const input = 'Input'; + static const contract = 'Contract'; + + static const blockStart = 'Block-Start'; + static const blockEnd = 'Block-End'; + static const dataStart = 'Data-Start'; + static const dataEnd = 'Data-End'; + + static const pinnedDataTx = 'Pinned-Data-Tx'; + static const arFsPin = 'ArFS-Pin'; +} + +class ContentTypeTag { + static const json = 'application/json'; + static const octetStream = 'application/octet-stream'; + static const manifest = 'application/x.arweave-manifest+json'; +} + +class EntityTypeTag { + static const drive = 'drive'; + static const folder = 'folder'; + static const file = 'file'; + static const snapshot = 'snapshot'; +} + +class CipherTag { + static const aes256 = 'AES256-GCM'; +} + +class DrivePrivacyTag { + static const public = 'public'; + static const private = 'private'; +} + +class DriveAuthModeTag { + static const password = 'password'; + static const none = 'none'; +} diff --git a/packages/ardrive_utils/lib/src/html/html.dart b/packages/ardrive_utils/lib/src/html/html.dart new file mode 100644 index 0000000000..b69dbea953 --- /dev/null +++ b/packages/ardrive_utils/lib/src/html/html.dart @@ -0,0 +1 @@ +export './html_util.dart'; diff --git a/lib/utils/html/html_util.dart b/packages/ardrive_utils/lib/src/html/html_util.dart similarity index 94% rename from lib/utils/html/html_util.dart rename to packages/ardrive_utils/lib/src/html/html_util.dart index 4a9d428431..da6736ad47 100644 --- a/lib/utils/html/html_util.dart +++ b/packages/ardrive_utils/lib/src/html/html_util.dart @@ -22,6 +22,7 @@ class TabVisibilitySingleton { implementation.onTabGetsFocused(onFocus); } +// TODO: Move this code to the arconnect package. void onArConnectWalletSwitch(Function onWalletSwitch) => implementation.onWalletSwitch(onWalletSwitch); diff --git a/lib/utils/html/implementations/html_stub.dart b/packages/ardrive_utils/lib/src/html/implementations/html_stub.dart similarity index 100% rename from lib/utils/html/implementations/html_stub.dart rename to packages/ardrive_utils/lib/src/html/implementations/html_stub.dart diff --git a/lib/utils/html/implementations/html_web.dart b/packages/ardrive_utils/lib/src/html/implementations/html_web.dart similarity index 91% rename from lib/utils/html/implementations/html_web.dart rename to packages/ardrive_utils/lib/src/html/implementations/html_web.dart index b9edea7df1..18efe6bccf 100644 --- a/lib/utils/html/implementations/html_web.dart +++ b/packages/ardrive_utils/lib/src/html/implementations/html_web.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:ardrive/services/arconnect/is_document_focused.dart'; +import 'package:ardrive_utils/src/html/is_document_focused.dart'; import 'package:universal_html/html.dart'; bool isTabFocused() { diff --git a/packages/ardrive_utils/lib/src/html/is_document_focused.dart b/packages/ardrive_utils/lib/src/html/is_document_focused.dart new file mode 100644 index 0000000000..4397657ac6 --- /dev/null +++ b/packages/ardrive_utils/lib/src/html/is_document_focused.dart @@ -0,0 +1,4 @@ +import 'package:js/js.dart'; + +@JS('isDocumentFocused') +external bool isDocumentFocused(); diff --git a/packages/ardrive_utils/lib/src/sign_nounce_and_data.dart b/packages/ardrive_utils/lib/src/sign_nounce_and_data.dart new file mode 100644 index 0000000000..6bd5f257cc --- /dev/null +++ b/packages/ardrive_utils/lib/src/sign_nounce_and_data.dart @@ -0,0 +1,18 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:arweave/arweave.dart'; + +// TODO: we may wnat to have this implemented on arweave-dart +Future signNonceAndData({ + required Wallet wallet, + required String nonce, + String? data, +}) async { + final signature = await wallet.sign( + Uint8List.fromList( + (data != null ? '$data$nonce' : nonce).toString().codeUnits, + ), + ); + return base64UrlEncode(signature); +} diff --git a/packages/ardrive_utils/pubspec.yaml b/packages/ardrive_utils/pubspec.yaml new file mode 100644 index 0000000000..97fdcb2827 --- /dev/null +++ b/packages/ardrive_utils/pubspec.yaml @@ -0,0 +1,64 @@ +name: ardrive_utils +description: A new Flutter package project. +version: 0.0.1 +homepage: +publish_to: none + +environment: + sdk: '>=3.0.2 <4.0.0' + flutter: ">=1.17.0" + +dependencies: + device_info_plus: ^9.0.3 + flutter: + sdk: flutter + package_info_plus: ^4.1.0 + platform: ^3.1.0 + universal_html: ^2.2.4 + arweave: + git: + url: https://github.com/ardriveapp/arweave-dart.git + ref: PE-3697 + js: ^0.6.7 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^2.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # To add assets to your package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/assets-and-images/#from-packages + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware + + # To add custom fonts to your package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/ardrive_utils/test/ardrive_utils_test.dart b/packages/ardrive_utils/test/ardrive_utils_test.dart new file mode 100644 index 0000000000..ab73b3a234 --- /dev/null +++ b/packages/ardrive_utils/test/ardrive_utils_test.dart @@ -0,0 +1 @@ +void main() {} diff --git a/packages/arfs/.gitignore b/packages/arfs/.gitignore new file mode 100644 index 0000000000..96486fd930 --- /dev/null +++ b/packages/arfs/.gitignore @@ -0,0 +1,30 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# 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 +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.packages +build/ diff --git a/packages/arfs/.metadata b/packages/arfs/.metadata new file mode 100644 index 0000000000..10542d27f6 --- /dev/null +++ b/packages/arfs/.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: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + channel: stable + +project_type: package diff --git a/packages/arfs/CHANGELOG.md b/packages/arfs/CHANGELOG.md new file mode 100644 index 0000000000..41cc7d8192 --- /dev/null +++ b/packages/arfs/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/packages/arfs/LICENSE b/packages/arfs/LICENSE new file mode 100644 index 0000000000..ba75c69f7f --- /dev/null +++ b/packages/arfs/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/packages/arfs/README.md b/packages/arfs/README.md new file mode 100644 index 0000000000..02fe8ecabc --- /dev/null +++ b/packages/arfs/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/packages/arfs/analysis_options.yaml b/packages/arfs/analysis_options.yaml new file mode 100644 index 0000000000..a5744c1cfb --- /dev/null +++ b/packages/arfs/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/arfs/lib/arfs.dart b/packages/arfs/lib/arfs.dart new file mode 100644 index 0000000000..233e3f5d9c --- /dev/null +++ b/packages/arfs/lib/arfs.dart @@ -0,0 +1,3 @@ +library arfs; + +export 'src/arfs_entities.dart'; diff --git a/packages/arfs/lib/src/arfs_entities.dart b/packages/arfs/lib/src/arfs_entities.dart new file mode 100644 index 0000000000..2da33b7125 --- /dev/null +++ b/packages/arfs/lib/src/arfs_entities.dart @@ -0,0 +1,141 @@ +// ignore_for_file: unused_element + +import 'package:ardrive_utils/ardrive_utils.dart'; + +// TODO: use this class on ardrive_app +abstract class ARFSEntity { + ARFSEntity({ + required this.appName, + required this.appVersion, + required this.arFS, + required this.driveId, + required this.entityType, + required this.name, + required this.txId, + required this.unixTime, + }); + + final String appName; + final String appVersion; + final String arFS; + final String driveId; + final EntityType entityType; + final String name; + final String txId; + final DateTime unixTime; +} + +abstract class PrivateARFSEntity implements ARFSEntity { + PrivateARFSEntity({ + required this.cipher, + required this.cipherIX, + required this.driveKey, + }); + + final CipherTag cipher; + final String cipherIX; + final String driveKey; +} + +abstract class ARFSDriveEntity extends ARFSEntity { + ARFSDriveEntity({ + required super.appName, + required super.appVersion, + required super.arFS, + required super.driveId, + required super.entityType, + required super.name, + required super.txId, + required super.unixTime, + required this.drivePrivacy, + required this.rootFolderId, + }); + + final DrivePrivacy drivePrivacy; + final String rootFolderId; +} + +abstract class ARFSFileEntity extends ARFSEntity { + ARFSFileEntity({ + required super.appName, + required super.appVersion, + required super.arFS, + required super.driveId, + required super.entityType, + required super.name, + required super.txId, + required super.unixTime, + required this.id, + required this.size, + required this.lastModifiedDate, + required this.parentFolderId, + this.contentType, + this.dataTxId, + this.pinnedDataOwnerAddress, + }); + + final String id; + final int size; + final String parentFolderId; + final DateTime lastModifiedDate; + final String? contentType; + final String? dataTxId; + final String? pinnedDataOwnerAddress; +} + +abstract class ARFSPrivateFileEntity extends ARFSFileEntity + implements PrivateARFSEntity { + ARFSPrivateFileEntity({ + required super.appName, + required super.appVersion, + required super.arFS, + required super.contentType, + required super.driveId, + required super.entityType, + required super.name, + required super.txId, + required super.unixTime, + required super.lastModifiedDate, + required super.parentFolderId, + required super.size, + required super.id, + super.pinnedDataOwnerAddress, + }); +} + +class _ARFSFileEntity extends ARFSFileEntity { + _ARFSFileEntity({ + required super.appName, + required super.appVersion, + required super.arFS, + required super.driveId, + required super.entityType, + required super.name, + required super.txId, + required super.unixTime, + required super.lastModifiedDate, + required super.parentFolderId, + required super.size, + required super.id, + required super.pinnedDataOwnerAddress, + }); +} + +class _ARFSDriveEntity extends ARFSDriveEntity { + _ARFSDriveEntity({ + required super.appName, + required super.appVersion, + required super.arFS, + required super.driveId, + required super.entityType, + required super.name, + required super.txId, + required super.unixTime, + required super.drivePrivacy, + required super.rootFolderId, + }); +} + +enum EntityType { file, folder, drive } + +enum DrivePrivacy { public, private } diff --git a/packages/arfs/pubspec.yaml b/packages/arfs/pubspec.yaml new file mode 100644 index 0000000000..35124bccbd --- /dev/null +++ b/packages/arfs/pubspec.yaml @@ -0,0 +1,57 @@ +name: arfs +description: A new Flutter package project. +version: 0.0.1 +homepage: +publish_to: none + +environment: + sdk: '>=3.0.2 <4.0.0' + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + ardrive_utils: + path: ../ardrive_utils + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^2.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # To add assets to your package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/assets-and-images/#from-packages + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware + + # To add custom fonts to your package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/arfs/test/arfs_test.dart b/packages/arfs/test/arfs_test.dart new file mode 100644 index 0000000000..ab73b3a234 --- /dev/null +++ b/packages/arfs/test/arfs_test.dart @@ -0,0 +1 @@ +void main() {} diff --git a/packages/build/.last_build_id b/packages/build/.last_build_id new file mode 100644 index 0000000000..953e56fce5 --- /dev/null +++ b/packages/build/.last_build_id @@ -0,0 +1 @@ +d4fe773e5af8aea054184ce4dc69442d \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index f6ea2ef2cb..cd0f3b4349 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: a742f71d7f3484253a623b30e19256aa4668ecbb3de6ad1beb0bcf8d4777ecd8 + sha256: d84d98f1992976775f83083523a34c5d22fea191eec3abb2bd09537fb623c2e0 url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.7" analyzer: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: "direct main" description: name: animations - sha256: fe8a6bdca435f718bb1dc8a11661b2c22504c6da40ef934cee8327ed77934164 + sha256: ef57563eed3620bd5d75ad96189846aca1e033c0c45fc9a7d26e80ab02b88a70 url: "https://pub.dev" source: hosted - version: "2.0.7" + version: "2.0.8" app_settings: dependency: "direct main" description: @@ -53,10 +53,24 @@ packages: dependency: "direct main" description: name: archive - sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + sha256: "06a96f1249f38a00435b3b0c9a3246d934d7dbc8183fc7c9e56989860edb99d4" url: "https://pub.dev" source: hosted - version: "3.3.7" + version: "3.4.4" + arconnect: + dependency: "direct main" + description: + path: "packages/arconnect" + relative: true + source: path + version: "0.0.1" + ardrive_crypto: + dependency: "direct main" + description: + path: "packages/ardrive_crypto" + relative: true + source: path + version: "0.0.1" ardrive_http: dependency: "direct main" description: @@ -70,11 +84,11 @@ packages: dependency: "direct main" description: path: "." - ref: PE-4417-export-logs - resolved-ref: "136d27ae8290ce771a264a068484276b7df68027" + ref: PE-3699-uploads-large-files-for-public-drives + resolved-ref: "5998dfddf3cf48aa8419b821e373727cb19ae0fa" url: "https://github.com/ar-io/ardrive_io.git" source: git - version: "1.3.0" + version: "1.4.0" ardrive_ui: dependency: "direct main" description: @@ -84,6 +98,27 @@ packages: url: "https://github.com/ar-io/ardrive_ui.git" source: git version: "1.12.0" + ardrive_uploader: + dependency: "direct main" + description: + path: "packages/ardrive_uploader" + relative: true + source: path + version: "1.0.0" + ardrive_utils: + dependency: "direct main" + description: + path: "packages/ardrive_utils" + relative: true + source: path + version: "0.0.1" + arfs: + dependency: transitive + description: + path: "packages/arfs" + relative: true + source: path + version: "0.0.1" args: dependency: transitive description: @@ -104,8 +139,8 @@ packages: dependency: "direct main" description: path: "." - ref: "v3.7.0" - resolved-ref: "6b85fcb4612cf95dc5331e1698a0c58699b2ece4" + ref: PE-3697 + resolved-ref: "30517c20669de213b8105273d3ec97005867bc90" url: "https://github.com/ardriveapp/arweave-dart.git" source: git version: "3.7.0" @@ -157,6 +192,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.2" + better_cryptography: + dependency: transitive + description: + name: better_cryptography + sha256: "67573ef169a3584710038f92e81b75c7790933af782a83ba8f71893496493de3" + url: "https://pub.dev" + source: hosted + version: "1.0.0+1" bip39: dependency: "direct main" description: @@ -185,10 +228,10 @@ packages: dependency: "direct dev" description: name: bloc_test - sha256: "43d5b2f3d09ba768d6b611151bdf20ca141ffb46e795eb9550a58c9c2f4eae3f" + sha256: af0de1a1e16a7536e95dcd7491e0a6d6078e11d2d691988e862280b74f5c7968 url: "https://pub.dev" source: hosted - version: "9.1.3" + version: "9.1.4" boolean_selector: dependency: transitive description: @@ -197,14 +240,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - buffer: - dependency: transitive - description: - name: buffer - sha256: "8962c12174f53e2e848a6acd7ac7fd63d8a1a6a316c20c458a832d87eba5422a" - url: "https://pub.dev" - source: hosted - version: "1.2.0" build: dependency: transitive description: @@ -233,10 +268,10 @@ packages: dependency: transitive description: name: build_resolvers - sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20" + sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.4.1" build_runner: dependency: "direct dev" description: @@ -249,10 +284,10 @@ packages: dependency: transitive description: name: build_runner_core - sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" + sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185 url: "https://pub.dev" source: hosted - version: "7.2.10" + version: "7.2.11" built_collection: dependency: transitive description: @@ -265,10 +300,10 @@ packages: dependency: transitive description: name: built_value - sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" + sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74 url: "https://pub.dev" source: hosted - version: "8.6.1" + version: "8.6.3" characters: dependency: transitive description: @@ -293,6 +328,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" + chunked_uploader: + dependency: "direct main" + description: + name: chunked_uploader + sha256: "0c2c36c28b4a2d597aeea99f8d3358fa14365997123ca220fd3b28aab9705add" + url: "https://pub.dev" + source: hosted + version: "1.1.0" cli_util: dependency: transitive description: @@ -313,26 +356,26 @@ packages: dependency: transitive description: name: code_builder - sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" + sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677" url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.7.0" collection: dependency: "direct main" description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" connectivity_plus: dependency: "direct main" description: name: connectivity_plus - sha256: "8599ae9edca5ff96163fca3e36f8e481ea917d1e71cdad912c084b5579913f34" + sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" connectivity_plus_platform_interface: dependency: transitive description: @@ -377,10 +420,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" + sha256: fd832b5384d0d6da4f6df60b854d33accaaeb63aa9e10e736a87381f08dee2cb url: "https://pub.dev" source: hosted - version: "0.3.3+4" + version: "0.3.3+5" crypto: dependency: transitive description: @@ -393,18 +436,18 @@ packages: dependency: "direct main" description: name: cryptography - sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35 + sha256: d146b76d33d94548cf035233fbc2f4338c1242fa119013bead807d033fc4ae05 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.7.0" csslib: dependency: transitive description: name: csslib - sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" url: "https://pub.dev" source: hosted - version: "0.17.3" + version: "1.0.0" csv: dependency: "direct main" description: @@ -433,18 +476,18 @@ packages: dependency: transitive description: name: desktop_drop - sha256: "4ca4d960f4b11c032e9adfd2a0a8ac615bc3fddb4cbe73dcf840dd8077582186" + sha256: d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.4.4" device_info_plus: - dependency: "direct main" + dependency: transitive description: name: device_info_plus - sha256: f52ab3b76b36ede4d135aab80194df8925b553686f0fa12226b4e2d658e45903 + sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659" url: "https://pub.dev" source: hosted - version: "8.2.2" + version: "9.0.3" device_info_plus_platform_interface: dependency: transitive description: @@ -462,13 +505,13 @@ packages: source: hosted version: "0.4.1" dio: - dependency: transitive + dependency: "direct main" description: name: dio - sha256: a9d76e72985d7087eb7c5e7903224ae52b337131518d127c554b9405936752b8 + sha256: "417e2a6f9d83ab396ec38ff4ea5da6c254da71e4db765ad737a42af6930140b7" url: "https://pub.dev" source: hosted - version: "5.2.1+1" + version: "5.3.3" dio_smart_retry: dependency: transitive description: @@ -481,26 +524,26 @@ packages: dependency: transitive description: name: dotted_border - sha256: "07a5c5e8d4e6e992279e190e0352be8faa5b8f96d81c77a78b2d42f060279840" + sha256: "108837e11848ca776c53b30bc870086f84b62ed6e01c503ed976e8f8c7df9c04" url: "https://pub.dev" source: hosted - version: "2.0.0+3" + version: "2.1.0" drift: dependency: "direct main" description: name: drift - sha256: a8ec4e44b4359ef44eab3d2c2f8e44b41a00c15673b879984484b34d27656ad5 + sha256: c66df5f88616f5b1fb8d83266738d4f3671c692b2aa680fd8fe53e57a4e149be url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.12.1" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: "2713aabc91d8e9cdf269b2ecfa503f103341925b07186e845de11a781015f7eb" + sha256: "8c9bb294a2f1a053f6d09890798ad5ac1fe436d527a4aa3254499105b7b93f96" url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.12.1" equatable: dependency: "direct main" description: @@ -509,14 +552,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.5" - executor: - dependency: transitive - description: - name: executor - sha256: "87d935b31b2bdf7fe2af0b77dd8ffe8864eaade25715e9c68bc49497e48c9851" - url: "https://pub.dev" - source: hosted - version: "2.2.3" fake_async: dependency: transitive description: @@ -525,14 +560,31 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + fetch_api: + dependency: transitive + description: + name: fetch_api + sha256: "7896632eda5af40c4459d673ad601df21d4c3ae6a45997e300a92ca63ec9fe4c" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + fetch_client: + dependency: "direct overridden" + description: + path: "." + ref: ignore-headers + resolved-ref: ba37ef6eaa291cdb36b4616c6fbec3c690bca728 + url: "https://github.com/karlprieb/fetch_client.git" + source: git + version: "1.0.2" ffi: dependency: transitive description: name: ffi - sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" file: dependency: transitive description: @@ -546,10 +598,10 @@ packages: description: path: "." ref: master - resolved-ref: a4902ec620ba28c484bf84a0cea4669f3d3698fe + resolved-ref: "688300aaeae4dce397252d403800c92ee9523e95" url: "https://github.com/ar-io/flutter_file_picker" source: git - version: "5.2.4" + version: "5.5.0" file_saver: dependency: transitive description: @@ -560,77 +612,85 @@ packages: source: git version: "0.1.1" file_selector: - dependency: "direct main" + dependency: transitive description: name: file_selector - sha256: "1d2fde93dddf634a9c3c0faa748169d7ac0d83757135555707e52f02c017ad4f" + sha256: "84eaf3e034d647859167d1f01cfe7b6352488f34c1b4932635012b202014c25b" url: "https://pub.dev" source: hosted - version: "0.9.5" + version: "1.0.1" file_selector_android: dependency: transitive description: name: file_selector_android - sha256: "59e694afad4609d689185a608958c85fbccb3e6feab12a6b8c95a2c0f90ad2f7" + sha256: d41e165d6f798ca941d536e5dc93494d50e78c571c28ad60cfe0b0fefeb9f1e7 url: "https://pub.dev" source: hosted - version: "0.5.0+1" + version: "0.5.0+3" file_selector_ios: dependency: transitive description: name: file_selector_ios - sha256: "54542b6b35e3ced6246df5fae13cf0b879d14669d0fdff1a53a098f16e23328b" + sha256: b3fbdda64aa2e335df6e111f6b0f1bb968402ed81d2dd1fa4274267999aa32c2 url: "https://pub.dev" source: hosted - version: "0.5.1+4" + version: "0.5.1+6" file_selector_linux: dependency: transitive description: name: file_selector_linux - sha256: "770eb1ab057b5ae4326d1c24cc57710758b9a46026349d021d6311bd27580046" + sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492" url: "https://pub.dev" source: hosted - version: "0.9.2" + version: "0.9.2+1" file_selector_macos: - dependency: "direct main" + dependency: transitive description: name: file_selector_macos - sha256: "7a6f1ae6107265664f3f7f89a66074882c4d506aef1441c9af313c1f7e6f41ce" + sha256: b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6 url: "https://pub.dev" source: hosted - version: "0.9.3" + version: "0.9.3+3" file_selector_platform_interface: dependency: transitive description: name: file_selector_platform_interface - sha256: "412705a646a0ae90f33f37acfae6a0f7cbc02222d6cd34e479421c3e74d3853c" + sha256: "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.6.1" file_selector_web: - dependency: "direct main" + dependency: transitive description: name: file_selector_web - sha256: e292740c469df0aeeaba0895bf622bea351a05e87d22864c826bf21c4780e1d7 + sha256: dc6622c4d66cb1bee623ddcc029036603c6cc45c85e4a775bb06008d61c809c1 url: "https://pub.dev" source: hosted - version: "0.9.2" + version: "0.9.2+1" file_selector_windows: dependency: transitive description: name: file_selector_windows - sha256: "1372760c6b389842b77156203308940558a2817360154084368608413835fc26" + sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0 + url: "https://pub.dev" + source: hosted + version: "0.9.3+1" + file_system_access_api: + dependency: transitive + description: + name: file_system_access_api + sha256: bcbf061ce180dffcceed9faefab513e87bff1eef38c3ed99cf7c3bbbc65a34e1 url: "https://pub.dev" source: hosted - version: "0.9.3" + version: "1.1.0" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: a4a99204da264a0aa9d54a332ea0315ce7b0768075139c77abefe98093dd98be + sha256: "95580fa07c8ca3072a2bb1fecd792616a33f8683477d25b7d29d3a6a399e6ece" url: "https://pub.dev" source: hosted - version: "2.14.0" + version: "2.17.0" firebase_core_platform_interface: dependency: transitive description: @@ -643,26 +703,26 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "0fd5c4b228de29b55fac38aed0d9e42514b3d3bd47675de52bf7f8fccaf922fa" + sha256: e8c408923cd3a25bd342c576a114f2126769cd1a57106a4edeaa67ea4a84e962 url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.8.0" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics - sha256: "398012cf7838f8a373a25da65dd62fc3a3f4abe4b5f886caa634952c3387dce3" + sha256: "833cf891d10e5e819a2034048ff7e8882bcc0b51055c0e17f5fe3f3c3c177a9d" url: "https://pub.dev" source: hosted - version: "3.3.3" + version: "3.3.7" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "39dfcc9a5ddfaa0588ad67f1016174dd9e19f6b31f592b8641bd559399567592" + sha256: dfdf1172f35fc0b0132bc5ec815aed52c07643ee56732e6807ca7dc12f7fce86 url: "https://pub.dev" source: hosted - version: "3.6.3" + version: "3.6.7" fixnum: dependency: transitive description: @@ -693,13 +753,13 @@ packages: source: hosted version: "3.3.1" flutter_downloader: - dependency: "direct overridden" + dependency: transitive description: name: flutter_downloader - sha256: ff5cb37482329018ba313f44cfa60aa68a779a70ecaa731a40d931d73b49acf2 + sha256: bc13eb52ce81822a94f107b2ea0541b0e28be350f0c064dfbb5c66e95d7791f4 url: "https://pub.dev" source: hosted - version: "1.10.3" + version: "1.11.3" flutter_driver: dependency: "direct dev" description: flutter @@ -736,10 +796,10 @@ packages: dependency: "direct main" description: name: flutter_email_sender - sha256: "52b713a67a966be4d9e6f68a323fc0a5bc2da71c567eb451af1aa90d30adbc3a" + sha256: "5001e9158f91a8799140fb30a11ad89cd587244f30b4f848d87085985c49b60f" url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.0.2" flutter_hooks: dependency: "direct main" description: @@ -760,10 +820,10 @@ packages: dependency: "direct main" description: name: flutter_lints - sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" flutter_localizations: dependency: "direct main" description: flutter @@ -773,18 +833,18 @@ packages: dependency: "direct main" description: name: flutter_multi_formatter - sha256: acbedc870b835d332b5abe97773725b2cbb614580e4a442bac36cfa80940b5bb + sha256: "71232e0ff3e24e94a94b5e01aaca8476a2d0c27ffe8bde16127f5e7c17f8e96f" url: "https://pub.dev" source: hosted - version: "2.11.2" + version: "2.11.11" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" + sha256: f185ac890306b5779ecbd611f52502d8d4d63d27703ef73161ca0407e815f02c url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.0.16" flutter_portal: dependency: "direct main" description: @@ -797,50 +857,50 @@ packages: dependency: "direct main" description: name: flutter_secure_storage - sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" + sha256: "22dbf16f23a4bcf9d35e51be1c84ad5bb6f627750565edd70dab70f3ff5fff8f" url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "8.1.0" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux - sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3" + sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.2.0" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos - sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50" + sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" flutter_secure_storage_platform_interface: dependency: transitive description: name: flutter_secure_storage_platform_interface - sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b + sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" flutter_secure_storage_web: dependency: transitive description: name: flutter_secure_storage_web - sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe" + sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" flutter_secure_storage_windows: dependency: transitive description: name: flutter_secure_storage_windows - sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee + sha256: "38f9501c7cb6f38961ef0e1eacacee2b2d4715c63cc83fe56449c4d3d0b47255" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.1" flutter_stripe: dependency: "direct main" description: @@ -885,6 +945,14 @@ packages: description: flutter source: sdk version: "0.0.0" + fpdart: + dependency: transitive + description: + name: fpdart + sha256: "7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9" + url: "https://pub.dev" + source: hosted + version: "1.1.0" freezed_annotation: dependency: transitive description: @@ -998,18 +1066,10 @@ packages: dependency: "direct main" description: name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "0.13.6" - http_client: - dependency: "direct main" - description: - name: http_client - sha256: "9e6e1cf0064d78da50754d7b7f8d342a55eea9790d029594073087b2e5d38012" - url: "https://pub.dev" - source: hosted - version: "1.5.2" + version: "1.1.0" http_methods: dependency: transitive description: @@ -1046,66 +1106,66 @@ packages: dependency: transitive description: name: image_picker - sha256: b6951e25b795d053a6ba03af5f710069c99349de9341af95155d52665cb4607c + sha256: "7d7f2768df2a8b0a3cefa5ef4f84636121987d403130e70b17ef7e2cf650ba84" url: "https://pub.dev" source: hosted - version: "0.8.9" + version: "1.0.4" image_picker_android: dependency: transitive description: name: image_picker_android - sha256: d2bab152deb2547ea6f53d82ebca9b7e77386bb706e5789e815d37e08ea475bb + sha256: "0c7b83bbe2980c8a8e36e974f055e11e51675784e13a4762889feed0f3937ff2" url: "https://pub.dev" source: hosted - version: "0.8.7+3" + version: "0.8.8+1" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0" + sha256: "50bc9ae6a77eea3a8b11af5eb6c661eeb858fdd2f734c2a4fd17086922347ef7" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "3.0.1" image_picker_ios: dependency: transitive description: name: image_picker_ios - sha256: b3e2f21feb28b24dd73a35d7ad6e83f568337c70afab5eabac876e23803f264b + sha256: c5538cacefacac733c724be7484377923b476216ad1ead35a0d2eadcdc0fc497 url: "https://pub.dev" source: hosted - version: "0.8.8" + version: "0.8.8+2" image_picker_linux: dependency: transitive description: name: image_picker_linux - sha256: "02cbc21fe1706b97942b575966e5fbbeaac535e76deef70d3a242e4afb857831" + sha256: "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa" url: "https://pub.dev" source: hosted - version: "0.2.1" + version: "0.2.1+1" image_picker_macos: dependency: transitive description: name: image_picker_macos - sha256: cee2aa86c56780c13af2c77b5f2f72973464db204569e1ba2dd744459a065af4 + sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62" url: "https://pub.dev" source: hosted - version: "0.2.1" + version: "0.2.1+1" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - sha256: "7c7b96bb9413a9c28229e717e6fd1e3edd1cc5569c1778fcca060ecf729b65ee" + sha256: ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514 url: "https://pub.dev" source: hosted - version: "2.8.0" + version: "2.9.1" image_picker_windows: dependency: transitive description: name: image_picker_windows - sha256: c3066601ea42113922232c7b7b3330a2d86f029f685bba99d82c30e799914952 + sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb" url: "https://pub.dev" source: hosted - version: "0.2.1" + version: "0.2.1+1" integration_test: dependency: "direct dev" description: flutter @@ -1123,10 +1183,10 @@ packages: dependency: "direct main" description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -1155,10 +1215,10 @@ packages: dependency: transitive description: name: jovial_svg - sha256: "5365abf2f021da99dba3eb391f495509561de077a3893ae55e76233775790370" + sha256: "5fd52a96fe3d2b69082c53374364649f51cb1b3e06ca6be3601ed8cae537bc7b" url: "https://pub.dev" source: hosted - version: "1.1.14" + version: "1.1.17" js: dependency: "direct main" description: @@ -1227,42 +1287,42 @@ packages: dependency: "direct main" description: name: local_auth - sha256: "0cf238be2bfa51a6c9e7e9cfc11c05ea39f2a3a4d3e5bb255d0ebc917da24401" + sha256: "7e6c63082e399b61e4af71266b012e767a5d4525dd6e9ba41e174fd42d76e115" url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.7" local_auth_android: dependency: transitive description: name: local_auth_android - sha256: "36a78898198386d36d4e152b8cb46059b18f0e2017f813a0e833e216199f8950" + sha256: "9ad0b1ffa6f04f4d91e38c2d4c5046583e23f4cae8345776a994e8670df57fb1" url: "https://pub.dev" source: hosted - version: "1.0.32" + version: "1.0.34" local_auth_ios: dependency: transitive description: name: local_auth_ios - sha256: edc2977c5145492f3451db9507a2f2f284ee4f408950b3e16670838726761940 + sha256: "26a8d1ad0b4ef6f861d29921be8383000fda952e323a5b6752cf82ca9cf9a7a9" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.1.4" local_auth_platform_interface: dependency: transitive description: name: local_auth_platform_interface - sha256: "9e160d59ef0743e35f1b50f4fb84dc64f55676b1b8071e319ef35e7f3bc13367" + sha256: fc5bd537970a324260fda506cfb61b33ad7426f37a8ea5c461cf612161ebba54 url: "https://pub.dev" source: hosted - version: "1.0.7" + version: "1.0.8" local_auth_windows: dependency: transitive description: name: local_auth_windows - sha256: "5af808e108c445d0cf702a8c5f8242f1363b7970320334f82e6e1e8ad0b0d7d4" + sha256: "505ba3367ca781efb1c50d3132e44a2446bccc4163427bc203b9b4d8994d97ea" url: "https://pub.dev" source: hosted - version: "1.0.9" + version: "1.0.10" logging: dependency: transitive description: @@ -1275,26 +1335,26 @@ packages: dependency: "direct main" description: name: lottie - sha256: f461105d3a35887b27089abf9c292334478dd292f7b47ecdccb6ae5c37a22c80 + sha256: b8bdd54b488c54068c57d41ae85d02808da09e2bee8b8dd1f59f441e7efa60cd url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.6.0" matcher: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -1363,10 +1423,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745" + sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "4.1.0" package_info_plus_platform_interface: dependency: transitive description: @@ -1403,50 +1463,50 @@ packages: dependency: "direct main" description: name: path_provider - sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.1.1" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86" + sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" url: "https://pub.dev" source: hosted - version: "2.0.27" + version: "2.2.0" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3" + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.11" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.1" percent_indicator: dependency: "direct main" description: @@ -1459,18 +1519,18 @@ packages: dependency: transitive description: name: permission_handler - sha256: "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81" + sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" url: "https://pub.dev" source: hosted - version: "10.4.3" + version: "11.0.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: c0c9754479a4c4b1c1f3862ddc11930c9b3f03bef2816bb4ea6eed1e13551d6f + sha256: ace7d15a3d1a4a0b91c041d01e5405df221edb9de9116525efc773c74e6fc790 url: "https://pub.dev" source: hosted - version: "10.3.2" + version: "11.0.5" permission_handler_apple: dependency: transitive description: @@ -1483,10 +1543,10 @@ packages: dependency: transitive description: name: permission_handler_platform_interface - sha256: "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9" + sha256: f2343e9fa9c22ae4fd92d4732755bfe452214e7189afcc097380950cf567b4b2 url: "https://pub.dev" source: hosted - version: "3.11.3" + version: "3.11.5" permission_handler_windows: dependency: transitive description: @@ -1515,10 +1575,10 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.6" pointycastle: dependency: transitive description: @@ -1619,10 +1679,10 @@ packages: dependency: "direct main" description: name: share_plus - sha256: b1f15232d41e9701ab2f04181f21610c36c83a12ae426b79b4bd011c567934b1 + sha256: "6cec740fa0943a826951223e76218df002804adb588235a8910dc3d6b0654e11" url: "https://pub.dev" source: hosted - version: "6.3.4" + version: "7.1.0" share_plus_platform_interface: dependency: transitive description: @@ -1635,58 +1695,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1" + sha256: b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076 + sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: b046999bf0ff58f04c364491bb803dcfa8f42e47b19c75478f53d323684a8cc1 + sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.4" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1" + sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1" + sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d + sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" shelf: dependency: transitive description: @@ -1768,50 +1828,50 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: transitive description: name: sqflite - sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9 + sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a" url: "https://pub.dev" source: hosted - version: "2.2.8+4" + version: "2.3.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f" + sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a" url: "https://pub.dev" source: hosted - version: "2.4.5+1" + version: "2.5.0" sqlite3: dependency: transitive description: name: sqlite3 - sha256: f7511ddd6a2dda8ded9d849f8a925bb6020e0faa59db2443debc18d484e59401 + sha256: db65233e6b99e99b2548932f55a987961bc06d82a31a0665451fa0b4fff4c3fb url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" sqlite3_flutter_libs: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: "1e20a88d5c7ae8400e009f38ddbe8b001800a6dffa37832481a86a219bc904c7" + sha256: "11a41f380fbcbda5bbba03ddcdbe0545e46094ab043783c46c70e8335831df03" url: "https://pub.dev" source: hosted - version: "0.5.15" + version: "0.5.17" sqlparser: dependency: transitive description: name: sqlparser - sha256: "9611f46d30a4e8286e54d17a1b5182d132512dc6fc3da90c45ad8ec2828a58b1" + sha256: d0a6c3ad33d530da1b1306edb33d9948a0d4bf1ce0681a3587bbe47e86d1c82b url: "https://pub.dev" source: hosted - version: "0.30.3" + version: "0.31.3" stack_trace: dependency: transitive description: @@ -1872,18 +1932,18 @@ packages: dependency: transitive description: name: stripe_android - sha256: e5557f2a81cb5070d48edf33168ca3891a22c63f0be98d90edeba54c4328dd21 + sha256: "188858dab6cc38c2924457766e365980d80fe807109730bc2928f2376870c619" url: "https://pub.dev" source: hosted - version: "9.2.1" + version: "9.4.0" stripe_ios: dependency: transitive description: name: stripe_ios - sha256: e397609a5083b79706814342b40a2a58f1b97ecab2b9d6cae8d8e9f59646fc8c + sha256: ddcf87cacf3a6fa482568d099332bae69326acfab51a726af9faa31a8ef30af8 url: "https://pub.dev" source: hosted - version: "9.2.1" + version: "9.4.1" stripe_js: dependency: "direct overridden" description: @@ -1918,6 +1978,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.0" + system_info_plus: + dependency: transitive + description: + name: system_info_plus + sha256: b915c811c6605b802f3988859bc2bb79c95f735762a75b5451741f7a2b949d1b + url: "https://pub.dev" + source: hosted + version: "0.0.5" term_glyph: dependency: transitive description: @@ -1930,26 +1998,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4" + sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" url: "https://pub.dev" source: hosted - version: "1.24.1" + version: "1.24.3" test_api: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" test_core: dependency: transitive description: name: test_core - sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93" + sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.5.3" timeago: dependency: "direct main" description: @@ -1986,10 +2054,10 @@ packages: dependency: "direct main" description: name: universal_html - sha256: a5cc5a84188e5d3e58f3ed77fe3dd4575dc1f68aa7c89e51b5b4105b9aab3b9d + sha256: "56536254004e24d9d8cfdb7dbbf09b74cf8df96729f38a2f5c238163e3d58971" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.4" universal_io: dependency: transitive description: @@ -2002,66 +2070,66 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e" + sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27" url: "https://pub.dev" source: hosted - version: "6.1.12" + version: "6.1.14" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "15f5acbf0dce90146a0f5a2c4a002b1814a6303c4c5c075aa2623b2d16156f03" + sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330 url: "https://pub.dev" source: hosted - version: "6.0.36" + version: "6.1.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" + sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "6.1.5" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" + sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e" + sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.7" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea + sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.5" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 + sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5" url: "https://pub.dev" source: hosted - version: "2.0.18" + version: "2.0.20" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" + sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069" url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "3.0.8" uuid: dependency: "direct main" description: @@ -2090,34 +2158,34 @@ packages: dependency: transitive description: name: video_player_android - sha256: f338a5a396c845f4632959511cad3542cdf3167e1b2a1a948ef07f7123c03608 + sha256: "3fe89ab07fdbce786e7eb25b58532d6eaf189ceddc091cb66cba712f8d9e8e55" url: "https://pub.dev" source: hosted - version: "2.4.9" + version: "2.4.10" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - sha256: "4c274e439f349a0ee5cb3c42978393ede173a443b98f50de6ffe6900eaa19216" + sha256: "6387c2de77763b45104256b3b00b660089be4f909ded8631457dc11bf635e38f" url: "https://pub.dev" source: hosted - version: "2.4.6" + version: "2.5.0" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface - sha256: a8c4dcae2a7a6e7cc1d7f9808294d968eca1993af34a98e95b9bdfa959bec684 + sha256: be72301bf2c0150ab35a8c34d66e5a99de525f6de1e8d27c0672b836fe48f73a url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.1" video_player_web: dependency: transitive description: name: video_player_web - sha256: "44ce41424d104dfb7cf6982cc6b84af2b007a24d126406025bf40de5d481c74c" + sha256: "2dd24f7ba46bfb5d070e9c795001db95e0ca5f2a3d025e98f287c10c9f0fd62f" url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.1.1" visibility_detector: dependency: "direct main" description: @@ -2130,10 +2198,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe + sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f url: "https://pub.dev" source: hosted - version: "11.3.0" + version: "11.7.1" watcher: dependency: transitive description: @@ -2142,6 +2210,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -2150,6 +2226,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.0" + webcrypto: + dependency: transitive + description: + name: webcrypto + sha256: a3cc45ce5efa053435505a958d32785f7497a684a859e6910d805ddf094f903f + url: "https://pub.dev" + source: hosted + version: "0.5.3" webdriver: dependency: transitive description: @@ -2162,26 +2246,34 @@ packages: dependency: transitive description: name: webkit_inspection_protocol - sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d" + sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" win32: dependency: transitive description: name: win32 - sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4 + sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + url: "https://pub.dev" + source: hosted + version: "5.0.9" + win32_registry: + dependency: transitive + description: + name: win32_registry + sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "1.1.2" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.3" xml: dependency: transitive description: @@ -2199,5 +2291,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/pubspec.yaml b/pubspec.yaml index 5d090ecc76..c2833596ad 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,8 +6,8 @@ publish_to: 'none' version: 2.20.0 environment: - sdk: '>=2.18.5 <3.0.0' - flutter: 3.10.0 + sdk: '>=3.0.2 <4.0.0' + flutter: 3.10.2 # https://pub.dev/packages/script_runner script_runner: @@ -40,16 +40,21 @@ dependencies: git: url: https://github.com/ar-io/ardrive_ui.git ref: v1.12.0 + ardrive_utils: + path: ./packages/ardrive_utils + ardrive_uploader: + path: ./packages/ardrive_uploader + arconnect: + path: ./packages/arconnect + ardrive_crypto: + path: ./packages/ardrive_crypto artemis: ^7.0.0-beta.13 arweave: git: url: https://github.com/ardriveapp/arweave-dart.git - ref: v3.7.0 + ref: PE-3697 cryptography: ^2.0.5 flutter_bloc: ^8.1.1 - file_selector: ^0.9.0 - file_selector_web: ^0.9.0 - file_selector_macos: ^0.9.0 intersperse: ^2.0.0 intl: ^0.18.0 json_annotation: ^4.8.0 @@ -61,14 +66,13 @@ dependencies: timeago: ^3.1.0 url_launcher: ^6.0.6 uuid: ^3.0.4 - http_client: ^1.5.1 flutter_dropzone: git: url: https://github.com/ar-io/flutter_dropzone ref: master path: flutter_dropzone responsive_builder: ^0.7.0 - package_info_plus: ^3.1.2 + package_info_plus: ^4.1.0 js: ^0.6.3 collection: ^1.15.0-nullsafety.4 csv: ^5.0.1 @@ -79,7 +83,7 @@ dependencies: shared_preferences: ^2.0.15 flutter_launcher_icons: ^0.10.0 equatable: ^2.0.3 - http: ^0.13.5 + http: ^1.1.0 stash: ^4.3.2 path: ^1.8.1 flutter_svg: ^1.1.3 @@ -89,7 +93,6 @@ dependencies: firebase_core: ^2.1.1 bloc_concurrency: ^0.2.0 universal_html: ^2.0.8 - device_info_plus: ^8.2.2 local_auth: ^2.1.2 flutter_secure_storage: ^8.0.0 async: ^2.9.0 @@ -116,8 +119,10 @@ dependencies: flutter_multi_formatter: ^2.11.1 credit_card_validator: ^2.1.0 tuple: ^2.0.2 - share_plus: ^6.3.4 + share_plus: ^7.0.1 flutter_email_sender: ^6.0.1 + chunked_uploader: ^1.1.0 + dio: ^5.3.2 provider: ^6.0.5 just_audio: ^0.9.34 synchronized: ^3.1.0 @@ -126,8 +131,11 @@ dependency_overrides: ardrive_io: git: url: https://github.com/ar-io/ardrive_io.git - ref: PE-4417-export-logs - flutter_downloader: 1.10.3 + ref: PE-3699-uploads-large-files-for-public-drives + arweave: + git: + url: https://github.com/ardriveapp/arweave-dart.git + ref: PE-3697 stripe_js: git: url: https://github.com/ardriveapp/flutter_stripe/ @@ -138,6 +146,11 @@ dependency_overrides: url: https://github.com/ardriveapp/flutter_stripe/ path: packages/stripe_platform_interface ref: main + fetch_client: + git: + url: https://github.com/karlprieb/fetch_client.git + ref: ignore-headers + http: ^1.1.0 dev_dependencies: integration_test: diff --git a/test/blocs/drive_attach_cubit_test.dart b/test/blocs/drive_attach_cubit_test.dart index c87afc09dc..2fb1bef909 100644 --- a/test/blocs/drive_attach_cubit_test.dart +++ b/test/blocs/drive_attach_cubit_test.dart @@ -5,6 +5,7 @@ import 'package:ardrive/blocs/blocs.dart'; import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/utils.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:cryptography/cryptography.dart'; @@ -57,9 +58,9 @@ void main() { DriveEntity( id: validDriveId, name: validDriveName, - privacy: DrivePrivacy.public, + privacy: DrivePrivacyTag.public, rootFolderId: validRootFolderId, - authMode: DriveAuthMode.none, + authMode: DriveAuthModeTag.none, )..ownerAddress = ownerAddress, ), ); @@ -72,9 +73,9 @@ void main() { DriveEntity( id: validPrivateDriveId, name: validDriveName, - privacy: DrivePrivacy.private, + privacy: DrivePrivacyTag.private, rootFolderId: validRootFolderId, - authMode: DriveAuthMode.password, + authMode: DriveAuthModeTag.password, )..ownerAddress = ownerAddress, ), ); @@ -85,9 +86,9 @@ void main() { when(() => arweave.getLatestDriveEntityWithId(notFoundDriveId)) .thenAnswer((_) => Future.value(null)); when(() => arweave.getDrivePrivacyForId(validDriveId)) - .thenAnswer((_) => Future.value(DrivePrivacy.public)); + .thenAnswer((_) => Future.value(DrivePrivacyTag.public)); when(() => arweave.getDrivePrivacyForId(validPrivateDriveId)) - .thenAnswer((_) => Future.value(DrivePrivacy.private)); + .thenAnswer((_) => Future.value(DrivePrivacyTag.private)); when(() => syncBloc.startSync()).thenAnswer((_) => Future.value(null)); diff --git a/test/blocs/drive_create_cubit_test.dart b/test/blocs/drive_create_cubit_test.dart index 8ff7e10435..5b39179bcb 100644 --- a/test/blocs/drive_create_cubit_test.dart +++ b/test/blocs/drive_create_cubit_test.dart @@ -2,11 +2,11 @@ import 'package:ardrive/blocs/blocs.dart'; import 'package:ardrive/core/arfs/entities/arfs_entities.dart'; -import 'package:ardrive/entities/entity.dart'; +import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/turbo/services/upload_service.dart'; -import 'package:ardrive/utils/app_platform.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:cryptography/cryptography.dart'; @@ -145,6 +145,52 @@ void main() { verify: (_) {}, ); + tearDown(() async { + await db.close(); + }); + + blocTest( + 'create public drive', + build: () => driveCreateCubit, + act: (bloc) async { + bloc.form.value = { + 'name': validDriveName, + 'privacy': DrivePrivacyTag.public, + }; + await bloc.submit(''); + }, + expect: () => [ + const DriveCreateInProgress( + privacy: DrivePrivacy.public, + ), + const DriveCreateSuccess( + privacy: DrivePrivacy.public, + ), + ], + verify: (_) {}, + ); + + blocTest( + 'create private drive', + build: () => driveCreateCubit, + act: (bloc) async { + bloc.form.value = { + 'name': validDriveName, + 'privacy': DrivePrivacyTag.private, + }; + + bloc.onPrivacyChanged(); + + await bloc.submit(''); + }, + expect: () => [ + const DriveCreateInProgress(privacy: DrivePrivacy.public), + const DriveCreateInProgress(privacy: DrivePrivacy.private), + const DriveCreateSuccess(privacy: DrivePrivacy.private), + ], + verify: (_) {}, + ); + blocTest( 'does nothing when submitted without valid form', build: () => driveCreateCubit, diff --git a/test/blocs/fs_entry_move_bloc_test.dart b/test/blocs/fs_entry_move_bloc_test.dart index c1080bb66b..6a7934b287 100644 --- a/test/blocs/fs_entry_move_bloc_test.dart +++ b/test/blocs/fs_entry_move_bloc_test.dart @@ -4,7 +4,7 @@ import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/turbo/services/upload_service.dart'; -import 'package:ardrive/utils/app_platform.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:cryptography/cryptography.dart'; @@ -59,7 +59,7 @@ void main() { rootFolderId: rootFolderId, ownerAddress: 'fake-owner-address', name: 'fake-drive-name', - privacy: DrivePrivacy.public, + privacy: DrivePrivacyTag.public, ), ); // Create fake root folder for drive and sub folders diff --git a/test/blocs/personal_file_download_cubit_test.dart b/test/blocs/personal_file_download_cubit_test.dart index 0b73109926..e6d61a2e69 100644 --- a/test/blocs/personal_file_download_cubit_test.dart +++ b/test/blocs/personal_file_download_cubit_test.dart @@ -1,599 +1,601 @@ -import 'package:ardrive/blocs/file_download/file_download_cubit.dart'; -import 'package:ardrive/core/arfs/entities/arfs_entities.dart'; -import 'package:ardrive/core/arfs/repository/arfs_repository.dart'; -import 'package:ardrive/core/crypto/crypto.dart'; -import 'package:ardrive/core/download_service.dart'; -import 'package:ardrive/models/daos/daos.dart'; -import 'package:ardrive/services/arweave/arweave.dart'; -import 'package:ardrive/utils/app_platform.dart'; -import 'package:ardrive/utils/data_size.dart'; -import 'package:ardrive_io/ardrive_io.dart'; -import 'package:arweave/arweave.dart'; -import 'package:bloc_test/bloc_test.dart'; -import 'package:cryptography/cryptography.dart'; -import 'package:drift/drift.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:mocktail/mocktail.dart'; - -import '../test_utils/mocks.dart'; - -Stream mockDownloadProgress() async* { - yield 100; -} - -Stream mockDownloadInProgress() { - return Stream.periodic(const Duration(seconds: 1), (c) => c + 1).take(5); -} - -// TODO(@thiagocarvalhodev): Implemente tests related to ArDriveDownloader -void main() { - late ProfileFileDownloadCubit profileFileDownloadCubit; - late DriveDao mockDriveDao; - late ArweaveService mockArweaveService; - late ArDriveDownloader mockArDriveDownloader; - late ArDriveCrypto mockCrypto; - late DownloadService mockDownloadService; - late ARFSRepository mockARFSRepository; - - MockARFSFile testFile = createMockFile(size: const MiB(2).size); - - MockARFSFile testFileAboveLimit = createMockFile(size: const MiB(301).size); - - MockARFSFile testFileUnderPrivateLimitAndAboveWarningLimit = - createMockFile(size: const MiB(201).size); - - MockARFSDrive mockDrivePrivate = - createMockDrive(drivePrivacy: DrivePrivacy.private); - - MockARFSDrive mockDrivePublic = - createMockDrive(drivePrivacy: DrivePrivacy.public); - - setUpAll(() { - registerFallbackValue(SecretKey([])); - registerFallbackValue(MockTransactionCommonMixin()); - registerFallbackValue(Uint8List(100)); - registerFallbackValue(mockDrivePrivate); - registerFallbackValue(mockDrivePublic); - registerFallbackValue(testFile); - registerFallbackValue(mockDownloadProgress()); - registerFallbackValue(mockDownloadInProgress()); - }); - - setUp(() { - mockDriveDao = MockDriveDao(); - mockArweaveService = MockArweaveService(); - mockArDriveDownloader = MockArDriveDownloader(); - mockCrypto = MockArDriveCrypto(); - mockDownloadService = MockDownloadService(); - mockARFSRepository = MockARFSRepository(); - }); - - group('Testing isFileAboveLimit method', () { - setUp(() { - profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ); - }); - test('should return false', () { - expect( - profileFileDownloadCubit.isSizeAbovePrivateLimit(const MiB(1).size), - false); - }); - test('should return false', () { - expect( - profileFileDownloadCubit.isSizeAbovePrivateLimit(const MiB(299).size), - false); - }); - - test('should return true', () { - expect( - profileFileDownloadCubit.isSizeAbovePrivateLimit(const MiB(300).size), - false); - }); - - test('should return true', () { - expect( - profileFileDownloadCubit.isSizeAbovePrivateLimit(const MiB(301).size), - true); - }); - - test('should return true', () { - expect( - profileFileDownloadCubit.isSizeAbovePrivateLimit(const GiB(1).size), - true); - }); - }); - - group('Testing download method', () { - setUp(() { - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePrivate); - when(() => mockDownloadService.download(any(), any())) - .thenAnswer((invocation) => Future.value(Uint8List(100))); - when(() => mockDriveDao.getFileKey(any(), any())) - .thenAnswer((invocation) => Future.value(SecretKey([]))); - when(() => mockDriveDao.getDriveKey(any(), any())) - .thenAnswer((invocation) => Future.value(SecretKey([]))); - when(() => mockArweaveService.getTransactionDetails(any())).thenAnswer( - (invocation) => Future.value(MockTransactionCommonMixin())); - when(() => mockCrypto.decryptTransactionData(any(), any(), any())) - .thenAnswer((invocation) => Future.value(Uint8List(100))); - }); - blocTest( - 'should download a private file', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - FileDownloadInProgress( - fileName: testFile.name, - totalByteCount: testFile.size, - ), - FileDownloadSuccess( - bytes: Uint8List(100), - fileName: testFile.name, - mimeType: testFile.contentType, - lastModified: testFile.lastModifiedDate, - ), - ], - ); - - blocTest( - 'should download a public file', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePublic); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - verify: (bloc) { - /// public files should not call these functions - verifyNever(() => mockDriveDao.getFileKey(any(), any())); - verifyNever(() => mockDriveDao.getDriveKey(any(), any())); - verifyNever( - () => mockCrypto.decryptTransactionData(any(), any(), any())); - }, - expect: () => [ - FileDownloadInProgress( - fileName: testFile.name, - totalByteCount: testFile.size, - ), - FileDownloadSuccess( - bytes: Uint8List(100), - fileName: testFile.name, - mimeType: testFile.contentType, - lastModified: testFile.lastModifiedDate, - ), - ], - ); - - blocTest( - 'should download with success a PRIVATE file above limit if the platform is not mobile', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFileAboveLimit, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Web); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePrivate); - }, - act: (bloc) async { - await profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - FileDownloadInProgress( - fileName: testFileAboveLimit.name, - totalByteCount: testFileAboveLimit.size, - ), - FileDownloadSuccess( - bytes: Uint8List(100), - fileName: testFileAboveLimit.name, - mimeType: testFileAboveLimit.contentType, - lastModified: testFileAboveLimit.lastModifiedDate, - ), - ], - ); - - blocTest( - 'should emit a FileDownloadFailure with fileAboveLimit reason when mobile', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFileAboveLimit, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Android); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePrivate); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - const FileDownloadFailure( - FileDownloadFailureReason.fileAboveLimit, - ), - ], - ); - - /// File is under private limits - /// File is above the warning limit - blocTest( - 'should emit a FileDownloadWarning', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFileUnderPrivateLimitAndAboveWarningLimit, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Android); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePrivate); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - const FileDownloadWarning(), - ], - ); - - blocTest( - 'should download a PUBLIC file with size above PRIVATE limit', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFileAboveLimit, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Web); - - /// Using a public drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePublic); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - FileDownloadInProgress( - fileName: testFileAboveLimit.name, - totalByteCount: testFileAboveLimit.size, - ), - FileDownloadSuccess( - bytes: Uint8List(100), - fileName: testFileAboveLimit.name, - mimeType: testFileAboveLimit.contentType, - lastModified: testFileAboveLimit.lastModifiedDate, - ), - ], - verify: (bloc) { - /// public files should not call these functions - verifyNever(() => mockDriveDao.getFileKey(any(), any())); - verifyNever(() => mockDriveDao.getDriveKey(any(), any())); - verifyNever( - () => mockCrypto.decryptTransactionData(any(), any(), any())); - }, - ); - - blocTest( - 'should emit a FileDownloadFailure with unknown reason when DownloadService throws', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Web); - - /// Using a public drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePublic); - when(() => mockDownloadService.download(any(), any())) - .thenThrow((invocation) => Exception()); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - FileDownloadInProgress( - fileName: testFile.name, - totalByteCount: testFile.size, - ), - const FileDownloadFailure(FileDownloadFailureReason.unknownError), - ], - verify: (bloc) { - /// public files should not call these functions - verifyNever(() => mockDriveDao.getFileKey(any(), any())); - verifyNever(() => mockDriveDao.getDriveKey(any(), any())); - verifyNever( - () => mockCrypto.decryptTransactionData(any(), any(), any())); - }, - ); - - blocTest( - 'should emit a FileDownloadFailure with unknown reason when Decrypt throws', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Web); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePrivate); - when(() => mockCrypto.decryptTransactionData(any(), any(), any())) - .thenThrow((invocation) => Exception()); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - FileDownloadInProgress( - fileName: testFile.name, - totalByteCount: testFile.size, - ), - const FileDownloadFailure(FileDownloadFailureReason.unknownError), - ], - ); - - blocTest( - 'should emit a FileDownloadFailure with unknown reason when Decrypt throws', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Web); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePrivate); - when(() => mockCrypto.decryptTransactionData(any(), any(), any())) - .thenThrow((invocation) => Exception()); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - FileDownloadInProgress( - fileName: testFile.name, - totalByteCount: testFile.size, - ), - const FileDownloadFailure(FileDownloadFailureReason.unknownError), - ], - ); - }); - - group('Testing download method mocking platform to mobile', () { - group('Testing download method mocking platform to mobile', () { - blocTest( - 'should emit a FileDownloadWithProgress and FileDownloadFinishedWithSuccess when iOS', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.iOS); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePublic); - when(() => mockArDriveDownloader.downloadFile(any(), any())) - .thenAnswer((i) => mockDownloadProgress()); - when(() => mockArweaveService.client).thenReturn( - Arweave(gatewayUrl: Uri.parse('http://example.com'))); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - FileDownloadWithProgress( - fileName: testFile.name, - fileSize: testFile.size, - progress: 100, - ), - FileDownloadFinishedWithSuccess(fileName: testFile.name), - ], - verify: (bloc) { - /// public files on mobile should not call these functions - verifyNever(() => mockDownloadService.download(any(), any())); - verifyNever(() => mockDriveDao.getFileKey(any(), any())); - verifyNever(() => mockDriveDao.getDriveKey(any(), any())); - verifyNever( - () => mockCrypto.decryptTransactionData(any(), any(), any())); - }); - - blocTest( - 'should emit a FileDownloadWithProgress and FileDownloadFinishedWithSuccess when Android', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Android); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePublic); - when(() => mockArDriveDownloader.downloadFile(any(), any())) - .thenAnswer((i) => mockDownloadProgress()); - when(() => mockArweaveService.client).thenReturn( - Arweave(gatewayUrl: Uri.parse('http://example.com'))); - }, - act: (bloc) { - profileFileDownloadCubit.download(SecretKey([])); - }, - expect: () => [ - FileDownloadWithProgress( - fileName: testFile.name, - fileSize: testFile.size, - progress: 100, - ), - FileDownloadFinishedWithSuccess(fileName: testFile.name), - ], - verify: (bloc) { - /// public files on mobile should not call these functions - verifyNever(() => mockDownloadService.download(any(), any())); - verifyNever(() => mockDriveDao.getFileKey(any(), any())); - verifyNever(() => mockDriveDao.getDriveKey(any(), any())); - verifyNever( - () => mockCrypto.decryptTransactionData(any(), any(), any())); - }); - - blocTest( - 'should download a public file using DownloadService instead ArDriveDownloader when platform differnt from mobile', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Web); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePublic); - }, - verify: (bloc) { - /// public files on mobile should not call these functions - verifyNever(() => mockArDriveDownloader.downloadFile(any(), any())); - }); - }); - - blocTest( - 'should emit a FileDownloadAborted', - build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( - file: testFile, - driveDao: mockDriveDao, - arweave: mockArweaveService, - downloader: mockArDriveDownloader, - crypto: mockCrypto, - downloadService: mockDownloadService, - arfsRepository: mockARFSRepository, - ), - setUp: () { - AppPlatform.setMockPlatform(platform: SystemPlatform.Android); - - /// Using a private drive - when(() => mockARFSRepository.getDriveById(any())) - .thenAnswer((_) async => mockDrivePublic); - - /// This will emit a new progress for each seconds - /// so we have time to abort the download and check how much it - /// downloaded - when(() => mockArDriveDownloader.downloadFile(any(), any())) - .thenAnswer((i) => mockDownloadInProgress()); - when(() => mockArDriveDownloader.cancelDownload()) - .thenAnswer((i) async {}); - when(() => mockArweaveService.client) - .thenReturn(Arweave(gatewayUrl: Uri.parse('http://example.com'))); - }, - act: (bloc) async { - profileFileDownloadCubit.download(SecretKey([])); - await Future.delayed(const Duration(seconds: 3)); - await profileFileDownloadCubit.abortDownload(); - }, - expect: () => [ - FileDownloadWithProgress( - fileName: testFile.name, - fileSize: testFile.size, - progress: 1, - ), - FileDownloadWithProgress( - fileName: testFile.name, - fileSize: testFile.size, - progress: 2, - ), - FileDownloadAborted(), - ], - verify: (bloc) { - verifyNever(() => mockArDriveDownloader.cancelDownload()); - - /// public files on mobile should not call these functions - verifyNever(() => mockDownloadService.download(any(), any())); - verifyNever(() => mockDriveDao.getFileKey(any(), any())); - verifyNever(() => mockDriveDao.getDriveKey(any(), any())); - verifyNever( - () => mockCrypto.decryptTransactionData(any(), any(), any())); - }); - }); -} +// import 'package:ardrive/blocs/file_download/file_download_cubit.dart'; +// import 'package:ardrive/core/arfs/entities/arfs_entities.dart'; +// import 'package:ardrive/core/arfs/repository/arfs_repository.dart'; +// import 'package:ardrive/core/crypto/crypto.dart'; +// import 'package:ardrive/core/download_service.dart'; +// import 'package:ardrive/models/daos/daos.dart'; +// import 'package:ardrive/services/arweave/arweave.dart'; +// import 'package:ardrive/utils/data_size.dart'; +// import 'package:ardrive_io/ardrive_io.dart'; +// import 'package:ardrive_utils/ardrive_utils.dart'; +// import 'package:arweave/arweave.dart'; +// import 'package:bloc_test/bloc_test.dart'; +// import 'package:cryptography/cryptography.dart'; +// import 'package:drift/drift.dart'; +// import 'package:flutter_test/flutter_test.dart'; +// import 'package:mocktail/mocktail.dart'; + +// import '../test_utils/mocks.dart'; + +// Stream mockDownloadProgress() async* { +// yield 100; +// } + +// Stream mockDownloadInProgress() { +// return Stream.periodic(const Duration(seconds: 1), (c) => c + 1).take(5); +// } + +void main() {} + +// // TODO(@thiagocarvalhodev): Implemente tests related to ArDriveDownloader +// void main() { +// late ProfileFileDownloadCubit profileFileDownloadCubit; +// late DriveDao mockDriveDao; +// late ArweaveService mockArweaveService; +// late ArDriveMobileDownloader mockArDriveDownloader; +// late ArDriveCrypto mockCrypto; +// late DownloadService mockDownloadService; +// late ARFSRepository mockARFSRepository; + +// MockARFSFile testFile = createMockFile(size: const MiB(2).size); + +// MockARFSFile testFileAboveLimit = createMockFile(size: const MiB(301).size); + +// MockARFSFile testFileUnderPrivateLimitAndAboveWarningLimit = +// createMockFile(size: const MiB(201).size); + +// MockARFSDrive mockDrivePrivate = +// createMockDrive(drivePrivacy: DrivePrivacy.private); + +// MockARFSDrive mockDrivePublic = +// createMockDrive(drivePrivacy: DrivePrivacy.public); + +// setUpAll(() { +// registerFallbackValue(SecretKey([])); +// registerFallbackValue(MockTransactionCommonMixin()); +// registerFallbackValue(Uint8List(100)); +// registerFallbackValue(mockDrivePrivate); +// registerFallbackValue(mockDrivePublic); +// registerFallbackValue(testFile); +// registerFallbackValue(mockDownloadProgress()); +// registerFallbackValue(mockDownloadInProgress()); +// }); + +// setUp(() { +// mockDriveDao = MockDriveDao(); +// mockArweaveService = MockArweaveService(); +// mockArDriveDownloader = MockArDriveDownloader(); +// mockCrypto = MockArDriveCrypto(); +// mockDownloadService = MockDownloadService(); +// mockARFSRepository = MockARFSRepository(); +// }); + +// group('Testing isFileAboveLimit method', () { +// setUp(() { +// profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// arfsRepository: mockARFSRepository, +// arDriveDownloader: mockArDriveDownloader, +// ); +// }); +// test('should return false', () { +// expect( +// profileFileDownloadCubit.isSizeAbovePrivateLimit(const MiB(1).size), +// false); +// }); +// test('should return false', () { +// expect( +// profileFileDownloadCubit.isSizeAbovePrivateLimit(const MiB(299).size), +// false); +// }); + +// test('should return true', () { +// expect( +// profileFileDownloadCubit.isSizeAbovePrivateLimit(const MiB(300).size), +// false); +// }); + +// test('should return true', () { +// expect( +// profileFileDownloadCubit.isSizeAbovePrivateLimit(const MiB(301).size), +// true); +// }); + +// test('should return true', () { +// expect( +// profileFileDownloadCubit.isSizeAbovePrivateLimit(const GiB(1).size), +// true); +// }); +// }); + +// group('Testing download method', () { +// setUp(() { +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePrivate); +// when(() => mockDownloadService.download(any(), any())) +// .thenAnswer((invocation) => Future.value(Uint8List(100))); +// when(() => mockDriveDao.getFileKey(any(), any())) +// .thenAnswer((invocation) => Future.value(SecretKey([]))); +// when(() => mockDriveDao.getDriveKey(any(), any())) +// .thenAnswer((invocation) => Future.value(SecretKey([]))); +// when(() => mockArweaveService.getTransactionDetails(any())).thenAnswer( +// (invocation) => Future.value(MockTransactionCommonMixin())); +// when(() => mockCrypto.decryptDataFromTransaction(any(), any(), any())) +// .thenAnswer((invocation) => Future.value(Uint8List(100))); +// }); +// blocTest( +// 'should download a private file', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// FileDownloadInProgress( +// fileName: testFile.name, +// totalByteCount: testFile.size, +// ), +// FileDownloadSuccess( +// bytes: Uint8List(100), +// fileName: testFile.name, +// mimeType: testFile.contentType, +// lastModified: testFile.lastModifiedDate, +// ), +// ], +// ); + +// blocTest( +// 'should download a public file', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePublic); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// verify: (bloc) { +// /// public files should not call these functions +// verifyNever(() => mockDriveDao.getFileKey(any(), any())); +// verifyNever(() => mockDriveDao.getDriveKey(any(), any())); +// verifyNever( +// () => mockCrypto.decryptDataFromTransaction(any(), any(), any())); +// }, +// expect: () => [ +// FileDownloadInProgress( +// fileName: testFile.name, +// totalByteCount: testFile.size, +// ), +// FileDownloadSuccess( +// bytes: Uint8List(100), +// fileName: testFile.name, +// mimeType: testFile.contentType, +// lastModified: testFile.lastModifiedDate, +// ), +// ], +// ); + +// blocTest( +// 'should download with success a PRIVATE file above limit if the platform is not mobile', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFileAboveLimit, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Web); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePrivate); +// }, +// act: (bloc) async { +// await profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// FileDownloadInProgress( +// fileName: testFileAboveLimit.name, +// totalByteCount: testFileAboveLimit.size, +// ), +// FileDownloadSuccess( +// bytes: Uint8List(100), +// fileName: testFileAboveLimit.name, +// mimeType: testFileAboveLimit.contentType, +// lastModified: testFileAboveLimit.lastModifiedDate, +// ), +// ], +// ); + +// blocTest( +// 'should emit a FileDownloadFailure with fileAboveLimit reason when mobile', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFileAboveLimit, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Android); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePrivate); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// const FileDownloadFailure( +// FileDownloadFailureReason.fileAboveLimit, +// ), +// ], +// ); + +// /// File is under private limits +// /// File is above the warning limit +// blocTest( +// 'should emit a FileDownloadWarning', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFileUnderPrivateLimitAndAboveWarningLimit, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Android); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePrivate); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// const FileDownloadWarning(), +// ], +// ); + +// blocTest( +// 'should download a PUBLIC file with size above PRIVATE limit', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFileAboveLimit, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Web); + +// /// Using a public drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePublic); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// FileDownloadInProgress( +// fileName: testFileAboveLimit.name, +// totalByteCount: testFileAboveLimit.size, +// ), +// FileDownloadSuccess( +// bytes: Uint8List(100), +// fileName: testFileAboveLimit.name, +// mimeType: testFileAboveLimit.contentType, +// lastModified: testFileAboveLimit.lastModifiedDate, +// ), +// ], +// verify: (bloc) { +// /// public files should not call these functions +// verifyNever(() => mockDriveDao.getFileKey(any(), any())); +// verifyNever(() => mockDriveDao.getDriveKey(any(), any())); +// verifyNever( +// () => mockCrypto.decryptDataFromTransaction(any(), any(), any())); +// }, +// ); + +// blocTest( +// 'should emit a FileDownloadFailure with unknown reason when DownloadService throws', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Web); + +// /// Using a public drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePublic); +// when(() => mockDownloadService.download(any(), any())) +// .thenThrow((invocation) => Exception()); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// FileDownloadInProgress( +// fileName: testFile.name, +// totalByteCount: testFile.size, +// ), +// const FileDownloadFailure(FileDownloadFailureReason.unknownError), +// ], +// verify: (bloc) { +// /// public files should not call these functions +// verifyNever(() => mockDriveDao.getFileKey(any(), any())); +// verifyNever(() => mockDriveDao.getDriveKey(any(), any())); +// verifyNever( +// () => mockCrypto.decryptDataFromTransaction(any(), any(), any())); +// }, +// ); + +// blocTest( +// 'should emit a FileDownloadFailure with unknown reason when Decrypt throws', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Web); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePrivate); +// when(() => mockCrypto.decryptDataFromTransaction(any(), any(), any())) +// .thenThrow((invocation) => Exception()); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// FileDownloadInProgress( +// fileName: testFile.name, +// totalByteCount: testFile.size, +// ), +// const FileDownloadFailure(FileDownloadFailureReason.unknownError), +// ], +// ); + +// blocTest( +// 'should emit a FileDownloadFailure with unknown reason when Decrypt throws', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Web); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePrivate); +// when(() => mockCrypto.decryptDataFromTransaction(any(), any(), any())) +// .thenThrow((invocation) => Exception()); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// FileDownloadInProgress( +// fileName: testFile.name, +// totalByteCount: testFile.size, +// ), +// const FileDownloadFailure(FileDownloadFailureReason.unknownError), +// ], +// ); +// }); + +// group('Testing download method mocking platform to mobile', () { +// group('Testing download method mocking platform to mobile', () { +// blocTest( +// 'should emit a FileDownloadWithProgress and FileDownloadFinishedWithSuccess when iOS', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.iOS); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePublic); +// when(() => mockArDriveDownloader.downloadFile(any(), any())) +// .thenAnswer((i) => mockDownloadProgress()); +// when(() => mockArweaveService.client).thenReturn( +// Arweave(gatewayUrl: Uri.parse('http://example.com'))); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// FileDownloadWithProgress( +// fileName: testFile.name, +// fileSize: testFile.size, +// progress: 100, +// ), +// FileDownloadFinishedWithSuccess(fileName: testFile.name), +// ], +// verify: (bloc) { +// /// public files on mobile should not call these functions +// verifyNever(() => mockDownloadService.download(any(), any())); +// verifyNever(() => mockDriveDao.getFileKey(any(), any())); +// verifyNever(() => mockDriveDao.getDriveKey(any(), any())); +// verifyNever(() => +// mockCrypto.decryptDataFromTransaction(any(), any(), any())); +// }); + +// blocTest( +// 'should emit a FileDownloadWithProgress and FileDownloadFinishedWithSuccess when Android', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Android); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePublic); +// when(() => mockArDriveDownloader.downloadFile(any(), any())) +// .thenAnswer((i) => mockDownloadProgress()); +// when(() => mockArweaveService.client).thenReturn( +// Arweave(gatewayUrl: Uri.parse('http://example.com'))); +// }, +// act: (bloc) { +// profileFileDownloadCubit.download(SecretKey([])); +// }, +// expect: () => [ +// FileDownloadWithProgress( +// fileName: testFile.name, +// fileSize: testFile.size, +// progress: 100, +// ), +// FileDownloadFinishedWithSuccess(fileName: testFile.name), +// ], +// verify: (bloc) { +// /// public files on mobile should not call these functions +// verifyNever(() => mockDownloadService.download(any(), any())); +// verifyNever(() => mockDriveDao.getFileKey(any(), any())); +// verifyNever(() => mockDriveDao.getDriveKey(any(), any())); +// verifyNever(() => +// mockCrypto.decryptDataFromTransaction(any(), any(), any())); +// }); + +// blocTest( +// 'should download a public file using DownloadService instead ArDriveDownloader when platform differnt from mobile', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Web); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePublic); +// }, +// verify: (bloc) { +// /// public files on mobile should not call these functions +// verifyNever(() => mockArDriveDownloader.downloadFile(any(), any())); +// }); +// }); + +// blocTest( +// 'should emit a FileDownloadAborted', +// build: () => profileFileDownloadCubit = ProfileFileDownloadCubit( +// file: testFile, +// driveDao: mockDriveDao, +// arweave: mockArweaveService, +// downloader: mockArDriveDownloader, +// crypto: mockCrypto, +// downloadService: mockDownloadService, +// arfsRepository: mockARFSRepository, +// ), +// setUp: () { +// AppPlatform.setMockPlatform(platform: SystemPlatform.Android); + +// /// Using a private drive +// when(() => mockARFSRepository.getDriveById(any())) +// .thenAnswer((_) async => mockDrivePublic); + +// /// This will emit a new progress for each seconds +// /// so we have time to abort the download and check how much it +// /// downloaded +// when(() => mockArDriveDownloader.downloadFile(any(), any())) +// .thenAnswer((i) => mockDownloadInProgress()); +// when(() => mockArDriveDownloader.cancelDownload()) +// .thenAnswer((i) async {}); +// when(() => mockArweaveService.client) +// .thenReturn(Arweave(gatewayUrl: Uri.parse('http://example.com'))); +// }, +// act: (bloc) async { +// profileFileDownloadCubit.download(SecretKey([])); +// await Future.delayed(const Duration(seconds: 3)); +// await profileFileDownloadCubit.abortDownload(); +// }, +// expect: () => [ +// FileDownloadWithProgress( +// fileName: testFile.name, +// fileSize: testFile.size, +// progress: 1, +// ), +// FileDownloadWithProgress( +// fileName: testFile.name, +// fileSize: testFile.size, +// progress: 2, +// ), +// FileDownloadAborted(), +// ], +// verify: (bloc) { +// verifyNever(() => mockArDriveDownloader.cancelDownload()); + +// /// public files on mobile should not call these functions +// verifyNever(() => mockDownloadService.download(any(), any())); +// verifyNever(() => mockDriveDao.getFileKey(any(), any())); +// verifyNever(() => mockDriveDao.getDriveKey(any(), any())); +// verifyNever( +// () => mockCrypto.decryptDataFromTransaction(any(), any(), any())); +// }); +// }); +// } diff --git a/test/core/upload/metadata_generator_test.dart b/test/core/upload/metadata_generator_test.dart deleted file mode 100644 index 78a7b58d86..0000000000 --- a/test/core/upload/metadata_generator_test.dart +++ /dev/null @@ -1,498 +0,0 @@ -import 'dart:typed_data'; - -import 'package:ardrive/core/arfs/entities/arfs_entities.dart' as arfs; -import 'package:ardrive/core/upload/metadata_generator.dart'; -import 'package:ardrive/core/upload/upload_metadata.dart'; -import 'package:ardrive/entities/entities.dart'; -import 'package:ardrive/services/app/app_info_services.dart'; -import 'package:ardrive_io/ardrive_io.dart'; -import 'package:arweave/arweave.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:mocktail/mocktail.dart'; - -class MockARFSTagsGenetator extends Mock implements ARFSTagsGenetator {} - -class MockAppInfoServices extends Mock implements AppInfoServices {} - -void main() { - late ARFSUploadMetadataGenerator generator; - late MockARFSTagsGenetator mockARFSTagsGenetator; - - final args = ARFSTagsArgs( - driveId: 'driveId', - parentFolderId: 'parentFolderId', - isPrivate: false, - entityId: 'entityId', - ); - - final metadataArgsPublic = ARFSUploadMetadataArgs( - driveId: 'driveId', - parentFolderId: 'parentFolderId', - privacy: 'public', - isPrivate: false, - ); - - final metadataArgsPrivate = ARFSUploadMetadataArgs( - driveId: 'driveId', - parentFolderId: 'parentFolderId', - privacy: 'private', - isPrivate: true, - ); - - setUpAll(() { - mockARFSTagsGenetator = MockARFSTagsGenetator(); - generator = ARFSUploadMetadataGenerator( - tagsGenerator: mockARFSTagsGenetator, - ); - - registerFallbackValue(args); - }); - - group('ARFSUploadMetadataGenetator', () { - group('generateMetadata', () { - test('throws ArgumentError when arguments is null', () async { - expect( - () async => await generator.generateMetadata( - await mockFile(), - null, - ), - throwsArgumentError, - ); - }); - - test('throws ArgumentError when generateTags throws generating a file', - () async { - when(() => mockARFSTagsGenetator.generateTags(any())) - .thenThrow(Exception()); - - expect( - () async => await generator.generateMetadata( - await mockFile(), - metadataArgsPublic, - ), - throwsException, - ); - }); - - test('throws ArgumentError when generateTags throws generating a folder', - () async { - final folder = IOFolderAdapter().fromIOFiles([ - await mockFile(), - await mockFile(), - ]); - - when(() => mockARFSTagsGenetator.generateTags(any())) - .thenThrow(Exception()); - - expect( - () async => await generator.generateMetadata( - folder, - metadataArgsPublic, - ), - throwsException, - ); - }); - - test('throws when args is invalid for file', () async { - expect( - () async => await generator.generateMetadata( - await mockFile(), - ARFSUploadMetadataArgs( - driveId: null, - parentFolderId: null, - privacy: null, - isPrivate: false, - ), - ), - throwsArgumentError, - ); - }); - - test('returns ARFSFileUploadMetadata when entity is IOFile', () async { - final file = await mockFile(); - - when(() => mockARFSTagsGenetator.generateTags(any())) - .thenReturn([Tag('tag', 'value')]); - - final metadataPublic = - await generator.generateMetadata(file, metadataArgsPublic); - final metadataPrivate = - await generator.generateMetadata(file, metadataArgsPrivate); - - expect(metadataPublic, isA()); - expect(metadataPublic.tags[0].name, 'tag'); - expect(metadataPublic.tags[0].value, 'value'); - expect(metadataPublic.name, file.name); - expect(metadataPublic.id, isNotEmpty); - expect(metadataPublic.isPrivate, false); - - expect(metadataPrivate, isA()); - expect(metadataPrivate.tags[0].name, 'tag'); - expect(metadataPrivate.tags[0].value, 'value'); - expect(metadataPrivate.name, file.name); - expect(metadataPrivate.id, isNotEmpty); - expect(metadataPrivate.isPrivate, true); - }); - - test('returns ARFSFolderUploadMetatadata when entity is IOFolder', - () async { - final folder = IOFolderAdapter().fromIOFiles([ - await mockFile(), - await mockFile(), - ]); - - when(() => mockARFSTagsGenetator.generateTags(any())) - .thenReturn([Tag('entity', 'folder')]); - - final metadataPublic = - await generator.generateMetadata(folder, metadataArgsPublic); - final metadataPrivate = - await generator.generateMetadata(folder, metadataArgsPrivate); - - expect(metadataPublic, isA()); - expect(metadataPublic.tags[0].name, 'entity'); - expect(metadataPublic.tags[0].value, 'folder'); - expect(metadataPublic.name, folder.name); - expect(metadataPublic.id, isNotEmpty); - expect(metadataPublic.isPrivate, false); - - expect(metadataPrivate, isA()); - expect(metadataPrivate.tags[0].name, 'entity'); - expect(metadataPrivate.tags[0].value, 'folder'); - expect(metadataPrivate.name, folder.name); - expect(metadataPrivate.id, isNotEmpty); - expect(metadataPrivate.isPrivate, true); - }); - }); - group('generateDrive', () { - test('returns ARFSDriveUploadMetadata when we call the generateDrive', - () async { - when(() => mockARFSTagsGenetator.generateTags(any())) - .thenReturn([Tag('entity', 'drive')]); - - final drivePublic = await generator.generateDrive( - name: 'name', - isPrivate: false, - ); - - final drivePrivate = await generator.generateDrive( - name: 'name', - isPrivate: true, - ); - - expect(drivePublic, isA()); - expect(drivePublic.tags[0].name, 'entity'); - expect(drivePublic.tags[0].value, 'drive'); - expect(drivePublic.name, 'name'); - expect(drivePublic.id, isNotEmpty); - expect(drivePublic.isPrivate, false); - - expect(drivePrivate, isA()); - expect(drivePrivate.tags[0].name, 'entity'); - expect(drivePrivate.tags[0].value, 'drive'); - expect(drivePrivate.name, 'name'); - expect(drivePrivate.id, isNotEmpty); - expect(drivePrivate.isPrivate, true); - }); - }); - }); - - group('ARFSTagsGenerator', () { - final appInfoServices = MockAppInfoServices(); - - group('generateTags', () { - test('should generate the proper tags for a entity file', () { - final ARFSTagsGenetator tagsGenerator = ARFSTagsGenetator( - appInfoServices: appInfoServices, entity: arfs.EntityType.file); - - when(() => appInfoServices.appInfo).thenReturn( - AppInfo( - arfsVersion: '1', - version: 'version', - appName: 'ArDrive', - platform: 'platform', - ), - ); - - final tags = tagsGenerator.generateTags(args); - - // app tags - tags.contains(Tag(EntityTag.arFs, '1')); - tags.contains(Tag(EntityTag.appVersion, 'version')); - tags.contains(Tag(EntityTag.appPlatform, 'platform')); - tags.contains(Tag(EntityTag.appName, 'Ardrive')); - - // entity tags - tags.contains(Tag(EntityTag.fileId, 'entityId')); - tags.contains(Tag(EntityTag.parentFolderId, 'parentFolderId')); - tags.contains(Tag(EntityTag.driveId, 'driveId')); - tags.contains(Tag(EntityTag.entityType, arfs.EntityType.file.name)); - - // u tags - tags.contains(Tag(EntityTag.appName, 'SmartWeaveAction')); - tags.contains(Tag(EntityTag.appVersion, '0.3.0')); - tags.contains(Tag(EntityTag.input, '{"function":"mint"}')); - tags.contains(Tag( - EntityTag.contract, 'KTzTXT_ANmF84fWEKHzWURD1LWd9QaFR9yfYUwH2Lxw')); - - expect( - tags - .firstWhere((element) => element.name == EntityTag.unixTime) - .value, - isNotNull, - ); - expect(tags.length, 12); - }); - - test('should generate the proper tags for a entity folder', () { - final ARFSTagsGenetator tagsGenerator = ARFSTagsGenetator( - appInfoServices: appInfoServices, entity: arfs.EntityType.folder); - - when(() => appInfoServices.appInfo).thenReturn( - AppInfo( - arfsVersion: '1', - version: 'version', - appName: 'ArDrive', - platform: 'platform', - ), - ); - final tags = tagsGenerator.generateTags(args); - - // app tags - tags.contains(Tag(EntityTag.arFs, '1')); - tags.contains(Tag(EntityTag.appVersion, 'version')); - tags.contains(Tag(EntityTag.appPlatform, 'platform')); - tags.contains(Tag(EntityTag.appName, 'Ardrive')); - - // entity tags - tags.contains(Tag(EntityTag.folderId, 'entityId')); - tags.contains(Tag(EntityTag.parentFolderId, 'parentFolderId')); - tags.contains(Tag(EntityTag.driveId, 'driveId')); - tags.contains(Tag(EntityTag.entityType, arfs.EntityType.folder.name)); - - // u tags - tags.contains(Tag(EntityTag.appName, 'SmartWeaveAction')); - tags.contains(Tag(EntityTag.appVersion, '0.3.0')); - tags.contains(Tag(EntityTag.input, '{"function":"mint"}')); - tags.contains(Tag( - EntityTag.contract, 'KTzTXT_ANmF84fWEKHzWURD1LWd9QaFR9yfYUwH2Lxw')); - - expect( - tags - .firstWhere((element) => element.name == EntityTag.unixTime) - .value, - isNotNull, - ); - expect(tags.length, 12); - }); - test('should generate the proper tags for a entity drive', () { - final ARFSTagsGenetator tagsGenerator = ARFSTagsGenetator( - appInfoServices: appInfoServices, entity: arfs.EntityType.drive); - - when(() => appInfoServices.appInfo).thenReturn( - AppInfo( - arfsVersion: '1', - version: 'version', - appName: 'ArDrive', - platform: 'platform', - ), - ); - final tags = tagsGenerator.generateTags(args); - - // app tags - tags.contains(Tag(EntityTag.arFs, '1')); - tags.contains(Tag(EntityTag.appVersion, 'version')); - tags.contains(Tag(EntityTag.appPlatform, 'platform')); - tags.contains(Tag(EntityTag.appName, 'Ardrive')); - - // entity tags - tags.contains(Tag(EntityTag.driveId, 'driveId')); - tags.contains(Tag(EntityTag.entityType, arfs.EntityType.drive.name)); - - // u tags - tags.contains(Tag(EntityTag.appName, 'SmartWeaveAction')); - tags.contains(Tag(EntityTag.appVersion, '0.3.0')); - tags.contains(Tag(EntityTag.input, '{"function":"mint"}')); - tags.contains(Tag( - EntityTag.contract, 'KTzTXT_ANmF84fWEKHzWURD1LWd9QaFR9yfYUwH2Lxw')); - - expect( - tags - .firstWhere((element) => element.name == EntityTag.unixTime) - .value, - isNotNull, - ); - expect(tags.length, 10); - }); - - test('should throw if the args is invalid generating a drive', () { - final ARFSTagsGenetator tagsGenerator = ARFSTagsGenetator( - appInfoServices: appInfoServices, entity: arfs.EntityType.drive); - - when(() => appInfoServices.appInfo).thenReturn( - AppInfo( - arfsVersion: '1', - version: 'version', - appName: 'ArDrive', - platform: 'platform', - ), - ); - - final wrongArgs = ARFSTagsArgs( - driveId: null, - isPrivate: null, - ); - - expect( - () => tagsGenerator.generateTags(wrongArgs), throwsArgumentError); - }); - test('should throw if the args is invalid generating a file', () { - final ARFSTagsGenetator tagsGenerator = ARFSTagsGenetator( - appInfoServices: appInfoServices, entity: arfs.EntityType.file); - - when(() => appInfoServices.appInfo).thenReturn( - AppInfo( - arfsVersion: '1', - version: 'version', - appName: 'ArDrive', - platform: 'platform', - ), - ); - - final wrongArgs = ARFSTagsArgs( - driveId: null, - parentFolderId: null, - ); - - expect( - () => tagsGenerator.generateTags(wrongArgs), throwsArgumentError); - }); - - test('should throw if the args is invalid generating a folder', () { - final ARFSTagsGenetator tagsGenerator = ARFSTagsGenetator( - appInfoServices: appInfoServices, entity: arfs.EntityType.file); - - when(() => appInfoServices.appInfo).thenReturn( - AppInfo( - arfsVersion: '1', - version: 'version', - appName: 'ArDrive', - platform: 'platform', - ), - ); - - final wrongArgs = ARFSTagsArgs( - driveId: null, - parentFolderId: null, - ); - - expect( - () => tagsGenerator.generateTags(wrongArgs), throwsArgumentError); - }); - }); - }); - - group('ARFSTagsValidator', () { - group('validate', () { - test('should not throw if the args is valid generating a drive', () { - final wrongArgs = ARFSTagsArgs( - driveId: 'drive id', - isPrivate: false, - ); - - expect( - () => ARFSTagsValidator.validate(wrongArgs, arfs.EntityType.drive), - returnsNormally); - }); - test('should throw if the args is invalid generating a drive', () { - final wrongArgs = ARFSTagsArgs( - driveId: null, - isPrivate: null, - ); - - expect( - () => ARFSTagsValidator.validate(wrongArgs, arfs.EntityType.drive), - throwsArgumentError); - }); - test('should not throw if the args is valid generating a file', () { - final wrongArgs = ARFSTagsArgs( - driveId: 'drive id', - parentFolderId: 'parent folder id', - entityId: 'entity id', - ); - - expect( - () => ARFSTagsValidator.validate(wrongArgs, arfs.EntityType.file), - returnsNormally); - }); - test('should throw if the args is invalid generating a file', () { - final wrongArgs = ARFSTagsArgs( - driveId: null, - ); - - expect( - () => ARFSTagsValidator.validate(wrongArgs, arfs.EntityType.file), - throwsArgumentError); - - final wrongArgs2 = ARFSTagsArgs( - driveId: 'not null', - parentFolderId: null, - ); - - expect( - () => ARFSTagsValidator.validate(wrongArgs2, arfs.EntityType.file), - throwsArgumentError); - - final wrongArgs3 = ARFSTagsArgs( - driveId: 'not null', - parentFolderId: 'not null', - entityId: null, - ); - - expect( - () => ARFSTagsValidator.validate(wrongArgs3, arfs.EntityType.file), - throwsArgumentError); - }); - - test('should not throw if the args is valid generating a folder', () { - final wrongArgs = ARFSTagsArgs( - driveId: 'drive id', - isPrivate: false, - entityId: 'entity id', - ); - - expect( - () => ARFSTagsValidator.validate(wrongArgs, arfs.EntityType.folder), - returnsNormally); - }); - - test('should throw if the args is invalid generating a folder', () { - final wrongArgs = ARFSTagsArgs( - driveId: null, - ); - - expect( - () => ARFSTagsValidator.validate(wrongArgs, arfs.EntityType.folder), - throwsArgumentError); - - final wrongArgs2 = ARFSTagsArgs( - driveId: 'not null', - entityId: null, - ); - expect( - () => - ARFSTagsValidator.validate(wrongArgs2, arfs.EntityType.folder), - throwsArgumentError); - }); - }); - }); -} - -Future mockFile() { - return IOFileAdapter().fromData( - Uint8List(10), - name: 'test.txt', - lastModifiedDate: DateTime.now(), - contentType: 'text/plain', - ); -} diff --git a/test/core/upload/uploader_test.dart b/test/core/upload/uploader_test.dart index dada2c095c..1a81986607 100644 --- a/test/core/upload/uploader_test.dart +++ b/test/core/upload/uploader_test.dart @@ -67,13 +67,13 @@ class MockUploadPaymentEvaluator extends Mock implements UploadPaymentEvaluator {} void main() { - ArDriveUploader uploader; + ArDriveUploaderFromHandles uploader; MockBundleUploader bundleUploader; MockFileV2Uploader fileV2Uploader; bundleUploader = MockBundleUploader(); fileV2Uploader = MockFileV2Uploader(); - uploader = ArDriveUploader( + uploader = ArDriveUploaderFromHandles( bundleUploader: bundleUploader, fileV2Uploader: fileV2Uploader, prepareBundle: (handle) async {}, diff --git a/test/download/limits_test.dart b/test/download/limits_test.dart index 932d7254ea..e4a8360147 100644 --- a/test/download/limits_test.dart +++ b/test/download/limits_test.dart @@ -1,5 +1,6 @@ import 'package:ardrive/download/limits.dart'; -import 'package:ardrive/utils/app_platform.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; +// ignore: depend_on_referenced_packages import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/test/download/multiple_download_bloc_test.dart b/test/download/multiple_download_bloc_test.dart index 3e229eab96..ced5b1eddc 100644 --- a/test/download/multiple_download_bloc_test.dart +++ b/test/download/multiple_download_bloc_test.dart @@ -7,11 +7,12 @@ import 'package:ardrive/download/download_utils.dart'; import 'package:ardrive/download/multiple_download_bloc.dart'; import 'package:ardrive/models/daos/daos.dart'; import 'package:ardrive/services/arweave/arweave.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/data_size.dart'; import 'package:ardrive_http/ardrive_http.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:bloc_test/bloc_test.dart'; import 'package:cryptography/cryptography.dart'; +// ignore: depend_on_referenced_packages import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -92,9 +93,9 @@ void main() async { group('[$groupLabel] -', () { setUp(() { mockCrypto = MockArDriveCrypto(); - when(() => mockCrypto.decryptTransactionData(any(), any(), any())) + when(() => mockCrypto.decryptDataFromTransaction(any(), any(), any())) .thenAnswer((_) async => Uint8List(0)); - when(() => mockCrypto.decryptTransactionData( + when(() => mockCrypto.decryptDataFromTransaction( decryptionFailureTransaction, any(), any())).thenThrow(Exception()); multipleDownloadBloc = createMultipleDownloadBloc( arfsRepository: arfsRepository, @@ -645,7 +646,8 @@ void main() async { .having((s) => s.skippedFiles.length, 'skippedFiles.length', 0), ], verify: (bloc) { - verify(() => mockCrypto.decryptTransactionData(any(), any(), any())) + verify(() => + mockCrypto.decryptDataFromTransaction(any(), any(), any())) .called(1); }, ); diff --git a/test/entities/custom_json_metadata_test.dart b/test/entities/custom_json_metadata_test.dart index aafbe097ac..c8cc905a96 100644 --- a/test/entities/custom_json_metadata_test.dart +++ b/test/entities/custom_json_metadata_test.dart @@ -1,4 +1,5 @@ import 'package:ardrive/entities/entities.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:package_info_plus/package_info_plus.dart'; @@ -135,7 +136,7 @@ void main() { folderEntity.driveId = ''; folderEntity.parentFolderId = ''; driveEntity.id = ''; - driveEntity.privacy = DrivePrivacy.public; + driveEntity.privacy = DrivePrivacyTag.public; fileTransaction = await fileEntity.asTransaction(); folderTransaction = await folderEntity.asTransaction(); diff --git a/test/entities/manifest_data_test.dart b/test/entities/manifest_data_test.dart index e1f73a159d..7118c22795 100644 --- a/test/entities/manifest_data_test.dart +++ b/test/entities/manifest_data_test.dart @@ -2,7 +2,7 @@ import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/entities/manifest_data.dart'; import 'package:ardrive/models/daos/daos.dart'; import 'package:ardrive/models/database/database.dart'; -import 'package:ardrive/utils/app_platform.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/utils.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:test/test.dart'; diff --git a/test/entities/snapshot_entity_test.dart b/test/entities/snapshot_entity_test.dart index bf6fbe94be..fae722a127 100644 --- a/test/entities/snapshot_entity_test.dart +++ b/test/entities/snapshot_entity_test.dart @@ -1,6 +1,7 @@ import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/entities/snapshot_entity.dart'; import 'package:ardrive/services/arweave/graphql/graphql_api.graphql.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:arweave/utils.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -23,7 +24,7 @@ void main() { }, 'tags': [ {'name': EntityTag.snapshotId, 'value': 'FAKE SNAPSHOT ID'}, - {'name': EntityTag.entityType, 'value': EntityType.snapshot}, + {'name': EntityTag.entityType, 'value': EntityTypeTag.snapshot}, {'name': EntityTag.driveId, 'value': 'FAKE DRIVE ID'}, {'name': EntityTag.blockStart, 'value': '0'}, {'name': EntityTag.blockEnd, 'value': '100'}, diff --git a/test/models/entity_version_tag_test.dart b/test/models/entity_version_tag_test.dart index 358d665c5e..ad42ba9934 100644 --- a/test/models/entity_version_tag_test.dart +++ b/test/models/entity_version_tag_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: unused_local_variable import 'package:ardrive/entities/entities.dart'; -import 'package:ardrive/utils/app_platform.dart'; +import 'package:ardrive_utils/ardrive_utils.dart' hide appName; import 'package:arweave/arweave.dart'; import 'package:arweave/utils.dart'; import 'package:package_info_plus/package_info_plus.dart'; @@ -179,7 +179,7 @@ void main() { id: driveId, name: testEntityName, rootFolderId: rootFolderId, - privacy: DrivePrivacy.public, + privacy: DrivePrivacyTag.public, ); AppPlatform.setMockPlatform(platform: SystemPlatform.unknown); diff --git a/test/services/arweave/arweave_service_test.dart b/test/services/arweave/arweave_service_test.dart index 26f614f8ea..d865c5283e 100644 --- a/test/services/arweave/arweave_service_test.dart +++ b/test/services/arweave/arweave_service_test.dart @@ -1,7 +1,7 @@ import 'package:ardrive/entities/file_entity.dart'; import 'package:ardrive/services/services.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/snapshots/range.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/test/test_utils/mocks.dart b/test/test_utils/mocks.dart index 286dc12d45..59289af150 100644 --- a/test/test_utils/mocks.dart +++ b/test/test_utils/mocks.dart @@ -13,12 +13,13 @@ import 'package:ardrive/services/config/config_fetcher.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/user/repositories/user_repository.dart'; import 'package:ardrive/utils/app_flavors.dart'; -import 'package:ardrive/utils/html/html_util.dart'; import 'package:ardrive/utils/secure_key_value_store.dart'; import 'package:ardrive/utils/upload_plan_utils.dart'; import 'package:ardrive_io/ardrive_io.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:bloc_test/bloc_test.dart'; +// ignore: depend_on_referenced_packages import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/widgets.dart'; import 'package:mocktail/mocktail.dart'; @@ -54,7 +55,7 @@ class MockUploadPlanUtils extends Mock implements UploadPlanUtils {} class MockBiometricAuthentication extends Mock implements BiometricAuthentication {} -class MockArDriveDownloader extends Mock implements ArDriveDownloader {} +class MockArDriveDownloader extends Mock implements ArDriveMobileDownloader {} class MockDownloadService extends Mock implements DownloadService {} diff --git a/test/test_utils/utils.dart b/test/test_utils/utils.dart index 7601feb8a2..237463bc7b 100644 --- a/test/test_utils/utils.dart +++ b/test/test_utils/utils.dart @@ -2,8 +2,8 @@ import 'dart:convert'; import 'dart:io' if (dart.library.html) 'dart:html'; import 'dart:math'; -import 'package:ardrive/entities/constants.dart'; import 'package:ardrive/models/models.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/arweave.dart'; import 'package:drift/drift.dart'; import 'package:drift/native.dart'; @@ -54,7 +54,7 @@ Future addTestFilesToDb( rootFolderId: rootFolderId, ownerAddress: 'fake-owner-address', name: 'fake-drive-name', - privacy: DrivePrivacy.public, + privacy: DrivePrivacyTag.public, ), ); // Create fake root folder for drive and sub folders diff --git a/test/utils/app_platform_test.dart b/test/utils/app_platform_test.dart index 3efee8264f..0376d2bb31 100644 --- a/test/utils/app_platform_test.dart +++ b/test/utils/app_platform_test.dart @@ -1,5 +1,6 @@ -import 'package:ardrive/utils/app_platform.dart'; -// ignore: depend_on_referenced_packages +// ignore_for_file: depend_on_referenced_packages + +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:platform/platform.dart'; import 'package:test/test.dart'; diff --git a/test/utils/fake_tags_test.dart b/test/utils/fake_tags_test.dart index ecc9abe082..7ea69e1f34 100644 --- a/test/utils/fake_tags_test.dart +++ b/test/utils/fake_tags_test.dart @@ -1,6 +1,5 @@ -import 'package:ardrive/entities/entities.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/bundles/fake_tags.dart'; +import 'package:ardrive_utils/ardrive_utils.dart' hide appName; import 'package:package_info_plus/package_info_plus.dart'; import 'package:test/test.dart'; diff --git a/test/utils/html_utils/tab_visibility_singleton_test.dart b/test/utils/html_utils/tab_visibility_singleton_test.dart index 0a2801a812..ef50c923eb 100644 --- a/test/utils/html_utils/tab_visibility_singleton_test.dart +++ b/test/utils/html_utils/tab_visibility_singleton_test.dart @@ -1,6 +1,7 @@ -import 'package:ardrive/utils/html/html_util.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:flutter_test/flutter_test.dart'; +// TODO: move this test for TabVisibilitySingleton to ardrive_utils void main() { group('TabVisibilitySingleton class', () { test( diff --git a/test/utils/link_generators_test.dart b/test/utils/link_generators_test.dart index bf8bd5e460..581bd3321f 100644 --- a/test/utils/link_generators_test.dart +++ b/test/utils/link_generators_test.dart @@ -1,6 +1,6 @@ -import 'package:ardrive/entities/entities.dart'; import 'package:ardrive/models/models.dart'; import 'package:ardrive/utils/link_generators.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:arweave/utils.dart'; import 'package:cryptography/cryptography.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -18,7 +18,7 @@ void main() { rootFolderId: 'publicDriveRootFolderId', ownerAddress: 'ownerAddress', name: 'testPublicDrive', - privacy: DrivePrivacy.public, + privacy: DrivePrivacyTag.public, dateCreated: DateTime.now(), lastUpdated: DateTime.now(), ); @@ -27,7 +27,7 @@ void main() { rootFolderId: 'privateRootFolderId', ownerAddress: 'ownerAddress', name: 'testPrivateDrive', - privacy: DrivePrivacy.private, + privacy: DrivePrivacyTag.private, dateCreated: DateTime.now(), lastUpdated: DateTime.now(), ); diff --git a/web/index.html b/web/index.html index d107837942..423ec985a1 100644 --- a/web/index.html +++ b/web/index.html @@ -50,5 +50,6 @@ + diff --git a/web/js/sha384.js b/web/js/sha384.js new file mode 100644 index 0000000000..6a9e67853e --- /dev/null +++ b/web/js/sha384.js @@ -0,0 +1,24 @@ +"use strict";var SHA384=(()=>{var r=Object.defineProperty;var b=Object.getOwnPropertyDescriptor;var j=Object.getOwnPropertyNames;var T=Object.prototype.hasOwnProperty;var $=(A,I)=>{for(var g in I)r(A,g,{get:I[g],enumerable:!0})},_=(A,I,g,B)=>{if(I&&typeof I=="object"||typeof I=="function")for(let C of j(I))!T.call(A,C)&&C!==g&&r(A,C,{get:()=>I[C],enumerable:!(B=b(I,C))||B.enumerable});return A};var AA=A=>_(r({},"__esModule",{value:!0}),A);var nA={};$(nA,{createSHA384:()=>m,sha384Hash:()=>aA});function t(A,I,g,B){function C(c){return c instanceof g?c:new g(function(F){F(c)})}return new(g||(g=Promise))(function(c,F){function e(h){try{D(B.next(h))}catch(k){F(k)}}function n(h){try{D(B.throw(h))}catch(k){F(k)}}function D(h){h.done?c(h.value):C(h.value).then(e,n)}D((B=B.apply(A,I||[])).next())})}var E=class{constructor(){this.mutex=Promise.resolve()}lock(){let I=()=>{};return this.mutex=this.mutex.then(()=>new Promise(I)),new Promise(g=>{I=g})}dispatch(I){return t(this,void 0,void 0,function*(){let g=yield this.lock();try{return yield Promise.resolve(I())}finally{g()}})}},N;function IA(){return typeof globalThis<"u"?globalThis:typeof self<"u"?self:typeof window<"u"?window:global}var K=IA(),J=(N=K.Buffer)!==null&&N!==void 0?N:null,gA=K.TextEncoder?new K.TextEncoder:null;function u(A,I){return(A&15)+(A>>6|A>>3&8)<<4|(I&15)+(I>>6|I>>3&8)}function BA(A,I){let g=I.length>>1;for(let B=0;B>>4;A[B++]=c>9?c+s:c+l,c=I[C]&15,A[B++]=c>9?c+s:c+l}return String.fromCharCode.apply(null,A)}var X=J!==null?A=>{if(typeof A=="string"){let I=J.from(A,"utf8");return new Uint8Array(I.buffer,I.byteOffset,I.length)}if(J.isBuffer(A))return new Uint8Array(A.buffer,A.byteOffset,A.length);if(ArrayBuffer.isView(A))return new Uint8Array(A.buffer,A.byteOffset,A.byteLength);throw new Error("Invalid data type!")}:A=>{if(typeof A=="string")return gA.encode(A);if(ArrayBuffer.isView(A))return new Uint8Array(A.buffer,A.byteOffset,A.byteLength);throw new Error("Invalid data type!")},z="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",d=new Uint8Array(256);for(let A=0;A>4,C+=1,B[C]=(e&15)<<4|n>>2,C+=1,B[C]=(n&3)<<6|D&63,C+=1}return B}var H=16*1024,y=4,EA=new E,f=new Map;function V(A,I){return t(this,void 0,void 0,function*(){let g=null,B=null,C=!1;if(typeof WebAssembly>"u")throw new Error("WebAssembly is not supported in this environment!");let c=(Q,i=0)=>{B.set(Q,i)},F=()=>B,e=()=>g.exports,n=Q=>{g.exports.Hash_SetMemorySize(Q);let i=g.exports.Hash_GetBuffer(),o=g.exports.memory.buffer;B=new Uint8Array(o,i,Q)},D=()=>new DataView(g.exports.memory.buffer).getUint32(g.exports.STATE_SIZE,!0),h=EA.dispatch(()=>t(this,void 0,void 0,function*(){if(!f.has(A.name)){let i=iA(A.data),o=WebAssembly.compile(i);f.set(A.name,o)}let Q=yield f.get(A.name);g=yield WebAssembly.instantiate(Q,{})})),k=()=>t(this,void 0,void 0,function*(){g||(yield h);let Q=g.exports.Hash_GetBuffer(),i=g.exports.memory.buffer;B=new Uint8Array(i,Q,H)}),q=(Q=null)=>{C=!0,g.exports.Hash_Init(Q)},O=Q=>{let i=0;for(;i{if(!C)throw new Error("update() called before init()");let i=X(Q);O(i)},p=new Uint8Array(I*2),Y=(Q,i=null)=>{if(!C)throw new Error("digest() called before init()");return C=!1,g.exports.Hash_Final(i),Q==="binary"?B.slice(0,I):R(p,B,I)},L=()=>{if(!C)throw new Error("save() can only be called after init() and before digest()");let Q=g.exports.Hash_GetState(),i=D(),o=g.exports.memory.buffer,a=new Uint8Array(o,Q,i),G=new Uint8Array(y+i);return BA(G,A.hash),G.set(a,y),G},W=Q=>{if(!(Q instanceof Uint8Array))throw new Error("load() expects an Uint8Array generated by save()");let i=g.exports.Hash_GetState(),o=D(),a=y+o,G=g.exports.memory.buffer;if(Q.length!==a)throw new Error(`Bad state length (expected ${a} bytes, got ${Q.length})`);if(!QA(A.hash,Q.subarray(0,y)))throw new Error("This state was written by an incompatible hash implementation");let v=Q.subarray(y);new Uint8Array(G,i,o).set(v),C=!0},U=Q=>typeof Q=="string"?Q.length!0;break;case"blake2b":case"blake2s":w=(Q,i)=>i<=512&&U(Q);break;case"blake3":w=(Q,i)=>i===0&&U(Q);break;case"xxhash64":case"xxhash3":case"xxhash128":w=()=>!1;break}let P=(Q,i=null,o=null)=>{if(!w(Q,i))return q(i),M(Q),Y("hex",o);let a=X(Q);return B.set(a),g.exports.Hash_Calculate(a.length,i,o),R(p,B,I)};return yield k(),{getMemory:F,writeMemory:c,getExports:e,setMemorySize:n,init:q,update:M,digest:Y,save:L,load:W,calculate:P,hashLength:I}})}function cA(A,I,g){return t(this,void 0,void 0,function*(){let B=yield A.lock(),C=yield V(I,g);return B(),C})}var wA=new E;var GA=new E;var yA=new DataView(new ArrayBuffer(4));var dA=new E;var tA=new E;var HA=new E;var SA=new E;var UA=new E;var rA=new E;var NA=new E;var JA=new E;var fA=new E;var KA=new E;var qA=new E;var oA="sha512",hA="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",FA="a5d1ca7c",Z={name:oA,data:hA,hash:FA},DA=new E,S=null;function x(A){if(S===null)return cA(DA,Z,48).then(I=>(S=I,S.calculate(A,384)));try{let I=S.calculate(A,384);return Promise.resolve(I)}catch(I){return Promise.reject(I)}}function m(){return V(Z,48).then(A=>{A.init(384);let I={init:()=>(A.init(384),I),update:g=>(A.update(g),I),digest:g=>A.digest(g),save:()=>A.save(),load:g=>(A.load(g),I),blockSize:128,digestSize:48};return I})}var MA=new E;var pA=new E;var YA=new E;var sA=new ArrayBuffer(8);var lA=new E;var RA=new ArrayBuffer(8);var XA=new E;var zA=new ArrayBuffer(8);var uA=new E;var VA=new E;var ZA=new E;async function aA(A){return eA(await x(A))}function eA(A){let I=A.length/2,g=new Uint8Array(I);for(let B=0;B Date: Thu, 19 Oct 2023 14:33:42 -0300 Subject: [PATCH 2/2] feat(revert): corrects issue after reverting PE-4754 --- lib/pages/drive_detail/drive_detail_page.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/drive_detail/drive_detail_page.dart b/lib/pages/drive_detail/drive_detail_page.dart index 6308bca83f..96b6a09554 100644 --- a/lib/pages/drive_detail/drive_detail_page.dart +++ b/lib/pages/drive_detail/drive_detail_page.dart @@ -28,7 +28,6 @@ import 'package:ardrive/pages/drive_detail/components/hover_widget.dart'; import 'package:ardrive/services/services.dart'; import 'package:ardrive/theme/theme.dart'; import 'package:ardrive/utils/app_localizations_wrapper.dart'; -import 'package:ardrive/utils/app_platform.dart'; import 'package:ardrive/utils/compare_alphabetically_and_natural.dart'; import 'package:ardrive/utils/filesize.dart'; import 'package:ardrive/utils/logger/logger.dart'; @@ -36,6 +35,7 @@ import 'package:ardrive/utils/size_constants.dart'; import 'package:ardrive/utils/user_utils.dart'; import 'package:ardrive_io/ardrive_io.dart'; import 'package:ardrive_ui/ardrive_ui.dart'; +import 'package:ardrive_utils/ardrive_utils.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart';