From 9a478cee547fefc5cccf809d0defa11235ed7ed3 Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Fri, 20 Nov 2020 09:15:15 -0300 Subject: [PATCH 1/2] AM-91: Add option to open links on mural --- .flutter-plugins-dependencies | 2 +- ios/Flutter/.last_build_id | 1 + ios/Flutter/Debug.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Flutter/flutter_export_environment.sh | 12 ++-- ios/Podfile | 41 ++++++++++++ ios/Runner.xcodeproj/project.pbxproj | 80 ++++++++++++++++++++++- lib/items/CommentItem.dart | 25 +++++-- pubspec.yaml | 2 + 9 files changed, 155 insertions(+), 10 deletions(-) create mode 100644 ios/Flutter/.last_build_id create mode 100644 ios/Podfile diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index d18d0a4..72d089b 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_messaging","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_local_notifications","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_local_notifications-1.4.4+2/","dependencies":[]},{"name":"fluttertoast","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.0.1/","dependencies":[]},{"name":"image_cropper","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.2.3/","dependencies":[]},{"name":"image_picker","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+4/","dependencies":[]},{"name":"path_provider","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.11/","dependencies":[]},{"name":"shared_preferences","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.8/","dependencies":[]},{"name":"sqflite","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]}],"android":[{"name":"firebase_messaging","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_local_notifications","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_local_notifications-1.4.4+2/","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.8/","dependencies":[]},{"name":"fluttertoast","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.0.1/","dependencies":[]},{"name":"image_cropper","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.2.3/","dependencies":[]},{"name":"image_picker","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+4/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.11/","dependencies":[]},{"name":"shared_preferences","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.8/","dependencies":[]},{"name":"sqflite","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_macos","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+1/","dependencies":["path_provider_linux"]}],"windows":[],"web":[{"name":"fluttertoast","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.0.1/","dependencies":[]},{"name":"shared_preferences_web","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_messaging","dependencies":[]},{"name":"flutter_local_notifications","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"image_cropper","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-07-30 16:13:00.074150","version":"1.17.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_messaging","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_local_notifications","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_local_notifications-1.4.4+2/","dependencies":[]},{"name":"fluttertoast","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.0.1/","dependencies":[]},{"name":"image_cropper","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.2.3/","dependencies":[]},{"name":"image_picker","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+4/","dependencies":[]},{"name":"path_provider","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.11/","dependencies":[]},{"name":"shared_preferences","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.8/","dependencies":[]},{"name":"sqflite","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]}],"android":[{"name":"firebase_messaging","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_local_notifications","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_local_notifications-1.4.4+2/","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.8/","dependencies":[]},{"name":"fluttertoast","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.0.1/","dependencies":[]},{"name":"image_cropper","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.2.3/","dependencies":[]},{"name":"image_picker","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+4/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.11/","dependencies":[]},{"name":"shared_preferences","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.8/","dependencies":[]},{"name":"sqflite","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_macos","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+1/","dependencies":["path_provider_linux"]}],"windows":[],"web":[{"name":"fluttertoast","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.0.1/","dependencies":[]},{"name":"shared_preferences_web","path":"/usr/lib/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_messaging","dependencies":[]},{"name":"flutter_local_notifications","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"image_cropper","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-07-30 16:13:00.074150","version":"1.17.5"} diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id new file mode 100644 index 0000000..e9a81c4 --- /dev/null +++ b/ios/Flutter/.last_build_id @@ -0,0 +1 @@ +e5b0a66fadc1a243c651eb27f35bf19d \ No newline at end of file diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee..e8efba1 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee..399e934 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index e6171e2..3161435 100755 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -1,11 +1,15 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/usr/lib/flutter" -export "FLUTTER_APPLICATION_PATH=/home/zambom/StarDestroyer/tie_interceptor/amadeus-flutter" -export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_ROOT=/Users/jailson/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/jailson/Documents/Amadeus/amadeus-flutter" +export "FLUTTER_TARGET=/Users/jailson/Documents/Amadeus/amadeus-flutter/lib/main.dart" export "FLUTTER_BUILD_DIR=build" export "SYMROOT=${SOURCE_ROOT}/../build/ios" export "OTHER_LDFLAGS=$(inherited) -framework Flutter" -export "FLUTTER_FRAMEWORK_DIR=/usr/lib/flutter/bin/cache/artifacts/engine/ios" +export "FLUTTER_FRAMEWORK_DIR=/Users/jailson/flutter/bin/cache/artifacts/engine/ios" export "FLUTTER_BUILD_NAME=1.2.4" export "FLUTTER_BUILD_NUMBER=11" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.packages" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..1e8c3c9 --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,41 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '9.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__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index cdf0ee1..7d3ae90 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -207,7 +207,85 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 6FF25374D5377369690BA51C /* [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; + }; + 8DD894F39B4826559FB72641 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", + "${PODS_ROOT}/../Flutter/Flutter.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", + "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", + "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", + "${BUILT_PRODUCTS_DIR}/TOCropViewController/TOCropViewController.framework", + "${BUILT_PRODUCTS_DIR}/Toast/Toast.framework", + "${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework", + "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework", + "${BUILT_PRODUCTS_DIR}/image_cropper/image_cropper.framework", + "${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", + "${BUILT_PRODUCTS_DIR}/screen/screen.framework", + "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", + "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", + "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", + "${BUILT_PRODUCTS_DIR}/video_player/video_player.framework", + "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework", + "${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TOCropViewController.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_cropper.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/screen.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework", + ); + 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; diff --git a/lib/items/CommentItem.dart b/lib/items/CommentItem.dart index 7d114d7..6f80ed6 100644 --- a/lib/items/CommentItem.dart +++ b/lib/items/CommentItem.dart @@ -1,12 +1,14 @@ import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter_html/flutter_html.dart'; +import 'package:flutter_html/style.dart'; +import 'package:url_launcher/url_launcher.dart'; import 'package:amadeus/localizations.dart'; import 'package:amadeus/models/CommentModel.dart'; import 'package:amadeus/models/UserModel.dart'; import 'package:amadeus/res/colors.dart'; -import 'package:amadeus/utils/StringUtils.dart'; import 'package:amadeus/widgets/ClickableImage.dart'; abstract class CommentPageItem {} @@ -37,6 +39,14 @@ class LoadPostItem extends StatelessWidget implements CommentPageItem { } } +_launchURL(url) async { + if (await canLaunch(url)) { + await launch(url); + } else { + throw 'Could not launch $url'; + } +} + class CommentItem extends StatelessWidget implements CommentPageItem { final CommentModel comment; final String _webserver; @@ -90,9 +100,16 @@ class CommentItem extends StatelessWidget implements CommentPageItem { child: new Row( children: [ new Expanded( - child: new Text( - StringUtils.stripTags(comment.comment), - style: new TextStyle(fontSize: 14.0), + child: new Html( + data: comment.comment, + onLinkTap: (url) { + _launchURL(url); + }, + style: { + "html": Style( + fontSize: FontSize(14.0) + ) + }, ), ), ], diff --git a/pubspec.yaml b/pubspec.yaml index d61b472..6e12c85 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,6 +36,8 @@ dependencies: shared_preferences: ^0.5.8 transparent_image: ^1.0.0 diacritic: ^0.1.1 + flutter_html: ^1.0.2 + url_launcher: ^5.4.2 dev_dependencies: flutter_test: From 2cbad01de8b19e4cc01aa6a52bf0b6e514d9ed30 Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Fri, 20 Nov 2020 14:05:00 -0300 Subject: [PATCH 2/2] update ios project --- .flutter-plugins-dependencies | 2 +- ios/Runner.xcodeproj/project.pbxproj | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 6bed6a6..d1232de 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_messaging","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_local_notifications-1.5.0+1/","dependencies":[]},{"name":"fluttertoast","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.1.1/","dependencies":[]},{"name":"image_cropper","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.3.1/","dependencies":[]},{"name":"image_picker","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+12/","dependencies":[]},{"name":"path_provider","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.22/","dependencies":[]},{"name":"shared_preferences","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+2/","dependencies":[]},{"name":"sqflite","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]}],"android":[{"name":"firebase_messaging","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_local_notifications-1.5.0+1/","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.11/","dependencies":[]},{"name":"fluttertoast","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.1.1/","dependencies":[]},{"name":"image_cropper","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.3.1/","dependencies":[]},{"name":"image_picker","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+12/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.22/","dependencies":[]},{"name":"shared_preferences","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+2/","dependencies":[]},{"name":"sqflite","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+4/","dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+2/","dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+1/","dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.1+1/","dependencies":["path_provider_windows"]}],"web":[{"name":"fluttertoast","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.1.1/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_messaging","dependencies":[]},{"name":"flutter_local_notifications","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"image_cropper","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-11-20 09:48:09.535924","version":"1.20.2"} +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_messaging","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_local_notifications-1.5.0+1/","dependencies":[]},{"name":"fluttertoast","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.1.1/","dependencies":[]},{"name":"image_cropper","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.3.1/","dependencies":[]},{"name":"image_picker","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+12/","dependencies":[]},{"name":"path_provider","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.22/","dependencies":[]},{"name":"screen","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/screen-0.0.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+2/","dependencies":[]},{"name":"sqflite","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]},{"name":"url_launcher","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.6/","dependencies":[]},{"name":"video_player","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/video_player-0.10.12+5/","dependencies":[]},{"name":"wakelock","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/wakelock-0.1.4+2/","dependencies":[]},{"name":"webview_flutter","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-0.3.24/","dependencies":[]}],"android":[{"name":"firebase_messaging","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_local_notifications-1.5.0+1/","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.11/","dependencies":[]},{"name":"fluttertoast","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.1.1/","dependencies":[]},{"name":"image_cropper","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/image_cropper-1.3.1/","dependencies":[]},{"name":"image_picker","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+12/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.22/","dependencies":[]},{"name":"screen","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/screen-0.0.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+2/","dependencies":[]},{"name":"sqflite","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]},{"name":"url_launcher","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.6/","dependencies":[]},{"name":"video_player","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/video_player-0.10.12+5/","dependencies":[]},{"name":"wakelock","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/wakelock-0.1.4+2/","dependencies":[]},{"name":"webview_flutter","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-0.3.24/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+4/","dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1+2/","dependencies":[]},{"name":"url_launcher_macos","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+9/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+2/","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-0.0.1+4/","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+1/","dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.1+1/","dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_windows-0.0.1+3/","dependencies":[]}],"web":[{"name":"fluttertoast","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-7.1.1/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.4+1/","dependencies":[]},{"name":"video_player_web","path":"/Users/jailson/flutter/.pub-cache/hosted/pub.dartlang.org/video_player_web-0.1.4+1/","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_messaging","dependencies":[]},{"name":"flutter_local_notifications","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"image_cropper","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"screen","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sqflite","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-11-20 10:10:18.312327","version":"1.20.2"} \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 16622e6..98d7457 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -269,8 +269,13 @@ "${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", + "${BUILT_PRODUCTS_DIR}/screen/screen.framework", "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", + "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", + "${BUILT_PRODUCTS_DIR}/video_player/video_player.framework", + "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework", + "${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -287,8 +292,13 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/screen.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh;