diff --git a/CHANGELOG.md b/CHANGELOG.md index dfdd7a5..d6a593b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [0.1.1] - TODO: 17-11-2018. + +* Updated description and fix image links. + +## [0.1.0] - TODO: 30-09-2018. + +* Updated environment sdk constraints to make the package Dart 2 compatible. + ## [0.0.1] - TODO: 27-05-2018. -* The flutter_dialogflow makes it easy to integrate dialogflow +* This package help to integrate Dialogflow into Flutter apps. Initial commit by VictorRancesCode. + diff --git a/README.md b/README.md index 31fd01a..8029fe6 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# flutter_dialogflow +# Dialogflow package for Flutter apps. -A new Flutter package. -* [Example](https://github.com/VictorRancesCode/flutter_dialogflow/tree/master/example) +This package is modified from [VictorRancesCode's package](https://github.com/VictorRancesCode/flutter_dialogflow) for compatible with Dart 2. +* [Example](https://github.com/ngoan98tv/flutter_dialogflow/tree/master/example)

- +

## Installation @@ -13,7 +13,7 @@ A new Flutter package. * Add this to your package's pubspec.yaml file: ``` dependencies: - flutter_dialogflow: "^0.0.1" + dialogflow: "^0.1.0" ``` * You can install packages from the command line: with Flutter: @@ -23,7 +23,7 @@ $ flutter packages get * Import it Now in your Dart code, you can use: ``` - import 'package:flutter_dialogflow/flutter_dialogflow.dart'; + import 'package:dialogflow/dialogflow.dart'; ``` @@ -38,7 +38,7 @@ $ flutter packages get * Example ``` void Response(query) async { - Dialogflow dialogflow = Dialogflow(token: "10178f9cb6cf12321asdf4aae75c87cd"); + Dialogflow dialogflow = Dialogflow(token: "Your token goes here"); AIResponse response = await dialogflow.sendQuery(query); print(response.getMessageResponse()); } diff --git a/build/testfile.dill b/build/testfile.dill new file mode 100644 index 0000000..71bc866 Binary files /dev/null and b/build/testfile.dill differ diff --git a/example/README.md b/example/README.md deleted file mode 100644 index 64a12f6..0000000 --- a/example/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# example - -A new Flutter project. - -## Getting Started - -For help getting started with Flutter, view our online -[documentation](https://flutter.io/). diff --git a/example/lib/main.dart b/example/lib/main.dart index 6077498..a2ba022 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_dialogflow/flutter_dialogflow.dart'; +import 'package:dialogflow/dialogflow.dart'; void main() => runApp(new MyApp()); class MyApp extends StatelessWidget { @@ -57,7 +57,7 @@ class _MyHomePageState extends State { void Response(query) async { _textController.clear(); - Dialogflow dialogflow =Dialogflow(token: "10178f9cb6cf44288a4af4aae75c87cd"); + Dialogflow dialogflow =Dialogflow(token: "Your own token"); AIResponse response = await dialogflow.sendQuery(query); ChatMessage message = new ChatMessage( text: response.getMessageResponse(), diff --git a/example/pubspec.lock b/example/pubspec.lock index 8b1175a..a123312 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,77 +7,63 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.31.1" + version: "0.32.4" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.4.1" + version: "1.5.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" - barback: - dependency: transitive - description: - name: barback - url: "https://pub.dartlang.org" - source: hosted - version: "0.15.2+15" + version: "2.0.8" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.2+1" + version: "1.1.2" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.6" + version: "1.14.11" convert: dependency: transitive description: name: convert url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.0.2+1" + version: "2.0.6" csslib: dependency: transitive description: name: csslib url: "https://pub.dartlang.org" source: hosted - version: "0.14.1" + version: "0.14.5" cupertino_icons: dependency: "direct main" description: @@ -85,18 +71,18 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_dialogflow: + dialogflow: dependency: "direct main" description: path: ".." relative: true source: path - version: "0.0.1" + version: "0.1.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -108,189 +94,189 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.0-alpha.9" + version: "0.1.4" glob: dependency: transitive description: name: glob url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "1.1.7" html: dependency: transitive description: name: html url: "https://pub.dartlang.org" source: hosted - version: "0.13.3" + version: "0.13.3+3" http: dependency: transitive description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.11.3+16" + version: "0.11.3+17" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "3.1.1" + version: "3.1.3" io: dependency: transitive description: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.2+1" - isolate: + version: "0.3.3" + js: dependency: transitive description: - name: isolate + name: js url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" - js: + version: "0.6.1+1" + json_rpc_2: dependency: transitive description: - name: js + name: json_rpc_2 url: "https://pub.dartlang.org" source: hosted - version: "0.6.1" + version: "2.0.9" kernel: dependency: transitive description: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.0-alpha.9" + version: "0.3.4" logging: dependency: transitive description: name: logging url: "https://pub.dartlang.org" source: hosted - version: "0.11.3+1" + version: "0.11.3+2" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.1+4" + version: "0.12.3+1" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.1.6" mime: dependency: transitive description: name: mime url: "https://pub.dartlang.org" source: hosted - version: "0.9.6" + version: "0.9.6+2" multi_server_socket: dependency: transitive description: name: multi_server_socket url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" node_preamble: dependency: transitive description: name: node_preamble url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "1.4.4" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.5" package_resolver: dependency: transitive description: name: package_resolver url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.4" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.5.1" + version: "1.6.2" plugin: dependency: transitive description: name: plugin url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+2" + version: "0.2.0+3" pool: dependency: transitive description: name: pool url: "https://pub.dartlang.org" source: hosted - version: "1.3.4" + version: "1.3.6" pub_semver: dependency: transitive description: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "1.3.2" + version: "1.4.2" quiver: dependency: transitive description: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "0.28.0" + version: "2.0.0+1" shelf: dependency: transitive description: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.2" + version: "0.7.3+3" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" shelf_static: dependency: transitive description: name: shelf_static url: "https://pub.dartlang.org" source: hosted - version: "0.2.7" + version: "0.2.8" shelf_web_socket: dependency: transitive description: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "0.2.2" + version: "0.2.2+4" sky_engine: dependency: transitive description: flutter @@ -302,97 +288,104 @@ packages: name: source_map_stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.1.4" + version: "1.1.5" source_maps: dependency: transitive description: name: source_maps url: "https://pub.dartlang.org" source: hosted - version: "0.10.4" + version: "0.10.7" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "1.4.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.2" + version: "1.9.3" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "1.6.8" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.4" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" test: dependency: transitive description: name: test url: "https://pub.dartlang.org" source: hosted - version: "0.12.32+2" + version: "1.3.0" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "1.1.6" utf: dependency: transitive description: name: utf url: "https://pub.dartlang.org" source: hosted - version: "0.9.0+4" + version: "0.9.0+5" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.8" + vm_service_client: + dependency: transitive + description: + name: vm_service_client + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.6" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "0.9.7+7" + version: "0.9.7+10" web_socket_channel: dependency: transitive description: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.0.7" + version: "1.0.9" yaml: dependency: transitive description: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.1.13" + version: "2.1.15" sdks: - dart: ">=2.0.0-dev.28.0 <=2.0.0-edge.af1436931b93e755d38223c487d33a0a1f5eadf5" + dart: ">=2.0.0-dev.68.0 <3.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 769084c..c316a71 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ description: A new Flutter project. dependencies: flutter: sdk: flutter - flutter_dialogflow: + dialogflow: path: ../ # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. diff --git a/lib/flutter_dialogflow.dart b/lib/dialogflow.dart similarity index 97% rename from lib/flutter_dialogflow.dart rename to lib/dialogflow.dart index 847b7ea..a72e89e 100644 --- a/lib/flutter_dialogflow.dart +++ b/lib/dialogflow.dart @@ -1,4 +1,4 @@ -library flutter_dialogflow; +library dialogflow; import 'package:meta/meta.dart'; import 'package:http/http.dart' as http; @@ -265,7 +265,7 @@ class Dialogflow { String _getUrl(query) { return "https://api.dialogflow.com/v1/query?v=$version&contexts=$query" - "&lang=es&query=$query&lang=$language&sessionId=$sessionId&timezone=$timezone"; + "&query=$query&lang=$language&sessionId=$sessionId&timezone=$timezone"; } Future sendQuery(query) async { @@ -273,7 +273,7 @@ class Dialogflow { _getUrl(query), headers: {HttpHeaders.AUTHORIZATION: "Bearer " + token}, ); - Map data = JSON.decode(response.body); + Map data = JsonCodec().decode(response.body); AIResponse aiResponse = new AIResponse(data); return aiResponse; } diff --git a/pubspec.lock b/pubspec.lock index 12f065e..e3c82cb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,77 +7,63 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.31.1" + version: "0.32.4" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.4.1" + version: "1.5.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" - barback: - dependency: transitive - description: - name: barback - url: "https://pub.dartlang.org" - source: hosted - version: "0.15.2+15" + version: "2.0.8" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.2+1" + version: "1.1.2" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.6" + version: "1.14.11" convert: dependency: transitive description: name: convert url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.0.2+1" + version: "2.0.6" csslib: dependency: transitive description: name: csslib url: "https://pub.dartlang.org" source: hosted - version: "0.14.1" + version: "0.14.5" flutter: dependency: "direct main" description: flutter @@ -94,189 +80,189 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.0-alpha.9" + version: "0.1.4" glob: dependency: transitive description: name: glob url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "1.1.7" html: dependency: transitive description: name: html url: "https://pub.dartlang.org" source: hosted - version: "0.13.3" + version: "0.13.3+3" http: dependency: "direct main" description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.11.3+16" + version: "0.11.3+17" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "3.1.1" + version: "3.1.3" io: dependency: transitive description: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.2+1" - isolate: + version: "0.3.3" + js: dependency: transitive description: - name: isolate + name: js url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" - js: + version: "0.6.1+1" + json_rpc_2: dependency: transitive description: - name: js + name: json_rpc_2 url: "https://pub.dartlang.org" source: hosted - version: "0.6.1" + version: "2.0.9" kernel: dependency: transitive description: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.0-alpha.9" + version: "0.3.4" logging: dependency: transitive description: name: logging url: "https://pub.dartlang.org" source: hosted - version: "0.11.3+1" + version: "0.11.3+2" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.1+4" + version: "0.12.3+1" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.1.6" mime: dependency: transitive description: name: mime url: "https://pub.dartlang.org" source: hosted - version: "0.9.6" + version: "0.9.6+2" multi_server_socket: dependency: transitive description: name: multi_server_socket url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" node_preamble: dependency: transitive description: name: node_preamble url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "1.4.4" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.5" package_resolver: dependency: transitive description: name: package_resolver url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.4" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.5.1" + version: "1.6.2" plugin: dependency: transitive description: name: plugin url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+2" + version: "0.2.0+3" pool: dependency: transitive description: name: pool url: "https://pub.dartlang.org" source: hosted - version: "1.3.4" + version: "1.3.6" pub_semver: dependency: transitive description: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "1.3.2" + version: "1.4.2" quiver: dependency: transitive description: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "0.28.0" + version: "2.0.0+1" shelf: dependency: transitive description: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.2" + version: "0.7.3+3" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" shelf_static: dependency: transitive description: name: shelf_static url: "https://pub.dartlang.org" source: hosted - version: "0.2.7" + version: "0.2.8" shelf_web_socket: dependency: transitive description: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "0.2.2" + version: "0.2.2+4" sky_engine: dependency: transitive description: flutter @@ -288,97 +274,104 @@ packages: name: source_map_stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.1.4" + version: "1.1.5" source_maps: dependency: transitive description: name: source_maps url: "https://pub.dartlang.org" source: hosted - version: "0.10.4" + version: "0.10.7" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "1.4.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.2" + version: "1.9.3" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "1.6.8" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.4" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" test: dependency: transitive description: name: test url: "https://pub.dartlang.org" source: hosted - version: "0.12.32+2" + version: "1.3.0" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "1.1.6" utf: dependency: transitive description: name: utf url: "https://pub.dartlang.org" source: hosted - version: "0.9.0+4" + version: "0.9.0+5" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.8" + vm_service_client: + dependency: transitive + description: + name: vm_service_client + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.6" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "0.9.7+7" + version: "0.9.7+10" web_socket_channel: dependency: transitive description: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.0.7" + version: "1.0.9" yaml: dependency: transitive description: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.1.13" + version: "2.1.15" sdks: - dart: ">=2.0.0-dev.23.0 <=2.0.0-edge.af1436931b93e755d38223c487d33a0a1f5eadf5" + dart: ">=2.0.0-dev.68.0 <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index d31192b..13f010f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,53 +1,21 @@ -name: flutter_dialogflow -description: The flutter_dialogflow makes it easy to integrate dialogflow -version: 0.0.1 -author: Victor Alfonso Rodas Oña -homepage: https://github.com/VictorRancesCode/flutter_dialogflow +name: dialogflow +description: A package for an easy way to integrate Dialogflow into Flutter apps using Dialogflow API v1 authentication via token code. +version: 0.1.1 +authors: + - Victor Alfonso Rodas Oña + - Trần Văn Ngoãn +homepage: https://github.com/ngoan98tv/flutter_dialogflow dependencies: flutter: sdk: flutter - http: ^0.11.3+16 + http: ^0.11.3+17 dev_dependencies: flutter_test: sdk: flutter -# For information on the generic Dart part of this file, see the -# following page: https://www.dartlang.org/tools/pub/pubspec - -# The following section is specific to Flutter. 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.io/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.io/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.io/custom-fonts/#from-packages environment: - sdk: ">=1.8.0 <2.0.0" \ No newline at end of file + sdk: '>=1.20.1 <3.0.0' \ No newline at end of file diff --git a/test/flutter_dialogflow_test.dart b/test/dialogflow_test.dart similarity index 84% rename from test/flutter_dialogflow_test.dart rename to test/dialogflow_test.dart index 9ed8621..3a7a301 100644 --- a/test/flutter_dialogflow_test.dart +++ b/test/dialogflow_test.dart @@ -1,6 +1,6 @@ import 'package:test/test.dart'; -import 'package:flutter_dialogflow/flutter_dialogflow.dart'; +import 'package:dialogflow/dialogflow.dart'; void main() { test('Test Dialogflow', () async {