Skip to content

Commit 73c6823

Browse files
faithoflifedevfaithoflifedev
committed
'better Flutter support'
1 parent 2d669d3 commit 73c6823

File tree

4 files changed

+38
-26
lines changed

4 files changed

+38
-26
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 1.1.0
4+
5+
* better `Flutter` support
6+
* dependency bumps
7+
38
## 1.0.8+4
49

510
* fix for flutter example

‎README.md‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,23 @@ Please feel free to submit PRs for any additional helper methods, or report an [
2727

2828
## Recent Changes
2929

30-
<<<<<<< HEAD
30+
### New for v1.1.0
31+
- [HighLiuk](https://github.com/HighLiuk) has contributed code that fills out some of the overall functionality
32+
- **Breaking Change:** The `GoogleVision` api has changed. To generate an auth token from a `String` the constructor `GoogleVision.withJwt(String credentialsJsonAsString)` should now be used, and for a file `GoogleVision.withJwtFile(String credentialsFilename)`
33+
34+
```dart
35+
// In your Flutter app
36+
final credentialsJsonAsString =
37+
await rootBundle.loadString('assets/service_credentials.json');
38+
39+
final googleVision = await GoogleVision.withJwt(credentialsJsonAsString);
40+
```
41+
42+
This change reflects the fact that the more common use case of the package is with `Flutter`
43+
3144
### New for v1.0.8
3245
- web entities and pages detection [https://cloud.google.com/vision/docs/detecting-web](https://cloud.google.com/vision/docs/detecting-web), provides urls of web pages that match the specified image
3346

34-
=======
35-
>>>>>>> fdaccb1 ('added support for more detection methods')
3647
### New for v1.0.7
3748

3849
[JLuisRojas](https://github.com/JLuisRojas) has provided code for:
@@ -49,10 +60,6 @@ In addition support for the following has also been added:
4960

5061
[imhafeez](https://github.com/imhafeez) has provided code for `Safe Search` functionality.
5162

52-
### New for v1.0.3
53-
54-
[4ctobias](https://github.com/4ctobias) has provided code for `Label Detection` functionality.
55-
5663
## Getting Started
5764

5865
### pubspec.yaml
@@ -62,11 +69,7 @@ To use this package, add the dependency to your `pubspec.yaml` file:
6269
```yaml
6370
dependencies:
6471
...
65-
<<<<<<< HEAD
66-
google_vision: ^1.0.8+4
67-
=======
68-
google_vision: ^1.0.7
69-
>>>>>>> fdaccb1 ('added support for more detection methods')
72+
google_vision: ^1.1.0
7073
```
7174
7275
### Obtaining Authorization Credentials
@@ -192,11 +195,11 @@ Please see the cli documentation [README.md](https://github.com/faithoflifedev/g
192195
- [imhafeez](https://github.com/imhafeez)
193196
- [4ctobias](https://github.com/4ctobias)
194197
- [JLuisRojas](https://github.com/JLuisRojas)
195-
<<<<<<< HEAD
196198
- [DeadBryam](https://github.com/DeadBryam)
197199
- [husitawi](https://github.com/husitawi)
198-
=======
199-
>>>>>>> fdaccb1 ('added support for more detection methods')
200+
- [DeadBryam](https://github.com/DeadBryam)
201+
- [husitawi](https://github.com/husitawi)
202+
- [HighLiuk](https://github.com/HighLiuk)
200203

201204
## Contributing
202205

‎lib/meta.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
import 'dart:convert' show json;
44

55
final pubSpec = json.decode(
6-
'{"name":"google_vision","version":"1.0.8+4","homepage":"https://github.com/faithoflifedev/google_vision","environment":{"sdk":">=2.17.0 <4.0.0"},"description":"Allows you to add Google Visions image labeling, face, logo, and landmark detection, OCR, and detection of explicit content, into applications.","dependencies":{"args":"^2.4.2","color":"^3.0.0","crypto_keys":"^0.3.0+1","dio":"^5.2.1+1","http":"^0.13.6","image":"^4.0.17","jose":"^0.3.3","json_annotation":"^4.8.1","retrofit":"^4.0.1","universal_io":"^2.2.2"},"dev_dependencies":{"build_runner":"^2.4.5","grinder":"^0.9.4","json_serializable":"^6.7.0","lints":"^2.1.1","publish_tools":"^0.1.0+10","retrofit_generator":"^7.0.7","test":"^1.24.3"},"executables":{"vision":""},"repository":"https://github.com/faithoflifedev/google_vision"}');
6+
'{"name":"google_vision","version":"1.1.0","homepage":"https://github.com/faithoflifedev/google_vision","environment":{"sdk":">=3.0.0 <4.0.0"},"description":"Allows you to add Google Visions image labeling, face, logo, and landmark detection, OCR, and detection of explicit content, into applications.","dependencies":{"args":"^2.4.2","color":"^3.0.0","crypto_keys":"^0.3.0+1","dio":"^5.3.2","http":"^1.1.0","image":"^4.0.17","jose":"^0.3.4","json_annotation":"^4.8.1","retrofit":"^4.0.1","universal_io":"^2.2.2"},"dev_dependencies":{"build_runner":"^2.4.6","grinder":"^0.9.4","json_serializable":"^6.7.1","lints":"^2.1.1","publish_tools":"^0.1.0+11","retrofit_generator":"^7.0.8","test":"^1.24.6"},"dependency_overrides":{"x509":{"git":"https://github.com/faithoflifedev/x509.git"}},"executables":{"vision":""},"repository":"https://github.com/faithoflifedev/google_vision"}');

‎tool/README.md‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ Please feel free to submit PRs for any additional helper methods, or report an [
1212

1313
## Table of Contents
1414
- [Recent Changes](#recent-changes)
15-
<<<<<<< HEAD
1615
- [New for v1.0.8](#new-for-v108)
17-
=======
18-
>>>>>>> fdaccb1 ('added support for more detection methods')
1916
- [New for v1.0.7](#new-for-v107)
2017
- [New for v1.0.6](#new-for-v106)
2118
- [New for v1.0.3](#new-for-v103)
@@ -30,12 +27,23 @@ Please feel free to submit PRs for any additional helper methods, or report an [
3027

3128
## Recent Changes
3229

33-
<<<<<<< HEAD
30+
### New for v1.1.0
31+
- [HighLiuk](https://github.com/HighLiuk) has contributed code that fills out some of the overall functionality
32+
- **Breaking Change:** The `GoogleVision` api has changed. To generate an auth token from a `String` the constructor `GoogleVision.withJwt(String credentialsJsonAsString)` should now be used, and for a file `GoogleVision.withJwtFile(String credentialsFilename)`
33+
34+
```dart
35+
// In your Flutter app
36+
final credentialsJsonAsString =
37+
await rootBundle.loadString('assets/service_credentials.json');
38+
39+
final googleVision = await GoogleVision.withJwt(credentialsJsonAsString);
40+
```
41+
42+
This change reflects the fact that the more common use case of the package is with `Flutter`
43+
3444
### New for v1.0.8
3545
- web entities and pages detection [https://cloud.google.com/vision/docs/detecting-web](https://cloud.google.com/vision/docs/detecting-web), provides urls of web pages that match the specified image
3646

37-
=======
38-
>>>>>>> fdaccb1 ('added support for more detection methods')
3947
### New for v1.0.7
4048

4149
[JLuisRojas](https://github.com/JLuisRojas) has provided code for:
@@ -52,10 +60,6 @@ In addition support for the following has also been added:
5260

5361
[imhafeez](https://github.com/imhafeez) has provided code for `Safe Search` functionality.
5462

55-
### New for v1.0.3
56-
57-
[4ctobias](https://github.com/4ctobias) has provided code for `Label Detection` functionality.
58-
5963
## Getting Started
6064

6165
### pubspec.yaml

0 commit comments

Comments
 (0)